--- jsr166/build.xml 2017/03/26 10:40:29 1.239
+++ jsr166/build.xml 2018/02/04 20:00:47 1.265
@@ -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,30 +390,36 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- depends="dist, 4jdk8dist"
- description="Builds all public jars and docs"/>
-
-
-
-
-
-
-
-
-
-
+
@@ -409,12 +436,13 @@
fork="true">
-
+
-
+
+
@@ -458,28 +486,25 @@
access="${build.javadoc.access}"
sourcepath="${src.dir}"
classpath=""
- executable="${javadoc9}">
+ source="9"
+ executable="${build.main.javadoc}">
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
@@ -513,18 +538,14 @@
-
-
-
-
@@ -584,8 +605,7 @@
-
+ description="Runs tck and jtreg tests for src/main"/>
@@ -596,22 +616,28 @@
-
-
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
@@ -663,12 +689,11 @@
-
+ description="Compiles all the perf tests in src/test/loops">
@@ -680,7 +705,7 @@
includeAntRuntime="false"
includeJavaRuntime="false"
encoding="ASCII"
- executable="${javac9}"
+ executable="${build.main.javac}"
fork="true">
@@ -688,9 +713,7 @@
-
-
@@ -716,14 +739,12 @@
encoding="ASCII"
executable="${javac8}"
fork="true">
-
-
@@ -747,14 +768,12 @@
encoding="ASCII"
executable="${javac8}"
fork="true">
-
-
@@ -770,7 +789,6 @@
-
@@ -804,8 +822,7 @@
-
+ description="Runs tck and jtreg tests for jsr166-4jdk8"/>
@@ -828,15 +846,11 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -848,9 +862,7 @@
-
-
@@ -866,13 +878,9 @@
+
-
-
-
-
+
-
-
-
+
-
-
-
-
+
@@ -943,14 +942,9 @@
-
-
-
-
+
-
-
+
-
-
+
+
-
-
-
-
-
-
+
@@ -1041,38 +1023,24 @@
+
-
-
-
-
-
+
-
-
-
+
-
-
+
-
-
-
+
+
-
-
-
-
-
+
@@ -1111,13 +1073,9 @@
-
-
-
-
+
@@ -1132,41 +1090,27 @@
failonerror = "true">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
-
-
+
+
-
-
-
-
+
@@ -1205,13 +1144,9 @@
-
-
-
-
+
@@ -1226,42 +1161,27 @@
failonerror = "true">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
-
-
-
+
+
-
-
-
-
+
@@ -1300,13 +1215,9 @@
-
-
-
-
+
@@ -1320,43 +1231,30 @@
executable="${javadoc7}">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
+
+
-
-
+
-
-
-
-
-
-
-
+
@@ -1421,13 +1311,9 @@
-
-
-
-
+
@@ -1441,16 +1327,11 @@
failonerror = "true">
-
-
-
-
+
-
-
+
@@ -1480,30 +1360,20 @@
+
-
-
-
-
-
+
-
+
-
-
+
@@ -1526,11 +1396,31 @@
+
+
+
+
+
+ description="Run errorprone over jsr166 source code (experimental)">
@@ -1549,22 +1439,10 @@
fork="true">
-
-
-
-
-
-
-
-
-
-
+
+
+ ${errorprone.jsr166.flags}"/>
@@ -1583,30 +1461,39 @@
workdir="${build.dir}"
classes="${product.jar}">
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+