--- jsr166/build.xml 2017/03/26 10:40:29 1.239
+++ jsr166/build.xml 2017/07/03 20:36:55 1.249
@@ -18,12 +18,10 @@
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
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
@@ -32,7 +30,7 @@
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.
------------------------------------------------------------------------------
@@ -298,6 +296,12 @@
+
+
+
+
+
+
@@ -321,7 +325,6 @@
-
@@ -369,30 +372,30 @@
-
+
+
+
+
+
+
+
+
+
+
- depends="dist, 4jdk8dist"
- description="Builds all public jars and docs"/>
-
-
-
-
-
-
-
-
-
-
+
@@ -409,12 +412,13 @@
fork="true">
-
+
-
+
+
@@ -458,13 +462,15 @@
access="${build.javadoc.access}"
sourcepath="${src.dir}"
classpath=""
- executable="${javadoc9}">
+ source="9"
+ executable="${build.main.javadoc}">
+
@@ -513,18 +519,14 @@
-
-
-
-
@@ -584,8 +586,7 @@
-
+ description="Runs tck and jtreg tests for src/main"/>
@@ -596,22 +597,20 @@
-
-
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
-
+
@@ -663,12 +662,11 @@
-
+ description="Compiles all the perf tests in src/test/loops">
@@ -680,7 +678,7 @@
includeAntRuntime="false"
includeJavaRuntime="false"
encoding="ASCII"
- executable="${javac9}"
+ executable="${build.main.javac}"
fork="true">
@@ -688,9 +686,7 @@
-
-
@@ -716,14 +712,12 @@
encoding="ASCII"
executable="${javac8}"
fork="true">
-
-
@@ -747,14 +741,12 @@
encoding="ASCII"
executable="${javac8}"
fork="true">
-
-
@@ -770,7 +762,6 @@
-
@@ -804,8 +795,7 @@
-
+ description="Runs tck and jtreg tests for jsr166-4jdk8"/>
@@ -848,9 +839,7 @@
-
-
@@ -866,13 +855,9 @@
+
-
-
-
-
+
-
-
-
+
-
-
-
-
+
@@ -943,14 +919,9 @@
-
-
-
-
+
-
-
+
-
-
+
+
-
-
-
-
-
-
+
@@ -1041,38 +1000,24 @@
+
-
-
-
-
-
+
-
-
-
+
-
-
+
-
-
-
+
+
-
-
-
-
-
+
@@ -1111,13 +1050,9 @@
-
-
-
-
+
@@ -1132,41 +1067,27 @@
failonerror = "true">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
-
-
+
+
-
-
-
-
+
@@ -1205,13 +1121,9 @@
-
-
-
-
+
@@ -1226,42 +1138,27 @@
failonerror = "true">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
-
-
-
+
+
-
-
-
-
+
@@ -1300,13 +1192,9 @@
-
-
-
-
+
@@ -1320,43 +1208,30 @@
executable="${javadoc7}">
-
+
-
-
-
-
-
+
-
-
-
+
-
+
-
+
+
-
-
+
-
-
-
-
-
-
-
+
@@ -1421,13 +1288,9 @@
-
-
-
-
+
@@ -1441,16 +1304,11 @@
failonerror = "true">
-
-
-
-
+
-
-
+
@@ -1480,30 +1337,20 @@
+
-
-
+
-
-
-
-
+
-
-
+
@@ -1526,11 +1373,10 @@
+ description="Run errorprone over jsr166 source code (experimental)">
@@ -1549,21 +1395,17 @@
fork="true">
-
-
-
-
-
-
-
-
-
-
+
@@ -1583,24 +1425,20 @@
workdir="${build.dir}"
classes="${product.jar}">
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1660,7 +1498,7 @@
+ jvm="${build.main.java}" fork="true">