--- jsr166/build.xml 2013/02/03 02:25:01 1.134
+++ jsr166/build.xml 2015/05/20 06:13:09 1.164
@@ -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,6 +122,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -145,17 +163,24 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
@@ -170,11 +195,11 @@ As of 2013-02, the very latest lambda 8
-
+
-
+
@@ -185,28 +210,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,6 +251,35 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -227,6 +291,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -245,13 +312,16 @@ As of 2013-02, the very latest lambda 8
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac8}"
+ executable="${build.main.javac}"
fork="true">
+
+
+
@@ -268,11 +338,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -284,18 +349,26 @@ As of 2013-02, the very latest lambda 8
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
@@ -334,14 +407,12 @@ As of 2013-02, the very latest lambda 8
+
-
-
-
@@ -352,153 +423,65 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
@@ -516,29 +499,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -594,6 +554,36 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -621,6 +611,14 @@ As of 2013-02, the very latest lambda 8
classes="${4jdk7product.jar}">
+
+
+
+
+
+
+
+
@@ -649,31 +647,20 @@ As of 2013-02, the very latest lambda 8
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -691,7 +678,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -718,11 +706,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -759,6 +742,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -784,12 +768,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -809,12 +794,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -850,6 +829,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -875,12 +855,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -900,11 +881,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -941,6 +917,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -966,12 +943,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -991,11 +969,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1008,6 +981,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1019,21 +995,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">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -1109,6 +1136,13 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+