preparation for possibly excluding GNUstep extensions by default

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29690 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2010-02-20 17:16:23 +00:00
parent 8123799077
commit 4904fa442a
20 changed files with 61 additions and 29 deletions

View file

@ -1,3 +1,30 @@
2010-02-20 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/Foundation/NSURL.h:
* Headers/Foundation/NSObject.h:
* Headers/Foundation/NSString.h:
* Headers/Foundation/NSCalendarDate.h:
* Headers/Foundation/NSBundle.h:
* Headers/Foundation/NSProcessInfo.h:
* Headers/Foundation/NSAttributedString.h:
* Headers/Foundation/NSUserDefaults.h:
* Headers/Foundation/NSThread.h:
* Headers/Foundation/NSData.h:
* Headers/Foundation/NSArray.h:
* Headers/Foundation/NSDebug.h:
* Headers/Foundation/NSFileHandle.h:
* Headers/Foundation/NSValue.h:
* Headers/Foundation/NSLock.h:
* Headers/Foundation/NSTask.h:
* Headers/Additions/GNUstepBase/GSVersionMacros.h:
* Headers/Additions/GNUstepBase/GSObjCRuntime.h:
Modified the sense of the 'NO_GNUSTEP' preprocessor constant slightly.
It is now always defined (GSVersionMacros.h defines it to zero if it
was not defined externally). A sbefore, defining it to 1 should prevent
the inclusion of GNUstep specific headers.
This change should make it easy for us to change the default behavior
at a later date.
2010-02-20 Richard Frith-Macdonald <rfm@gnu.org>
* Source/Makefile.postamble:

View file

@ -25,17 +25,17 @@ constants will modify the API visible to software being compiled -
@deffn preprocessor NO_GNUSTEP
GNUstep specific extensions to the OpenStep and MacOS cocoa APIs are
excluded from the headers.
excluded from the headers if this is defined to a non-zero value.
@end deffn
@deffn preprocessor STRICT_MACOS_X
Only methods and classes that are part of the MacOS cocoa API are made
available in the headers.
available in the headers if this is defined.
@end deffn
@deffn preprocessor STRICT_OPENSTEP
Only methods and classes that are part of the OpenStep specification are
made available in the headers.
made available in the headers if this is defined.
@end deffn
Note, these preprocessor constants are used in developer code (ie the code

View file

@ -131,7 +131,7 @@ extern "C" {
#endif
#ifndef NO_GNUSTEP
#if !NO_GNUSTEP
/*
* Functions for accessing instance variables directly -
* We can copy an ivar into arbitrary data,

View file

@ -25,17 +25,22 @@
#ifndef __GNUSTEP_GSVERSIONMACROS_H_INCLUDED_
#define __GNUSTEP_GSVERSIONMACROS_H_INCLUDED_
/*
* Check consistency of definitions for system compatibility.
/* By default we defined NO_GNUSTEP to 0 so that we will include extensions.
*/
#if !defined(NO_GNUSTEP)
# define NO_GNUSTEP 0
#endif
/* Check consistency of definitions for system compatibility.
*/
#if defined(STRICT_OPENSTEP)
#define GS_OPENSTEP_V 10000
#define NO_GNUSTEP 1
# define GS_OPENSTEP_V 10000
# undef NO_GNUSTEP
# define NO_GNUSTEP 1
#elif defined(STRICT_MACOS_X)
#define GS_OPENSTEP_V 100600
#define NO_GNUSTEP 1
#else
#undef NO_GNUSTEP
# define GS_OPENSTEP_V 100600
# undef NO_GNUSTEP
# define NO_GNUSTEP 1
#endif
/*

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -30,7 +30,7 @@
#include <errno.h>
#if !defined(NO_GNUSTEP)
#if !NO_GNUSTEP
# if defined(GNUSTEP_BASE_INTERNAL)
# import "Foundation/NSObject.h"
# import "GNUstepBase/NSDebug+GNUstepBase.h"

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -379,7 +379,7 @@ GS_EXPORT NSString* const NSThreadDidStartNotification;
#endif
#if !defined(NO_GNUSTEP)
#if !NO_GNUSTEP
# if defined(GNUSTEP_BASE_INTERNAL)
# import "GNUstepBase/NSThread+GNUstepBase.h"
# else

View file

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

View file

@ -61,7 +61,7 @@ GS_EXPORT NSString* const NSGlobalDomain;
*/
GS_EXPORT NSString* const NSRegistrationDomain;
#ifndef NO_GNUSTEP
#if !NO_GNUSTEP
/**
* User defaults domain for GNUstep config file and for any defaults
* stored in the GlobalDefaults.plist file alongside the config file.
@ -179,7 +179,7 @@ GS_EXPORT NSString* const NSLanguageCode;
/** Key for locale dictionary: formal name of language. */
GS_EXPORT NSString* const NSFormalName;
#ifndef NO_GNUSTEP
#if !NO_GNUSTEP
/** Key for locale dictionary: name of locale. */
GS_EXPORT NSString* const GSLocale;
#endif

View file

@ -363,7 +363,7 @@ extern "C" {
}
#endif
#if !defined(NO_GNUSTEP) && !defined(GNUSTEP_BASE_INTERNAL)
#if !NO_GNUSTEP && !defined(GNUSTEP_BASE_INTERNAL)
#import <GNUstepBase/NSNumber+GNUstepBase.h>
#endif