mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Change GNUSTEP_PATHPREFIX_LIST to GNUSTEP_PATHLIST
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13917 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
96091f1587
commit
ee4d81520c
12 changed files with 47 additions and 33 deletions
14
ChangeLog
14
ChangeLog
|
|
@ -1,3 +1,17 @@
|
|||
2002-06-18 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* GNUstep-reset.sh: Change GNUSTEP_PATHPREFIX_LIST to
|
||||
GNUSTEP_PATHLIST for compatibility with many shells (variable was
|
||||
too long).
|
||||
* GNUstep.csh.in: Idem
|
||||
* GNUstep.sh.in: Idem
|
||||
* debugapp.in: Idem
|
||||
* executable.template.in: Idem
|
||||
* ld_lib_path.sh: Idem
|
||||
* openapp.in: Idem
|
||||
* opentool.in: Idem
|
||||
* Documentation/install.texi: Idem
|
||||
|
||||
Mon Jun 17 18:56:39 2002 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* Master/rules.make (internal-distclean): Remove program.core as
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@ This will source in the GNUstep.sh file and set the environment
|
|||
variables; thus making them available for all users. Before executing
|
||||
this script, you can setup a default path for scripts in the
|
||||
makefiles package to use for searching for tools and apps by
|
||||
defining the variable GNUSTEP_PATHPREFIX_LIST (and exporting
|
||||
defining the variable GNUSTEP_PATHLIST (and exporting
|
||||
it). By default, it's set to
|
||||
|
||||
@example
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
The currently released version is @samp{@value{GNUSTEP-MAKE-VERSION}}.
|
||||
@end ifclear
|
||||
|
||||
@section Changes in version @samp{1.3.2}
|
||||
@section Changes in version @samp{1.3.3}
|
||||
|
||||
@itemize @bullet
|
||||
@item Recognizes XXX_STANDARD_INSTALL=no to not do installation.
|
||||
|
|
|
|||
|
|
@ -48,9 +48,9 @@ function reset_path
|
|||
# Loop on the paths
|
||||
for dir in $original_path; do
|
||||
# For each of them, keep it only if it's not beginning with
|
||||
# a path in GNUSTEP_PATHPREFIX_LIST as prefix
|
||||
# a path in GNUSTEP_PATHLIST as prefix
|
||||
found=no;
|
||||
for gnustep_dir in $GNUSTEP_PATHPREFIX_LIST; do
|
||||
for gnustep_dir in $GNUSTEP_PATHLIST; do
|
||||
if [ -n "$gnustep_dir" ]; then
|
||||
case $dir in
|
||||
$gnustep_dir*) found=yes; break;;
|
||||
|
|
@ -89,7 +89,7 @@ reset_path PATH
|
|||
# want to pollute the environment with it.
|
||||
unset -f reset_path
|
||||
|
||||
unset GNUSTEP_PATHPREFIX_LIST
|
||||
unset GNUSTEP_PATHLIST
|
||||
unset GNUSTEP_USER_ROOT
|
||||
unset GNUSTEP_HOST_OS
|
||||
unset GNUSTEP_HOST_VENDOR
|
||||
|
|
|
|||
|
|
@ -73,13 +73,13 @@ endif
|
|||
#
|
||||
# Add the GNUstep tools directories to the path
|
||||
#
|
||||
if ( ! ${?GNUSTEP_PATHPREFIX_LIST} ) then
|
||||
setenv GNUSTEP_PATHPREFIX_LIST \
|
||||
if ( ! ${?GNUSTEP_PATHLIST} ) then
|
||||
setenv GNUSTEP_PATHLIST \
|
||||
${GNUSTEP_USER_ROOT}:${GNUSTEP_LOCAL_ROOT}:${GNUSTEP_NETWORK_ROOT}:${GNUSTEP_SYSTEM_ROOT}
|
||||
endif
|
||||
|
||||
set temp_path = ""
|
||||
foreach dir ( `/bin/sh -c 'IFS=:; for i in ${GNUSTEP_PATHPREFIX_LIST}; do echo $i; done'` )
|
||||
foreach dir ( `/bin/sh -c 'IFS=:; for i in ${GNUSTEP_PATHLIST}; do echo $i; done'` )
|
||||
set temp_path=${temp_path}${dir}/Tools:
|
||||
if ( "${GNUSTEP_FLATTENED}" == "" ) then
|
||||
set temp_path=${temp_path}${dir}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}:
|
||||
|
|
@ -96,7 +96,7 @@ unset temp_path dir
|
|||
|
||||
source ${GNUSTEP_MAKEFILES}/ld_lib_path.csh
|
||||
|
||||
# FIXME/TODO - use GNUSTEP_PATHPREFIX_LIST here
|
||||
# FIXME/TODO - use GNUSTEP_PATHLIST here
|
||||
set gnustep_class_path="${GNUSTEP_USER_ROOT}/Libraries/Java:${GNUSTEP_LOCAL_ROOT}/Libraries/Java:${GNUSTEP_NETWORK_ROOT}/Libraries/Java:${GNUSTEP_SYSTEM_ROOT}/Libraries/Java"
|
||||
|
||||
if ( ! ${?CLASSPATH} ) then
|
||||
|
|
|
|||
|
|
@ -114,11 +114,11 @@ fi
|
|||
export GNUSTEP_USER_ROOT
|
||||
|
||||
#
|
||||
# GNUSTEP_PATHPREFIX_LIST is like an abstract path-like shell
|
||||
# GNUSTEP_PATHLIST is like an abstract path-like shell
|
||||
# variable, which can be used to search the gnustep directories - and
|
||||
# in these scripts, it is also used to set up other shell variables
|
||||
#
|
||||
if [ -z "$GNUSTEP_PATHPREFIX_LIST" ]; then
|
||||
if [ -z "$GNUSTEP_PATHLIST" ]; then
|
||||
|
||||
# If we need to convert win32 paths, this is the time!
|
||||
if [ -z "`echo $GNUSTEP_SYSTEM_ROOT | sed 's|^[a-zA-Z]:/.*$||'`" ]; then
|
||||
|
|
@ -134,20 +134,20 @@ if [ -z "$GNUSTEP_PATHPREFIX_LIST" ]; then
|
|||
fi
|
||||
|
||||
# Now we basically want to build
|
||||
# GNUSTEP_PATHPREFIX_LIST="$G_U_R:$G_L_R:$G_N_R:$G_S_R"
|
||||
# GNUSTEP_PATHLIST="$G_U_R:$G_L_R:$G_N_R:$G_S_R"
|
||||
# but we want to remove duplicates.
|
||||
|
||||
# Start with $G_U_R:$G_L_R - or $G_U_R if they are the same
|
||||
if [ "$G_L_R" != "$G_U_R" ]; then
|
||||
GNUSTEP_PATHPREFIX_LIST="$G_U_R:$G_L_R"
|
||||
GNUSTEP_PATHLIST="$G_U_R:$G_L_R"
|
||||
else
|
||||
GNUSTEP_PATHPREFIX_LIST="$G_U_R"
|
||||
GNUSTEP_PATHLIST="$G_U_R"
|
||||
fi
|
||||
|
||||
# Now append $G_N_R but only if different from what already there
|
||||
if [ "$G_N_R" != "$G_U_R" ]; then
|
||||
if [ "$G_N_R" != "$G_L_R" ]; then
|
||||
GNUSTEP_PATHPREFIX_LIST="$GNUSTEP_PATHPREFIX_LIST:$G_N_R"
|
||||
GNUSTEP_PATHLIST="$GNUSTEP_PATHLIST:$G_N_R"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -155,7 +155,7 @@ if [ -z "$GNUSTEP_PATHPREFIX_LIST" ]; then
|
|||
if [ "$G_S_R" != "$G_U_R" ]; then
|
||||
if [ "$G_S_R" != "$G_L_R" ]; then
|
||||
if [ "$G_S_R" != "$G_N_R" ]; then
|
||||
GNUSTEP_PATHPREFIX_LIST="$GNUSTEP_PATHPREFIX_LIST:$G_S_R"
|
||||
GNUSTEP_PATHLIST="$GNUSTEP_PATHLIST:$G_S_R"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
@ -165,7 +165,7 @@ if [ -z "$GNUSTEP_PATHPREFIX_LIST" ]; then
|
|||
unset G_N_R
|
||||
unset G_S_R
|
||||
|
||||
export GNUSTEP_PATHPREFIX_LIST
|
||||
export GNUSTEP_PATHLIST
|
||||
fi
|
||||
|
||||
#
|
||||
|
|
@ -174,7 +174,7 @@ fi
|
|||
tmp_IFS="$IFS"
|
||||
IFS=:
|
||||
temp_path=
|
||||
for dir in $GNUSTEP_PATHPREFIX_LIST; do
|
||||
for dir in $GNUSTEP_PATHLIST; do
|
||||
|
||||
# Prepare the path_fragment
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
|
|
@ -211,7 +211,7 @@ export PATH
|
|||
tmp_IFS="$IFS"
|
||||
IFS=:
|
||||
gnustep_class_path=
|
||||
for dir in $GNUSTEP_PATHPREFIX_LIST; do
|
||||
for dir in $GNUSTEP_PATHLIST; do
|
||||
|
||||
if [ -z "$gnustep_class_path" ]; then
|
||||
gnustep_class_path="$dir/Libraries/Java"
|
||||
|
|
|
|||
2
INSTALL
2
INSTALL
|
|
@ -200,7 +200,7 @@ as `/etc/bashrc', where you could add lines similar to these:
|
|||
variables; thus making them available for all users. Before executing
|
||||
this script, you can setup a default path for scripts in the makefiles
|
||||
package to use for searching for tools and apps by defining the
|
||||
variable GNUSTEP_PATHPREFIX_LIST (and exporting it). By default, it's
|
||||
variable GNUSTEP_PATHLIST (and exporting it). By default, it's
|
||||
set to
|
||||
|
||||
$GNUSTEP_USER_ROOT:$GNUSTEP_LOCAL_ROOT:$GNUSTEP_SYSTEM_ROOT
|
||||
|
|
|
|||
|
|
@ -85,8 +85,8 @@ case $app in
|
|||
*/*) # A relative path
|
||||
full_appname=`(cd $app; pwd)`;;
|
||||
*) # A path that should be searched into the GNUstep paths
|
||||
if [ -n $GNUSTEP_PATHPREFIX_LIST ]; then
|
||||
SPATH=$GNUSTEP_PATHPREFIX_LIST
|
||||
if [ -n $GNUSTEP_PATHLIST ]; then
|
||||
SPATH=$GNUSTEP_PATHLIST
|
||||
else
|
||||
SPATH=$PATH
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -101,8 +101,8 @@ case $app in
|
|||
*/*) # A relative path
|
||||
full_appname=`(cd $dir; pwd)`;;
|
||||
*) # A path that needs to be searched
|
||||
if [ -n $GNUSTEP_PATHPREFIX_LIST ]; then
|
||||
SPATH=$GNUSTEP_PATHPREFIX_LIST
|
||||
if [ -n $GNUSTEP_PATHLIST ]; then
|
||||
SPATH=$GNUSTEP_PATHLIST
|
||||
else
|
||||
SPATH=$PATH
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ fi
|
|||
old_IFS="$IFS"
|
||||
IFS=:
|
||||
lib_paths=
|
||||
for dir in $GNUSTEP_PATHPREFIX_LIST; do
|
||||
for dir in $GNUSTEP_PATHLIST; do
|
||||
|
||||
# prepare the path_fragment for this dir
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
|
|
@ -133,7 +133,7 @@ unset lib_paths
|
|||
old_IFS="$IFS"
|
||||
IFS=:
|
||||
guile_paths=
|
||||
for dir in $GNUSTEP_PATHPREFIX_LIST; do
|
||||
for dir in $GNUSTEP_PATHLIST; do
|
||||
|
||||
if [ -z "$guile_paths" ]; then
|
||||
guile_paths="$dir/Libraries/Guile"
|
||||
|
|
|
|||
|
|
@ -58,8 +58,8 @@ case $app in
|
|||
*/*) # A relative path
|
||||
full_appname=`(cd $app; pwd)`;;
|
||||
*) # A path that should be searched into the GNUstep paths
|
||||
if [ -n $GNUSTEP_PATHPREFIX_LIST ]; then
|
||||
SPATH=$GNUSTEP_PATHPREFIX_LIST
|
||||
if [ -n $GNUSTEP_PATHLIST ]; then
|
||||
SPATH=$GNUSTEP_PATHLIST
|
||||
else
|
||||
SPATH=$PATH
|
||||
fi
|
||||
|
|
|
|||
10
opentool.in
10
opentool.in
|
|
@ -25,8 +25,8 @@
|
|||
# is not specified. The arguments passed after the tool name are passed
|
||||
# unmodified to the tool.
|
||||
|
||||
if [ -z "$GNUSTEP_PATHPREFIX_LIST" ]; then
|
||||
echo "The GNUSTEP_PATHPREFIX_LIST environment variable is missing."
|
||||
if [ -z "$GNUSTEP_PATHLIST" ]; then
|
||||
echo "The GNUSTEP_PATHLIST environment variable is missing."
|
||||
echo "Did you forget to set up your environment using GNUstep.sh ?"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -94,7 +94,7 @@ case $tool in
|
|||
if [ -z "$full_toolname" ]; then
|
||||
|
||||
# Local tool not found - Search for an installed one
|
||||
# we search in GNUSTEP_PATHPREFIX_LIST, which means we
|
||||
# we search in GNUSTEP_PATHLIST, which means we
|
||||
# search in the order in:
|
||||
# GNUSTEP_USER_ROOT
|
||||
# GNUSTEP_LOCAL_ROOT
|
||||
|
|
@ -106,8 +106,8 @@ case $tool in
|
|||
# subdirectory, then the top-level directory.
|
||||
# (For flattened systems we skip the first two options.
|
||||
#
|
||||
if [ -n "$GNUSTEP_PATHPREFIX_LIST" ]; then
|
||||
SPATH=$GNUSTEP_PATHPREFIX_LIST
|
||||
if [ -n "$GNUSTEP_PATHLIST" ]; then
|
||||
SPATH=$GNUSTEP_PATHLIST
|
||||
IFS=:
|
||||
for dir in $SPATH; do
|
||||
tmpdir=$dir/Tools
|
||||
|
|
|
|||
Loading…
Reference in a new issue