[ecj] 70/145: debian/rules: Renamed the get-source target to get-orig-source and completed the script to build the upstream tarball Use XZ compression for the upstream tarball

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ecj.

commit bd9d2fcf236f44ef3d1b3bebf8011841af4dfb77
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 26 13:18:59 2014 +0200

    debian/rules: Renamed the get-source target to get-orig-source and completed the script to build the upstream tarball
    Use XZ compression for the upstream tarball
---
 debian/changelog |  3 +++
 debian/rules     | 65 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f243448..025832a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ ecj (3.9.0-3) UNRELEASED; urgency=medium
   * Call 'set -e' in the body of the ecj maintainer scripts
   * Fixed a typo in the ecj manpages
   * Added a watch file
+  * debian/rules: Renamed the get-source target to get-orig-source
+    and completed the script to build the upstream tarball.
+  * Use XZ compression for the upstream tarball
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 26 Jun 2014 01:40:40 +0200
 
diff --git a/debian/rules b/debian/rules
index 8dd0277..d7a9334 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+VERSION       := $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*//')
+
 GCC_VERSION   := $(shell ls -l /usr/bin/gcj | sed 's/.*-> gcj-\(.*\)/\1/')
 GCC_VERSION   := 4.9
 
@@ -226,10 +228,8 @@ clean::
 	rm -f debian/*.pyc ecj1
 	rm -rf debian/.mh
 
-RR=../cvs/R3_5_maintenance/
-RR=../cvs/R3_5_1/
-RR=R4_3_1/
-tag = R4_3_1
+TAG = R4_3_1
+DIR = ecj-$(DEB_UPSTREAM_VERSION)
 
 MAVEN_REPO  := http://repo1.maven.org/maven2
 PACKAGE := ecj
@@ -239,31 +239,36 @@ get-orig-pom:
 	wget  -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \
         $(MAVEN_REPO)/org/eclipse/jdt/core/compiler/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
 
-get-source:
-	rm -rf org.eclipse.jdt.core
-	#wget http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/snapshot/R4_3_1.tar.gz
-	#git clone -b R3_8_maintenance git://git.eclipse.org/gitroot/jdt/eclipse.jdt.core.git
-	tar xf ../R4_3_1.tar.gz
-	rm -rf tmp-src
-	mkdir -p tmp-src/org.eclipse.jdt.core
-	cp -p $(RR)org.eclipse.jdt.core/scripts/about.html \
-		tmp-src/org.eclipse.jdt.core/
-	cp -p $(RR)org.eclipse.jdt.core/scripts/build.xml \
-		tmp-src/org.eclipse.jdt.core/
-	tar -c -f - -C $(RR)org.eclipse.jdt.core/compiler org \
-	    | tar -x -f - -C tmp-src/org.eclipse.jdt.core/
-
-	tar -c -f - -C $(RR)org.eclipse.jdt.core/antadapter org META-INF \
-	    | tar -x -f - -C tmp-src/org.eclipse.jdt.core/
-	find tmp-src -name CheckDebugAttributes.java | xargs -r rm -f
-	find tmp-src -name BuildJarIndex.java | xargs -r rm -f
-
-	tar -c -f - -C $(RR)org.eclipse.jdt.core/batch org \
-	    | tar -x -f - -C tmp-src/org.eclipse.jdt.core/
-
-	mkdir -p tmp-src/org.eclipse.jdt.core/META-INF/services
-#	cp -p $(RR)org.eclipse.jdt.core/scripts/META-INF/MANIFEST.MF \
-#	    tmp-src/org.eclipse.jdt.core/META-INF/
+get-orig-source:
+	rm -rf $(DIR) $(TAG).tar.gz $(TAG)
+	wget http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/snapshot/$(TAG).tar.gz
+	tar xf $(TAG).tar.gz
+	mkdir -p $(DIR)/src/org.eclipse.jdt.core
+	cp -p $(TAG)/org.eclipse.jdt.core/scripts/about.html \
+		$(DIR)/src/org.eclipse.jdt.core/
+	cp -p $(TAG)/org.eclipse.jdt.core/scripts/build.xml \
+		$(DIR)/src/org.eclipse.jdt.core/
+
+	tar -c -f - -C $(TAG)/org.eclipse.jdt.core/compiler org \
+	    | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/
+
+	tar -c -f - -C $(TAG)/org.eclipse.jdt.core/antadapter org META-INF \
+	    | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/
+
+	find $(DIR) -name CheckDebugAttributes.java | xargs -r rm -f
+	find $(DIR) -name BuildJarIndex.java | xargs -r rm -f
+
+	tar -c -f - -C $(TAG)/org.eclipse.jdt.core/batch org \
+	    | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/
+
+	mkdir -p $(DIR)/src/org.eclipse.jdt.core/META-INF/services
+#	cp -p $(TAG)/org.eclipse.jdt.core/scripts/META-INF/MANIFEST.MF \
+#	    $(DIR)/src/org.eclipse.jdt.core/META-INF/
 	printf 'org.eclipse.jdt.internal.compiler.tool.EclipseCompiler #Eclipse compiler' \
-	    > tmp-src/org.eclipse.jdt.core/META-INF/services/javax.tools.JavaCompiler
+	    > $(DIR)/src/org.eclipse.jdt.core/META-INF/services/javax.tools.JavaCompiler
+
+	# Create the upstream tarball
+	tar -c -J -f ../ecj_$(VERSION).orig.tar.xz $(DIR)
 
+	# Remove the temporary files
+	rm -rf $(DIR) $(TAG).tar.gz $(TAG)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ecj.git