[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-30-g87dbc44

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=87dbc44b048a9bcbc0862e972a4ce2a27904b1af

The branch, branch-1.11 has been updated
       via  87dbc44b048a9bcbc0862e972a4ce2a27904b1af (commit)
       via  64399ee8b02160fa03576c01f1dafb5bd5d07a5c (commit)
       via  c84e89177b242a6133aff742e32309009e90374d (commit)
       via  8e5a8aae8460e171b22d68001a9b89bd517e1eb4 (commit)
      from  d9d4f66c72dde7ce6ed094095ff07500b2500f9c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 87dbc44b048a9bcbc0862e972a4ce2a27904b1af
Merge: d9d4f66c72dde7ce6ed094095ff07500b2500f9c 
64399ee8b02160fa03576c01f1dafb5bd5d07a5c
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Feb 22 22:14:34 2010 +0100

    Merge branch 'maint' into branch-1.11

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                           |   26 ++++++++++++
 NEWS                                |    5 ++
 doc/automake.texi                   |    8 ++-
 lib/mdate-sh                        |    9 ++--
 tests/Makefile.am                   |    3 +
 tests/Makefile.in                   |    3 +
 tests/{extra5.test => extra10.test} |   33 +++++++++-------
 tests/extra11.test                  |   72 +++++++++++++++++++++++++++++++++++
 tests/{extra6.test => extra12.test} |   47 ++++++++++------------
 9 files changed, 158 insertions(+), 48 deletions(-)
 copy tests/{extra5.test => extra10.test} (65%)
 create mode 100755 tests/extra11.test
 copy tests/{extra6.test => extra12.test} (54%)

diff --git a/ChangeLog b/ChangeLog
index b84d809..080e558 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2010-02-22  Karl Berry  <address@hidden>
+
+       Improve help message of mdate-sh.
+       * mdate-sh: mention actual output format in help message.
+
+2010-02-22  Ralf Wildenhues  <address@hidden>
+
+       Deprecate dist-lzma in favor of dist-xz.
+       * doc/automake.texi (The Types of Distributions, Options):
+       Adjust text to reflect renaming of lzma to xz.
+       * NEWS: Update.
+       Missing deprecation noted by Antonio Diaz Diaz.
+
+2010-02-20  Stefano Lattarini  <address@hidden>
+
+       Add tests about support of wildcards in EXTRA_DIST.
+       * tests/extra10.test: New test, check basic support of wildcards
+       in EXTRA_DIST.
+       * tests/extra11.test: New test, check more complex usage of
+       wildcards in EXTRA_DIST.
+       * tests/extra11.test: New test, check usage of wildcards in
+       EXTRA_DIST when $builddir != $srcdir.
+       * tests/Makefile.am (TESTS): Updated accordingly.
+       Necessity of these new tests suggested by Braden McDaniel
+       and Ralf Wildenhues.
+
 2010-02-08  Simon Josefsson  <address@hidden>
 
        Fix copyright statement in gnupload script.
diff --git a/NEWS b/NEWS
index c9df157..7a2f742 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 New in 1.11.1a:
 
+* Miscellaneous changes:
+
+  - The `lzma' compression scheme and associated automake option `dist-lzma'
+    is obsoleted by `xz' and `dist-xz' due to upstream changes.
+
 Bugs fixed in 1.11.1a:
 
 * Bugs introduced by 1.11.1:
diff --git a/doc/automake.texi b/doc/automake.texi
index 8e8f5f6..ffa022d 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8444,6 +8444,8 @@ Generate a gzip tar archive of the distribution.
 @item @code{dist-lzma}
 Generate an @samp{lzma} tar archive of the distribution.  @command{lzma}
 archives are frequently smaller than @command{bzip2}-compressed archives.
+The @samp{lzma} format is obsolete, you should use the @samp{xz} format
+instead.
 @trindex dist-lzma
 
 @item @code{dist-shar}
@@ -8453,7 +8455,7 @@ Generate a shar archive of the distribution.
 @item @code{dist-xz}
 Generate an @samp{xz} tar archive of the distribution.  @command{xz}
 archives are frequently smaller than @command{bzip2}-compressed archives.
-The @samp{xz} format will soon (early 2009) displace the @samp{lzma} format.
+The @samp{xz} format displaces the obsolete @samp{lzma} format.
 @trindex dist-xz
 
 @item @code{dist-zip}
@@ -8992,7 +8994,7 @@ Hook @code{dist-bzip2} to @code{dist}.
 @item @option{dist-lzma}
 @cindex Option, @option{dist-lzma}
 @opindex dist-lzma
-Hook @code{dist-lzma} to @code{dist}.
+Hook @code{dist-lzma} to @code{dist}.  Obsoleted by @code{dist-xz}.
 @trindex dist-lzma
 
 @item @option{dist-shar}
@@ -9261,7 +9263,7 @@ In order to use this option with C sources, you should add
 These three mutually exclusive options select the tar format to use
 when generating tarballs with @samp{make dist}.  (The tar file created
 is then compressed according to the set of @option{no-dist-gzip},
address@hidden, @option{dist-lzma} and @option{dist-tarZ} options in use.)
address@hidden, @option{dist-xz} and @option{dist-tarZ} options in use.)
 
 These options must be passed as arguments to @code{AM_INIT_AUTOMAKE}
 (@pxref{Macros}) because they can require additional configure checks.
diff --git a/lib/mdate-sh b/lib/mdate-sh
index e631b22..c477512 100755
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 # Get modification time of a file or directory and pretty-print it.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2010-02-22.21; # UTC
 
-# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007, 2009, 2010
+# Free Software Foundation, Inc.
 # written by Ulrich Drepper <address@hidden>, June 1995
 #
 # This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,8 @@ case $1 in
     cat <<\EOF
 Usage: mdate-sh [--help] [--version] FILE
 
-Pretty-print the modification time of FILE.
+Pretty-print the modification day of FILE, in the format:
+1 January 1970
 
 Report bugs to <address@hidden>.
 EOF
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3b4c850..7a34626 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -306,6 +306,9 @@ extra5.test \
 extra6.test \
 extra7.test \
 extra8.test \
+extra10.test \
+extra11.test \
+extra12.test \
 f90only.test \
 flavor.test \
 flibs.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index eced3e7..260ebec 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -541,6 +541,9 @@ extra5.test \
 extra6.test \
 extra7.test \
 extra8.test \
+extra10.test \
+extra11.test \
+extra12.test \
 f90only.test \
 flavor.test \
 flibs.test \
diff --git a/tests/extra5.test b/tests/extra10.test
similarity index 65%
copy from tests/extra5.test
copy to tests/extra10.test
index 21f756e..16d06a3 100755
--- a/tests/extra5.test
+++ b/tests/extra10.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -14,27 +14,30 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check to make sure EXTRA_DIST can contain a directory from $buildir.
-# From Dean Povey.
+# Check that wildcards in EXTRA_DIST are honoured.
+# Suggested by observations from Braden McDaniel.
 
 . ./defs || Exit 1
 
-echo AC_OUTPUT >> configure.in
+set -e
 
-cat > Makefile.am << 'END'
-EXTRA_DIST=foo
+echo AC_OUTPUT >> configure.in
 
-foo:
-       mkdir foo
-       touch foo/bar
+cat > Makefile.am <<'END'
+EXTRA_DIST=*.foo
+.PHONY: test
+test: distdir
+       diff a.foo $(distdir)/a.foo
+       diff b.foo $(distdir)/b.foo
+       test ! -r $(distdir)/c.bar
 END
 
-set -e
-
 $ACLOCAL
 $AUTOMAKE
 $AUTOCONF
-mkdir build
-cd build
-../configure
-$MAKE distdir
+
+echo aaa > a.foo
+echo bbb > b.foo
+echo ccc > c.foo
+./configure
+$MAKE test
diff --git a/tests/extra11.test b/tests/extra11.test
new file mode 100755
index 0000000..14dda42
--- /dev/null
+++ b/tests/extra11.test
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check for more complex usage of wildcards in EXTRA_DIST.
+# Suggested by observations from Braden McDaniel.
+
+. ./defs || Exit 1
+
+set -e
+
+echo AC_OUTPUT >> configure.in
+
+cat > Makefile.am <<'END'
+EXTRA_DIST = [!c-z].t d.t [ab].dir foo.* *zardoz*
+
+.PHONY: prereq
+prereq:
+       echo a > a.t
+       echo b > b.t
+       echo c > c.t
+       echo d > d.t
+       echo m > m.t
+       echo z > z.t
+       mkdir a.dir b.dir c.dir
+       echo a1 > a.dir/f1
+       echo a2 > a.dir/f2
+       echo bb > b.dir/f
+       echo cc > c.dir/x
+       echo 0 > foo
+       echo 1 > foo.x
+       echo 2 > foo.bar
+       echo foo > _zardoz_
+
+.PHONY: test
+test: distdir
+       diff a.t $(distdir)/a.t
+       diff b.t $(distdir)/b.t
+       test ! -r $(distdir)/c.t
+       diff d.t $(distdir)/d.t
+       test ! -r $(distdir)/m.t
+       test ! -r $(distdir)/z.t
+       diff a.dir/f1 $(distdir)/a.dir/f1
+       diff a.dir/f2 $(distdir)/a.dir/f2
+       diff b.dir/f $(distdir)/b.dir/f
+       test ! -r $(distdir)/c.dir
+       diff foo.x $(distdir)/foo.x
+       diff foo.bar $(distdir)/foo.bar
+       test ! -r $(distdir)/foo
+       diff _zardoz_ $(distdir)/_zardoz_
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+$MAKE prereq
+ls -l . *.dir
+$MAKE test
diff --git a/tests/extra6.test b/tests/extra12.test
similarity index 54%
copy from tests/extra6.test
copy to tests/extra12.test
index 0dbf735..72b918c 100755
--- a/tests/extra6.test
+++ b/tests/extra12.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -14,8 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check to make sure EXTRA_DIST can contain a directory or
-# a subdirectory, in $(builddir) or $(srcdir).
+# Check that wildcards in elements of EXTRA_DIST are honoured when
+# $srcdir != $builddir, if properly declared.
+# Suggested by observations from Braden McDaniel.
 
 . ./defs || Exit 1
 
@@ -23,35 +24,29 @@ set -e
 
 echo AC_OUTPUT >> configure.in
 
-cat > Makefile.am << 'END'
-EXTRA_DIST=foo/bar baz foo2/bar2 baz2
 
-check: distdir
-       test -f $(distdir)/foo/bar/baz
-       test -f $(distdir)/baz/foo
-       test -f $(distdir)/foo2/bar2/baz2
-       test -f $(distdir)/baz2/foo2
-END
+cat > Makefile.am <<'END'
+EXTRA_DIST = *.foo $(srcdir)/*.foo $(builddir)/*.bar $(srcdir)/*.bar
 
-# Create some files in $(srcdir)
-mkdir foo
-mkdir foo/bar
-touch foo/bar/baz
-mkdir baz
-touch baz/foo
+.PHONY: test
+test: distdir
+       ls -l $(srcdir) $(builddir) $(distdir)
+       diff $(srcdir)/a.foo $(distdir)/a.foo
+       diff $(srcdir)/b.bar $(distdir)/b.bar
+       diff $(builddir)/c.foo $(distdir)/c.foo
+       diff $(builddir)/d.bar $(distdir)/d.bar
+END
 
 $ACLOCAL
 $AUTOMAKE
 $AUTOCONF
+
+echo aaa > a.foo
+echo bbb > b.bar
 mkdir build
+echo ccc > build/c.foo
+echo ddd > build/d.bar
+
 cd build
 ../configure
-
-# Create some files in $(builddir)
-mkdir foo2
-mkdir foo2/bar2
-touch foo2/bar2/baz2
-mkdir baz2
-touch baz2/foo2
-
-$MAKE check
+$MAKE test


hooks/post-receive
-- 
GNU Automake