diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-08-11 10:59:32 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-08-11 11:14:17 +0200 |
| commit | 60b6c2e4e5f95aabf7a652f68123305968d3e3c3 (patch) | |
| tree | c0712c63a48b40859a5c3e98fe0e602f51eda075 /lib/am | |
| parent | 9c12e9b5a6ed5b004232f540443ca40f7731c70e (diff) | |
| download | automake-60b6c2e4e5f95aabf7a652f68123305968d3e3c3.tar.gz | |
[ng] dist: remove obsolete distribution formats
Those formats being the 'shar' archive and the tar archive compressed
with 'compress'. Support for them is kept in mainline Automake for
the sake of backward compatibility only, and modern software releases
should not use those formats anyway, so it's better if we just remove
them.
* NG-NEWS, doc/automake-ng.texi: Update.
* lib/Automake/Options.pm (_is_valid_easy_option): Remove 'dist-shar'
and 'dist-tarZ'.
(_process_option_list): Give a fatal error if one of those two options
is seen.
* lib/am/distdir.am (am.dist.ext.tarZ, am.dist.ext.shar): Remove these
variables.
(dist-tarZ, dist-shar): And these targets.
* lib/am/distcheck.mk (distcheck): Do not try to decompress '.shar.gz'
or '.tar.Z' archives: they won't be there anyway.
* t/dist-formats.tap: Adjust and simplify.
* t/dist-obsolete.sh: New test.
* t/lzma.sh: Remove, subsumed by it.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'lib/am')
| -rw-r--r-- | lib/am/distcheck.mk | 4 | ||||
| -rw-r--r-- | lib/am/distdir.am | 10 |
2 files changed, 0 insertions, 14 deletions
diff --git a/lib/am/distcheck.mk b/lib/am/distcheck.mk index b35899737..759928a3f 100644 --- a/lib/am/distcheck.mk +++ b/lib/am/distcheck.mk @@ -33,10 +33,6 @@ distcheck: dist lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff --git a/lib/am/distdir.am b/lib/am/distdir.am index 35d9a71b5..f687f1849 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -317,8 +317,6 @@ am.dist.ext.gzip = tar.gz am.dist.ext.bzip2 = tar.bz2 am.dist.ext.xz = tar.xz am.dist.ext.lzip = tar.lz -am.dist.ext.tarZ = tar.Z -am.dist.ext.shar = shar.gz am.dist.ext.zip = zip DIST_TARGETS = $(foreach x,$(am.dist.formats),dist-$x) @@ -344,14 +342,6 @@ dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__post_remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__post_remove_distdir) - dist-zip: distdir rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) |