summaryrefslogtreecommitdiff
blob: a0f0435686252544f6e0257dbe6b79379b131521 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
diff -Nur pmd-4.2.4/bin/build.xml pmd-4.2.4_patched/bin/build.xml
--- pmd-4.2.4/bin/build.xml	2008-08-31 15:32:20.000000000 +0300
+++ pmd-4.2.4_patched/bin/build.xml	2008-11-23 08:15:09.000000000 +0200
@@ -22,11 +22,7 @@
 
 	<path id="dependencies.path">
 		<pathelement location="${dir.build}" />
-		<fileset dir="${dir.lib}">
-			<include name="jaxen-${jaxen.version}.jar" />
-			<include name="asm-${asm.version}.jar" />
-			<include name="junit-${junit.version}.jar" />
-		</fileset>
+		<fileset dir="${dir.lib}" includes="*.jar"/>
 	</path>
 
 	<target name="delete" description="Deletes the build directory and the pmd-x.x jar file.">
@@ -76,7 +72,6 @@
 			<zipfileset dir="etc" includes="ruleset.dtd,ruleset_xml_schema.xsd" prefix="rulesets"/>
 			<manifest>
 				<attribute name="Main-Class" value="net.sourceforge.pmd.PMD" />
-				<attribute name="Class-Path" value="jaxen-${jaxen.version}.jar asm-${asm.version}.jar" />
 			</manifest>
 		</jar>
 
@@ -86,17 +81,6 @@
 			basedir="${dir.build}" />
 	</target>
 
-	<taskdef name="retroweaver" classname="net.sourceforge.retroweaver.ant.RetroWeaverTask">
-		<classpath>
-			<pathelement location="${dir.lib14}/retroweaver-${retroweaver.version}.jar"/>
-			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
-			<pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
-			<pathelement location="${dir.lib14}/asm-commons-${asm.version}.jar"/>
-			<pathelement location="${dir.lib14}/asm-util-${asm.version}.jar"/>
-			<pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
-		</classpath>
-	</taskdef>
-
 	<target name="weavejunit" depends="jar">
 		<path id="retroweaverclasspath">
 			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
@@ -211,7 +195,7 @@
 	<target name="test-execute" description="Runs the unit tests">
 		<delete dir="${test.outputdir}" />
 		<mkdir dir="${test.outputdir}/xml"/>
-		<junit printsummary="${test.printsummary}" showoutput="no" filtertrace="yes" haltonfailure="no" jvm="${test.jvm}" forkmode="perBatch"
+		<junit printsummary="${test.printsummary}" showoutput="no" filtertrace="yes" haltonfailure="yes" jvm="${test.jvm}" forkmode="perBatch"
 			failureProperty="test.failure" 
 		>
 			<sysproperty key="pmd.regress" value="${test.regression}"/>