--- jsr166/build.xml 2013/06/18 20:54:57 1.142
+++ jsr166/build.xml 2015/09/02 04:46:40 1.171
@@ -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,44 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -245,7 +304,7 @@ As of 2013-02, the very latest lambda 8
jdk="${jdk@{target}.home}"
workDir="@{workdir}/JTwork"
reportDir="@{workdir}/JTreport">
-
+
@@ -268,6 +327,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -286,13 +348,16 @@ As of 2013-02, the very latest lambda 8
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac8}"
+ executable="${build.main.javac}"
fork="true">
+
+
+
@@ -320,18 +385,26 @@ As of 2013-02, the very latest lambda 8
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
@@ -370,6 +443,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -385,31 +459,72 @@ As of 2013-02, the very latest lambda 8
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -459,6 +574,32 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -512,11 +683,13 @@ As of 2013-02, the very latest lambda 8
+
+
@@ -557,8 +730,7 @@ As of 2013-02, the very latest lambda 8
+ classes="${4jdk7product.jar}"/>
@@ -576,7 +748,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -603,11 +776,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -644,6 +812,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -669,12 +838,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -694,12 +864,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -735,6 +899,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -760,12 +925,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -785,11 +951,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -826,6 +987,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -851,12 +1013,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -876,11 +1039,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -893,6 +1051,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -904,21 +1065,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">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -993,6 +1206,13 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+