mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Removed support for library_paths.openapp; this feature was not available in common setups so I doubt anyone could use it anyway
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@23744 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
6155960fe8
commit
c16e923759
9 changed files with 27 additions and 186 deletions
19
ChangeLog
19
ChangeLog
|
|
@ -1,3 +1,22 @@
|
|||
2006-10-03 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
Removed support for library_paths.openapp. It was not available
|
||||
in any common setups, so almost nobody could use it anyway.
|
||||
|
||||
* Instance/application.make ($(APP_FILE)): Do not create
|
||||
library_paths.openapp.
|
||||
* Instance/gswapp.make (GSWAPP_FILE): Same change.
|
||||
|
||||
* executable.template.in: Removed library_paths.openapp code.
|
||||
|
||||
* ld_lib_path.sh: Removed additional_library_paths and
|
||||
additional_framework_paths code.
|
||||
* ld_lib_path.csh: Same changes.
|
||||
|
||||
* transform_paths.sh: File removed.
|
||||
* GNUmakefile.in (install): Do not install transform_paths.sh
|
||||
(uninstall): Do not uninstall it.
|
||||
|
||||
2006-10-03 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
Merged debugapp and openapp. Now there is a single script,
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ install: generated-files
|
|||
$(EC)(for f in config.guess config.sub install-sh mkinstalldirs \
|
||||
clean_cpu.sh clean_os.sh \
|
||||
clean_vendor.sh cpu.sh GNUstep-reset.sh \
|
||||
ld_lib_path.sh os.sh transform_paths.sh vendor.sh \
|
||||
ld_lib_path.sh os.sh vendor.sh \
|
||||
ld_lib_path.csh relative_path.sh strip_makefiles.sh; do \
|
||||
$(INSTALL_PROGRAM) -m 755 $(srcdir)/$$f $(makedir); \
|
||||
done)
|
||||
|
|
@ -205,7 +205,7 @@ uninstall:
|
|||
for f in config.guess config.sub install-sh mkinstalldirs \
|
||||
clean_cpu.sh clean_os.sh \
|
||||
clean_vendor.sh cpu.sh ld_lib_path.sh os.sh \
|
||||
transform_paths.sh vendor.sh \
|
||||
vendor.sh \
|
||||
ld_lib_path.csh fixpath.sh \
|
||||
GNUstep.sh GNUstep.csh GNUstep-reset.sh \
|
||||
relative_path.sh strip_makefiles.sh; do \
|
||||
|
|
|
|||
|
|
@ -114,10 +114,6 @@ endif
|
|||
$(APP_FILE): $(OBJ_FILES_TO_LINK)
|
||||
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) $(CC_LDFLAGS) -o $(LDOUT)$@ \
|
||||
$(OBJ_FILES_TO_LINK) $(ALL_GUI_LIBS)$(END_ECHO)
|
||||
ifneq ($(FOUNDATION_LIB), apple)
|
||||
$(ECHO_NOTHING)$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
|
||||
>$(APP_DIR)/$(GNUSTEP_TARGET_LDIR)/library_paths.openapp$(END_ECHO)
|
||||
endif
|
||||
|
||||
#
|
||||
# Compilation targets
|
||||
|
|
|
|||
|
|
@ -108,10 +108,6 @@ GSWAPP_FILE = $(GNUSTEP_BUILD_DIR)/$(GSWAPP_FILE_NAME)
|
|||
$(GSWAPP_FILE): $(OBJ_FILES_TO_LINK)
|
||||
$(ECHO_LINKING)$(LD) $(ALL_LDFLAGS) $(CC_LDFLAGS) -o $(LDOUT)$@ \
|
||||
$(OBJ_FILES_TO_LINK) $(ALL_GSW_LIBS)$(END_ECHO)
|
||||
ifneq ($(FOUNDATION_LIB), apple)
|
||||
$(ECHO_NOTHING)$(TRANSFORM_PATHS_SCRIPT) $(subst -L,,$(ALL_LIB_DIRS)) \
|
||||
>$(GSWAPP_DIR)/$(GNUSTEP_TARGET_LDIR)/library_paths.openapp$(END_ECHO)
|
||||
endif
|
||||
|
||||
#
|
||||
# Compilation targets
|
||||
|
|
|
|||
|
|
@ -25,6 +25,10 @@
|
|||
# This is a shell script which attempts to find the GNUstep executable
|
||||
# of the same name based on the current host and library_combo.
|
||||
|
||||
# This is installed inside the application directory in the
|
||||
# non-flattened case. In the flattened case, we install the binary
|
||||
# directly and no wrappers are used.
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
# Main body
|
||||
#--------------------------------------------------------------------------
|
||||
|
|
@ -242,17 +246,7 @@ if [ $show_full_path = 1 ]; then
|
|||
exit 0
|
||||
fi
|
||||
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx -a "$GNUSTEP_HOST_OS" = nextstep4 ]; then
|
||||
if [ -f "$full_appname/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_appname/library_paths.openapp`"
|
||||
fi
|
||||
else
|
||||
if [ -f "$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat \"$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp\"`"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Load up LD_LIBRARY_PATH
|
||||
# Load up LD_LIBRARY_PATH ... FIXME, what about just sourcing GNUstep.sh instead ?
|
||||
. "$GNUSTEP_MAKEFILES/ld_lib_path.sh"
|
||||
|
||||
exec "$full_appname/$relative_path" "$@"
|
||||
|
|
|
|||
|
|
@ -53,17 +53,6 @@ switch ( "${host_os}" )
|
|||
else if ( { (echo "${DYLD_LIBRARY_PATH}" | fgrep -v "${lib_paths}" >/dev/null) } ) then
|
||||
setenv DYLD_LIBRARY_PATH "${lib_paths}:${DYLD_LIBRARY_PATH}"
|
||||
endif
|
||||
if ( $?additional_lib_paths == 1) then
|
||||
foreach dir (${additional_lib_paths})
|
||||
set additional="${additional}${dir}:"
|
||||
end
|
||||
endif
|
||||
|
||||
if ( "${?additional}" == "1" ) then
|
||||
if ( { (echo "${DYLD_LIBRARY_PATH}" | fgrep -v "${additional}" >/dev/null) } ) then
|
||||
setenv DYLD_LIBRARY_PATH="${additional}${DYLD_LIBRARY_PATH}"
|
||||
endif
|
||||
endif
|
||||
breaksw
|
||||
|
||||
case *darwin* :
|
||||
|
|
@ -72,17 +61,6 @@ switch ( "${host_os}" )
|
|||
else if ( { (echo "${DYLD_LIBRARY_PATH}" | fgrep -v "${lib_paths}" >/dev/null) } ) then
|
||||
setenv DYLD_LIBRARY_PATH "${lib_paths}:${DYLD_LIBRARY_PATH}"
|
||||
endif
|
||||
if ( $?additional_lib_paths == 1) then
|
||||
foreach dir (${additional_lib_paths})
|
||||
set additional="${additional}${dir}:"
|
||||
end
|
||||
endif
|
||||
|
||||
if ( "${?additional}" == "1" ) then
|
||||
if ( { (echo "${DYLD_LIBRARY_PATH}" | fgrep -v "${additional}" >/dev/null) } ) then
|
||||
setenv DYLD_LIBRARY_PATH="${additional}${DYLD_LIBRARY_PATH}"
|
||||
endif
|
||||
endif
|
||||
|
||||
# The code below has been temporarily removed, because...
|
||||
# Frameworks in GNUstep-make are supported by creating a link like
|
||||
|
|
@ -105,24 +83,12 @@ switch ( "${host_os}" )
|
|||
# if [ "$LIBRARY_COMBO" = "apple-apple-apple" -o \
|
||||
# "$LIBRARY_COMBO" = "apple" ]; then
|
||||
|
||||
unset additional
|
||||
|
||||
if ( $?DYLD_FRAMEWORK_PATH == 0 ) then
|
||||
setenv DYLD_FRAMEWORK_PATH "${fw_paths}"
|
||||
else if ( { (echo "${DYLD_FRAMEWORK_PATH}" | fgrep -v "${fw_paths}" >/dev/null) } ) then
|
||||
setenv DYLD_FRAMEWORK_PATH "${fw_paths}:${DYLD_FRAMEWORK_PATH}"
|
||||
endif
|
||||
if ( $?additional_framework_paths == 1) then
|
||||
foreach dir (${additional_framework_paths})
|
||||
set additional="${additional}${dir}:"
|
||||
end
|
||||
endif
|
||||
|
||||
if ( "${?additional}" == "1" ) then
|
||||
if ( { (echo "${DYLD_FRAMEWORK_PATH}" | fgrep -v "${additional}" >/dev/null) } ) then
|
||||
setenv DYLD_FRAMEWORK_PATH="${additional}${DYLD_FRAMEWORK_PATH}"
|
||||
endif
|
||||
endif
|
||||
breaksw
|
||||
|
||||
case *hpux* :
|
||||
|
|
@ -131,17 +97,6 @@ switch ( "${host_os}" )
|
|||
else if ( { (echo "${SHLIB_PATH}" | fgrep -v "${lib_paths}" >/dev/null) } ) then
|
||||
setenv SHLIB_PATH "${lib_paths}:${SHLIB_PATH}"
|
||||
endif
|
||||
if ( $?additional_lib_paths == 1) then
|
||||
foreach dir (${additional_lib_paths})
|
||||
set additional="${additional}${dir}:"
|
||||
end
|
||||
endif
|
||||
|
||||
if ( "${?additional}" == "1" ) then
|
||||
if ( { (echo "${SHLIB_PATH}" | fgrep -v "${additional}" >/dev/null) } ) then
|
||||
setenv SHLIB_PATH="${additional}${SHLIB_PATH}"
|
||||
endif
|
||||
endif
|
||||
|
||||
if ( $?LD_LIBRARY_PATH == 0 ) then
|
||||
setenv LD_LIBRARY_PATH "${lib_paths}"
|
||||
|
|
@ -149,17 +104,6 @@ switch ( "${host_os}" )
|
|||
setenv LD_LIBRARY_PATH "${lib_paths}:${LD_LIBRARY_PATH}"
|
||||
endif
|
||||
|
||||
if ( $?additional_lib_paths == 1) then
|
||||
foreach dir (${additional_lib_paths})
|
||||
set additional="${additional}${dir}:"
|
||||
end
|
||||
endif
|
||||
|
||||
if ( "${?additional}" == "1" ) then
|
||||
if ( { (echo "${LD_LIBRARY_PATH}" | fgrep -v "${additional}" >/dev/null) } ) then
|
||||
setenv LD_LIBRARY_PATH="${additional}${LD_LIBRARY_PATH}"
|
||||
endif
|
||||
endif
|
||||
breaksw
|
||||
|
||||
case * :
|
||||
|
|
@ -168,20 +112,10 @@ switch ( "${host_os}" )
|
|||
else if ( { (echo "${LD_LIBRARY_PATH}" | fgrep -v "${lib_paths}" >/dev/null) } ) then
|
||||
setenv LD_LIBRARY_PATH "${lib_paths}:${LD_LIBRARY_PATH}"
|
||||
endif
|
||||
if ( $?additional_lib_paths == 1) then
|
||||
foreach dir (${additional_lib_paths})
|
||||
set additional="${additional}${dir}:"
|
||||
end
|
||||
endif
|
||||
|
||||
if ( "${?additional}" == "1" ) then
|
||||
if ( { (echo "${LD_LIBRARY_PATH}" | fgrep -v "${additional}" >/dev/null) } ) then
|
||||
setenv LD_LIBRARY_PATH="${additional}${LD_LIBRARY_PATH}"
|
||||
endif
|
||||
endif
|
||||
breaksw
|
||||
|
||||
endsw
|
||||
|
||||
unset tool_path_part last_path_part host_os additional dir lib_paths fw_paths
|
||||
unset tool_path_part last_path_part host_os dir lib_paths fw_paths
|
||||
|
||||
|
|
|
|||
|
|
@ -75,52 +75,6 @@ unset old_IFS
|
|||
unset dir
|
||||
|
||||
|
||||
# This is only used to support the library_paths.openapp
|
||||
# functionality. That file will contain a list of library paths that
|
||||
# 'openapp' is supposed to automatically add to your LD_LIBRARY_PATH
|
||||
# when you run the application. Only good use I can think of is if
|
||||
# you link your application to some local libs in some local
|
||||
# directories, and then want to be able to try the application out
|
||||
# before installing the libs. FIXME - we should probably remove this
|
||||
# functionality/hack which has a limited use, hardcodes fixed paths in
|
||||
# the application (which is never good), and forces you to run
|
||||
# ld_lib_path.sh etc. in order to start an application.
|
||||
if [ -n "$additional_library_paths" ]; then
|
||||
old_IFS="$IFS"
|
||||
IFS="
|
||||
"
|
||||
additional=""
|
||||
for dir in $additional_library_paths; do
|
||||
additional="${additional}${dir}:"
|
||||
done
|
||||
unset dir
|
||||
|
||||
lib_paths="${additional}${lib_paths}"
|
||||
|
||||
unset additional
|
||||
IFS="$old_IFS"
|
||||
unset old_IFS
|
||||
fi
|
||||
|
||||
# This is unused at the moment. Presumably if we added a
|
||||
# framework_paths.openapp file, this would be used to support it.
|
||||
if [ -n "$additional_framework_paths" ]; then
|
||||
old_IFS="$IFS"
|
||||
IFS="
|
||||
"
|
||||
additional=""
|
||||
for dir in $additional_framework_paths; do
|
||||
additional="${additional}${dir}:"
|
||||
done
|
||||
unset dir
|
||||
|
||||
fw_paths="${additional}${fw_paths}"
|
||||
|
||||
unset additional
|
||||
IFS="$old_IFS"
|
||||
unset old_IFS
|
||||
fi
|
||||
|
||||
case "$host_os" in
|
||||
|
||||
*nextstep4*)
|
||||
|
|
|
|||
13
openapp.in
13
openapp.in
|
|
@ -234,19 +234,6 @@ if [ -n "$openapp_only_find" ]; then
|
|||
exit 0
|
||||
fi
|
||||
|
||||
# FIXME - If we want to support library_paths.openapp, we would need
|
||||
# to do this. Pity as we already source GNUstep.sh (which in turn
|
||||
# sources ld_lib_path.sh) at the beginning, so it would be great not
|
||||
# to have to source it again here. I mean it's getting very clumsy.
|
||||
# I vote for dropping the library_paths.openapp functionality
|
||||
# altogether. Nobody must be using it anyway, since this code has
|
||||
# been missing for a very long time, and nobody ever noticed! :-)
|
||||
|
||||
#if [ -f "$openapp_full_appname/library_paths.openapp" ]; then
|
||||
# additional_library_paths="`cat \"$openapp_full_appname/library_paths.openapp\"`"
|
||||
# . "$GNUSTEP_MAKEFILES/ld_lib_path.sh"
|
||||
#fi
|
||||
|
||||
if [ -n "$openapp_debug_mode" ]; then
|
||||
|
||||
# Search for a core file in the current directory.
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
#!/bin/sh
|
||||
# transform_paths.sh
|
||||
#
|
||||
# Copyright (C) 1997 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: Ovidiu Predescu <ovidiu@net-community.com>
|
||||
# Date: October 1997
|
||||
# Rewritten: Nicola Pero <n.pero@mi.flashnet.it>
|
||||
# Date: March 2001
|
||||
#
|
||||
#
|
||||
# This file is part of the GNUstep Makefile Package.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public
|
||||
# License along with this library; see the file COPYING.LIB.
|
||||
# If not, write to the Free Software Foundation,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
# Takes a list of paths possibly containing relative paths and outputs a
|
||||
# list containing only absolute paths based upon the current directory.
|
||||
|
||||
if [ -z "$*" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
curdir="`pwd`"
|
||||
|
||||
for dir in $@; do
|
||||
if [ -d "$curdir/$dir" ]; then
|
||||
echo "$curdir/$dir"
|
||||
else
|
||||
echo "$dir"
|
||||
fi
|
||||
done
|
||||
Loading…
Reference in a new issue