Set frameworkd on Apple for all lib combos

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@19468 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2004-06-06 04:01:41 +00:00
parent 355f20b08d
commit d3fd109512
6 changed files with 86 additions and 49 deletions

View file

@ -1,3 +1,13 @@
2004-06-05 Adam Fedor <fedor@gnu.org>
* ld_lib_path.[c]sh: Allow seting of GNUstep framework location on
Mac OS X for all library combos (patch from Quentin Mathe
<gnustep-quentin@club-internet.fr>).
* Documentation/README.Cygwin: Update
* Documentation/machines.texi: Add Mac OS X section.
* Documentation/news.texi: Update.
Tue Jun 1 15:43:45 BST 2004 Riccardo Mottola <rollei@tiscalinet.it>
* debugapp.in (appname): Fixed escaping of --args argument to work

View file

@ -58,8 +58,7 @@ Before you start, you need Cygwin in some programming-oriented
configuration (full configuration is OK but it's VERY big
now). Installation instructions are on Cygwin site.
In fact Cygwin already contains every package needed for GNUstep
except GCC and GDB. Please see below.
In fact Cygwin already contains every package needed for GNUstep.
Building GCC and GDB
--------------------
@ -73,9 +72,8 @@ So you have to build these two from sources.
Please note that generally GDB is optional! It's up to you whether to
use it or not. If you don't use it you don't need to build it.
1. GCC. Get sources from http://gcc.gnu.org . I suggest version 2.xx.x
(last stable in gcc-2 branch e.g. 2.95.3) because gnustep-objc suits
to version 2 of GCC. Get sources (including languages you need),
1. GCC. Get sources from http://gcc.gnu.org.
Get sources (including languages you need),
unpack, build. Before installing uninstall previous version of GCC via
setup.exe program.

View file

@ -25,6 +25,7 @@ more popular operating systems. Some machines marked with
* FreeBSD 3.x::
* FreeBSD 2.x::
* Irix 6.5/MIPS::
* MacOSX/PowerPC::
* MkLinux/PowerPC::
* NetBSD::
* Netwinder::
@ -127,8 +128,8 @@ Use the GNU runtime. Download the gcc compiler and configure it with
@item Extra libs needed
Use libffi (not ffcall). This should be enabled by default in gnustep-base
so you don't have to type --enable-libffi. Also you need the dlcompat library
(from @url{www.opendarwin.org}) to load bundles (like the backend bundle).
so you don't have to type --enable-libffi. For 6.x, you need the dlcompat
library (from @url{www.opendarwin.org}) to load bundles (not needed for 7.x).
@item Special Instructions
@ -137,6 +138,8 @@ directory for complete instructions.
@end table
See also the MacOSX/PowerPC section
@c -----------------------------------------
@node Debian/DEC-Alpha, Debian/i386, Darwin/PowerPC, Machine Specific
@section Debian/DEC-Alpha
@ -312,7 +315,7 @@ You need to use gmake not make to compile the GNUstep packages.
@end table
@c -----------------------------------------
@node Irix 6.5/MIPS, MkLinux/PowerPC, FreeBSD 2.x, Machine Specific
@node Irix 6.5/MIPS, MacOSX/PowerPC, FreeBSD 2.x, Machine Specific
@section Irix 6.5/MIPS
@table @samp
@ -338,7 +341,39 @@ No libffi-support: Use ffcall
@end table
@c -----------------------------------------
@node MkLinux/PowerPC, NetBSD, Irix 6.5/MIPS, Machine Specific
@node MacOSX/PowerPC, MkLinux/PowerPC, Irix 6.5/MIPS, Machine Specific
@section MacOSX/PowerPC
Currently tested on MacOSX 10.2, 10.3
@table @samp
@item Recommended compiler
Default.
@item Extra libs needed
None.
@item Special Instructions
By default, on Mac OS X, only the GNUstep extensions are built. This
is if you want to build gdl2, etc on Mac OS X. Xcode project files
exist, but they may not be up-to-date. Try:
@example
cd make
./configure --with-library-combo=apple-apple-apple
make install debug=yes
cd ../base
./configure --with-xml-prefix=/usr --disable-xmltest
make install debug=yes
@end example
@end table
See also the Darwin/PowerPC section.
@c -----------------------------------------
@node MkLinux/PowerPC, NetBSD, MacOSX/PowerPC, Machine Specific
@section MkLinux/PowerPC
Tested with R2 RC2 (2004/03/04).
@ -555,7 +590,7 @@ gdnc doesn't work. If you recompile the kernel then it starts working.
@node Suse/Intel, Suse 7.x/PPC, Suse 6.x/Intel, Machine Specific
@section Suse/Intel
GNUstep has been tested on version 7.0, 8.0, 8.1, 8.2, and 9.0 of Suse
GNUstep has been tested on version 7.0, 8.0, 8.1, 8.2, 9.0, and 9.1 of Suse
@table @samp
@item Recommended compiler
@ -701,7 +736,7 @@ work.
@table @samp
@item Recommended compiler
gcc 2.95.3 (Cygwin release 1.1.8) or later
gcc 3.3.1 or later (with libobjc and libjava (if using libffi))
@item Extra libs needed
Objective-C library DLL (@url{ftp://ftp.gnustep.org/pub/gnustep/windows/cygwin})
@ -709,21 +744,16 @@ for shared libs. It's a good idea to remove the libobjc.a that comes with gcc
(gcc -v for location) so that it isn't accidentally found.
For ffcall, you should get version 1.8b or above (the earlier ones don't
compile). There are still some problems with structure passing, but that is
generally not supportred on any architecture. libffi also works.
generally not supported on any architecture. libffi also works.
@item Special Instructions
On later versions of Cygwin you may be required to include the win32api
directory in CPPFLAGS when configuring:
@example
CPPFLAGS=-I/usr/include/win32api ./configure
@end example
@end table
Make sure you have good shared libraries for everthing. Sometimes a bad
shared library (like libtiff) will cause odd and untraceable problems.
See @url{README.Cygwin} for information on compiling.
@end table
@c -----------------------------------------
@node Windows with MinGW, Yellowdog/PowerPC, Windows with CYGWIN, Machine Specific
@section Windows with MinGW (@emph{Unstable! As always...})

View file

@ -9,6 +9,14 @@
The currently released version is @samp{@value{GNUSTEP-MAKE-VERSION}}.
@end ifclear
@section Changes in version @samp{1.9.2}
@itemize @bullet
@item Application and Bundles use the latest convention on Apple.
@end itemize
@ifclear ANNOUNCE-ONLY
@section Changes in version @samp{1.9.1}
@itemize @bullet
@ -17,8 +25,6 @@ The currently released version is @samp{@value{GNUSTEP-MAKE-VERSION}}.
@item Framework version and naming clarified.
@end itemize
@ifclear ANNOUNCE-ONLY
@section Changes in version @samp{1.9.0}
@itemize @bullet

View file

@ -84,25 +84,22 @@ switch ( "${host_os}" )
endif
endif
if ( ( "${LIBRARY_COMBO}" == "apple-apple-apple" ) \
|| ( "${LIBRARY_COMBO}" == "apple") ) then
unset additional
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 ( $?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
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

View file

@ -131,19 +131,15 @@ case "$host_os" in
fi
fi
export DYLD_LIBRARY_PATH
if [ "$LIBRARY_COMBO" = "apple-apple-apple" -o \
"$LIBRARY_COMBO" = "apple" ]; then
if [ -z "$DYLD_FRAMEWORK_PATH" ]; then
DYLD_FRAMEWORK_PATH="$fw_paths"
else
if ( echo ${DYLD_FRAMEWORK_PATH}|
fgrep -v "${fw_paths}" >/dev/null ); then
DYLD_FRAMEWORK_PATH="$fw_paths:$DYLD_FRAMEWORK_PATH"
fi
if [ -z "$DYLD_FRAMEWORK_PATH" ]; then
DYLD_FRAMEWORK_PATH="$fw_paths"
else
if ( echo ${DYLD_FRAMEWORK_PATH}|
fgrep -v "${fw_paths}" >/dev/null ); then
DYLD_FRAMEWORK_PATH="$fw_paths:$DYLD_FRAMEWORK_PATH"
fi
export DYLD_FRAMEWORK_PATH
fi
;;
export DYLD_FRAMEWORK_PATH;;
*hpux*)
if [ -z "$SHLIB_PATH" ]; then