Merge remote-tracking branch 'gnustep/master' into dev

ChangeLog

@@ -1,3 +1,57 @@
+2012-04-08  Richard Frith-Macdonald <[email protected]>
+
+        * TestFramework/ObjectTesting.h: Fix error performing equality test
+        in copying protocol test macro.
+
+2012-03-28  Richard Frith-Macdonald <[email protected]>
+
+        Make release
+	* Version 2.6.4
+        Update release notes/documentation
+
+2012-03-25  Richard Frith-Macdonald <[email protected]>
+
+        * TestFramework/Testing.h: Use -isEqualForTestcase: for PASS_EQUAL
+        macro equality testing if the expected value responds to it.
+        Add informal protocol declaring -isEqualForTestcase:
+        * TestFramework/ObjectTesting.h: Convert protocol checking functions
+        to macros (so error messages get file/line number information) and
+        get copy and coding before/after equality checks to use the
+        PASS_EQUAL macro so that we can easily make customised tests by
+        implementing -isEqualForTestcase: for the class being tested.
+
+2012-03-16  Emmanuel Maillard <[email protected]>
+
+        * target.make: Add target for android
+
+2012-03-08  Jean-Charles BERTIN <[email protected]>
+
+        * TestFramework/gnustep-tests.in: Fix typo
+
+2012-03-01  Richard Frith-Macdonald <[email protected]>
+
+        * common.make: Remove -shared-libgcc linker flag
+        * configure.ac: Add check for clang and add -shared-libgcc to linker
+        flags if we aren't using it (using gcc) but are using exceptions.
+        Tidy a little.
+        Patch based on contribtion by Jean-Charles Bertin.
+
+2012-03-01  Richard Frith-Macdonald <[email protected]>
+
+        * Version ... bump subminor number in preparation for next release.
+
+2012-03-01  Richard Frith-Macdonald <[email protected]>
+
+        Make release
+	* Version 2.6.3
+        * Update release notes
+
+2013-02-20  Nicola Pero  <[email protected]>
+
+	* Instance/framework.make: Removed trailing '/' after
+	$(GNUSTEP_TARGET_LDIR) in a couple of cases, to fix building on
+	non-flattened layout.
+
 2012-01-31  Richard Frith-Macdonald <[email protected]>
 
 	* rules.make: A couple more printout targets for managing installation

Documentation/news.texi

@@ -9,13 +9,23 @@
 The currently released version is @samp{@value{GNUSTEP-MAKE-VERSION}}.
 @end ifclear
 
+@section Changes in version @samp{2.6.4}
+
+Test framework extended equality tests.
+
+Android build target
+
+@ifclear ANNOUNCE-ONLY
+
+@section Changes in version @samp{2.6.3}
+
+Minor bugfix release.
+
 @section Changes in version @samp{2.6.2}
 
 Added standalone filesystem layout for putting everything in 
 one directory for easy deployment of relocatable. Other bug fixes.
 
-@ifclear ANNOUNCE-ONLY
-
 @section Changes in version @samp{2.6.1}
 
 Bug fix release. Most notably to fix a problem compiling GNUstep with clang.

Documentation/releasenotes.texi

@@ -4,6 +4,16 @@ The release notes include descriptions of API changes, behavior
 changes and other information that might help developers and users
 migrate to using a newer version of the make system.
 
+@section Version 2.6.4
+
+Test framework enhancement (extended equality tests)
+
+Android built target
+
+@section Version 2.6.3
+
+Bug fixes
+
 @section Version 2.6.2
 @table @samp
 @item Added standalone filesystem layout for putting everything in 

Instance/framework.make

@@ -536,7 +536,7 @@ ifeq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin)
 $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR):
 	$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
 
-$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/
+$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)
 ifeq ($(MAKE_CURRENT_VERSION),yes)
 	$(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework; \
 	$(RM_LN_S) $(GNUSTEP_INSTANCE); \
@@ -562,7 +562,7 @@ ifeq ($(FRAMEWORK_VERSION_SUPPORT), yes)
 $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR):
 	$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
 
-$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/
+$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)
 ifeq ($(MAKE_CURRENT_VERSION),yes)
 	$(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR); \
 	$(RM_LN_S) $(GNUSTEP_INSTANCE) $(FRAMEWORK_LIBRARY_FILE); \