--- jsr166/build.xml 2017/03/27 02:11:26 1.241
+++ jsr166/build.xml 2018/01/20 01:54:14 1.261
@@ -21,10 +21,12 @@
$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/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.
@@ -132,6 +134,7 @@
+
@@ -142,6 +145,7 @@
+
@@ -181,15 +185,18 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
@@ -197,6 +204,8 @@
+
+
@@ -296,6 +305,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -319,11 +340,12 @@
-
+
+
@@ -341,16 +363,17 @@
workDir="@{workdir}/JTwork">
-
-
+
+
-
+
+
@@ -367,7 +390,16 @@
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
@@ -407,12 +430,13 @@
fork="true">
-
+
-
+
+
@@ -456,13 +480,15 @@
access="${build.javadoc.access}"
sourcepath="${src.dir}"
classpath=""
- executable="${javadoc9}">
+ source="9"
+ executable="${build.main.javadoc}">
+
@@ -589,22 +615,28 @@
-
-
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
@@ -672,7 +704,7 @@
includeAntRuntime="false"
includeJavaRuntime="false"
encoding="ASCII"
- executable="${javac9}"
+ executable="${build.main.javac}"
fork="true">
@@ -805,6 +837,7 @@
access="${build.javadoc.access}"
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
classpath=""
+ source="8"
executable="${javadoc8}"
failonerror = "true">
@@ -1366,8 +1399,29 @@
+
+
+
+
+
@@ -1389,22 +1443,9 @@
fork="true">
-
-
-
-
-
-
-
-
-
-
+
+ ${errorprone.jsr166.flags}"/>
@@ -1423,30 +1464,38 @@
workdir="${build.dir}"
classes="${product.jar}">
-
-
-
-
-
-
-
-
-
-
+
+ ${errorprone.jsr166.flags}
+ ${errorprone.jsr166.test.flags}"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+