|
Igor Foox |
8afbc96 |
--- build.xml.old 2006-07-20 14:29:08.000000000 -0400
|
|
Igor Foox |
8afbc96 |
+++ build.xml 2006-07-20 14:29:35.000000000 -0400
|
|
Igor Foox |
8afbc96 |
@@ -53,6 +53,8 @@
|
|
Igor Foox |
8afbc96 |
<property name="contrib.jar" location="${lib}/${jar.name}"/>
|
|
Igor Foox |
8afbc96 |
<property name="jar.main.class" value="net.sf.antcontrib.AntContribVersion"/>
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
+ <property name="bcel.jar" value="http://www.ibiblio.org/maven/bcel/jars/bcel-5.1.jar" />
|
|
Igor Foox |
8afbc96 |
+
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
######################################################
|
|
Igor Foox |
8afbc96 |
### Build the class and jar file target directories
|
|
Igor Foox |
8afbc96 |
@@ -153,7 +155,7 @@
|
|
Igor Foox |
8afbc96 |
<manifest file="${lib}/MANIFEST.MF">
|
|
Igor Foox |
8afbc96 |
<attribute name="Built-By" value="Ant-contrib"/>
|
|
Igor Foox |
8afbc96 |
<attribute name="Main-Class" value="${jar.main.class}"/>
|
|
Igor Foox |
8afbc96 |
- <attribute name="Class-Path" value="${jar.name}"/>
|
|
Igor Foox |
8afbc96 |
+
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
<attribute name="Specification-Version" value="${spec.version}"/>
|
|
Igor Foox |
8afbc96 |
<attribute name="Specification-Vendor" value="${spec.vendor}"/-->
|
|
Igor Foox |
8afbc96 |
@@ -349,8 +351,8 @@
|
|
Igor Foox |
8afbc96 |
</classpath>
|
|
Igor Foox |
8afbc96 |
</junit>
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
- <fail message="JUnit error (${junit.error}) encountered." if="junit.error" />
|
|
Igor Foox |
8afbc96 |
- <fail message="JUnit failure (${junit.failure}) encountered." if="junit.failure" />
|
|
Igor Foox |
8afbc96 |
+
|
|
Igor Foox |
8afbc96 |
+
|
|
Igor Foox |
8afbc96 |
</target>
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
<target name="test-all" depends="compile-tests">
|
|
Igor Foox |
8afbc96 |
@@ -373,7 +375,7 @@
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
<target name="get-jar-deps">
|
|
Igor Foox |
8afbc96 |
<antcall target="get-dep-maybe">
|
|
Igor Foox |
8afbc96 |
- <param name="dep.src" value="http://www.ibiblio.org/maven/bcel/jars/bcel-5.1.jar" />
|
|
Igor Foox |
8afbc96 |
+ <param name="dep.src" value="${bcel.jar}" />
|
|
Igor Foox |
8afbc96 |
<param name="dep.dest" value="${runlib}/bcel-5.1.jar" />
|
|
Igor Foox |
8afbc96 |
</antcall>
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
@@ -384,12 +386,18 @@
|
|
Igor Foox |
8afbc96 |
</target>
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
<target name="build-ant-testutil" unless="ant.build.testutil.available">
|
|
Igor Foox |
8afbc96 |
-
|
|
Igor Foox |
8afbc96 |
- dest="${build.ant.dir}">
|
|
Igor Foox |
8afbc96 |
- <patternset>
|
|
Igor Foox |
8afbc96 |
- <include name="${ant.unzip.dir}/src/testcases/org/apache/tools/ant/BuildFileTest.java"/>
|
|
Igor Foox |
8afbc96 |
- </patternset>
|
|
Igor Foox |
8afbc96 |
- </unzip>
|
|
Igor Foox |
8afbc96 |
+
|
|
Igor Foox |
8afbc96 |
+ dest="${build.ant.dir}" />
|
|
Igor Foox |
8afbc96 |
+
|
|
Igor Foox |
8afbc96 |
+ <delete file="${build.ant.dir}/${ant.src.file}" />
|
|
Igor Foox |
8afbc96 |
+
|
|
Igor Foox |
8afbc96 |
+
|
|
Igor Foox |
8afbc96 |
+ dest="${build.ant.dir}" />
|
|
Igor Foox |
8afbc96 |
+
|
|
Igor Foox |
8afbc96 |
+ <delete file="${build.ant.dir}/${ant.src.tar.file}" />
|
|
Igor Foox |
8afbc96 |
+ <delete file="${build.ant.dir}/${ant.unzip.dir}/lib/xml-apis.jar" />
|
|
Igor Foox |
8afbc96 |
+ <delete file="${build.ant.dir}/${ant.unzip.dir}/lib/xercesImpl.jar" />
|
|
Igor Foox |
8afbc96 |
+
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
<mkdir dir="${testclasses}" />
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
@@ -408,9 +416,12 @@
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
value="build/ant" />
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
- value="1.6.2" />
|
|
Igor Foox |
8afbc96 |
+ value="1.6.5" />
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
- value="apache-ant-${ant.download.version}-src.zip" />
|
|
Igor Foox |
8afbc96 |
+ value="apache-ant-${ant.download.version}-src.tar.gz" />
|
|
Igor Foox |
8afbc96 |
+
|
|
Igor Foox |
8afbc96 |
+ value="apache-ant-${ant.download.version}-src.tar" />
|
|
Igor Foox |
8afbc96 |
+
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
value="apache-ant-${ant.download.version}" />
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
@@ -418,7 +429,7 @@
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
usetimestamp="true"
|
|
Igor Foox |
8afbc96 |
- src="http://archive.apache.org/dist/ant/source/${ant.src.file}">
|
|
Igor Foox |
8afbc96 |
+ src="file://${basedir}/../../../SOURCES/${ant.src.file}">
|
|
Igor Foox |
8afbc96 |
</get>
|
|
Igor Foox |
8afbc96 |
|
|
Igor Foox |
8afbc96 |
|