progname=$0
package=gnulib
-cvsdatestamp='$Date: 2006-01-26 12:51:48 $'
+cvsdatestamp='$Date: 2006-07-15 23:07:01 $'
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
Operation modes:
--list print the available module names
- --import import the given modules into the current package
+ --import import the given modules into the current package;
+ if no modules are specified, update the current
+ package from the current gnulib
+ --update update the current package, restore files omitted
+ from CVS
--create-testdir create a scratch package with the given modules
--create-megatestdir create a mega scratch package with the given modules
one by one and all together
--extract-tests-module report the unit test module, if it exists
Options:
- --dir=DIRECTORY specify the target directory
- For --import, this specifies where your
- configure.ac can be found. Defaults to current
- directory.
- --lib=LIBRARY Specify the library name. Defaults to 'libgnu'.
- --source-base=DIRECTORY
- Directory relative --dir where source code is
- placed (default \"lib\"), for --import.
- --m4-base=DIRECTORY Directory relative --dir where *.m4 macros are
- placed (default \"m4\"), for --import.
- --tests-base=DIRECTORY
- Directory relative --dir where unit tests are
- placed (default \"tests\"), for --import.
- --aux-dir=DIRECTORY Directory relative --dir where auxiliary build
- tools are placed (default \"build-aux\").
- --with-tests Include unit tests for the included modules.
--avoid=MODULE Avoid including the given MODULE. Useful if you
have code that provides equivalent functionality.
This option can be repeated.
+ --dry-run For --import, only print what would have been done.
--lgpl Abort if modules aren't available under the LGPL.
Also modify license template from GPL to LGPL.
+ --lib=LIBRARY Specify the library name. Defaults to 'libgnu'.
--libtool Use libtool rules, for --import.
- --macro-prefix=PREFIX Specify the prefix of the macros 'gl_EARLY' and
- 'gl_INIT'. Default is 'gl'.
+ --macro-prefix=PREFIX Specify the prefix of the macros gl_EARLY and
+ gl_INIT. Default is "gl".
--no-changelog don't update or create ChangeLog files
- --dry-run For --import, only print what would have been done.
-s, --symbolic, --symlink Make symbolic links instead of copying files.
+ --with-tests Include unit tests for the included modules.
+
+Directory options:
+ --dir=DIRECTORY specify the target directory
+ For --import, this specifies where your
+ configure.ac can be found. Defaults to current
+ directory.
+ --aux-dir=DIRECTORY Directory relative to --dir where auxiliary build
+ tools are placed (default \"build-aux\").
+ --doc-base=DIRECTORY Directory relative to --dir where doc files are
+ placed (default \"doc\"), for --import.
+ --m4-base=DIRECTORY Directory relative to --dir where *.m4 macros are
+ placed (default \"m4\"), for --import.
+ --source-base=DIRECTORY Directory relative to --dir where source code is
+ placed (default \"lib\"), for --import.
+ --tests-base=DIRECTORY Directory relative to --dir where unit tests are
+ placed (default \"tests\"), for --import.
Report bugs to <bug-gnulib@gnu.org>."
}
# outputs to stdout the --version message.
func_version ()
{
+ year=`echo "$last_checkin_date" | sed -e 's,/.*$,,'`
echo "$progname (GNU $package) $version"
- echo "Copyright (C) 2002-2005 Free Software Foundation, Inc.
+ echo "Copyright (C) $year Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
echo "Written by" "Bruno Haible" "and" "Simon Josefsson"
}
+# func_emit_copyright_notice
+# outputs to stdout a header for a generated file.
+func_emit_copyright_notice ()
+{
+ echo "# Copyright (C) 2004-2006 Free Software Foundation, Inc."
+ echo "#"
+ echo "# This file is free software, distributed under the terms of the GNU"
+ echo "# General Public License. As a special exception to the GNU General"
+ echo "# Public License, this file may be distributed as part of a program"
+ echo "# that contains a configuration script generated by Autoconf, under"
+ echo "# the same distribution terms as the rest of that program."
+ echo "#"
+ echo "# Generated by gnulib-tool."
+}
+
# func_tmpdir
# creates a temporary directory.
# Sets variable
# - libname, supplied_libname from --lib
# - sourcebase from --source-base
# - m4base from --m4-base
+# - docbase from --doc-base
# - testsbase from --tests-base
# - auxdir from --aux-dir
# - inctests true if --with-tests was given, blank otherwise
supplied_libname=
sourcebase=
m4base=
+ docbase=
testsbase=
auxdir=
inctests=
--m4-base=* )
m4base=`echo "X$1" | sed -e 's/^X--m4-base=//'`
shift ;;
+ --doc-base )
+ shift
+ if test $# = 0; then
+ func_fatal_error "missing argument for --doc-base"
+ fi
+ docbase=$1
+ shift ;;
+ --doc-base=* )
+ docbase=`echo "X$1" | sed -e 's/^X--doc-base=//'`
+ shift ;;
--tests-base )
shift
if test $# = 0; then
echo "you need to use 'gnulib --import' - at your own risk!" 1>&2
exit 1
fi
- if test -n "$libname" || test -n "$sourcebase" || test -n "$m4base" \
+ if test -n "$supplied_libname" || test -n "$sourcebase" || test -n "$m4base" \
|| test -n "$testsbase" || test -n "$auxdir" || test -n "$inctests" \
+ || test -n "$docbase" \
|| test -n "$avoidlist" || test -n "$lgpl" || test -n "$macro_prefix"; then
echo "gnulib-tool: invalid options for 'update' mode" 1>&2
echo "Try 'gnulib-tool --help' for more information." 1>&2
case "$m4base" in
*/ ) m4base=`echo "$m4base" | sed -e "$sed_trimtrailingslashes"` ;;
esac
+ case "$docbase" in
+ */ ) docbase=`echo "$docbase" | sed -e "$sed_trimtrailingslashes"` ;;
+ esac
case "$testsbase" in
*/ ) testsbase=`echo "$testsbase" | sed -e "$sed_trimtrailingslashes"` ;;
esac
esac
}
-sed_extract_prog=':[ ]*$/ {
+sed_extract_prog=':[ ]*$/ {
:a
n
- s/^Description:[ ]*$//
- s/^Files:[ ]*$//
- s/^Depends-on:[ ]*$//
- s/^configure\.ac:[ ]*$//
- s/^Makefile\.am:[ ]*$//
- s/^Include:[ ]*$//
- s/^License:[ ]*$//
- s/^Maintainer:[ ]*$//
+ s/^Description:[ ]*$//
+ s/^Files:[ ]*$//
+ s/^Depends-on:[ ]*$//
+ s/^configure\.ac:[ ]*$//
+ s/^Makefile\.am:[ ]*$//
+ s/^Include:[ ]*$//
+ s/^License:[ ]*$//
+ s/^Maintainer:[ ]*$//
tb
p
ba
{
sed -n -e "/^Files$sed_extract_prog" < "$gnulib_dir/modules/$1"
#echo m4/onceonly.m4
- echo m4/onceonly_2_57.m4
+ #echo m4/onceonly_2_57.m4
}
# func_get_dependencies module
func_verify_nontests_module
if test -n "$module"; then
# Extract the value of "lib_SOURCES += ...".
- for file in `func_get_automake_snippet "$module" | sed -e "$sed_remove_backslash_newline" | sed -n -e 's,^lib_SOURCES[ ]*+=\([^#]*\).*$,\1,p'`; do
+ for file in `func_get_automake_snippet "$module" | sed -e "$sed_remove_backslash_newline" | sed -n -e 's,^lib_SOURCES[ ]*+=\([^#]*\).*$,\1,p'`; do
# Ignore .h files since they are not compiled.
case "$file" in
*.h) ;;
perhapsLT=
fi
echo "## Process this file with automake to produce Makefile.in."
- echo "# Copyright (C) 2004 Free Software Foundation, Inc."
- echo "#"
- echo "# This file is free software, distributed under the terms of the GNU"
- echo "# General Public License. As a special exception to the GNU General"
- echo "# Public License, this file may be distributed as part of a program"
- echo "# that contains a configuration script generated by Automake, under"
- echo "# the same distribution terms as the rest of that program."
- echo "#"
- echo "# Generated by gnulib-tool."
+ func_emit_copyright_notice
if test -n "$actioncmd"; then
echo "# Reproduce by: $actioncmd"
fi
echo "BUILT_SOURCES ="
echo "SUFFIXES ="
echo "MOSTLYCLEANFILES ="
+ echo "MOSTLYCLEANDIRS ="
echo "CLEANFILES ="
echo "DISTCLEANFILES ="
echo "MAINTAINERCLEANFILES ="
echo
+ echo "AM_CPPFLAGS ="
+ echo
for module in $modules; do
func_verify_nontests_module
if test -n "$module"; then
fi
} > amsnippet.tmp
# Skip the contents if its entirely empty.
- if grep '[^ ]' amsnippet.tmp > /dev/null ; then
+ if grep '[^ ]' amsnippet.tmp > /dev/null ; then
echo "## begin gnulib module $module"
echo
cat amsnippet.tmp
fi
done
echo
+ echo "mostlyclean-local:"
+ echo " @test -z \"\$(MOSTLYCLEANDIRS)\" || \\"
+ echo " for dir in \$(MOSTLYCLEANDIRS); do \\"
+ echo " if test -d \$\$dir; then \\"
+ echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\"
+ echo " fi; \\"
+ echo " done"
+ echo
echo "# Makefile.am ends here"
}
fi
testsbase_inverse=`echo "$testsbase" | sed -e 's,/$,,' | sed -e 's,[^/][^/]*,..,g'`
echo "## Process this file with automake to produce Makefile.in."
- echo "# Copyright (C) 2004-2005 Free Software Foundation, Inc."
- echo "#"
- echo "# This file is free software, distributed under the terms of the GNU"
- echo "# General Public License. As a special exception to the GNU General"
- echo "# Public License, this file may be distributed as part of a program"
- echo "# that contains a configuration script generated by Automake, under"
- echo "# the same distribution terms as the rest of that program."
- echo "#"
- echo "# Generated by gnulib-tool."
+ func_emit_copyright_notice
echo
# Generate dependencies here, since it eases the debugging of test failures.
echo "AUTOMAKE_OPTIONS = 1.5 foreign"
echo "BUILT_SOURCES ="
echo "SUFFIXES ="
echo "MOSTLYCLEANFILES ="
+ echo "MOSTLYCLEANDIRS ="
echo "CLEANFILES ="
echo "DISTCLEANFILES ="
echo "MAINTAINERCLEANFILES ="
if test -n "$module"; then
func_get_automake_snippet "$module" > amsnippet.tmp
# Skip the contents if its entirely empty.
- if grep '[^ ]' amsnippet.tmp > /dev/null ; then
+ if grep '[^ ]' amsnippet.tmp > /dev/null ; then
echo "## begin gnulib module $module"
echo
cat amsnippet.tmp
echo "clean-local:"
echo " rm -rf SunWS_cache"
echo
+ echo "mostlyclean-local:"
+ echo " @test -z \"\$(MOSTLYCLEANDIRS)\" || \\"
+ echo " for dir in \$(MOSTLYCLEANDIRS); do \\"
+ echo " if test -d \$\$dir; then \\"
+ echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\"
+ echo " fi; \\"
+ echo " done"
+ echo
echo "# Makefile.am ends here"
}
# - libname library name
# - sourcebase directory relative to destdir where to place source code
# - m4base directory relative to destdir where to place *.m4 macros
+# - docbase directory relative to destdir where to place doc files
# - testsbase directory relative to destdir where to place unit test code
# - auxdir directory relative to destdir where to place build aux files
# - inctests true if --with-tests was given, blank otherwise
cached_avoidlist=
cached_sourcebase=
cached_m4base=
+ cached_docbase=
cached_testsbase=
cached_libname=
cached_lgpl=
/gl_M4_BASE(/ {
s,^.*gl_M4_BASE([[ ]*\([^])]*\).*$,cached_m4base="\1",p
}
+ /gl_DOC_BASE(/ {
+ s,^.*gl_DOC_BASE([[ ]*\([^])]*\).*$,cached_docbase="\1",p
+ }
/gl_TESTS_BASE(/ {
s,^.*gl_TESTS_BASE([[ ]*\([^])]*\).*$,cached_testsbase="\1",p
}
func_fatal_error "missing --source-base option"
fi
fi
+ # The docbase defaults to the cached one.
+ if test -z "$docbase"; then
+ docbase="$cached_docbase"
+ if test -z "$docbase"; then
+ func_fatal_error "missing --doc-base option"
+ fi
+ fi
# The testsbase defaults to the cached one.
if test -z "$testsbase"; then
testsbase="$cached_testsbase"
echo "Create directory $destdir/$m4base"
fi
fi
+ if test ! -d "$destdir/$docbase"; then
+ if $doit; then
+ echo "Creating directory $destdir/$docbase"
+ mkdir "$destdir/$docbase" || func_fatal_error "failed"
+ else
+ echo "Create directory $destdir/$docbase"
+ fi
+ fi
if test -n "$inctests"; then
if test ! -d "$destdir/$testsbase"; then
if $doit; then
fi
fi
- # Copy files or make symbolic links. Remove obsolete files.
func_tmpdir
trap 'rm -rf "$tmp"' 0 1 2 3 15
+ # func_dest_tmpfilename file
+ # determines the name of a temporary file (file is relative to destdir).
+ # Sets variable:
+ # - tmpfile absolute filename of the temporary file
+ func_dest_tmpfilename ()
+ {
+ if $doit; then
+ # Put the new contents of $file in a file in the same directory (needed
+ # to guarantee that an 'mv' to "$destdir/$file" works).
+ tmpfile="$destdir/$1.tmp"
+ else
+ # Put the new contents of $file in a file in a temporary directory
+ # (because the directory of "$file" might not exist).
+ tmpfile="$tmp"/`basename "$1"`.tmp
+ fi
+ }
+
+ # Copy files or make symbolic links. Remove obsolete files.
delimiter=' '
for f in $old_files; do
case "$f" in
build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;;
+ doc/*) g=`echo "$f" | sed -e "s,^doc/,$cached_docbase/,"` ;;
lib/*) g=`echo "$f" | sed -e "s,^lib/,$cached_sourcebase/,"` ;;
m4/*) g=`echo "$f" | sed -e "s,^m4/,$cached_m4base/,"` ;;
tests/*) g=`echo "$f" | sed -e "s,^tests/,$cached_testsbase/,"` ;;
for f in $new_files; do
case "$f" in
build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;;
+ doc/*) g=`echo "$f" | sed -e "s,^doc/,$docbase/,"` ;;
lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;;
m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;;
tests/*) g=`echo "$f" | sed -e "s,^tests/,$testsbase/,"` ;;
# Uses parameters f, g, already_present.
func_add_or_update ()
{
- cp "$gnulib_dir/$f" "$destdir/$g.tmp" || func_fatal_error "failed"
+ func_dest_tmpfilename "$g"
+ cp "$gnulib_dir/$f" "$tmpfile" || func_fatal_error "failed"
if test -n "$lgpl"; then
# Update license.
case "$f" in
lib/*)
sed -e 's/GNU General/GNU Lesser General/g' \
-e 's/version 2\([ ,]\)/version 2.1\1/g' \
- < "$gnulib_dir/$f" > "$destdir/$g.tmp" || func_fatal_error "failed"
+ < "$gnulib_dir/$f" > "$tmpfile" || func_fatal_error "failed"
;;
esac
fi
if test -f "$destdir/$g"; then
# The file already exists.
- if cmp "$destdir/$g" "$destdir/$g.tmp" > /dev/null; then
+ if cmp "$destdir/$g" "$tmpfile" > /dev/null; then
: # The file has not changed.
else
# Replace the file.
echo "Replacing file $g (non-gnulib code backuped in ${g}~) !!"
fi
mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed"
- if test -n "$symbolic" && cmp "$gnulib_dir/$f" "$destdir/$g.tmp" > /dev/null; then
+ if test -n "$symbolic" && cmp "$gnulib_dir/$f" "$tmpfile" > /dev/null; then
func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g"
else
- mv -f "$destdir/$g.tmp" "$destdir/${g}" || func_fatal_error "failed"
+ mv -f "$tmpfile" "$destdir/${g}" || func_fatal_error "failed"
fi
else
if test -n "$already_present"; then
# frequently that developers don't put autogenerated files into CVS.
if $doit; then
echo "Copying file $g"
- if test -n "$symbolic" && cmp "$gnulib_dir/$f" "$destdir/$g.tmp" > /dev/null; then
+ if test -n "$symbolic" && cmp "$gnulib_dir/$f" "$tmpfile" > /dev/null; then
func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g"
else
- mv -f "$destdir/$g.tmp" "$destdir/${g}" || func_fatal_error "failed"
+ mv -f "$tmpfile" "$destdir/${g}" || func_fatal_error "failed"
fi
else
echo "Copy file $g"
fi
fi
- rm -f "$destdir/$g.tmp"
+ rm -f "$tmpfile"
}
# Then the files that are in new-files, but not in old-files:
sed_take_last_column='s,^.*'"$delimiter"',,'
for f in `LC_ALL=C join -t"$delimiter" -v2 "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_last_column"`; do
case "$f" in
build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;;
+ doc/*) g=`echo "$f" | sed -e "s,^doc/,$docbase/,"` ;;
lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;;
m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;;
tests/*) g=`echo "$f" | sed -e "s,^tests/,$testsbase/,"` ;;
for f in `LC_ALL=C join -t"$delimiter" "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_last_column"`; do
case "$f" in
build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;;
+ doc/*) g=`echo "$f" | sed -e "s,^doc/,$docbase/,"` ;;
lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;;
m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;;
tests/*) g=`echo "$f" | sed -e "s,^tests/,$testsbase/,"` ;;
esac
func_add_or_update
done
- rm -rf "$tmp"
- # Undo the effect of the previous 'trap' command. Some shellology:
- # We cannot use "trap - 0 1 2 3 15", because Solaris sh would attempt to
- # execute the command "-". "trap '' ..." is fine only for signal 0 (= normal
- # exit); for the others we need to call 'exit' explicitly. The value of $? is
- # 128 + signal number and is set before the trap-registered command is run.
- trap '' 0
- trap 'exit $?' 1 2 3 15
# Command-line invocation printed in a comment in generated gnulib-cache.m4.
actioncmd="gnulib-tool --import"
actioncmd="$actioncmd --lib=$libname"
actioncmd="$actioncmd --source-base=$sourcebase"
actioncmd="$actioncmd --m4-base=$m4base"
+ actioncmd="$actioncmd --doc-base=$docbase"
actioncmd="$actioncmd --aux-dir=$auxdir"
for module in $avoidlist; do
actioncmd="$actioncmd --avoid=$module"
actioncmd="$actioncmd `echo $specified_modules`"
# Create lib/Makefile.am.
- func_emit_lib_Makefile_am > "$destdir"/$sourcebase/Makefile.am.tmp
+ func_dest_tmpfilename $sourcebase/Makefile.am
+ func_emit_lib_Makefile_am > "$tmpfile"
if test -f "$destdir"/$sourcebase/Makefile.am; then
- if cmp "$destdir"/$sourcebase/Makefile.am "$destdir"/$sourcebase/Makefile.am.tmp > /dev/null; then
- rm -f "$destdir"/$sourcebase/Makefile.am.tmp
+ if cmp "$destdir"/$sourcebase/Makefile.am "$tmpfile" > /dev/null; then
+ rm -f "$tmpfile"
else
if $doit; then
echo "Updating $sourcebase/Makefile.am (backup in $sourcebase/Makefile.am~)"
mv -f "$destdir"/$sourcebase/Makefile.am "$destdir"/$sourcebase/Makefile.am~
- mv -f "$destdir"/$sourcebase/Makefile.am.tmp "$destdir"/$sourcebase/Makefile.am
+ mv -f "$tmpfile" "$destdir"/$sourcebase/Makefile.am
else
echo "Update $sourcebase/Makefile.am (backup in $sourcebase/Makefile.am~)"
- rm -f "$destdir"/$sourcebase/Makefile.am.tmp
+ rm -f "$tmpfile"
fi
fi
else
if $doit; then
echo "Creating $sourcebase/Makefile.am"
- mv -f "$destdir"/$sourcebase/Makefile.am.tmp "$destdir"/$sourcebase/Makefile.am
+ mv -f "$tmpfile" "$destdir"/$sourcebase/Makefile.am
else
echo "Create $sourcebase/Makefile.am"
- rm -f "$destdir"/$sourcebase/Makefile.am.tmp
+ rm -f "$tmpfile"
fi
fi
# Create m4/gnulib-cache.m4.
+ func_dest_tmpfilename $m4base/gnulib-cache.m4
(
- echo "# Copyright (C) 2004 Free Software Foundation, Inc."
- echo "# This file is free software, distributed under the terms of the GNU"
- echo "# General Public License. As a special exception to the GNU General"
- echo "# Public License, this file may be distributed as part of a program"
- echo "# that contains a configuration script generated by Autoconf, under"
- echo "# the same distribution terms as the rest of that program."
- echo "#"
- echo "# Generated by gnulib-tool."
+ func_emit_copyright_notice
echo "#"
echo "# This file represents the specification of how gnulib-tool is used."
echo "# It acts as a cache: It is written and read by gnulib-tool."
echo "gl_AVOID([$avoidlist])"
echo "gl_SOURCE_BASE([$sourcebase])"
echo "gl_M4_BASE([$m4base])"
+ echo "gl_DOC_BASE([$docbase])"
echo "gl_TESTS_BASE([$testsbase])"
echo "gl_LIB([$libname])"
test -z "$lgpl" || echo "gl_LGPL"
test -z "$libtool" || echo "gl_LIBTOOL"
echo "gl_MACRO_PREFIX([$macro_prefix])"
- ) > "$destdir"/$m4base/gnulib-cache.m4.tmp
+ ) > "$tmpfile"
if test -f "$destdir"/$m4base/gnulib-cache.m4; then
- if cmp "$destdir"/$m4base/gnulib-cache.m4 "$destdir"/$m4base/gnulib-cache.m4.tmp > /dev/null; then
- rm -f "$destdir"/$m4base/gnulib-cache.m4.tmp
+ if cmp "$destdir"/$m4base/gnulib-cache.m4 "$tmpfile" > /dev/null; then
+ rm -f "$tmpfile"
else
if $doit; then
echo "Updating $m4base/gnulib-cache.m4 (backup in $m4base/gnulib-cache.m4~)"
mv -f "$destdir"/$m4base/gnulib-cache.m4 "$destdir"/$m4base/gnulib-cache.m4~
- mv -f "$destdir"/$m4base/gnulib-cache.m4.tmp "$destdir"/$m4base/gnulib-cache.m4
+ mv -f "$tmpfile" "$destdir"/$m4base/gnulib-cache.m4
else
echo "Update $m4base/gnulib-cache.m4 (backup in $m4base/gnulib-cache.m4~)"
if false; then
- cat "$destdir"/$m4base/gnulib-cache.m4.tmp
+ cat "$tmpfile"
echo
echo "# gnulib-cache.m4 ends here"
fi
- rm -f "$destdir"/$m4base/gnulib-cache.m4.tmp
+ rm -f "$tmpfile"
fi
fi
else
if $doit; then
echo "Creating $m4base/gnulib-cache.m4"
- mv -f "$destdir"/$m4base/gnulib-cache.m4.tmp "$destdir"/$m4base/gnulib-cache.m4
+ mv -f "$tmpfile" "$destdir"/$m4base/gnulib-cache.m4
else
echo "Create $m4base/gnulib-cache.m4"
- cat "$destdir"/$m4base/gnulib-cache.m4.tmp
- rm -f "$destdir"/$m4base/gnulib-cache.m4.tmp
+ cat "$tmpfile"
+ rm -f "$tmpfile"
fi
fi
# Create m4/gnulib-comp.m4.
+ func_dest_tmpfilename $m4base/gnulib-comp.m4
(
- echo "# Copyright (C) 2004 Free Software Foundation, Inc."
- echo "# This file is free software, distributed under the terms of the GNU"
- echo "# General Public License. As a special exception to the GNU General"
- echo "# Public License, this file may be distributed as part of a program"
- echo "# that contains a configuration script generated by Autoconf, under"
- echo "# the same distribution terms as the rest of that program."
- echo "#"
- echo "# Generated by gnulib-tool."
+ func_emit_copyright_notice
echo "#"
echo "# This file represents the compiled summary of the specification in"
echo "# gnulib-cache.m4. It lists the computed macro invocations that need"
echo "AC_DEFUN([${macro_prefix}_EARLY],"
echo "["
echo " AC_REQUIRE([AC_PROG_RANLIB])"
- if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 > /dev/null; then
+ if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then
echo " AC_REQUIRE([AC_GNU_SOURCE])"
fi
- if grep gl_USE_SYSTEM_EXTENSIONS "$destdir"/$m4base/*.m4 > /dev/null; then
+ if grep gl_USE_SYSTEM_EXTENSIONS "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then
echo " AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])"
fi
- if grep gl_LOCK "$destdir"/$m4base/*.m4 > /dev/null; then
+ if grep gl_LOCK "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then
echo " AC_REQUIRE([gl_LOCK])"
fi
echo "])"
echo "AC_DEFUN([${macro_prefix}_FILE_LIST], ["
echo "$files" | sed -e 's,^, ,'
echo "])"
- ) > "$destdir"/$m4base/gnulib-comp.m4.tmp
+ ) > "$tmpfile"
if test -f "$destdir"/$m4base/gnulib-comp.m4; then
- if cmp "$destdir"/$m4base/gnulib-comp.m4 "$destdir"/$m4base/gnulib-comp.m4.tmp > /dev/null; then
- rm -f "$destdir"/$m4base/gnulib-comp.m4.tmp
+ if cmp "$destdir"/$m4base/gnulib-comp.m4 "$tmpfile" > /dev/null; then
+ rm -f "$tmpfile"
else
if $doit; then
echo "Updating $m4base/gnulib-comp.m4 (backup in $m4base/gnulib-comp.m4~)"
mv -f "$destdir"/$m4base/gnulib-comp.m4 "$destdir"/$m4base/gnulib-comp.m4~
- mv -f "$destdir"/$m4base/gnulib-comp.m4.tmp "$destdir"/$m4base/gnulib-comp.m4
+ mv -f "$tmpfile" "$destdir"/$m4base/gnulib-comp.m4
else
echo "Update $m4base/gnulib-comp.m4 (backup in $m4base/gnulib-comp.m4~)"
if false; then
- cat "$destdir"/$m4base/gnulib-comp.m4.tmp
+ cat "$tmpfile"
echo
echo "# gnulib-comp.m4 ends here"
fi
- rm -f "$destdir"/$m4base/gnulib-comp.m4.tmp
+ rm -f "$tmpfile"
fi
fi
else
if $doit; then
echo "Creating $m4base/gnulib-comp.m4"
- mv -f "$destdir"/$m4base/gnulib-comp.m4.tmp "$destdir"/$m4base/gnulib-comp.m4
+ mv -f "$tmpfile" "$destdir"/$m4base/gnulib-comp.m4
else
echo "Create $m4base/gnulib-comp.m4"
- cat "$destdir"/$m4base/gnulib-comp.m4.tmp
- rm -f "$destdir"/$m4base/gnulib-comp.m4.tmp
+ cat "$tmpfile"
+ rm -f "$tmpfile"
fi
fi
if test -n "$inctests"; then
# Create tests/Makefile.am.
- func_emit_tests_Makefile_am > "$destdir"/$testsbase/Makefile.am.tmp
+ func_dest_tmpfilename $testsbase/Makefile.am
+ func_emit_tests_Makefile_am > "$tmpfile"
if test -f "$destdir"/$testsbase/Makefile.am; then
- if cmp "$destdir"/$testsbase/Makefile.am "$destdir"/$testsbase/Makefile.am.tmp > /dev/null; then
- rm -f "$destdir"/$testsbase/Makefile.am.tmp
+ if cmp "$destdir"/$testsbase/Makefile.am "$tmpfile" > /dev/null; then
+ rm -f "$tmpfile"
else
if $doit; then
echo "Updating $testsbase/Makefile.am (backup in $testsbase/Makefile.am~)"
mv -f "$destdir"/$testsbase/Makefile.am "$destdir"/$testsbase/Makefile.am~
- mv -f "$destdir"/$testsbase/Makefile.am.tmp "$destdir"/$testsbase/Makefile.am
+ mv -f "$tmpfile" "$destdir"/$testsbase/Makefile.am
else
echo "Update $testsbase/Makefile.am (backup in $testsbase/Makefile.am~)"
- rm -f "$destdir"/$testsbase/Makefile.am.tmp
+ rm -f "$tmpfile"
fi
fi
else
if $doit; then
echo "Creating $testsbase/Makefile.am"
- mv -f "$destdir"/$testsbase/Makefile.am.tmp "$destdir"/$testsbase/Makefile.am
+ mv -f "$tmpfile" "$destdir"/$testsbase/Makefile.am
else
echo "Create $testsbase/Makefile.am"
- rm -f "$destdir"/$testsbase/Makefile.am.tmp
+ rm -f "$tmpfile"
fi
fi
fi
+ rm -rf "$tmp"
+ # Undo the effect of the previous 'trap' command. Some shellology:
+ # We cannot use "trap - 0 1 2 3 15", because Solaris sh would attempt to
+ # execute the command "-". "trap '' ..." is fine only for signal 0 (= normal
+ # exit); for the others we need to call 'exit' explicitly. The value of $? is
+ # 128 + signal number and is set before the trap-registered command is run.
+ trap '' 0
+ trap 'exit $?' 1 2 3 15
+
echo "Finished."
echo
echo "You may need to add #include directives for the following .h files."
- for module in $modules; do
- func_get_include_directive "$module"
- done | LC_ALL=C sort -u | sed -e '/^$/d;' -e 's/^/ /'
+ (
+ # First the #include <...> directives without #ifs, sorted for convenience.
+ for module in $modules; do
+ if func_get_include_directive "$module" | grep '^#if' >/dev/null; then
+ :
+ else
+ func_get_include_directive "$module" | grep -v 'include "'
+ fi
+ done | LC_ALL=C sort -u
+ # Then the #include "..." directives without #ifs, sorted for convenience.
+ for module in $modules; do
+ if func_get_include_directive "$module" | grep '^#if' >/dev/null; then
+ :
+ else
+ func_get_include_directive "$module" | grep 'include "'
+ fi
+ done | LC_ALL=C sort -u
+ # Then the #include directives that are surrounded by #ifs. Not sorted.
+ for module in $modules; do
+ if func_get_include_directive "$module" | grep '^#if' >/dev/null; then
+ func_get_include_directive "$module"
+ fi
+ done
+ ) | sed -e '/^$/d;' -e 's/^/ /'
echo
echo "Don't forget to"
echo " - add \"$sourcebase/Makefile\" to AC_CONFIG_FILES in $configure_ac,"
echo "AC_PROG_MAKE_SET"
echo "AC_PROG_RANLIB"
echo
- if grep AC_GNU_SOURCE "$testdir"/m4/*.m4 > /dev/null; then
+ if grep AC_GNU_SOURCE "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then
echo "AC_GNU_SOURCE"
echo
fi
- if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 > /dev/null; then
+ if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then
echo "gl_USE_SYSTEM_EXTENSIONS"
echo
fi
- if grep gl_LOCK "$testdir"/m4/*.m4 > /dev/null; then
+ if grep gl_LOCK "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then
echo "gl_LOCK"
echo
fi
echo "AC_PROG_MAKE_SET"
echo "AC_PROG_RANLIB"
echo
- if grep AC_GNU_SOURCE "$testdir"/m4/*.m4 > /dev/null; then
+ if grep AC_GNU_SOURCE "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then
echo "AC_GNU_SOURCE"
echo
fi
- if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 > /dev/null; then
+ if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then
echo "gl_USE_SYSTEM_EXTENSIONS"
echo
fi
- if grep gl_LOCK "$testdir"/m4/*.m4 > /dev/null; then
+ if grep gl_LOCK "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then
echo "gl_LOCK"
echo
fi
;;
import | update )
-
+
# Where to import.
if test -z "$destdir"; then
destdir=.
# First use of gnulib in the given m4base.
test -n "$supplied_libname" || supplied_libname=true
test -n "$sourcebase" || sourcebase="lib"
+ test -n "$docbase" || docbase="doc"
test -n "$testsbase" || testsbase="tests"
test -n "$macro_prefix" || macro_prefix="gl"
fi
# To get this list of directories, look at Makefile.am. (Not at
# configure, because it may be omitted from CVS. Also, don't run
# "find $destdir -name gnulib-cache.m4", as it might be too expensive.)
- aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ ]*=' "$destdir"/Makefile.am | sed -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/'`
+ aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ ]*=' "$destdir"/Makefile.am | sed -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/'`
m4dirs=
m4dirs_count=0
m4dir_is_next=
test -n "$supplied_libname" || supplied_libname=true
test -n "$sourcebase" || sourcebase="lib"
m4base="m4"
+ test -n "$docbase" || docbase="doc"
test -n "$testsbase" || testsbase="tests"
test -n "$macro_prefix" || macro_prefix="gl"
func_import "$*"
projects / gnulib.git / blobdiff