--- jsr166/build.xml 2013/06/18 19:03:50 1.141
+++ jsr166/build.xml 2015/06/17 01:55:44 1.165
@@ -16,17 +16,23 @@
$HOME/jdk/jdk6
$HOME/jdk/jdk7
$HOME/jdk/jdk8
+ $HOME/jdk/jdk9
where each of the above is a JDK or a symlink to same, and
$HOME/jdk/src/jdk6
$HOME/jdk/src/jdk7
$HOME/jdk/src/jdk8
+ $HOME/jdk/src/jdk9
where each of the above is a complete JDK source tree
(e.g. mercurial forest) or a symlink to same.
-As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
+
+ Alternatively, define ant variables thus:
+ ant -Djdk$N.home=...
+ for $N in 6 7 8 9 ...
------------------------------------------------------------------------------
-
+
+
@@ -44,13 +50,15 @@ As of 2013-02, the very latest lambda 8
-
-
+
-
-
@@ -114,6 +122,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -154,17 +163,24 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
@@ -183,7 +199,7 @@ As of 2013-02, the very latest lambda 8
-
+
@@ -197,7 +213,6 @@ As of 2013-02, the very latest lambda 8
source="@{compile-target}"
target="@{compile-target}"
classpath="${junit.jar}"
- bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac@{compile-target}}"
@@ -206,6 +221,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -217,6 +233,12 @@ As of 2013-02, the very latest lambda 8
fork="true">
+
+
+
+
+
+
@@ -229,7 +251,34 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -245,7 +294,7 @@ As of 2013-02, the very latest lambda 8
jdk="${jdk@{target}.home}"
workDir="@{workdir}/JTwork"
reportDir="@{workdir}/JTreport">
-
+
@@ -268,6 +317,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -286,13 +338,16 @@ As of 2013-02, the very latest lambda 8
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac8}"
+ executable="${build.main.javac}"
fork="true">
+
+
+
@@ -309,11 +364,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -325,18 +375,26 @@ As of 2013-02, the very latest lambda 8
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
@@ -375,14 +433,12 @@ As of 2013-02, the very latest lambda 8
+
-
-
-
@@ -393,166 +449,65 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -571,29 +526,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -649,6 +581,36 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -677,11 +639,13 @@ As of 2013-02, the very latest lambda 8
+
+
@@ -722,8 +686,7 @@ As of 2013-02, the very latest lambda 8
+ classes="${4jdk7product.jar}"/>
@@ -741,7 +704,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -768,11 +732,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -809,6 +768,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -834,12 +794,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -859,12 +820,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -900,6 +855,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -925,12 +881,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -950,11 +907,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -991,6 +943,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -1016,12 +969,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -1041,11 +995,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1058,6 +1007,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1069,21 +1021,49 @@ As of 2013-02, the very latest lambda 8
debug="${build.debug}"
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
- source="7"
+ source="${build.jsr166e.java.version}"
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac7}"
+ executable="${build.jsr166e.javac}"
fork="true">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -1158,6 +1162,13 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+