Backward compatibility fixups

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29663 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,27 @@
+2010-02-18 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/GNUmakefile:
+	* Headers/Foundation/NSURL.h:
+	* Headers/Foundation/NSObject.h:
+	* Headers/Foundation/NSString.h:
+	* Headers/Foundation/NSCalendarDate.h:
+	* Headers/Foundation/NSBundle.h:
+	* Headers/Foundation/Foundation.h.install:
+	* Headers/Foundation/NSProcessInfo.h:
+	* Headers/Foundation/NSAttributedString.h:
+	* Headers/Foundation/NSData.h:
+	* Headers/Foundation/NSArray.h:
+	* Headers/Foundation/NSFileHandle.h:
+	* Headers/Foundation/NSValue.h:
+	* Headers/Foundation/NSLock.h:
+	* Headers/Foundation/NSTask.h:
+	* Tools/GNUmakefile:
+	Have standard foundation headers include any corresponding GNUstep
+	extension headers unless NO_GNUSTEP is defined (building code with
+	strict OSX compatibility) or GNUSTEP_BASE_INTERNAL is defined
+	(building the base library etc itsself, and needing to ensure we
+	don't accidentally include installed headers from a previous version).
+
 2010-02-18 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSSpellServer.m:

Headers/Foundation/Foundation.h.install

@@ -136,8 +136,4 @@
 #import	<Foundation/NSXMLParser.h>
 #import	<Foundation/NSZone.h>
 
-#if	!defined(NO_GNUSTEP)
-#import	<GNUstepBase/Additions.h>
-#endif
-
 #endif /* __Foundation_h_GNUSTEP_BASE_INCLUDE */

Headers/Foundation/NSArray.h

@@ -271,4 +271,8 @@ DEFINE_BLOCK_TYPE(GSPredicateBlock, BOOL, id, NSUInteger, BOOL*);
 }
 #endif
 
+#if	!defined(NO_GNUSTEP) && !defined(GNUSTEP_BASE_INTERNAL)
+#import	<GNUstepBase/NSArray+GNUstepBase.h>
+#endif
+
 #endif /* __NSArray_h_GNUSTEP_BASE_INCLUDE */

Headers/Foundation/NSAttributedString.h

@@ -139,5 +139,9 @@ extern "C" {
 }
 #endif
 
+#if     !defined(NO_GNUSTEP) && !defined(GNUSTEP_BASE_INTERNAL)
+#import <GNUstepBase/NSAttributedString+GNUstepBase.h>
+#endif
+
 #endif	/* __NSAttributedString_h_GNUSTEP_BASE_INCLUDE */
 

Headers/Foundation/NSBundle.h

@@ -573,4 +573,8 @@ GS_EXPORT NSString* const NSLoadedClasses;
 }
 #endif
 
+#if     !defined(NO_GNUSTEP) && !defined(GNUSTEP_BASE_INTERNAL)
+#import <GNUstepBase/NSBundle+GNUstepBase.h>
+#endif
+
 #endif	/* __NSBundle_h_GNUSTEP_BASE_INCLUDE */

Headers/Foundation/NSCalendarDate.h

@@ -160,6 +160,10 @@ extern "C" {
 @end
 #endif
 
+#if     !defined(NO_GNUSTEP) && !defined(GNUSTEP_BASE_INTERNAL)
+#import <GNUstepBase/NSCalendarDate+GNUstepBase.h>
+#endif
+
 #if	defined(__cplusplus)
 }
 #endif

Headers/Foundation/NSData.h

@@ -329,4 +329,8 @@ enum {
 }
 #endif
 
+#if     !defined(NO_GNUSTEP) && !defined(GNUSTEP_BASE_INTERNAL)
+#import <GNUstepBase/NSData+GNUstepBase.h>
+#endif
+
 #endif /* __NSData_h_GNUSTEP_BASE_INCLUDE */

Headers/Foundation/NSFileHandle.h

@@ -258,4 +258,8 @@ GS_EXPORT NSString * const GSFileHandleNotificationError;
 }
 #endif
 
+#if     !defined(NO_GNUSTEP) && !defined(GNUSTEP_BASE_INTERNAL)
+#import <GNUstepBase/NSFileHandle+GNUstepBase.h>
+#endif
+
 #endif /* __NSFileHandle_h_GNUSTEP_BASE_INCLUDE */

Headers/Foundation/NSLock.h

@@ -302,5 +302,9 @@ extern "C" {
 }
 #endif
 
+#if     !defined(NO_GNUSTEP) && !defined(GNUSTEP_BASE_INTERNAL)
+#import <GNUstepBase/NSLock+GNUstepBase.h>
+#endif
+
 #endif /* __NSLock_h_GNUSTEP_BASE_INCLUDE */
 

Headers/Foundation/NSObject.h

@@ -459,4 +459,8 @@ GS_EXPORT NSRecursiveLock *gnustep_global_lock;
 }
 #endif
 
+#if     !defined(NO_GNUSTEP) && !defined(GNUSTEP_BASE_INTERNAL)
+#import <GNUstepBase/NSObject+GNUstepBase.h>
+#endif
+
 #endif /* __NSObject_h_GNUSTEP_BASE_INCLUDE */

Headers/Foundation/NSProcessInfo.h

@@ -247,4 +247,8 @@ GS_EXPORT BOOL GSDebugSet(NSString *level);
 }
 #endif
 
+#if     !defined(NO_GNUSTEP) && !defined(GNUSTEP_BASE_INTERNAL)
+#import <GNUstepBase/NSProcessInfo+GNUstepBase.h>
+#endif
+
 #endif /* __NSProcessInfo_h_GNUSTEP_BASE_INCLUDE */

Headers/Foundation/NSString.h

@@ -809,4 +809,9 @@ extern struct objc_class _NSConstantStringClassReference;
 }
 #endif
 
+#if     !defined(NO_GNUSTEP) && !defined(GNUSTEP_BASE_INTERNAL)
+#import <GNUstepBase/NSString+GNUstepBase.h>
+#import <GNUstepBase/NSMutableString+GNUstepBase.h>
+#endif
+
 #endif /* __NSString_h_GNUSTEP_BASE_INCLUDE */

Headers/Foundation/NSTask.h

@@ -120,4 +120,8 @@ GS_EXPORT NSString* const NSTaskDidTerminateNotification;
 }
 #endif
 
+#if     !defined(NO_GNUSTEP) && !defined(GNUSTEP_BASE_INTERNAL)
+#import <GNUstepBase/NSTask+GNUstepBase.h>
+#endif
+
 #endif /* __NSTask_h_GNUSTEP_BASE_INCLUDE */

Headers/Foundation/NSURL.h

@@ -126,5 +126,9 @@ GS_EXPORT NSString* const NSURLFileScheme;
 }
 #endif
 
+#if     !defined(NO_GNUSTEP) && !defined(GNUSTEP_BASE_INTERNAL)
+#import <GNUstepBase/NSURL+GNUstepBase.h>
+#endif
+
 #endif	/* __NSURL_h_GNUSTEP_BASE_INCLUDE */
 

Headers/Foundation/NSValue.h

@@ -382,4 +382,8 @@ unsigned	GSSmallHash(int n);
 }
 #endif
 
+#if     !defined(NO_GNUSTEP) && !defined(GNUSTEP_BASE_INTERNAL)
+#import <GNUstepBase/NSNumber+GNUstepBase.h>
+#endif
+
 #endif /* __NSValue_h_GNUSTEP_BASE_INCLUDE */

Source/GNUmakefile

@@ -74,23 +74,12 @@ else
 libgnustep-base_SUBPROJECTS+=unix
 endif
 
-ifeq ($(GNUSTEP_TARGET_OS), mingw32)
-
 DEFS= -DGNUSTEP_TARGET_DIR=\"$(GNUSTEP_TARGET_DIR)\" \
 	-DGNUSTEP_TARGET_CPU=\"$(GNUSTEP_TARGET_CPU)\" \
 	-DGNUSTEP_TARGET_OS=\"$(GNUSTEP_TARGET_OS)\" \
 	-DGNUSTEP_IS_FLATTENED=\"$(GNUSTEP_IS_FLATTENED)\" \
-	-DLIBRARY_COMBO=\"$(LIBRARY_COMBO)\"
-
-else
-
-DEFS= -DGNUSTEP_TARGET_DIR=\"$(GNUSTEP_TARGET_DIR)\" \
-	-DGNUSTEP_TARGET_CPU=\"$(GNUSTEP_TARGET_CPU)\" \
-	-DGNUSTEP_TARGET_OS=\"$(GNUSTEP_TARGET_OS)\" \
-	-DGNUSTEP_IS_FLATTENED=\"$(GNUSTEP_IS_FLATTENED)\" \
-	-DLIBRARY_COMBO=\"$(LIBRARY_COMBO)\"
-
-endif
+	-DLIBRARY_COMBO=\"$(LIBRARY_COMBO)\" \
+	-DGNUSTEP_BASE_INTERNAL=1
 
 # The GNU source files
 

Tools/GNUmakefile

@@ -47,6 +47,9 @@ include $(GNUSTEP_MAKEFILES)/common.make
 -include ../config.mak
 -include ../Source/pathconfig/pathconfig.mak
 
+ADDITIONAL_CPPFLAGS = -DGNUSTEP_BASE_INTERNAL=1
+
+
 # DTDs to install
 dtddir = $(GNUSTEP_LIBRARY)/DTDs
 DTD_FILES = plist-0_9.dtd \