--- jsr166/build.xml 2013/02/05 03:39:35 1.136
+++ jsr166/build.xml 2015/09/08 16:54:43 1.176
@@ -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,6 +50,17 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
@@ -105,13 +122,17 @@ As of 2013-02, the very latest lambda 8
+
-
+
+
+
+
@@ -145,17 +166,24 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
@@ -170,11 +198,11 @@ As of 2013-02, the very latest lambda 8
-
+
-
+
@@ -185,28 +213,38 @@ As of 2013-02, the very latest lambda 8
debug="${build.debug}"
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
- source="@{source}"
+ source="@{compile-target}"
+ target="@{compile-target}"
classpath="${junit.jar}"
- bootclasspath="@{classes}:${bootclasspath@{source}}"
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac@{target}}"
+ executable="${javac@{compile-target}}"
fork="true">
+
-
+
+
+
+
+
+
+
+
+
@@ -216,8 +254,30 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -228,11 +288,11 @@ As of 2013-02, the very latest lambda 8
-
-
+
@@ -255,6 +315,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -273,13 +336,16 @@ As of 2013-02, the very latest lambda 8
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac8}"
+ executable="${build.main.javac}"
fork="true">
+
+
+
@@ -296,11 +362,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -312,18 +373,26 @@ As of 2013-02, the very latest lambda 8
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
@@ -362,14 +431,12 @@ As of 2013-02, the very latest lambda 8
+
-
-
-
@@ -380,167 +447,72 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
@@ -558,29 +530,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -611,6 +560,32 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -653,7 +658,7 @@ As of 2013-02, the very latest lambda 8
-
@@ -663,14 +668,23 @@ As of 2013-02, the very latest lambda 8
classes="${4jdk7product.jar}">
+
+
+
+
+
+
+
+
+
-
+
-
@@ -692,13 +706,13 @@ As of 2013-02, the very latest lambda 8
-
+
-
@@ -722,7 +736,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -749,11 +764,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -790,6 +800,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -815,12 +826,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -840,12 +852,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -881,6 +887,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -906,12 +913,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -931,11 +939,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -972,6 +975,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -997,12 +1001,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -1022,11 +1027,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1039,6 +1039,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1050,21 +1053,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">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -1140,6 +1194,13 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+