--- jsr166/build.xml 2017/03/24 16:33:02 1.238
+++ jsr166/build.xml 2018/01/23 06:09:53 1.263
@@ -18,21 +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/jdk7
$HOME/jdk/jdk8
$HOME/jdk/jdk9
$HOME/jdk/jdk10
+ $HOME/jdk/jdk11
where each of the above is a JDK or a symlink to same, and
- $HOME/jdk/src/jdk7
$HOME/jdk/src/jdk8
$HOME/jdk/src/jdk9
$HOME/jdk/src/jdk10
+ $HOME/jdk/src/jdk11
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 7 8 9 10 ...
+ for $N in 8 9 10 ...
As of 2016-03, the sources in src/main are for jdk9+ only.
------------------------------------------------------------------------------
@@ -134,6 +134,7 @@
+
@@ -144,6 +145,7 @@
+
@@ -183,15 +185,18 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
@@ -199,6 +204,8 @@
+
+
@@ -298,6 +305,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -321,11 +340,12 @@
-
+
+
@@ -343,16 +363,17 @@
workDir="@{workdir}/JTwork">
-
-
+
+
-
+
+
@@ -369,27 +390,30 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
@@ -406,12 +430,13 @@
fork="true">
-
+
-
+
+
@@ -455,13 +480,15 @@
access="${build.javadoc.access}"
sourcepath="${src.dir}"
classpath=""
- executable="${javadoc9}">
+ source="9"
+ executable="${build.main.javadoc}">
+
@@ -510,18 +537,14 @@
-
-
-
-
@@ -581,8 +604,7 @@
-
+ description="Runs tck and jtreg tests for src/main"/>
@@ -593,22 +615,28 @@
-
-
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
@@ -660,12 +688,11 @@
-
+ description="Compiles all the perf tests in src/test/loops">
@@ -677,7 +704,7 @@
includeAntRuntime="false"
includeJavaRuntime="false"
encoding="ASCII"
- executable="${javac9}"
+ executable="${build.main.javac}"
fork="true">
@@ -685,9 +712,7 @@
-
-
@@ -713,14 +738,12 @@
encoding="ASCII"
executable="${javac8}"
fork="true">
-
-
@@ -744,14 +767,12 @@
encoding="ASCII"
executable="${javac8}"
fork="true">
-
-
@@ -767,7 +788,6 @@
-
@@ -801,8 +821,7 @@
-
+ description="Runs tck and jtreg tests for jsr166-4jdk8"/>
@@ -845,9 +865,7 @@
-
-
@@ -863,13 +881,9 @@
+
-
-
-
-
+
-
-
-
+
-
-
-
-
+
@@ -940,14 +945,9 @@
-
-
-
-
+
-
-
+
-
-
+
+
-
-
-
-
-
-
+
@@ -1038,38 +1026,24 @@
+
-
-
-
-
-
+
-
-
-
+
-
-
+
-
-
-
+
+
-
-
-
-
-
+
@@ -1108,13 +1076,9 @@
-
-
-
-
+
@@ -1129,41 +1093,27 @@
failonerror = "true">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
+
-
-
+
-
-
-
-
+
@@ -1202,13 +1147,9 @@
-
-
-
-
+
@@ -1223,42 +1164,27 @@
failonerror = "true">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
-
-
-
+
+
-
-
-
-
+
@@ -1297,13 +1218,9 @@
-
-
-
-
+
@@ -1317,43 +1234,30 @@
executable="${javadoc7}">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
+
+
-
-
+
-
-
-
-
-
-
-
+
@@ -1418,13 +1314,9 @@
-
-
-
-
+
@@ -1438,16 +1330,11 @@
failonerror = "true">
-
-
-
-
+
-
-
+
@@ -1477,30 +1363,20 @@
+
-
-
+
-
-
-
-
+
-
-
+
@@ -1523,11 +1399,31 @@
+
+
+
+
+
+ description="Run errorprone over jsr166 source code (experimental)">
@@ -1546,22 +1442,9 @@
fork="true">
-
-
-
-
-
-
-
-
-
-
+
+ ${errorprone.jsr166.flags}"/>
@@ -1580,30 +1463,38 @@
workdir="${build.dir}"
classes="${product.jar}">
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+