--- bin/build.xml 2006-12-07 17:11:47.000000000 +0100 +++ bin/build.xml 2006-12-07 17:17:13.000000000 +0100 @@ -12,12 +12,7 @@ <path id="dependencies.path"> <pathelement location="${dir.build}" /> - <fileset dir="${dir.lib}"> - <include name="jaxen-1.1-beta-10.jar" /> - <include name="jakarta-oro-2.0.8.jar" /> - <include name="xercesImpl-2.6.2.jar" /> - <include name="xmlParserAPIs-2.6.2.jar" /> - </fileset> + <fileset dir="${dir.lib}" includes="*.jar"/> </path> <target name="delete" description="Deletes the build directory and the pmd-x.x jar file."> @@ -28,7 +23,7 @@ <target name="compile" description="Compiles the code"> <mkdir dir="${dir.build}" /> - <javac deprecation="false" debug="true" optimize="false" srcdir="${dir.src}:${dir.regress}" destdir="${dir.build}"> + <javac deprecation="false" debug="true" optimize="false" srcdir="${dir.src}" destdir="${dir.build}"> <classpath> <path refid="dependencies.path" /> </classpath> @@ -60,7 +55,6 @@ <jar jarfile="${dir.lib}\pmd-${version}.jar" includes="net/sourceforge/pmd/**/**,test/net/sourceforge/pmd/testframework/**/**,rulesets/**" basedir="${dir.build}"> <manifest> <attribute name="Main-Class" value="net.sourceforge.pmd.PMD" /> - <attribute name="Class-Path" value="jaxen-1.1-beta-10.jar jakarta-oro-2.0.8.jar" /> </manifest> </jar> </target> @@ -87,7 +81,16 @@ <fail unless="junit.available" message="Could find JUnit... please place a junit.jar file in the CLASSPATH." /> </target> - <target name="test" depends="requires-junit,compile,copy" description="Runs the unit tests"> + <target name="compile-tests" description="Compiles the test cases"> + <mkdir dir="${dir.build}" /> + <javac deprecation="false" debug="true" optimize="false" srcdir="${dir.regress}" destdir="${dir.build}"> + <classpath> + <path refid="dependencies.path" /> + </classpath> + </javac> + </target> + + <target name="test" depends="requires-junit,compile-tests,copy" description="Runs the unit tests"> <junit printsummary="yes" haltonfailure="no" forkmode="perBatch"> <classpath> <path refid="dependencies.path" />