From: Gary V. Vaughan <gary@gnu.org>
Date: Sun, 7 Sep 2008 08:17:37 +0000 (+0800)
Subject: Enable release procedure to work with lzma OLDRELEASE file.
X-Git-Tag: v2.2.7b~202
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35bd5f31765013e9e3f22a10874b2014cebc428e;p=thirdparty%2Flibtool.git

Enable release procedure to work with lzma OLDRELEASE file.
* Makefile.maint (diffs, prev-tarball, new-tarball): If lzma
tarballs are present use them to generate the diffs, otherwise
use gz tarballs if they are present, or else complain if both
are missing.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---

diff --git a/ChangeLog b/ChangeLog
index 23d9026c6..07b50743f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-09-07  Gary V. Vaughan  <gary@gnu.org>
 
+	Enable release procedure to work with lzma OLDRELEASE file.
+	* Makefile.maint (diffs, prev-tarball, new-tarball): If lzma
+	tarballs are present use them to generate the diffs, otherwise
+	use gz tarballs if they are present, or else complain if both
+	are missing.
+
 	Set SCM version number to 2.2.7a.
 	* configure.ac, libltdl/configure.ac (AC_INIT): Bump version
 	number to 2.2.7a.
diff --git a/Makefile.maint b/Makefile.maint
index 64f175739..02284dfbd 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -175,28 +175,38 @@ prev-tarball:
 		then echo "LASTRELEASE is not set"; exit 1; fi
 	@ofile="$(PACKAGE)-$(LASTRELEASE).tar.gz"; \
 	if test -f $$ofile; then :; \
-	else echo "Cannot make diffs without $$ofile"; exit 1; fi
+	else ofile="$(PACKAGE)-$(LASTRELEASE).tar.lzma"; \
+          if test -f $$ofile; then :; \
+          else echo "Cannot make diffs without $$ofile"; exit 1; fi; fi
 
 .PHONY: new-tarball
 new-tarball:
 ## Make sure we have the new release tarball in the tree.
 	@ofile="$(PACKAGE)-$(VERSION).tar.gz"; \
 	if test -f $$ofile; then :; \
-	else echo "Cannot make diffs without $$ofile"; exit 1; fi
+	else ofile="$(PACKAGE)-$(VERSION).tar.lzma"; \
+          if test -f $$ofile; then :; \
+          else echo "Cannot make diffs without $$ofile"; exit 1; fi; fi
 
 DIFF = diff
 DIFF_OPTIONS = -ruNp
 
-.PHONY: diff
+.PHONY: diffs
 diffs: prev-tarball new-tarball
 ## Unpack the tarballs somewhere to diff them
 	rm -rf delta-diff
 	mkdir delta-diff
 
+	cd delta-diff; \
 	ofile="../$(PACKAGE)-$(LASTRELEASE)-$(VERSION).diff.gz"; \
-	cd delta-diff \
-	&& tar xzf "../$(PACKAGE)-$(LASTRELEASE).tar.gz" \
-	&& tar xzf "../$(PACKAGE)-$(VERSION).tar.gz" \
+	otar="../$(PACKAGE)-$(LASTRELEASE).tar"; \
+	ntar="../$(PACKAGE)-$(VERSION).tar"; \
+	test -f "$$otar.gz" && otar="$$otar.gz" && ounpack="gzip"; \
+	test -f "$$ntar.gz" && ntar="$$ntar.gz" && nunpack="gzip"; \
+	test -f "$$otar.lzma" && otar="$$otar.lzma" && ounpack="lzma"; \
+	test -f "$$ntar.lzma" && ntar="$$ntar.lzma" && nunpack="zlma"; \
+	$$ounpack -c -d "$$otar" | tar xf - \
+	&& $$nunpack -c -d "$$ntar" | tar xf - \
 	&& $(DIFF) $(DIFF_OPTIONS) \
 		$(PACKAGE)-$(LASTRELEASE) $(PACKAGE)-$(VERSION) \
 		| GZIP=$(GZIP_ENV) gzip -c > $$ofile \