#! /bin/sh
#
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 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
--vc-files Update version control related files.
--no-vc-files Don't update version control related files
(.gitignore and/or .cvsignore).
- --no-changelog Don't update or create ChangeLog files.
Options for --create-[mega]testdir, --[mega]test:
date=`date -d "$date" -u +"%Y-%m-%d %H:%M:%S"`
version=' '`cd "$gnulib_dir" && ./build-aux/git-version-gen /dev/null | sed -e 's/-dirty/-modified/'`
else
- if test -d "$gnulib_dir"/CVS \
- && (cvs --version) >/dev/null 2>/dev/null; then
- # gnulib checked out from CVS.
- sed_extract_first_date='/^date: /{
-s/^date: \([0-9][0-9][0-9][0-9]\).\([0-9][0-9]\).\([0-9][0-9]\) \([0-9][0-9]:[0-9][0-9]:[0-9][0-9]\).*/\1-\2-\3 \4/p
-q
-}'
- date=`cd "$gnulib_dir" && cvs log -N ChangeLog 2>/dev/null | sed -n -e "$sed_extract_first_date"`
- else
- # gnulib copy without versioning information.
- date=`sed -e 's/ .*//;q' "$gnulib_dir"/ChangeLog`
- fi
- version=
+ # gnulib copy without versioning information.
+ date=`zcat /usr/share/doc/gnulib/changelog.gz | sed -e 's/ .*//;q'`
+ version=`zcat /usr/share/doc/gnulib/NEWS.stable.gz | grep -o -m 1 ' [0-9]\+-stable'`
+ debversion=`dpkg-query --show --showformat '${Version}' gnulib`
fi
year=`"$gnulib_dir"/build-aux/mdate-sh "$self_abspathname" | sed -e 's,^.* ,,'`
echo "\
-gnulib-tool (GNU $package $date)$version
+gnulib-tool (GNU $package $date)$version Debian: $debversion
Copyright (C) $year Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
* ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;;
esac
done
- gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`
+ gnulib_dir=/usr/share/gnulib
}
# func_tmpdir
shift
fi
+# Unset CDPATH. Otherwise, output from 'cd dir' can surprise callers.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
# Command-line option processing.
# Removes the OPTIONS from the arguments. Sets the variables:
# - mode one of: list, find, import, add-import, remove-import,
# - vc_files true if --vc-files was given, false if --no-vc-files was
# given, blank otherwise
# - autoconf_minversion minimum supported autoconf version
-# - do_changelog false if --no-changelog was given, : otherwise
# - doit : if actions shall be executed, false if only to be printed
# - symbolic true if --symlink or --more-symlinks was given, blank
# otherwise
po_domain=
witness_c_macro=
vc_files=
- do_changelog=:
doit=:
symbolic=
lsymbolic=
vc_files=false
shift ;;
--no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch )
- do_changelog=false
+ # A no-op for backward compatibility.
shift ;;
--dry-run )
doit=false
echo "you need to use 'gnulib --import' - at your own risk!" 1>&2
func_exit 1
fi
- do_changelog=false
fi
if test -n "$pobase" && test -z "$po_domain"; then
echo "gnulib-tool: together with --po-base, you need to specify --po-domain" 1>&2
fi
# Canonicalize the inctests variable.
case "$mode" in
- import | add-import | remove-import)
+ import | add-import | remove-import | update)
if test -z "$inctests"; then
inctests=false
fi
# 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' \
+ sed -e '/^ChangeLog$/d' -e '/\/ChangeLog$/d' \
-e '/^COPYING$/d' -e '/\/COPYING$/d' \
-e '/^README$/d' -e '/\/README$/d' \
-e '/^TEMPLATE$/d' \
{ 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" \
if test -n "$uses_subdirs"; then
subdir_options=' subdir-objects'
fi
- echo "AUTOMAKE_OPTIONS = 1.5 gnits${subdir_options}"
+ echo "AUTOMAKE_OPTIONS = 1.9.6 gnits${subdir_options}"
fi
echo
if test -z "$makefile_name"; then
witness_macro="$1"
if test "$libtool" = true; then
libext=la
+ perhapsLT=LT
sed_eliminate_LDFLAGS="$sed_noop"
else
libext=a
+ perhapsLT=
sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d'
fi
if $for_test; then
if test -n "$uses_subdirs"; then
subdir_options=' subdir-objects'
fi
- echo "AUTOMAKE_OPTIONS = 1.5 foreign${subdir_options}"
+ echo "AUTOMAKE_OPTIONS = 1.9.6 foreign${subdir_options}"
echo
if $for_test && ! $single_configure; then
echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}"
# func_emit_autoconf_snippet indentation
# emits the autoconf snippet of a module.
# Input:
+# - indentation spaces to prepend on each line
# - local_gnulib_dir from --local-dir
# - modcache true or false, from --cache-modules/--no-cache-modules
# - sed_replace_build_aux sed expression that replaces reference to build-aux
# command line options.
# - disable_gettext true or false. It tells whether to disable AM_GNU_GETTEXT
# invocations.
-# - indentation spaces to prepend on each line
func_emit_autoconf_snippet ()
{
+ indentation="$1"
if { case $module in
gnumakefile | maintainer-makefile)
# These modules are meant to be used only in the top-level directory.
| { if $disable_gettext; then
sed -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./'
else
- cat
+ # Don't indent AM_GNU_GETTEXT_VERSION line, as that confuses
+ # autopoint through at least GNU gettext version 0.18.2.
+ sed -e 's/^ *AM_GNU_GETTEXT_VERSION/AM_GNU_GETTEXT_VERSION/'
fi
}
if test "$module" = 'alloca' && test "$libtool" = true && ! $disable_libtool; then
fi
echo "gl_MACRO_PREFIX([$macro_prefix])"
echo "gl_PO_DOMAIN([$po_domain])"
- echo "gl_WITNESS_C_DOMAIN([$witness_c_macro])"
+ echo "gl_WITNESS_C_MACRO([$witness_c_macro])"
if test -n "$vc_files"; then
echo "gl_VC_FILES([$vc_files])"
fi
echo "Create $testsbase/$makefile_am"
rm -f "$tmpfile"
fi
- func_append added_files "$testsbase/$makefile_am$nl"
+ func_append added_files "$testsbase/$makefile_am$nl"
fi
fi
(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
+ > "$tmp"/ignore-removed
)
if test -s "$tmp"/ignore-added || test -s "$tmp"/ignore-removed; then
if $doit; then
# Create Makefile.am.
(echo "## Process this file with automake to produce Makefile.in."
echo
- echo "AUTOMAKE_OPTIONS = 1.5 foreign"
+ echo "AUTOMAKE_OPTIONS = 1.9.6 foreign"
echo
echo "SUBDIRS = $subdirs"
echo
func_append megasubdirs "ALL"
# Create autobuild.
- cvsdate=`if test -f "$gnulib_dir/CVS/Entries"; then \
- vc_witness="$gnulib_dir/CVS/Entries"; \
- else \
- vc_witness="$gnulib_dir/.git/refs/heads/master"; \
- fi; \
+ cvsdate=`vc_witness="$gnulib_dir/.git/refs/heads/master"; \
sh "$gnulib_dir/build-aux/mdate-sh" "$vc_witness" \
| sed -e 's,January,01,' -e 's,Jan,01,' \
-e 's,February,02,' -e 's,Feb,02,' \
# Create Makefile.am.
(echo "## Process this file with automake to produce Makefile.in."
echo
- echo "AUTOMAKE_OPTIONS = 1.5 foreign"
+ echo "AUTOMAKE_OPTIONS = 1.9.6 foreign"
echo
echo "SUBDIRS = $megasubdirs"
echo
projects / gnulib.git / blobdiff