Author: phunt
Date: Wed Jul 16 11:38:39 2008
New Revision: 677371
URL: http://svn.apache.org/viewvc?rev=677371&view=rev
Log:
Moved the cobertura taskdef into the cobertura target - the regular targets
always work now and the cobertura targets will work if the coberbura jars are
available
Modified:
hadoop/zookeeper/trunk/build.xml
Modified: hadoop/zookeeper/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/build.xml?rev=677371&r1=677370&r2=677371&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/build.xml (original)
+++ hadoop/zookeeper/trunk/build.xml Wed Jul 16 11:38:39 2008
@@ -387,24 +387,24 @@
</target>
<!-- Code coverage -->
- <taskdef resource="tasks.properties">
+ <target name="cobertura-instrument" depends="compile-test">
+ <taskdef resource="tasks.properties">
<classpath>
- <pathelement path="${lib.dir}/cobertura/cobertura.jar" />
- <fileset dir="${lib.dir}/cobertura/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- </fileset>
+ <pathelement path="${lib.dir}/cobertura/cobertura.jar" />
+ <fileset dir="${lib.dir}/cobertura/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
</classpath>
- </taskdef>
+ </taskdef>
- <target name="cobertura-instrument" depends="compile-test">
- <cobertura-instrument todir="${build.dir}/cobertura">
- <fileset dir="${build.classes}">
- <include name="org/apache/zookeeper/**/*.class"/>
- </fileset>
- </cobertura-instrument>
+ <cobertura-instrument todir="${build.dir}/cobertura">
+ <fileset dir="${build.classes}">
+ <include name="org/apache/zookeeper/**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
</target>
<target name="cobertura-test" depends="test-init,cobertura-instrument">
