--- jsr166/build.xml 2013/05/20 19:12:23 1.140
+++ jsr166/build.xml 2014/10/03 23:18:13 1.159
@@ -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
-
+
@@ -230,6 +246,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -268,6 +285,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -286,13 +306,15 @@ As of 2013-02, the very latest lambda 8
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac8}"
+ executable="${build.main.javac}"
fork="true">
+
+
@@ -309,11 +331,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -325,18 +342,26 @@ As of 2013-02, the very latest lambda 8
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
@@ -375,14 +400,12 @@ As of 2013-02, the very latest lambda 8
+
-
-
-
@@ -394,75 +417,12 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -471,88 +431,34 @@ As of 2013-02, the very latest lambda 8
depends="jar"
description="Runs jtreg tests for main using the jtreg ant task">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -571,29 +477,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -654,6 +537,35 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -722,7 +636,8 @@ As of 2013-02, the very latest lambda 8
+ classes="${4jdk7product.jar}"
+ jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
@@ -740,7 +655,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -767,11 +683,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -833,12 +744,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -858,12 +770,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -924,12 +830,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -949,11 +856,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1015,12 +917,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -1040,11 +943,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1057,6 +955,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1068,11 +969,11 @@ 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">
@@ -1083,6 +984,32 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-