--- a/clover-ant.xml	Thu Apr 07 19:14:15 2011 -0400
+++ b/clover-ant.xml	Fri Apr 08 17:37:19 2011 -0400
@@ -6,8 +6,8 @@
     <description>Clover Ant tasks</description>
     
 
-    <target name="-check.clover">
-        <property           name="clover.jar.file" value="${user.home.ant.lib}/clover.jar}"/>
+    <target name="-check.clover" depends="init">
+        <property           name="clover.jar.file" value="${user.home.ant.lib}/clover.jar"/>
         <property           name="ssdt.clover.jar.src"
                             value="http://ivy.ssdt.nwoca.org/repository/clover/clover.jar"/>
         <property           name="clover.dest" value="${build.dir}/clover"/>
@@ -21,21 +21,27 @@
                 <available file="${clover.license}"/>
             </and>
         </condition>
+        <if>
+            <isset property="clover.installed"/>
+            <then><taskdef resource="cloverlib.xml"/></then>
+        </if>
     </target>
 
-    <target name="with.coverage" depends="init,-check.clover" if="clover.installed">
-        <taskdef resource="cloverlib.xml"/>
-    
+    <target name="with.coverage" depends="-check.clover" if="clover.installed">
+        
         <property name="coverage.run.with.clover" value="true"/>
         <clover-env/>
-        <clover-setup recordTestResults="false"/>
         <clover-clean/>
+        <clover-setup>
+            <fileset dir="${src.dir}"/>
+        </clover-setup>
         <mkdir dir="${build.dir}/.clover"/>
         <mkdir dir="${build.dir}/clover"/>
     </target>
 
-
-    <target name="coverage.xml" description="Generates an XML report to ${clover.dest}." if="coverage.run.with.clover">
+    <target name="coverage.xml" depends="-check.clover"
+        description="Generates an XML report to ${clover.dest}."
+        if="coverage.run.with.clover">
         <clover-report>
             <current outfile="${clover.dest}/clover.xml" title="${ivy.project.module}" span="${clover.span}">
                 <format type="xml"/>
@@ -47,6 +53,18 @@
         </clover-report>
     </target>
 
-
+    <target name="coverage.html" depends="-check.clover"
+            description="Generates an HTML report to ${clover.dest}."
+            if="coverage.run.with.clover">
+        <clover-report>
+            <current outfile="${clover.dest}" title="${ivy.project.module}" span="${clover.span}">
+                <format type="html"/>
+                <testresults dir="build/test/results" includes="TEST-*.xml"/>
+             <sourcepath>
+                <pathelement path="${src.dir}"/>
+              </sourcepath>
+            </current>
+        </clover-report>
+    </target>
 
 </project>