38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
--- ant-contrib/build.xml
|
|
+++ ant-contrib/build.xml
|
|
@@ -388,12 +388,12 @@
|
|
<unzip src="${build.ant.dir}/${ant.src.file}"
|
|
dest="${build.ant.dir}">
|
|
<patternset>
|
|
- <include name="${ant.unzip.dir}/src/testcases/org/apache/tools/ant/BuildFileTest.java"/>
|
|
+ <include name="${ant.unzip.dir}/src/tests/junit/org/apache/tools/ant/BuildFileTest.java"/>
|
|
</patternset>
|
|
</unzip>
|
|
|
|
<mkdir dir="${testclasses}" />
|
|
- <javac srcdir="${build.ant.dir}/${ant.unzip.dir}/src/testcases"
|
|
+ <javac srcdir="${build.ant.dir}/${ant.unzip.dir}/src/tests/junit"
|
|
includes="org/apache/tools/ant/BuildFileTest.java"
|
|
destdir="${testclasses}" source="${javac.source}"
|
|
debug="${javac.debug}" target="${javac.target}" includeantruntime="yes">
|
|
@@ -409,7 +409,7 @@
|
|
<property name="build.ant.dir"
|
|
value="build/ant" />
|
|
<property name="ant.download.version"
|
|
- value="1.6.2" />
|
|
+ value="1.7.0" />
|
|
<property name="ant.src.file"
|
|
value="apache-ant-${ant.download.version}-src.zip" />
|
|
<property name="ant.unzip.dir"
|
|
--- ant-contrib/test/src/net/sf/antcontrib/BuildFileTestBase.java
|
|
+++ ant-contrib/test/src/net/sf/antcontrib/BuildFileTestBase.java
|
|
@@ -76,7 +76,7 @@
|
|
* @param filename name of project file to run
|
|
* @exception BuildException Description of the Exception
|
|
*/
|
|
- protected void configureProject( String filename ) throws BuildException {
|
|
+ public void configureProject( String filename ) throws BuildException {
|
|
// find the build file
|
|
File f = new File( filename );
|
|
if ( !f.exists() ) {
|