--- jsr166/build.xml 2013/02/05 03:39:35 1.136
+++ 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,6 +46,17 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
@@ -105,6 +118,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -145,17 +159,24 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
@@ -170,11 +191,11 @@ As of 2013-02, the very latest lambda 8
-
+
-
+
@@ -185,12 +206,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 +223,15 @@ As of 2013-02, the very latest lambda 8
-
+
+
+
@@ -217,6 +242,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -255,6 +281,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -273,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">
+
+
@@ -296,11 +327,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -312,18 +338,26 @@ As of 2013-02, the very latest lambda 8
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
@@ -362,14 +396,12 @@ As of 2013-02, the very latest lambda 8
+
-
-
-
@@ -381,75 +413,12 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -458,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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -558,29 +473,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -641,6 +533,35 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -692,7 +620,7 @@ As of 2013-02, the very latest lambda 8
-
+
@@ -704,7 +632,8 @@ As of 2013-02, the very latest lambda 8
+ classes="${4jdk7product.jar}"
+ jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
@@ -722,7 +651,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -749,11 +679,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -815,12 +740,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -840,12 +766,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -906,12 +826,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -931,11 +852,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -997,12 +913,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -1022,11 +939,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1039,6 +951,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1050,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">
@@ -1065,6 +980,32 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-