[tomcat7] 12/13: 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 tomcat7.

commit dc8b76e808b2ef5e1dd32e679479ad4fa6452451
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 27 10:49:36 2015 +0200

    Merged the ANT_ARGS and ANT_INVOKE variables
---
 debian/changelog |  1 +
 debian/rules     | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71a251b..a73fee8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ tomcat7 (7.0.61-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 e11d5b9..42c7bd8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,20 @@
 #!/usr/bin/make -f
 
 export JAVA_HOME := /usr/lib/jvm/default-java
-BLDLIB := output/build/lib
-BLDBIN := output/build/bin
 
-VERSION := $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*$$//' | sed 's/~/-/')
-T_JARS := tomcat-i18n-fr tomcat-i18n-es tomcat-i18n-ja catalina-ant
+BLDLIB    := output/build/lib
+BLDBIN    := output/build/bin
+VERSION   := $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*$$//' | sed 's/~/-/')
+T_JARS    := tomcat-i18n-fr tomcat-i18n-es tomcat-i18n-ja catalina-ant
 T_MAVENIZED_JARS := jasper-el annotations-api jasper catalina-ha catalina
-
-# Add distribution.name as system property to grab it when showing version
-TOMCAT7_DISTRIBUTION := "$(shell lsb_release -si)"
-
-ANT_ARGS := -Ddistribution.name=$(TOMCAT7_DISTRIBUTION)
-
-ANT_INVOKE := ant $(ANT_ARGS) -propertyfile debian/ant.properties
+ANT       := ant -propertyfile debian/ant.properties \
+             -Ddistribution.name=$(shell lsb_release -si)
 
 %:
 	dh $@
 
 override_dh_auto_build:
-	$(ANT_INVOKE) extras-jmx-remote deploy
+	$(ANT) extras-jmx-remote deploy
 
 	# Build the Javadoc for the Servlet, JSP, EL and WebSocket APIs
 	javadoc -subpackages "javax.servlet" -d "output/api" \
@@ -32,7 +27,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:
@@ -127,7 +122,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/tomcat7.git