--- jsr166/build.xml 2013/07/10 17:09:45 1.143
+++ jsr166/build.xml 2015/02/20 22:33:13 1.163
@@ -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">
+
+
+
+
+
+
@@ -230,6 +252,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -268,6 +291,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -286,13 +312,15 @@ As of 2013-02, the very latest lambda 8
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac8}"
+ executable="${build.main.javac}"
fork="true">
+
+
@@ -320,15 +348,17 @@ As of 2013-02, the very latest lambda 8
+ executable="${javadoc9}">
+
+
@@ -337,7 +367,7 @@ As of 2013-02, the very latest lambda 8
-
+
@@ -376,6 +406,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -391,31 +422,63 @@ As of 2013-02, the very latest lambda 8
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -495,6 +558,35 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -582,7 +676,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -609,11 +704,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -675,12 +765,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -700,12 +791,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -766,12 +851,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -791,11 +877,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -857,12 +938,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -882,11 +964,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -899,6 +976,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -910,11 +990,11 @@ 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">
@@ -925,6 +1005,32 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -999,6 +1129,13 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+