ant/java150_build.patch

81 lines
3.4 KiB
Diff

Index: apache-ant-1.6.5/src/etc/testcases/core/loaderref/loaderref.xml
===================================================================
--- apache-ant-1.6.5.orig/src/etc/testcases/core/loaderref/loaderref.xml
+++ apache-ant-1.6.5/src/etc/testcases/core/loaderref/loaderref.xml
@@ -17,7 +17,7 @@ This build file is intended to be used f
<target name="compile">
<mkdir dir="${classes.dir}"/>
- <javac srcdir="${src.dir}" destdir="${classes.dir}"/>
+ <javac source="1.4" target="1.4" srcdir="${src.dir}" destdir="${classes.dir}"/>
</target>
<target name="testbadref" depends="compile" >
Index: apache-ant-1.6.5/src/etc/testcases/core/taskcontainer.xml
===================================================================
--- apache-ant-1.6.5.orig/src/etc/testcases/core/taskcontainer.xml
+++ apache-ant-1.6.5/src/etc/testcases/core/taskcontainer.xml
@@ -17,7 +17,7 @@
<target name="testTaskdef">
<mkdir dir="${build.dir}"/>
- <javac srcdir="containersrc" destdir="${build.dir}" debug="on"/>
+ <javac source="1.4" target="1.4" srcdir="containersrc" destdir="${build.dir}" debug="on"/>
<sequential>
<taskdef name="sseq" classpath="${build.dir}" classname="test.SpecialSeq"/>
@@ -45,4 +45,4 @@
<delete dir="${build.dir}"/>
</target>
-</project>
\ No newline at end of file
+</project>
Index: apache-ant-1.6.5/src/etc/testcases/taskdefs/available.xml
===================================================================
--- apache-ant-1.6.5.orig/src/etc/testcases/taskdefs/available.xml
+++ apache-ant-1.6.5/src/etc/testcases/taskdefs/available.xml
@@ -135,7 +135,7 @@
<!-- create a dummy file and look for it -->
<mkdir dir="${user.dir}/test"/>
<echo message="package test;public class test {}" file="${user.dir}/test/test.java"/>
- <javac srcdir="${user.dir}" includes="test/test.java"/>
+ <javac source="1.4" target="1.4" srcdir="${user.dir}" includes="test/test.java"/>
<jar destfile="${user.dir}/test.jar" basedir="${user.dir}" includes="test/test.class"/>
<available property="test"
classname="test.test" classpath="${user.dir}/test.jar"/>
Index: apache-ant-1.6.5/src/etc/testcases/taskdefs/optional/depend/depend.xml
===================================================================
--- apache-ant-1.6.5.orig/src/etc/testcases/taskdefs/optional/depend/depend.xml
+++ apache-ant-1.6.5/src/etc/testcases/taskdefs/optional/depend/depend.xml
@@ -50,7 +50,7 @@
<target name="compile">
<mkdir dir="${classes.dir}"/>
- <javac srcdir="${tempsrc.dir}" destdir="${classes.dir}"/>
+ <javac source="1.4" target="1.4" srcdir="${tempsrc.dir}" destdir="${classes.dir}"/>
</target>
<target name="clean">
@@ -135,7 +135,7 @@
<pathelement location="${classes.dir}"/>
</path>
- <javac srcdir="${tempsrc.dir}" destdir="${classes.dir}"
+ <javac source="1.4" target="1.4" srcdir="${tempsrc.dir}" destdir="${classes.dir}"
classpathref="path.compile"/>
<sleep seconds="3"/>
Index: apache-ant-1.6.5/src/etc/testcases/types/assertions.xml
===================================================================
--- apache-ant-1.6.5.orig/src/etc/testcases/types/assertions.xml
+++ apache-ant-1.6.5/src/etc/testcases/types/assertions.xml
@@ -14,6 +14,7 @@
<mkdir dir="${build.dir}"/>
<javac srcdir="${src.dir}"
includes="*.java"
+ targte="1.4"
source="1.4"
debug="true"
destdir="${build.dir}"