[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-643-ge4aa649

[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=e4aa6497d2319f2305a67fed7f6d0099169cb6e4

The branch, branch-1.11 has been updated
       via  e4aa6497d2319f2305a67fed7f6d0099169cb6e4 (commit)
       via  c8e01d581a7e7c2445a139def46939a547951746 (commit)
       via  7dbb5500f658405e8862a90f1bb17d0c82a27f54 (commit)
      from  d01e0f44118b43599521f71ad65e0d552f6604b7 (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 e4aa6497d2319f2305a67fed7f6d0099169cb6e4
Merge: d01e0f4 c8e01d5
Author: Stefano Lattarini <address@hidden>
Date:   Sat Dec 10 00:27:11 2011 +0100

    Merge branch 'maint' into branch-1.11
    
    * maint:
      dist-xz, dist-bzip2: don't hard-code -9, honor envvar settings
      news: fix typos, grammaros and suboptimal wording

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

Summary of changes:
 ChangeLog         |   37 ++++++++++++++++++++++++++++-
 Makefile.in       |    6 ++--
 NEWS              |   68 +++++++++++++++++++++++-----------------------------
 doc/automake.texi |   10 +++++++
 lib/am/distdir.am |    8 +++---
 5 files changed, 83 insertions(+), 46 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1aba97a..bf01432 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2011-12-09  Jim Meyering  <address@hidden>
+           Stefano Lattarini  <address@hidden>
+
+       dist-xz, dist-bzip2: don't hard-code -9, honor envvar settings
+       Before the present change, automake-generated `dist-xz' rule used
+       a hard-coded `xz -9'.  That was a problem because on this front,
+       xz differs from gzip and bzip2.  While the latter two don't incur
+       any run-time decompression penalty for using a higher compression
+       level, specifying -9 with xz imposes a potentially fatal virtual
+       memory requirement on any client that wants to decompress your
+       tar.xz file.
+       People have complained that a tarball compressed with -9 cannot
+       be uncompressed in a low-memory environment (wrt-based embedded).
+       Hence, instead of defaulting to -9, which is useful only for very
+       large tarballs, it defaults to -e (equivalent to -6e).  This
+       limits the default memory requirements imposed on decompressors,
+       yet still gives very good compression ratios.
+       * lib/am/distdir.am (dist-xz): Do not hard-code xz's -9: that made
+       it impossible to override.  Actually don't default to -9, either,
+       since that induced inordinately large virtual memory usage when
+       merely decompressing.  Instead, use its XZ_OPT envvar, defaulting
+       to -e if not defined.  Suggested by Lasse Collin.
+       (dist, dist-all) [?XZ?]: Likewise
+       (dist-bzip2): Similarly, do not hard-code -9, but do continue to
+       use -9 by default.  Honor the BZIP2 envvar.
+       (dist, dist-all) [?BZIP2?]: Likewise
+       * NEWS: Update.
+       * doc/automake.texi (The Types of Distributions): Describe the
+       newly enabled environment variables.
+
+2011-12-09  Stefano Lattarini  <address@hidden>
+
+       * NEWS: Fix typos, grammaros and suboptimal wording.
+       Reported by Jim Meyering.
+
 2011-12-07  Stefano Lattarini  <address@hidden>
 
        maint: sync auxiliary files from upstream
@@ -299,7 +334,7 @@
 
        info: allow user to inhibit creation/update of '${infodir}/dir'
        With this change, we allow the user to request the install-info
-       rules not to update the `${infodir}/dir' file, by exporting the
+       rules not to update the `${infodir}/dir' file, by setting the
        environment variable `AM_UPDATE_INFO_DIR' to the value "no".
        This is especially useful to distro packagers, and is a definite
        improvement over our previous hack of looking whether the
diff --git a/Makefile.in b/Makefile.in
index cb969c4..b91bcdf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -671,7 +671,7 @@ dist-gzip: distdir
        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c 
>$(distdir).tar.gz
        $(am__remove_distdir)
 dist-bzip2: distdir
-       tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+       tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c 
>$(distdir).tar.bz2
        $(am__remove_distdir)
 
 dist-lzma: distdir
@@ -679,7 +679,7 @@ dist-lzma: distdir
        $(am__remove_distdir)
 
 dist-xz: distdir
-       tardir=$(distdir) && $(am__tar) | xz -9 -c >$(distdir).tar.xz
+       tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c 
>$(distdir).tar.xz
        $(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -697,7 +697,7 @@ dist-zip: distdir
 
 dist dist-all: distdir
        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c 
>$(distdir).tar.gz
-       tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+       tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c 
>$(distdir).tar.bz2
        $(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
diff --git a/NEWS b/NEWS
index 6c85e1e..ad0af5f 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,11 @@ New in 1.11.1a:
   - The `lzma' compression scheme and associated automake option `dist-lzma'
     is obsoleted by `xz' and `dist-xz' due to upstream changes.
 
+  - You may adjust the compression options used in dist-xz and dist-bzip2.
+    The default is now merely -e for xz, but still -9 for bzip;  you may
+    specify a different level via the XZ_OPT and BZIP2 envvars respectively.
+    E.g., "make dist-xz XZ_OPT=-7" or "make dist-xz BZIP2=-5"
+
   - The `compile' script now converts some options for MSVC for a better
     user experience.  Similarly, the new `ar-lib' script wraps Microsoft lib.
 
@@ -40,11 +45,11 @@ New in 1.11.1a:
     the list of options.
 
   - A developer that needs to pass specific flags to configure at "make
-    distcheck" time can now, and indeed he's advised to, do so by defining
+    distcheck" time can now, and indeed is advised to, do so by defining
     the developer-reserved makefile variable AM_DISTCHECK_CONFIGURE_FLAGS,
     instead of the old DISTCHECK_CONFIGURE_FLAGS.
     The DISTCHECK_CONFIGURE_FLAGS variable should now be reserved for the
-    user; still, the old Makefile.am files that used to define it should
+    user; still, the old Makefile.am files that used to define it will
     still continue to work as before.
 
   - New macro AM_PROG_AR that looks for an archiver and wraps it in the new
@@ -64,7 +69,7 @@ Bugs fixed in 1.11.1a:
 
 * Bugs introduced by 1.11.1:
 
-* Long standing bugs:
+* Long-standing bugs:
 
   - The `parallel-tests' test driver works around a GNU make 3.80 bug with
     trailing white space in the test list (`TESTS = foo $(EMPTY)'), and
@@ -78,15 +83,10 @@ Bugs fixed in 1.11.1a:
     or "redefinition of TEST_EXTENSIONS), or even, in some situations,
     silently producing broken `Makefile.in' files.
 
-  - The `silent-rules' option now also silences all compile rules if dependency
-    tracking is disabled.  Also, when `silent-rules' is not used, the output 
from
-    `make' does not contain spurious extra lines with only a backslash in them
-    any more; it now again matches that from pre-1.11 Automake.
-
-  - Several scripts as well as the parallel-tests testsuite driver now
-    exit with the right exit status upon receiving a signal.
-
-  - The `dist-xz' option now uses `xz -9' for maximum compression.
+  - The `silent-rules' option now truly silences all compile rules, even
+    when dependency tracking is disabled.  Also, when `silent-rules' is
+    not used, `make' output no longer contains spurious backslash-only
+    lines, thus once again matching what Automake did before 1.11.
 
   - A per-Makefile.am setting of -Werror does not carry over to the
     handling of other Makefile.am files any more.
@@ -118,43 +118,35 @@ Bugs fixed in 1.11.1a:
     `make -n' is invoked.  Fixes include compilation of Emacs Lisp, Vala, or
     Yacc source files and the rule to update config.h.
 
-  - Several scripts as well as the parallel-tests testsuite driver now
-    exit with the right exit status upon receiving a signal.
-
-  - A per-Makefile.am setting of -Werror does not carry over to the
-    handling of other Makefile.am files any more.
+  - Several scripts and the parallel-tests testsuite driver now exit with
+    the right exit status upon receiving a signal.
 
-  - The order of Yacc and Lex flags is fixed to be consistent with other
-    languages: $(AM_YFLAGS) comes before $(YFLAGS), and $(AM_LFLAGS) before
-    $(LFLAGS), so that the user variables override the developer variables.
-
-  - Rules generated by Automake now try harder to not change any files when
-    `make -n' is invoked.  Fixes include compilation of Emacs Lisp, Vala, or
-    Yacc source files and the rule to update config.h.
+  - A per-Makefile.am setting of -Werror does not erroneously carry over
+    to the handling of other Makefile.am files.
 
   - The code for automatic dependency tracking works around a Solaris
     make bug triggered by sources containing repeated slashes when the
     `subdir-objects' option was used.
 
-  - The parallel-tests driver now does not produce erroneous results
-    with Tru64/OSF 5.1 sh upon unreadable log files any more.
+  - The parallel-tests driver no longer produces erroneous results with
+    Tru64/OSF 5.1 sh upon unreadable log files.
 
-  - The makedepend and hp depmodes now works better with VPATH builds.
+  - The makedepend and hp depmodes now work better with VPATH builds.
 
-  - Java sources specified with check_JAVA are not compiled anymore upon
-    "make all", but only upon "make check".
+  - Java sources specified with check_JAVA are no longer compiled for
+    "make all", but only for "make check".
 
   - An usage like "java_JAVA = foo.java" will now cause Automake to warn
     and error out if `javadir' is undefined, instead of silently producing
     a broken Makefile.in.
 
-  - Now aclocal and automake, when they've to spawn autoconf or autom4te
-    processes, honour the configure-time definitions of AUTOCONF and
-    AUTOM4TE.
+  - aclocal and automake now honour the configure-time definitions of
+    AUTOCONF and AUTOM4TE when they spawn autoconf or autom4te processes.
 
-  - The `install-info' recipe does not try anymore to guess whether the
+  - The `install-info' recipe no longer tries to guess whether the
     `install-info' program is from Debian or from GNU, and adaptively
-    change its behaviour; this has proven to be frail and easy to regress.
+    change its behaviour; this has proven to be frail and easy to
+    regress.
 
 Bugs fixed in 1.11.1:
 
@@ -354,7 +346,7 @@ New in 1.11:
 
 Bugs fixed in 1.11:
 
-* Long standing bugs:
+* Long-standing bugs:
 
   - Fix aix dependency tracking for libtool objects.
 
@@ -687,7 +679,7 @@ New in 1.9:
 
 Bugs fixed in 1.8.5:
 
-* Long standing bugs:
+* Long-standing bugs:
 
   - Define DIST_SUBDIRS even when the `no-dist' or `cygnus' options are used
     so that `make distclean' and `make maintainer-clean' can work.
@@ -700,7 +692,7 @@ Bugs fixed in 1.8.5:
 
 Bugs fixed in 1.8.4:
 
-* Long standing bugs:
+* Long-standing bugs:
 
   - Fix AM_PATH_PYTHON to correctly display $PYTHON when it has been
     overridden by the user.
@@ -727,7 +719,7 @@ Bugs fixed in 1.8.4:
 
 Bugs fixed in 1.8.3:
 
-* Long standing bugs:
+* Long-standing bugs:
 
   - Quote filenames in installation rules, in case $DESTDIR, $prefix,
     or any of the other *dir variables contain a space.
diff --git a/doc/automake.texi b/doc/automake.texi
index 783463c..869611c 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8674,9 +8674,13 @@ Automake generates rules to provide archives of the 
project for
 distributions in various formats.  Their targets are:
 
 @table @asis
address@hidden BZIP2
 @item @code{dist-bzip2}
 Generate a bzip2 tar archive of the distribution.  bzip2 archives are
 frequently smaller than gzipped archives.
+By default, this rule makes @samp{bzip2} use a compression option of
address@hidden  To make it use a different one, set the @env{BZIP2}
+environment variable.  For example, @samp{make dist-bzip2 BZIP2=-7}.
 @trindex dist-bzip2
 
 @item @code{dist-gzip}
@@ -8694,10 +8698,16 @@ instead.
 Generate a shar archive of the distribution.
 @trindex dist-shar
 
address@hidden XZ_OPT
 @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 displaces the obsolete @samp{lzma} format.
+By default, this rule makes @samp{xz} use a compression option of
address@hidden  To make it use a different one, set the @env{XZ_OPT}
+environment variable.  For example, run this command to use the
+default compression ratio, but with a progress indicator:
address@hidden dist-xz XZ_OPT=-7e}.
 @trindex dist-xz
 
 @item @code{dist-zip}
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 41ff14a..f685ec1 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -341,7 +341,7 @@ dist-gzip: distdir
 ?BZIP2?DIST_ARCHIVES += $(distdir).tar.bz2
 .PHONY: dist-bzip2
 dist-bzip2: distdir
-       tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+       tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c 
>$(distdir).tar.bz2
        $(am__remove_distdir)
 
 ?LZMA?DIST_ARCHIVES += $(distdir).tar.lzma
@@ -353,7 +353,7 @@ dist-lzma: distdir
 ?XZ?DIST_ARCHIVES += $(distdir).tar.xz
 .PHONY: dist-xz
 dist-xz: distdir
-       tardir=$(distdir) && $(am__tar) | xz -9 -c >$(distdir).tar.xz
+       tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c 
>$(distdir).tar.xz
        $(am__remove_distdir)
 
 ?COMPRESS?DIST_ARCHIVES += $(distdir).tar.Z
@@ -395,9 +395,9 @@ endif %?SUBDIRS%
 
 dist dist-all: distdir
 ?GZIP? tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c 
>$(distdir).tar.gz
-?BZIP2?        tardir=$(distdir) && $(am__tar) | bzip2 -9 -c 
>$(distdir).tar.bz2
+?BZIP2?        tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c 
>$(distdir).tar.bz2
 ?LZMA? tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-?XZ?   tardir=$(distdir) && $(am__tar) | xz -9 -c >$(distdir).tar.xz
+?XZ?   tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c 
>$(distdir).tar.xz
 ?COMPRESS?     tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 ?SHAR? shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 ?ZIP?  -rm -f $(distdir).zip


hooks/post-receive
-- 
GNU Automake