--- jsr166/build.xml 2015/09/13 03:41:53 1.180
+++ jsr166/build.xml 2015/11/05 17:18:53 1.190
@@ -29,6 +29,11 @@
Alternatively, define ant variables thus:
ant -Djdk$N.home=...
for $N in 6 7 8 9 ...
+
+ As of 2015-09, there is incomplete hacky support for jigsaw
+ Build for jigsaw using something like:
+ ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
+ "docs" target is still broken.
------------------------------------------------------------------------------
@@ -52,17 +57,6 @@
-
-
-
-
-
-
@@ -95,22 +89,25 @@
-
+
+ if:set="have.java.base"/>
+ unless:set="have.java.base"/>
+
+
-
-
+
+
-
+
@@ -197,12 +194,15 @@
-
-
-
-
-
-
+
+
@@ -211,8 +211,14 @@
+
+
+
+
+
+
-
-
+
+
+
@@ -241,17 +248,16 @@
failonerror="true"
jvm="${java@{target}}"
fork="true">
-
+
+
-
+
+
-
-
-
@@ -290,7 +296,17 @@
+
+
+
+
+
+
+
+
+
+
@@ -300,9 +316,10 @@
workDir="@{workdir}/JTwork"
reportDir="@{workdir}/JTreport">
-
+
+
-
+
@@ -333,10 +350,22 @@
depends="configure-compiler"
description="Compiles src/main sources to build dir">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -396,6 +426,7 @@
+
@@ -620,6 +651,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -649,8 +681,9 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
- bootclasspath="${bootclasspath7}"
+ bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac8}"
@@ -816,6 +849,7 @@
classpath=""
bootclasspath="${bootclasspath6}"
source="5"
+ target="5"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
@@ -905,6 +939,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -999,6 +1034,7 @@
bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
classpath=""
source="6"
+ target="6"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
@@ -1090,6 +1126,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.jsr166e.java.version}"
+ target="${build.jsr166e.java.version}"
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
@@ -1116,8 +1153,9 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.jsr166e.java.version}"
+ target="${build.jsr166e.java.version}"
classpath=""
- bootclasspath="${bootclasspath7}"
+ bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac8}"