--- jsr166/build.xml 2013/05/20 19:12:23 1.140
+++ jsr166/build.xml 2014/02/16 14:25:46 1.151
@@ -16,17 +16,19 @@
$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.
------------------------------------------------------------------------------
-
+
+
@@ -114,6 +116,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -160,9 +163,13 @@ As of 2013-02, the very latest lambda 8
-
+
+
+
+
+
@@ -268,6 +275,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -286,13 +296,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 +321,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -325,18 +332,25 @@ As of 2013-02, the very latest lambda 8
+ executable="${javadoc9}">
+
+
+
+
+
+
+
@@ -375,14 +389,12 @@ As of 2013-02, the very latest lambda 8
+
-
-
-
@@ -394,75 +406,12 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -471,88 +420,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 +466,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -654,6 +526,35 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -722,7 +625,8 @@ As of 2013-02, the very latest lambda 8
+ classes="${4jdk7product.jar}"
+ jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
@@ -767,11 +671,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -858,12 +757,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -949,11 +842,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1040,11 +928,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1057,6 +940,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1068,11 +954,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 +969,32 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1114,17 +1026,45 @@ As of 2013-02, the very latest lambda 8
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-