mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Tidied up filesystem layout change to use 'fhs' as default. Updated documentation
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@32550 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
be04d858f7
commit
69649c1526
5 changed files with 2965 additions and 3869 deletions
25
ChangeLog
25
ChangeLog
|
|
@ -1,8 +1,19 @@
|
|||
2011-03-13 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* configure.ac: Always use 'fhs' layout as the default layout
|
||||
except on apple-apple-apple. Removed 'native' layout. Updated
|
||||
comments and documentation. If an invalid --with-layout=xxx
|
||||
option is used, print a list of the available layouts.
|
||||
* configure: Regenerated.
|
||||
* Documentations/releasenotes.texi: Explain the change in default
|
||||
layout. Tidied up existing entry.
|
||||
* RELEASENOTES: Regenerated.
|
||||
|
||||
2011-03-13 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* TestFramework/gnustep-tests.in:
|
||||
* TestFramework/GNUmakefile.in:
|
||||
* TestFramework/README:
|
||||
* TestFramework/gnustep-tests.in:
|
||||
* TestFramework/GNUmakefile.in:
|
||||
* TestFramework/README:
|
||||
Clean and simplify handling of preprocessor flag and include
|
||||
directory setup. Use the standard gnustep-make 'ADDITIONAL'
|
||||
environment variables to set test options while still honoring
|
||||
|
|
@ -262,9 +273,9 @@
|
|||
|
||||
2011-02-10 19:06 David Chisnall <theraven@gna.org>
|
||||
|
||||
* tools/make/trunk/configure, tools/make/trunk/configure.ac: Don't
|
||||
depend on the existence of Object class for checking whether
|
||||
exceptions work.
|
||||
* configure.ac: Don't depend on the existence of Object class for
|
||||
checking whether exceptions work.
|
||||
* configure: Regenerated.
|
||||
|
||||
2011-02-07 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
|
|
@ -294,7 +305,7 @@
|
|||
|
||||
* target.make: Add c99 flag for solaris
|
||||
|
||||
2010-09-22 Riccardo Mottola
|
||||
2010-09-22 Riccardo Mottola <rm@gnu.org>
|
||||
|
||||
* installation-domains.conf: add defaults for objc2 and
|
||||
systempreferences
|
||||
|
|
|
|||
|
|
@ -4,11 +4,43 @@ The release notes include descriptions of API changes, behavior
|
|||
changes and other information that might help developers and users
|
||||
migrate to using a newer version of the make system.
|
||||
|
||||
@section Version 2.6.0
|
||||
@table @samp
|
||||
|
||||
@item The default filesystem layout is now the 'fhs' layout
|
||||
Before version 2.6.0, the default filesystem layout was the 'gnustep'
|
||||
layout. Starting with 2.6.0, the default filesystem layout has
|
||||
changed and is now the 'fhs' layout. To get the old default layout,
|
||||
configure gnustep-make using ./configure --with-layout=gnustep. Note
|
||||
that this change does not affect gnustep-make when used with the
|
||||
apple-apple-apple library combo, in which case the default filesystem
|
||||
layout remains the 'apple' one.
|
||||
|
||||
The change in the default filesystem layout means that the location of
|
||||
the GNUstep.sh file in a default installation has changed from
|
||||
/usr/GNUstep/System/Library/Makefiles/GNUstep.sh to
|
||||
/usr/local/share/GNUstep/Makefiles/GNUstep.sh. If you use the default
|
||||
layout and execute the GNUstep.sh script on startup, you need to
|
||||
change the command from
|
||||
|
||||
@smallexample
|
||||
. /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
|
||||
@end smallexample
|
||||
|
||||
to
|
||||
|
||||
@smallexample
|
||||
. /usr/local/share/GNUstep/Makefiles/GNUstep.sh
|
||||
@end smallexample
|
||||
|
||||
@end table
|
||||
|
||||
@section Version 2.4.0
|
||||
@table @samp
|
||||
|
||||
@item You can enable the use of the non-fragile ivar ABI (for compilers
|
||||
like clang that support it) using the --enable-objc-nonfragile-abi flag.
|
||||
@item You can enable the use of the non-fragile ivar ABI
|
||||
The --enable-objc-nonfragile-abi flag can be used to enable the
|
||||
non-fragile ivar ABI for compilers (such as clang) that support it.
|
||||
|
||||
@item -Wall is now used by default unless 'make warn=no' is specified
|
||||
Before version 2.4.0, 'make debug=yes' would not only build object
|
||||
|
|
|
|||
45
RELEASENOTES
45
RELEASENOTES
|
|
@ -5,12 +5,39 @@ The release notes include descriptions of API changes, behavior changes
|
|||
and other information that might help developers and users migrate to
|
||||
using a newer version of the make system.
|
||||
|
||||
1.1 Version 2.4.0
|
||||
1.1 Version 2.6.0
|
||||
=================
|
||||
|
||||
`You can enable the use of the non-fragile ivar ABI (for compilers'
|
||||
like clang that support it) using the -enable-objc-nonfragile-abi
|
||||
flag.
|
||||
`The default filesystem layout is now the 'fhs' layout'
|
||||
Before version 2.6.0, the default filesystem layout was the
|
||||
'gnustep' layout. Starting with 2.6.0, the default filesystem
|
||||
layout has changed and is now the 'fhs' layout. To get the old
|
||||
default layout, configure gnustep-make using ./configure
|
||||
-with-layout=gnustep. Note that this change does not affect
|
||||
gnustep-make when used with the apple-apple-apple library combo,
|
||||
in which case the default filesystem layout remains the 'apple'
|
||||
one.
|
||||
|
||||
The change in the default filesystem layout means that the
|
||||
location of the GNUstep.sh file in a default installation has
|
||||
changed from /usr/GNUstep/System/Library/Makefiles/GNUstep.sh to
|
||||
/usr/local/share/GNUstep/Makefiles/GNUstep.sh. If you use the
|
||||
default layout and execute the GNUstep.sh script on startup, you
|
||||
need to change the command from
|
||||
|
||||
. /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
|
||||
|
||||
to
|
||||
|
||||
. /usr/local/share/GNUstep/Makefiles/GNUstep.sh
|
||||
|
||||
|
||||
1.2 Version 2.4.0
|
||||
=================
|
||||
|
||||
`You can enable the use of the non-fragile ivar ABI'
|
||||
The -enable-objc-nonfragile-abi flag can be used to enable the
|
||||
non-fragile ivar ABI for compilers (such as clang) that support it.
|
||||
|
||||
`-Wall is now used by default unless 'make warn=no' is specified'
|
||||
Before version 2.4.0, 'make debug=yes' would not only build object
|
||||
|
|
@ -252,7 +279,7 @@ using a newer version of the make system.
|
|||
on all gnustep-make versions that support library resources (ie,
|
||||
gnustep-make >= 2.0.x).
|
||||
|
||||
1.2 Version 2.2.0
|
||||
1.3 Version 2.2.0
|
||||
=================
|
||||
|
||||
`libobjc library'
|
||||
|
|
@ -278,7 +305,7 @@ using a newer version of the make system.
|
|||
at removing directories that were created during by 'make install'.
|
||||
|
||||
|
||||
1.3 Version 2.0.7
|
||||
1.4 Version 2.0.7
|
||||
=================
|
||||
|
||||
`default installation'
|
||||
|
|
@ -320,7 +347,7 @@ using a newer version of the make system.
|
|||
default.
|
||||
|
||||
|
||||
1.4 Version 2.0.6
|
||||
1.5 Version 2.0.6
|
||||
=================
|
||||
|
||||
`GNUSTEP_ABSOLUTE_INSTALL_PATHS'
|
||||
|
|
@ -348,7 +375,7 @@ using a newer version of the make system.
|
|||
go in that subdirectory and install it.
|
||||
|
||||
|
||||
1.5 Version 2.0.5
|
||||
1.6 Version 2.0.5
|
||||
=================
|
||||
|
||||
`default filesystem layout on apple-apple-apple'
|
||||
|
|
@ -393,7 +420,7 @@ using a newer version of the make system.
|
|||
variable (see above).
|
||||
|
||||
|
||||
1.6 Version 2.0.0
|
||||
1.7 Version 2.0.0
|
||||
=================
|
||||
|
||||
Version 2.0.0 is a new major release of gnustep-make which includes a
|
||||
|
|
|
|||
37
configure.ac
37
configure.ac
|
|
@ -310,49 +310,28 @@ AC_ARG_WITH(layout,[
|
|||
installation to use. The layout described by FILE will be
|
||||
read from the FilesystemLayouts directory. Check the
|
||||
FilesystemLayouts subdirectory for a list of layouts and how
|
||||
to choose which one you want (or create your own). If a layout
|
||||
is specified, we automatically avoid importing an existing config
|
||||
file.
|
||||
If you do not specify a layout then the one recorded in the installed
|
||||
GNUstep config file is used, or if there is no layout specified there
|
||||
then one which depends on your operating system (if a layout for
|
||||
it has been contributed) is used.
|
||||
If there is no system specific layout then 'gnustep' is used except
|
||||
to choose which one you want (or create your own).
|
||||
If you do not specify a layout then 'fhs' is used except
|
||||
when the library-combo is apple-apple-apple, in which case it is 'apple'.
|
||||
You may specify the layout 'native' to force the default system
|
||||
specific layout to be used instead of the layout in the config file.
|
||||
Example: --with-layout=fhs
|
||||
],
|
||||
GNUSTEP_FILESYSTEM_LAYOUT="$withval",)
|
||||
|
||||
# The variable GNUSTEP_FILESYSTEM_LAYOUT is empty if no layout was
|
||||
# specified on the command line. In that case, we use any 'native'
|
||||
# layout, but we leave GNUSTEP_FILESYSTEM_LAYOUT unset so that later
|
||||
# tests can tell that no layout was specified.
|
||||
# specified on the command line.
|
||||
if test ! x"$GNUSTEP_FILESYSTEM_LAYOUT" = x""; then
|
||||
AC_MSG_RESULT($GNUSTEP_FILESYSTEM_LAYOUT)
|
||||
GNUSTEP_FILESYSTEM_LAYOUT_FILE="$GNUSTEP_FILESYSTEM_LAYOUT"
|
||||
else
|
||||
AC_MSG_RESULT(not specified... use 'native')
|
||||
GNUSTEP_FILESYSTEM_LAYOUT_FILE=native
|
||||
fi
|
||||
|
||||
if test x"$GNUSTEP_FILESYSTEM_LAYOUT_FILE" = x"native"; then
|
||||
# This is the default layout that is used when installing
|
||||
# GNUstep with no other indication. We normally use the native
|
||||
# layout for the target operating system (if we know it) or 'gnustep'
|
||||
# if we don't.
|
||||
# However, for backward compatibility, if the library-combo is
|
||||
# apple-apple-apple we use 'apple' irrespective of the target OS
|
||||
# though I'm not sure that really makes sense.
|
||||
# GNUstep with no other indication. We normally use 'fhs'.
|
||||
# However, if the library-combo is apple-apple-apple we use
|
||||
# 'apple' irrespective of the target OS.
|
||||
if test "$ac_cv_library_combo" = "apple-apple-apple"; then
|
||||
AC_MSG_RESULT(default layout: 'apple' since we're on apple-apple-apple)
|
||||
GNUSTEP_FILESYSTEM_LAYOUT_FILE=apple
|
||||
else
|
||||
case "$target_os" in
|
||||
linux*) GNUSTEP_FILESYSTEM_LAYOUT_FILE=fhs ;;
|
||||
*) GNUSTEP_FILESYSTEM_LAYOUT_FILE=gnustep ;;
|
||||
esac
|
||||
GNUSTEP_FILESYSTEM_LAYOUT_FILE=fhs
|
||||
AC_MSG_RESULT(default layout: '$GNUSTEP_FILESYSTEM_LAYOUT_FILE')
|
||||
fi
|
||||
fi
|
||||
|
|
@ -360,6 +339,8 @@ fi
|
|||
if test ! -f "$srcdir/FilesystemLayouts/$GNUSTEP_FILESYSTEM_LAYOUT_FILE" >&5 2>&5; then
|
||||
echo "Can not find $srcdir/FilesystemLayouts/$GNUSTEP_FILESYSTEM_LAYOUT_FILE"
|
||||
echo "Please check your --with-layout=xxx argument and try again."
|
||||
echo "Valid arguments for --with-layout= are:"
|
||||
echo `ls "$srcdir/FilesystemLayouts/" | grep -v README`
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue