--- jsr166/build.xml 2016/12/20 04:18:46 1.229
+++ jsr166/build.xml 2017/09/28 01:17:47 1.255
@@ -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 @@
+
@@ -182,15 +181,15 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -233,6 +232,11 @@
+
+
+
+
+
+
-
+
@@ -264,11 +269,12 @@
jvm="${java@{target}}"
fork="true">
-
-
-
-
-
+
+
+
+
+
+
@@ -290,6 +296,12 @@
+
+
+
+
+
+
@@ -313,11 +325,12 @@
-
+
+
@@ -335,16 +348,17 @@
workDir="@{workdir}/JTwork">
-
-
+
+
-
+
+
@@ -361,27 +375,30 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
@@ -398,12 +415,13 @@
fork="true">
-
+
+
+
-
@@ -447,14 +465,16 @@
access="${build.javadoc.access}"
sourcepath="${src.dir}"
classpath=""
- executable="${javadoc9}">
+ source="9"
+ executable="${build.main.javadoc}">
-
+
+
@@ -502,18 +522,14 @@
-
-
-
-
@@ -534,7 +550,11 @@
+ classes="${product.jar}">
+
+
+
+
-
+ description="Runs tck and jtreg tests for src/main"/>
@@ -581,30 +600,29 @@
-
-
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
-
+
+
+
+
-
-
-
+
@@ -650,12 +668,11 @@
-
+ description="Compiles all the perf tests in src/test/loops">
@@ -667,7 +684,7 @@
includeAntRuntime="false"
includeJavaRuntime="false"
encoding="ASCII"
- executable="${javac9}"
+ executable="${build.main.javac}"
fork="true">
@@ -675,9 +692,7 @@
-
-
@@ -703,14 +718,12 @@
encoding="ASCII"
executable="${javac8}"
fork="true">
-
-
@@ -734,14 +747,12 @@
encoding="ASCII"
executable="${javac8}"
fork="true">
-
-
+
-
@@ -757,7 +768,6 @@
-
@@ -773,6 +783,7 @@
+
@@ -790,8 +801,7 @@
-
+ description="Runs tck and jtreg tests for jsr166-4jdk8"/>
@@ -834,9 +845,7 @@
-
-
@@ -852,13 +861,9 @@
+
-
-
-
-
+
-
-
-
+
-
-
-
-
+
@@ -929,14 +925,9 @@
-
-
-
-
+
+
-
-
+
-
-
+
+
-
-
-
-
-
-
+
@@ -1026,38 +1006,24 @@
+
-
-
-
-
-
+
-
-
-
+
-
-
+
-
-
-
+
+
-
-
-
-
-
+
@@ -1096,13 +1056,9 @@
-
-
-
-
+
@@ -1117,41 +1073,27 @@
failonerror = "true">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
-
-
+
+
-
-
-
-
+
@@ -1190,13 +1127,9 @@
-
-
-
-
+
@@ -1211,42 +1144,27 @@
failonerror = "true">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
-
-
-
+
+
-
-
-
-
+
@@ -1285,13 +1198,9 @@
-
-
-
-
+
@@ -1305,43 +1214,30 @@
executable="${javadoc7}">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
+
+
-
-
+
-
-
-
-
-
-
-
+
@@ -1406,13 +1294,9 @@
-
-
-
-
+
@@ -1426,16 +1310,11 @@
failonerror = "true">
-
-
-
-
+
-
-
+
@@ -1465,30 +1343,20 @@
+
-
-
+
-
-
-
-
+
-
-
+
@@ -1508,13 +1376,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -1556,12 +1532,12 @@
type="jar,bundle" inline="true" conf="default,master"
pattern="${guava.dir}/[artifact].[ext]"
organisation="com.google.guava" module="guava-testlib"/>
-
+
-
+ jvm="${build.main.java}" fork="true">
+