Author: ludovicc-guest Date: 2010-11-21 23:15:51 +0000 (Sun, 21 Nov 2010) New Revision: 13097
Modified: trunk/maven-ant-helper/debian/changelog trunk/maven-ant-helper/maven-build.xml Log: * add build-all target and optional javadoc generation Modified: trunk/maven-ant-helper/debian/changelog =================================================================== --- trunk/maven-ant-helper/debian/changelog 2010-11-21 21:24:03 UTC (rev 13096) +++ trunk/maven-ant-helper/debian/changelog 2010-11-21 23:15:51 UTC (rev 13097) @@ -1,3 +1,10 @@ +maven-ant-helper (7.0ubuntu1~ppa1) maverick; urgency=low + + * Add a default build-all target which can run the build and optionally + generate javadoc if generate.javadoc property is set + + -- Ludovic Claude <[email protected]> Mon, 22 Nov 2010 00:14:25 +0100 + maven-ant-helper (7.0) experimental; urgency=low * Update Standards-Version to 3.9.1, use source format 3.0 (native) Modified: trunk/maven-ant-helper/maven-build.xml =================================================================== --- trunk/maven-ant-helper/maven-build.xml 2010-11-21 21:24:03 UTC (rev 13096) +++ trunk/maven-ant-helper/maven-build.xml 2010-11-21 23:15:51 UTC (rev 13097) @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<project name="pkg-java" default="package" basedir="." xmlns:c="antlib:net.sf.antcontrib"> +<project name="pkg-java" default="build-all" basedir="." xmlns:c="antlib:net.sf.antcontrib"> <taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpath="/usr/share/java/ant-contrib.jar"/> @@ -38,6 +38,7 @@ Up to 15 dependencies can be defined here. Example use: dependency=libcommons-lang-java dependency2=libcommons-logging-java + javadoc.generate: if set, the default target (build-all) will build the project and generate the Javadoc If you provide a pom file to your project, or the project already contains a pom file, then it will be read. You need to add /usr/share/java/ant-nodeps.jar to the classpath @@ -147,7 +148,6 @@ </loadfile> <!-- default empty value --> <property name="cleaner.options" value=""/> - <echo message="Cleaner options: ${cleaner.options}" /> <mkdir dir="${debian.dir}/.mh" /> <delete> @@ -164,6 +164,7 @@ <c:var name="cleaner.options" value="${cleaner.options} --keep-parent-version" /> </then> </c:if> + <echo message="Cleaner options:${cleaner.options}" /> <java fork="true" dir="." classname="org.debian.maven.repo.POMCleaner"> @@ -399,6 +400,15 @@ <target name="package" depends="jar,mvn-package,restore-pom" /> <target name="package-and-local-install" depends="package,local-install" /> + <target name="build-all" depends="package"> + <c:if> + <isset property="generate.javadoc" /> + <then> + <antcall target="javadoc" /> + </then> + </c:if> + </target> + <!-- | Javadoc |--> _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
