[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-122-g4147afc

[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=4147afc1cfed700fbcbefb797ae98a7ee7e5602a

The branch, master has been updated
       via  4147afc1cfed700fbcbefb797ae98a7ee7e5602a (commit)
       via  3c3ff958e5d692ec4ce9b025821abba103cc7b94 (commit)
      from  d3092078407feadbd3d76e4d82c4685467d2e6d2 (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 4147afc1cfed700fbcbefb797ae98a7ee7e5602a
Merge: d3092078407feadbd3d76e4d82c4685467d2e6d2 
3c3ff958e5d692ec4ce9b025821abba103cc7b94
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Feb 24 19:56:26 2010 +0100

    Merge branch 'lzip-support'
    
    * lzip-support:
      Add lzip compression support.

commit 3c3ff958e5d692ec4ce9b025821abba103cc7b94
Author: Antonio Diaz Diaz <address@hidden>
Date:   Wed Feb 24 19:41:59 2010 +0100

    Add lzip compression support.
    
    * automake.in (handle_dist): Recognize dist-lzip.
    (make_paragraphs): Map LZIP to dist-lzip.
    * doc/automake.texi (Dist): Add dist-lzip.
    (Options): Likewise.
    * lib/Automake/Options.pm (_process_option_list): Add dist-lzip.
    * lib/am/distdir.am
    (dist dist-all): Add command to create an lzip-compressed tarball.
    (distcheck): Handle lzip-compressed tarballs just like the others.
    * tests/defs.in: Test for lzip, too.
    * tests/lzip.test: New file, based on nogzip.test.
    * tests/Makefile.am (TESTS): Add lzip.test.
    * NEWS: Update.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                    |   17 +++++++++++++++++
 Makefile.in                  |   32 +++++++++++++++++++-------------
 NEWS                         |    2 ++
 automake.in                  |    3 ++-
 doc/automake.texi            |   16 ++++++++++++++--
 lib/Automake/Options.pm      |    2 +-
 lib/am/distdir.am            |   13 +++++++++++--
 tests/Makefile.am            |    1 +
 tests/Makefile.in            |    1 +
 tests/{xz.test => lzip.test} |   12 ++++++------
 10 files changed, 74 insertions(+), 25 deletions(-)
 copy tests/{xz.test => lzip.test} (79%)

diff --git a/ChangeLog b/ChangeLog
index fc9d31f..5fbc889 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2010-02-24  Antonio Diaz Diaz  <address@hidden>  (tiny change)
+           Ralf Wildenhues  <address@hidden>
+
+       Add lzip compression support.
+       * automake.in (handle_dist): Recognize dist-lzip.
+       (make_paragraphs): Map LZIP to dist-lzip.
+       * doc/automake.texi (Dist): Add dist-lzip.
+       (Options): Likewise.
+       * lib/Automake/Options.pm (_process_option_list): Add dist-lzip.
+       * lib/am/distdir.am
+       (dist dist-all): Add command to create an lzip-compressed tarball.
+       (distcheck): Handle lzip-compressed tarballs just like the others.
+       * tests/defs.in: Test for lzip, too.
+       * tests/lzip.test: New file, based on nogzip.test.
+       * tests/Makefile.am (TESTS): Add lzip.test.
+       * NEWS: Update.
+
 2010-02-22  Karl Berry  <address@hidden>
 
        Improve help message of mdate-sh.
diff --git a/Makefile.in b/Makefile.in
index e8fb282..6a96eb4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -649,6 +649,10 @@ dist-bzip2: distdir
        tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
        $(am__post_remove_distdir)
 
+dist-lzip: distdir
+       tardir=$(distdir) && $(am__tar) | lzip -9 -c >$(distdir).tar.lz
+       $(am__post_remove_distdir)
+
 dist-lzma: distdir
        tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
        $(am__post_remove_distdir)
@@ -685,6 +689,8 @@ distcheck: dist
          bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
        *.tar.lzma*) \
          lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+       *.tar.lz*) \
+         lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
        *.tar.xz*) \
          xz -dc $(distdir).tar.xz | $(am__untar) ;;\
        *.tar.Z*) \
@@ -862,19 +868,19 @@ uninstall-am: uninstall-binSCRIPTS
        all all-am am--refresh check check-am clean clean-cscope \
        clean-generic clean-local cscope cscopelist \
        cscopelist-recursive ctags ctags-recursive dist dist-all \
-       dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar dist-tarZ \
-       dist-xz dist-zip distcheck distclean distclean-generic \
-       distclean-tags distcleancheck distdir distuninstallcheck dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-binSCRIPTS install-data install-data-am install-dvi \
-       install-dvi-am install-exec install-exec-am install-exec-hook \
-       install-html install-html-am install-info install-info-am \
-       install-man install-pdf install-pdf-am install-ps \
-       install-ps-am install-strip installcheck installcheck-am \
-       installdirs installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-       pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-       uninstall-binSCRIPTS uninstall-hook
+       dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma dist-shar \
+       dist-tarZ dist-xz dist-zip distcheck distclean \
+       distclean-generic distclean-tags distcleancheck distdir \
+       distuninstallcheck dvi dvi-am html html-am info info-am \
+       install install-am install-binSCRIPTS install-data \
+       install-data-am install-dvi install-dvi-am install-exec \
+       install-exec-am install-exec-hook install-html install-html-am \
+       install-info install-info-am install-man install-pdf \
+       install-pdf-am install-ps install-ps-am install-strip \
+       installcheck installcheck-am installdirs installdirs-am \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+       uninstall uninstall-am uninstall-binSCRIPTS uninstall-hook
 
 
 install-exec-hook:
diff --git a/NEWS b/NEWS
index ebb52d6..4f8f8bb 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,8 @@ New in 1.11a:
   - The `lzma' compression scheme and associated automake option `dist-lzma'
     is obsoleted by `xz' and `dist-xz' due to upstream changes.
 
+  - "make dist" can now create lzip-compressed tarballs.
+
 Bugs fixed in 1.11a:
 
   - Lots of minor bugfixes.
diff --git a/automake.in b/automake.in
index 8029dc9..c0bf146 100644
--- a/automake.in
+++ b/automake.in
@@ -3944,7 +3944,7 @@ sub handle_dist ()
     {
       my $archive_defined = option 'no-dist-gzip' ? 0 : 1;
       $archive_defined ||=
-       grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzma xz);
+       grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzip lzma xz);
       error (option 'no-dist-gzip',
             "no-dist-gzip specified but no dist-* specified, "
             . "at least one archive format must be enabled")
@@ -7098,6 +7098,7 @@ sub make_paragraphs ($%)
 
                 'XZ'          => !! option 'dist-xz',
                 'LZMA'        => !! option 'dist-lzma',
+                'LZIP'        => !! option 'dist-lzip',
                 'BZIP2'       => !! option 'dist-bzip2',
                 'COMPRESS'    => !! option 'dist-tarZ',
                 'GZIP'        =>  ! option 'no-dist-gzip',
diff --git a/doc/automake.texi b/doc/automake.texi
index 5e02071..7df95ff 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8441,6 +8441,11 @@ frequently smaller than gzipped archives.
 Generate a gzip tar archive of the distribution.
 @trindex dist-gzip
 
address@hidden @code{dist-lzip}
+Generate an @samp{lzip} tar archive of the distribution.  @command{lzip}
+archives are frequently smaller than @command{bzip2}-compressed archives.
address@hidden dist-lzip
+
 @item @code{dist-lzma}
 Generate an @samp{lzma} tar archive of the distribution.  @command{lzma}
 archives are frequently smaller than @command{bzip2}-compressed archives.
@@ -8991,6 +8996,12 @@ Cause @command{dejagnu}-specific rules to be generated.  
@xref{DejaGnu Tests}.
 Hook @code{dist-bzip2} to @code{dist}.
 @trindex dist-bzip2
 
address@hidden @option{dist-lzip}
address@hidden Option, @option{dist-lzip}
address@hidden dist-lzip
+Hook @code{dist-lzip} to @code{dist}.
address@hidden dist-lzip
+
 @item @option{dist-lzma}
 @cindex Option, @option{dist-lzma}
 @opindex dist-lzma
@@ -9263,7 +9274,8 @@ 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-xz} and @option{dist-tarZ} options in use.)
address@hidden, @option{dist-lzip}, @option{dist-tarZ} and
address@hidden options in use.)
 
 These options must be passed as arguments to @code{AM_INIT_AUTOMAKE}
 (@pxref{Macros}) because they can require additional configure checks.
@@ -12929,4 +12941,4 @@ parentheses is the number of generated test cases.
 @c  LocalWords:  LTALLOCA MALLOC malloc memcmp strdup alloca libcompat xyz DFOO
 @c  LocalWords:  unprefixed buildable preprocessed DBAZ DDATADIR WARNINGCFLAGS
 @c  LocalWords:  LIBFOOCFLAGS LIBFOOLDFLAGS ftable testSubDir obj LIBTOOLFLAGS
address@hidden  LocalWords:  barexec Pinard's automatize initialize lzma xz 
cscope
address@hidden  LocalWords:  barexec Pinard's automatize initialize lzip lzma 
xz cscope
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index cacc7d2..8d004d9 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -259,7 +259,7 @@ sub _process_option_list (\%$@)
       elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo'
             || $_ eq 'dist-shar' || $_ eq 'dist-zip'
             || $_ eq 'dist-tarZ' || $_ eq 'dist-bzip2'
-            || $_ eq 'dist-lzma' || $_ eq 'dist-xz'
+            || $_ eq 'dist-lzip' || $_ eq 'dist-lzma' || $_ eq 'dist-xz'
             || $_ eq 'no-dist-gzip' || $_ eq 'no-dist'
             || $_ eq 'dejagnu' || $_ eq 'no-texinfo.tex'
             || $_ eq 'readme-alpha' || $_ eq 'check-news'
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 4e356b9..9459e75 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -1,6 +1,6 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-## Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+## 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
@@ -348,6 +348,12 @@ dist-bzip2: distdir
        tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
        $(am__post_remove_distdir)
 
+?LZIP?DIST_ARCHIVES += $(distdir).tar.lz
+.PHONY: dist-lzip
+dist-lzip: distdir
+       tardir=$(distdir) && $(am__tar) | lzip -9 -c >$(distdir).tar.lz
+       $(am__post_remove_distdir)
+
 ?LZMA?DIST_ARCHIVES += $(distdir).tar.lzma
 .PHONY: dist-lzma
 dist-lzma: distdir
@@ -380,6 +386,7 @@ dist-zip: distdir
        $(am__post_remove_distdir)
 
 ?LZMA?DIST_TARGETS += dist-lzma
+?LZIP?DIST_TARGETS += dist-lzip
 ?XZ?DIST_TARGETS += dist-xz
 ?SHAR?DIST_TARGETS += dist-shar
 ?BZIP2?DIST_TARGETS += dist-bzip2
@@ -434,6 +441,8 @@ distcheck: dist
          bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
        *.tar.lzma*) \
          lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+       *.tar.lz*) \
+         lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
        *.tar.xz*) \
          xz -dc $(distdir).tar.xz | $(am__untar) ;;\
        *.tar.Z*) \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index de56d36..9d99d3a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -453,6 +453,7 @@ ltinstloc.test \
 ltlibobjs.test \
 ltlibsrc.test \
 ltorder.test \
+lzip.test \
 lzma.test \
 maintclean.test \
 make.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9da8424..a2d2931 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -695,6 +695,7 @@ ltinstloc.test \
 ltlibobjs.test \
 ltlibsrc.test \
 ltorder.test \
+lzip.test \
 lzma.test \
 maintclean.test \
 make.test \
diff --git a/tests/xz.test b/tests/lzip.test
similarity index 79%
copy from tests/xz.test
copy to tests/lzip.test
index f442711..fecbc83 100755
--- a/tests/xz.test
+++ b/tests/lzip.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  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,23 +14,23 @@
 # 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 support for no-dist-gzip with xz
+# Check support for no-dist-gzip with lzip
 
-required=xz
+required=lzip
 . ./defs || Exit 1
 
 set -e
 
 cat > configure.in << 'END'
-AC_INIT([xz], [1.0])
-AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
+AC_INIT([lzip], [1.0])
+AM_INIT_AUTOMAKE([no-dist-gzip dist-lzip])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
 test: distcheck
-       test $(DIST_ARCHIVES) = xz-1.0.tar.xz
+       test $(DIST_ARCHIVES) = lzip-1.0.tar.lz
        test -f $(DIST_ARCHIVES)
 END
 


hooks/post-receive
-- 
GNU Automake