--- jsr166/build.xml 2015/09/13 02:09:35 1.178
+++ 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 @@
+
+
+
@@ -366,8 +406,8 @@
-
-
+
+
@@ -396,6 +436,7 @@
+
@@ -404,6 +445,11 @@
+
+
+
+
+
@@ -428,8 +474,8 @@
-
-
+
+
@@ -529,6 +575,11 @@
+
+
+
+
+
@@ -560,6 +611,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.sourcelevel}"
+ target="${build.sourcelevel}"
fork="true">
@@ -615,6 +667,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -644,8 +697,9 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
- bootclasspath="${bootclasspath7}"
+ bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac8}"
@@ -669,8 +723,8 @@
-
-
+
+
@@ -811,6 +865,7 @@
classpath=""
bootclasspath="${bootclasspath6}"
source="5"
+ target="5"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
@@ -833,8 +888,8 @@
-
-
+
+
@@ -900,6 +955,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -924,8 +980,8 @@
-
-
+
+
@@ -994,6 +1050,7 @@
bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
classpath=""
source="6"
+ target="6"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
@@ -1016,8 +1073,8 @@
-
-
+
+
@@ -1085,6 +1142,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.jsr166e.java.version}"
+ target="${build.jsr166e.java.version}"
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
@@ -1111,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}"
@@ -1135,8 +1194,8 @@
-
-
+
+