[tomcat8] 14/16: Merged the ANT_ARGS and ANT_INVOKE variables

[Emmanuel Bourg]

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

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

commit 318a5479da511bef4a2d5ed3074af8fc3ea03242
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 7 13:17:31 2015 +0200

    Merged the ANT_ARGS and ANT_INVOKE variables
---
 debian/changelog |  1 +
 debian/rules     | 20 +++++++-------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f57174..7c54a07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ tomcat8 (8.0.22-2) UNRELEASED; urgency=medium
       in build.properties.default
     - Renamed T_VER to VERSION
     - Removed the RWFILES and RWLOC variables
+    - Merged the ANT_ARGS and ANT_INVOKE variables
     - No longer remove the long gone .svn directories under
       /usr/share/tomcat8/webapps/default_root
     - Let dh_fixperms set the permissions instead of calling chmod +x
diff --git a/debian/rules b/debian/rules
index 27960b9..c050128 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,17 @@
 #!/usr/bin/make -f
 
 JAVA_HOME := /usr/lib/jvm/default-java
-BLDLIB := output/build/lib
 
-# Upstream version
-VERSION := $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*$$//' | sed 's/~/-/')
-
-# Add distribution.name as system property to grab it when showing version
-TOMCAT_DISTRIBUTION := "$(shell lsb_release -si)"
-
-ANT_ARGS := -Ddistribution.name=$(TOMCAT_DISTRIBUTION)
-
-ANT_INVOKE := ant $(ANT_ARGS) -propertyfile debian/ant.properties
+BLDLIB    := output/build/lib
+VERSION   := $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*$$//' | sed 's/~/-/')
+ANT       := ant -propertyfile debian/ant.properties \
+             -Ddistribution.name=$(shell lsb_release -si)
 
 %:
 	dh $@
 
 override_dh_auto_build:
-	$(ANT_INVOKE) deploy
+	$(ANT) deploy
 
 	# Build the Javadoc for the Servlet, JSP, EL and WebSocket APIs
 	$(JAVA_HOME)/bin/javadoc -subpackages "javax.servlet:javax.el:javax.websocket" -d "output/api" \
@@ -30,7 +24,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	mkdir -p webapps/examples/WEB-INF/lib
 	cp /usr/share/java/jstl1.1.jar webapps/examples/WEB-INF/lib/jstl.jar
 	cp /usr/share/java/standard.jar webapps/examples/WEB-INF/lib/standard.jar
-	$(ANT_INVOKE) test
+	$(ANT) test
 endif
 
 override_dh_install-indep:
@@ -56,7 +50,7 @@ override_dh_install-indep:
 
 override_dh_auto_clean:
 	dh_auto_clean
-	-$(ANT_INVOKE) clean
+	-$(ANT) clean
 	rm -rf "output/"
 	rm -rf webapps/examples/WEB-INF/lib/*.jar
 	rm -f modules/jdbc-pool/output/resources/MANIFEST.MF

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