gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 16:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updates for the fact that GNUSTEP_USER_DIR is obsolete/ignored in current gnustep-make/gnustep-base

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@25941 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2008-01-14 10:39:21 +00:00
parent 5a9b3fcd87
commit cedc0cb3e4
6 changed files with 27 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

31
ChangeLog
View file

@ -1,3 +1,15 @@
2008-01-14 Nicola Pero <nicola.pero@meta-innovation.com>
* 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 <rfm@gnu.org> 2008-01-10 Richard Frith-Macdonald <rfm@gnu.org>
* Source/inet_pton.c: * Source/inet_pton.c:
@ -35,15 +47,15 @@
2008-01-07 Richard Frith-Macdonald <rfm@gnu.org> 2008-01-07 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSSocketStream.h: simplify socket address handling * Source/GSSocketStream.h: simplify socket address handling
* Source/GSSocketStream.m: ditto + more work on socks * Source/GSSocketStream.m: ditto + more work on socks
* Source/GSStream.h: minor tweaks * Source/GSStream.h: minor tweaks
* Source/GSStream.m:minor tweaks * Source/GSStream.m:minor tweaks
* Source/unix/NSStream.m: simplified socket address handling * Source/unix/NSStream.m: simplified socket address handling
* Source/GSNetwork.h: add macro to get socket address length * Source/GSNetwork.h: add macro to get socket address length
* Source/GSHTTPAuthentication.m: Handle arg classh check in init * Source/GSHTTPAuthentication.m: Handle arg classh check in init
* Source/NSURLRequest.m: ditto * Source/NSURLRequest.m: ditto
* Source/NSURLProtocol.m: attempt to add support for authentication * Source/NSURLProtocol.m: attempt to add support for authentication
2008-01-07 Fred Kiefer <FredKiefer@gmx.de> 2008-01-07 Fred Kiefer <FredKiefer@gmx.de>
@ -69,6 +81,7 @@
* Source/GSSocketStream.m: Fix missing isfeds * Source/GSSocketStream.m: Fix missing isfeds
2008-01-04 Riccardo Mottola <riccardo@kaffe.org> 2008-01-04 Riccardo Mottola <riccardo@kaffe.org>
* Source/NSKeyValueObserving.m: fixed cc99ism * Source/NSKeyValueObserving.m: fixed cc99ism
2008-01-04 Richard Frith-Macdonald <rfm@gnu.org> 2008-01-04 Richard Frith-Macdonald <rfm@gnu.org>

50
Documentation/Base.gsdoc
View file

@ -487,13 +487,13 @@ notice and this notice are preserved.
<deflist> <deflist>
<term>GNUSTEP_SYSTEM_ROOT</term> <term>GNUSTEP_SYSTEM_ROOT</term>
<desc> <desc>
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 system libraries, tools, applications, headers, resources
in general are located relative to this. in general are located relative to this.
</desc> </desc>
<term>GNUSTEP_NETWORK_ROOT</term> <term>GNUSTEP_NETWORK_ROOT</term>
<desc> <desc>
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 (non-system) resources that are intended to be shared
across a local network. Typically this is an NFS exported across a local network. Typically this is an NFS exported
directory shared by many machines. It provides an directory shared by many machines. It provides an
@ -502,7 +502,7 @@ notice and this notice are preserved.
</desc> </desc>
<term>GNUSTEP_LOCAL_ROOT</term> <term>GNUSTEP_LOCAL_ROOT</term>
<desc> <desc>
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 (non-system) resources. Typically all locally produced
or contributed software is installed relative to this. or contributed software is installed relative to this.
</desc> </desc>
@ -512,7 +512,7 @@ notice and this notice are preserved.
</p> </p>
<deflist> <deflist>
<term>GNUSTEP_USER_DIR</term> <term>GNUSTEP_USER_DIR</term>
<desc>Path for user specific GNUstep resources (eg. 'GNUstep'). <desc>Obsolete. Path for user specific GNUstep resources (eg. 'GNUstep').
Relative to the user's home directory. Relative to the user's home directory.
</desc> </desc>
<term>GNUSTEP_USER_CONFIG_FILE</term> <term>GNUSTEP_USER_CONFIG_FILE</term>
@ -540,44 +540,6 @@ notice and this notice are preserved.
HOMEDRIVE and HOMEPATH environment variables (or the USERPROFILE HOMEDRIVE and HOMEPATH environment variables (or the USERPROFILE
environment variable if the others can't be used). environment variable if the others can't be used).
</p> </p>
<p>
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):
</p>
<deflist>
<term>GNUSTEP_SYS_APPS</term>
<desc>Place for system/os applications (eg. '/bin')</desc>
<term>GNUSTEP_SYS_LIBS</term>
<desc>Place for system/os shared libraries (eg. '/lib')</desc>
<term>GNUSTEP_SYS_ADMIN</term>
<desc>Place for system administration tools (eg. '/sbin')</desc>
<term>GNUSTEP_PLATFORM_APPS</term>
<desc>Place for non-gnustep applications (eg. '/usr/bin')</desc>
<term>GNUSTEP_PLATFORM_LIBS</term>
<desc>Place for application shared libraries
(eg. '/usr/lib')</desc>
<term>GNUSTEP_PLATFORM_RESOURCES</term>
<desc>Place for shared application resources
(eg. '/usr/share')</desc>
<term>GNUSTEP_PLATFORM_ADMIN</term>
<desc>Place for non-critical administrative tools
(eg. '/usr/sbin')</desc>
<term>GNUSTEP_PLATFORM_LOCAL_APPS</term>
<desc>Place for machine local applications
(eg. '/usr/local/bin')</desc>
<term>GNUSTEP_PLATFORM_LOCAL_LIBS</term>
<desc>Place for machine local shared libraries
(eg. '/usr/local/lib/')</desc>
<term>GNUSTEP_PLATFORM_LOCAL_RESOURCES</term>
<desc>Place for machine local resources.
(eg. '/usr/local/share')</desc>
</deflist>
<p>
These add to the path for NSSystemDomainMask, or
NSLocalDomainMask as appropriate.
</p>
<p> <p>
All the above values from the configuration file are made All the above values from the configuration file are made
available in the NSUserDefaults system at runtime, in the available in the NSUserDefaults system at runtime, in the
@ -691,10 +653,6 @@ notice and this notice are preserved.
are also ignored. are also ignored.
</p> </p>
<p> <p>
User specific files are stored in the locaton given by
GNUSTEP_USER_DIR (by default, the
<code>GNUstep</code> subdirectory of the users home
directory).<br />
The defaults database for a user is stored in the The defaults database for a user is stored in the
subdirectory of the users home directory given by subdirectory of the users home directory given by
GNUSTEP_USER_DEFAULTS_DIR (by default, the GNUSTEP_USER_DEFAULTS_DIR (by default, the

3
Headers/Additions/GNUstepBase/config.h.in
View file

@ -132,9 +132,6 @@
/* Built in default value for GNUstep user defaults directory */ /* Built in default value for GNUstep user defaults directory */
#undef GNUSTEP_TARGET_USER_DEFAULTS_DIR #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 */ /* Built in default value for GNUstep user_dir admin apps */
#undef GNUSTEP_TARGET_USER_DIR_ADMIN_APPS #undef GNUSTEP_TARGET_USER_DIR_ADMIN_APPS

7
Source/NSPathUtilities.m
View file

@ -142,7 +142,6 @@ static NSString *gnustep_is_flattened =
static NSString *gnustepConfigPath = nil; static NSString *gnustepConfigPath = nil;
static NSString *gnustepUserDir = nil;
static NSString *gnustepUserHome = nil; static NSString *gnustepUserHome = nil;
static NSString *gnustepUserDefaultsDir = 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. * 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_IF_SET(gnustepUserDefaultsDir, c, @"GNUSTEP_USER_DEFAULTS_DIR");
ASSIGN_PATH(gnustepMakefiles, c, @"GNUSTEP_MAKEFILES"); ASSIGN_PATH(gnustepMakefiles, c, @"GNUSTEP_MAKEFILES");
@ -423,6 +421,7 @@ static void ExtractValuesFromConfig(NSDictionary *config)
[c removeObjectForKey: @"GNUSTEP_LOCAL_ROOT"]; [c removeObjectForKey: @"GNUSTEP_LOCAL_ROOT"];
[c removeObjectForKey: @"GNUSTEP_SYSTEM_ROOT"]; [c removeObjectForKey: @"GNUSTEP_SYSTEM_ROOT"];
[c removeObjectForKey: @"GNUSTEP_NETWORK_ROOT"]; [c removeObjectForKey: @"GNUSTEP_NETWORK_ROOT"];
[c removeObjectForKey: @"GNUSTEP_USER_DIR"];
if ([c count] > 0) if ([c count] > 0)
{ {
@ -437,10 +436,6 @@ static void ExtractValuesFromConfig(NSDictionary *config)
/* /*
* Set default locations for user files if necessary. * Set default locations for user files if necessary.
*/ */
if (gnustepUserDir == nil)
{
ASSIGN(gnustepUserDir, @GNUSTEP_TARGET_USER_DIR);
}
if (gnustepUserDefaultsDir == nil) if (gnustepUserDefaultsDir == nil)
{ {
ASSIGN(gnustepUserDefaultsDir, @GNUSTEP_TARGET_USER_DEFAULTS_DIR); ASSIGN(gnustepUserDefaultsDir, @GNUSTEP_TARGET_USER_DEFAULTS_DIR);

11
configure vendored
View file

@ -2135,7 +2135,6 @@ case "$target_os" in
GNUSTEP_SYSTEM_ROOT=/usr/GNUstep/System GNUSTEP_SYSTEM_ROOT=/usr/GNUstep/System
GNUSTEP_LOCAL_ROOT=/usr/GNUstep/Local GNUSTEP_LOCAL_ROOT=/usr/GNUstep/Local
GNUSTEP_NETWORK_ROOT=/usr/GNUstep/Local GNUSTEP_NETWORK_ROOT=/usr/GNUstep/Local
GNUSTEP_USER_DIR=GNUstep
GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf 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 $ECHO_N "checking for Makefiles directory... $ECHO_C" >&6; }
{ echo "$as_me:$LINENO: result: $GNUSTEP_MAKEFILES" >&5 { echo "$as_me:$LINENO: result: $GNUSTEP_MAKEFILES" >&5
echo "${ECHO_T}$GNUSTEP_MAKEFILES" >&6; } 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 "$as_me:$LINENO: checking for user defaults directory" >&5
echo $ECHO_N "checking for user defaults directory... $ECHO_C" >&6; } echo $ECHO_N "checking for user defaults directory... $ECHO_C" >&6; }
{ echo "$as_me:$LINENO: result: $GNUSTEP_USER_DEFAULTS_DIR" >&5 { echo "$as_me:$LINENO: result: $GNUSTEP_USER_DEFAULTS_DIR" >&5
@ -2595,12 +2590,6 @@ cat >>confdefs.h <<_ACEOF
#define GNUSTEP_TARGET_MAKEFILES "$GNUSTEP_MAKEFILES" #define GNUSTEP_TARGET_MAKEFILES "$GNUSTEP_MAKEFILES"
_ACEOF _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'` GNUSTEP_USER_DEFAULTS_DIR=`echo $GNUSTEP_USER_DEFAULTS_DIR|sed -e 's/\\\\/\\\\\\\\/g'`
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF

7
configure.ac
View file

@ -190,7 +190,6 @@ case "$target_os" in
GNUSTEP_SYSTEM_ROOT=/usr/GNUstep/System GNUSTEP_SYSTEM_ROOT=/usr/GNUstep/System
GNUSTEP_LOCAL_ROOT=/usr/GNUstep/Local GNUSTEP_LOCAL_ROOT=/usr/GNUstep/Local
GNUSTEP_NETWORK_ROOT=/usr/GNUstep/Local GNUSTEP_NETWORK_ROOT=/usr/GNUstep/Local
GNUSTEP_USER_DIR=GNUstep
GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf 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_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_CHECKING([for Makefiles directory])
AC_MSG_RESULT($GNUSTEP_MAKEFILES) 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_CHECKING([for user defaults directory])
AC_MSG_RESULT($GNUSTEP_USER_DEFAULTS_DIR) AC_MSG_RESULT($GNUSTEP_USER_DEFAULTS_DIR)
AC_MSG_CHECKING([for user config file]) 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, AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_MAKEFILES,
"$GNUSTEP_MAKEFILES", "$GNUSTEP_MAKEFILES",
[Built in default value for 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'` GNUSTEP_USER_DEFAULTS_DIR=`echo $GNUSTEP_USER_DEFAULTS_DIR|sed -e 's/\\\\/\\\\\\\\/g'`
AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_USER_DEFAULTS_DIR, AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_USER_DEFAULTS_DIR,
"$GNUSTEP_USER_DEFAULTS_DIR", "$GNUSTEP_USER_DEFAULTS_DIR",