#! /bin/sh
#
-# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002-2006 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# This program is meant for authors or maintainers which want to import
progname=$0
package=gnulib
-cvsdatestamp='$Date: 2005-09-19 15:29:40 $'
+cvsdatestamp='$Date: 2006-01-26 12:51:48 $'
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
# ;;
#esac
-AUTORECONF="${AUTOCONFPATH}autoreconf"
+# You can set AUTOMAKEPATH to empty if automake 1.9.x is already in your PATH.
+AUTOMAKEPATH=
+
+# If you didn't set AUTOCONFPATH and AUTOMAKEPATH, you can also set the
+# variables AUTOCONF, ACLOCAL, AUTOMAKE, AUTORECONF individually.
+if test -z "${AUTOCONF}" || test -n "${AUTOCONFPATH}"; then
+ AUTOCONF="${AUTOCONFPATH}autoconf"
+fi
+if test -z "${ACLOCAL}" || test -n "${AUTOMAKEPATH}"; then
+ ACLOCAL="${AUTOMAKEPATH}aclocal"
+fi
+if test -z "${AUTOMAKE}" || test -n "${AUTOMAKEPATH}"; then
+ AUTOMAKE="${AUTOMAKEPATH}automake"
+fi
+if test -z "${AUTORECONF}" || test -n "${AUTOCONFPATH}"; then
+ AUTORECONF="${AUTOCONFPATH}autoreconf"
+fi
# func_usage
# outputs to stdout the --help usage message.
echo "\
Usage: gnulib-tool --list
gnulib-tool --import [module1 ... moduleN]
+ gnulib-tool --update
gnulib-tool --create-testdir --dir=directory module1 ... moduleN
gnulib-tool --create-megatestdir --dir=directory [module1 ... moduleN]
gnulib-tool --test --dir=directory module1 ... moduleN
{
# Use the mktemp program if available. If not available, hide the error
# message.
- tmp=`(umask 077 && mktemp -d -q "$TMPDIR/glXXXXXX") 2>/dev/null` &&
+ tmp=`(umask 077 && mktemp -d "$TMPDIR/glXXXXXX") 2>/dev/null` &&
test -n "$tmp" && test -d "$tmp"
} ||
{
exit 1
}
-# func_cp_if_changed SRC DEST
-# Like cp, but avoids munging timestamps if the file hasn't changed.
-# Uses also the variables
-# - dry_run true if actions shall only be printed, blank otherwise
-func_cp_if_changed ()
-{
- if test $# -ne 2; then
- echo "usage: func_cp_if_changed SRC DEST" >&2
- fi
- test -n "$dry_run" && dry=echo
- if cmp "$1" "$2" >/dev/null 2>&1; then
- :
- else
- $dry cp -p "$1" "$2"
- fi
-}
-
-# func_mv_if_changed SRC DEST
-# Like mv, but avoids munging timestamps if the file hasn't changed.
-# Removes SRC if it is not renamed.
-# Uses also the variables
-# - dry_run true if actions shall only be printed, blank otherwise
-func_mv_if_changed ()
-{
- if test $# -ne 2; then
- echo "usage: func_mv_if_changed SRC DEST" >&2
- fi
- test -n "$dry_run" && dry=echo
- if cmp "$1" "$2" >/dev/null 2>&1; then
- $dry rm "$1"
- else
- $dry mv "$1" "$2"
- fi
-}
+# func_readlink SYMLINK
+# outputs the target of the given symlink.
+if (type -p readlink) > /dev/null 2>&1; then
+ func_readlink ()
+ {
+ # Use the readlink program from GNU coreutils.
+ readlink "$1"
+ }
+else
+ func_readlink ()
+ {
+ # Use two sed invocations. A single sed -n -e 's,^.* -> \(.*\)$,\1,p'
+ # would do the wrong thing if the link target contains " -> ".
+ LC_ALL=C ls -l "$1" | sed -e 's, -> ,#%%#,' | sed -n -e 's,^.*#%%#\(.*\)$,\1,p'
+ }
+fi
# func_ln_if_changed SRC DEST
# Like ln -s, but avoids munging timestamps if the link is correct.
-# Uses also the variables
-# - dry_run true if actions shall only be printed, blank otherwise
func_ln_if_changed ()
{
if test $# -ne 2; then
echo "usage: func_ln_if_changed SRC DEST" >&2
fi
- test -n "$dry_run" && dry=echo
- if test -L "$2" -a "$1" = "`readlink "$2"`"; then
+ if test -L "$2" && test "$1" = "`func_readlink "$2"`"; then
:
else
- $dry rm -f "$2"
- $dry ln -s "$1" "$2"
+ rm -f "$2"
+ ln -s "$1" "$2"
fi
}
# - lgpl true if --lgpl was given, blank otherwise
# - libtool true if --libtool was given, blank otherwise
# - do_changelog false if --no-changelog was given, : otherwise
-# - dry_run true if --dry-run was given, blank otherwise
+# - doit : if actions shall be executed, false if only to be printed
{
mode=
destdir=
libtool=
macro_prefix=
do_changelog=:
- dry_run=
+ doit=:
symbolic=
supplied_opts="$@"
--import | --impor | --impo | --imp | --im | --i )
mode=import
shift ;;
+ --update | --updat | --upda | --upd | --up | --u )
+ mode=update
+ shift ;;
--create-testdir | --create-testdi | --create-testd | --create-test | --create-tes | --create-te | --create-t )
mode=create-testdir
shift ;;
do_changelog=false
shift ;;
--dry-run )
- dry_run=true
+ doit=false
shift ;;
- -s | --symbolic | --symlink )
+ -s | --symbolic | --symboli | --symbol | --symbo | --symb | --symlink | --symlin | --symli | --syml | --sym | --sy )
symbolic=true
shift ;;
--help | --hel | --he | --h )
func_version
exit 0 ;;
-- )
- # Stop option prcessing
+ # Stop option processing
shift
break ;;
-* )
break ;;
esac
done
+
+ if test "$mode" = update; then
+ if test $# != 0; then
+ echo "gnulib-tool: too many arguments in 'update' mode" 1>&2
+ echo "Try 'gnulib-tool --help' for more information." 1>&2
+ echo "If you really want to modify the gnulib configuration of your project," 1>&2
+ 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" \
+ || test -n "$testsbase" || test -n "$auxdir" || test -n "$inctests" \
+ || 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
+ echo "If you really want to modify the gnulib configuration of your project," 1>&2
+ echo "you need to use 'gnulib --import' - at your own risk!" 1>&2
+ exit 1
+ fi
+ do_changelog=false
+ fi
+
+ # Remove trailing slashes from the directory names. This is necessary for
+ # m4base (to avoid an error in func_import) and optional for the others.
+ sed_trimtrailingslashes='s,\([^/]\)//*$,\1,'
+ case "$sourcebase" in
+ */ ) sourcebase=`echo "$sourcebase" | sed -e "$sed_trimtrailingslashes"` ;;
+ esac
+ case "$m4base" in
+ */ ) m4base=`echo "$m4base" | sed -e "$sed_trimtrailingslashes"` ;;
+ esac
+ case "$testsbase" in
+ */ ) testsbase=`echo "$testsbase" | sed -e "$sed_trimtrailingslashes"` ;;
+ esac
+ case "$auxdir" in
+ */ ) auxdir=`echo "$auxdir" | sed -e "$sed_trimtrailingslashes"` ;;
+ esac
}
case "$0" in
esac
while test -h "$self_abspathname"; do
# Resolve symbolic link.
- sedexpr1='s, -> ,#%%#,'
- sedexpr2='s,^.*#%%#\(.*\)$,\1,p'
- linkval=`LC_ALL=C ls -l "$self_abspathname" | sed -e "$sedexpr1" | sed -n -e "$sedexpr2"`
+ linkval=`func_readlink "$self_abspathname"`
test -n "$linkval" || break
case "$linkval" in
/* ) self_abspathname="$linkval" ;;
(cd "$gnulib_dir/modules" && ls -1) \
| sed -e '/^CVS$/d' -e '/^ChangeLog$/d' -e '/^README$/d' -e '/^TEMPLATE$/d' -e '/^TEMPLATE-TESTS$/d' -e '/~$/d' \
| sed -e '/-tests$/d' \
- | sort
+ | LC_ALL=C sort
}
# func_verify_module
func_verify_module
if test -n "$module"; then
# Duplicate dependencies are harmless, but Jim wants a warning.
- duplicated_deps=`func_get_dependencies $module | sort | uniq -d`
+ duplicated_deps=`func_get_dependencies $module | LC_ALL=C sort | LC_ALL=C uniq -d`
if test -n "$duplicated_deps"; then
echo "warning: module $module has duplicated dependencies: "`echo $duplicated_deps` 1>&2
fi
fi
fi
done
- xmodules=`for m in $xmodules; do echo $m; done | sort | uniq`
+ xmodules=`for m in $xmodules; do echo $m; done | LC_ALL=C sort | LC_ALL=C uniq`
if test "$xmodules" = "$modules"; then
break
fi
done
}
+# func_modules_add_dummy
+# Input:
+# - modules list of modules, including dependencies
+# Output:
+# - modules list of modules, including 'dummy' if needed
+func_modules_add_dummy ()
+{
+ have_lib_SOURCES=
+ sed_remove_backslash_newline=':a
+/\\$/{
+s/\\$//
+N
+s/\n//
+ba
+}'
+ for module in $modules; do
+ 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
+ # Ignore .h files since they are not compiled.
+ case "$file" in
+ *.h) ;;
+ *) have_lib_SOURCES=yes ;;
+ esac
+ done
+ fi
+ done
+ # Add the dummy module, to make sure the library will be non-empty.
+ if test -z "$have_lib_SOURCES"; then
+ modules="$modules dummy"
+ fi
+}
+
# func_modules_to_filelist
# Input:
# - modules list of modules, including dependencies
files="$files "`func_get_filelist $module`
fi
done
- files=`for f in $files; do echo $f; done | sort | uniq`
+ files=`for f in $files; do echo $f; done | LC_ALL=C sort | LC_ALL=C uniq`
}
# func_emit_lib_Makefile_am
echo
echo "${libname}_${libext}_SOURCES ="
echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@"
+ echo "noinst_HEADERS ="
echo "EXTRA_DIST ="
echo "BUILT_SOURCES ="
echo "SUFFIXES ="
# - libname library name
# - libtool true if libtool will be used, blank otherwise
# - sourcebase relative directory containing lib source code
+# - m4base relative directory containing autoconf macros
+# - testsbase relative directory containing unit test code
func_emit_tests_Makefile_am ()
{
if test -n "$libtool"; then
else
libext=a
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 "#"
# Generate dependencies here, since it eases the debugging of test failures.
echo "AUTOMAKE_OPTIONS = 1.5 foreign"
echo
- echo "ACLOCAL_AMFLAGS = -I ../m4"
+ echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}"
echo
+ # Nothing is being added to SUBDIRS; nevertheless the existence of this
+ # variable is needed to avoid an error from automake:
+ # "AM_GNU_GETTEXT used but SUBDIRS not defined"
+ echo "SUBDIRS ="
echo "TESTS ="
+ echo "TESTS_ENVIRONMENT ="
echo "noinst_PROGRAMS ="
+ echo "check_PROGRAMS ="
+ echo "noinst_HEADERS ="
echo "EXTRA_DIST ="
echo "BUILT_SOURCES ="
echo "SUFFIXES ="
echo
echo "AM_CPPFLAGS = \\"
echo " -I. -I\$(srcdir) \\"
- echo " -I.. -I\$(srcdir)/.. \\"
- echo " -I../${sourcebase-lib} -I\$(srcdir)/../${sourcebase-lib}"
+ echo " -I${testsbase_inverse} -I\$(srcdir)/${testsbase_inverse} \\"
+ echo " -I${testsbase_inverse}/${sourcebase-lib} -I\$(srcdir)/${testsbase_inverse}/${sourcebase-lib}"
echo
- echo "LDADD = ../${sourcebase-lib}/${libname}.${libext}"
+ echo "LDADD = ${testsbase_inverse}/${sourcebase-lib}/${libname}.${libext}"
echo
for module in $modules; do
func_verify_tests_module
# - libname library name
# - sourcebase directory relative to destdir where to place source code
# - m4base directory relative to destdir where to place *.m4 macros
+# - 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
# - avoidlist list of modules to avoid, from --avoid
# - lgpl true if library's license shall be LGPL, blank otherwise
# - libtool true if libtool will be used, blank otherwise
# - guessed_libtool true if the configure.ac file uses libtool, blank otherwise
# - macro_prefix prefix of gl_EARLY, gl_INIT macros to use
-# - dry_run true if actions shall only be printed, blank otherwise
+# - doit : if actions shall be executed, false if only to be printed
# - symbolic true if files should be symlinked, copied otherwise
func_import ()
{
cached_avoidlist=
cached_sourcebase=
cached_m4base=
+ cached_testsbase=
cached_libname=
cached_lgpl=
cached_libtool=
/gl_M4_BASE(/ {
s,^.*gl_M4_BASE([[ ]*\([^])]*\).*$,cached_m4base="\1",p
}
+ /gl_TESTS_BASE(/ {
+ s,^.*gl_TESTS_BASE([[ ]*\([^])]*\).*$,cached_testsbase="\1",p
+ }
/gl_LIB(/ {
s,^.*gl_LIB([[ ]*\([^])]*\).*$,cached_libname="\1",p
}
func_fatal_error "missing --source-base option"
fi
fi
+ # The testsbase defaults to the cached one.
+ if test -z "$testsbase"; then
+ testsbase="$cached_testsbase"
+ if test -z "$testsbase"; then
+ func_fatal_error "missing --tests-base option"
+ fi
+ fi
# The libname defaults to the cached one.
if test -z "$supplied_libname"; then
libname="$cached_libname"
fi
# Canonicalize the list of specified modules.
- specified_modules=`for m in $specified_modules; do echo $m; done | sort | uniq`
+ specified_modules=`for m in $specified_modules; do echo $m; done | LC_ALL=C sort | LC_ALL=C uniq`
# Determine final module list.
modules="$specified_modules"
echo "Module list with included dependencies:"
echo "$modules" | sed -e 's/^/ /'
+ # Add the dummy module if needed.
+ func_modules_add_dummy
+
# If --lgpl, check the license of modules are compatible.
if test -n "$lgpl"; then
for module in $modules; do
license=`func_get_license $module`
case $license in
- LGPL | 'public domain' | 'unlimited') ;;
+ LGPL | 'GPLed build tool' | 'public domain' | 'unlimited') ;;
*) func_fatal_error "incompatible license on module $module: $license" ;;
esac
done
fi
# Create directories.
- test -d "$destdir/$sourcebase" \
- || { test -n "$dry_run" || mkdir "$destdir/$sourcebase" || func_fatal_error "failed"; }
- test -d "$destdir/$m4base" \
- || { test -n "$dry_run" || mkdir "$destdir/$m4base" || func_fatal_error "failed"; }
- test -d "$destdir/$auxdir" \
- || { test -n "$dry_run" || mkdir "$destdir/$auxdir" || func_fatal_error "failed"; }
+ if test ! -d "$destdir/$sourcebase"; then
+ if $doit; then
+ echo "Creating directory $destdir/$sourcebase"
+ mkdir "$destdir/$sourcebase" || func_fatal_error "failed"
+ else
+ echo "Create directory $destdir/$sourcebase"
+ fi
+ fi
+ if test ! -d "$destdir/$m4base"; then
+ if $doit; then
+ echo "Creating directory $destdir/$m4base"
+ mkdir "$destdir/$m4base" || func_fatal_error "failed"
+ else
+ echo "Create directory $destdir/$m4base"
+ fi
+ fi
+ if test -n "$inctests"; then
+ if test ! -d "$destdir/$testsbase"; then
+ if $doit; then
+ echo "Creating directory $destdir/$testsbase"
+ mkdir "$destdir/$testsbase" || func_fatal_error "failed"
+ else
+ echo "Create directory $destdir/$testsbase"
+ fi
+ fi
+ fi
+ if test ! -d "$destdir/$auxdir"; then
+ if $doit; then
+ echo "Creating directory $destdir/$auxdir"
+ mkdir "$destdir/$auxdir" || func_fatal_error "failed"
+ else
+ echo "Create directory $destdir/$auxdir"
+ fi
+ fi
# Copy files or make symbolic links. Remove obsolete files.
func_tmpdir
build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;;
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/,"` ;;
*) g="$f" ;;
esac
echo "$g""$delimiter""$f"
build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;;
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/,"` ;;
*) g="$f" ;;
esac
echo "$g""$delimiter""$f"
done | LC_ALL=C sort > "$tmp"/new-files
# First the files that are in old-files, but not in new-files:
- for g in `LC_ALL=C join -t"$delimiter" -v1 "$tmp"/old-files "$tmp"/new-files | sed -e 's,'"$delimiter"'.*,,'`; do
+ sed_take_first_column='s,'"$delimiter"'.*,,'
+ for g in `LC_ALL=C join -t"$delimiter" -v1 "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_first_column"`; do
# Remove the file. Do nothing if the user already removed it.
if test -f "$destdir/$g"; then
- echo "Removing file $g (backup in ${g}~)"
- test -n "$dry_run" && dry=echo
- $dry mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed"
+ if $doit; then
+ echo "Removing file $g (backup in ${g}~)"
+ mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed"
+ else
+ echo "Remove file $g (backup in ${g}~)"
+ fi
fi
done
# func_add_or_update handles a file that ought to be present afterwards.
: # The file has not changed.
else
# Replace the file.
- if test -n "$already_present"; then
- echo "Updating file $g (backup in ${g}~)"
- else
- echo "Replacing file $g (non-gnulib code backuped in ${g}~) !!"
- fi
- test -n "$dry_run" && dry=echo
- $dry mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed"
- if test -n "$symbolic" && cmp "$gnulib_dir/$f" "$destdir/$g.tmp" > /dev/null; then
- func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g"
+ if $doit; then
+ if test -n "$already_present"; then
+ echo "Updating file $g (backup in ${g}~)"
+ else
+ 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
+ func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g"
+ else
+ mv -f "$destdir/$g.tmp" "$destdir/${g}" || func_fatal_error "failed"
+ fi
else
- $dry mv -f "$destdir/$g.tmp" "$destdir/${g}" || func_fatal_error "failed"
+ if test -n "$already_present"; then
+ echo "Update file $g (backup in ${g}~)"
+ else
+ echo "Replace file $g (non-gnulib code backuped in ${g}~) !!"
+ fi
fi
fi
else
# Install the file.
# Don't protest if the file should be there but isn't: it happens
# frequently that developers don't put autogenerated files into CVS.
- echo "Copying file $g"
- test -n "$dry_run" && dry=echo
- if test -n "$symbolic" && cmp "$gnulib_dir/$f" "$destdir/$g.tmp" > /dev/null; then
- func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g"
+ if $doit; then
+ echo "Copying file $g"
+ if test -n "$symbolic" && cmp "$gnulib_dir/$f" "$destdir/$g.tmp" > /dev/null; then
+ func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g"
+ else
+ mv -f "$destdir/$g.tmp" "$destdir/${g}" || func_fatal_error "failed"
+ fi
else
- $dry mv -f "$destdir/$g.tmp" "$destdir/${g}" || func_fatal_error "failed"
+ echo "Copy file $g"
fi
fi
rm -f "$destdir/$g.tmp"
}
# Then the files that are in new-files, but not in old-files:
+ sed_take_last_column='s,^.*'"$delimiter"',,'
already_present=
- for f in `LC_ALL=C join -t"$delimiter" -v2 "$tmp"/old-files "$tmp"/new-files | sed -e 's,'^.*"$delimiter"',,'`; do
+ 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/,"` ;;
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/,"` ;;
*) g="$f" ;;
esac
func_add_or_update
done
# Then the files that are in new-files and in old-files:
already_present=true
- for f in `LC_ALL=C join -t"$delimiter" "$tmp"/old-files "$tmp"/new-files | sed -e 's,'^.*"$delimiter"',,'`; do
+ 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/,"` ;;
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/,"` ;;
*) g="$f" ;;
esac
func_add_or_update
done
rm -rf "$tmp"
- trap - 0 1 2 3 15
+ # 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 `echo $specified_modules`"
# Create lib/Makefile.am.
- if test -z "$dry_run"; then
- func_emit_lib_Makefile_am > "$destdir"/$sourcebase/Makefile.am.tmp
- 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
- else
+ func_emit_lib_Makefile_am > "$destdir"/$sourcebase/Makefile.am.tmp
+ 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
+ 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
+ else
+ echo "Update $sourcebase/Makefile.am (backup in $sourcebase/Makefile.am~)"
+ rm -f "$destdir"/$sourcebase/Makefile.am.tmp
fi
- else
+ fi
+ else
+ if $doit; then
echo "Creating $sourcebase/Makefile.am"
mv -f "$destdir"/$sourcebase/Makefile.am.tmp "$destdir"/$sourcebase/Makefile.am
+ else
+ echo "Create $sourcebase/Makefile.am"
+ rm -f "$destdir"/$sourcebase/Makefile.am.tmp
fi
- else
- echo "Creating $sourcebase/Makefile.am..."
- func_emit_lib_Makefile_am
fi
# Create m4/gnulib-cache.m4.
(
- if test -z "$dry_run"; then
- exec > "$destdir"/$m4base/gnulib-cache.m4.tmp
- else
- echo "Creating $m4base/gnulib-cache.m4..."
- echo "# $destdir/$m4base/gnulib-cache.m4"
- fi
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 "gl_AVOID([$avoidlist])"
echo "gl_SOURCE_BASE([$sourcebase])"
echo "gl_M4_BASE([$m4base])"
+ 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])"
- echo
- echo "# gnulib-cache.m4 ends here"
- )
- if test -z "$dry_run"; then
- 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
- else
+ ) > "$destdir"/$m4base/gnulib-cache.m4.tmp
+ 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
+ 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
+ else
+ echo "Update $m4base/gnulib-cache.m4 (backup in $m4base/gnulib-cache.m4~)"
+ if false; then
+ cat "$destdir"/$m4base/gnulib-cache.m4.tmp
+ echo
+ echo "# gnulib-cache.m4 ends here"
+ fi
+ rm -f "$destdir"/$m4base/gnulib-cache.m4.tmp
fi
- else
+ fi
+ else
+ if $doit; then
echo "Creating $m4base/gnulib-cache.m4"
mv -f "$destdir"/$m4base/gnulib-cache.m4.tmp "$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
fi
fi
# Create m4/gnulib-comp.m4.
(
- if test -z "$dry_run"; then
- exec > "$destdir"/$m4base/gnulib-comp.m4.tmp
- else
- echo "Creating $m4base/gnulib-comp.m4..."
- echo "# $destdir/$m4base/gnulib-comp.m4"
- fi
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 "# any checks for libraries, header files, types and library functions."
echo "AC_DEFUN([${macro_prefix}_EARLY],"
echo "["
+ echo " AC_REQUIRE([AC_PROG_RANLIB])"
if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 > /dev/null; then
echo " AC_REQUIRE([AC_GNU_SOURCE])"
fi
if grep gl_USE_SYSTEM_EXTENSIONS "$destdir"/$m4base/*.m4 > /dev/null; then
echo " AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])"
fi
+ if grep gl_LOCK "$destdir"/$m4base/*.m4 > /dev/null; then
+ echo " AC_REQUIRE([gl_LOCK])"
+ fi
echo "])"
echo
echo "# This macro should be invoked from $configure_ac, in the section"
echo "# \"Check for header files, types and library functions\"."
echo "AC_DEFUN([${macro_prefix}_INIT],"
echo "["
+ if test -z "$libtool"; then
+ echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
+ else
+ echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
+ fi
+ if test "$auxdir" != "build-aux"; then
+ sed_replace_build_aux='
+ :a
+ /AC_CONFIG_FILES(.*:build-aux\/.*)/{
+ s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)|
+ ba
+ }'
+ sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'`
+ else
+ sed_replace_build_aux=
+ fi
for module in $modules; do
func_verify_module
if test -n "$module"; then
- func_get_autoconf_snippet "$module" | sed -e '/^$/d;' -e 's/^/ /' -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./'
+ func_get_autoconf_snippet "$module" \
+ | sed -e '/^$/d;' -e 's/^/ /' \
+ -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./' \
+ -e "$sed_replace_build_aux"
if test "$module" = 'alloca' && test -n "$libtool"; then
echo 'changequote(,)dnl'
echo 'LTALLOCA=`echo "$ALLOCA" | sed '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`'
echo "AC_DEFUN([${macro_prefix}_FILE_LIST], ["
echo "$files" | sed -e 's,^, ,'
echo "])"
- echo
- echo "# gnulib-comp.m4 ends here"
- )
- if test -z "$dry_run"; then
- 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
- else
+ ) > "$destdir"/$m4base/gnulib-comp.m4.tmp
+ 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
+ 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
+ else
+ echo "Update $m4base/gnulib-comp.m4 (backup in $m4base/gnulib-comp.m4~)"
+ if false; then
+ cat "$destdir"/$m4base/gnulib-comp.m4.tmp
+ echo
+ echo "# gnulib-comp.m4 ends here"
+ fi
+ rm -f "$destdir"/$m4base/gnulib-comp.m4.tmp
fi
- else
+ fi
+ else
+ if $doit; then
echo "Creating $m4base/gnulib-comp.m4"
mv -f "$destdir"/$m4base/gnulib-comp.m4.tmp "$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
+ fi
+ fi
+
+ if test -n "$inctests"; then
+ # Create tests/Makefile.am.
+ func_emit_tests_Makefile_am > "$destdir"/$testsbase/Makefile.am.tmp
+ 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
+ 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
+ else
+ echo "Update $testsbase/Makefile.am (backup in $testsbase/Makefile.am~)"
+ rm -f "$destdir"/$testsbase/Makefile.am.tmp
+ fi
+ fi
+ else
+ if $doit; then
+ echo "Creating $testsbase/Makefile.am"
+ mv -f "$destdir"/$testsbase/Makefile.am.tmp "$destdir"/$testsbase/Makefile.am
+ else
+ echo "Create $testsbase/Makefile.am"
+ rm -f "$destdir"/$testsbase/Makefile.am.tmp
+ fi
fi
fi
echo
echo "Don't forget to"
echo " - add \"$sourcebase/Makefile\" to AC_CONFIG_FILES in $configure_ac,"
+ if test -n "$inctests"; then
+ echo " - add \"$testsbase/Makefile\" to AC_CONFIG_FILES in $configure_ac,"
+ fi
sourcebase_dir=`echo "$sourcebase" | sed -n -e 's,/[^/]*$,/,p'`
sourcebase_base=`basename "$sourcebase"`
echo " - mention \"${sourcebase_base}\" in SUBDIRS in ${sourcebase_dir}Makefile.am,"
+ if test -n "$inctests"; then
+ testsbase_dir=`echo "$testsbase" | sed -n -e 's,/[^/]*$,/,p'`
+ testsbase_base=`basename "$testsbase"`
+ echo " - mention \"${testsbase_base}\" in SUBDIRS in ${testsbase_dir}Makefile.am,"
+ fi
echo " - mention \"-I ${m4base}\" in ACLOCAL_AMFLAGS in Makefile.am,"
echo " - invoke ${macro_prefix}_EARLY in $configure_ac, right after AC_PROG_CC,"
echo " - invoke ${macro_prefix}_INIT in $configure_ac."
{
testdir="$1"
modules="$2"
- modules=`for m in $modules; do echo $m; done | sort | uniq`
+ modules=`for m in $modules; do echo $m; done | LC_ALL=C sort | LC_ALL=C uniq`
# Determine final module list.
func_modules_transitive_closure
echo "Module list with included dependencies:"
echo "$modules" | sed -e 's/^/ /'
+ # Add the dummy module if needed.
+ func_modules_add_dummy
+
# Determine final file list.
func_modules_to_filelist
echo "File list:"
test -d "$testdir/tests" || mkdir "$testdir/tests"
# Create tests/Makefile.am.
sourcebase=lib
+ m4base=m4
+ testsbase=tests
func_emit_tests_Makefile_am > "$testdir/tests/Makefile.am"
# Create tests/configure.ac.
(echo "# Process this file with autoconf to produce a configure script."
echo "gl_USE_SYSTEM_EXTENSIONS"
echo
fi
+ if grep gl_LOCK "$testdir"/m4/*.m4 > /dev/null; then
+ echo "gl_LOCK"
+ echo
+ fi
+ if test -z "$libtool"; then
+ echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
+ else
+ echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
+ fi
+ if test "$auxdir" != "build-aux"; then
+ sed_replace_build_aux='
+ :a
+ /AC_CONFIG_FILES(.*:build-aux\/.*)/{
+ s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:../'"$auxdir"'/\2)|
+ ba
+ }'
+ sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'`
+ else
+ sed_replace_build_aux=
+ fi
# We don't have explicit ordering constraints between the various
# autoconf snippets. It's cleanest to put those of the library before
# those of the tests.
for module in $modules; do
func_verify_nontests_module
if test -n "$module"; then
- func_get_autoconf_snippet "$module"
+ func_get_autoconf_snippet "$module" \
+ | sed -e "$sed_replace_build_aux"
fi
done
for module in $modules; do
func_verify_tests_module
if test -n "$module"; then
- func_get_autoconf_snippet "$module"
+ func_get_autoconf_snippet "$module" \
+ | sed -e "$sed_replace_build_aux"
fi
done
echo
echo "gl_USE_SYSTEM_EXTENSIONS"
echo
fi
+ if grep gl_LOCK "$testdir"/m4/*.m4 > /dev/null; then
+ echo "gl_LOCK"
+ echo
+ fi
+ if test -z "$libtool"; then
+ echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
+ else
+ echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
+ fi
+ if test "$auxdir" != "build-aux"; then
+ sed_replace_build_aux='
+ :a
+ /AC_CONFIG_FILES(.*:build-aux\/.*)/{
+ s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)|
+ ba
+ }'
+ sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'`
+ else
+ sed_replace_build_aux=
+ fi
for module in $modules; do
func_verify_nontests_module
if test -n "$module"; then
- func_get_autoconf_snippet "$module"
+ func_get_autoconf_snippet "$module" \
+ | sed -e "$sed_replace_build_aux"
fi
done
echo
(cd "$testdir"
./configure
cd lib
- built_sources=`grep '^BUILT_SOURCES *=' Makefile.in | sed -e 's/^BUILT_SOURCES *=//'`
- if test -n "$built_sources"; then
- make $built_sources
- fi
+ echo 'built_sources: $(BUILT_SOURCES)' >> Makefile
+ make built_sources
cd ..
make distclean
)
# Create autogenerated files.
(cd "$megatestdir"
- echo "executing ${AUTORECONF} --install"
- ${AUTORECONF} --install
+ # Do not use "${AUTORECONF} --install", because autoreconf operates
+ # recursively, but the subdirectories are already finished, therefore
+ # calling autoreconf here would only waste lots of CPU time.
+ echo "executing ${ACLOCAL}"
+ ${ACLOCAL}
+ echo "executing mkdir build-aux"
+ mkdir build-aux
+ echo "executing ${AUTOCONF}"
+ ${AUTOCONF}
+ echo "executing ${AUTOMAKE} --add-missing --copy"
+ ${AUTOMAKE} --add-missing --copy
)
}
func_all_modules
;;
- import )
+ 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 "$testsbase" || testsbase="tests"
test -n "$macro_prefix" || macro_prefix="gl"
fi
func_import "$*"
test -n "$supplied_libname" || supplied_libname=true
test -n "$sourcebase" || sourcebase="lib"
m4base="m4"
+ test -n "$testsbase" || testsbase="tests"
test -n "$macro_prefix" || macro_prefix="gl"
func_import "$*"
else