diff -ru jna-3.4.2.orig/build.xml jna-3.4.2/build.xml --- jna-3.4.2.orig/build.xml 2012-09-06 06:55:52.000000000 -0400 +++ jna-3.4.2/build.xml 2012-09-24 15:49:59.000000000 -0400 @@ -230,7 +230,6 @@ <path id="test.runpath"> <pathelement path="${build}/${jar}"/> <pathelement path="${test.classes}"/> - <pathelement path="lib/clover.jar"/> <path refid="test.libs"/> </path> </target> @@ -536,12 +535,11 @@ <copy todir="${build}/jws" file="${build}/${jar}"/> <copy todir="${build}/jws" file="${build}/${testjar}"/> <copy todir="${build}/jws" file="lib/junit.jar"/> - <copy todir="${build}/jws" file="lib/clover.jar"/> <jar jarfile="${build}/jws/jnidispatch.jar"> <fileset dir="${build.native}" includes="*jnidispatch.*"/> </jar> <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true"> - <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/> + <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar"/> </signjar> </target> @@ -626,7 +624,7 @@ <report todir="${reports.junit}"/> </junitreport> <echo>View test report in file://${reports.junit}/index.html</echo> - <fail if="testfailure" unless="clover">One or more tests failed</fail> + <fail if="testfailure">One or more tests failed</fail> </target> <target name="contrib-test" depends="contrib-jars,compile-tests"> @@ -640,27 +638,6 @@ </subant> </target> - <target name="with.clover" description="Enable code coverage for tests"> - <taskdef resource="cloverlib.xml" classpath="lib/clover.jar"/> - <property name="clover" value="true"/> - <property name="build" value="build.clover"/> - <clover-setup/> - </target> - - <target name="clover" depends="with.clover,test" - description="Generate test code coverage reports"> - <property name="reports.clover" value="${reports}/clover"/> - <mkdir dir="${reports.clover}"/> - <clover-report> - <current outfile="${reports.clover}" title="clover"> - <fileset dir="." includes="**/*.java" /> - <testresults dir="${results.junit}" includes="TEST-*.xml"/> - <format type="html"/> - </current> - </clover-report> - <echo>Reports generated in ${reports.clover}</echo> - </target> - <target name="javadoc" depends="-setup"> <path id="javadoc.src.path"> <path refid="src.path"/> @@ -881,7 +858,7 @@ <!-- Full sources required to build and test everything --> <zip zipfile="${dist}/src-full.zip"> <zipfileset src="${dist}/src.zip"/> - <zipfileset dir="lib" includes="junit.jar,clover.jar" prefix="lib"/> + <zipfileset dir="lib" includes="junit.jar" prefix="lib"/> <zipfileset dir="." includes=".classpath,.project"/> <zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/> </zip>