Add clover

git-svn-id: http://svn.dmdirc.com/trunk@3243 00569f92-eb28-0410-84fd-f71c24880f

build.xml

@@ -4,8 +4,10 @@
 <!-- (If you delete it and reopen the project it will be recreated.) -->
 <project name="DMDirc" default="default" basedir=".">
     <description>Builds, tests, and runs the project DMDirc.</description>
-		<import file="nbproject/build-impl.xml"/>
-		<import file="BuildPlugins.xml"/>
+
+    <import file="nbproject/build-impl.xml"/>
+    <import file="BuildPlugins.xml"/>
+
     <!--
 
     There exist several targets which are by default empty and which can be 

junitreport.xml

@@ -5,33 +5,35 @@
 <project name="DMDirc" default="default" basedir=".">
     <taskdef resource="clovertasks"/>
     <description>Builds, tests, and runs the project DMDirc.</description>
+
+    <property name="clover.jar" location="/home/dmdirc/clover/clover/lib/clover.jar"/>
+    <taskdef resource="cloverlib.xml" classpath="${clover.jar}"/>
+    <available property="clover.installed" classname="com.cenqua.clover.CloverInstr" />
+
+    <target name="with.clover" depends="clean" if="clover.installed">
+        <clover-setup>
+            <fileset dir="src/com/dmdirc/" includes="**/*.java"/>
+        </clover-setup>
+    </target>
+
+    <target name="clover.html" if="clover.installed">
+        <mkdir dir="reports/clover" />
+        <mkdir dir="reports/clover/history" />
+        <clover-html-report outdir="reports/clover" historydir="reports/clover/history" title="DMDirc"/>
+    </target>
+
     <import file="nbproject/build-impl.xml"/>
     <property file="nbproject/project.properties"/>
     <property name="test.reports" value="./junitreports" />
-<!--    <target name="with.clover">
-       <clover-setup initString="mycoverage.db" source="1.5"/>
-    </target>
-   <target name="test-html" depends="with.clover,compile-test,test">
-       <classpath>
-           <pathelement path="${ant.home}/lib/clover.jar"/>
-       </classpath>
-   </target>
-    <target name="clover.html" depends="with.clover">
-        <clover-report>
-            <current outfile="clover_html">
-                <format type="html"/>
-            </current>
-        </clover-report>
-    </target> -->
-   <target name="test-html" depends="compile-test,test"/>
+
+		
+   <target name="test-html" depends="compile-test,test,clover.html"/>
    <target name="-post-test-run">
-<!--   <target name="test-html" depends="compile-test,test"> -->
       <junitreport todir="${test.reports}">
         <fileset dir="${build.test.results.dir}">
           <include name="TEST-*.xml" />
         </fileset>
         <report todir="${test.reports}" />
       </junitreport>
-<!--      <fail if="tests.failed">Some tests failed; see details above.</fail> -->
     </target>
 </project>

nbproject/build-impl.xml

@@ -194,6 +194,9 @@ is divided into following sections:
             <attribute default="**" name="testincludes"/>
             <sequential>
                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
+                    <classpath>
+                        <pathelement path="${clover.jar}"/>
+                    </classpath>
                     <batchtest todir="${build.test.results.dir}">
                         <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>