This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 6585d226c9b09cd6ab7884bd18a85b16489f4335 Author: Emmanuel Bourg <[email protected]> Date: Thu May 7 11:07:21 2015 +0200 Call ant test in override_dh_auto_test --- debian/rules | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/debian/rules b/debian/rules index 778ab1f..7ac23e4 100755 --- a/debian/rules +++ b/debian/rules @@ -32,19 +32,22 @@ ANT_INVOKE := ant $(ANT_ARGS) -propertyfile debian/ant.properties dh $@ override_dh_auto_build: -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) deploy test -else $(ANT_INVOKE) deploy -endif + + # 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" \ -sourcepath "java" -author -version -breakiterator -notimestamp \ -windowtitle "Tomcat API Documentation" -doctitle "Tomcat API" \ -bottom "Copyright © 2000-2014 The Apache Software Foundation. All Rights Reserved." +override_dh_auto_test: +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 +endif + override_dh_auto_clean: dh_auto_clean -$(ANT_INVOKE) clean -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
