--- jsr166/build.xml 2013/02/06 19:55:06 1.137
+++ 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,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,12 +210,13 @@ 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}}"
+ bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac@{target}}"
+ executable="${javac@{compile-target}}"
fork="true">
@@ -201,12 +227,15 @@ As of 2013-02, the very latest lambda 8
-
+
+
+
@@ -217,6 +246,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -255,6 +285,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -273,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">
+
+
@@ -296,11 +331,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -312,18 +342,26 @@ As of 2013-02, the very latest lambda 8
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
@@ -362,14 +400,12 @@ As of 2013-02, the very latest lambda 8
+
-
-
-
@@ -381,75 +417,12 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -458,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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -558,29 +477,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -641,6 +537,35 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -693,7 +624,7 @@ As of 2013-02, the very latest lambda 8
-
+
@@ -705,7 +636,8 @@ As of 2013-02, the very latest lambda 8
+ classes="${4jdk7product.jar}"
+ jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
@@ -723,7 +655,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -750,11 +683,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -816,12 +744,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -841,12 +770,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -907,12 +830,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -932,11 +856,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -998,12 +917,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -1023,11 +943,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1040,6 +955,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1051,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">
@@ -1066,6 +984,32 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-