Detect if clover is present in build.xml. Automatically clean clover db in ant clean, if present

This commit is contained in:
Mark DePristo 2012-12-31 09:24:01 -05:00
parent 429567cd3f
commit 3d1c107f9d
1 changed files with 9 additions and 6 deletions

View File

@ -114,7 +114,6 @@
<property name="clover.instrument.level" value="method"/> <property name="clover.instrument.level" value="method"/>
<taskdef resource="cloverlib.xml" classpath="${clover.jar}"/> <taskdef resource="cloverlib.xml" classpath="${clover.jar}"/>
<!-- ******************************************************************************** --> <!-- ******************************************************************************** -->
<!-- Filesets and paths --> <!-- Filesets and paths -->
<!-- ******************************************************************************** --> <!-- ******************************************************************************** -->
@ -1031,6 +1030,14 @@
<delete dir="${scaladoc.dir}" /> <delete dir="${scaladoc.dir}" />
</target> </target>
<target name="-check.clover">
<available property="clover.installed" classname="com.cenqua.clover.CloverInstr" />
</target>
<target name="clean.clover" depends="-check.clover" if="clover.installed">
<clover-clean/>
</target>
<target name="clean.gsalib"> <target name="clean.gsalib">
<!-- Currently not cleaning out the lib during 'ant clean' --> <!-- Currently not cleaning out the lib during 'ant clean' -->
<exec executable="R" failonerror="false"> <exec executable="R" failonerror="false">
@ -1038,7 +1045,7 @@
</exec> </exec>
</target> </target>
<target name="clean" description="clean up" depends="clean.javadoc,clean.scaladoc,clean.gatkdocs"> <target name="clean" description="clean up" depends="clean.javadoc,clean.scaladoc,clean.gatkdocs,clean.clover">
<delete dir="${build.dir}"/> <delete dir="${build.dir}"/>
<delete dir="${lib.dir}"/> <delete dir="${lib.dir}"/>
<delete dir="${contract.dump.dir}"/> <delete dir="${contract.dump.dir}"/>
@ -1135,10 +1142,6 @@
<!-- Test targets --> <!-- Test targets -->
<target name="clover.clean">
<clover-clean/>
</target>
<target name="clover.report"> <target name="clover.report">
<clover-report coverageCacheSize="nocache"> <clover-report coverageCacheSize="nocache">
<current outfile="clover_html" title="GATK clover report" showUniqueCoverage="false" numThreads="4"> <current outfile="clover_html" title="GATK clover report" showUniqueCoverage="false" numThreads="4">