[jtreg] 04/04: Fetch the version and the build number provided to the Ant script from the version of the package

[Emmanuel Bourg]

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

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

commit b1aae26d6518c45a9cd53076241d8a939ca8c92e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 4 16:37:52 2014 +0200

    Fetch the version and the build number provided to the Ant script from the version of the package
---
 debian/changelog | 2 ++
 debian/rules     | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 040990e..e1cb47b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ jtreg (4.1-b09-1) UNRELEASED; urgency=medium
     - Refreshed the patches
   * Moved the package to Git
   * Dropped the JTREG_HOME variable from the launcher scripts
+  * debian/rules: Fetch the version and the build number provided
+    to the Ant script from the version of the package
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 17 Jun 2014 16:16:28 +0200
 
diff --git a/debian/rules b/debian/rules
index ad1c23d..08e7ff5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,9 @@
 
 JAVA_HOME = /usr/lib/jvm/default-java
 
+VERSION      := $(shell dpkg-parsechangelog --show-field Version | sed 's/-.*//')
+BUILD_NUMBER := $(shell dpkg-parsechangelog --show-field Version | sed 's/.*-\(b[0-9]*\).*/\1/')
+
 override_dh_auto_build:
 	ant -f make/build.xml \
 	    -Dant.jar=/usr/share/java/ant.jar \
@@ -11,9 +14,9 @@ override_dh_auto_build:
 	    -Djunit.jar=/usr/share/java/junit4.jar \
 	    -Dtestng.jar=/usr/share/java/testng.jar \
 	    -Djavatest.jar=/usr/share/java/javatest.jar \
-	    -Dbuild.version=4.1 \
+	    -Dbuild.version=$(VERSION) \
 	    -Dbuild.milestone=src \
-	    -Dbuild.number=b08
+	    -Dbuild.number=$(BUILD_NUMBER)
 	dh_auto_build
 
 	# Generate the manpages

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