--- jsr166/build.xml 2016/12/20 04:18:46 1.229
+++ jsr166/build.xml 2017/12/18 21:07:18 1.259
@@ -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,17 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
@@ -198,6 +199,7 @@
+
@@ -233,6 +235,11 @@
+
+
+
+
+
+
-
+
@@ -264,11 +272,12 @@
jvm="${java@{target}}"
fork="true">
-
-
-
-
-
+
+
+
+
+
+
@@ -290,6 +299,12 @@
+
+
+
+
+
+
@@ -313,11 +328,12 @@
-
+
+
@@ -335,16 +351,17 @@
workDir="@{workdir}/JTwork">
-
-
+
+
-
+
+
@@ -361,27 +378,30 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
@@ -398,12 +418,13 @@
fork="true">
-
+
+
+
-
@@ -447,14 +468,16 @@
access="${build.javadoc.access}"
sourcepath="${src.dir}"
classpath=""
- executable="${javadoc9}">
+ source="9"
+ executable="${build.main.javadoc}">
-
+
+
@@ -502,18 +525,14 @@
-
-
-
-
@@ -534,7 +553,11 @@
+ classes="${product.jar}">
+
+
+
+
-
+ description="Runs tck and jtreg tests for src/main"/>
@@ -581,30 +603,29 @@
-
-
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
-
+
+
+
+
-
-
-
+
@@ -650,12 +671,11 @@
-
+ description="Compiles all the perf tests in src/test/loops">
@@ -667,7 +687,7 @@
includeAntRuntime="false"
includeJavaRuntime="false"
encoding="ASCII"
- executable="${javac9}"
+ executable="${build.main.javac}"
fork="true">
@@ -675,9 +695,7 @@
-
-
@@ -703,14 +721,12 @@
encoding="ASCII"
executable="${javac8}"
fork="true">
-
-
@@ -734,14 +750,12 @@
encoding="ASCII"
executable="${javac8}"
fork="true">
-
-
+
-
@@ -757,7 +771,6 @@
-
@@ -773,6 +786,7 @@
+
@@ -790,8 +804,7 @@
-
+ description="Runs tck and jtreg tests for jsr166-4jdk8"/>
@@ -834,9 +848,7 @@
-
-
@@ -852,13 +864,9 @@
+
-
-
-
-
+
-
-
-
+
-
-
-
-
+
@@ -929,14 +928,9 @@
-
-
-
-
+
+
-
-
+
-
-
+
+
-
-
-
-
-
-
+
@@ -1026,38 +1009,24 @@
+
-
-
-
-
-
+
-
-
-
+
-
-
+
-
-
-
+
+
-
-
-
-
-
+
@@ -1096,13 +1059,9 @@
-
-
-
-
+
@@ -1117,41 +1076,27 @@
failonerror = "true">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
-
-
+
+
-
-
-
-
+
@@ -1190,13 +1130,9 @@
-
-
-
-
+
@@ -1211,42 +1147,27 @@
failonerror = "true">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
-
-
-
+
+
-
-
-
-
+
@@ -1285,13 +1201,9 @@
-
-
-
-
+
@@ -1305,43 +1217,30 @@
executable="${javadoc7}">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
+
+
-
-
+
-
-
-
-
-
-
-
+
@@ -1406,13 +1297,9 @@
-
-
-
-
+
@@ -1426,16 +1313,11 @@
failonerror = "true">
-
-
-
-
+
-
-
+
@@ -1465,30 +1346,20 @@
+
-
-
+
-
-
-
-
+
-
-
+
@@ -1508,13 +1379,125 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -1556,12 +1539,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">
+