Commit 287b56a6 authored by Lubomir Bulej's avatar Lubomir Bulej

build.properties: define Java version targets for bypass and client code to...

build.properties: define Java version targets for bypass and client code to enable testing on Java 8
build.xml: force specific Java versions for bypass and client code
build.xml: include build.local.properties to allow local property overrides
parent 50561463
......@@ -84,3 +84,7 @@ release.bin.zip=${release}/disl-${disl.version}-bin.zip
release.bin.tar=${release}/disl-${disl.version}-bin.tar.bz2
release.src.zip=${release}/disl-${disl.version}-src.zip
release.src.tar=${release}/disl-${disl.version}-src.tar.bz2
# Java versions for different targets
target.disl.bypass=1.4
target.disl.client=1.6
<project name="disl" default="build" basedir=".">
<property name="build.sysclasspath" value="ignore" />
<property file="disl.version" />
<property file="build.local.properties" />
<property file="build.properties" />
......@@ -174,7 +176,7 @@
<for list="always,never,dynamic" param="variant">
<sequential>
<mkdir dir="${build.disl.bypass}/@{variant}" />
<javac destdir="${build.disl.bypass}/@{variant}" srcdir="${src.disl.bypass}/@{variant}" debug="true" source="1.4" target="1.4">
<javac destdir="${build.disl.bypass}/@{variant}" srcdir="${src.disl.bypass}/@{variant}" debug="true" source="${target.disl.bypass}" target="${target.disl.bypass}">
<compilerarg value="-Xbootclasspath/p:${basedir}/${build.disl.thread}" />
</javac>
</sequential>
......@@ -374,7 +376,7 @@
<target name="compile-shvm-dispatch">
<mkdir dir="${build.shvm.dispatch}" />
<javac destdir="${build.shvm.dispatch}" srcdir="${src.shvm.dispatch}" debug="true" />
<javac destdir="${build.shvm.dispatch}" srcdir="${src.shvm.dispatch}" debug="true" source="${target.disl.client}" target="${target.disl.client}" />
</target>
......@@ -434,7 +436,7 @@
<target name="compile-test" depends="compile-util,compile-disl,compile-shvm">
<mkdir dir="${build.test}" />
<javac destdir="${build.test}" srcdir="${src.test}" debug="true">
<javac destdir="${build.test}" srcdir="${src.test}" debug="true" source="${target.disl.client}" target="${target.disl.client}">
<classpath refid="test.classpath" />
</javac>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment