Blob Blame History Raw
--- nekohtml-1.9.14/build.xml.orig	2010-07-19 13:56:56.190200850 -0400
+++ nekohtml-1.9.14/build.xml	2010-07-19 14:06:07.908202000 -0400
@@ -48,7 +48,7 @@
  <property name='xerces.javadoc' value='http://xml.apache.org/xerces2-j/javadocs/xerces2/'/>
 
  <!-- DEPENDENCIES -->
- <available property='bcel.available' file='${lib.dir}/bcel-5.2.jar' />
+ <available property='bcel.available' file='${lib.dir}/bcel.jar' />
 
  <property name="xerces.version" value="2.9.1"/>
 
@@ -77,7 +77,7 @@
 			source='${compile.source}' target='${compile.target}'
 			includeAntRuntime='false'>
 			<classpath>
-				<fileset dir='${lib.dir}/xerces-@{xercesVersion}' includes='*.jar' />
+				<fileset dir='${lib.dir}' includes='xerces-j2.jar' />
 			</classpath>
 			<src path='${src.dir}' />
 			<src path='${build.src.dir}' />
@@ -88,7 +88,7 @@
 			source='${compile.source}' target='${compile.target}'
 			includeAntRuntime='false'>
 			<classpath>
-				<fileset dir='${lib.dir}/xerces-@{xercesVersion}' includes='*.jar' />
+				<fileset dir='${lib.dir}' includes='xerces-j2.jar' />
 			</classpath>
 			<src path='${src.dir}' />
 			<src path='${build.src.dir}' />
@@ -102,11 +102,13 @@
 		unless="compile.skip">
 	<mkdir dir="${build.classes.dir}"/>
 	
+	<!--
 	<compileWith xercesVersion="2.0.2" bridge="2_0"/>
 	<compileWith xercesVersion="2.1.0" bridge="2_1"/>
 	<compileWith xercesVersion="2.2.1" bridge="2_2"/>
 	<compileWith xercesVersion="2.3.0" bridge="2_3"/>
 	<compileWith xercesVersion="2.8.1" bridge="2_3"/>
+	-->
 	<compileWith xercesVersion="2.9.1" bridge="2_3"/>
 
 	<copy todir="${build.classes.dir}">
@@ -229,7 +231,7 @@
  	<java classname='org.apache.tools.ant.Main'>
  		<classpath>
  			<pathelement path='${java.class.path}' />
- 			<pathelement location='${lib.dir}/bcel-5.2.jar' />
+ 			<pathelement location='${lib.dir}/bcel.jar' />
  		</classpath>
  		<arg value='x-minimal' />
  	</java>
@@ -270,7 +272,7 @@
 	  		 source='${compile.source}' target='${compile.target}'
 	  		 includeAntRuntime='true'>
 	  	<classpath>
-	  		<fileset dir='${lib.dir}' includes='xml-apis.jar,xerces*.jar, junit*.jar' />
+	  		<fileset dir='${lib.dir}' includes='xml-commons-apis.jar,xerces-j2.jar,junit.jar' />
 		    <pathelement location='${build.classes.dir}' />
 	  	</classpath>
 	    <src path='${src.test.dir}' />
@@ -291,8 +293,8 @@
 				<classpath>
 				    <pathelement path='${build.test-classes.dir}'/>
 				    <pathelement location='${build.classes.dir}' />
-			  		<fileset dir='${lib.dir}' includes='junit*.jar' />
-		  	  		<fileset dir='${lib.dir}/xerces-@{xercesVersion}' includes='*.jar' />
+			  		<fileset dir='${lib.dir}' includes='junit.jar' />
+		  	  		<fileset dir='${lib.dir}' includes='xerces-j2.jar' />
 				</classpath>
 	
 				<formatter type="xml"/>
@@ -311,10 +313,12 @@
 		<mkdir dir="${build.dir}/junit"/>
 
 		<testWith xercesVersion="2.9.1"/>
+		<!--
 		<testWith xercesVersion="2.8.1"/>
 		<testWith xercesVersion="2.3.0"/>
 		<testWith xercesVersion="2.2.1"/>
 		<testWith xercesVersion="minimal"/>
+		-->
 		<!--
 		<testWith xercesVersion="2.1.0"/>
 		<testWith xercesVersion="2.0.2"/>
@@ -351,7 +355,7 @@
 		    <fileset dir='${build.src.dir}' />
 		</jar>
 
-		<path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.0.8.jar" />
+		<path id="maven-ant-tasks.classpath" path="${lib.dir}/maven-ant-tasks.jar" />
 		<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
 			classpathref="maven-ant-tasks.classpath" />
 		<artifact:pom id="maven.project" file="pom.xml" />