[Automake-commit] [SCM] GNU Automake branch, micro, updated. v1.14-17-g8a310a5

[Stefano Lattarini]

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=8a310a5fa5a908cf8771e44431e5743fb0e8b026

The branch, micro has been updated
       via  8a310a5fa5a908cf8771e44431e5743fb0e8b026 (commit)
       via  1e2f142fff20f126644b42ded42c12614114aab3 (commit)
       via  8dbdc495503a3a689d1396326c212af26a5a00ca (commit)
       via  7a8b3b0c6b28626b7c62354973e923f4aa579743 (commit)
       via  2c063f33aece0afa0ee5c10d94aed6fa722c5ea9 (commit)
       via  8c554e1ffea9ca414ac3e0c09437ef91a8edcfc1 (commit)
      from  1a24c5400c68c6cf3959c8ec5134ca79d0daad43 (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 8a310a5fa5a908cf8771e44431e5743fb0e8b026
Author: Stefano Lattarini <address@hidden>
Date:   Wed Oct 30 00:51:25 2013 +0000

    tests: fix spurious failure when zip is present but unzip is not
    
    Fixes automake bug#15181.
    
    * t/dist-formats.tap (have_compressor): When checking that zip(1), also
    check for unzip(1), otherwise "make distcheck" will be unable to extract
    the zip tarball it creates, which will cause spurious failures.  While
    at it, reorganize the existing code a bit.
    * THANKS, NEWS: Update.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 1e2f142fff20f126644b42ded42c12614114aab3
Author: Stefano Lattarini <address@hidden>
Date:   Wed Oct 30 00:04:51 2013 +0000

    tests: fix spurious failure due to localization issues
    
    Fixes automake bug#15237.
    
    * t/autohdr-subdir-pr12495.sh: Ensure make is run in the C locale, so that
    we can expect error messages in English when grepping its output.
    * THANKS, NEWS: Update.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 8dbdc495503a3a689d1396326c212af26a5a00ca
Author: Stefano Lattarini <address@hidden>
Date:   Tue Oct 29 23:50:49 2013 +0000

    NEWS: update with the changes since v1.14
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 7a8b3b0c6b28626b7c62354973e923f4aa579743
Author: Peter Breitenlohner <address@hidden>
Date:   Tue Sep 10 12:03:30 2013 +0200

    docs: correct typos in the fix-timestamp.sh script
    
    * doc/automake.texi: Here.  The original version of this example script
    makes no sense at all, using 'configure' instead of the intended 'touch'
    in few key places.
    
    Copyright-paperwork-exempt: yes
    Signed-off-by: Peter Breitenlohner <address@hidden>
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 2c063f33aece0afa0ee5c10d94aed6fa722c5ea9
Author: Benoit Sigoure <address@hidden>
Date:   Tue Sep 17 09:57:53 2013 -0700

    python: byte-compile nobase_*_PYTHON files only once
    
    * lib/am/python.am: Here. Byte-compiling was occurring inside of
    a loop, causing an O(n^2) number of byte-compilations instead of
    O(n).
    
    Copyright-paperwork-exempt: yes
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 8c554e1ffea9ca414ac3e0c09437ef91a8edcfc1
Author: Václav Zeman <address@hidden>
Date:   Mon Oct 28 21:28:05 2013 +0000

    cosmetics: typofix in the 'missing' script
    
    * lib/missing: Here, in a message printed to the user.
    * THANKS: Update.
    
    Copyright-paperwork-exempt: yes
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 NEWS                        |   23 ++++++++++++++++++
 THANKS                      |    3 ++
 doc/automake.texi           |    4 +-
 lib/am/python.am            |   12 ++++----
 lib/missing                 |    4 +-
 t/autohdr-subdir-pr12495.sh |    4 +++
 t/dist-formats.tap          |   54 +++++++++++++++++++++++--------------------
 7 files changed, 69 insertions(+), 35 deletions(-)

diff --git a/NEWS b/NEWS
index 9ec55df..aaec7c0 100644
--- a/NEWS
+++ b/NEWS
@@ -104,6 +104,29 @@
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+New in 1.14.1:
+
+* Bugs fixed:
+
+  - Fixed a gross inefficiency in the recipes for installing byte-compiled
+    python files, that was causing an O(N^2) performance on the number N of
+    files, instead of the expected O(N) performance.  Note that this bug
+    was only relevant when the number of python files was high (which is
+    unusual in practice).
+
+  - The 'test-driver' script now actually error out with a clear error
+    message on the most common invalid usages.
+
+  - Several spurious failures/hangs in the testsuite (bugs #14706, #14707,
+    #14760, #14911, #15181, #15237).
+
+* Documentation fixes:
+
+  - Fixed typos in the 'fix-timestamp.sh' example script that made it
+    nonsensical.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 New in 1.14:
 
 * C compilation, and the AC_PROG_CC and AM_PROG_CC_C_O macros:
diff --git a/THANKS b/THANKS
index 1482da2..6be803e 100644
--- a/THANKS
+++ b/THANKS
@@ -17,6 +17,7 @@ Alexander Turbov                address@hidden
 Alexandre Duret-Lutz            address@hidden
 Alexey Mahotkin                 address@hidden
 Alfred M. Szmidt                address@hidden
+Andrea Urbani                   address@hidden
 Andreas Bergmeier               address@hidden
 Andreas Buening                 address@hidden
 Andreas Köhler                  address@hidden
@@ -405,11 +406,13 @@ Tom Rini                        address@hidden
 Ulrich Drepper                  address@hidden
 Ulrich Eckhardt                 address@hidden
 Václav Haisman                  address@hidden
+Václav Zeman                    address@hidden
 Vadim Zeitlin                   address@hidden
 Vasyl Khalak                    address@hidden
 Vincent Lefevre                 address@hidden
 Vladimir Serbinenko             address@hidden
 Volker Boerchers                address@hidden
+Weiller Ronfini                 address@hidden
 Werner John                     address@hidden
 Werner Koch                     address@hidden
 Werner Lemberg                  address@hidden
diff --git a/doc/automake.texi b/doc/automake.texi
index 8f4020b..62728d4 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -11728,9 +11728,9 @@ touch aclocal.m4
 sleep 1
 # autoconf-generated configure depends on aclocal.m4 and on
 # configure.ac
-configure config.h.in
+touch configure
 # so does autoheader-generated config.h.in
-configure config.h.in
+touch config.h.in
 # and all the automake-generated Makefile.in files
 touch `find . -name Makefile.in -print`
 # finally, the makeinfo-generated '.info' files depend on the
diff --git a/lib/am/python.am b/lib/am/python.am
index 36f0b2d..06545b1 100644
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -66,7 +66,7 @@ else !%?BASE%
          echo " $(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)'"; \
          $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)" || exit 1; \
        fi; \
-       $(am__nobase_list) | while read dir files; do \
+       $(am__nobase_list) | { while read dir files; do \
          xfiles=; for p in $$files; do \
 ## A file can be in the source directory or the build directory.
            if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
@@ -79,13 +79,13 @@ else !%?BASE%
 ## Don't perform translation, since script name is important.
            echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
            $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(%NDIR%dir)/$$dir" || exit 
$$?; }; \
+       done; \
 ## Byte-compile must be done at install time, since file times are
 ## encoded in the actual files.
-         if test -n "$$dlist"; then \
-           $(am__py_compile) --destdir "$(DESTDIR)" \
-                             --basedir "$(%NDIR%dir)" $$dlist; \
-         else :; fi \
-       done
+       if test -n "$$dlist"; then \
+         $(am__py_compile) --destdir "$(DESTDIR)" \
+                           --basedir "$(%NDIR%dir)" $$dlist; \
+       else :; fi; }
 endif !%?BASE%
 endif %?INSTALL%
 
diff --git a/lib/missing b/lib/missing
index cdea514..db98974 100755
--- a/lib/missing
+++ b/lib/missing
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <address@hidden>, 1996.
@@ -160,7 +160,7 @@ give_advice ()
       ;;
    autom4te*)
       echo "You might have modified some maintainer files that require"
-      echo "the 'automa4te' program to be rebuilt."
+      echo "the 'autom4te' program to be rebuilt."
       program_details 'autom4te'
       ;;
     bison*|yacc*)
diff --git a/t/autohdr-subdir-pr12495.sh b/t/autohdr-subdir-pr12495.sh
index 7e26b46..dcb9620 100644
--- a/t/autohdr-subdir-pr12495.sh
+++ b/t/autohdr-subdir-pr12495.sh
@@ -63,6 +63,10 @@ $MAKE
 test -f a.h.in
 test -f a.h
 
+# We might need to grep the output of GNU make for error messages.
+LANG=C LANGUAGE=C LC_ALL=C
+export LANG LANGUAGE LC_ALL
+
 ocwd=$(pwd)
 for x in b c; do
   test $x = b || cd sub
diff --git a/t/dist-formats.tap b/t/dist-formats.tap
index 49281d9..3c9e621 100644
--- a/t/dist-formats.tap
+++ b/t/dist-formats.tap
@@ -67,34 +67,38 @@ setup_vars_for_compression_format ()
 have_compressor ()
 {
   test $# -eq 1 || fatal_ "have_compressor(): bad usage"
-  case $1 in
+  if test $1 = gzip; then
     # Assume gzip(1) is available on every reasonable portability target.
-    gzip)
-      return 0;;
-    *)
-      case $1 in
-        # Do not use --version, or older versions bzip2 would try to
-        # compress stdin.  This would cause binary output in the test
-        # logs, with potential breakage of our testsuite harness.
-        bzip2) o=--help;;
-        # OpenSolaris zip do not support the '--version' option, but
-        # accepts the '-v' one with a similar meaning (if no further
-        # arguments are given).
-        zip) o=-v;;
-        # Assume the other compressors we care about support the
-        # '--version' option.
-        *) o=--version;;
-      esac
-      # Redirect to stderr to avoid polluting the output, in case this
-      # function is used in a command substitution (as it is, below).
-      if $1 $o </dev/null >&2; then
-        return 0
-      else
-        return 1
-      fi
+    return 0
+  fi
+  needed_programs=$1
+  # Assume by default the other compressors we care about support the
+  # '--version' option.  We'll special-case the one which don't.
+  checker_option=--version
+  case $1 in
+    bzip2)
+      # Do not use --version, or older versions bzip2 would try to
+      # compress stdin.  This would cause binary output in the test
+      # logs, with potential breakage of our testsuite harness.
+      checker_option=--help
+      ;;
+    zip)
+      # OpenSolaris zip do not support the '--version' option, but
+      # accepts the '-v' one with a similar meaning (if no further
+      # arguments are given).
+      checker_option=-v
+      # Also, we need 'unzip' to decompress the created zipped archives
+      # (bug#15181).
+      needed_programs='zip unzip'
       ;;
   esac
-  fatal_ "have_compressor(): dead code reached"
+  # Redirect to stderr to avoid polluting the output, in case this
+  # function is used in a command substitution (as it is, later in
+  # this script).
+  for p in $needed_programs; do
+    $p $checker_option </dev/null >&2 || return 1
+  done
+  return 0
 }
 
 all_compression_formats='gzip lzip xz bzip2 zip'


hooks/post-receive
-- 
GNU Automake