X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=5f20206147807b02a1d5373c291adee4cd94a02e;hb=41f33021bba216bf24c5d93951fbede15390ea92;hp=1ede05c74c0342e98094a49a7dc70577af5de399;hpb=c9d8406d2c4c7f9d479c268d50f8c70907851cfb;p=gnulib.git diff --git a/gnulib-tool b/gnulib-tool index 1ede05c74..5f2020614 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2005-08-31 20:54:49 $' +cvsdatestamp='$Date: 2005-12-02 13:37:34 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` @@ -44,6 +44,7 @@ func_usage () 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 @@ -122,6 +123,37 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." echo "Written by" "Bruno Haible" "and" "Simon Josefsson" } +# func_tmpdir +# creates a temporary directory. +# Sets variable +# - tmp pathname of freshly created temporary directory +func_tmpdir () +{ + # Use the environment variable TMPDIR, falling back to /tmp. This allows + # users to specify a different temporary directory, for example, if their + # /tmp is filled up or too small. + : ${TMPDIR=/tmp} + { + # Use the mktemp program if available. If not available, hide the error + # message. + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/glXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" + } || + { + # Use a simple mkdir command. It is guaranteed to fail if the directory + # already exists. $RANDOM is bash specific and expands to empty in shells + # other than bash, ksh and zsh. Its use does not increase security; + # rather, it minimizes the probability of failure in a very cluttered /tmp + # directory. + tmp=$TMPDIR/gl$$-$RANDOM + (umask 077 && mkdir "$tmp") + } || + { + echo "$0: cannot create a temporary directory in $TMPDIR" >&2 + { (exit 1); exit 1; } + } +} + # func_fatal_error message # outputs to stderr a fatal error message, and terminates the program. func_fatal_error () @@ -131,56 +163,35 @@ func_fatal_error () 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 } @@ -198,7 +209,7 @@ func_ln_if_changed () # - 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= @@ -214,7 +225,7 @@ func_ln_if_changed () libtool= macro_prefix= do_changelog=: - dry_run= + doit=: symbolic= supplied_opts="$@" @@ -227,6 +238,9 @@ func_ln_if_changed () --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 ;; @@ -337,9 +351,9 @@ func_ln_if_changed () 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 ) @@ -349,7 +363,7 @@ func_ln_if_changed () func_version exit 0 ;; -- ) - # Stop option prcessing + # Stop option processing shift break ;; -* ) @@ -360,6 +374,42 @@ func_ln_if_changed () 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 @@ -378,9 +428,7 @@ 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" ;; @@ -398,7 +446,7 @@ func_all_modules () (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 @@ -545,7 +593,7 @@ func_modules_transitive_closure () 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 @@ -572,7 +620,7 @@ func_modules_transitive_closure () 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 @@ -594,7 +642,7 @@ func_modules_to_filelist () 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 @@ -603,7 +651,6 @@ func_modules_to_filelist () # - modules list of modules, including dependencies # - libname library name # - libtool true if libtool will be used, blank otherwise -# - cmd (optional) command that led to this invocation # - actioncmd (optional) command that will reproduce this invocation func_emit_lib_Makefile_am () { @@ -624,9 +671,6 @@ func_emit_lib_Makefile_am () echo "# the same distribution terms as the rest of that program." echo "#" echo "# Generated by gnulib-tool." - if test -n "$cmd"; then - echo "# Invoked as: $cmd" - fi if test -n "$actioncmd"; then echo "# Reproduce by: $actioncmd" fi @@ -678,6 +722,8 @@ func_emit_lib_Makefile_am () # - 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 @@ -685,6 +731,7 @@ func_emit_tests_Makefile_am () 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 "#" @@ -699,9 +746,10 @@ func_emit_tests_Makefile_am () # 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 echo "TESTS =" + echo "TESTS_ENVIRONMENT =" echo "noinst_PROGRAMS =" echo "EXTRA_DIST =" echo "BUILT_SOURCES =" @@ -713,10 +761,10 @@ func_emit_tests_Makefile_am () 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 @@ -746,14 +794,16 @@ func_emit_tests_Makefile_am () # - 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 -# - supplied_opts all options passed to gnulib-tool func_import () { # Get the cached settings. @@ -761,6 +811,7 @@ func_import () cached_avoidlist= cached_sourcebase= cached_m4base= + cached_testsbase= cached_libname= cached_lgpl= cached_libtool= @@ -783,6 +834,9 @@ func_import () /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 } @@ -836,8 +890,15 @@ func_import () 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 "$libname"; then + if test -z "$supplied_libname"; then libname="$cached_libname" if test -z "$libname"; then func_fatal_error "missing --lib option" @@ -847,9 +908,13 @@ func_import () if test -z "$lgpl"; then lgpl="$cached_lgpl" fi - # Use libtool if specified either way. + # Use libtool if specified either way, or if guessed. if test -z "$libtool"; then - libtool="$cached_libtool" + if test -n "$cached_m4base"; then + libtool="$cached_libtool" + else + libtool="$guessed_libtool" + fi fi # The macro_prefix defaults to the cached one. if test -z "$macro_prefix"; then @@ -860,7 +925,7 @@ func_import () 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" @@ -873,7 +938,7 @@ func_import () 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 @@ -894,102 +959,162 @@ func_import () old_files="$old_files m4/gnulib-tool.m4" fi + # Create directories. + 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. - for f1 in $old_files; do - case "$f1" in - build-aux/*) g1=`echo "$f1" | sed -e "s,^build-aux/,$auxdir/,"` ;; - lib/*) g1=`echo "$f1" | sed -e "s,^lib/,$cached_sourcebase/,"` ;; - m4/*) g1=`echo "$f1" | sed -e "s,^m4/,$cached_m4base/,"` ;; - *) g1="$f1" ;; + func_tmpdir + trap 'rm -rf "$tmp"' 0 1 2 3 15 + delimiter=' ' + for f in $old_files; do + case "$f" in + 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 - still_present= - for f2 in $new_files; do - case "$f2" in - build-aux/*) g2=`echo "$f2" | sed -e "s,^build-aux/,$auxdir/,"` ;; - lib/*) g2=`echo "$f2" | sed -e "s,^lib/,$sourcebase/,"` ;; - m4/*) g2=`echo "$f2" | sed -e "s,^m4/,$m4base/,"` ;; - *) g2="$f2" ;; - esac - if test "$g2" = "$g1"; then - still_present=true - break - fi - done - if test -z "$still_present"; then - # Remove the file. Do nothing if the user already removed it. - if test -f "$destdir/$g1"; then - echo "Removing file $g1 (backup in ${g1}~)" - test -n "$dry_run" && dry=echo - $dry mv -f "$destdir/$g1" "$destdir/${g1}~" || func_fatal_error "failed" + echo "$g""$delimiter""$f" + done | LC_ALL=C sort > "$tmp"/old-files + for f in $new_files; 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 + 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 + # Remove the file. Do nothing if the user already removed it. + if test -f "$destdir/$g"; then + 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 - for f2 in $new_files; do - case "$f2" in - build-aux/*) g2=`echo "$f2" | sed -e "s,^build-aux/,$auxdir/,"` ;; - lib/*) g2=`echo "$f2" | sed -e "s,^lib/,$sourcebase/,"` ;; - m4/*) g2=`echo "$f2" | sed -e "s,^m4/,$m4base/,"` ;; - *) g2="$f2" ;; - esac - already_present= - for f1 in $old_files; do - case "$f1" in - build-aux/*) g1=`echo "$f1" | sed -e "s,^build-aux/,$auxdir/,"` ;; - lib/*) g1=`echo "$f1" | sed -e "s,^lib/,$cached_sourcebase/,"` ;; - m4/*) g1=`echo "$f1" | sed -e "s,^m4/,$cached_m4base/,"` ;; - *) g1="$f1" ;; - esac - if test "$g1" = "$g2"; then - already_present=true - break - fi - done - cp "$gnulib_dir/$f2" "$destdir/$g2.tmp" || func_fatal_error "failed" + # func_add_or_update handles a file that ought to be present afterwards. + # Uses parameters f, g, already_present. + func_add_or_update () + { + cp "$gnulib_dir/$f" "$destdir/$g.tmp" || func_fatal_error "failed" if test -n "$lgpl"; then # Update license. - case "$f2" in + case "$f" in lib/*) sed -e 's/GNU General/GNU Lesser General/g' \ -e 's/version 2\([ ,]\)/version 2.1\1/g' \ - < "$gnulib_dir/$f2" > "$destdir/$g2.tmp" || func_fatal_error "failed" + < "$gnulib_dir/$f" > "$destdir/$g.tmp" || func_fatal_error "failed" ;; esac fi - if test -f "$destdir/$g2"; then + if test -f "$destdir/$g"; then # The file already exists. - if cmp "$destdir/$g2" "$destdir/$g2.tmp" > /dev/null; then + if cmp "$destdir/$g" "$destdir/$g.tmp" > /dev/null; then : # The file has not changed. else # Replace the file. - if test -n "$already_present"; then - echo "Updating file $g2 (backup in ${g2}~)" - else - echo "Replacing file $g2 (non-gnulib code backuped in ${g2}~) !!" - fi - test -n "$dry_run" && dry=echo - $dry mv -f "$destdir/$g2" "$destdir/${g2}~" || func_fatal_error "failed" - if test -z "$symbolic" && cmp "$gnulib_dir/$f2" "$destdir/$g2.tmp"; then - func_ln_if_changed "$gnulib_dir/$f2" "$destdir/$g2" + 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/$g2.tmp" "$destdir/${g2}" || 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 $g2" - test -n "$dry_run" && dry=echo - if test -z "$symbolic" && cmp "$gnulib_dir/$f2" "$destdir/$g2.tmp"; then - func_ln_if_changed "$gnulib_dir/$f2" "$destdir/$g2" + 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/$g2.tmp" "$destdir/${g2}" || 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: + already_present= + for f in `LC_ALL=C join -t"$delimiter" -v2 "$tmp"/old-files "$tmp"/new-files | sed -e 's,'^.*"$delimiter"',,'`; 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 - - # Command-line invocation printed in various files. - cmd="gnulib-tool $supplied_opts" + # 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 + 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 # Command-line invocation printed in a comment in generated gnulib-cache.m4. actioncmd="gnulib-tool --import" @@ -1007,37 +1132,36 @@ func_import () if test -n "$libtool"; then actioncmd="$actioncmd --libtool" fi - actioncmd="$actioncmd -macro-prefix=$macro_prefix" + actioncmd="$actioncmd --macro-prefix=$macro_prefix" 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" @@ -1061,36 +1185,43 @@ func_import () 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" @@ -1123,6 +1254,11 @@ func_import () 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 for module in $modules; do func_verify_module if test -n "$module"; then @@ -1142,21 +1278,60 @@ func_import () 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 @@ -1169,9 +1344,17 @@ func_import () 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." @@ -1184,7 +1367,7 @@ func_create_testdir () { 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 @@ -1252,6 +1435,8 @@ func_create_testdir () 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." @@ -1274,6 +1459,11 @@ func_create_testdir () echo "gl_USE_SYSTEM_EXTENSIONS" echo fi + if test -z "$libtool"; then + echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" + else + echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" + 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. @@ -1333,6 +1523,11 @@ func_create_testdir () echo "gl_USE_SYSTEM_EXTENSIONS" echo fi + if test -z "$libtool"; then + echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" + else + echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" + fi for module in $modules; do func_verify_nontests_module if test -n "$module"; then @@ -1364,10 +1559,8 @@ func_create_testdir () (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 ) @@ -1434,7 +1627,8 @@ case $mode in func_all_modules ;; - import ) + import | update ) + # Where to import. if test -z "$destdir"; then destdir=. @@ -1442,93 +1636,110 @@ case $mode in test -d "$destdir" \ || func_fatal_error "destination directory does not exist: $destdir" - # Prefer configure.ac to configure.in - test -f "$destdir"/configure.in && configure_ac="$destdir/configure.in" - test -f "$destdir"/configure.ac && configure_ac="$destdir/configure.ac" - test -f "$configure_ac" \ - || func_fatal_error "cannot find $destdir/configure.ac" - - # Get settings. - my_sed_traces='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,; - /gl_MODULES[^_]/ { - s,^.*gl_MODULES([[ ]*\([^])]*\).*$,cached_modules="\1",; p; - }; - /gl_AVOID[^_]/ { - s,^.*gl_AVOID([[ ]*\([^])]*\).*$,cached_avoidlist="\1",; p; - }; - /gl_SOURCE_BASE/ { - s,^.*gl_SOURCE_BASE([[ ]*\([^])]*\).*$,cached_sourcebase="\1",; p; - }; - /gl_M4_BASE/ { - s,^.*gl_M4_BASE([[ ]*\([^])]*\).*$,cached_m4base="\1",; p; - }; - /gl_LIB/ { - s,^.*gl_LIB([[ ]*\([^])]*\).*$,cached_libname="\1",; p; - }; - /AC_CONFIG_AUX_DIR/ { - s,^.*AC_CONFIG_AUX_DIR([[ ]*\([^])]*\).*$,ac_auxdir="\1",; p; - } - /A[CM]_PROG_LIBTOOL/ { s,^.*$,seen_libtool=:,; p; }; - /LT_INIT/ { s,^.*$,seen_libtool=:,; p; }; - /gl_LGPL/ { s,^.*$,cached_lgpl=true,; p; }; - /gl_LIBTOOL/ { s,^.*$,cached_libtool=:,; p; }; - /gl_MACRO_PREFIX/ { - s,^.*gl_MACRO_PREFIX([[ ]*\([^])]*\).*$,cached_macro_prefix="\1",; p; - }; - d;' - eval `cat $configure_ac | sed "$my_sed_traces"` - - # Override libname? - if test -z "$supplied_libname" && test -n "$cached_libname"; then - libname="$cached_libname" + # Prefer configure.ac to configure.in. + if test -f "$destdir"/configure.ac; then + configure_ac="$destdir/configure.ac" + else + if test -f "$destdir"/configure.in; then + configure_ac="$destdir/configure.in" + else + func_fatal_error "cannot find $destdir/configure.ac" + fi fi - # Set up source base. - test -z "$sourcebase" && sourcebase="$cached_sourcebase" - test -z "$sourcebase" && sourcebase="lib" - test -d "$destdir/$sourcebase" \ - || { test -z "$dry_run" && mkdir "$destdir/$sourcebase"; } \ - || func_fatal_error "source base $destdir/$sourcebase doesn't exist" - - # Set up m4 base. - test -z "$m4base" && m4base="$cached_m4base" - test -z "$m4base" && m4base="m4" - test -d "$destdir/$m4base" \ - || { test -z "$dry_run" && mkdir "$destdir/$m4base"; } \ - || func_fatal_error "m4 base $destdir/$m4base doesn't exist" - - # Set up auxiliary directory. - test -z "$auxdir" && auxdir="$ac_auxdir" - test -z "$auxdir" && auxdir="build-aux" - test -d "$destdir/$auxdir" \ - || { test -z "$dry_run" && mkdir "$destdir/$auxdir"; } \ - || func_fatal_error "aux directory $destdir/$auxdir doesn't exist" - - # Require LGPL? - if test -n "$cached_lgpl"; then - lgpl=true - fi + test -f "$destdir"/Makefile.am \ + || func_fatal_error "cannot find $destdir/Makefile.am" - # Using libtool? - if test -n "$seen_libtool" || test -n "$cached_libtool"; then - libtool=true - fi + # Analyze configure.ac. + guessed_auxdir="." + guessed_libtool= + my_sed_traces=' + s,#.*$,, + s,^dnl .*$,, + s, dnl .*$,, + /AC_CONFIG_AUX_DIR/ { + s,^.*AC_CONFIG_AUX_DIR([[ ]*\([^])]*\).*$,guessed_auxdir="\1",p + } + /A[CM]_PROG_LIBTOOL/ { + s,^.*$,guessed_libtool=true,p + }' + eval `sed -n -e "$my_sed_traces" < "$configure_ac"` - # Macro prefix - test -z "$macro_prefix" && macro_prefix="$cached_macro_prefix" - test -z "$macro_prefix" && macro_prefix="gl" + if test -z "$auxdir"; then + auxdir="$guessed_auxdir" + fi - # What modules to extract. - if test $# = 0; then - modules="$cached_modules" + # Determine where to apply func_import. + if test -n "$m4base"; then + # Apply func_import to a particular gnulib directory. + # Any number of additional modules can be given. + if test ! -f "$destdir/$m4base"/gnulib-cache.m4; then + # 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 "$*" else - modules="$*" + # Apply func_import to all gnulib directories. + # 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/'` + m4dirs= + m4dirs_count=0 + m4dir_is_next= + for arg in $aclocal_amflags; do + if test -n "$m4dir_is_next"; then + # Ignore absolute directory pathnames, like /usr/local/share/aclocal. + case "$arg" in + /*) ;; + *) + if test -f "$destdir/$arg"/gnulib-cache.m4; then + m4dirs="$m4dirs $arg" + m4dirs_count=`expr $m4dirs_count + 1` + fi + ;; + esac + else + if test "X$arg" = "X-I"; then + m4dir_is_next=yes + else + m4dir_is_next= + fi + fi + done + if test $m4dirs_count = 0; then + # First use of gnulib in a package. + # Any number of additional modules can be given. + 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 + if test $m4dirs_count = 1; then + # There's only one use of gnulib here. Assume the user means it. + # Any number of additional modules can be given. + for m4base in $m4dirs; do + func_import "$*" + done + else + # Ambiguous - guess what the user meant. + if test $# = 0; then + # No further arguments. Guess the user wants to update all of them. + for m4base in $m4dirs; do + func_import + done + else + # Really ambiguous. + func_fatal_error "Ambiguity: to which directory should the modules be added? Please specify at least --m4-base=..." + fi + fi + fi fi - - # Which modules to avoid? - avoidlist=`echo $avoidlist $cached_avoidlist` - - func_import "$modules" ;; create-testdir )