summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2015-11-07 15:34:53 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2015-11-07 15:34:53 (GMT)
commit6cecc808e5552f3220b97033306e42ce152908bb (patch) (side-by-side diff)
tree778eb3e631cc6e556f1ec31ab584446951da8885
parent638c48ec020909e52a2081b4b9dc6908592e1bab (diff)
downloadidest-6cecc808e5552f3220b97033306e42ce152908bb.tar.gz
idest-6cecc808e5552f3220b97033306e42ce152908bb.tar.bz2
Include gnulib as a submodule. Fix testsuite.
Guile 2.x outputs spurious diagnostics to stderr when compiling input files. The only way to disable it is to disable compilation by setting environment variable GUILE_AUTO_COMPILE to 0. However, even if compilation is disabled, Guile still checks whether the compiled file exists and complains on stderr if it is older than the input file. This diagnostics begins with ;;;. Delete this using sed prior to comparing stderr with the expected text. * .gitmodules: Add gnulib * gnulib: New module. * bootstrap: Update from gnulib * gint: Upgrade. * scheme/idest/batch/setlyrics.scm: Fix typo. * src/Makefile.am: Use AM_CPPFLAGS instead of obsolete includes. * tests/atlocal.in: Set GUILE_AUTO_COMPILE=0 * tests/testsuite.at (WITH_GUILE): New macro. * tests/delcomm.at: Use WITH_GUILE. * tests/fmt-shortlist.at: Likewise. * tests/framelist00.at: Likewise. * tests/framelist01.at: Likewise. * tests/framelist02.at: Likewise. * tests/list1.at: Likewise. * tests/list2.at: Likewise. * tests/lyrics00.at: Likewise. * tests/pic00.at: Likewise. * tests/pic01.at: Likewise. * tests/script00.at: Likewise. * tests/script01.at: Likewise. * tests/script02.at: Likewise. * tests/script03.at: Likewise. * tests/script04.at: Likewise. * tests/script05.at: Likewise. * tests/script06.at: Likewise. * tests/script07.at: Likewise. * tests/script08.at: Likewise. * tests/setlyrics.at: Likewise. * tests/setpic.at: Likewise. * tests/settitle.at: Likewise. * tests/shortlist.at: Likewise.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--.gitmodules3
-rwxr-xr-xbootstrap983
m---------gint0
m---------gnulib0
-rw-r--r--scheme/idest/batch/setlyrics.scm2
-rw-r--r--src/Makefile.am13
-rw-r--r--tests/atlocal.in3
-rw-r--r--tests/delcomm.at6
-rw-r--r--tests/fmt-shortlist.at7
-rw-r--r--tests/framelist00.at6
-rw-r--r--tests/framelist01.at6
-rw-r--r--tests/framelist02.at6
-rw-r--r--tests/list1.at7
-rw-r--r--tests/list2.at7
-rw-r--r--tests/lyrics00.at6
-rw-r--r--tests/pic00.at5
-rw-r--r--tests/pic01.at6
-rw-r--r--tests/script00.at6
-rw-r--r--tests/script01.at6
-rw-r--r--tests/script02.at6
-rw-r--r--tests/script03.at6
-rw-r--r--tests/script04.at6
-rw-r--r--tests/script05.at6
-rw-r--r--tests/script06.at6
-rw-r--r--tests/script07.at6
-rw-r--r--tests/script08.at6
-rw-r--r--tests/setlyrics.at6
-rw-r--r--tests/setpic.at6
-rw-r--r--tests/settitle.at7
-rw-r--r--tests/shortlist.at7
-rw-r--r--tests/testsuite.at7
31 files changed, 785 insertions, 368 deletions
diff --git a/.gitmodules b/.gitmodules
index 7c369d4..adb8e67 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3 +3,4 @@
url = git://git.gnu.org.ua/gint.git
+[submodule "gnulib"]
+ path = gnulib
+ url = git://git.sv.gnu.org/gnulib.git
diff --git a/bootstrap b/bootstrap
index 4cb82b2..e72894c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,2 +1,4 @@
#! /bin/sh
+# Print a version string.
+scriptversion=2014-12-08.12; # UTC
@@ -4,5 +6,5 @@
-# Copyright (C) 2003-2008 Free Software Foundation, Inc.
+# Copyright (C) 2003-2015 Free Software Foundation, Inc.
-# Dico is free software: you can redistribute it and/or modify
+# 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
@@ -11,3 +13,3 @@
-# Dico is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,5 +19,13 @@
# You should have received a copy of the GNU General Public License
-# along with Dico. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Written by Paul Eggert.
+# Originally written by Paul Eggert. The canonical version of this
+# script is maintained as build-aux/bootstrap in gnulib, however, to
+# be useful to your project, you should place a copy of it under
+# version control in the top-level directory of your project. The
+# intent is that all customization can be done with a bootstrap.conf
+# file also maintained in your version control; gnulib comes with a
+# template build-aux/bootstrap.conf to get you started.
+
+# Please report bugs or propose patches to bug-gnulib@gnu.org.
@@ -28,12 +38,16 @@ export LC_ALL
+# Ensure that CDPATH is not set. Otherwise, the output from cd
+# would cause trouble in at least one use below.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
local_gl_dir=gl
-# Temporary directory names.
-bt='._bootmp'
-bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
-bt2=${bt}2
+# Honour $PERL, but work even if there is none
+PERL="${PERL-perl}"
+
+me=$0
usage() {
- echo >&2 "\
-Usage: $0 [OPTION]...
+ cat <<EOF
+Usage: $me [OPTION]...
Bootstrap this package from the checked-out sources.
@@ -41,3 +55,3 @@ Bootstrap this package from the checked-out sources.
Options:
- --gnulib-srcdir=DIRNAME Specify the local directory where gnulib
+ --gnulib-srcdir=DIRNAME specify the local directory where gnulib
sources reside. Use this if you already
@@ -45,15 +59,52 @@ Options:
do not want to waste your bandwidth downloading
- them again.
- --copy Copy files instead of creating symbolic links.
- --force Attempt to bootstrap even if the sources seem
- not to have been checked out.
- --skip-po Do not download po files.
-
-If the file bootstrap.conf exists in the current working directory, its
+ them again. Defaults to \$GNULIB_SRCDIR
+ --bootstrap-sync if this bootstrap script is not identical to
+ the version in the local gnulib sources,
+ update this script, and then restart it with
+ /bin/sh or the shell \$CONFIG_SHELL
+ --no-bootstrap-sync do not check whether bootstrap is out of sync
+ --copy copy files instead of creating symbolic links
+ --force attempt to bootstrap even if the sources seem
+ not to have been checked out
+ --no-git do not use git to update gnulib. Requires that
+ --gnulib-srcdir point to a correct gnulib snapshot
+ --skip-po do not download po files
+
+If the file $me.conf exists in the same directory as this script, its
contents are read as shell variables to configure the bootstrap.
+For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
+are honored.
+
Running without arguments will suffice in most cases.
-"
+EOF
+}
+
+# warnf_ FORMAT-STRING ARG1...
+warnf_ ()
+{
+ warnf_format_=$1
+ shift
+ nl='
+'
+ case $* in
+ *$nl*) me_=$(printf "$me"|tr "$nl|" '??')
+ printf "$warnf_format_" "$@" | sed "s|^|$me_: |" ;;
+ *) printf "$me: $warnf_format_" "$@" ;;
+ esac >&2
+}
+
+# warn_ WORD1...
+warn_ ()
+{
+ # If IFS does not start with ' ', set it and emit the warning in a subshell.
+ case $IFS in
+ ' '*) warnf_ '%s\n' "$*";;
+ *) (IFS=' '; warn_ "$@");;
+ esac
}
+# die WORD1...
+die() { warn_ "$@"; exit 1; }
+
# Configuration.
@@ -69,2 +120,13 @@ gnulib_files=
+: ${AUTOPOINT=autopoint}
+: ${AUTORECONF=autoreconf}
+
+# A function to be called right after gnulib-tool is run.
+# Override it via your own definition in bootstrap.conf.
+bootstrap_post_import_hook() { :; }
+
+# A function to be called after everything else in this script.
+# Override it via your own definition in bootstrap.conf.
+bootstrap_epilogue() { :; }
+
# The command to download all .po files for a specified domain into
@@ -75,10 +137,18 @@ gnulib_files=
po_download_command_format=\
-"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'"
+"rsync --delete --exclude '*.s1' -Lrtvz \
+ 'translationproject.org::tp/latest/%s/' '%s'"
+
+# Fallback for downloading .po files (if rsync fails).
+po_download_command_format2=\
+"wget --mirror -nd -q -np -A.po -P '%s' \
+ http://translationproject.org/latest/%s/"
+# Prefer a non-empty tarname (4th argument of AC_INIT if given), else
+# fall back to the package name (1st argument with munging)
extract_package_name='
- /^AC_INIT(/{
- /.*,.*,.*, */{
- s///
- s/[][]//g
- s/)$//
+ /^AC_INIT(\[*/{
+ s///
+ /^[^,]*,[^,]*,[^,]*,[ []*\([^][ ,)]\)/{
+ s//\1/
+ s/[],)].*//
p
@@ -86,7 +156,6 @@ extract_package_name='
}
- s/AC_INIT(\[*//
- s/]*,.*//
+ s/[],)].*//
s/^GNU //
y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
- s/[^A-Za-z0-9_]/-/g
+ s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g
p
@@ -94,3 +163,4 @@ extract_package_name='
'
-package=`sed -n "$extract_package_name" configure.ac` || exit
+package=$(sed -n "$extract_package_name" configure.ac) \
+ || die 'cannot find package name in configure.ac'
gnulib_name=lib$package
@@ -102,14 +172,3 @@ doc_base=doc
tests_base=tests
-
-# Extra files from gnulib, which override files from other sources.
-gnulib_extra_files="
- $build_aux/install-sh
- $build_aux/missing
- $build_aux/mdate-sh
- $build_aux/texinfo.tex
- $build_aux/depcomp
- $build_aux/config.guess
- $build_aux/config.sub
- doc/INSTALL
-"
+gnulib_extra_files=''
@@ -128,3 +187,4 @@ XGETTEXT_OPTIONS='\\\
-# Package bug report address for gettext files
+# Package bug report address and copyright holder for gettext files
+COPYRIGHT_HOLDER='Free Software Foundation, Inc.'
MSGID_BUGS_ADDRESS=bug-$package@gnu.org
@@ -147,4 +207,72 @@ vc_ignore=auto
+# Set this to true in bootstrap.conf to enable --bootstrap-sync by
+# default.
+bootstrap_sync=false
+
+# Use git to update gnulib sources
+use_git=true
+
+check_exists() {
+ if test "$1" = "--verbose"; then
+ ($2 --version </dev/null) >/dev/null 2>&1
+ if test $? -ge 126; then
+ # If not found, run with diagnostics as one may be
+ # presented with env variables to set to find the right version
+ ($2 --version </dev/null)
+ fi
+ else
+ ($1 --version </dev/null) >/dev/null 2>&1
+ fi
+
+ test $? -lt 126
+}
+
+# find_tool ENVVAR NAMES...
+# -------------------------
+# Search for a required program. Use the value of ENVVAR, if set,
+# otherwise find the first of the NAMES that can be run.
+# If found, set ENVVAR to the program name, die otherwise.
+#
+# FIXME: code duplication, see also gnu-web-doc-update.
+find_tool ()
+{
+ find_tool_envvar=$1
+ shift
+ find_tool_names=$@
+ eval "find_tool_res=\$$find_tool_envvar"
+ if test x"$find_tool_res" = x; then
+ for i; do
+ if check_exists $i; then
+ find_tool_res=$i
+ break
+ fi
+ done
+ fi
+ if test x"$find_tool_res" = x; then
+ warn_ "one of these is required: $find_tool_names;"
+ die "alternatively set $find_tool_envvar to a compatible tool"
+ fi
+ eval "$find_tool_envvar=\$find_tool_res"
+ eval "export $find_tool_envvar"
+}
+
# Override the default configuration, if necessary.
-test -r bootstrap.conf && . ./bootstrap.conf
+# Make sure that bootstrap.conf is sourced from the current directory
+# if we were invoked as "sh bootstrap".
+case "$0" in
+ */*) test -r "$0.conf" && . "$0.conf" ;;
+ *) test -r "$0.conf" && . ./"$0.conf" ;;
+esac
+
+# Extra files from gnulib, which override files from other sources.
+test -z "${gnulib_extra_files}" && \
+ gnulib_extra_files="
+ build-aux/install-sh
+ build-aux/mdate-sh
+ build-aux/texinfo.tex
+ build-aux/depcomp
+ build-aux/config.guess
+ build-aux/config.sub
+ doc/INSTALL
+"
@@ -167,3 +295,3 @@ do
--gnulib-srcdir=*)
- GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;
+ GNULIB_SRCDIR=${option#--gnulib-srcdir=};;
--skip-po)
@@ -174,5 +302,10 @@ do
copy=true;;
+ --bootstrap-sync)
+ bootstrap_sync=true;;
+ --no-bootstrap-sync)
+ bootstrap_sync=false;;
+ --no-git)
+ use_git=false;;
*)
- echo >&2 "$0: $option: unknown option"
- exit 1;;
+ die "$option: unknown option";;
esac
@@ -180,10 +313,19 @@ done
+$use_git || test -d "$GNULIB_SRCDIR" \
+ || die "Error: --no-git requires --gnulib-srcdir"
+
if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
- echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
- exit 1
+ die "Bootstrapping from a non-checked-out distribution is risky."
fi
-# If $STR is not already on a line by itself in $FILE, insert it,
-# sorting the new contents of the file and replacing $FILE with the result.
-insert_sorted_if_absent() {
+# Strip blank and comment lines to leave significant entries.
+gitignore_entries() {
+ sed '/^#/d; /^$/d' "$@"
+}
+
+# If $STR is not already on a line by itself in $FILE, insert it at the start.
+# Entries are inserted at the start of the ignore list to ensure existing
+# entries starting with ! are not overridden. Such entries support
+# whitelisting exceptions after a more generic blacklist pattern.
+insert_if_absent() {
file=$1
@@ -191,5 +333,28 @@ insert_sorted_if_absent() {
test -f $file || touch $file
- echo "$str" | sort -u - $file | cmp -s - $file \
- || echo "$str" | sort -u - $file -o $file \
- || exit 1
+ test -r $file || die "Error: failed to read ignore file: $file"
+ duplicate_entries=$(gitignore_entries $file | sort | uniq -d)
+ if [ "$duplicate_entries" ] ; then
+ die "Error: Duplicate entries in $file: " $duplicate_entries
+ fi
+ linesold=$(gitignore_entries $file | wc -l)
+ linesnew=$( { echo "$str"; cat $file; } | gitignore_entries | sort -u | wc -l)
+ if [ $linesold != $linesnew ] ; then
+ { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \
+ || die "insert_if_absent $file $str: failed"
+ fi
+}
+
+# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
+# insert_if_absent.
+insert_vc_ignore() {
+ vc_ignore_file="$1"
+ pattern="$2"
+ case $vc_ignore_file in
+ *.gitignore)
+ # A .gitignore entry that does not start with '/' applies
+ # recursively to subdirectories, so prepend '/' to every
+ # .gitignore entry.
+ pattern=$(echo "$pattern" | sed s,^,/,);;
+ esac
+ insert_if_absent "$vc_ignore_file" "$pattern"
}
@@ -202,7 +367,4 @@ grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
>/dev/null && found_aux_dir=yes
-if test $found_aux_dir = no; then
- echo "$0: expected line not found in configure.ac. Add the following:" >&2
- echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2
- exit 1
-fi
+test $found_aux_dir = yes \
+ || die "configure.ac lacks 'AC_CONFIG_AUX_DIR([$build_aux])'; add it"
@@ -214,4 +376,210 @@ if test ! -d $build_aux; then
test $dot_ig = x && continue
- insert_sorted_if_absent $dot_ig $build_aux
+ insert_vc_ignore $dot_ig $build_aux
+ done
+fi
+
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+sort_ver() { # sort -V is not generally available
+ ver1="$1"
+ ver2="$2"
+
+ # split on '.' and compare each component
+ i=1
+ while : ; do
+ p1=$(echo "$ver1" | cut -d. -f$i)
+ p2=$(echo "$ver2" | cut -d. -f$i)
+ if [ ! "$p1" ]; then
+ echo "$1 $2"
+ break
+ elif [ ! "$p2" ]; then
+ echo "$2 $1"
+ break
+ elif [ ! "$p1" = "$p2" ]; then
+ if [ "$p1" -gt "$p2" ] 2>/dev/null; then # numeric comparison
+ echo "$2 $1"
+ elif [ "$p2" -gt "$p1" ] 2>/dev/null; then # numeric comparison
+ echo "$1 $2"
+ else # numeric, then lexicographic comparison
+ lp=$(printf "$p1\n$p2\n" | LANG=C sort -n | tail -n1)
+ if [ "$lp" = "$p2" ]; then
+ echo "$1 $2"
+ else
+ echo "$2 $1"
+ fi
+ fi
+ break
+ fi
+ i=$(($i+1))
+ done
+}
+
+get_version() {
+ app=$1
+
+ $app --version >/dev/null 2>&1 || { $app --version; return 1; }
+
+ $app --version 2>&1 |
+ sed -n '# Move version to start of line.
+ s/.*[v ]\([0-9]\)/\1/
+
+ # Skip lines that do not start with version.
+ /^[0-9]/!d
+
+ # Remove characters after the version.
+ s/[^.a-z0-9-].*//
+
+ # The first component must be digits only.
+ s/^\([0-9]*\)[a-z-].*/\1/
+
+ #the following essentially does s/5.005/5.5/
+ s/\.0*\([1-9]\)/.\1/g
+ p
+ q'
+}
+
+check_versions() {
+ ret=0
+
+ while read app req_ver; do
+ # We only need libtoolize from the libtool package.
+ if test "$app" = libtool; then
+ app=libtoolize
+ fi
+ # Exempt git if --no-git is in effect.
+ if test "$app" = git; then
+ $use_git || continue
+ fi
+ # Honor $APP variables ($TAR, $AUTOCONF, etc.)
+ appvar=$(echo $app | LC_ALL=C tr '[a-z]-' '[A-Z]_')
+ test "$appvar" = TAR && appvar=AMTAR
+ case $appvar in
+ GZIP) ;; # Do not use $GZIP: it contains gzip options.
+ PERL::*) ;; # Keep perl modules as-is
+ *) eval "app=\${$appvar-$app}" ;;
+ esac
+
+ # Handle the still-experimental Automake-NG programs specially.
+ # They remain named as the mainstream Automake programs ("automake",
+ # and "aclocal") to avoid gratuitous incompatibilities with
+ # pre-existing usages (by, say, autoreconf, or custom autogen.sh
+ # scripts), but correctly identify themselves (as being part of
+ # "GNU automake-ng") when asked their version.
+ case $app in
+ automake-ng|aclocal-ng)
+ app=${app%-ng}
+ ($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || {
+ warn_ "Error: '$app' not found or not from Automake-NG"
+ ret=1
+ continue
+ } ;;
+ # Another check is for perl modules. These can be written as
+ # e.g. perl::XML::XPath in case of XML::XPath module, etc.
+ perl::*)
+ # Extract module name
+ app="${app#perl::}"
+ if ! $PERL -m"$app" -e 'exit 0' >/dev/null 2>&1; then
+ warn_ "Error: perl module '$app' not found"
+ ret=1
+ fi
+ continue
+ ;;
+ esac
+ if [ "$req_ver" = "-" ]; then
+ # Merely require app to exist; not all prereq apps are well-behaved
+ # so we have to rely on $? rather than get_version.
+ if ! check_exists --verbose $app; then
+ warn_ "Error: '$app' not found"
+ ret=1
+ fi
+ else
+ # Require app to produce a new enough version string.
+ inst_ver=$(get_version $app)
+ if [ ! "$inst_ver" ]; then
+ warn_ "Error: '$app' not found"
+ ret=1
+ else
+ latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2)
+ if [ ! "$latest_ver" = "$inst_ver" ]; then
+ warnf_ '%s\n' \
+ "Error: '$app' version == $inst_ver is too old" \
+ " '$app' version >= $req_ver is required"
+ ret=1
+ fi
+ fi
+ fi
done
+
+ return $ret
+}
+
+print_versions() {
+ echo "Program Min_version"
+ echo "----------------------"
+ printf %s "$buildreq"
+ echo "----------------------"
+ # can't depend on column -t
+}
+
+# Find sha1sum, named gsha1sum on MacPorts, shasum on Mac OS X 10.6.
+# Also find the compatible sha1 utility on the BSDs
+if test x"$SKIP_PO" = x; then
+ find_tool SHA1SUM sha1sum gsha1sum shasum sha1
+fi
+
+use_libtool=0
+# We'd like to use grep -E, to see if any of LT_INIT,
+# AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
+# but that's not portable enough (e.g., for Solaris).
+grep '^[ ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
+ && use_libtool=1
+grep '^[ ]*LT_INIT' configure.ac >/dev/null \
+ && use_libtool=1
+if test $use_libtool = 1; then
+ find_tool LIBTOOLIZE glibtoolize libtoolize
+fi
+
+# gnulib-tool requires at least automake and autoconf.
+# If either is not listed, add it (with minimum version) as a prerequisite.
+case $buildreq in
+ *automake*) ;;
+ *) buildreq="automake 1.9
+$buildreq" ;;
+esac
+case $buildreq in
+ *autoconf*) ;;
+ *) buildreq="autoconf 2.59
+$buildreq" ;;
+esac
+
+# When we can deduce that gnulib-tool will require patch,
+# and when patch is not already listed as a prerequisite, add it, too.
+if test -d "$local_gl_dir" \
+ && ! find "$local_gl_dir" -name '*.diff' -exec false {} +; then
+ case $buildreq in
+ *patch*) ;;
+ *) buildreq="patch -
+$buildreq" ;;
+ esac
+fi
+
+if ! printf "$buildreq" | check_versions; then
+ echo >&2
+ if test -f README-prereq; then
+ die "See README-prereq for how to get the prerequisite programs"
+ else
+ die "Please install the prerequisite programs"
+ fi
+fi
+
+# Warn the user if autom4te appears to be broken; this causes known
+# issues with at least gettext 0.18.3.
+probe=$(echo 'm4_quote([hi])' | autom4te -l M4sugar -t 'm4_quote:$%' -)
+if test "x$probe" != xhi; then
+ warn_ "WARNING: your autom4te wrapper eats stdin;"
+ warn_ "if bootstrap fails, consider upgrading your autotools"
fi
@@ -220,5 +588,19 @@ echo "$0: Bootstrapping from checked-out $package sources..."
+# See if we can use gnulib's git-merge-changelog merge driver.
+if $use_git && test -d .git && check_exists git; then
+ if git config merge.merge-changelog.driver >/dev/null ; then
+ :
+ elif check_exists git-merge-changelog; then
+ echo "$0: initializing git-merge-changelog driver"
+ git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
+ git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
+ else
+ echo "$0: consider installing git-merge-changelog from gnulib"
+ fi
+fi
+
+
cleanup_gnulib() {
status=$?
- rm -fr gnulib
+ rm -fr "$gnulib_path"
exit $status
@@ -226,3 +608,13 @@ cleanup_gnulib() {
-# Get gnulib files.
+git_modules_config () {
+ test -f .gitmodules && git config --file .gitmodules "$@"
+}
+
+if $use_git; then
+ gnulib_path=$(git_modules_config submodule.gnulib.path)
+ test -z "$gnulib_path" && gnulib_path=gnulib
+fi
+
+# Get gnulib files. Populate $GNULIB_SRCDIR, possibly updating a
+# submodule, for use in the rest of the script.
@@ -230,3 +622,9 @@ case ${GNULIB_SRCDIR--} in
-)
- if [ ! -d gnulib ]; then
+ # Note that $use_git is necessarily true in this case.
+ if git_modules_config submodule.gnulib.url >/dev/null; then
+ echo "$0: getting gnulib files..."
+ git submodule init -- "$gnulib_path" || exit $?
+ git submodule update -- "$gnulib_path" || exit $?
+
+ elif [ ! -d "$gnulib_path" ]; then
echo "$0: getting gnulib files..."
@@ -235,3 +633,5 @@ case ${GNULIB_SRCDIR--} in
- git clone --depth 2 git://git.sv.gnu.org/gnulib ||
+ shallow=
+ git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
+ git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
cleanup_gnulib
@@ -240,7 +640,52 @@ case ${GNULIB_SRCDIR--} in
fi
- GNULIB_SRCDIR=gnulib
+ GNULIB_SRCDIR=$gnulib_path
+ ;;
+*)
+ # Use GNULIB_SRCDIR directly or as a reference.
+ if $use_git && test -d "$GNULIB_SRCDIR"/.git && \
+ git_modules_config submodule.gnulib.url >/dev/null; then
+ echo "$0: getting gnulib files..."
+ if git submodule -h|grep -- --reference > /dev/null; then
+ # Prefer the one-liner available in git 1.6.4 or newer.
+ git submodule update --init --reference "$GNULIB_SRCDIR" \
+ "$gnulib_path" || exit $?
+ else
+ # This fallback allows at least git 1.5.5.
+ if test -f "$gnulib_path"/gnulib-tool; then
+ # Since file already exists, assume submodule init already complete.
+ git submodule update -- "$gnulib_path" || exit $?
+ else
+ # Older git can't clone into an empty directory.
+ rmdir "$gnulib_path" 2>/dev/null
+ git clone --reference "$GNULIB_SRCDIR" \
+ "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
+ && git submodule init -- "$gnulib_path" \
+ && git submodule update -- "$gnulib_path" \
+ || exit $?
+ fi
+ fi
+ GNULIB_SRCDIR=$gnulib_path
+ fi
+ ;;
esac
+# $GNULIB_SRCDIR now points to the version of gnulib to use, and
+# we no longer need to use git or $gnulib_path below here.
+
+if $bootstrap_sync; then
+ cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
+ echo "$0: updating bootstrap and restarting..."
+ case $(sh -c 'echo "$1"' -- a) in
+ a) ignored=--;;
+ *) ignored=ignored;;
+ esac
+ exec sh -c \
+ 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
+ $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \
+ "$0" "$@" --no-bootstrap-sync
+ }
+fi
+
gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
-<$gnulib_tool || exit
+<$gnulib_tool || exit $?
@@ -251,4 +696,7 @@ download_po_files() {
domain=$2
- echo "$0: getting translations into $subdir for $domain..."
- cmd=`printf "$po_download_command_format" "$domain" "$subdir"`
+ echo "$me: getting translations into $subdir for $domain..."
+ cmd=$(printf "$po_download_command_format" "$domain" "$subdir")
+ eval "$cmd" && return
+ # Fallback to HTTP.
+ cmd=$(printf "$po_download_command_format2" "$subdir" "$domain")
eval "$cmd"
@@ -256,4 +704,6 @@ download_po_files() {
-# Download .po files to $po_dir/.reference and copy only the new
+# Mirror .po files to $po_dir/.reference and copy only the new
# or modified ones into $po_dir. Also update $po_dir/LINGUAS.
+# Note po files that exist locally only are left in $po_dir but will
+# not be included in LINGUAS and hence will not be distributed.
update_po_files() {
@@ -264,3 +714,3 @@ update_po_files() {
- # Download *.po files into this dir.
+ # Mirror *.po files into this dir.
# Usually contains *.s1 checksum files.
@@ -271,7 +721,7 @@ update_po_files() {
&& ls "$ref_po_dir"/*.po 2>/dev/null |
- sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS"
+ sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return
- langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
+ langs=$(cd $ref_po_dir && echo *.po | sed 's/\.po//g')
test "$langs" = '*' && langs=x
- for po in `cd $ref_po_dir && echo *.po|sed 's/\.po//g'`; do
+ for po in $langs; do
case $po in x) continue;; esac
@@ -280,6 +730,7 @@ update_po_files() {
if ! test -f "$cksum_file" ||
- ! test -f "$po_dir/$po.po" ||
- ! sha1sum -c --status "$cksum_file" < "$new_po" > /dev/null; then
- echo "updated $po_dir/$po.po..."
- cp "$new_po" "$po_dir/$po.po" && sha1sum < "$new_po" > "$cksum_file"
+ ! test -f "$po_dir/$po.po" ||
+ ! $SHA1SUM -c "$cksum_file" < "$new_po" > /dev/null 2>&1; then
+ echo "$me: updated $po_dir/$po.po..."
+ cp "$new_po" "$po_dir/$po.po" \
+ && $SHA1SUM < "$new_po" > "$cksum_file" || return
fi
@@ -308,3 +759,3 @@ symlink_to_dir()
# This is required at least for "lib/uniwidth/cjk.h".
- dst_dir=`dirname "$dst"`
+ dst_dir=$(dirname "$dst")
if ! test -d "$dst_dir"; then
@@ -315,7 +766,7 @@ symlink_to_dir()
# FIXME: for now, this does only one level
- parent=`dirname "$dst_dir"`
+ parent=$(dirname "$dst_dir")
for dot_ig in x $vc_ignore; do
- test $dot_ig = x && continue
- ig=$parent/$dot_ig
- insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'`
+ test $dot_ig = x && continue
+ ig=$parent/$dot_ig
+ insert_vc_ignore $ig "${dst_dir##*/}"
done
@@ -325,6 +776,6 @@ symlink_to_dir()
{
- test ! -h "$dst" || {
- echo "$0: rm -f $dst" &&
- rm -f "$dst"
- }
+ test ! -h "$dst" || {
+ echo "$me: rm -f $dst" &&
+ rm -f "$dst"
+ }
} &&
@@ -332,26 +783,33 @@ symlink_to_dir()
cmp -s "$src" "$dst" || {
- echo "$0: cp -fp $src $dst" &&
- cp -fp "$src" "$dst"
+ echo "$me: cp -fp $src $dst" &&
+ cp -fp "$src" "$dst"
}
else
+ # Leave any existing symlink alone, if it already points to the source,
+ # so that broken build tools that care about symlink times
+ # aren't confused into doing unnecessary builds. Conversely, if the
+ # existing symlink's time stamp is older than the source, make it afresh,
+ # so that broken tools aren't confused into skipping needed builds. See
+ # <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>.
test -h "$dst" &&
- src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 &&
- dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 &&
- test "$src_i" = "$dst_i" || {
- dot_dots=
- case $src in
- /*) ;;
- *)
- case /$dst/ in
- *//* | */../* | */./* | /*/*/*/*/*/)
- echo >&2 "$0: invalid symlink calculation: $src -> $dst"
- exit 1;;
- /*/*/*/*/) dot_dots=../../../;;
- /*/*/*/) dot_dots=../../;;
- /*/*/) dot_dots=../;;
- esac;;
- esac
-
- echo "$0: ln -fs $dot_dots$src $dst" &&
- ln -fs "$dot_dots$src" "$dst"
+ src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 &&
+ dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 &&
+ test "$src_i" = "$dst_i" &&
+ both_ls=$(ls -dt "$src" "$dst") &&
+ test "X$both_ls" = "X$dst$nl$src" || {
+ dot_dots=
+ case $src in
+ /*) ;;
+ *)
+ case /$dst/ in
+ *//* | */../* | */./* | /*/*/*/*/*/)
+ die "invalid symlink calculation: $src -> $dst";;
+ /*/*/*/*/) dot_dots=../../../;;
+ /*/*/*/) dot_dots=../../;;
+ /*/*/) dot_dots=../;;
+ esac;;
+ esac
+
+ echo "$me: ln -fs $dot_dots$src $dst" &&
+ ln -fs "$dot_dots$src" "$dst"
}
@@ -361,134 +819,78 @@ symlink_to_dir()
-cp_mark_as_generated()
-{
- cp_src=$1
- cp_dst=$2
-
- if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then
- symlink_to_dir "$GNULIB_SRCDIR" "$cp_dst"
- elif cmp -s "$cp_src" "$local_gl_dir/$cp_dst"; then
- symlink_to_dir $local_gl_dir "$cp_dst"
- else
- case $cp_dst in
- *.[ch]) c1='/* '; c2=' */';;
- *.texi) c1='@c '; c2= ;;
- *.m4|*/Make*|Make*) c1='# ' ; c2= ;;
- *) c1= ; c2= ;;
- esac
-
- # If the destination directory doesn't exist, create it.
- # This is required at least for "lib/uniwidth/cjk.h".
- dst_dir=`dirname "$cp_dst"`
- test -d "$dst_dir" || mkdir -p "$dst_dir"
-
- if test -z "$c1"; then
- cmp -s "$cp_src" "$cp_dst" || {
- echo "$0: cp -f $cp_src $cp_dst" &&
- rm -f "$cp_dst" &&
- sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst"
- }
- else
- # Copy the file first to get proper permissions if it
- # doesn't already exist. Then overwrite the copy.
- cp "$cp_src" "$cp_dst-t" &&
- (
- echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
- echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
- sed "s!$bt_regex/!!g" "$cp_src"
- ) > $cp_dst-t &&
- if cmp -s "$cp_dst-t" "$cp_dst"; then
- rm -f "$cp_dst-t"
- else
- echo "$0: cp $cp_src $cp_dst # with edits" &&
- mv -f "$cp_dst-t" "$cp_dst"
- fi
- fi
- fi
-}
-
version_controlled_file() {
- dir=$1
+ parent=$1
file=$2
- found=no
- if test -d CVS; then
- grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
- grep '^/[^/]*/[0-9]' > /dev/null && found=yes
- elif test -d .git; then
- git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
+ if test -d .git; then
+ git rm -n "$file" > /dev/null 2>&1
elif test -d .svn; then
- svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes
+ svn log -r HEAD "$file" > /dev/null 2>&1
+ elif test -d CVS; then
+ grep -F "/${file##*/}/" "$parent/CVS/Entries" 2>/dev/null |
+ grep '^/[^/]*/[0-9]' > /dev/null
else
- echo "$0: no version control for $dir/$file?" >&2
+ warn_ "no version control for $file?"
+ false
fi
- test $found = yes
}
-slurp() {
- for dir in . `(cd $1 && find * -type d -print)`; do
- copied=
- sep=
- for file in `ls -a $1/$dir`; do
- case $file in
- .|..) continue;;
- .*) continue;; # FIXME: should all file names starting with "." be ignored?
- esac
- test -d $1/$dir/$file && continue
- for excluded_file in $excluded_files; do
- test "$dir/$file" = "$excluded_file" && continue 2
- done
- if test $file = Makefile.am; then
- copied=$copied${sep}$gnulib_mk; sep=$nl
- remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
- sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/$gnulib_mk || {
- echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
- rm -f $dir/$gnulib_mk &&
- sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
- }
- elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
- version_controlled_file $dir $file; then
- echo "$0: $dir/$file overrides $1/$dir/$file"
- else
- copied=$copied$sep$file; sep=$nl
- if test $file = gettext.m4; then
- echo "$0: patching m4/gettext.m4 to remove need for intl/* ..."
- rm -f $dir/$file
- sed '
- /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
- AC_DEFUN([AM_INTL_SUBDIR], [
- /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
- AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
- $a\
- AC_DEFUN([gl_LOCK_EARLY], [])
- ' $1/$dir/$file >$dir/$file
- else
- cp_mark_as_generated $1/$dir/$file $dir/$file
- fi
- fi || exit
- done
+# NOTE: we have to be careful to run both autopoint and libtoolize
+# before gnulib-tool, since gnulib-tool is likely to provide newer
+# versions of files "installed" by these two programs.
+# Then, *after* gnulib-tool (see below), we have to be careful to
+# run autoreconf in such a way that it does not run either of these
+# two just-pre-run programs.
- for dot_ig in x $vc_ignore; do
- test $dot_ig = x && continue
- ig=$dir/$dot_ig
- if test -n "$copied"; then
- insert_sorted_if_absent $ig "$copied"
- # If an ignored file name ends with .in.h, then also add
- # the name with just ".h". Many gnulib headers are generated,
- # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
- # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
- f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
- insert_sorted_if_absent $ig "$f"
-
- # For files like sys_stat.in.h and sys_time.in.h, record as
- # ignorable the directory we might eventually create: sys/.
- f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
- insert_sorted_if_absent $ig "$f"
- fi
- done
- done
-}
+# Import from gettext.
+with_gettext=yes
+grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
+ with_gettext=no
+
+if test $with_gettext = yes || test $use_libtool = 1; then
+
+ tempbase=.bootstrap$$
+ trap "rm -f $tempbase.0 $tempbase.1" 1 2 13 15
+ > $tempbase.0 > $tempbase.1 &&
+ find . ! -type d -print | sort > $tempbase.0 || exit
-# Create boot temporary directories to import from gnulib and gettext.
-rm -fr $bt $bt2 &&
-mkdir $bt $bt2 || exit
+ if test $with_gettext = yes; then
+ # Released autopoint has the tendency to install macros that have been
+ # obsoleted in current gnulib, so run this before gnulib-tool.
+ echo "$0: $AUTOPOINT --force"
+ $AUTOPOINT --force || exit
+ fi
+
+ # Autoreconf runs aclocal before libtoolize, which causes spurious
+ # warnings if the initial aclocal is confused by the libtoolized
+ # (or worse out-of-date) macro directory.
+ # libtoolize 1.9b added the --install option; but we support back
+ # to libtoolize 1.5.22, where the install action was default.
+ if test $use_libtool = 1; then
+ install=
+ case $($LIBTOOLIZE --help) in
+ *--install*) install=--install ;;
+ esac
+ echo "running: $LIBTOOLIZE $install --copy"
+ $LIBTOOLIZE $install --copy
+ fi
+
+ find . ! -type d -print | sort >$tempbase.1
+ old_IFS=$IFS
+ IFS=$nl
+ for file in $(comm -13 $tempbase.0 $tempbase.1); do
+ IFS=$old_IFS
+ parent=${file%/*}
+ version_controlled_file "$parent" "$file" || {
+ for dot_ig in x $vc_ignore; do
+ test $dot_ig = x && continue
+ ig=$parent/$dot_ig
+ insert_vc_ignore "$ig" "${file##*/}"
+ done
+ }
+ done
+ IFS=$old_IFS
+
+ rm -f $tempbase.0 $tempbase.1
+ trap - 1 2 13 15
+fi
@@ -499,8 +901,8 @@ gnulib_tool_options="\
--no-changelog\
- --aux-dir $bt/$build_aux\
- --doc-base $bt/$doc_base\
+ --aux-dir $build_aux\
+ --doc-base $doc_base\
--lib $gnulib_name\
- --m4-base $bt/$m4_base/\
- --source-base $bt/$source_base/\
- --tests-base $bt/$tests_base\
+ --m4-base $m4_base/\
+ --source-base $source_base/\
+ --tests-base $tests_base\
--local-dir $local_gl_dir\
@@ -508,43 +910,19 @@ gnulib_tool_options="\
"
+if test $use_libtool = 1; then
+ case "$gnulib_tool_options " in
+ *' --libtool '*) ;;
+ *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
+ esac
+fi
echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
-$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
-slurp $bt || exit
+$gnulib_tool $gnulib_tool_options --import $gnulib_modules \
+ || die "gnulib-tool failed"
for file in $gnulib_files; do
- symlink_to_dir "$GNULIB_SRCDIR" $file || exit
+ symlink_to_dir "$GNULIB_SRCDIR" $file \
+ || die "failed to symlink $file"
done
-
-# Import from gettext.
-with_gettext=yes
-grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
- with_gettext=no
-
-if test $with_gettext = yes; then
- echo "$0: (cd $bt2; autopoint) ..."
- cp configure.ac $bt2 &&
- (cd $bt2 && autopoint && rm configure.ac) &&
- slurp $bt2 $bt || exit
-
- rm -fr $bt $bt2 || exit
-fi
-
-# Coreutils is unusual in that it generates some of its test-related
-# Makefile.am files. That must be done before invoking automake.
-mam_template=tests/Makefile.am.in
-if test -f $mam_template; then
- PERL=perl
- for tool in cut head join pr sort tac tail test tr uniq wc; do
- m=tests/$tool/Makefile.am
- t=${m}t
- rm -f $m $t
- sed -n '1,/^##test-files-begin/p' $mam_template > $t
- echo "x = $tool" >> $t
- srcdir=tests/$tool
- $PERL -I$srcdir -w -- tests/mk-script $srcdir --list >> $t
- sed -n '/^##test-files-end/,$p' $mam_template >> $t
- chmod -w $t
- mv $t $m
- done
-fi
+bootstrap_post_import_hook \
+ || die "bootstrap_post_import_hook failed"
@@ -562,10 +940,18 @@ find "$m4_base" "$source_base" \
-# Reconfigure, getting other files.
+# Invoke autoreconf with --force --install to ensure upgrades of tools
+# such as ylwrap.
+AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS"
-echo "$0: autoreconf --force --install --symlink ..."
-autoreconf --force --install --symlink
+# Some systems (RHEL 5) are using ancient autotools, for which the
+# --no-recursive option had not been invented. Detect that lack and
+# omit the option when it's not supported. FIXME in 2017: remove this
+# hack when RHEL 5 autotools are updated, or when they become irrelevant.
+case $($AUTORECONF --help) in
+ *--no-recursive*) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";;
+esac
-# FIXME: A kludge to avoid unnecessary data in the distribution.
-test -d libltdl/config && rm -rf libltdl/config
-test -d libltdl/m4 && rm -rf libltdl/m4
+# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
+echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS"
+AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \
+ || die "autoreconf failed"
@@ -575,6 +961,7 @@ for file in $gnulib_extra_files; do
*/INSTALL) dst=INSTALL;;
- build-aux/*) dst=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;;
+ build-aux/*) dst=$build_aux/${file#build-aux/};;
*) dst=$file;;
esac
- symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit
+ symlink_to_dir "$GNULIB_SRCDIR" $file $dst \
+ || die "failed to symlink $file"
done
@@ -587,3 +974,4 @@ if test $with_gettext = yes; then
/^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
- /^MSGID_BUGS_ADDRESS *=/s/=.*/= '"$MSGID_BUGS_ADDRESS"'/
+ /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/
+ /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'|
/^XGETTEXT_OPTIONS *=/{
@@ -591,5 +979,17 @@ if test $with_gettext = yes; then
a\
- '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
+ '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
}
- ' po/Makevars.template >po/Makevars
+ ' po/Makevars.template >po/Makevars \
+ || die 'cannot generate po/Makevars'
+
+ # If the 'gettext' module is in use, grab the latest Makefile.in.in.
+ # If only the 'gettext-h' module is in use, assume autopoint already
+ # put the correct version of this file into place.
+ case $gnulib_modules in
+ *gettext-h*) ;;
+ *gettext*)
+ cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in \
+ || die "cannot create po/Makefile.in.in"
+ ;;
+ esac
@@ -603,7 +1003,8 @@ if test $with_gettext = yes; then
/^XGETTEXT_OPTIONS *=/{
- s/$/ \\/
- a\
- '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
+ s/$/ \\/
+ a\
+ '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
}
- ' <po/Makevars.template >runtime-po/Makevars
+ ' po/Makevars.template >runtime-po/Makevars \
+ || die 'cannot generate runtime-po/Makevars'
@@ -614,2 +1015,12 @@ fi
+bootstrap_epilogue
+
echo "$0: done. Now you can run './configure'."
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/gint b/gint
-Subproject b39efd37a7fbf478072c72f82b4310c8620a4ce
+Subproject fd86bf7d44b0c970771830692ae7491447ebe8b
diff --git a/gnulib b/gnulib
new file mode 160000
+Subproject 36d982f39b683d0266b9c6ff1e01cbfc94bd97f
diff --git a/scheme/idest/batch/setlyrics.scm b/scheme/idest/batch/setlyrics.scm
index b41cb5b..ad4dd2d 100644
--- a/scheme/idest/batch/setlyrics.scm
+++ b/scheme/idest/batch/setlyrics.scm
@@ -74,3 +74,3 @@
"usage: idest -S ~A [OPTIONS] FILE...\n\
-ry `idest -S ~A --help', for more info.\n"
+Try `idest -S ~A --help', for more info.\n"
progname progname)
diff --git a/src/Makefile.am b/src/Makefile.am
index bd06dbf..2c34303 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,3 +31,10 @@ BUILT_SOURCES=cmdline.h frametab.c
EXTRA_DIST=cmdline.opt getopt.m4
-INCLUDES=-I$(top_srcdir)/gnu -I$(top_builddir)/gnu -I$(top_srcdir)/libid3tag @GUILE_INCLUDES@
+AM_CPPFLAGS = \
+ -DGUILE_SITE=\"@GUILE_SITE@\"\
+ -DPKG_SITE=\"$(sitedir)\"\
+ -DVERSION_SITE=\"$(sitedir)/$(VERSION)\"\
+ -I$(top_srcdir)/gnu\
+ -I$(top_builddir)/gnu\
+ -I$(top_srcdir)/libid3tag\
+ @GUILE_INCLUDES@
LDADD=../gnu/libgnu.a ../libid3tag/libid3tag.a -lz @GUILE_LIBS@
@@ -51,5 +58 @@ include ../gint/gint.mk
-AM_CPPFLAGS=\
- -DGUILE_SITE=\"@GUILE_SITE@\"\
- -DPKG_SITE=\"$(sitedir)\"\
- -DVERSION_SITE=\"$(sitedir)/$(VERSION)\"
diff --git a/tests/atlocal.in b/tests/atlocal.in
index a302b99..35ad063 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -12,3 +12,4 @@ GUILE_VERSION="@GUILE_VERSION@"
INSTALL_PROG="@INSTALL@"
-
+GUILE_AUTO_COMPILE=0
+export GUILE_AUTO_COMPILE
diff --git a/tests/delcomm.at b/tests/delcomm.at
index f263061..236f05a 100644
--- a/tests/delcomm.at
+++ b/tests/delcomm.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,3 +20,3 @@ AT_KEYWORDS([script examples delcomm])
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file1 -s $abs_srcdir/id3v1 10k
@@ -24,3 +24,3 @@ genfile -f file2 -p $abs_srcdir/id3v2 10k
-idest -N -S $abs_top_srcdir/examples/delcomm.scm file1 file2
+idest -N -S $abs_top_srcdir/examples/delcomm.scm file1 file2])
echo file1
diff --git a/tests/fmt-shortlist.at b/tests/fmt-shortlist.at
index 925646c..d529d84 100644
--- a/tests/fmt-shortlist.at
+++ b/tests/fmt-shortlist.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,4 +20,3 @@ AT_KEYWORDS([script format shortlist])
AT_CHECK([
-PREREQ_GUILE
-
+WITH_GUILE([
genfile -f file1 -s $abs_srcdir/id3v1 10k
@@ -25,3 +24,3 @@ genfile -f file2 -p $abs_srcdir/id3v2 10k
-idest -N -p $abs_top_srcdir/scheme --format shortlist file1 file2
+idest -N -p $abs_top_srcdir/scheme --format shortlist file1 file2])
],
diff --git a/tests/framelist00.at b/tests/framelist00.at
index 894d0f0..1faaeb0 100644
--- a/tests/framelist00.at
+++ b/tests/framelist00.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,5 +20,5 @@ AT_KEYWORDS([script format framelist--full framelist00])
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file -p $abs_srcdir/id3v2 10k
-idest -N -p $abs_top_srcdir/scheme --format framelist --full file
+idest -N -p $abs_top_srcdir/scheme --format framelist --full file])
],
diff --git a/tests/framelist01.at b/tests/framelist01.at
index 59e5ca2..1e37262 100644
--- a/tests/framelist01.at
+++ b/tests/framelist01.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,5 +20,5 @@ AT_KEYWORDS([script format framelist--frames framelist01])
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file -p $abs_srcdir/id3v2 10k
-idest -N -p $abs_top_srcdir/scheme --format framelist --frames TIT2,COMM,APIC file
+idest -N -p $abs_top_srcdir/scheme --format framelist --frames TIT2,COMM,APIC file])
],
diff --git a/tests/framelist02.at b/tests/framelist02.at
index c56d11e..6376ca7 100644
--- a/tests/framelist02.at
+++ b/tests/framelist02.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,5 +20,5 @@ AT_KEYWORDS([script format framelist--single-line framelist02])
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file -p $abs_srcdir/id3v2 10k
-idest -N -p $abs_top_srcdir/scheme --format framelist --single-line file
+idest -N -p $abs_top_srcdir/scheme --format framelist --single-line file])
],
diff --git a/tests/list1.at b/tests/list1.at
index 80d869b..4464dfb 100644
--- a/tests/list1.at
+++ b/tests/list1.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,4 +20,3 @@ AT_KEYWORDS([script examples list1])
AT_CHECK([
-PREREQ_GUILE
-
+WITH_GUILE([
genfile -f file1 -s $abs_srcdir/id3v1 10k
@@ -25,3 +24,3 @@ genfile -f file2 -p $abs_srcdir/id3v2 10k
-idest -N -S $abs_top_srcdir/examples/list1.scm file1 file2
+idest -N -S $abs_top_srcdir/examples/list1.scm file1 file2])
],
diff --git a/tests/list2.at b/tests/list2.at
index 73008c6..5bb082c 100644
--- a/tests/list2.at
+++ b/tests/list2.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,4 +20,3 @@ AT_KEYWORDS([script examples list2])
AT_CHECK([
-PREREQ_GUILE
-
+WITH_GUILE([
genfile -f file1 -s $abs_srcdir/id3v1 10k
@@ -25,3 +24,3 @@ genfile -f file2 -p $abs_srcdir/id3v2 10k
-idest -N -S $abs_top_srcdir/examples/list2.scm TIT2,TALB,COMM,TENC file1 file2
+idest -N -S $abs_top_srcdir/examples/list2.scm TIT2,TALB,COMM,TENC file1 file2])
],
diff --git a/tests/lyrics00.at b/tests/lyrics00.at
index 0eefe05..1162398 100644
--- a/tests/lyrics00.at
+++ b/tests/lyrics00.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,6 +20,6 @@ AT_KEYWORDS([script format lyrics lyrics00])
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file -p $abs_srcdir/id3v2 10k
unset PAGER
-idest -N -p $abs_top_srcdir/scheme --format lyrics file
+idest -N -p $abs_top_srcdir/scheme --format lyrics file])
],
diff --git a/tests/pic00.at b/tests/pic00.at
index 1a177e3..8a97551 100644
--- a/tests/pic00.at
+++ b/tests/pic00.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,4 +20,3 @@ AT_KEYWORDS([script format pic--help pic00])
AT_CHECK([
-PREREQ_GUILE
-idest -N -p $abs_top_srcdir/scheme --format pic --help
+WITH_GUILE([idest -N -p $abs_top_srcdir/scheme --format pic --help])
],
diff --git a/tests/pic01.at b/tests/pic01.at
index 4c01c32..a264186 100644
--- a/tests/pic01.at
+++ b/tests/pic01.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,5 +20,5 @@ AT_KEYWORDS([script format pic--store pic01])
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file -p $abs_srcdir/id3v2 10k
-idest -N -p $abs_top_srcdir/scheme --format pic --store --file ~N-~C.~T file
+idest -N -p $abs_top_srcdir/scheme --format pic --store --file ~N-~C.~T file])
echo file-32x32 sample image.png
diff --git a/tests/script00.at b/tests/script00.at
index 402e158..92b08ee 100644
--- a/tests/script00.at
+++ b/tests/script00.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -31,3 +31,3 @@ AT_DATA([framelist.scm],[
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file1 -s $abs_srcdir/id3v1 10k
@@ -35,3 +35,3 @@ genfile -f file2 -p $abs_srcdir/id3v2 10k
-idest -N -S ./framelist.scm file1 file2
+idest -N -S ./framelist.scm file1 file2])
],
diff --git a/tests/script01.at b/tests/script01.at
index e03aa41..64e185b 100644
--- a/tests/script01.at
+++ b/tests/script01.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -31,3 +31,3 @@ AT_DATA([framelist.scm],[
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file1 -s $abs_srcdir/id3v1 10k
@@ -40,3 +40,3 @@ mkdir subdir
mv framelist.scm subdir
-idest -N -P `pwd`/subdir -S framelist file1 file2
+idest -N -P `pwd`/subdir -S framelist file1 file2])
],
diff --git a/tests/script02.at b/tests/script02.at
index 8eeee5c..0985f35 100644
--- a/tests/script02.at
+++ b/tests/script02.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -41,5 +41,5 @@ AT_DATA([.idest.scm],[
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file1 -s $abs_srcdir/id3v1 10k
-HOME=/tmp idest -S ./framelist.scm file1 | sed '4s|.*/idest/idest.scm|GUILE_SITE_DIR/idest/idest.scm|'
+HOME=/tmp idest -S ./framelist.scm file1 | sed '4s|.*/idest/idest.scm|GUILE_SITE_DIR/idest/idest.scm|'])
],
diff --git a/tests/script03.at b/tests/script03.at
index 040d7a2..4901169 100644
--- a/tests/script03.at
+++ b/tests/script03.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -28,5 +28,5 @@ AT_DATA([test.scm],[
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file -s $abs_srcdir/id3v1 10k
-idest -N -S ./test.scm
+idest -N -S ./test.scm])
],
diff --git a/tests/script04.at b/tests/script04.at
index 8c83b1f..0d6a0a7 100644
--- a/tests/script04.at
+++ b/tests/script04.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -30,6 +30,6 @@ AT_DATA([delpic.scm],[
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file -p $abs_srcdir/id3v2 10k
echo removing APIC frames
-idest -N -S ./delpic.scm file
+idest -N -S ./delpic.scm file])
echo tags
diff --git a/tests/script05.at b/tests/script05.at
index eaa76c4..89ebfb1 100644
--- a/tests/script05.at
+++ b/tests/script05.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -30,3 +30,3 @@ AT_DATA([delpic.scm],[
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file -p $abs_srcdir/id3v2 10k
@@ -35,3 +35,3 @@ echo removing APIC frames
idest -N -p $abs_top_srcdir/scheme -n -S delpic.scm file |
- sed "s|$abs_top_srcdir|abs_top_srcdir|"
+ sed "s|$abs_top_srcdir|abs_top_srcdir|"])
echo cmp
diff --git a/tests/script06.at b/tests/script06.at
index 12f00e2..233466c 100644
--- a/tests/script06.at
+++ b/tests/script06.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,4 +20,4 @@ AT_KEYWORDS([script format script06])
AT_CHECK([
-PREREQ_GUILE
-idest -N -p $abs_top_srcdir/scheme --format framelist $abs_srcdir/id3v2
+WITH_GUILE([
+idest -N -p $abs_top_srcdir/scheme --format framelist $abs_srcdir/id3v2])
],
diff --git a/tests/script07.at b/tests/script07.at
index 2a5d3c7..99c9b95 100644
--- a/tests/script07.at
+++ b/tests/script07.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -30,3 +30,3 @@ AT_DATA([delpic.scm],
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file -p $abs_srcdir/id3v2 10k
@@ -34,3 +34,3 @@ $INSTALL_PROG -d scheme/idest/batch
$INSTALL_PROG delpic.scm scheme/idest/batch
-idest -N -p $abs_top_srcdir/scheme:`pwd`/scheme --batch delpic file
+idest -N -p $abs_top_srcdir/scheme:`pwd`/scheme --batch delpic file])
idest -a file
diff --git a/tests/script08.at b/tests/script08.at
index d48e470..8ff78f7 100644
--- a/tests/script08.at
+++ b/tests/script08.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -30,3 +30,3 @@ AT_DATA([delpic.scm],
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file -p $abs_srcdir/id3v2 10k
@@ -38,3 +38,3 @@ subdir=`pwd`/scheme
idest -N -p $abs_top_srcdir/scheme:$subdir -n --batch delpic file |
- sed "s|$subdir|subdir|;s|$abs_top_srcdir|abs_top_srcdir|"
+ sed "s|$subdir|subdir|;s|$abs_top_srcdir|abs_top_srcdir|"])
echo cmp
diff --git a/tests/setlyrics.at b/tests/setlyrics.at
index 2b9f983..dba8090 100644
--- a/tests/setlyrics.at
+++ b/tests/setlyrics.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -33,6 +33,6 @@ manipulating ID3 tags and to apply them to any number of files.
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file 10k
idest -N -p $abs_top_srcdir/scheme --batch \
- setlyrics --lang eng -c 'sample lyrics' -f input file
+ setlyrics --lang eng -c 'sample lyrics' -f input file])
idest -a file | sed 's/ *$//'
diff --git a/tests/setpic.at b/tests/setpic.at
index 82642cb..e8ef343 100644
--- a/tests/setpic.at
+++ b/tests/setpic.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -21,6 +21,6 @@ AT_KEYWORDS([script batch setpic])
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file 10k
idest -N -p $abs_top_srcdir/scheme --batch \
- setpic -d '32x32 picture' -f $abs_srcdir/idest-32.png file
+ setpic -d '32x32 picture' -f $abs_srcdir/idest-32.png file])
idest -a file | sed 's/ *$//'
diff --git a/tests/settitle.at b/tests/settitle.at
index bd71e79..7afb9db 100644
--- a/tests/settitle.at
+++ b/tests/settitle.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,7 +20,6 @@ AT_KEYWORDS([script examples settitle])
AT_CHECK([
-PREREQ_GUILE
-
+WITH_GUILE([
genfile -f Test_file_for_idest.mp3 10k
idest -N -S $abs_top_srcdir/examples/settitle.scm Test_file_for_idest.mp3
-idest -a Test_file_for_idest.mp3
+idest -a Test_file_for_idest.mp3])
],
diff --git a/tests/shortlist.at b/tests/shortlist.at
index cb13aba..b4c25c2 100644
--- a/tests/shortlist.at
+++ b/tests/shortlist.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,4 +20,3 @@ AT_KEYWORDS([script examples shortlist])
AT_CHECK([
-PREREQ_GUILE
-
+WITH_GUILE([
genfile -f file1 -s $abs_srcdir/id3v1 10k
@@ -25,3 +24,3 @@ genfile -f file2 -p $abs_srcdir/id3v2 10k
-idest -N -S $abs_top_srcdir/examples/shortlist.scm file1 file2
+idest -N -S $abs_top_srcdir/examples/shortlist.scm file1 file2])
],
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 196567d..1168a52 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,3 +1,3 @@
# This file is part of idest
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -21,2 +21,7 @@ m4_define([AT_SKIP_TEST],[exit 77])
m4_define([PREREQ_GUILE],[test -z "$GUILE_VERSION" && AT_SKIP_TEST])
+m4_define([WITH_GUILE],[PREREQ_GUILE
+($1) 2>stderr.log
+sed '/^;;; /d' stderr.log >&2
+rm stderr.log
+])

Return to:

Send suggestions and report system problems to the System administrator.