mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Fix FLATTENED strucutre in some files
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@8607 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
86db950126
commit
dc01b6a29e
7 changed files with 70 additions and 36 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2001-01-13 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* openapp.in (additional_library_paths): Set for FLATTENED structure
|
||||
* debugapp.in: Add FLATTENED structure support.
|
||||
(fix from Frederic <frederic.chauvin@noos.fr>).
|
||||
|
||||
* GNUmakefile.in: Add target to make dist file.
|
||||
|
||||
Fri Jan 12 17:38:06 2001 Nicola Pero <nicola@brainstorm.co.uk>
|
||||
|
||||
* configure.in (AC_OUTPUT): Added install-complete-dir.sh and
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
#
|
||||
|
||||
include config.make
|
||||
include Version
|
||||
|
||||
prefix = @prefix@
|
||||
GNUSTEP_INSTALLATION_DIR=$(prefix)
|
||||
|
|
@ -66,6 +67,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|||
INSTALL_DATA = @INSTALL_DATA@
|
||||
PERL = @PERL@
|
||||
|
||||
VERTAG = `echo $(GNUSTEP_MAKE_VERSION) | tr '.' '_'`
|
||||
|
||||
MAKE_FILES = aggregate.make application.make bundle.make service.make \
|
||||
common.make brain.make java.make jni.make library.make rules.make \
|
||||
target.make tool.make ctool.make test-library.make names.make \
|
||||
|
|
@ -148,6 +151,13 @@ distclean: clean
|
|||
rm -f GNUmakefile config.make
|
||||
rm -f config.cache config.log config.status
|
||||
|
||||
cvs-dist:
|
||||
cvs -z3 export -r make-$(VERTAG) make
|
||||
mkdir gstep-$(GNUSTEP_MAKE_VERSION)
|
||||
mv make gstep-$(GNUSTEP_MAKE_VERSION)
|
||||
tar --gzip -cf gstep-make-$(GNUSTEP_MAKE_VERSION).tar.gz gstep-$(GNUSTEP_MAKE_VERSION)
|
||||
rm -rf gstep-$(GNUSTEP_MAKE_VERSION)
|
||||
|
||||
generated-files: GNUmakefile GNUstep.sh GNUstep.csh config.h config.make debugapp openapp
|
||||
|
||||
GNUmakefile: GNUmakefile.in config.status
|
||||
|
|
|
|||
2
configure
vendored
2
configure
vendored
|
|
@ -4155,6 +4155,7 @@ DATE=`date +"%Y%m%d"`
|
|||
|
||||
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Produce the output files
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -4342,6 +4343,7 @@ s%@XML_CFLAGS@%$XML_CFLAGS%g
|
|||
s%@XML_LIBS@%$XML_LIBS%g
|
||||
s%@HAVE_GMP@%$HAVE_GMP%g
|
||||
s%@GNUSTEP_VERSION@%$GNUSTEP_VERSION%g
|
||||
s%@GNUSTEP_MAKE_VERSION@%$GNUSTEP_MAKE_VERSION%g
|
||||
s%@GNUSTEP_MAJOR_VERSION@%$GNUSTEP_MAJOR_VERSION%g
|
||||
s%@GNUSTEP_MINOR_VERSION@%$GNUSTEP_MINOR_VERSION%g
|
||||
s%@DATE@%$DATE%g
|
||||
|
|
|
|||
|
|
@ -692,6 +692,7 @@ if test -f "../Version"; then
|
|||
fi
|
||||
DATE=`date +"%Y%m%d"`
|
||||
AC_SUBST(GNUSTEP_VERSION)
|
||||
AC_SUBST(GNUSTEP_MAKE_VERSION)
|
||||
AC_SUBST(GNUSTEP_MAJOR_VERSION)
|
||||
AC_SUBST(GNUSTEP_MINOR_VERSION)
|
||||
AC_SUBST(DATE)
|
||||
|
|
|
|||
77
debugapp.in
77
debugapp.in
|
|
@ -127,38 +127,40 @@ if [ -z "$full_appname" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
#
|
||||
# Determine the host information
|
||||
#
|
||||
if [ -z "$GNUSTEP_HOST" ]; then
|
||||
GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess`
|
||||
GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/Makefiles/config.sub $GNUSTEP_HOST`
|
||||
export GNUSTEP_HOST
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_CPU" ]; then
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/cpu.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $GNUSTEP_HOST_CPU`
|
||||
export GNUSTEP_HOST_CPU
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_VENDOR" ]; then
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/vendor.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_vendor.sh $GNUSTEP_HOST_VENDOR`
|
||||
export GNUSTEP_HOST_VENDOR
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_OS" ]; then
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/os.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $GNUSTEP_HOST_OS`
|
||||
export GNUSTEP_HOST_OS
|
||||
fi
|
||||
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
#
|
||||
# Determine the host information
|
||||
#
|
||||
if [ -z "$GNUSTEP_HOST" ]; then
|
||||
GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess`
|
||||
GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/Makefiles/config.sub $GNUSTEP_HOST`
|
||||
export GNUSTEP_HOST
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_CPU" ]; then
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/cpu.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $GNUSTEP_HOST_CPU`
|
||||
export GNUSTEP_HOST_CPU
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_VENDOR" ]; then
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/vendor.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_vendor.sh $GNUSTEP_HOST_VENDOR`
|
||||
export GNUSTEP_HOST_VENDOR
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_OS" ]; then
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/os.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $GNUSTEP_HOST_OS`
|
||||
export GNUSTEP_HOST_OS
|
||||
fi
|
||||
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ -f "$full_appname/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_appname/library_paths.openapp`"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
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
|
||||
|
||||
appname=`echo $app | sed 's/\.[a-z]*$//'`
|
||||
|
|
@ -177,21 +179,28 @@ if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
|||
|
||||
else
|
||||
# Determine if the application has a binary for this operating system
|
||||
if [ ! -d $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS ]; then
|
||||
if [ -z "$GNUSTEP_FLATTENED" -a ! -d $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS ]; then
|
||||
echo "$full_appname application does not have a binary for this kind of machine and operating system."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -d $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO ]; then
|
||||
if [ -z "$GNUSTEP_FLATTENED" -a ! -d $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO ]; then
|
||||
echo "$full_appname application does not have a binary for this combination of libraries: $LIBRARY_COMBO."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Support for GDBbundle under OPENSTEP
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
file_appname=$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/$appname
|
||||
else
|
||||
file_appname=$full_appname/$appname
|
||||
fi
|
||||
|
||||
#Support for GDBbundle under OPENSTEP
|
||||
if [ $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
$GDB -connect TextEdit $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/$appname $corefile
|
||||
$GDB -connect TextEdit $file_appname $corefile
|
||||
else
|
||||
$GDB $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/$appname $corefile
|
||||
$GDB $file_appname $corefile
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# This package is not relocatable
|
||||
%define ver @GNUSTEP_VERSION@
|
||||
%define ver @GNUSTEP_MAKE_VERSION@
|
||||
%define date @DATE@
|
||||
%define prefix /usr
|
||||
%define gir %{prefix}/GNUstep
|
||||
|
|
@ -78,7 +78,7 @@ mv mygnustep.csh $RPM_BUILD_ROOT/etc/profile.d/GNUstep.csh
|
|||
|
||||
cat > filelist.rpm.in << EOF
|
||||
%defattr (-, bin, bin)
|
||||
%doc COPYING DESIGN README
|
||||
%doc COPYING INSTALL NEWS README
|
||||
%ifos Linux
|
||||
%config /etc/profile.d/GNUstep.csh
|
||||
%config /etc/profile.d/GNUstep.sh
|
||||
|
|
|
|||
|
|
@ -161,6 +161,10 @@ if [ -z "$GNUSTEP_FLATTENED" ]; then
|
|||
additional_library_paths="`cat $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp`"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if [ -f "$full_appname/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_appname/library_paths.openapp`"
|
||||
fi
|
||||
fi
|
||||
|
||||
# get base app name
|
||||
|
|
|
|||
Loading…
Reference in a new issue