diff --git a/ChangeLog b/ChangeLog index e285977e6..6aa680f12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-01-14 Nicola Pero + + * configure.ac: Do not read obsolete GNUSTEP_USER_DIR and do not + substitute GNUSTEP_TARGET_USER_DIR. + * configure: Regenerated. + * Headers/Additions/GNUstepBase/config.h.in: Regenerated. + * Source/NSPathUtilities.m: Do not read obsolete GNUSTEP_USER_DIR + from the configuration. Ignore it if found. It was never used + anywhere. + * Documentation/Base.gsdoc: Removed or slightly updated some + obsolete documentation on filesystem configuration. + 2008-01-10 Richard Frith-Macdonald * Source/inet_pton.c: @@ -35,15 +47,15 @@ 2008-01-07 Richard Frith-Macdonald - * Source/GSSocketStream.h: simplify socket address handling - * Source/GSSocketStream.m: ditto + more work on socks - * Source/GSStream.h: minor tweaks - * Source/GSStream.m:minor tweaks - * Source/unix/NSStream.m: simplified socket address handling - * Source/GSNetwork.h: add macro to get socket address length - * Source/GSHTTPAuthentication.m: Handle arg classh check in init - * Source/NSURLRequest.m: ditto - * Source/NSURLProtocol.m: attempt to add support for authentication + * Source/GSSocketStream.h: simplify socket address handling + * Source/GSSocketStream.m: ditto + more work on socks + * Source/GSStream.h: minor tweaks + * Source/GSStream.m:minor tweaks + * Source/unix/NSStream.m: simplified socket address handling + * Source/GSNetwork.h: add macro to get socket address length + * Source/GSHTTPAuthentication.m: Handle arg classh check in init + * Source/NSURLRequest.m: ditto + * Source/NSURLProtocol.m: attempt to add support for authentication 2008-01-07 Fred Kiefer @@ -69,6 +81,7 @@ * Source/GSSocketStream.m: Fix missing isfeds 2008-01-04 Riccardo Mottola + * Source/NSKeyValueObserving.m: fixed cc99ism 2008-01-04 Richard Frith-Macdonald diff --git a/Documentation/Base.gsdoc b/Documentation/Base.gsdoc index 3834756a7..e0ae99bd7 100644 --- a/Documentation/Base.gsdoc +++ b/Documentation/Base.gsdoc @@ -487,13 +487,13 @@ notice and this notice are preserved. GNUSTEP_SYSTEM_ROOT - Used to specify the GNUstep system root directory ... all + Obsolete. Used to specify the GNUstep system root directory ... all system libraries, tools, applications, headers, resources in general are located relative to this. GNUSTEP_NETWORK_ROOT - Used to specify the GNUstep root directory for local + Obsolete. Used to specify the GNUstep root directory for local (non-system) resources that are intended to be shared across a local network. Typically this is an NFS exported directory shared by many machines. It provides an @@ -502,7 +502,7 @@ notice and this notice are preserved. GNUSTEP_LOCAL_ROOT - Used to specify the GNUstep root directory for local + Obsolete. Used to specify the GNUstep root directory for local (non-system) resources. Typically all locally produced or contributed software is installed relative to this. @@ -512,7 +512,7 @@ notice and this notice are preserved.

GNUSTEP_USER_DIR - Path for user specific GNUstep resources (eg. 'GNUstep'). + Obsolete. Path for user specific GNUstep resources (eg. 'GNUstep'). Relative to the user's home directory. GNUSTEP_USER_CONFIG_FILE @@ -540,44 +540,6 @@ notice and this notice are preserved. HOMEDRIVE and HOMEPATH environment variables (or the USERPROFILE environment variable if the others can't be used).

-

- Support is provided to locate OS/PLATFORM directories. A conf file - may provide the definitions below (with examples typical for - when GNUstep is installed according to the Linux - Filesystem Hierarchy standard): -

- - GNUSTEP_SYS_APPS - Place for system/os applications (eg. '/bin') - GNUSTEP_SYS_LIBS - Place for system/os shared libraries (eg. '/lib') - GNUSTEP_SYS_ADMIN - Place for system administration tools (eg. '/sbin') - GNUSTEP_PLATFORM_APPS - Place for non-gnustep applications (eg. '/usr/bin') - GNUSTEP_PLATFORM_LIBS - Place for application shared libraries - (eg. '/usr/lib') - GNUSTEP_PLATFORM_RESOURCES - Place for shared application resources - (eg. '/usr/share') - GNUSTEP_PLATFORM_ADMIN - Place for non-critical administrative tools - (eg. '/usr/sbin') - GNUSTEP_PLATFORM_LOCAL_APPS - Place for machine local applications - (eg. '/usr/local/bin') - GNUSTEP_PLATFORM_LOCAL_LIBS - Place for machine local shared libraries - (eg. '/usr/local/lib/') - GNUSTEP_PLATFORM_LOCAL_RESOURCES - Place for machine local resources. - (eg. '/usr/local/share') - -

- These add to the path for NSSystemDomainMask, or - NSLocalDomainMask as appropriate. -

All the above values from the configuration file are made available in the NSUserDefaults system at runtime, in the @@ -691,10 +653,6 @@ notice and this notice are preserved. are also ignored.

- User specific files are stored in the locaton given by - GNUSTEP_USER_DIR (by default, the - GNUstep subdirectory of the users home - directory).
The defaults database for a user is stored in the subdirectory of the users home directory given by GNUSTEP_USER_DEFAULTS_DIR (by default, the diff --git a/Headers/Additions/GNUstepBase/config.h.in b/Headers/Additions/GNUstepBase/config.h.in index acde4b6a7..25acc23bd 100644 --- a/Headers/Additions/GNUstepBase/config.h.in +++ b/Headers/Additions/GNUstepBase/config.h.in @@ -132,9 +132,6 @@ /* Built in default value for GNUstep user defaults directory */ #undef GNUSTEP_TARGET_USER_DEFAULTS_DIR -/* Built in default value for GNUstep user directory */ -#undef GNUSTEP_TARGET_USER_DIR - /* Built in default value for GNUstep user_dir admin apps */ #undef GNUSTEP_TARGET_USER_DIR_ADMIN_APPS diff --git a/Source/NSPathUtilities.m b/Source/NSPathUtilities.m index 1ba7bc0bd..607f136a4 100644 --- a/Source/NSPathUtilities.m +++ b/Source/NSPathUtilities.m @@ -142,7 +142,6 @@ static NSString *gnustep_is_flattened = static NSString *gnustepConfigPath = nil; -static NSString *gnustepUserDir = nil; static NSString *gnustepUserHome = nil; static NSString *gnustepUserDefaultsDir = nil; @@ -332,7 +331,6 @@ static void ExtractValuesFromConfig(NSDictionary *config) /* * Move values out of the dictionary and into variables for rapid reference. */ - ASSIGN_IF_SET(gnustepUserDir, c, @"GNUSTEP_USER_DIR"); ASSIGN_IF_SET(gnustepUserDefaultsDir, c, @"GNUSTEP_USER_DEFAULTS_DIR"); ASSIGN_PATH(gnustepMakefiles, c, @"GNUSTEP_MAKEFILES"); @@ -423,6 +421,7 @@ static void ExtractValuesFromConfig(NSDictionary *config) [c removeObjectForKey: @"GNUSTEP_LOCAL_ROOT"]; [c removeObjectForKey: @"GNUSTEP_SYSTEM_ROOT"]; [c removeObjectForKey: @"GNUSTEP_NETWORK_ROOT"]; + [c removeObjectForKey: @"GNUSTEP_USER_DIR"]; if ([c count] > 0) { @@ -437,10 +436,6 @@ static void ExtractValuesFromConfig(NSDictionary *config) /* * Set default locations for user files if necessary. */ - if (gnustepUserDir == nil) - { - ASSIGN(gnustepUserDir, @GNUSTEP_TARGET_USER_DIR); - } if (gnustepUserDefaultsDir == nil) { ASSIGN(gnustepUserDefaultsDir, @GNUSTEP_TARGET_USER_DEFAULTS_DIR); diff --git a/configure b/configure index 26a3e2c33..0fdc83ef4 100755 --- a/configure +++ b/configure @@ -2135,7 +2135,6 @@ case "$target_os" in GNUSTEP_SYSTEM_ROOT=/usr/GNUstep/System GNUSTEP_LOCAL_ROOT=/usr/GNUstep/Local GNUSTEP_NETWORK_ROOT=/usr/GNUstep/Local - GNUSTEP_USER_DIR=GNUstep GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf ;; @@ -2379,10 +2378,6 @@ echo "$as_me: We store the following filesystem layout into gnustep-base, to be echo $ECHO_N "checking for Makefiles directory... $ECHO_C" >&6; } { echo "$as_me:$LINENO: result: $GNUSTEP_MAKEFILES" >&5 echo "${ECHO_T}$GNUSTEP_MAKEFILES" >&6; } -{ echo "$as_me:$LINENO: checking for user directory" >&5 -echo $ECHO_N "checking for user directory... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $GNUSTEP_USER_DIR" >&5 -echo "${ECHO_T}$GNUSTEP_USER_DIR" >&6; } { echo "$as_me:$LINENO: checking for user defaults directory" >&5 echo $ECHO_N "checking for user defaults directory... $ECHO_C" >&6; } { echo "$as_me:$LINENO: result: $GNUSTEP_USER_DEFAULTS_DIR" >&5 @@ -2595,12 +2590,6 @@ cat >>confdefs.h <<_ACEOF #define GNUSTEP_TARGET_MAKEFILES "$GNUSTEP_MAKEFILES" _ACEOF -GNUSTEP_USER_DIR=`echo $GNUSTEP_USER_DIR|sed -e 's/\\\\/\\\\\\\\/g'` - -cat >>confdefs.h <<_ACEOF -#define GNUSTEP_TARGET_USER_DIR "$GNUSTEP_USER_DIR" -_ACEOF - GNUSTEP_USER_DEFAULTS_DIR=`echo $GNUSTEP_USER_DEFAULTS_DIR|sed -e 's/\\\\/\\\\\\\\/g'` cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 4993c75e3..fb3c4717f 100644 --- a/configure.ac +++ b/configure.ac @@ -190,7 +190,6 @@ case "$target_os" in GNUSTEP_SYSTEM_ROOT=/usr/GNUstep/System GNUSTEP_LOCAL_ROOT=/usr/GNUstep/Local GNUSTEP_NETWORK_ROOT=/usr/GNUstep/Local - GNUSTEP_USER_DIR=GNUstep GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf ;; @@ -422,8 +421,6 @@ esac AC_MSG_NOTICE([We store the following filesystem layout into gnustep-base, to be used when no config file is found]) AC_MSG_CHECKING([for Makefiles directory]) AC_MSG_RESULT($GNUSTEP_MAKEFILES) -AC_MSG_CHECKING([for user directory]) -AC_MSG_RESULT($GNUSTEP_USER_DIR) AC_MSG_CHECKING([for user defaults directory]) AC_MSG_RESULT($GNUSTEP_USER_DEFAULTS_DIR) AC_MSG_CHECKING([for user config file]) @@ -536,10 +533,6 @@ GNUSTEP_MAKEFILES=`echo $GNUSTEP_MAKEFILES|sed -e 's/\\\\/\\\\\\\\/g'` AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_MAKEFILES, "$GNUSTEP_MAKEFILES", [Built in default value for GNUstep Makefiles]) -GNUSTEP_USER_DIR=`echo $GNUSTEP_USER_DIR|sed -e 's/\\\\/\\\\\\\\/g'` -AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_USER_DIR, - "$GNUSTEP_USER_DIR", - [Built in default value for GNUstep user directory]) GNUSTEP_USER_DEFAULTS_DIR=`echo $GNUSTEP_USER_DEFAULTS_DIR|sed -e 's/\\\\/\\\\\\\\/g'` AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_USER_DEFAULTS_DIR, "$GNUSTEP_USER_DEFAULTS_DIR",