--- jsr166/build.xml 2017/01/29 20:19:00 1.231
+++ jsr166/build.xml 2017/09/19 19:47:20 1.251
@@ -18,24 +18,21 @@
itself. Because the JDK version matters and because different
targets require different JDKs, we assume that users have created a
hierarchy containing:
- $HOME/jdk/jdk6
- $HOME/jdk/jdk7
$HOME/jdk/jdk8
$HOME/jdk/jdk9
+ $HOME/jdk/jdk10
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
+ $HOME/jdk/src/jdk10
where each of the above is a complete JDK source tree
(e.g. mercurial forest) or a symlink to same.
Alternatively, define ant variables thus:
ant -Djdk$N.home=... -Djdk$N.src.home=...
- for $N in 6 7 8 9 ...
+ for $N in 8 9 10 ...
- As of 2016-03, the sources in src/main are for jdk9+ only. The "docs"
- target is currently broken.
+ As of 2016-03, the sources in src/main are for jdk9+ only.
------------------------------------------------------------------------------
@@ -134,6 +131,7 @@
+
@@ -143,6 +141,7 @@
+
@@ -233,6 +232,11 @@
+
+
+
+
+
+
-
+
@@ -264,12 +269,12 @@
jvm="${java@{target}}"
fork="true">
-
-
-
-
-
-
+
+
+
+
+
+
@@ -291,6 +296,12 @@
+
+
+
+
+
+
@@ -314,7 +325,6 @@
-
@@ -336,8 +346,8 @@
workDir="@{workdir}/JTwork">
-
-
+
+
@@ -362,27 +372,30 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
@@ -399,12 +412,13 @@
fork="true">
-
+
+
+
-
@@ -448,14 +462,16 @@
access="${build.javadoc.access}"
sourcepath="${src.dir}"
classpath=""
- executable="${javadoc9}">
+ source="9"
+ executable="${build.main.javadoc}">
-
+
+
@@ -503,18 +519,14 @@
-
-
-
-
@@ -535,7 +547,11 @@
+ classes="${product.jar}">
+
+
+
+
-
+ description="Runs tck and jtreg tests for src/main"/>
@@ -582,30 +597,29 @@
-
-
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
-
+
+
+
+
-
-
-
+
@@ -651,12 +665,11 @@
-
+ description="Compiles all the perf tests in src/test/loops">
@@ -668,7 +681,7 @@
includeAntRuntime="false"
includeJavaRuntime="false"
encoding="ASCII"
- executable="${javac9}"
+ executable="${build.main.javac}"
fork="true">
@@ -676,9 +689,7 @@
-
-
@@ -704,14 +715,12 @@
encoding="ASCII"
executable="${javac8}"
fork="true">
-
-
@@ -735,14 +744,12 @@
encoding="ASCII"
executable="${javac8}"
fork="true">
-
-
+
-
@@ -758,7 +765,6 @@
-
@@ -774,6 +780,7 @@
+
@@ -791,8 +798,7 @@
-
+ description="Runs tck and jtreg tests for jsr166-4jdk8"/>
@@ -835,9 +842,7 @@
-
-
@@ -853,13 +858,9 @@
+
-
-
-
-
+
-
-
-
+
-
-
-
-
+
@@ -930,14 +922,9 @@
-
-
-
-
+
+
-
-
+
-
-
+
+
-
-
-
-
-
-
+
@@ -1027,38 +1003,24 @@
+
-
-
-
-
-
+
-
-
-
+
-
-
+
-
-
-
+
+
-
-
-
-
-
+
@@ -1097,13 +1053,9 @@
-
-
-
-
+
@@ -1118,41 +1070,27 @@
failonerror = "true">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
-
-
+
+
-
-
-
-
+
@@ -1191,13 +1124,9 @@
-
-
-
-
+
@@ -1212,42 +1141,27 @@
failonerror = "true">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
-
-
-
+
+
-
-
-
-
+
@@ -1286,13 +1195,9 @@
-
-
-
-
+
@@ -1306,43 +1211,30 @@
executable="${javadoc7}">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
+
+
-
-
+
-
-
-
-
-
-
-
+
@@ -1407,13 +1291,9 @@
-
-
-
-
+
@@ -1427,16 +1307,11 @@
failonerror = "true">
-
-
-
-
+
-
-
+
@@ -1466,30 +1340,20 @@
+
-
-
-
-
-
+
-
+
-
-
+
@@ -1509,6 +1373,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1561,7 +1501,7 @@
+ jvm="${build.main.java}" fork="true">