--- jsr166/build.xml 2013/05/02 21:38:03 1.139
+++ jsr166/build.xml 2014/07/12 17:29:12 1.158
@@ -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.
------------------------------------------------------------------------------
-
+
+
@@ -44,11 +46,16 @@ As of 2013-02, the very latest lambda 8
-
-
+
+
@@ -111,6 +118,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -151,17 +159,24 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
@@ -180,7 +195,7 @@ As of 2013-02, the very latest lambda 8
-
+
@@ -208,7 +223,7 @@ As of 2013-02, the very latest lambda 8
-
@@ -227,6 +242,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -265,6 +281,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -283,13 +302,15 @@ As of 2013-02, the very latest lambda 8
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac8}"
+ executable="${build.main.javac}"
fork="true">
+
+
@@ -306,11 +327,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -322,18 +338,26 @@ As of 2013-02, the very latest lambda 8
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
@@ -372,14 +396,12 @@ As of 2013-02, the very latest lambda 8
+
-
-
-
@@ -391,75 +413,12 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -468,88 +427,34 @@ As of 2013-02, the very latest lambda 8
depends="jar"
description="Runs jtreg tests for main using the jtreg ant task">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -568,29 +473,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -651,6 +533,35 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -707,7 +620,7 @@ As of 2013-02, the very latest lambda 8
-
+
@@ -719,7 +632,8 @@ As of 2013-02, the very latest lambda 8
+ classes="${4jdk7product.jar}"
+ jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
@@ -737,7 +651,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -764,11 +679,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -830,12 +740,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -855,12 +766,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -921,12 +826,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -946,11 +852,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1012,12 +913,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -1037,11 +939,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1054,6 +951,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1065,11 +965,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">
@@ -1080,6 +980,32 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-