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