--- jsr166/build.xml 2013/05/20 19:12:23 1.140
+++ jsr166/build.xml 2015/05/20 06:13:09 1.164
@@ -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,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 +338,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -325,18 +349,26 @@ As of 2013-02, the very latest lambda 8
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
@@ -375,14 +407,12 @@ As of 2013-02, the very latest lambda 8
+
-
-
-
@@ -393,166 +423,64 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -571,29 +499,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -649,6 +554,36 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -677,11 +612,13 @@ As of 2013-02, the very latest lambda 8
+
+
@@ -722,7 +659,8 @@ As of 2013-02, the very latest lambda 8
+ classes="${4jdk7product.jar}"
+ jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
@@ -740,7 +678,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -767,11 +706,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -808,6 +742,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -833,12 +768,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -858,12 +794,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -899,6 +829,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -924,12 +855,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -949,11 +881,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -990,6 +917,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -1015,12 +943,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -1040,11 +969,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1057,6 +981,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1068,21 +995,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 +1136,13 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+