--- jsr166/build.xml 2013/02/01 21:58:27 1.132
+++ 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,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,64 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -227,6 +320,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -245,12 +341,16 @@ As of 2013-02, the very latest lambda 8
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac8}"
+ executable="${build.main.javac}"
fork="true">
+
+
+
+
@@ -267,11 +367,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -283,18 +378,26 @@ As of 2013-02, the very latest lambda 8
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
@@ -333,14 +436,12 @@ As of 2013-02, the very latest lambda 8
+
-
-
-
@@ -351,153 +452,74 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
@@ -515,29 +537,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -568,6 +567,32 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -618,6 +674,15 @@ As of 2013-02, the very latest lambda 8
workdir="${build.4jdk7.dir}"
classes="${4jdk7product.jar}">
+
+
+
+
+
+
+
+
+
@@ -646,31 +711,19 @@ As of 2013-02, the very latest lambda 8
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -688,7 +741,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -715,11 +769,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -756,6 +805,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -781,12 +831,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -806,12 +857,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -847,6 +892,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -872,12 +918,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -897,11 +944,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -938,6 +980,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -963,12 +1006,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -988,11 +1032,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1005,6 +1044,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1016,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">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -1106,6 +1199,13 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+