From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 1 Jan 2012 12:23:19 +0000 (+0100)
Subject: dist: remove support for lzma (superseded by xz and lzip)
X-Git-Tag: ng-0.5a~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02e90723551e707d77fb972aa47b4bc3f0fb0029;p=thirdparty%2Fautomake.git

dist: remove support for lzma (superseded by xz and lzip)

See also commit `v1.11-611-ge637fa2' (from maint), where support
for lzma compression of distribution archive had been deprecated.

* NEWS: Update.
* lib/Automake/Options.pm: Error out if the `dist-lzma' option
is used.
* lib/am/distdir.am: Remove all support for the creation of a
lzma-compressed distribution archive.
* tests/lzma.test: Update.
---

diff --git a/NEWS b/NEWS
index a64847df9..6f6051b41 100644
--- a/NEWS
+++ b/NEWS
@@ -4,10 +4,6 @@ New in 1.11a:
 
   - automake now generates silenced rules for texinfo outputs.
 
-  - The `lzma' compression format for distribution archives has been
-    deprecated in favor of `xz' and `lzip', and will be removed in the
-    next major Automake release (1.12).
-
   - The deprecated options `--output-dir', `--Werror' and `--Wno-error'
     have been removed.
 
@@ -109,6 +105,9 @@ New in 1.11a:
 
   - "make dist" can now create lzip-compressed tarballs.
 
+  - The deprecated `lzma' compression format for distribution archives
+    has been removed, in favor of `xz' and `lzip'.
+
   - In the Automake info documentation, the Top node and the nodes about
     the invocation of the automake and aclocal programs have been renamed;
     now, calling "info automake" will open the Top node, while calling
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 34c026c28..75a739253 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -274,11 +274,8 @@ sub _process_option_list (\%@)
 	}
       elsif ($_ eq 'dist-lzma')
         {
-          # Creation of distribution tarball compressed with lzma is
-          # deprecated, will be removed in the next major release.
-          msg 'obsolete', $where,
-              "lzma compression is deprecated; use `dist-xz' " .
-              "or `dist-lzip' instead\n";
+          error ($where, "support for lzma-compressed distribution " .
+                         "archives has been removed");
         }
       elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo'
 	     || $_ eq 'dist-shar' || $_ eq 'dist-zip'
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 2697efc3f..d8c1a894c 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -355,12 +355,6 @@ dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__remove_distdir)
 
-?LZMA?DIST_ARCHIVES += $(distdir).tar.lzma
-.PHONY: dist-lzma
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__post_remove_distdir)
-
 ?XZ?DIST_ARCHIVES += $(distdir).tar.xz
 .PHONY: dist-xz
 dist-xz: distdir
@@ -386,7 +380,6 @@ dist-zip: distdir
 	zip -rq $(distdir).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
@@ -440,8 +433,6 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  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*) \
diff --git a/tests/lzma.test b/tests/lzma.test
index 6c42ae9c9..28b419885 100755
--- a/tests/lzma.test
+++ b/tests/lzma.test
@@ -18,11 +18,11 @@
 
 . ./defs || Exit 1
 
-errmsg='lzma.*deprecated.*dist-xz.*dist-lzip.*instead'
+errmsg='support for lzma.*removed'
 
 echo AUTOMAKE_OPTIONS = dist-lzma > Makefile.am
 $ACLOCAL --force
-AUTOMAKE_fails -Wnone -Wobsolete
+AUTOMAKE_fails -Wnone -Wno-error
 grep "^Makefile\\.am:1:.*$errmsg" stderr
 
 cat > configure.in << 'END'
@@ -31,23 +31,10 @@ AM_INIT_AUTOMAKE([no-dist-gzip dist-lzma])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 END
-
-cat > Makefile.am << 'END'
-test: distcheck
-	test $(DIST_ARCHIVES) = lzma-1.0.tar.lzma
-	test -f $(DIST_ARCHIVES)
-END
+: > Makefile.am
 
 $ACLOCAL --force
-AUTOMAKE_fails
+AUTOMAKE_fails -Wnone -Wno-error
 grep "^configure\\.in:2:.*$errmsg" stderr
 
-$AUTOMAKE -Wno-obsolete
-
-lzma --version || skip_ "lzma compressor required for the rest of the test"
-
-$AUTOCONF
-./configure
-$MAKE test
-
 :