X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=bc967e35498a17c0477b5ca2dfca87df4a696e8d;hb=e4c754e34096c0703a41f6c0e9fb7cc1f007b3ed;hp=ea018bd719b014503058e2103341a8bd8cc52a0d;hpb=ddec812613d0f94065251dc5dd3105ac3b3889de;p=gnulib.git diff --git a/gnulib-tool b/gnulib-tool index ea018bd71..bc967e354 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 2002-2009 Free Software Foundation, Inc. +# Copyright (C) 2002-2010 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 @@ -40,6 +40,9 @@ AUTOMAKEPATH= # You can set GETTEXTPATH to empty if autopoint 0.15 is already in your PATH. GETTEXTPATH= +# You can set LIBTOOLPATH to empty if libtoolize 2.x is already in your PATH. +LIBTOOLPATH= + # If you didn't set AUTOCONFPATH and AUTOMAKEPATH, you can also set the # variables AUTOCONF, AUTOHEADER, ACLOCAL, AUTOMAKE, AUTORECONF individually. if test -z "${AUTOCONF}" || test -n "${AUTOCONFPATH}"; then @@ -63,6 +66,11 @@ if test -z "${AUTOPOINT}" || test -n "${GETTEXTPATH}"; then AUTOPOINT="${GETTEXTPATH}autopoint" fi +# If you didn't set LIBTOOLPATH, you can also set the variable LIBTOOLIZE. +if test -z "${LIBTOOLIZE}" || test -n "${LIBTOOLPATH}"; then + LIBTOOLIZE="${LIBTOOLPATH}libtoolize" +fi + # You can set MAKE. if test -z "${MAKE}"; then MAKE=make @@ -100,12 +108,24 @@ fi # An empty expression does not work with the native 'sed' on AIX 6.1. sed_noop='s,x,x,' +# sed_comments is true or false, depending whether 'sed' supports comments. +# (The GNU autoconf doc says that sed comments are not portable, but does +# not say which 'sed' versions are affected.) +if echo fo | sed -e 's/f/g/ +# s/o/u/ +s/o/e/' 2>/dev/null | grep ge > /dev/null; then + sed_comments=true +else + sed_comments=false +fi + # func_usage # outputs to stdout the --help usage message. func_usage () { echo "\ Usage: gnulib-tool --list + gnulib-tool --find filename gnulib-tool --import [module1 ... moduleN] gnulib-tool --update gnulib-tool --create-testdir --dir=directory [module1 ... moduleN] @@ -113,8 +133,10 @@ Usage: gnulib-tool --list gnulib-tool --test --dir=directory module1 ... moduleN gnulib-tool --megatest --dir=directory [module1 ... moduleN] gnulib-tool --extract-description module + gnulib-tool --extract-comment module gnulib-tool --extract-status module gnulib-tool --extract-notice module + gnulib-tool --extract-applicability module gnulib-tool --extract-filelist module gnulib-tool --extract-dependencies module gnulib-tool --extract-autoconf-snippet module @@ -128,6 +150,7 @@ Usage: gnulib-tool --list Operation modes: --list print the available module names + --find find the modules which contain the specified file --import import the given modules into the current package; if no modules are specified, update the current package from the current gnulib @@ -141,8 +164,10 @@ Operation modes: --megatest test the given modules one by one and all together (recommended to use CC=\"gcc -Wall\" here) --extract-description extract the description - --extract-status extract the status (obsolete or not) + --extract-comment extract the comment + --extract-status extract the status (obsolete etc.) --extract-notice extract the notice or banner + --extract-applicability extract the applicability --extract-filelist extract the list of files --extract-dependencies extract the dependencies --extract-autoconf-snippet extract the snippet for configure.ac @@ -162,9 +187,34 @@ General options: directory. --local-dir=DIRECTORY Specify a local override directory where to look up files before looking in gnulib's directory. + --cache-modules Enable module caching optimization. + --no-cache-modules Disable module caching optimization. --verbose Increase verbosity. May be repeated. --quiet Decrease verbosity. May be repeated. +Options for --import, --update: + --dry-run Only print what would have been done. + +Options for --import, --create-[mega]testdir, --[mega]test: + --with-tests Include unit tests for the included modules. + --with-obsolete Include obsolete modules when they occur among the + dependencies. By default, dependencies to obsolete + modules are ignored. + --with-c++-tests Include even unit tests for C++ interoperability. + --with-longrunning-tests + Include even unit tests that are long-runners. + --with-privileged-tests + Include even unit tests that require root + privileges. + --with-unportable-tests + Include even unit tests that fail on some platforms. + --with-all-tests Include all kinds of problematic unit tests. + --avoid=MODULE Avoid including the given MODULE. Useful if you + have code that provides equivalent functionality. + This option can be repeated. + --libtool Use libtool rules. + --no-libtool Don't use libtool rules. + Options for --import: --lib=LIBRARY Specify the library name. Defaults to 'libgnu'. --source-base=DIRECTORY @@ -181,13 +231,6 @@ Options for --import: placed (default \"tests\"). --aux-dir=DIRECTORY Directory relative to --dir where auxiliary build tools are placed (default \"build-aux\"). - --with-tests Include unit tests for the included modules. - --with-obsolete Include obsolete modules when they occur among the - dependencies. By default, dependencies to obsolete - modules are ignored. - --avoid=MODULE Avoid including the given MODULE. Useful if you - have code that provides equivalent functionality. - This option can be repeated. --lgpl[=2|=3] Abort if modules aren't available under the LGPL. Also modify license template from GPL to LGPL. The version number of the LGPL can be specified; @@ -195,8 +238,6 @@ Options for --import: --makefile-name=NAME Name of makefile in automake syntax in the source-base and tests-base directories (default \"Makefile.am\"). - --libtool Use libtool rules. - --no-libtool Don't use libtool rules. --macro-prefix=PREFIX Specify the prefix of the macros 'gl_EARLY' and 'gl_INIT'. Default is 'gl'. --po-domain=NAME Specify the prefix of the i18n domain. Usually use @@ -206,11 +247,21 @@ Options for --import: (.gitignore and/or .cvsignore). --no-changelog Don't update or create ChangeLog files. -Options for --import and --update: - --dry-run For --import, only print what would have been done. +Options for --create-[mega]testdir, --[mega]test: + --without-c++-tests Exclude unit tests for C++ interoperability. + --without-longrunning-tests + Exclude unit tests that are long-runners. + --without-privileged-tests + Exclude unit tests that require root privileges. + --without-unportable-tests + Exclude unit tests that fail on some platforms. + +Options for --import, --update, --create-[mega]testdir, --[mega]test: -s, --symbolic, --symlink Make symbolic links instead of copying files. --local-symlink Make symbolic links instead of copying files, only for files from the local override directory. + +Options for --import, --update: -S, --more-symlinks Make symbolic links instead of copying files, and don't replace copyright notices. @@ -252,7 +303,7 @@ q fi version= fi - year=`"$gnulib_dir"/build-aux/mdate-sh "$self_abspathname" | sed 's,^.* ,,'` + year=`"$gnulib_dir"/build-aux/mdate-sh "$self_abspathname" | sed -e 's,^.* ,,'` echo "\ gnulib-tool (GNU $package $date)$version Copyright (C) $year Free Software Foundation, Inc. @@ -267,10 +318,10 @@ Written by" "Bruno Haible" "and" "Simon Josefsson" # outputs to stdout a header for a generated file. func_emit_copyright_notice () { - sed -n '/Copyright/ { - p - q - }' < "$self_abspathname" + sed -n -e '/Copyright/ { + p + q + }' < "$self_abspathname" 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" @@ -489,6 +540,13 @@ func_fatal_error () func_exit 1 } +# func_warning message +# Outputs to stderr a warning message, +func_warning () +{ + echo "gnulib-tool: warning: $1" 1>&2 +} + # func_readlink SYMLINK # outputs the target of the given symlink. if (type -p readlink) > /dev/null 2>&1; then @@ -638,39 +696,20 @@ func_ln_if_changed () fi } -# func_reset_sigpipe -# Resets SIGPIPE to its default behaviour. SIGPIPE is signalled when a process -# writes into a pipe with no readers, i.e. a pipe where all readers have -# already closed their file descriptor that read from it or exited entirely. -# The default behaviour is to terminate the current process without an error -# message. -# When "trap '' SIGPIPE" is in effect, the behaviour (at least with bash) is to -# terminate the current process with an error message. -# This function should be called at the beginning of a command that only -# produces output to stdout (i.e. no side effects!), when the command that -# will read from this pipe might prematurely exit or close its standard input -# descriptor. -if test -n "$BASH_VERSION"; then - # The problem has only been reported with bash. Probably it occurs only with - # bash-3.2. For the reasons, see - # . - # Note that Solaris sh does not understand "trap - SIGPIPE". - func_reset_sigpipe () - { - trap - SIGPIPE - } -else - func_reset_sigpipe () - { - : - } -fi - -# Ensure an 'echo' command that does not interpret backslashes. -# Test cases: +# Ensure an 'echo' command that +# 1. does not interpret backslashes and +# 2. does not print an error message "broken pipe" when writing into a pipe +# with no writers. +# +# Test cases for problem 1: # echo '\n' | wc -l prints 1 when OK, 2 when KO # echo '\t' | grep t > /dev/null has return code 0 when OK, 1 when KO -# This problem is a weird heritage from SVR4. BSD got it right (except that +# Test cases for problem 2: +# echo hi | true frequently prints +# "bash: echo: write error: Broken pipe" +# to standard error in bash 3.2. +# +# Problem 1 is a weird heritage from SVR4. BSD got it right (except that # BSD echo interprets '-n' as an option, which is also not desirable). # Nowadays the problem occurs in 4 situations: # - in bash, when the shell option xpg_echo is set (bash >= 2.04) @@ -693,6 +732,12 @@ fi # - otherwise: respawn using /bin/sh and rely on the workarounds. # When respawning, we pass --no-reexec as first argument, so as to avoid # turning this script into a fork bomb in unlucky situations. +# +# Problem 2 is specific to bash 3.2 and affects the 'echo' built-in, but not +# the 'printf' built-in. See +# +# +# The workaround is: define echo to a function that uses the printf built-in. have_echo= if echo '\t' | grep t > /dev/null; then have_echo=yes # Lucky! @@ -717,7 +762,10 @@ fi # For bash >= 2.0: define echo to a function that uses the printf built-in. # For bash < 2.0: define echo to a function that uses cat of a here document. # (There is no win in using 'printf' over 'cat' if it is not a shell built-in.) -if test -z "$have_echo" \ +# Also handle problem 2, specific to bash 3.2, here. +if { test -z "$have_echo" \ + || case "$BASH_VERSION" in 3.2*) true;; *) false;; esac; \ + } \ && test -n "$BASH_VERSION"; then \ if type printf 2>/dev/null | grep / > /dev/null; then # 'printf' is not a shell built-in. @@ -817,6 +865,7 @@ fi # - mode list or import or create-testdir or create-megatestdir # - destdir from --dir # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - verbose integer, default 0, inc/decremented by --verbose/--quiet # - libname, supplied_libname from --lib # - sourcebase from --source-base @@ -827,6 +876,21 @@ fi # - auxdir from --aux-dir # - inctests true if --with-tests was given, blank otherwise # - incobsolete true if --with-obsolete was given, blank otherwise +# - inc_cxx_tests true if --with-c++-tests was given, blank otherwise +# - inc_longrunning_tests true if --with-longrunning-tests was given, blank +# otherwise +# - inc_privileged_tests true if --with-privileged-tests was given, blank +# otherwise +# - inc_unportable_tests true if --with-unportable-tests was given, blank +# otherwise +# - inc_all_tests true if --with-all-tests was given, blank otherwise +# - excl_cxx_tests true if --without-c++-tests was given, blank otherwise +# - excl_longrunning_tests true if --without-longrunning-tests was given, +# blank otherwise +# - excl_privileged_tests true if --without-privileged-tests was given, blank +# otherwise +# - excl_unportable_tests true if --without-unportable-tests was given, blank +# otherwise # - avoidlist list of modules to avoid, from --avoid # - lgpl yes or a number if --lgpl was given, blank otherwise # - makefile_name from --makefile-name @@ -847,6 +911,7 @@ fi mode= destdir= local_gnulib_dir= + modcache=true verbose=0 libname=libgnu supplied_libname= @@ -858,6 +923,15 @@ fi auxdir= inctests= incobsolete= + inc_cxx_tests= + inc_longrunning_tests= + inc_privileged_tests= + inc_unportable_tests= + inc_all_tests= + excl_cxx_tests= + excl_longrunning_tests= + excl_privileged_tests= + excl_unportable_tests= avoidlist= lgpl= makefile_name= @@ -878,6 +952,9 @@ fi --list | --lis ) mode=list shift ;; + --find | --fin | --fi | --f ) + mode=find + shift ;; --import | --impor | --impo | --imp | --im | --i ) mode=import shift ;; @@ -922,6 +999,12 @@ fi --local-dir=* ) local_gnulib_dir=`echo "X$1" | sed -e 's/^X--local-dir=//'` shift ;; + --cache-modules | --cache-module | --cache-modul | --cache-modu | --cache-mod | --cache-mo | --cache-m | --cache- | --cache | --cach | --cac | --ca ) + modcache=true + shift ;; + --no-cache-modules | --no-cache-module | --no-cache-modul | --no-cache-modu | --no-cache-mod | --no-cache-mo | --no-cache-m | --no-cache- | --no-cache | --no-cach | --no-cac | --no-ca ) + modcache=false + shift ;; --verbose | --verbos | --verbo | --verb ) verbose=`expr $verbose + 1` shift ;; @@ -1000,12 +1083,39 @@ fi --aux-dir=* ) auxdir=`echo "X$1" | sed -e 's/^X--aux-dir=//'` shift ;; - --with-tests ) + --with-tests | --with-test | --with-tes | --with-te | --with-t) inctests=true shift ;; - --with-obsolete ) + --with-obsolete | --with-obsolet | --with-obsole | --with-obsol | --with-obso | --with-obs | --with-ob | --with-o) incobsolete=true shift ;; + --with-c++-tests | --with-c++-test | --with-c++-tes | --with-c++-te | --with-c++-t | --with-c++- | --with-c++ | --with-c+ | --with-c) + inc_cxx_tests=true + shift ;; + --with-longrunning-tests | --with-longrunning-test | --with-longrunning-tes | --with-longrunning-te | --with-longrunning-t | --with-longrunning- | --with-longrunning | --with-longrunnin | --with-longrunni | --with-longrunn | --with-longrun | --with-longru | --with-longr | --with-long | --with-lon | --with-lo | --with-l) + inc_longrunning_tests=true + shift ;; + --with-privileged-tests | --with-privileged-test | --with-privileged-tes | --with-privileged-te | --with-privileged-t | --with-privileged- | --with-privileged | --with-privilege | --with-privileg | --with-privile | --with-privil | --with-privi | --with-priv | --with-pri | --with-pr | --with-p) + inc_privileged_tests=true + shift ;; + --with-unportable-tests | --with-unportable-test | --with-unportable-tes | --with-unportable-te | --with-unportable-t | --with-unportable- | --with-unportable | --with-unportabl | --with-unportab | --with-unporta | --with-unport | --with-unpor | --with-unpo | --with-unp | --with-un | --with-u) + inc_unportable_tests=true + shift ;; + --with-all-tests | --with-all-test | --with-all-tes | --with-all-te | --with-all-t | --with-all- | --with-all | --with-al | --with-a) + inc_all_tests=true + shift ;; + --without-c++-tests | --without-c++-test | --without-c++-tes | --without-c++-te | --without-c++-t | --without-c++- | --without-c++ | --without-c+ | --without-c) + excl_cxx_tests=true + shift ;; + --without-longrunning-tests | --without-longrunning-test | --without-longrunning-tes | --without-longrunning-te | --without-longrunning-t | --without-longrunning- | --without-longrunning | --without-longrunnin | --without-longrunni | --without-longrunn | --without-longrun | --without-longru | --without-longr | --without-long | --without-lon | --without-lo | --without-l) + excl_longrunning_tests=true + shift ;; + --without-privileged-tests | --without-privileged-test | --without-privileged-tes | --without-privileged-te | --without-privileged-t | --without-privileged- | --without-privileged | --without-privilege | --without-privileg | --without-privile | --without-privil | --without-privi | --without-priv | --without-pri | --without-pr | --without-p) + excl_privileged_tests=true + shift ;; + --without-unportable-tests | --without-unportable-test | --without-unportable-tes | --without-unportable-te | --without-unportable-t | --without-unportable- | --without-unportable | --without-unportabl | --without-unportab | --without-unporta | --without-unport | --without-unpor | --without-unpo | --without-unp | --without-un | --without-u) + excl_unportable_tests=true + shift ;; --avoid ) shift if test $# = 0; then @@ -1070,7 +1180,7 @@ fi --no-vc-files ) vc_files=false shift ;; - --no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch | --no-c ) + --no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch ) do_changelog=false shift ;; --dry-run ) @@ -1105,6 +1215,14 @@ fi esac done + if test "$mode" = import; then + if test -n "$excl_cxx_tests" || test -n "$excl_longrunning_tests" \ + || test -n "$excl_privileged_tests" || test -n "$excl_unportable_tests"; then + echo "gnulib-tool: invalid options for 'import' mode" 1>&2 + echo "Try 'gnulib-tool --help' for more information." 1>&2 + func_exit 1 + fi + fi if test "$mode" = update; then if test $# != 0; then echo "gnulib-tool: too many arguments in 'update' mode" 1>&2 @@ -1117,6 +1235,11 @@ fi || test -n "$sourcebase" || test -n "$m4base" || test -n "$pobase" \ || test -n "$docbase" || test -n "$testsbase" || test -n "$auxdir" \ || test -n "$inctests" || test -n "$incobsolete" \ + || test -n "$inc_cxx_tests" || test -n "$inc_longrunning_tests" \ + || test -n "$inc_privileged_tests" || test -n "$inc_unportable_tests" \ + || test -n "$inc_all_tests" \ + || test -n "$excl_cxx_tests" || test -n "$excl_longrunning_tests" \ + || test -n "$excl_privileged_tests" || test -n "$excl_unportable_tests" \ || test -n "$avoidlist" || test -n "$lgpl" || test -n "$makefile_name" \ || test -n "$macro_prefix" || test -n "$po_domain" \ || test -n "$vc_files"; then @@ -1134,7 +1257,7 @@ fi func_exit 1 fi if test -z "$pobase" && test -n "$po_domain"; then - echo "gnulib-tool: warning: --po-domain has no effect without a --po-base option" 1>&2 + func_warning "--po-domain has no effect without a --po-base option" fi # Determine the minimum supported autoconf version from the project's @@ -1177,7 +1300,7 @@ fi if test -n "$prereqs"; then autoconf_minversion=` for version in $prereqs; do echo $version; done | - LC_ALL=C sort -nru | sed 1q + LC_ALL=C sort -nru | sed -e 1q ` fi fi @@ -1262,6 +1385,23 @@ func_lookup_file () fi } +# func_sanitize_modulelist +# receives a list of possible module names on standard input, one per line. +# It removes those which are just file names unrelated to modules, and outputs +# the resulting list to standard output, one per line. +func_sanitize_modulelist () +{ + sed -e '/^CVS\//d' -e '/\/CVS\//d' \ + -e '/^ChangeLog$/d' -e '/\/ChangeLog$/d' \ + -e '/^COPYING$/d' -e '/\/COPYING$/d' \ + -e '/^README$/d' -e '/\/README$/d' \ + -e '/^TEMPLATE$/d' \ + -e '/^TEMPLATE-EXTENDED$/d' \ + -e '/^TEMPLATE-TESTS$/d' \ + -e '/^\..*/d' \ + -e '/~$/d' +} + # func_all_modules # Input: # - local_gnulib_dir from --local-dir @@ -1276,19 +1416,29 @@ func_all_modules () (cd "$local_gnulib_dir" && find modules -type f -print | sed -e 's,^modules/,,' -e 's,\.diff$,,') fi } \ - | sed -e '/^CVS\//d' -e '/\/CVS\//d' \ - -e '/^ChangeLog$/d' -e '/\/ChangeLog$/d' \ - -e '/^COPYING$/d' -e '/\/COPYING$/d' \ - -e '/^README$/d' -e '/\/README$/d' \ - -e '/^TEMPLATE$/d' \ - -e '/^TEMPLATE-EXTENDED$/d' \ - -e '/^TEMPLATE-TESTS$/d' \ - -e '/^\..*/d' \ - -e '/~$/d' \ + | func_sanitize_modulelist \ | sed -e '/-tests$/d' \ | LC_ALL=C sort -u } +# func_exists_module module +# tests whether a module, given by name, exists +# Input: +# - local_gnulib_dir from --local-dir +func_exists_module () +{ + { test -f "$gnulib_dir/modules/$1" \ + || { test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules" \ + && test -f "$local_gnulib_dir/modules/$1"; }; } \ + && test "CVS" != "$1" \ + && test "ChangeLog" != "$1" \ + && test "COPYING" != "$1" \ + && test "README" != "$1" \ + && test "TEMPLATE" != "$1" \ + && test "TEMPLATE-EXTENDED" != "$1" \ + && test "TEMPLATE-TESTS" != "$1" +} + # func_verify_module # verifies a module name # Input: @@ -1296,21 +1446,12 @@ func_all_modules () # - module module name argument func_verify_module () { - if { test -f "$gnulib_dir/modules/$module" \ - || { test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules" \ - && test -f "$local_gnulib_dir/modules/$module"; }; } \ - && test "CVS" != "$module" \ - && test "ChangeLog" != "$module" \ - && test "COPYING" != "$module" \ - && test "README" != "$module" \ - && test "TEMPLATE" != "$module" \ - && test "TEMPLATE-EXTENDED" != "$module" \ - && test "TEMPLATE-TESTS" != "$module"; then + if func_exists_module "$module"; then # OK, $module is a correct module name. # Verify that building the module description with 'patch' succeeds. func_lookup_file "modules/$module" else - echo "gnulib-tool: module $module doesn't exist" 1>&2 + func_warning "module $module doesn't exist" module= fi } @@ -1341,12 +1482,22 @@ func_verify_tests_module () esac } +# Suffix of a sed expression that extracts a particular field from a +# module description. +# A field starts with a line that contains a keyword, such as 'Description', +# followed by a colon and optional whitespace. All following lines, up to +# the next field (or end of file if there is none) form the contents of the +# field. +# An absent field is equivalent to a field with empty contents. +# NOTE: Keep this in sync with sed_extract_cache_prog below! sed_extract_prog=':[ ]*$/ { :a n s/^Description:[ ]*$// + s/^Comment:[ ]*$// s/^Status:[ ]*$// s/^Notice:[ ]*$// + s/^Applicability:[ ]*$// s/^Files:[ ]*$// s/^Depends-on:[ ]*$// s/^configure\.ac-early:[ ]*$// @@ -1362,40 +1513,436 @@ sed_extract_prog=':[ ]*$/ { :b }' +# Piece of a sed expression that converts a field header line to a shell +# variable name, +# NOTE: Keep this in sync with sed_extract_prog above! +sed_extract_field_header=' + s/^Description:[ ]*$/description/ + s/^Comment:[ ]*$/comment/ + s/^Status:[ ]*$/status/ + s/^Notice:[ ]*$/notice/ + s/^Applicability:[ ]*$/applicability/ + s/^Files:[ ]*$/files/ + s/^Depends-on:[ ]*$/dependson/ + s/^configure\.ac-early:[ ]*$/configureac_early/ + s/^configure\.ac:[ ]*$/configureac/ + s/^Makefile\.am:[ ]*$/makefile/ + s/^Include:[ ]*$/include/ + s/^Link:[ ]*$/link/ + s/^License:[ ]*$/license/ + s/^Maintainer:[ ]*$/maintainer/' + +if $modcache; then + + # Note: The 'eval' silences stderr output in dash. + if (declare -A x && { x[f/2]='foo'; x[f/3]='bar'; eval test '${x[f/2]}' = foo; }) 2>/dev/null; then + # Zsh 4 and Bash 4 have associative arrays. + have_associative=true + else + # For other shells, use 'eval' with computed shell variable names. + have_associative=false + fi + + if $have_associative; then + + # Declare the associative arrays. + declare -A modcache_cached + sed_to_declare_statement='s|^.*/\([a-zA-Z0-9_]*\)/$|declare -A modcache_\1|p' + declare_script=`echo "$sed_extract_field_header" | sed -n -e "$sed_to_declare_statement"` + eval "$declare_script" + + else + + # func_cache_var module + # computes the cache variable name corresponding to $module. + # Note: This computation can map different module names to the same + # cachevar (such as 'foo-bar', 'foo_bar', or 'foo/bar'); the caller has + # to protect against this case. + # Output: + # - cachevar a shell variable name + if (f=foo; eval echo '${f//o/e}') < /dev/null 2>/dev/null | grep fee >/dev/null; then + # Bash 2.0 and newer, ksh, and zsh support the syntax + # ${param//pattern/replacement} + # as a shorthand for + # `echo "$param" | sed -e "s/pattern/replacement/g"`. + # Note: The 'eval' above silences stderr output in dash. + func_cache_var () + { + cachevar=c_${1//[!a-zA-Z0-9_]/_} + } + else + func_cache_var () + { + case $1 in + *[!a-zA-Z0-9_]*) + cachevar=c_`echo "$1" | LC_ALL=C sed -e 's/[^a-zA-Z0-9_]/_/g'` ;; + *) + cachevar=c_$1 ;; + esac + } + fi + + fi + + # func_init_sed_convert_to_cache_statements + # Input: + # - modcachevar_assignment + # Output: + # - sed_convert_to_cache_statements + func_init_sed_convert_to_cache_statements () + { + # 'sed' script that turns a module description into shell script + # assignments, suitable to be eval'ed. All active characters are escaped. + # This script turns + # Description: + # Some module's description + # + # Files: + # lib/file.h + # into: + # modcache_description[$1]=\ + # 'Some module'"'"'s description + # ' + # modcache_files[$1]=\ + # 'lib/file.h' + # or: + # c_MODULE_description_set=set; c_MODULE_description=\ + # 'Some module'"'"'s description + # ' + # c_MODULE_files_set=set; c_MODULE_files=\ + # 'lib/file.h' + # The script consists of two parts: + # 1) Ignore the lines before the first field header. + # 2) A loop, treating non-field-header lines by escaping single quotes + # and adding a closing quote in the last line, + sed_convert_to_cache_statements=" + :llla + # Here we have not yet seen a field header. + + # See if the current line contains a field header. + t llla1 + :llla1 + ${sed_extract_field_header} + t lllb + + # No field header. Ignore the line. + + # Read the next line. Upon EOF, just exit. + n + b llla + + :lllb + # The current line contains a field header. + + # Turn it into the beginning of an assignment. + s/^\\(.*\\)\$/${modcachevar_assignment}\\\\/ + + # Move it to the hold space. Don't print it yet, + # because we want no assignment if the field is empty. + h + + # Read the next line. + # Upon EOF, the field was empty. Print no assignment. Just exit. + n + + # See if the current line contains a field header. + t lllb1 + :lllb1 + ${sed_extract_field_header} + # If it is, the previous field was empty. Print no assignment. + t lllb + + # Not a field header. + + # Print the previous line, held in the hold space. + x + p + x + + # Transform single quotes. + s/'/'\"'\"'/g + + # Prepend a single quote. + s/^/'/ + + :lllc + + # Move it to the hold space. + h + + # Read the next line. + # Upon EOF, branch. + \${ + b llle + } + n + + # See if the current line contains a field header. + t lllc1 + :lllc1 + ${sed_extract_field_header} + t llld + + # Print the previous line, held in the hold space. + x + p + x + + # Transform single quotes. + s/'/'\"'\"'/g + + b lllc + + :llld + # A field header. + # Print the previous line, held in the hold space, with a single quote + # to end the assignment. + x + s/\$/'/ + p + x + + b lllb + + :llle + # EOF seen. + # Print the previous line, held in the hold space, with a single quote + # to end the assignment. + x + s/\$/'/ + p + # Exit. + n + " + if ! $sed_comments; then + # Remove comments. + sed_convert_to_cache_statements=`echo "$sed_convert_to_cache_statements" \ + | sed -e 's/^ *//' -e 's/^#.*//'` + fi + } + + if $have_associative; then + # sed_convert_to_cache_statements does not depend on the module. + modcachevar_assignment='modcache_\1[$1]=' + func_init_sed_convert_to_cache_statements + fi + + # func_cache_lookup_module module + # + # looks up a module, like 'func_lookup_file modules/$module', and stores all + # of its relevant data in a cache in the memory of the processing shell. If + # already cached, it does not look it up again, thus saving file access time. + # Parameters: + # - module non-empty string + # Output if $have_associative: + # - modcache_cached[$module] set to yes + # - modcache_description[$module] == + # - modcache_status[$module] \ set to the field's value, minus the + # - ... / final newline, + # - modcache_maintainer[$module] == or unset if the field's value is empty + # Output if ! $have_associative: + # - cachevar a shell variable name + # - ${cachevar}_cached set to $module + # - ${cachevar}_description == + # - ${cachevar}_status \ set to the field's value, minus the + # - ... / final newline, + # - ${cachevar}_maintainer == or unset if the field's value is empty + # - ${cachevar}_description_set == + # - ${cachevar}_status_set \ set to non-empty if the field's value + # - ... / is non-empty, + # - ${cachevar}_maintainer_set == or unset if the field's value is empty + func_cache_lookup_module () + { + if $have_associative; then + cached=${modcache_cached[$1]} + else + func_cache_var "$1" + eval "cached=\"\$${cachevar}_cached\"" + fi + if test -z "$cached"; then + # Not found in cache. Look it up on the file system. + func_lookup_file "modules/$1" + if $have_associative; then + modcache_cached[$1]=yes + else + eval "${cachevar}_cached=\"\$1\"" + fi + if ! $have_associative; then + # sed_convert_to_cache_statements depends on the module. + modcachevar_assignment="${cachevar}"'_\1_set=set; '"${cachevar}"'_\1=' + func_init_sed_convert_to_cache_statements + fi + cache_statements=`LC_ALL=C sed -n -e "$sed_convert_to_cache_statements" < "$lookedup_file"` + eval "$cache_statements" + else + if ! $have_associative; then + if test "$1" != "$cached"; then + func_fatal_error "cache variable collision between $1 and $cached" + fi + fi + fi + } + +fi + # func_get_description module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_description () { - func_lookup_file "modules/$1" - sed -n -e "/^Description$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Description$sed_extract_prog" < "$lookedup_file" + else + func_cache_lookup_module "$1" + # Output the field's value, including the final newline (if any). + if $have_associative; then + if test -n "${modcache_description[$1]+set}"; then + echo "${modcache_description[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_description_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_description\"" + echo "${field_value}" + fi + fi + fi +} + +# func_get_comment module +# Input: +# - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules +func_get_comment () +{ + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Comment$sed_extract_prog" < "$lookedup_file" + else + func_cache_lookup_module "$1" + # Output the field's value, including the final newline (if any). + if $have_associative; then + if test -n "${modcache_comment[$1]+set}"; then + echo "${modcache_comment[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_comment_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_comment\"" + echo "${field_value}" + fi + fi + fi } # func_get_status module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_status () { - func_lookup_file "modules/$1" - sed -n -e "/^Status$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Status$sed_extract_prog" < "$lookedup_file" + else + func_cache_lookup_module "$1" + # Output the field's value, including the final newline (if any). + if $have_associative; then + if test -n "${modcache_status[$1]+set}"; then + echo "${modcache_status[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_status_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_status\"" + echo "${field_value}" + fi + fi + fi } # func_get_notice module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_notice () { - func_lookup_file "modules/$1" - sed -n -e "/^Notice$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Notice$sed_extract_prog" < "$lookedup_file" + else + func_cache_lookup_module "$1" + # Output the field's value, including the final newline (if any). + if $have_associative; then + if test -n "${modcache_notice[$1]+set}"; then + echo "${modcache_notice[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_notice_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_notice\"" + echo "${field_value}" + fi + fi + fi +} + +# func_get_applicability module +# Input: +# - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules +# The expected result (on stdout) is either 'main', or 'tests', or 'all'. +func_get_applicability () +{ + if ! $modcache; then + func_lookup_file "modules/$1" + my_applicability=`sed -n -e "/^Applicability$sed_extract_prog" < "$lookedup_file"` + else + func_cache_lookup_module "$1" + # Get the field's value, without the final newline. + if $have_associative; then + my_applicability="${modcache_applicability[$1]}" + else + eval "my_applicability=\"\$${cachevar}_applicability\"" + fi + fi + if test -n "$my_applicability"; then + echo $my_applicability + else + # The default is 'main' or 'tests', depending on the module's name. + case $1 in + *-tests) echo "tests";; + *) echo "main";; + esac + fi } # func_get_filelist module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_filelist () { - func_lookup_file "modules/$1" - sed -n -e "/^Files$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Files$sed_extract_prog" < "$lookedup_file" + else + func_cache_lookup_module "$1" + # Output the field's value, including the final newline (if any). + if $have_associative; then + if test -n "${modcache_files[$1]+set}"; then + echo "${modcache_files[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_files_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_files\"" + echo "${field_value}" + fi + fi + fi echo m4/00gnulib.m4 echo m4/gnulib-common.m4 case "$autoconf_minversion" in @@ -1410,6 +1957,7 @@ func_get_filelist () # elements starting with prefix and ending with suffix are considered. # Processing: removed_prefix and removed_suffix are removed from each element, # added_prefix and added_suffix are added to each element. +# prefix, suffix should not contain shell-special characters. # removed_prefix, removed_suffix should not contain the characters "$`\{}[]^|. # added_prefix, added_suffix should not contain the characters \|&. func_filter_filelist () @@ -1421,8 +1969,10 @@ func_filter_filelist () }; then ffflist= for fff in $3; do + # Do not quote possibly-empty parameters in case patterns, + # AIX and HP-UX ksh won't match them if they are empty. case "$fff" in - "$4"*"$5") + $4*$5) if test -n "$6"; then func_remove_prefix fff "$6" fi @@ -1442,7 +1992,7 @@ func_filter_filelist () sed_fff_filter="s|^$6\(.*\)$7\$|$8\\1$9|" ffflist=`for fff in $3; do case "$fff" in - "$4"*"$5") echo "$fff" ;; + $4*$5) echo "$fff" ;; esac done | sed -e "$sed_fff_filter"` fi @@ -1452,46 +2002,116 @@ func_filter_filelist () # func_get_dependencies module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_dependencies () { - # ${module}-tests always implicitly depends on ${module}. + # ${module}-tests implicitly depends on ${module}, if that module exists. case "$1" in *-tests) fgd1="$1" func_remove_suffix fgd1 '-tests' - echo "$fgd1" + if func_exists_module "$fgd1"; then + echo "$fgd1" + fi ;; esac # Then the explicit dependencies listed in the module description. - func_lookup_file "modules/$1" - sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file" + else + func_cache_lookup_module "$1" + # Output the field's value, including the final newline (if any). + if $have_associative; then + if test -n "${modcache_dependson[$1]+set}"; then + echo "${modcache_dependson[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_dependson_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_dependson\"" + echo "${field_value}" + fi + fi + fi } # func_get_autoconf_early_snippet module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_autoconf_early_snippet () { - func_lookup_file "modules/$1" - sed -n -e "/^configure\.ac-early$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^configure\.ac-early$sed_extract_prog" < "$lookedup_file" + else + func_cache_lookup_module "$1" + # Output the field's value, including the final newline (if any). + if $have_associative; then + if test -n "${modcache_configureac_early[$1]+set}"; then + echo "${modcache_configureac_early[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_configureac_early_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_configureac_early\"" + echo "${field_value}" + fi + fi + fi } # func_get_autoconf_snippet module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_autoconf_snippet () { - func_lookup_file "modules/$1" - sed -n -e "/^configure\.ac$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^configure\.ac$sed_extract_prog" < "$lookedup_file" + else + func_cache_lookup_module "$1" + # Output the field's value, including the final newline (if any). + if $have_associative; then + if test -n "${modcache_configureac[$1]+set}"; then + echo "${modcache_configureac[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_configureac_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_configureac\"" + echo "${field_value}" + fi + fi + fi } # func_get_automake_snippet module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_automake_snippet () { - func_lookup_file "modules/$1" - sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" + else + func_cache_lookup_module "$1" + # Output the field's value, including the final newline (if any). + if $have_associative; then + if test -n "${modcache_makefile[$1]+set}"; then + echo "${modcache_makefile[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_makefile_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_makefile\"" + echo "${field_value}" + fi + fi + fi case "$1" in *-tests) # *-tests module live in tests/, not lib/. @@ -1515,15 +2135,29 @@ func_get_automake_snippet () }' sed_extract_mentioned_files='s/^lib_SOURCES[ ]*+=[ ]*//p' already_mentioned_files=` \ - sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" \ + { if ! $modcache; then + sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" + else + if $have_associative; then + if test -n "${modcache_makefile[$1]+set}"; then + echo "${modcache_makefile[$1]}" + fi + else + eval 'field_set="$'"${cachevar}"'_makefile_set"' + if test -n "$field_set"; then + eval 'field_value="$'"${cachevar}"'_makefile"' + echo "${field_value}" + fi + fi + fi + } \ | sed -e "$sed_combine_lines" \ | sed -n -e "$sed_extract_mentioned_files" | sed -e 's/#.*//'` all_files=`func_get_filelist $1` func_filter_filelist lib_files "$nl" "$all_files" 'lib/' '' 'lib/' '' # Remove $already_mentioned_files from $lib_files. echo "$lib_files" | LC_ALL=C sort -u > "$tmp"/lib-files - extra_files=`func_reset_sigpipe; \ - for f in $already_mentioned_files; do echo $f; done \ + extra_files=`for f in $already_mentioned_files; do echo $f; done \ | LC_ALL=C sort -u | LC_ALL=C join -v 2 - "$tmp"/lib-files` if test -n "$extra_files"; then echo "EXTRA_DIST +=" $extra_files @@ -1571,29 +2205,82 @@ func_get_automake_snippet () # func_get_include_directive module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_include_directive () { - func_lookup_file "modules/$1" - sed -n -e "/^Include$sed_extract_prog" < "$lookedup_file" | \ - sed -e 's/^\(["<]\)/#include \1/' + { + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Include$sed_extract_prog" < "$lookedup_file" + else + func_cache_lookup_module "$1" + # Output the field's value, including the final newline (if any). + if $have_associative; then + if test -n "${modcache_include[$1]+set}"; then + echo "${modcache_include[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_include_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_include\"" + echo "${field_value}" + fi + fi + fi + } | sed -e 's/^\(["<]\)/#include \1/' } # func_get_link_directive module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_link_directive () { - func_lookup_file "modules/$1" - sed -n -e "/^Link$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Link$sed_extract_prog" < "$lookedup_file" + else + func_cache_lookup_module "$1" + # Output the field's value, including the final newline (if any). + if $have_associative; then + if test -n "${modcache_link[$1]+set}"; then + echo "${modcache_link[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_link_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_link\"" + echo "${field_value}" + fi + fi + fi } # func_get_license module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_license () { - func_lookup_file "modules/$1" - { sed -n -e "/^License$sed_extract_prog" < "$lookedup_file" + { + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^License$sed_extract_prog" < "$lookedup_file" + else + func_cache_lookup_module "$1" + # Output the field's value, including the final newline (if any). + if $have_associative; then + if test -n "${modcache_license[$1]+set}"; then + echo "${modcache_license[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_license_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_license\"" + echo "${field_value}" + fi + fi + fi # The default is GPL. echo "GPL" } | sed -e 's,^ *$,,' | sed -e 1q @@ -1602,10 +2289,27 @@ func_get_license () # func_get_maintainer module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_maintainer () { - func_lookup_file "modules/$1" - sed -n -e "/^Maintainer$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Maintainer$sed_extract_prog" < "$lookedup_file" + else + func_cache_lookup_module "$1" + # Output the field's value, including the final newline (if any). + if $have_associative; then + if test -n "${modcache_maintainer[$1]+set}"; then + echo "${modcache_maintainer[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_maintainer_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_maintainer\"" + echo "${field_value}" + fi + fi + fi } # func_get_tests_module module @@ -1638,10 +2342,33 @@ func_acceptable () # func_modules_transitive_closure # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - modules list of specified modules # - inctests true if tests should be included, blank otherwise # - incobsolete true if obsolete modules among dependencies should be # included, blank otherwise +# - inc_cxx_tests true if C++ interoperability tests should be included, +# blank otherwise +# - inc_longrunning_tests true if long-runnings tests should be included, +# blank otherwise +# - inc_privileged_tests true if tests that require root privileges should be +# included, blank otherwise +# - inc_unportable_tests true if tests that fail on some platforms should be +# included, blank otherwise +# - inc_all_direct_tests true if all kinds of problematic unit tests among +# the unit tests of the specified modules should be +# included, blank otherwise +# - inc_all_indirect_tests true if all kinds of problematic unit tests among +# the unit tests of the dependencies should be +# included, blank otherwise +# - excl_cxx_tests true if C++ interoperability tests should be excluded, +# blank otherwise +# - excl_longrunning_tests true if long-runnings tests should be excluded, +# blank otherwise +# - excl_privileged_tests true if tests that require root privileges should be +# excluded, blank otherwise +# - excl_unportable_tests true if tests that fail on some platforms should be +# excluded, blank otherwise # - avoidlist list of modules to avoid # - tmp pathname of a temporary directory # Output: @@ -1656,6 +2383,7 @@ func_modules_transitive_closure () handledmodules= inmodules="$modules" outmodules= + fmtc_inc_all_tests="$inc_all_direct_tests" while test -n "$inmodules"; do inmodules_this_round="$inmodules" inmodules= # Accumulator, queue for next round @@ -1668,35 +2396,99 @@ func_modules_transitive_closure () # Duplicate dependencies are harmless, but Jim wants a warning. duplicated_deps=`echo "$deps" | 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 + func_warning "module $module has duplicated dependencies: "`echo $duplicated_deps` fi - for dep in $deps; do - if test -n "$incobsolete" \ - || { status=`func_get_status $dep`; test "$status" != obsolete; }; then - func_append inmodules " $dep" - fi - done if test -n "$inctests"; then testsmodule=`func_get_tests_module $module` if test -n "$testsmodule"; then - func_append inmodules " $testsmodule" + deps="$deps $testsmodule" fi fi + for dep in $deps; do + # Determine whether to include the dependency or tests module. + inc=true + for word in `func_get_status $dep`; do + case "$word" in + obsolete) + test -n "$incobsolete" \ + || inc=false + ;; + c++-test) + test -z "$excl_cxx_tests" \ + || inc=false + test -n "$fmtc_inc_all_tests" || test -n "$inc_cxx_tests" \ + || inc=false + ;; + longrunning-test) + test -z "$excl_longrunning_tests" \ + || inc=false + test -n "$fmtc_inc_all_tests" || test -n "$inc_longrunning_tests" \ + || inc=false + ;; + privileged-test) + test -z "$excl_privileged_tests" \ + || inc=false + test -n "$fmtc_inc_all_tests" || test -n "$inc_privileged_tests" \ + || inc=false + ;; + unportable-test) + test -z "$excl_unportable_tests" \ + || inc=false + test -n "$fmtc_inc_all_tests" || test -n "$inc_unportable_tests" \ + || inc=false + ;; + *-test) + test -n "$fmtc_inc_all_tests" \ + || inc=false + ;; + esac + done + if $inc; then + func_append inmodules " $dep" + fi + done fi fi done handledmodules=`for m in $handledmodules $inmodules_this_round; do echo $m; done | LC_ALL=C sort -u` # Remove $handledmodules from $inmodules. for m in $inmodules; do echo $m; done | LC_ALL=C sort -u > "$tmp"/queued-modules - inmodules=`func_reset_sigpipe; echo "$handledmodules" | LC_ALL=C join -v 2 - "$tmp"/queued-modules` + inmodules=`echo "$handledmodules" | LC_ALL=C join -v 2 - "$tmp"/queued-modules` + fmtc_inc_all_tests="$inc_all_indirect_tests" done modules=`for m in $outmodules; do echo $m; done | LC_ALL=C sort -u` rm -f "$tmp"/queued-modules } +# func_show_module_list +# Input: +# - specified_modules list of specified modules (one per line, sorted) +# - modules complete list of modules (one per line, sorted) +# - tmp pathname of a temporary directory +func_show_module_list () +{ + if case "$TERM" in + xterm*) test -t 1;; + *) false;; + esac; then + # Assume xterm compatible escape sequences. + bold_on=`printf '\x1b[1m'` + bold_off=`printf '\x1b[0m'` + else + bold_on= + bold_off= + fi + echo "Module list with included dependencies (indented):" + echo "$specified_modules" | sed -e '/^$/d' -e 's/$/| /' > "$tmp"/specified-modules + echo "$modules" | sed -e '/^$/d' \ + | LC_ALL=C join -t '|' -a 2 "$tmp"/specified-modules - \ + | sed -e 's/^\(.*\)|.*/|\1/' -e 's/^/ /' -e 's/^ |\(.*\)$/ '"${bold_on}"'\1'"${bold_off}"'/' +} + # func_modules_add_dummy # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - modules list of modules, including dependencies # Output: # - modules list of modules, including 'dummy' if needed @@ -1738,6 +2530,7 @@ ba # func_modules_notice # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - verbose integer, default 0, inc/decremented by --verbose/--quiet # - modules list of modules, including dependencies func_modules_notice () @@ -1759,6 +2552,7 @@ func_modules_notice () # func_modules_to_filelist # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - modules list of modules, including dependencies # Output: # - files list of files @@ -1827,6 +2621,7 @@ func_dest_tmpfilename () # Input: # - destdir target directory # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - f the original file name # - lookedup_file name of the merged (combined) file # - lookedup_tmp true if it is located in the tmp directory, blank otherwise @@ -1860,6 +2655,7 @@ func_add_file () # Input: # - destdir target directory # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - f the original file name # - lookedup_file name of the merged (combined) file # - lookedup_tmp true if it is located in the tmp directory, blank otherwise @@ -1906,6 +2702,7 @@ func_update_file () # emits the contents of library makefile to standard output. # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - modules list of modules, including dependencies # - libname library name # - pobase directory relative to destdir where to place *.po files @@ -1970,6 +2767,7 @@ func_emit_lib_Makefile_am () if test -n "$module"; then { func_get_automake_snippet "$module" | + LC_ALL=C \ sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \ -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \ -e "$sed_eliminate_LDFLAGS" \ @@ -1981,16 +2779,16 @@ func_emit_lib_Makefile_am () echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@" echo "${libname}_${libext}_DEPENDENCIES += @${perhapsLT}ALLOCA@" fi - } > amsnippet.tmp + } > "$tmp"/amsnippet # Skip the contents if it's entirely empty. - if grep '[^ ]' amsnippet.tmp > /dev/null ; then + if grep '[^ ]' "$tmp"/amsnippet > /dev/null ; then echo "## begin gnulib module $module" echo - cat amsnippet.tmp + cat "$tmp"/amsnippet echo "## end gnulib module $module" echo fi - rm -f amsnippet.tmp + rm -f "$tmp"/amsnippet # Test whether there are some source files in subdirectories. for f in `func_get_filelist "$module"`; do case $f in @@ -2002,7 +2800,7 @@ func_emit_lib_Makefile_am () done fi done - } > allsnippets.tmp + } > "$tmp"/allsnippets if test -z "$makefile_name"; then # If there are source files in subdirectories, prevent collision of the # object files (example: hash.c and libxml/hash.c). @@ -2020,7 +2818,7 @@ func_emit_lib_Makefile_am () echo "noinst_LTLIBRARIES =" # Automake versions < 1.9b create an empty pkgdatadir at installation time # if you specify pkgdata_DATA to empty. This is a workaround. - if grep '^pkgdata_DATA *+=' allsnippets.tmp > /dev/null; then + if grep '^pkgdata_DATA *+=' "$tmp"/allsnippets > /dev/null; then echo "pkgdata_DATA =" fi echo "EXTRA_DIST =" @@ -2050,11 +2848,15 @@ func_emit_lib_Makefile_am () done if test -z "$makefile_name"; then echo - echo "AM_CPPFLAGS =" + if $for_test; then + echo "AM_CPPFLAGS = -DGNULIB_STRICT_CHECKING=1" + else + echo "AM_CPPFLAGS =" + fi echo "AM_CFLAGS =" fi echo - if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" allsnippets.tmp > /dev/null \ + if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" "$tmp"/allsnippets > /dev/null \ || { test -n "$makefile_name" \ && test -f "$sourcebase/Makefile.am" \ && LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" "$sourcebase/Makefile.am" > /dev/null; \ @@ -2082,7 +2884,7 @@ func_emit_lib_Makefile_am () echo "AM_CPPFLAGS += -DDEFAULT_TEXT_DOMAIN=\\\"${po_domain}-gnulib\\\"" echo fi - cat allsnippets.tmp \ + cat "$tmp"/allsnippets \ | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' echo echo "mostlyclean-local: mostlyclean-generic" @@ -2092,13 +2894,14 @@ func_emit_lib_Makefile_am () echo " fi; \\" echo " done; \\" echo " :" - rm -f allsnippets.tmp + rm -f "$tmp"/allsnippets } # func_emit_po_Makevars # emits the contents of po/ makefile parameterization to standard output. # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - sourcebase directory relative to destdir where to place source code # - pobase directory relative to destdir where to place *.po files # - po_domain prefix of i18n domain to use (without -gnulib suffix) @@ -2160,6 +2963,7 @@ EOF # emits the file list to be passed to xgettext to standard output. # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - sourcebase directory relative to destdir where to place source code # - files list of new files func_emit_po_POTFILES_in () @@ -2171,10 +2975,11 @@ func_emit_po_POTFILES_in () echo "$files" | sed -n -e "s,^lib/,$sourcebase/,p" } -# func_emit_tests_Makefile_am +# func_emit_tests_Makefile_am witness_macro # emits the contents of tests makefile to standard output. # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - modules list of modules, including dependencies # - libname library name # - auxdir directory relative to destdir where to place build aux files @@ -2194,6 +2999,7 @@ func_emit_po_POTFILES_in () # - uses_subdirs nonempty if object files in subdirs exist func_emit_tests_Makefile_am () { + witness_macro="$1" if test "$libtool" = true; then libext=la sed_eliminate_LDFLAGS="$sed_noop" @@ -2226,6 +3032,7 @@ func_emit_tests_Makefile_am () if test -n "$module"; then { func_get_automake_snippet "$module" | + LC_ALL=C \ sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \ -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \ -e "$sed_eliminate_LDFLAGS" \ @@ -2237,16 +3044,25 @@ func_emit_tests_Makefile_am () echo "libtests_a_LIBADD += @${perhapsLT}ALLOCA@" echo "libtests_a_DEPENDENCIES += @${perhapsLT}ALLOCA@" fi - } > amsnippet.tmp + } > "$tmp"/amsnippet # Skip the contents if it's entirely empty. - if grep '[^ ]' amsnippet.tmp > /dev/null ; then - echo "## begin gnulib module $module" - echo - cat amsnippet.tmp - echo "## end gnulib module $module" - echo + if grep '[^ ]' "$tmp"/amsnippet > /dev/null ; then + # Mention long-running tests at the end. + ofd=3 + for word in `func_get_status "$module"`; do + if test "$word" = 'longrunning-test'; then + ofd=4 + break + fi + done + { echo "## begin gnulib module $module" + echo + cat "$tmp"/amsnippet + echo "## end gnulib module $module" + echo + } >&$ofd fi - rm -f amsnippet.tmp + rm -f "$tmp"/amsnippet # Test whether there are some source files in subdirectories. for f in `func_get_filelist "$module"`; do case $f in @@ -2258,7 +3074,7 @@ func_emit_tests_Makefile_am () done fi done - } > allsnippets.tmp + } 3> "$tmp"/main_snippets 4> "$tmp"/longrunning_snippets # Generate dependencies here, since it eases the debugging of test failures. # If there are source files in subdirectories, prevent collision of the # object files (example: hash.c and libxml/hash.c). @@ -2275,8 +3091,9 @@ func_emit_tests_Makefile_am () # 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 "SUBDIRS = ." echo "TESTS =" + echo "XFAIL_TESTS =" echo "TESTS_ENVIRONMENT =" echo "noinst_PROGRAMS =" if ! $for_test; then @@ -2293,7 +3110,7 @@ func_emit_tests_Makefile_am () fi # Automake versions < 1.9b create an empty pkgdatadir at installation time # if you specify pkgdata_DATA to empty. This is a workaround. - if grep '^pkgdata_DATA *+=' allsnippets.tmp > /dev/null; then + if grep '^pkgdata_DATA *+=' "$tmp"/main_snippets "$tmp"/longrunning_snippets > /dev/null; then echo "pkgdata_DATA =" fi echo "EXTRA_DIST =" @@ -2320,6 +3137,12 @@ func_emit_tests_Makefile_am () done echo echo "AM_CPPFLAGS = \\" + if $for_test; then + echo " -DGNULIB_STRICT_CHECKING=1 \\" + fi + if test -n "${witness_macro}"; then + echo " -D@${witness_macro}@=1 \\" + fi echo " -I. -I\$(srcdir) \\" echo " -I${testsbase_inverse} -I\$(srcdir)/${testsbase_inverse} \\" echo " -I${testsbase_inverse}/${sourcebase-lib} -I\$(srcdir)/${testsbase_inverse}/${sourcebase-lib}" @@ -2351,7 +3174,12 @@ func_emit_tests_Makefile_am () echo "AM_LIBTOOLFLAGS = --preserve-dup-deps" echo fi - cat allsnippets.tmp \ + # Many test scripts use ${EXEEXT} or ${srcdir}. + # EXEEXT is defined by AC_PROG_CC through autoconf. + # srcdir is defined by autoconf and automake. + echo "TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='\$(srcdir)'" + echo + cat "$tmp"/main_snippets "$tmp"/longrunning_snippets \ | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' echo "# Clean up after Solaris cc." echo "clean-local:" @@ -2364,7 +3192,7 @@ func_emit_tests_Makefile_am () echo " fi; \\" echo " done; \\" echo " :" - rm -f allsnippets.tmp + rm -f "$tmp"/main_snippets "$tmp"/longrunning_snippets } # func_emit_initmacro_start macro_prefix @@ -2432,7 +3260,7 @@ func_emit_initmacro_end () echo " if test -n \"\$${macro_prefix_arg}_LIBOBJS\"; then" echo " # Remove the extension." echo " sed_drop_objext='s/\\.o\$//;s/\\.obj\$//'" - echo " for i in \`for i in \$${macro_prefix_arg}_LIBOBJS; do echo \"\$i\"; done | sed \"\$sed_drop_objext\" | sort | uniq\`; do" + echo " for i in \`for i in \$${macro_prefix_arg}_LIBOBJS; do echo \"\$i\"; done | sed -e \"\$sed_drop_objext\" | sort | uniq\`; do" echo " ${macro_prefix_arg}_libobjs=\"\$${macro_prefix_arg}_libobjs \$i.\$ac_objext\"" echo " ${macro_prefix_arg}_ltlibobjs=\"\$${macro_prefix_arg}_ltlibobjs \$i.lo\"" echo " done" @@ -2483,6 +3311,7 @@ func_emit_initmacro_done () # Uses also the variables # - destdir target directory # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - verbose integer, default 0, inc/decremented by --verbose/--quiet # - libname library name # - sourcebase directory relative to destdir where to place source code @@ -2493,6 +3322,14 @@ func_emit_initmacro_done () # - auxdir directory relative to destdir where to place build aux files # - inctests true if --with-tests was given, blank otherwise # - incobsolete true if --with-obsolete was given, blank otherwise +# - inc_cxx_tests true if --with-c++-tests was given, blank otherwise +# - inc_longrunning_tests true if --with-longrunning-tests was given, blank +# otherwise +# - inc_privileged_tests true if --with-privileged-tests was given, blank +# otherwise +# - inc_unportable_tests true if --with-unportable-tests was given, blank +# otherwise +# - inc_all_tests true if --with-all-tests was given, blank otherwise # - avoidlist list of modules to avoid, from --avoid # - lgpl yes or a number if library's license shall be LGPL, # blank otherwise @@ -2517,6 +3354,11 @@ func_import () cached_local_gnulib_dir= cached_specified_modules= cached_incobsolete= + cached_inc_cxx_tests= + cached_inc_longrunning_tests= + cached_inc_privileged_tests= + cached_inc_unportable_tests= + cached_inc_all_tests= cached_avoidlist= cached_sourcebase= cached_m4base= @@ -2554,6 +3396,21 @@ func_import () /gl_WITH_OBSOLETE/ { s,^.*$,cached_incobsolete=true,p } + /gl_WITH_CXX_TESTS/ { + s,^.*$,cached_inc_cxx_tests=true,p + } + /gl_WITH_LONGRUNNING_TESTS/ { + s,^.*$,cached_inc_longrunning_tests=true,p + } + /gl_WITH_PRIVILEGED_TESTS/ { + s,^.*$,cached_inc_privileged_tests=true,p + } + /gl_WITH_UNPORTABLE_TESTS/ { + s,^.*$,cached_inc_unportable_tests=true,p + } + /gl_WITH_ALL_TESTS/ { + s,^.*$,cached_inc_all_tests=true,p + } /gl_AVOID(/ { s,^.*gl_AVOID([[ ]*\([^]"$`\\)]*\).*$,cached_avoidlist="\1",p } @@ -2653,6 +3510,28 @@ func_import () if test -z "$incobsolete"; then incobsolete="$cached_incobsolete" fi + # Included special kinds of tests modules among the dependencies if specified + # either way. + if test -z "$inc_cxx_tests"; then + inc_cxx_tests="$cached_inc_cxx_tests" + fi + if test -z "$inc_longrunning_tests"; then + inc_longrunning_tests="$cached_inc_longrunning_tests" + fi + if test -z "$inc_privileged_tests"; then + inc_privileged_tests="$cached_inc_privileged_tests" + fi + if test -z "$inc_unportable_tests"; then + inc_unportable_tests="$cached_inc_unportable_tests" + fi + if test -z "$inc_all_tests"; then + inc_all_tests="$cached_inc_all_tests" + fi + # --without-*-tests options are not supported here. + excl_cxx_tests= + excl_longrunning_tests= + excl_privileged_tests= + excl_unportable_tests= # Append the cached and the specified avoidlist. This is probably better # than dropping the cached one when --avoid is specified at least once. avoidlist=`for m in $cached_avoidlist $avoidlist; do echo $m; done | LC_ALL=C sort -u` @@ -2729,12 +3608,15 @@ func_import () # Canonicalize the list of specified modules. specified_modules=`for m in $specified_modules; do echo $m; done | LC_ALL=C sort -u` + # Include all kinds of tests modules if --with-all-tests was specified. + inc_all_direct_tests="$inc_all_tests" + inc_all_indirect_tests="$inc_all_tests" + # Determine final module list. modules="$specified_modules" func_modules_transitive_closure if test $verbose -ge 0; then - echo "Module list with included dependencies:" - echo "$modules" | sed -e 's/^/ /' + func_show_module_list fi final_modules="$modules" @@ -2744,9 +3626,9 @@ func_import () # is specified, it will consist only of LGPLed source. # The tests-related module list is the transitive closure of the specified # modules, including tests modules, minus the main module list excluding - # 'link-warning'. Its lib/* sources (brought in through dependencies of - # *-tests modules) go into $testsbase/. It may contain GPLed source, even if - # --lgpl is specified. + # modules of applicability 'all'. Its lib/* sources (brought in through + # dependencies of *-tests modules) go into $testsbase/. It may contain GPLed + # source, even if --lgpl is specified. # Determine main module list. saved_inctests="$inctests" inctests="" @@ -2760,8 +3642,12 @@ func_import () fi # Determine tests-related module list. echo "$final_modules" | LC_ALL=C sort -u > "$tmp"/final-modules - sed_remove_link_warning='/^link-warning$/d' - testsrelated_modules=`func_reset_sigpipe; echo "$main_modules" | LC_ALL=C sort -u | sed -e "$sed_remove_link_warning" | LC_ALL=C join -v 2 - "$tmp"/final-modules` + testsrelated_modules=`for module in $main_modules; do + if test \`func_get_applicability $module\` = main; then + echo $module + fi + done \ + | LC_ALL=C sort -u | LC_ALL=C join -v 2 - "$tmp"/final-modules` if test $verbose -ge 1; then echo "Tests-related module list:" echo "$testsrelated_modules" | sed -e 's/^/ /' @@ -2809,7 +3695,7 @@ func_import () case "$lgpl" in yes | 3) case $license in - LGPL | LGPLv2+) ;; + LGPL | LGPLv2+ | LGPLv3+) ;; *) func_append license_incompatibilities "$module $license$nl" ;; esac ;; @@ -3115,6 +4001,21 @@ s,^\(.................................................[^ ]*\) *, if test -n "$incobsolete"; then func_append actioncmd " --with-obsolete" fi + if test -n "$inc_cxx_tests"; then + func_append actioncmd " --with-c++-tests" + fi + if test -n "$inc_longrunning_tests"; then + func_append actioncmd " --with-longrunning-tests" + fi + if test -n "$inc_privileged_tests"; then + func_append actioncmd " --with-privileged-tests" + fi + if test -n "$inc_unportable_tests"; then + func_append actioncmd " --with-unportable-tests" + fi + if test -n "$inc_all_tests"; then + func_append actioncmd " --with-all-tests" + fi for module in $avoidlist; do func_append actioncmd " --avoid=$module" done @@ -3398,9 +4299,14 @@ s,//*$,/,' esac echo "gl_LOCAL_DIR([$relative_local_gnulib_dir])" echo "gl_MODULES([" - echo "$specified_modules" | sed 's/^/ /g' + echo "$specified_modules" | sed -e 's/^/ /g' echo "])" test -z "$incobsolete" || echo "gl_WITH_OBSOLETE" + test -z "$inc_cxx_tests" || echo "gl_WITH_CXX_TESTS" + test -z "$inc_longrunning_tests" || echo "gl_WITH_LONGRUNNING_TESTS" + test -z "$inc_privileged_tests" || echo "gl_WITH_PRIVILEGED_TESTS" + test -z "$inc_unportable_tests" || echo "gl_WITH_UNPORTABLE_TESTS" + test -z "$inc_all_tests" || echo "gl_WITH_ALL_TESTS" echo "gl_AVOID([$avoidlist])" echo "gl_SOURCE_BASE([$sourcebase])" echo "gl_M4_BASE([$m4base])" @@ -3483,6 +4389,7 @@ s,//*$,/,' for module in $final_modules; do func_verify_module if test -n "$module"; then + echo "# Code from module $module:" func_get_autoconf_early_snippet "$module" fi done \ @@ -3512,28 +4419,40 @@ s,//*$,/,' else sed_replace_build_aux="$sed_noop" fi + echo " gl_m4_base='$m4base'" func_emit_initmacro_start $macro_prefix echo " gl_source_base='$sourcebase'" for module in $main_modules; do func_verify_module if test -n "$module"; then + echo " # Code from module $module:" 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 "$libtool" = true; then echo 'changequote(,)dnl' - echo 'LTALLOCA=`echo "$ALLOCA" | sed '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`' + echo 'LTALLOCA=`echo "$ALLOCA" | sed -e '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`' echo 'changequote([, ])dnl' echo 'AC_SUBST([LTALLOCA])' fi fi done + echo " # End of code from modules" func_emit_initmacro_end $macro_prefix echo " gltests_libdeps=" echo " gltests_ltlibdeps=" func_emit_initmacro_start ${macro_prefix}tests echo " gl_source_base='$testsbase'" + # Define a tests witness macro that depends on the package. + # PACKAGE is defined by AM_INIT_AUTOMAKE, PACKAGE_TARNAME is defined by AC_INIT. + # See . + echo "changequote(,)dnl" + echo " ${macro_prefix}tests_WITNESS=IN_\`echo \"\${PACKAGE-\$PACKAGE_TARNAME}\" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'\`_GNULIB_TESTS" + echo "changequote([, ])dnl" + echo " AC_SUBST([${macro_prefix}tests_WITNESS])" + echo " gl_module_indicator_condition=\$${macro_prefix}tests_WITNESS" + echo " m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [\$gl_module_indicator_condition])" for module in $testsrelated_modules; do func_verify_module if test -n "$module"; then @@ -3546,6 +4465,7 @@ s,//*$,/,' -e 's/gl_ltlibdeps/gltests_ltlibdeps/g' fi done + echo " m4_popdef([gl_MODULE_INDICATOR_CONDITION])" func_emit_initmacro_end ${macro_prefix}tests # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is # created using libtool, because libtool already handles the dependencies. @@ -3604,7 +4524,7 @@ s,//*$,/,' func_dest_tmpfilename $testsbase/$makefile_am destfile="$testsbase/$makefile_am" modules="$testsrelated_modules" - func_emit_tests_Makefile_am > "$tmpfile" + func_emit_tests_Makefile_am "${macro_prefix}tests_WITNESS" > "$tmpfile" if test -f "$destdir"/$testsbase/$makefile_am; then if cmp "$destdir"/$testsbase/$makefile_am "$tmpfile" > /dev/null; then rm -f "$tmpfile" @@ -3657,8 +4577,7 @@ s,//*$,/,' if test -f "$destdir/$dir$ignore"; then if test -n "$dir_added" || test -n "$dir_removed"; then sed -e "s|^$anchor||" < "$destdir/$dir$ignore" | LC_ALL=C sort > "$tmp"/ignore - (func_reset_sigpipe - echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u \ + (echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u \ | LC_ALL=C join -v 1 - "$tmp"/ignore > "$tmp"/ignore-added echo "$dir_removed" | sed -e '/^$/d' | LC_ALL=C sort -u \ | LC_ALL=C join -v 1 - "$tmp"/ignore > "$tmp"/ignore-removed @@ -3812,7 +4731,25 @@ s,//*$,/,' # func_create_testdir testdir modules # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - auxdir directory relative to destdir where to place build aux files +# - inctests true if tests should be included, blank otherwise +# - incobsolete true if obsolete modules among dependencies should be +# included, blank otherwise +# - excl_cxx_tests true if C++ interoperability tests should be excluded, +# blank otherwise +# - excl_longrunning_tests true if long-runnings tests should be excluded, +# blank otherwise +# - excl_privileged_tests true if tests that require root privileges should be +# excluded, blank otherwise +# - excl_unportable_tests true if tests that fail on some platforms should be +# excluded, blank otherwise +# - avoidlist list of modules to avoid +# - libtool true if --libtool was given, false if --no-libtool was +# given, blank otherwise +# - symbolic true if files should be symlinked, copied otherwise +# - lsymbolic true if files from local_gnulib_dir should be symlinked, +# copied otherwise func_create_testdir () { testdir="$1" @@ -3821,20 +4758,28 @@ func_create_testdir () # All modules together. # Except config-h, which breaks all modules which use HAVE_CONFIG_H. # Except ftruncate, mountlist, which abort the configuration on mingw. FIXME. + # Except lib-ignore, which leads to link errors when Sun C++ is used. FIXME. modules=`func_all_modules` - modules=`for m in $modules; do case $m in config-h | ftruncate | mountlist) ;; *) echo $m;; esac; done` + modules=`for m in $modules; do case $m in config-h | ftruncate | mountlist | lib-ignore) ;; *) echo $m;; esac; done` fi - modules=`for m in $modules; do echo $m; done | LC_ALL=C sort -u` + specified_modules="$modules" + + # Canonicalize the list of specified modules. + specified_modules=`for m in $specified_modules; do echo $m; done | LC_ALL=C sort -u` + + # Unlike in func_import, here we want to include all kinds of tests for the + # directly specified modules, but not for dependencies. + inc_all_direct_tests=true + inc_all_indirect_tests="$inc_all_tests" # Check that the license of every module is consistent with the license of # its dependencies. - saved_modules="$modules" saved_inctests="$inctests" # When computing transitive closures, don't consider $module to depend on # $module-tests. Need this becauses tests are implicitly GPL and may depend # on GPL modules - therefore we don't want a warning in this case. inctests="" - for requested_module in $saved_modules; do + for requested_module in $specified_modules; do requested_license=`func_get_license "$requested_module"` if test "$requested_license" != GPL; then # Here we use func_modules_transitive_closure, not just @@ -3853,19 +4798,19 @@ func_create_testdir () GPLv2+) case "$license" in GPLv2+ | LGPLv2+) ;; - *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;; + *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; esac ;; LGPL) case "$license" in LGPL | LGPLv2+) ;; - *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;; + *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; esac ;; LGPLv2+) case "$license" in LGPLv2+) ;; - *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;; + *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; esac ;; esac @@ -3874,7 +4819,6 @@ func_create_testdir () done fi done - modules="$saved_modules" inctests="$saved_inctests" # Subdirectory names. @@ -3888,10 +4832,10 @@ func_create_testdir () vc_files= # Determine final module list. + modules="$specified_modules" func_modules_transitive_closure if test $verbose -ge 0; then - echo "Module list with included dependencies:" - echo "$modules" | sed -e 's/^/ /' + func_show_module_list fi # Add the dummy module if needed. @@ -4000,11 +4944,11 @@ func_create_testdir () test -d "$testdir/$testsbase" || mkdir "$testdir/$testsbase" # Viewed from the $testsbase subdirectory, $auxdir is different. saved_auxdir="$auxdir" - auxdir=`echo "$testsbase/"|sed 's%[^/][^/]*//*%../%g'`"$auxdir" + auxdir=`echo "$testsbase/" | sed -e 's%[^/][^/]*//*%../%g'`"$auxdir" # Create $testsbase/Makefile.am. use_libtests=false destfile="$testsbase/Makefile.am" - func_emit_tests_Makefile_am > "$testdir/$testsbase/Makefile.am" + func_emit_tests_Makefile_am "" > "$testdir/$testsbase/Makefile.am" any_uses_subdirs="$any_uses_subdirs$uses_subdirs" # Create $testsbase/configure.ac. (echo "# Process this file with autoconf to produce a configure script." @@ -4019,6 +4963,10 @@ func_create_testdir () echo "AC_PROG_MAKE_SET" echo "AC_PROG_RANLIB" echo + if test -n "$uses_subdirs"; then + echo "AM_PROG_CC_C_O" + echo + fi for module in $modules; do func_verify_module if test -n "$module"; then @@ -4034,6 +4982,8 @@ func_create_testdir () done \ | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' if test "$libtool" = true; then + echo "LT_INIT([win32-dll])" + echo "LT_LANG([C++])" echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" echo "gl_cond_libtool=true" else @@ -4056,6 +5006,7 @@ func_create_testdir () s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)| ba }' + echo "gl_m4_base='../$m4base'" func_emit_initmacro_start $macro_prefix # We don't have explicit ordering constraints between the various # autoconf snippets. It's cleanest to put those of the library before @@ -4157,6 +5108,8 @@ func_create_testdir () done \ | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' if test "$libtool" = true; then + echo "LT_INIT([win32-dll])" + echo "LT_LANG([C++])" echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" echo "gl_cond_libtool=true" else @@ -4183,6 +5136,7 @@ func_create_testdir () else sed_replace_build_aux="$sed_noop" fi + echo "gl_m4_base='$m4base'" func_emit_initmacro_start $macro_prefix echo "gl_source_base='$sourcebase'" for module in $modules; do @@ -4235,6 +5189,9 @@ func_create_testdir () fi done fi + if test "$libtool" = true; then + func_execute_command ${LIBTOOLIZE} --copy || func_exit 1 + fi func_execute_command ${ACLOCAL} -I $m4base || func_exit 1 if ! test -d build-aux; then func_execute_command mkdir build-aux || func_exit 1 @@ -4267,13 +5224,13 @@ func_create_testdir () fi # Need to run configure and make once, to create built files that are to be # distributed (such as getdate.c). + sed_remove_make_variables='s,[$]([A-Za-z0-9_]*),,g' # Extract the value of "CLEANFILES += ..." and "MOSTLYCLEANFILES += ...". cleaned_files=`sed -e "$sed_remove_backslash_newline" < "$testdir/$sourcebase/Makefile.am" \ | sed -n -e 's,^CLEANFILES[ ]*+=\([^#]*\).*$,\1,p' -e 's,^MOSTLYCLEANFILES[ ]*+=\([^#]*\).*$,\1,p'` cleaned_files=`for file in $cleaned_files; do echo " $file "; done` # Extract the value of "BUILT_SOURCES += ...". Remove variable references # such $(FOO_H) because they don't refer to distributed files. - sed_remove_make_variables='s,[$]([A-Za-z0-9_]*),,g' built_sources=`sed -e "$sed_remove_backslash_newline" < "$testdir/$sourcebase/Makefile.am" \ | sed -n -e 's,^BUILT_SOURCES[ ]*+=\([^#]*\).*$,\1,p' \ | sed -e "$sed_remove_make_variables"` @@ -4283,14 +5240,44 @@ func_create_testdir () *) echo $file ;; esac; done` - if test -n "$distributed_built_sources"; then + tests_distributed_built_sources= + if test -n "$inctests"; then + # Likewise for built files in the $testsbase directory. + tests_cleaned_files=`sed -e "$sed_remove_backslash_newline" < "$testdir/$testsbase/Makefile.am" \ + | sed -n -e 's,^CLEANFILES[ ]*+=\([^#]*\).*$,\1,p' -e 's,^MOSTLYCLEANFILES[ ]*+=\([^#]*\).*$,\1,p'` + tests_cleaned_files=`for file in $tests_cleaned_files; do echo " $file "; done` + tests_built_sources=`sed -e "$sed_remove_backslash_newline" < "$testdir/$testsbase/Makefile.am" \ + | sed -n -e 's,^BUILT_SOURCES[ ]*+=\([^#]*\).*$,\1,p' \ + | sed -e "$sed_remove_make_variables"` + tests_distributed_built_sources=`for file in $tests_built_sources; do + case "$tests_cleaned_files" in + *" "$file" "*) ;; + *) echo $file ;; + esac; + done` + fi + if test -n "$distributed_built_sources" || test -n "$tests_distributed_built_sources"; then (cd "$testdir" ./configure || func_exit 1 - cd "$sourcebase" - echo 'built_sources: $(BUILT_SOURCES)' >> Makefile - $MAKE built_sources || func_exit 1 - cd .. - $MAKE distclean || func_exit 1 + if test -n "$distributed_built_sources"; then + cd "$sourcebase" + echo 'built_sources: $(BUILT_SOURCES)' >> Makefile + $MAKE AUTOCONF="${AUTOCONF}" AUTOHEADER="${AUTOHEADER}" ACLOCAL="${ACLOCAL}" AUTOMAKE="${AUTOMAKE}" AUTORECONF="${AUTORECONF}" AUTOPOINT="${AUTOPOINT}" LIBTOOLIZE="${LIBTOOLIZE}" \ + built_sources \ + || func_exit 1 + cd .. + fi + if test -n "$tests_distributed_built_sources"; then + cd "$testsbase" + echo 'built_sources: $(BUILT_SOURCES)' >> Makefile + $MAKE AUTOCONF="${AUTOCONF}" AUTOHEADER="${AUTOHEADER}" ACLOCAL="${ACLOCAL}" AUTOMAKE="${AUTOMAKE}" AUTORECONF="${AUTORECONF}" AUTOPOINT="${AUTOPOINT}" LIBTOOLIZE="${LIBTOOLIZE}" \ + built_sources \ + || func_exit 1 + cd .. + fi + $MAKE AUTOCONF="${AUTOCONF}" AUTOHEADER="${AUTOHEADER}" ACLOCAL="${ACLOCAL}" AUTOMAKE="${AUTOMAKE}" AUTORECONF="${AUTORECONF}" AUTOPOINT="${AUTOPOINT}" LIBTOOLIZE="${LIBTOOLIZE}" \ + distclean \ + || func_exit 1 ) || func_exit 1 fi } @@ -4298,6 +5285,7 @@ func_create_testdir () # func_create_megatestdir megatestdir allmodules # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - auxdir directory relative to destdir where to place build aux files func_create_megatestdir () { @@ -4406,6 +5394,40 @@ case $mode in func_all_modules ;; + find ) + # sed expression that converts a literal to a basic regular expression. + # Needs to handle . [ \ * ^ $. + sed_literal_to_basic_regex='s/\\/\\\\/g +s/\[/\\[/g +s/\^/\\^/g +s/\([.*$]\)/[\1]/g' + for filename + do + if test -f "$gnulib_dir/$filename" \ + || { test -n "$local_gnulib_dir" && test -f "$local_gnulib_dir/$filename"; }; then + filename_anywhere_regex=`echo "$filename" | sed -e "$sed_literal_to_basic_regex"` + filename_line_regex='^'"$filename_anywhere_regex"'$' + module_candidates=` + { + (cd "$gnulib_dir" && find modules -type f -print | xargs -n 100 grep -l "$filename_line_regex" /dev/null | sed -e 's,^modules/,,') + if test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules"; then + (cd "$local_gnulib_dir" && find modules -type f -print | xargs -n 100 grep -l "$filename_anywhere_regex" /dev/null | sed -e 's,^modules/,,' -e 's,\.diff$,,') + fi + } \ + | func_sanitize_modulelist \ + | LC_ALL=C sort -u + ` + for module in $module_candidates; do + if func_get_filelist $module | grep "$filename_line_regex" > /dev/null; then + echo $module + fi + done + else + func_warning "file $filename does not exist" + fi + done + ;; + import | update ) # Where to import. @@ -4466,7 +5488,7 @@ case $mode in m4dirs= m4dirs_count=0 if test -f "$destdir"/Makefile.am; then - aclocal_amflags=`sed -n 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/p' "$destdir"/Makefile.am` + aclocal_amflags=`sed -n -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/p' "$destdir"/Makefile.am` m4dir_is_next= for arg in $aclocal_amflags; do if test -n "$m4dir_is_next"; then @@ -4496,7 +5518,7 @@ case $mode in sedexpr2='s,^[^/]*$,.,' sedexpr3='s,/[^/]*$,,' m4dirs=`sed -n -e "$sedexpr1" aclocal.m4 | sed -e "$sedexpr2" -e "$sedexpr3" | LC_ALL=C sort -u` - m4dirs_count=`echo "$m4dirs" | wc -l` + m4dirs_count=`printf %s "$m4dirs" | wc -l` fi fi if test $m4dirs_count = 0; then @@ -4523,8 +5545,10 @@ case $mode in for m4base in $m4dirs; do # Perform func_import in a subshell, so that variable values # such as - # local_gnulib_dir, incobsolete, avoidlist, sourcebase, m4base, - # pobase, docbase, testsbase, inctests, libname, lgpl, + # local_gnulib_dir, incobsolete, inc_cxx_tests, + # inc_longrunning_tests, inc_privileged_tests, + # inc_unportable_tests, inc_all_tests, avoidlist, sourcebase, + # m4base, pobase, docbase, testsbase, inctests, libname, lgpl, # makefile_name, libtool, macro_prefix, po_domain, vc_files # don't propagate from one directory to another. (func_import) || func_exit 1 @@ -4614,6 +5638,16 @@ case $mode in done ;; + extract-comment ) + for module + do + func_verify_module + if test -n "$module"; then + func_get_comment "$module" + fi + done + ;; + extract-status ) for module do @@ -4634,6 +5668,16 @@ case $mode in done ;; + extract-applicability ) + for module + do + func_verify_module + if test -n "$module"; then + func_get_applicability "$module" + fi + done + ;; + extract-filelist ) for module do