--- jsr166/build.xml 2013/02/01 21:58:27 1.132
+++ 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,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,71 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -227,6 +327,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -245,12 +348,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 +374,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -283,18 +385,26 @@ As of 2013-02, the very latest lambda 8
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
@@ -333,14 +443,12 @@ As of 2013-02, the very latest lambda 8
+
-
-
-
@@ -351,153 +459,74 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
@@ -515,29 +544,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -568,6 +574,32 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -618,6 +681,15 @@ As of 2013-02, the very latest lambda 8
workdir="${build.4jdk7.dir}"
classes="${4jdk7product.jar}">
+
+
+
+
+
+
+
+
+
@@ -646,31 +718,19 @@ As of 2013-02, the very latest lambda 8
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -688,7 +748,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -715,11 +776,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -756,6 +812,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -781,12 +838,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -806,12 +864,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -847,6 +899,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -872,12 +925,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -897,11 +951,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -938,6 +987,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -963,12 +1013,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -988,11 +1039,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1005,6 +1051,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1016,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">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -1106,6 +1206,13 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+