mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Merged changes from HEAD.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/branches/NibCompatibility@22359 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento
parent
1ca257a6cd
commit
7b4931f40f
4 changed files with 90 additions and 50 deletions
26
ChangeLog
26
ChangeLog
|
|
@ -1,3 +1,29 @@
|
|||
2006-01-11 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Documentation/README.MinGW: Update with information on libxml2
|
||||
|
||||
2006-01-05 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Instance/bundle.make: Always link agains all libs when using
|
||||
Apple's CC.
|
||||
|
||||
2006-01-01 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* openapp.in: Remove IFS setting and search again ... it prevented
|
||||
windows paths from working (which was why it was removed in the first
|
||||
place). Also removed insertion of '.' as a path to search ... since
|
||||
this is generally considered a security flaw.
|
||||
Removed some code to search in odd subdirectories.
|
||||
Added code to search the directories specified in PATH as well as the
|
||||
standard locations. Does this need a different path separator on
|
||||
mingw? Can't remember and I don't currently have a windows system to
|
||||
test on.
|
||||
|
||||
2005-12-30 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* openapp.in: Re-add IFS setting and search in current dir
|
||||
(Fixes Bug #15289).
|
||||
|
||||
2005-12-21 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Version 1.11.2
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Date: 31-May-2005 (tested under Windows XP)
|
||||
Date: 11-Jan-2006 (tested under Windows XP)
|
||||
Author: Nicola Pero <n.pero@mi.flashnet.it>,
|
||||
after Richard Frith-Macdonald <rfm@gnu.org> and others
|
||||
|
||||
|
|
@ -196,8 +196,8 @@ Download the following packages:
|
|||
libintl-0.11.5-2.lib.zip
|
||||
(important: libintl-0.14.4 is untested, use 0.11.5 to be safe)
|
||||
|
||||
libiconv-1.8.1-bin.zip
|
||||
libiconv-1.8.1-lib.zip
|
||||
libiconv-1.8-1-bin.zip
|
||||
libiconv-1.8-1-lib.zip
|
||||
|
||||
zlib-1.2.2-bin.zip
|
||||
zlib-1.2.2-lib.zip
|
||||
|
|
@ -209,15 +209,33 @@ install them, simply unzip them into /C/xxx/msys/1.0/mingw.
|
|||
12. XML support
|
||||
===============
|
||||
|
||||
Not working yet.
|
||||
You need to get the source code for libxml2 and build it yourself ...
|
||||
but first you justfix the symbol information in libiconv so you can link to it.
|
||||
|
||||
cd /mingw/lib
|
||||
mkdir backup-libiconv
|
||||
mv libiconv.la backup-libiconv
|
||||
mv libiconv.lib backup-libiconv
|
||||
dlltool -D libiconv-2.dll -C -l libiconvlib --export-all-symbols -A ../bin/libiconv-2.dll
|
||||
|
||||
Then you can remove the backup-libiconv directory and its
|
||||
contents if all has worked.
|
||||
|
||||
Now download the libxml2 source from http://www.xmlsoft.org
|
||||
I used libxml2-2.6.23.tar.gz
|
||||
|
||||
Unpack the source, change into the directory and run the configure script
|
||||
Then do 'make'
|
||||
Then do 'make install'
|
||||
|
||||
You should now have libxml2 installed on your system.
|
||||
|
||||
13. Installing gnustep-base
|
||||
===========================
|
||||
|
||||
Go in gnustep-base, and type
|
||||
|
||||
./configure --disable-xml
|
||||
./configure
|
||||
make
|
||||
make install
|
||||
|
||||
|
|
|
|||
|
|
@ -64,9 +64,9 @@ ifeq ($(BUILD_DLL), yes)
|
|||
LINK_BUNDLE_AGAINST_ALL_LIBS = yes
|
||||
endif
|
||||
|
||||
# On Darwin, two-level namespaces require all symbols in bundles
|
||||
# to be resolved at link time. Do this even if we don't think we need it.
|
||||
ifeq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin)
|
||||
# Apple CC two-level namespaces requires all symbols in bundles
|
||||
# to be resolved at link time.
|
||||
ifeq ($(CC_BUNDLE), yes)
|
||||
LINK_BUNDLE_AGAINST_ALL_LIBS = yes
|
||||
endif
|
||||
|
||||
|
|
|
|||
80
openapp.in
80
openapp.in
|
|
@ -75,7 +75,7 @@ esac
|
|||
# Remove leading slashes at the end of the application name
|
||||
app="`echo \"$app\" | sed 's%/*$%%'`"
|
||||
|
||||
# Now build the list of directory names we look for. If the user has
|
||||
# Now form the set of directory names we look for. If the user has
|
||||
# given us a full application directory name (for example, Gorm.app)
|
||||
# then we only search for the given directory name; if instead the
|
||||
# user has given us the application name without the suffix (for
|
||||
|
|
@ -83,59 +83,55 @@ app="`echo \"$app\" | sed 's%/*$%%'`"
|
|||
# Gorm.debug, then for Gorm.profile (in that order).
|
||||
# If the appname is known, save it to avoid running a grep later to get it.
|
||||
case "$app" in
|
||||
*.app) app_list="$app"; appname="";;
|
||||
*.debug) app_list="$app"; appname="";;
|
||||
*.profile) app_list="$app"; appname="";;
|
||||
*) app_list="$app.app:$app.debug:$app.profile"; appname="$app";
|
||||
*.app) a1="$app"; a2=""; a3=""; appname="";;
|
||||
*.debug) a1="$app"; a2=""; a3=""; appname="";;
|
||||
*.profile) a1="$app"; a2=""; a3=""; appname="";;
|
||||
*) a1="$app.app"; a2="$app.debug" a3="$app.profile"; appname="$app";
|
||||
esac
|
||||
|
||||
case "$app" in
|
||||
/*) # An absolute path.
|
||||
for appdir in $app_list; do
|
||||
#echo "$appdir"
|
||||
if [ -d "$appdir" ]; then
|
||||
/*) # An absolute path.
|
||||
for appdir in "$a1" "$a2" "$a3"; do
|
||||
if [ \( "" != "$appdir" \) -a \( -d "$appdir" \) ]; then
|
||||
full_appname="$appdir"
|
||||
break
|
||||
fi
|
||||
done;;
|
||||
done
|
||||
;;
|
||||
*/*) # A relative path
|
||||
for appdir in $app_list; do
|
||||
#echo "$appdir"
|
||||
if [ -d "$appdir" ]; then
|
||||
full_appname="`(cd \"$appdir\"; pwd)`"
|
||||
break
|
||||
fi
|
||||
done;;
|
||||
*) # A path that should be searched into the GNUstep paths
|
||||
for appdir in "$a1" "$a2" "$a3"; do
|
||||
if [ \( "" != "$appdir" \) -a \( -d "$appdir" \) ]; then
|
||||
full_appname="`(cd \"$appdir\"; pwd)`"
|
||||
break
|
||||
fi
|
||||
done
|
||||
;;
|
||||
*)
|
||||
# We should first search the standard GNUstep locations.
|
||||
for dir in "$GNUSTEP_USER_ROOT" "$GNUSTEP_LOCAL_ROOT" "$GNUSTEP_NETWORK_ROOT" "$GNUSTEP_SYSTEM_ROOT"; do
|
||||
for appdir in $app_list; do
|
||||
# First, search in $dir/Applications/any_path_here/$appdir
|
||||
#echo "$dir/Applications/"'*'"/$appdir"
|
||||
for d in $dir/Applications/*/$appdir ; do
|
||||
# If nothing is found, * expands to '*'. Check that it's
|
||||
# not the case, and that we have a real match.
|
||||
if [ "$d" != "$dir/Applications/"'*'"/$appdir" ]; then
|
||||
#echo " $d"
|
||||
if [ -d "$d" ]; then
|
||||
full_appname="`(cd \"$d\"; pwd)`"
|
||||
break 3
|
||||
fi
|
||||
fi
|
||||
done
|
||||
# Now, in $dir/Applications/$appdir
|
||||
#echo "$dir/Applications/$appdir"
|
||||
if [ -d "$dir/Applications/$appdir" ]; then
|
||||
for appdir in "$a1" "$a2" "$a3"; do
|
||||
# Standard locations ... in $dir/Applications/$appdir
|
||||
if [ \( "" != "$appdir" \) -a \( -d "$dir/Applications/$appdir" \) ]; then
|
||||
full_appname="`(cd \"$dir/Applications/$appdir\"; pwd)`"
|
||||
break 2
|
||||
fi
|
||||
# Finally, in $dir/$appdir
|
||||
#echo "$dir/$appdir"
|
||||
if [ -d "$dir/$appdir" ]; then
|
||||
full_appname="`(cd \"$dir/$appdir\"; pwd)`"
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done;;
|
||||
done
|
||||
if [ -z "$full_appname" ]; then
|
||||
# And now search the standard PATH (may include '.')
|
||||
old_IFS="$IFS"
|
||||
IFS=:
|
||||
for dir in $PATH; do
|
||||
for appdir in "$a1" "$a2" "$a3"; do
|
||||
if [ \( "" != "$appdir" \) -a \( -d "$dir/$appdir" \) ]; then
|
||||
full_appname="`(cd \"$dir/$appdir\"; pwd)`"
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS="$old_IFS"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
unset app_list
|
||||
unset appdir
|
||||
|
|
|
|||
Loading…
Reference in a new issue