vmassol 2002/06/16 08:43:47
Modified: src/templates/build/plugins/clover build.xml
Log:
make it work under both Ant 1.4.1 and Ant 1.5 or greater
Revision Changes Path
1.2 +33 -20
jakarta-turbine-maven/src/templates/build/plugins/clover/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/clover/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 16 Jun 2002 13:21:16 -0000 1.1
+++ build.xml 16 Jun 2002 15:43:47 -0000 1.2
@@ -13,34 +13,34 @@
<pathelement location="${lib.repo}/maven.jar"/>
</classpath>
</taskdef>
-
+
<create-classpath
listFile="${maven.home}/plugins/core/jars.list"
reference="pre-maven-classpath"
baseDir="${lib.repo}"
/>
-
+
<path id="maven-classpath">
<path refid="pre-maven-classpath"/>
<pathelement location="${lib.repo}/maven.jar"/>
</path>
-
+
<!-- define maven taskdefs, as taskdefs are not yet inheritable? -->
<taskdef resource="maven-taskdefs.properties">
<classpath refid="maven-classpath" />
</taskdef>
<property name="maven.init" value="true" />
-
+
<!-- call common build file initialization to verify project, update jars
load project and default properties etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
- target="verify-project"
- inheritAll="true"
- inheritRefs="true"
+ target="verify-project"
+ inheritAll="true"
+ inheritRefs="true"
exportAll="true"
exportRefs="true"/>
-
+
</target>
<!-- ================================================================== -->
@@ -66,11 +66,11 @@
</target>
<!-- =================================================================== -->
- <!-- C L O V E R C O M P I L E -->
+ <!-- Prepare for clover -->
<!-- =================================================================== -->
<target
- name="clover-compile"
+ name="clover-prepare"
depends="local-init">
<!-- Must prepare the sources first -->
@@ -79,15 +79,35 @@
inheritAll="true"
inheritRefs="true"
exportAll="true"
- exportRefs="true"/>
+ exportRefs="true">
+ </maven-ant>
+
+ <maven-ant antfile="${maven.home}/plugins/test/build.xml"
+ target="compile"
+ inheritAll="true"
+ inheritRefs="true"
+ exportAll="true"
+ exportRefs="true">
+ </maven-ant>
+
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Compile with Clover to instrument source code -->
+ <!-- =================================================================== -->
+ <target
+ name="clover-compile"
+ depends="clover-prepare">
+
+ <property name="build.compiler"
+ value="org.apache.tools.ant.taskdefs.CloverCompilerAdapter"/>
<javac
destdir="${maven.build.clover.classes}"
excludes="**/package.html"
debug="${maven.compile.debug}"
deprecation="${maven.compile.deprecation}"
- optimize="${maven.compile.optimize}"
- compiler="org.apache.tools.ant.taskdefs.CloverCompilerAdapter">
+ optimize="${maven.compile.optimize}">
<src>
<path refid="maven.compile.src.set"/>
</src>
@@ -107,13 +127,6 @@
name="clover-test"
depends="clover-compile"
if="maven.unitTestSourceDirectory">
-
- <maven-ant antfile="${maven.home}/plugins/test/build.xml"
- target="compile"
- inheritAll="true"
- inheritRefs="true"
- exportAll="true"
- exportRefs="true"/>
<junit printSummary="yes" failureProperty="maven.test.failure"
fork="${maven.junit.fork}" dir="${maven.junit.dir}">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
