mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 00:41:02 +00:00
MinGW updates to paths ... complicated stuff
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24720 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
4c6d361454
commit
73c22c6b13
3 changed files with 113 additions and 36 deletions
10
ChangeLog
10
ChangeLog
|
|
@ -1,3 +1,13 @@
|
|||
2007-02-28 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* configure.ac: If no config file to import is specified, then
|
||||
load the gnustep-make one in preference to the runtime config
|
||||
file, which might be a relative path such as ./GNUstep.conf. On
|
||||
mingw, do not set just GNUSTEP_xxx_ROOT and similar variables to
|
||||
relative paths, but set all of the GNUSTEP_xxx_yyy variables by
|
||||
computing relative paths using gnustep-make's scripts.
|
||||
* configure: Regenerated.
|
||||
|
||||
2007-02-28 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/NSObject.m: Update suggested by Larry Campbell to use 32
|
||||
|
|
|
|||
68
configure
vendored
68
configure
vendored
|
|
@ -1595,23 +1595,7 @@ fi
|
|||
#
|
||||
# Set 'standard' defaults for values from configuration file.
|
||||
#
|
||||
# On mingw, we assume paths relative to the location of the base library -
|
||||
# Normally that DLL is stored in the Tools directory of the System domain,
|
||||
# so we assume a standard layout relative to that. For standalone deployment
|
||||
# you may want everything in the same directory, in which case the paths for
|
||||
# the domains relative to the DLL need to be modified.
|
||||
#
|
||||
# On unix we assume a standard layout for both development and distribution.
|
||||
#
|
||||
case "$target_os" in
|
||||
mingw*)
|
||||
GNUSTEP_SYSTEM_ROOT=./..\\..\\System
|
||||
GNUSTEP_LOCAL_ROOT=./..\\..\\Local
|
||||
GNUSTEP_NETWORK_ROOT=./..\\..\\Local
|
||||
GNUSTEP_USER_DIR=GNUstep
|
||||
GNUSTEP_USER_DEFAULTS_DIR=GNUstep\\Defaults
|
||||
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
|
||||
;;
|
||||
*)
|
||||
GNUSTEP_SYSTEM_ROOT=/usr/GNUstep/System
|
||||
GNUSTEP_LOCAL_ROOT=/usr/GNUstep/Local
|
||||
|
|
@ -1667,8 +1651,8 @@ fi;
|
|||
GNUSTEP_DEFAULT_CONFIG="$result"
|
||||
fi
|
||||
if test "$GNUSTEP_DEFAULT_CONFIG" = ""; then
|
||||
if test -f "$GNUSTEP_CONFIG_FILE"; then
|
||||
GNUSTEP_DEFAULT_CONFIG="$GNUSTEP_CONFIG_FILE"
|
||||
if test -f "$GNUSTEP_MAKE_CONFIG"; then
|
||||
GNUSTEP_DEFAULT_CONFIG="$GNUSTEP_MAKE_CONFIG"
|
||||
fi
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_DEFAULT_CONFIG" >&5
|
||||
|
|
@ -1751,6 +1735,54 @@ if test x"$GNUSTEP_USER_DIR_DOC" = x""; then GNUSTEP_USER_DIR_DOC=$GNUSTEP_USER_
|
|||
if test x"$GNUSTEP_USER_DIR_DOC_MAN" = x""; then GNUSTEP_USER_DIR_DOC_MAN=$GNUSTEP_USER_DIR/Documentation/man; fi
|
||||
if test x"$GNUSTEP_USER_DIR_DOC_INFO" = x""; then GNUSTEP_USER_DIR_DOC_INFO=$GNUSTEP_USER_DIR/Documentation/info; fi
|
||||
|
||||
#
|
||||
# If we are on mingw, we now want to convert the paths to relative
|
||||
# paths (relative to libgnustep-base.dll).
|
||||
#
|
||||
# FIXME: To do it properly, we ought to allow the user to configure
|
||||
# the installation domain at configure time! This assumes we always
|
||||
# install into System.
|
||||
#
|
||||
case "$target_os" in
|
||||
mingw*)
|
||||
GNUSTEP_BASE_PATH="$GNUSTEP_SYSTEM_TOOLS"
|
||||
GNUSTEP_SYSTEM_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_APPS`
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_ADMIN_APPS`
|
||||
GNUSTEP_SYSTEM_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_TOOLS`
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_ADMIN_TOOLS`
|
||||
GNUSTEP_SYSTEM_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_LIBRARY`
|
||||
GNUSTEP_SYSTEM_LIBRARIES=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_LIBRARIES`
|
||||
GNUSTEP_SYSTEM_HEADERS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_HEADERS`
|
||||
GNUSTEP_SYSTEM_DOC=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_DOC`
|
||||
GNUSTEP_SYSTEM_DOC_MAN=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_DOC_MAN`
|
||||
GNUSTEP_SYSTEM_DOC_INFO=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_DOC_INFO`
|
||||
|
||||
GNUSTEP_NETWORK_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_APPS`
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_ADMIN_APPS`
|
||||
GNUSTEP_NETWORK_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_TOOLS`
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_ADMIN_TOOLS`
|
||||
GNUSTEP_NETWORK_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_LIBRARY`
|
||||
GNUSTEP_NETWORK_LIBRARIES=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_LIBRARIES`
|
||||
GNUSTEP_NETWORK_HEADERS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_HEADERS`
|
||||
GNUSTEP_NETWORK_DOC=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_DOC`
|
||||
GNUSTEP_NETWORK_DOC_MAN=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_DOC_MAN`
|
||||
GNUSTEP_NETWORK_DOC_INFO=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_DOC_INFO`
|
||||
|
||||
GNUSTEP_LOCAL_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_APPS`
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_ADMIN_APPS`
|
||||
GNUSTEP_LOCAL_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_TOOLS`
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_ADMIN_TOOLS`
|
||||
GNUSTEP_LOCAL_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_LIBRARY`
|
||||
GNUSTEP_LOCAL_LIBRARIES=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_LIBRARIES`
|
||||
GNUSTEP_LOCAL_HEADERS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_HEADERS`
|
||||
GNUSTEP_LOCAL_DOC=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_DOC`
|
||||
GNUSTEP_LOCAL_DOC_MAN=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_DOC_MAN`
|
||||
GNUSTEP_LOCAL_DOC_INFO=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_DOC_INFO`
|
||||
# It would be nice to now store this stuff into a ./GNUstep.conf file
|
||||
# installed with gnustep-base.dll. This would clarify.
|
||||
;;
|
||||
esac
|
||||
|
||||
#
|
||||
# Set the default configuration file values in config.h to be hard-coded
|
||||
# into NSPathUtilities.m
|
||||
|
|
|
|||
71
configure.ac
71
configure.ac
|
|
@ -169,23 +169,7 @@ fi
|
|||
#
|
||||
# Set 'standard' defaults for values from configuration file.
|
||||
#
|
||||
# On mingw, we assume paths relative to the location of the base library -
|
||||
# Normally that DLL is stored in the Tools directory of the System domain,
|
||||
# so we assume a standard layout relative to that. For standalone deployment
|
||||
# you may want everything in the same directory, in which case the paths for
|
||||
# the domains relative to the DLL need to be modified.
|
||||
#
|
||||
# On unix we assume a standard layout for both development and distribution.
|
||||
#
|
||||
case "$target_os" in
|
||||
mingw*)
|
||||
GNUSTEP_SYSTEM_ROOT=./..\\..\\System
|
||||
GNUSTEP_LOCAL_ROOT=./..\\..\\Local
|
||||
GNUSTEP_NETWORK_ROOT=./..\\..\\Local
|
||||
GNUSTEP_USER_DIR=GNUstep
|
||||
GNUSTEP_USER_DEFAULTS_DIR=GNUstep\\Defaults
|
||||
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
|
||||
;;
|
||||
*)
|
||||
GNUSTEP_SYSTEM_ROOT=/usr/GNUstep/System
|
||||
GNUSTEP_LOCAL_ROOT=/usr/GNUstep/Local
|
||||
|
|
@ -238,8 +222,11 @@ then
|
|||
GNUSTEP_DEFAULT_CONFIG="$result"
|
||||
fi
|
||||
if test "$GNUSTEP_DEFAULT_CONFIG" = ""; then
|
||||
if test -f "$GNUSTEP_CONFIG_FILE"; then
|
||||
GNUSTEP_DEFAULT_CONFIG="$GNUSTEP_CONFIG_FILE"
|
||||
# Try the gnustep-make config file first. On MinGW this means
|
||||
# we import the gnustep-make paths instead of paths from the non-existing
|
||||
# ./GNUstep.conf file.
|
||||
if test -f "$GNUSTEP_MAKE_CONFIG"; then
|
||||
GNUSTEP_DEFAULT_CONFIG="$GNUSTEP_MAKE_CONFIG"
|
||||
fi
|
||||
fi
|
||||
AC_MSG_RESULT($GNUSTEP_DEFAULT_CONFIG)
|
||||
|
|
@ -317,6 +304,54 @@ if test x"$GNUSTEP_USER_DIR_DOC" = x""; then GNUSTEP_USER_DIR_DOC=$GNUSTEP_USER_
|
|||
if test x"$GNUSTEP_USER_DIR_DOC_MAN" = x""; then GNUSTEP_USER_DIR_DOC_MAN=$GNUSTEP_USER_DIR/Documentation/man; fi
|
||||
if test x"$GNUSTEP_USER_DIR_DOC_INFO" = x""; then GNUSTEP_USER_DIR_DOC_INFO=$GNUSTEP_USER_DIR/Documentation/info; fi
|
||||
|
||||
#
|
||||
# If we are on mingw, we now want to convert the paths to relative
|
||||
# paths (relative to libgnustep-base.dll).
|
||||
#
|
||||
# FIXME: To do it properly, we ought to allow the user to configure
|
||||
# the installation domain at configure time! This assumes we always
|
||||
# install into System.
|
||||
#
|
||||
case "$target_os" in
|
||||
mingw*)
|
||||
GNUSTEP_BASE_PATH="$GNUSTEP_SYSTEM_TOOLS"
|
||||
GNUSTEP_SYSTEM_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_APPS`
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_ADMIN_APPS`
|
||||
GNUSTEP_SYSTEM_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_TOOLS`
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_ADMIN_TOOLS`
|
||||
GNUSTEP_SYSTEM_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_LIBRARY`
|
||||
GNUSTEP_SYSTEM_LIBRARIES=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_LIBRARIES`
|
||||
GNUSTEP_SYSTEM_HEADERS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_HEADERS`
|
||||
GNUSTEP_SYSTEM_DOC=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_DOC`
|
||||
GNUSTEP_SYSTEM_DOC_MAN=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_DOC_MAN`
|
||||
GNUSTEP_SYSTEM_DOC_INFO=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_DOC_INFO`
|
||||
|
||||
GNUSTEP_NETWORK_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_APPS`
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_ADMIN_APPS`
|
||||
GNUSTEP_NETWORK_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_TOOLS`
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_ADMIN_TOOLS`
|
||||
GNUSTEP_NETWORK_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_LIBRARY`
|
||||
GNUSTEP_NETWORK_LIBRARIES=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_LIBRARIES`
|
||||
GNUSTEP_NETWORK_HEADERS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_HEADERS`
|
||||
GNUSTEP_NETWORK_DOC=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_DOC`
|
||||
GNUSTEP_NETWORK_DOC_MAN=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_DOC_MAN`
|
||||
GNUSTEP_NETWORK_DOC_INFO=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_DOC_INFO`
|
||||
|
||||
GNUSTEP_LOCAL_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_APPS`
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_ADMIN_APPS`
|
||||
GNUSTEP_LOCAL_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_TOOLS`
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_ADMIN_TOOLS`
|
||||
GNUSTEP_LOCAL_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_LIBRARY`
|
||||
GNUSTEP_LOCAL_LIBRARIES=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_LIBRARIES`
|
||||
GNUSTEP_LOCAL_HEADERS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_HEADERS`
|
||||
GNUSTEP_LOCAL_DOC=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_DOC`
|
||||
GNUSTEP_LOCAL_DOC_MAN=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_DOC_MAN`
|
||||
GNUSTEP_LOCAL_DOC_INFO=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_DOC_INFO`
|
||||
# It would be nice to now store this stuff into a ./GNUstep.conf file
|
||||
# installed with gnustep-base.dll. This would clarify.
|
||||
;;
|
||||
esac
|
||||
|
||||
#
|
||||
# Set the default configuration file values in config.h to be hard-coded
|
||||
# into NSPathUtilities.m
|
||||
|
|
|
|||
Loading…
Reference in a new issue