--- jsr166/build.xml 2015/09/11 18:43:46 1.177
+++ jsr166/build.xml 2016/03/24 20:44:47 1.198
@@ -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"/>
+
+
-
-
+
+
-
+
@@ -178,7 +175,7 @@
-
+
@@ -197,12 +194,15 @@
-
-
-
-
-
-
+
+
@@ -211,8 +211,14 @@
+
+
+
+
+
+
-
-
+
+
+
@@ -241,17 +248,17 @@
failonerror="true"
jvm="${java@{target}}"
fork="true">
-
+
+
-
+
+
+
-
-
-
@@ -283,6 +290,9 @@
+
+
+
@@ -290,23 +300,37 @@
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
+
+
-
+
+
@@ -333,10 +357,22 @@
depends="configure-compiler"
description="Compiles src/main sources to build dir">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -356,6 +393,9 @@
+
+
+
@@ -365,6 +405,10 @@
+
+
+
+
@@ -392,6 +436,7 @@
+
@@ -400,6 +445,11 @@
+
+
+
+
+
@@ -423,6 +473,10 @@
+
+
+
+
@@ -521,6 +575,11 @@
+
+
+
+
+
@@ -552,6 +611,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.sourcelevel}"
+ target="${build.sourcelevel}"
fork="true">
@@ -607,6 +667,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -636,8 +697,9 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
- bootclasspath="${bootclasspath7}"
+ bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac8}"
@@ -660,6 +722,10 @@
+
+
+
+
@@ -799,6 +865,7 @@
classpath=""
bootclasspath="${bootclasspath6}"
source="5"
+ target="5"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
@@ -820,6 +887,10 @@
+
+
+
+
@@ -884,6 +955,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -907,6 +979,10 @@
+
+
+
+
@@ -974,6 +1050,7 @@
bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
classpath=""
source="6"
+ target="6"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
@@ -995,6 +1072,10 @@
+
+
+
+
@@ -1061,6 +1142,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.jsr166e.java.version}"
+ target="${build.jsr166e.java.version}"
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
@@ -1087,8 +1169,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}"
@@ -1110,6 +1193,10 @@
+
+
+
+