--- jsr166/build.xml 2013/05/20 19:12:23 1.140
+++ jsr166/build.xml 2015/09/02 03:45:13 1.169
@@ -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,37 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -245,7 +297,7 @@ As of 2013-02, the very latest lambda 8
jdk="${jdk@{target}.home}"
workDir="@{workdir}/JTwork"
reportDir="@{workdir}/JTreport">
-
+
@@ -268,6 +320,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -286,13 +341,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 +367,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -325,18 +378,26 @@ As of 2013-02, the very latest lambda 8
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
@@ -375,14 +436,12 @@ As of 2013-02, the very latest lambda 8
+
-
-
-
@@ -393,167 +452,74 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
@@ -571,29 +537,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -624,6 +567,32 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -677,11 +676,13 @@ As of 2013-02, the very latest lambda 8
+
+
@@ -740,7 +741,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -767,11 +769,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -808,6 +805,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -833,12 +831,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -858,12 +857,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -899,6 +892,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -924,12 +918,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -949,11 +944,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -990,6 +980,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -1015,12 +1006,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -1040,11 +1032,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1057,6 +1044,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1068,21 +1058,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">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -1157,6 +1199,13 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+