diff options
author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-02-24 19:56:26 +0100 |
---|---|---|
committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-02-24 19:56:26 +0100 |
commit | 4147afc1cfed700fbcbefb797ae98a7ee7e5602a (patch) | |
tree | d83e540e242130c5a1d4eb1341b091cff5f7cfa7 | |
parent | d3092078407feadbd3d76e4d82c4685467d2e6d2 (diff) | |
parent | 3c3ff958e5d692ec4ce9b025821abba103cc7b94 (diff) | |
download | automake-4147afc1cfed700fbcbefb797ae98a7ee7e5602a.tar.gz |
Merge branch 'lzip-support'
* lzip-support:
Add lzip compression support.
-rw-r--r-- | ChangeLog | 17 | ||||
-rw-r--r-- | Makefile.in | 32 | ||||
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | automake.in | 3 | ||||
-rw-r--r-- | doc/automake.texi | 16 | ||||
-rw-r--r-- | lib/Automake/Options.pm | 2 | ||||
-rw-r--r-- | lib/am/distdir.am | 13 | ||||
-rw-r--r-- | tests/Makefile.am | 1 | ||||
-rw-r--r-- | tests/Makefile.in | 1 | ||||
-rwxr-xr-x | tests/lzip.test | 41 |
10 files changed, 109 insertions, 19 deletions
@@ -1,3 +1,20 @@ +2010-02-24 Antonio Diaz Diaz <ant_diaz@teleline.es> (tiny change) + Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + 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 <karl@gnu.org> Improve help message of mdate-sh. diff --git a/Makefile.in b/Makefile.in index e8fb28231..6a96eb4b1 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: @@ -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 8029dc91b..c0bf14687 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 5e02071e1..7df95ff58 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 +@item @code{dist-lzip} +Generate an @samp{lzip} tar archive of the distribution. @command{lzip} +archives are frequently smaller than @command{bzip2}-compressed archives. +@trindex 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 +@item @option{dist-lzip} +@cindex Option, @option{dist-lzip} +@opindex dist-lzip +Hook @code{dist-lzip} to @code{dist}. +@trindex 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}, -@option{dist-bzip2}, @option{dist-xz} and @option{dist-tarZ} options in use.) +@option{dist-bzip2}, @option{dist-lzip}, @option{dist-tarZ} and +@option{dist-xz} 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 -@c LocalWords: barexec Pinard's automatize initialize lzma xz cscope +@c LocalWords: barexec Pinard's automatize initialize lzip lzma xz cscope diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm index cacc7d2e1..8d004d9b0 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 4e356b912..9459e7509 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 de56d3697..9d99d3a48 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 9da84246f..a2d2931d1 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/lzip.test b/tests/lzip.test new file mode 100755 index 000000000..fecbc83fa --- /dev/null +++ b/tests/lzip.test @@ -0,0 +1,41 @@ +#! /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 support for no-dist-gzip with lzip + +required=lzip +. ./defs || Exit 1 + +set -e + +cat > configure.in << 'END' +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) = lzip-1.0.tar.lz + test -f $(DIST_ARCHIVES) +END + +$ACLOCAL +$AUTOCONF +$AUTOMAKE +./configure +$MAKE test |