summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Boldt2006-05-09 14:39:27 (EDT)
committerNick Boldt2006-05-09 14:39:27 (EDT)
commitb5a8710295232a34b055d3f8c7828486476ce2e0 (patch)
treea86d5f6790ff05fea79042e2ef956eeca994b266
parent18b3f26620885c363e62cb0db7a9cdb5315cc1f9 (diff)
downloadcdo-b5a8710295232a34b055d3f8c7828486476ce2e0.zip
cdo-b5a8710295232a34b055d3f8c7828486476ce2e0.tar.gz
cdo-b5a8710295232a34b055d3f8c7828486476ce2e0.tar.bz2
add more jdk1.5 stuff
-rw-r--r--plugins/org.eclipse.net4j.tests/test.xml21
1 files changed, 21 insertions, 0 deletions
diff --git a/plugins/org.eclipse.net4j.tests/test.xml b/plugins/org.eclipse.net4j.tests/test.xml
index f4361b3..194c5dd 100644
--- a/plugins/org.eclipse.net4j.tests/test.xml
+++ b/plugins/org.eclipse.net4j.tests/test.xml
@@ -39,16 +39,37 @@
<!-- This target defines the tests that need to be run. -->
<target name="suite">
+ <echo message="Set javacSource and javacTarget = 1.5"/>
+ <property name="javacSource" value="1.5" />
+ <property name="javacTarget" value="1.5" />
+
+ <path id="bc">
+ <fileset dir="${java.home}/lib">
+ <include name="*.jar" />
+ </fileset>
+ </path>
+ <property name="bootclasspath" refid="bc" />
+
+ <!-- new 060508 to make build work when using JDK1.5 source/target -->
+ <echo message="Set J2SE-1.5 = ${bootclasspath}"/>
+ <property name="J2SE-1.5" value="${bootclasspath}"/>
+ <condition property="bundleBootClasspath" value="${J2SE-1.5}"><isset property="J2SE-1.5"/></condition>
+ <condition property="bundleJavacSource" value="1.5"><isset property="J2SE-1.5"/></condition>
+ <condition property="bundleJavacTarget" value="1.5"><isset property="J2SE-1.5"/></condition>
<property name="emft-folder" value="${eclipse-home}/emf_folder"/>
<delete dir="${emft-folder}" quiet="true"/>
+ <property name="core.test.vmargs" value="-DJ2SE-1.5=${bootclasspath} -Djava15-home=${java.home}"/>
+
<echo message="About to run core-test from ${library-file} in ${eclipse-home}"/>
<echo message="data-dir = ${emft-folder}"/>
<echo message="plugin-name = ${plugin-name}"/>
<echo message="classname = org.eclipse.net4j.tests.AllSuites"/>
+ <echo message="vmargs = ${core.test.vmargs}"/>
<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}" >
<property name="data-dir" value="${emft-folder}"/>
<property name="plugin-name" value="${plugin-name}"/>
<property name="classname" value="org.eclipse.net4j.tests.AllSuites"/>
+ <property name="vmargs" value="${core.test.vmargs}"/>
</ant>
</target>