mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
More filesystem support updates
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24567 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
d034cb1d6b
commit
34fed13a63
5 changed files with 69 additions and 86 deletions
12
ChangeLog
12
ChangeLog
|
|
@ -1,3 +1,15 @@
|
|||
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* configure.ac (GNUSTEP_USER_DIR_LIBRARIES): Fixed definition.
|
||||
Use GNUSTEP_SYSTEM_HEADERS and GNUSTEP_SYSTEM_LIBRARIES rather
|
||||
than GNUSTEP_SYSTEM_ROOT/Library/Headers and
|
||||
GNUSTEP_SYSTEM_ROOT/Library/Libraries.
|
||||
* configure: Regenerated.
|
||||
|
||||
* ld_lib_path.sh: Removed the optional argument.
|
||||
Updated to new filesystem support.
|
||||
* ld_lib_path.csh: Same changes.
|
||||
|
||||
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* common.make (LD_LIB_PATH_SCRIPT): Unused variable removed.
|
||||
|
|
|
|||
18
configure
vendored
18
configure
vendored
|
|
@ -3825,7 +3825,7 @@ if test x"$GNUSTEP_USER_DIR_HEADERS" = x""; then
|
|||
fi
|
||||
fi
|
||||
if test x"$GNUSTEP_USER_DIR_LIBRARIES" = x""; then
|
||||
GNUSTEP_USER_DIR_LIBRARIES="$GNUSTEP_USER_DIR/Libraries/"
|
||||
GNUSTEP_USER_DIR_LIBRARIES="$GNUSTEP_USER_DIR_LIBRARY/Libraries/"
|
||||
fi
|
||||
if test x"$GNUSTEP_USER_DIR_DOCUMENTATION" = x""; then
|
||||
GNUSTEP_USER_DIR_DOCUMENTATION="$GNUSTEP_USER_DIR/Documentation"
|
||||
|
|
@ -3908,16 +3908,16 @@ fi
|
|||
# Miscellaneous flags and setup
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
# Set location of GNUstep dirs for later use
|
||||
# Set location of System GNUstep dirs for later use
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS"
|
||||
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_ROOT/Library/Libraries"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES"
|
||||
else
|
||||
clean_target_os=`$srcdir/clean_os.sh $target_os`
|
||||
clean_target_cpu=`$srcdir/clean_cpu.sh $target_cpu`
|
||||
obj_dir="$clean_target_cpu/$clean_target_os"
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$obj_dir"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_ROOT/Library/Headers/${ac_cv_library_combo}"
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir"
|
||||
fi
|
||||
|
||||
# Check to see if the libobjc library is in our GNUSTEP_SYSTEM_ROOT.
|
||||
|
|
@ -3948,11 +3948,7 @@ echo "${ECHO_T}$gs_cv_objc_libdir" >&6
|
|||
|
||||
# The following are needed to compile the test programs
|
||||
if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
else
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$GNUSTEP_SYSTEM_ROOT/Library/Headers/${ac_cv_library_combo}"
|
||||
fi
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$GNUSTEP_SYSTEM_HEADERS"
|
||||
OBJC_LDFLAGS="$LDFLAGS $LIB_DIR -L$gs_cv_objc_libdir"
|
||||
fi
|
||||
|
||||
|
|
|
|||
18
configure.ac
18
configure.ac
|
|
@ -748,7 +748,7 @@ if test x"$GNUSTEP_USER_DIR_HEADERS" = x""; then
|
|||
fi
|
||||
fi
|
||||
if test x"$GNUSTEP_USER_DIR_LIBRARIES" = x""; then
|
||||
GNUSTEP_USER_DIR_LIBRARIES="$GNUSTEP_USER_DIR/Libraries/"
|
||||
GNUSTEP_USER_DIR_LIBRARIES="$GNUSTEP_USER_DIR_LIBRARY/Libraries/"
|
||||
fi
|
||||
if test x"$GNUSTEP_USER_DIR_DOCUMENTATION" = x""; then
|
||||
GNUSTEP_USER_DIR_DOCUMENTATION="$GNUSTEP_USER_DIR/Documentation"
|
||||
|
|
@ -836,16 +836,16 @@ AC_SUBST(BACKEND_BUNDLE)
|
|||
# Miscellaneous flags and setup
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
# Set location of GNUstep dirs for later use
|
||||
# Set location of System GNUstep dirs for later use
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS"
|
||||
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_ROOT/Library/Libraries"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES"
|
||||
else
|
||||
clean_target_os=`$srcdir/clean_os.sh $target_os`
|
||||
clean_target_cpu=`$srcdir/clean_cpu.sh $target_cpu`
|
||||
obj_dir="$clean_target_cpu/$clean_target_os"
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$obj_dir"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_ROOT/Library/Headers/${ac_cv_library_combo}"
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir"
|
||||
fi
|
||||
|
||||
# Check to see if the libobjc library is in our GNUSTEP_SYSTEM_ROOT.
|
||||
|
|
@ -871,11 +871,7 @@ AC_MSG_RESULT($gs_cv_objc_libdir)
|
|||
|
||||
# The following are needed to compile the test programs
|
||||
if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
else
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$GNUSTEP_SYSTEM_ROOT/Library/Headers/${ac_cv_library_combo}"
|
||||
fi
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$GNUSTEP_SYSTEM_HEADERS"
|
||||
OBJC_LDFLAGS="$LDFLAGS $LIB_DIR -L$gs_cv_objc_libdir"
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -4,10 +4,11 @@
|
|||
#
|
||||
# Set up the LD_LIBRARY_PATH (or similar env variable for your system)
|
||||
#
|
||||
# Copyright (C) 1998 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1998-2007 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: Scott Christley <scottc@net-community.com>
|
||||
# Author: Ovidiu Predescu <ovidiu@net-community.com>
|
||||
# Author: Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
#
|
||||
# This file is part of the GNUstep Makefile Package.
|
||||
#
|
||||
|
|
@ -22,30 +23,17 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
|
||||
# The first (and only) parameter to this script is the canonical
|
||||
# operating system name.
|
||||
|
||||
if ( "$GNUSTEP_IS_FLATTENED" == "no" ) then
|
||||
set last_path_part="Library/Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}"
|
||||
set tool_path_part="Library/Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}"
|
||||
if ( "$GNUSTEP_IS_FLATTENED" == "yes" ) then
|
||||
set lib_paths=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_LIBRARIES" "$GNUSTEP_LOCAL_LIBRARIES" "$GNUSTEP_NETWORK_LIBRARIES" "$GNUSTEP_SYSTEM_LIBRARIES" $fixup_paths`
|
||||
else
|
||||
set last_path_part="Library/Libraries"
|
||||
set tool_path_part="Library/Libraries"
|
||||
set lib_paths=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_LIBRARIES/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO" "$GNUSTEP_USER_LIBRARIES/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS" "$GNUSTEP_LOCAL_LIBRARIES/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO" "$GNUSTEP_LOCAL_LIBRARIES/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS" $fixup_paths`
|
||||
|
||||
set lib_paths="$lib_paths":`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_NETWORK_LIBRARIES/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO" "$GNUSTEP_NETWORK_LIBRARIES/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS" "$GNUSTEP_SYSTEM_LIBRARIES/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO" "$GNUSTEP_SYSTEM_LIBRARIES/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS" $fixup_paths`:
|
||||
endif
|
||||
|
||||
set host_os=${GNUSTEP_HOST_OS}
|
||||
set fw_paths=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_LIBRARY/Frameworks" "$GNUSTEP_LOCAL_LIBRARY/Frameworks" "$GNUSTEP_NETWORK_LIBRARY/Frameworks" "$GNUSTEP_SYSTEM_LIBRARY/Frameworks" $fixup_paths`
|
||||
|
||||
if ( "${host_os}" == "" ) then
|
||||
set host_os=${1}
|
||||
endif
|
||||
|
||||
set lib_paths="${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
|
||||
|
||||
set last_path_part="Library/Frameworks"
|
||||
|
||||
set fw_paths="${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}"
|
||||
|
||||
switch ( "${host_os}" )
|
||||
switch ( "${GNUSTEP_HOST_OS}" )
|
||||
|
||||
case *nextstep4* :
|
||||
if ( $?DYLD_LIBRARY_PATH == 0 ) then
|
||||
|
|
|
|||
|
|
@ -24,62 +24,54 @@
|
|||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
|
||||
#
|
||||
# FIXME/TODO: Update this for the new filesystem support
|
||||
#
|
||||
# The modern version of this file basically expects you to execute it
|
||||
# inside GNUstep.sh. If not, you need to have at least the
|
||||
# GNUSTEP_MAKEFILES, GNUSTEP_HOST_*, GNUSTEP_SYSTEM_LIBRARIES,
|
||||
# GNUSTEP_LOCAL_LIBRARIES, etc. GNUSTEP_SYSTEM_LIBRARY,
|
||||
# GNUSTEP_LOCAL_LIBRARY, etc. variables defined.
|
||||
|
||||
# FIXME/TODO: Update all callers to source GNUstep.sh and not this file.
|
||||
|
||||
# This file is sourced. This means extra care is needed when changing
|
||||
# it. Please read the comments on GNUstep.sh.in before touching it.
|
||||
|
||||
# The first (and only) parameter to this script is the canonical
|
||||
# operating system name.
|
||||
|
||||
host_os=$GNUSTEP_HOST_OS
|
||||
|
||||
if [ -z "$host_os" ]; then
|
||||
host_os=$1
|
||||
fi
|
||||
|
||||
|
||||
old_IFS="$IFS"
|
||||
IFS=:
|
||||
lib_paths=
|
||||
fw_paths=
|
||||
for dir in $GNUSTEP_PATHLIST; do
|
||||
|
||||
# prepare the path_fragment for libraries and this dir
|
||||
if [ "$GNUSTEP_IS_FLATTENED" = "no" ]; then
|
||||
path_fragment="$dir/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO:$dir/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS"
|
||||
else
|
||||
path_fragment="$dir/Library/Libraries"
|
||||
fi
|
||||
# Determine the library paths
|
||||
GNUSTEP_LIBRARIES_PATHLIST=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_LIBRARIES" "$GNUSTEP_LOCAL_LIBRARIES" "$GNUSTEP_NETWORK_LIBRARIES" "$GNUSTEP_SYSTEM_LIBRARIES" $fixup_paths`
|
||||
|
||||
# Append the path_fragment to lib_paths
|
||||
if [ -z "$lib_paths" ]; then
|
||||
lib_paths="$path_fragment"
|
||||
else
|
||||
lib_paths="$lib_paths:$path_fragment"
|
||||
fi
|
||||
if [ "$GNUSTEP_IS_FLATTENED" = "yes" ]; then
|
||||
lib_paths="$GNUSTEP_LIBRARIES_PATHLIST"
|
||||
else
|
||||
old_IFS="$IFS"
|
||||
IFS=:
|
||||
for dir in $GNUSTEP_LIBRARIES_PATHLIST; do
|
||||
|
||||
# prepare the path_fragment for frameworks and this dir
|
||||
path_fragment="$dir/Library/Frameworks"
|
||||
# prepare the path_fragment for libraries and this dir
|
||||
path_fragment="$dir/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO:$dir/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS"
|
||||
|
||||
# Append the path_fragment to fw_paths
|
||||
if [ -z "$fw_paths" ]; then
|
||||
fw_paths="$path_fragment"
|
||||
else
|
||||
fw_paths="$fw_paths:$path_fragment"
|
||||
fi
|
||||
# Append the path_fragment to lib_paths
|
||||
if [ -z "$lib_paths" ]; then
|
||||
lib_paths="$path_fragment"
|
||||
else
|
||||
lib_paths="$lib_paths:$path_fragment"
|
||||
fi
|
||||
|
||||
unset path_fragment
|
||||
unset path_fragment
|
||||
done
|
||||
IFS="$old_IFS"
|
||||
unset old_IFS
|
||||
unset dir
|
||||
fi
|
||||
|
||||
done
|
||||
IFS="$old_IFS"
|
||||
unset old_IFS
|
||||
unset dir
|
||||
unset GNUSTEP_LIBRARIES_PATHLIST
|
||||
|
||||
# Determine the framework paths
|
||||
fw_paths=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_LIBRARY/Frameworks" "$GNUSTEP_LOCAL_LIBRARY/Frameworks" "$GNUSTEP_NETWORK_LIBRARY/Frameworks" "$GNUSTEP_SYSTEM_LIBRARY/Frameworks" $fixup_paths`
|
||||
|
||||
|
||||
case "$host_os" in
|
||||
case "$GNUSTEP_HOST_OS" in
|
||||
|
||||
*nextstep4*)
|
||||
if [ -z "$DYLD_LIBRARY_PATH" ]; then
|
||||
|
|
@ -163,7 +155,6 @@ case "$host_os" in
|
|||
|
||||
esac
|
||||
|
||||
unset host_os
|
||||
unset lib_paths
|
||||
unset fw_paths
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue