Browse Source

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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@677371 13f79535-47bb-0310-9956-ffa450edef68
Patrick D. Hunt 17 years ago
parent
commit
f1f13a3719
1 changed files with 15 additions and 15 deletions
  1. 15 15
      build.xml

+ 15 - 15
build.xml

@@ -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">