ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.241 by jsr166, Mon Mar 27 02:11:26 2017 UTC vs.
Revision 1.313 by jsr166, Mon Apr 27 23:47:11 2020 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
# Line 18 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
22 <  $HOME/jdk/jdk8
23 <  $HOME/jdk/jdk9
24 <  $HOME/jdk/jdk10
22 >  $HOME/jdk/jdk11
23 >  $HOME/jdk/jdk12
24 >  $HOME/jdk/jdk13
25 >  $HOME/jdk/jdk14
26 >  $HOME/jdk/jdk15
27    where each of the above is a JDK or a symlink to same, and
28 <  $HOME/jdk/src/jdk8
29 <  $HOME/jdk/src/jdk9
30 <  $HOME/jdk/src/jdk10
31 <  where each of the above is a complete JDK source tree
32 <  (e.g. mercurial forest) or a symlink to same.
28 >  $HOME/jdk/src/jdk11
29 >  $HOME/jdk/src/jdk12
30 >  $HOME/jdk/src/jdk13
31 >  $HOME/jdk/src/jdk14
32 >  $HOME/jdk/src/jdk15
33 >  where each of the above is a JDK source tree or a symlink to same.
34  
35    Alternatively, define ant variables thus:
36    ant -Djdk$N.home=... -Djdk$N.src.home=...
37 <  for $N in 8 9 10 ...
37 >  for $N in 11 .. 15 ...
38  
39    As of 2016-03, the sources in src/main are for jdk9+ only.
40 +  As of 2019-08, the sources in src/main are for jdk11+ only.
41 +  As of 2019-10, compatibility support for jdk8 is dropped entirely.
42   ------------------------------------------------------------------------------
43    </description>
44  
# Line 50 | Line 56
56  
57  
58    <!-- Compilation options -->
53  <property name="build.sourcelevel"    value="6"/>
59    <property name="build.debug"          value="true"/>
60    <property name="build.debuglevel"     value="source,lines,vars"/>
61    <property name="build.deprecation"    value="false"/>
# Line 62 | Line 67
67    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
68    <property name="build.loops.dir"             location="${build.dir}/loops"/>
69  
65  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
66  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
67  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
68  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
69
70  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
71  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
72  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
73  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
74
75  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
76  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
77  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
78  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
79
80  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
81  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
82  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
83  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
84
70    <!-- JDK locations -->
71    <property name="jdks.home"  location="${user.home}/jdk"/>
72  
# Line 93 | Line 78
78      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
79      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
80      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
81 <    <local name="have.java.base"/>
97 <    <available property="have.java.base"
98 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
99 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
100 <      if:set="have.java.base"/>
101 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
102 <      unless:set="have.java.base"/>
103 <    <local name="modules"/>
104 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
105 <    <local name="boot.jar.dir"/>
106 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
107 <    <path id="bootclasspath@{v}" unless:set="modules">
108 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
109 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
110 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
111 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
112 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
113 <    </path>
114 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
81 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
82      </sequential>
83    </macrodef>
84  
# Line 127 | Line 94
94      </sequential>
95    </macrodef>
96  
97 <  <defjdklocations v="6"/>
98 <  <defjdklocations v="7"/>
99 <  <defjdklocations v="8"/>
100 <  <defjdklocations v="9"/>
101 <  <defjdklocations v="10"/>
97 >  <defjdklocations v="11"/>
98 >  <defjdklocations v="12"/>
99 >  <defjdklocations v="13"/>
100 >  <defjdklocations v="14"/>
101 >  <defjdklocations v="15"/>
102  
103    <!-- Source locations -->
104    <property name="src.dir"              location="${basedir}/src/main"/>
105    <property name="test.src.dir"         location="${basedir}/src/test"/>
106    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
107    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
108 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
109 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
110 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
111 <  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
112 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
108 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
109 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
110 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
111 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
112 >  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
113 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
114    <property name="lib.dir"              location="${basedir}/lib"/>
115    <property name="dist.dir"             location="${basedir}/dist"/>
116    <property name="topsrc.dir"           location="${basedir}/src"/>
149  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
154  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
117  
118    <!-- Javadoc locations -->
119    <property name="docs.dir"          location="${build.dir}/docs"/>
120 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
163 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
164 <
165 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
171 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
120 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
121  
122    <!-- Jar locations -->
123    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
180  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
124    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
125  
126    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
127 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
128 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
129 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
130 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
131 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
132 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
133 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
134 <  <!-- Default jdk doc location (latest stable release seems best) -->
135 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
127 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
128 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
129 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
130 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
131 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
132 >  <!-- The location of jdk early access docs (RIP) -->
133 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
134 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
135 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
136 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
137 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
138 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
139 >  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
140 >  <property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/docs"/>
141 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
142 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
143  
144    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
145 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
146 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
147 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
148 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
149 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
145 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
146 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
147 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
148 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
149 >  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
150    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
151  
152    <!-- Define the "jtreg" task -->
# Line 204 | Line 154
154    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
155             classpath="${lib.dir}/jtreg.jar" />
156  
157 <  <!-- Tck options; see JSR166TestCase.java
157 >  <!-- Tck configuration options; see JSR166TestCase.java
158     To profile a single tck test class:
159     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
160     To stress test a single tck test class:
# Line 227 | Line 177
177  
178      <sequential>
179  
230    <local name="modules"/>
231    <condition property="modules">
232      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233    </condition>
234
235    <local name="use-doclint"/>
236    <condition property="use-doclint">
237      <not> <equals arg1="@{target}" arg2="7"/> </not>
238    </condition>
239
180      <mkdir dir="@{workdir}/tck-classes"/>
181  
182      <javac srcdir="@{tck.src.dir}"
# Line 256 | Line 196
196        <include name="*.java"/>
197        <compilerarg value="-XDignore.symbol.file=true"/>
198        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
199 <      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
200 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
261 <      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
199 >      <compilerarg value="-Xdoclint:reference/private"/>
200 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
201        <compilerarg line="${build.args}"/>
202        <javac-elements/>
203  
# Line 268 | Line 207
207            failonerror="true"
208            jvm="${java@{target}}"
209            fork="true">
210 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
211 <        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
212 <        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
213 <        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
214 <        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
215 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
216 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
217 <        <jvmarg line="@{jvmflags}"/>
218 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
219 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
220 <
221 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
222 <        <syspropertyset id="system-properties-used-by-tck">
223 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
224 <          <propertyref prefix="jsr166."/>
225 <          <propertyref name="test.timeout.factor"/>
226 <        </syspropertyset>
227 <
228 <        <classpath>
229 <          <pathelement location="${junit.jar}"/>
230 <          <pathelement location="@{workdir}/tck-classes"/>
292 <        </classpath>
210 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
211 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
212 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
213 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
214 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
215 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
216 >        <jvmarg line="@{jvmflags}"/>
217 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
218 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
219 >
220 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
221 >        <syspropertyset id="system-properties-used-by-tck">
222 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
223 >          <propertyref prefix="jsr166."/>
224 >          <propertyref name="test.timeout.factor"/>
225 >        </syspropertyset>
226 >
227 >        <classpath>
228 >          <pathelement location="${junit.jar}"/>
229 >          <pathelement location="@{workdir}/tck-classes"/>
230 >        </classpath>
231      </java>
232  
233      </sequential>
234    </macrodef>
235  
236    <!-- Define jtreg test sets for different jdk versions -->
237 <  <fileset dir="${jtreg9.src.dir}">
238 <    <patternset id="jdk9.jtreg.tests">
239 <      <include name="**/*.java"/>
240 <    </patternset>
241 <  </fileset>
242 <
243 <  <fileset dir="${jtreg8.src.dir}">
244 <    <patternset id="jdk8.jtreg.tests">
245 <      <include name="**/*.java"/>
246 <    </patternset>
247 <  </fileset>
237 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
238 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
239 >  <property name="jtreg.test.pattern" value="**/*.java"/>
240 >  <macrodef name="defjtregtests">
241 >    <attribute name="v"/>
242 >    <sequential>
243 >      <fileset dir="${jtreg@{v}.src.dir}">
244 >        <patternset id="jdk@{v}.jtreg.tests">
245 >          <include name="${jtreg.test.pattern}"/>
246 >        </patternset>
247 >      </fileset>
248 >    </sequential>
249 >  </macrodef>
250  
251 <  <fileset dir="${jtreg7.src.dir}">
252 <    <patternset id="jdk7.jtreg.tests">
253 <      <include name="**/*.java"/>
254 <    </patternset>
255 <  </fileset>
251 >  <defjtregtests v="15"/>
252 >  <defjtregtests v="14"/>
253 >  <defjtregtests v="13"/>
254 >  <defjtregtests v="12"/>
255 >  <defjtregtests v="11"/>
256  
257    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
258    <property name="jtreg.flags" value=""/>
259  
260    <macrodef name="run-jtreg-tests">
261 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
322 <    <attribute name="source" default="7"/>
261 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
262      <attribute name="target"/>
263      <attribute name="workdir"/>
264      <attribute name="classes"/>
265 +    <attribute name="verbose" default="${jtreg.verbose}"/>
266      <attribute name="jtregflags" default=""/>
267 +    <element name="jtreg-elements" optional="true"/>
268  
269      <sequential>
270  
271      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
272      <property name="jtreg.verbose" value="nopass,fail,error"/>
273  
333    <local name="modules"/>
334    <condition property="modules">
335      <available file="${jdk@{target}.home}/jmods" type="dir"/>
336    </condition>
337
274      <delete dir="@{workdir}/JTwork"   quiet="true"/>
275      <jtreg dir="${jtreg@{target}.src.dir}"
276             jdk="${jdk@{target}.home}"
277             workDir="@{workdir}/JTwork">
278        <patternset refid="jdk@{target}.jtreg.tests"/>
279 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
280 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
281 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
279 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
280 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
281 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
282        <arg value="-agentvm"/>
283        <arg value="-noreport"/>
284 <      <arg value="-verbose:${jtreg.verbose}"/>
284 >      <arg value="-verbose:@{verbose}"/>
285        <arg value="-vmoptions:-esa -ea"/>
286        <arg value="-automatic"/>
287        <arg value="-k:!ignore"/>
288        <arg line="@{jtregflags}"/>
289        <arg line="${jtreg.flags}"/>
290 +      <jtreg-elements/>
291      </jtreg>
292      </sequential>
293    </macrodef>
# Line 361 | Line 298
298    </path>
299  
300    <!-- Support @jls tag, used in jdk8+ javadoc -->
301 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
302    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
303    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
304  
305    <!-- Main targets -->
306  
307 <  <property name="build.main.java.version" value="9"/>
308 <  <property name="build.main.javac" value="${javac9}"/>
307 >  <!-- Default values: may seem strange ... -->
308 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
309 >  <!-- But at build time, target jdk9, for maximal binary portability -->
310 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
311 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
312 >    o override-methods=summary
313 >    o {@systemProperty ...}
314 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
315 >    o 8202628: javadoc generates bad links in TestModules.java
316 >    -->
317 >  <property name="java.runtime.target" value="11"/>
318 >  <property name="build.main.java" value="${java11}"/>
319 >  <property name="build.main.javac" value="${javac11}"/>
320 >  <property name="build.main.javadoc" value="${javadoc12}"/>
321 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
322  
323    <target name="dists"
324 <          depends="dist, 4jdk8dist"
324 >          depends="dist"
325            description="Builds all public jars and docs"/>
375          <!--
376              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
377          -->
326  
327    <target name="compile"
328            depends="configure-compiler"
329            description="Compiles src/main sources to build dir">
330  
383    <local name="modules"/>
384    <condition property="modules">
385      <and>
386        <available file="${jdk9.home}/jmods" type="dir"/>
387        <equals arg1="9" arg2="${build.main.java.version}"/>
388      </and>
389    </condition>
390
331      <local name="destdir"/>
332 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
393 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
332 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
333  
334      <mkdir dir="${destdir}"/>
335  
# Line 407 | Line 346
346             fork="true">
347  
348        <include name="**/*.java"/>
349 <      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
349 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
350        <compilerarg value="-Xprefer:source"/>
351        <compilerarg value="-XDignore.symbol.file=true"/>
352 <      <compilerarg value="-Xlint:all"/>
352 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
353 >      <compilerarg value="-Xlint:all,-removal"/>
354 >      <compilerarg line="--doclint-format html5"/>
355 > <!--  Temporarily disable doclint, due to https://bugs.openjdk.java.net/browse/JDK-8214571 -->
356 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
357 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
358        <compilerarg value="-Werror"/>
415      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
359        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
360        <compilerarg line="${build.args}"/>
361  
# Line 438 | Line 381
381    <target name="docs"
382            description="Builds javadocs for src/main to dist dir">
383  
384 <    <delete dir="${docs.dir}"/>
384 >    <delete dir="${docs.dir}" quiet="true"/>
385      <mkdir dir="${docs.dir}"/>
386  
387 +    <!-- old school frames via docs/index.html?overview-summary.html -->
388 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
389 +    <local name="use-frames"/>
390 +    <condition property="use-frames">
391 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
392 +    </condition>
393 +
394      <!-- the packagenames="none" hack below prevents scanning the -->
395      <!-- sourcepath for packages -->
396  
# Line 451 | Line 401
401   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
402      <javadoc destdir="${docs.dir}"
403               packagenames="none"
404 <             link="${java9.api.url}"
404 >             link="${java.api.url}"
405               overview="${src.dir}/intro.html"
406               access="${build.javadoc.access}"
407               sourcepath="${src.dir}"
408               classpath=""
409 <             executable="${javadoc9}">
409 >             source="${build.main.javadoc.source}"
410 >             executable="${build.main.javadoc}">
411 > <!-- TODO: JDK-8214571 failonerror = "true" -->
412        <fileset dir="${src.dir}" defaultexcludes="yes">
413          <include name="**/*.java"/>
414        </fileset>
415 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
415 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
416        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
417 +      <arg value="-quiet"/>
418        <arg value="-XDignore.symbol.file=true"/>
419 +      <arg value="-html5"/>
420        <arg value="--patch-module=java.base=${src.dir}"/>
421 <      <arg value="-tag"/>
422 <      <arg value="${javadoc.jls.option}"/>
423 < <!-- @apiNote currently unused -->
424 < <!--       <arg value="-tag"/> -->
425 < <!--       <arg value="apiNote:a:API Note:"/> -->
426 <      <arg value="-tag"/>
473 <      <arg value="implSpec:a:Implementation Requirements:"/>
474 <      <arg value="-tag"/>
475 <      <arg value="implNote:a:Implementation Note:"/>
421 >      <arg value="--frames" if:set="use-frames"/>
422 >      <arg value="--override-methods=summary"/>
423 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
424 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
425 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
426 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
427   <!-- tags added in jdk9: currently unused -->
428 < <!--       <arg value="-tag"/> -->
429 < <!--       <arg value="revised:X"/> -->
479 < <!--       <arg value="-tag"/> -->
480 < <!--       <arg value="spec:X"/> -->
428 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
429 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
430      </javadoc>
431    </target>
432  
# Line 487 | Line 436
436            description="Puts all distributable products in single hierarchy"/>
437  
438  
490  <target name="release"
491          depends="dist"
492          description="Puts entire CVS tree, plus distribution productions, in a jar">
493
494    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
495
496    <jar basedir="${basedir}" destfile="${release.jar}">
497      <!-- <exclude name="build/**"/> -->
498      <exclude name="${release.jar}"/>
499      <exclude name="user.properties"/>
500      <exclude name="etc/notes/**"/>
501      <exclude name="src/emulation/**"/>
502      <exclude name="**/SyntaxTest.java"/>
503      <exclude name="**/SuperfluousAbstract.java"/>
504      <manifest>
505        <attribute name="Built-By" value="${user.name}"/>
506        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
507      </manifest>
508    </jar>
509  </target>
510
511
439    <target name="clean"
440            description="Removes all build products">
441      <delete dir="${build.dir}"/>
# Line 533 | Line 460
460    </target>
461  
462    <target name="tck"
463 <          depends="jar"
463 >          depends="jar"
464            description="Runs tck tests for src/main directly">
465  
466      <run-tck-tests
467 <      target="${build.main.java.version}"
467 >      target="${java.runtime.target}"
468        workdir="${build.dir}"
469        classes="${product.jar}">
470        <javac-elements>
# Line 568 | Line 495
495    </target>
496  
497    <target name="jtreg"
498 <          depends="jar"
498 >          depends="jar"
499            description="Runs jtreg tests for src/main using the jtreg ant task">
500      <run-jtreg-tests
501 <       target="${build.main.java.version}"
501 >       target="${java.runtime.target}"
502         workdir="${build.dir}"
503         classes="${product.jar}"/>
504    </target>
# Line 580 | Line 507
507            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
508            description="Runs tck and jtreg tests for src/main"/>
509  
510 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
510 >  <target name="test-version-permutations"
511 >          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
512 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
513 >
514 >  <target name="test11">
515 >    <antcall>
516 >      <param name="java.runtime.target" value="11"/>
517 >      <param name="build.main.javac" value="${javac11}"/>
518 >      <param name="build.main.javadoc" value="${javadoc12}"/>
519 >      <param name="build.main.javadoc.source" value="11"/>
520 >      <target name="clean"/>
521 >      <target name="test"/>
522 >      <target name="docs"/>
523 >    </antcall>
524 >  </target>
525  
526 < <!--     <antcall target="jtreg"> -->
527 < <!--       <param name="build.main.java.version" value="8"/> -->
528 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
529 < <!--     </antcall> -->
526 >  <target name="test12">
527 >    <antcall>
528 >      <param name="java.runtime.target" value="12"/>
529 >      <param name="build.main.javac" value="${javac12}"/>
530 >      <param name="build.main.javadoc" value="${javadoc12}"/>
531 >      <param name="build.main.javadoc.source" value="12"/>
532 >      <target name="clean"/>
533 >      <target name="test"/>
534 >      <target name="docs"/>
535 >    </antcall>
536 >  </target>
537  
538 < <!--   </target> -->
538 >  <target name="test13">
539 >    <antcall>
540 >      <param name="java.runtime.target" value="13"/>
541 >      <param name="build.main.javac" value="${javac13}"/>
542 >      <param name="build.main.javadoc" value="${javadoc13}"/>
543 >      <param name="build.main.javadoc.source" value="13"/>
544 >      <target name="clean"/>
545 >      <target name="test"/>
546 >      <target name="docs"/>
547 >    </antcall>
548 >  </target>
549  
550 < <!--   <target name="test89" -->
551 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
550 >  <target name="test14">
551 >    <antcall>
552 >      <param name="java.runtime.target" value="14"/>
553 >      <param name="build.main.javac" value="${javac14}"/>
554 >      <param name="build.main.javadoc" value="${javadoc14}"/>
555 >      <param name="build.main.javadoc.source" value="14"/>
556 >      <target name="clean"/>
557 >      <target name="test"/>
558 >      <target name="docs"/>
559 >    </antcall>
560 >  </target>
561  
562 < <!--     <antcall target="clean"/> -->
563 < <!--     <antcall target="test"> -->
564 < <!--       <param name="build.main.java.version" value="8"/> -->
565 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
566 < <!--     </antcall> -->
562 >  <target name="test15">
563 >    <antcall>
564 >      <param name="java.runtime.target" value="15"/>
565 >      <param name="build.main.javac" value="${javac15}"/>
566 >      <param name="build.main.javadoc" value="${javadoc15}"/>
567 >      <param name="build.main.javadoc.source" value="15"/>
568 >      <target name="clean"/>
569 >      <target name="test"/>
570 >      <target name="docs"/>
571 >    </antcall>
572 >  </target>
573  
574 < <!--     <antcall target="clean"/> -->
575 < <!--     <antcall target="test"> -->
576 < <!--       <param name="build.main.java.version" value="9"/> -->
577 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
578 < <!--     </antcall> -->
574 >  <target name="test11-12">
575 >    <antcall>
576 >      <param name="java.runtime.target" value="12"/>
577 >      <param name="build.main.javac" value="${javac11}"/>
578 >      <param name="build.main.javadoc" value="${javadoc12}"/>
579 >      <param name="build.main.javadoc.source" value="11"/>
580 >      <target name="clean"/>
581 >      <target name="test"/>
582 >      <target name="docs"/>
583 >    </antcall>
584 >  </target>
585  
586 < <!--   </target> -->
586 >  <target name="test11-13">
587 >    <antcall>
588 >      <param name="java.runtime.target" value="13"/>
589 >      <param name="build.main.javac" value="${javac11}"/>
590 >      <param name="build.main.javadoc" value="${javadoc13}"/>
591 >      <param name="build.main.javadoc.source" value="11"/>
592 >      <target name="clean"/>
593 >      <target name="test"/>
594 >      <target name="docs"/>
595 >    </antcall>
596 >  </target>
597  
598 +  <target name="test11-14">
599 +    <antcall>
600 +      <param name="java.runtime.target" value="14"/>
601 +      <param name="build.main.javac" value="${javac11}"/>
602 +      <param name="build.main.javadoc" value="${javadoc14}"/>
603 +      <param name="build.main.javadoc.source" value="11"/>
604 +      <target name="clean"/>
605 +      <target name="test"/>
606 +      <target name="docs"/>
607 +    </antcall>
608 +  </target>
609 +
610 +  <target name="test11-15">
611 +    <antcall>
612 +      <param name="java.runtime.target" value="15"/>
613 +      <param name="build.main.javac" value="${javac11}"/>
614 +      <param name="build.main.javadoc" value="${javadoc15}"/>
615 +      <param name="build.main.javadoc.source" value="11"/>
616 +      <target name="clean"/>
617 +      <target name="test"/>
618 +      <target name="docs"/>
619 +    </antcall>
620 +  </target>
621  
622  
623    <target name="configure-compiler">
# Line 628 | Line 640
640    </target>
641  
642  
631
632  <!-- Various demos and test programs -->
633
634
635  <!-- description="Benchmark from Doug Lea's AQS paper" -->
636  <target name="loops" depends="configure-compiler">
637
638    <mkdir dir="${build.loops.dir}"/>
639
640    <javac srcdir="${loops.src.dir}"
641          destdir="${build.loops.dir}"
642            debug="${build.debug}"
643       debuglevel="${build.debuglevel}"
644      deprecation="${build.deprecation}"
645           source="${build.sourcelevel}"
646           target="${build.sourcelevel}"
647         encoding="ASCII"
648             fork="true">
649
650      <compilerarg line="${build.args}"/>
651      <classpath refid="loops.classpath"/>
652      <compilerarg value="-XDignore.symbol.file=true"/>
653
654    </javac>
655
656    <java classname="ALoops" fork="true">
657      <classpath refid="loops.classpath"/>
658    </java>
659  </target>
660
661
643    <target name="compile-test-loops" depends="jar"
644            description="Compiles all the perf tests in src/test/loops">
645  
# Line 672 | Line 653
653             includeAntRuntime="false"
654             includeJavaRuntime="false"
655             encoding="ASCII"
656 <           executable="${javac9}"
656 >           executable="${build.main.javac}"
657             fork="true">
658  
659        <include name="*.java"/>
660        <compilerarg value="-XDignore.symbol.file=true"/>
661 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
662 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
682 <      <compilerarg line="${build.args}"/>
683 <    </javac>
684 <  </target>
685 <
686 <
687 <  <!-- jsr166 4jdk8 -->
688 <
689 <  <target name="4jdk8compile"
690 <          depends="configure-compiler"
691 <          description="Compiles src/jdk8 sources, targeting jdk8">
692 <
693 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
694 <
695 <    <javac srcdir="${4jdk8src.dir}"
696 <           destdir="${build.4jdk8.classes.dir}"
697 <           debug="${build.debug}"
698 <           debuglevel="${build.debuglevel}"
699 <           deprecation="${build.deprecation}"
700 <           source="8"
701 <           target="8"
702 <           classpath=""
703 <           bootclasspath="${bootclasspath8}"
704 <           includeAntRuntime="false"
705 <           includeJavaRuntime="false"
706 <           encoding="ASCII"
707 <           executable="${javac8}"
708 <           fork="true">
709 <      <include name="**/*.java"/>
710 <      <compilerarg value="-Xprefer:source"/>
711 <      <compilerarg value="-XDignore.symbol.file=true"/>
712 <      <compilerarg value="-Xlint:all"/>
713 <      <compilerarg value="-Werror"/>
714 <      <compilerarg line="${build.args}"/>
715 <    </javac>
716 <  </target>
717 <
718 <  <target name="4jdk8doclint"
719 <          depends="configure-compiler"
720 <          description="Finds doclint warnings">
721 <
722 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
723 <
724 <    <javac srcdir="${4jdk8src.dir}"
725 <           destdir="${build.4jdk8.classes.dir}"
726 <           debug="${build.debug}"
727 <           debuglevel="${build.debuglevel}"
728 <           deprecation="${build.deprecation}"
729 <           source="8"
730 <           target="8"
731 <           classpath=""
732 <           bootclasspath="${bootclasspath8}"
733 <           includeAntRuntime="false"
734 <           includeJavaRuntime="false"
735 <           encoding="ASCII"
736 <           executable="${javac8}"
737 <           fork="true">
738 <      <include name="**/*.java"/>
739 <      <compilerarg value="-Xprefer:source"/>
740 <      <compilerarg value="-XDignore.symbol.file=true"/>
741 <      <compilerarg value="-Xlint:all"/>
742 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
661 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
662 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
663        <compilerarg line="${build.args}"/>
664      </javac>
665    </target>
666  
667  
668 <  <target name="4jdk8jar"
669 <          depends="4jdk8compile"
750 <          description="Builds library jar from compiled sources">
751 <
752 <    <jar destfile="${4jdk8product.jar}">
753 <      <fileset dir="${build.4jdk8.classes.dir}"/>
754 <      <manifest>
755 <        <attribute name="Built-By" value="${user.name}"/>
756 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
757 <      </manifest>
758 <    </jar>
759 <  </target>
760 <
761 <
762 <  <target name="4jdk8-tck"
763 <          depends="4jdk8jar"
764 <          description="Runs tck tests for jsr166-4jdk8 directly">
765 <
766 <    <run-tck-tests
767 <      target="8"
768 <      workdir="${build.4jdk8.dir}"
769 <      classes="${4jdk8product.jar}">
770 <      <javac-elements>
771 <        <!-- JDK9+ test classes -->
772 <        <exclude name="*9Test.java"/>
773 <        <exclude name="*10Test.java"/>
774 <        <compilerarg value="-Werror"/>
775 <      </javac-elements>
776 <    </run-tck-tests>
777 <  </target>
778 <
779 <
780 <  <target name="4jdk8-jtreg"
781 <          depends="4jdk8jar"
782 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
783 <    <run-jtreg-tests
784 <       target="8"
785 <       workdir="${build.4jdk8.dir}"
786 <       classes="${4jdk8product.jar}"/>
787 <  </target>
788 <
789 <
790 <  <target name="4jdk8-test"
791 <          depends="4jdk8-tck, 4jdk8-jtreg"
792 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
793 <
794 <
795 <  <target name="4jdk8docs"
796 <          description="Builds javadocs for src/jdk8 to dist dir">
797 <
798 <    <delete dir="${4jdk8docs.dir}"/>
799 <    <mkdir dir="${4jdk8docs.dir}"/>
800 <
801 <    <javadoc destdir="${4jdk8docs.dir}"
802 <             packagenames="none"
803 <             link="${java8.api.url}"
804 <             overview="${4jdk8src.dir}/intro.html"
805 <             access="${build.javadoc.access}"
806 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
807 <             classpath=""
808 <             executable="${javadoc8}"
809 <             failonerror = "true">
810 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
811 <        <include name="**/*.java"/>
812 <      </fileset>
813 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
814 <      <arg value="-XDignore.symbol.file=true"/>
815 <      <arg value="-tag"/>
816 <      <arg value="${javadoc.jls.option}"/>
817 < <!-- @apiNote currently unused -->
818 < <!--       <arg value="-tag"/> -->
819 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
820 <      <arg value="-tag"/>
821 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
822 <      <arg value="-tag"/>
823 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
824 <    </javadoc>
825 <  </target>
826 <
827 <
828 <  <target name="4jdk8dist"
829 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
830 <          description="Puts all distributable products in single hierarchy"/>
831 <
832 <
833 <  <target name="4jdk8clean"
834 <          description="Removes all 4jdk8 build products">
835 <    <delete dir="${build.4jdk8.dir}"/>
836 <  </target>
837 <
838 <
839 <  <target name="4jdk8dist-jar"
840 <          depends="4jdk8clean, 4jdk8jar">
841 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
842 <  </target>
843 <
844 <
845 <  <target name="4jdk8dist-docs"
846 <          depends="4jdk8clean, 4jdk8docs">
847 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
848 <  </target>
849 <
850 <
668 >  <!-- old branches no longer maintained.  build support deleted -->
669 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
670    <!-- jsr166 4jdk7 (no longer maintained) -->
852
853  <target name="4jdk7compile" depends="configure-compiler">
854    <mkdir dir="${build.4jdk7.classes.dir}"/>
855
856    <javac srcdir="${4jdk7src.dir}"
857           destdir="${build.4jdk7.classes.dir}"
858           debug="${build.debug}"
859           debuglevel="${build.debuglevel}"
860           deprecation="${build.deprecation}"
861           source="6"
862           target="6"
863           classpath=""
864           bootclasspath="${bootclasspath6}"
865           includeAntRuntime="false"
866           includeJavaRuntime="false"
867           encoding="ASCII"
868           executable="${javac7}"
869           fork="true">
870
871      <include name="**/*.java"/>
872      <compilerarg value="-Xprefer:source"/>
873      <compilerarg value="-XDignore.symbol.file=true"/>
874      <compilerarg value="-Xlint:all"/>
875      <compilerarg value="-Werror"/>
876      <compilerarg line="${build.args}"/>
877    </javac>
878  </target>
879
880  <target name="4jdk7doclint" depends="configure-compiler">
881    <mkdir dir="${build.4jdk7.classes.dir}"/>
882
883    <javac srcdir="${4jdk7src.dir}"
884           destdir="${build.4jdk7.classes.dir}"
885           debug="${build.debug}"
886           debuglevel="${build.debuglevel}"
887           deprecation="${build.deprecation}"
888           source="6"
889           target="6"
890           classpath=""
891           bootclasspath="${bootclasspath6}"
892           includeAntRuntime="false"
893           includeJavaRuntime="false"
894           encoding="ASCII"
895           executable="${javac8}"
896           fork="true">
897
898      <include name="**/*.java"/>
899      <compilerarg value="-Xprefer:source"/>
900      <compilerarg value="-XDignore.symbol.file=true"/>
901      <compilerarg value="-Xlint:all"/>
902      <compilerarg value="-Xdoclint:all/protected"/>
903      <compilerarg line="${build.args}"/>
904    </javac>
905  </target>
906
907  <target name="4jdk7jar" depends="4jdk7compile">
908    <jar destfile="${4jdk7product.jar}">
909      <fileset dir="${build.4jdk7.classes.dir}"/>
910      <manifest>
911        <attribute name="Built-By" value="${user.name}"/>
912        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
913      </manifest>
914    </jar>
915  </target>
916
917  <target name="4jdk7-tck" depends="4jdk7jar">
918    <run-tck-tests
919      target="7"
920      workdir="${build.4jdk7.dir}"
921      classes="${4jdk7product.jar}">
922      <javac-elements>
923        <!-- JDK8+ test classes -->
924        <exclude name="*8Test.java"/>
925        <exclude name="*9Test.java"/>
926        <exclude name="*10Test.java"/>
927        <exclude name="DoubleAccumulatorTest.java"/>
928        <exclude name="DoubleAdderTest.java"/>
929        <exclude name="LongAccumulatorTest.java"/>
930        <exclude name="LongAdderTest.java"/>
931        <exclude name="CompletableFutureTest.java"/>
932        <exclude name="SplittableRandomTest.java"/>
933        <exclude name="StampedLockTest.java"/>
934        <exclude name="SubmissionPublisherTest.java"/>
935        <compilerarg value="-Werror"/>
936      </javac-elements>
937    </run-tck-tests>
938  </target>
939
940  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
941  <target name="4jdk7-tck-junit" depends="4jdk7compile">
942
943    <junit printsummary="true"
944           showoutput="true"
945           errorProperty="junit.failed"
946           failureProperty="junit.failed"
947           includeantruntime="true"
948           jvm="${java7}"
949           fork="true">
950
951      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
952      <jvmarg value="-server"/>
953
954      <classpath>
955        <pathelement location="${junit.jar}"/>
956        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
957      </classpath>
958
959      <formatter type="brief"/>
960
961      <test name="${jsr166.tckTestClass}" haltonfailure="no">
962      </test>
963    </junit>
964  </target>
965
966  <target name="4jdk7-jtreg" depends="4jdk7jar">
967    <run-jtreg-tests
968       target="7"
969       workdir="${build.4jdk7.dir}"
970       classes="${4jdk7product.jar}"/>
971  </target>
972
973  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
974
975  <target name="4jdk7docs">
976    <delete dir="${4jdk7docs.dir}"/>
977    <mkdir dir="${4jdk7docs.dir}"/>
978
979    <javadoc destdir="${4jdk7docs.dir}"
980             packagenames="none"
981             link="${java7.api.url}"
982             overview="${4jdk7src.dir}/intro.html"
983             access="${build.javadoc.access}"
984             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
985             classpath=""
986             executable="${javadoc7}"
987             failonerror = "true">
988      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
989        <include name="**/*.java"/>
990      </fileset>
991      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
992      <arg value="-XDignore.symbol.file=true"/>
993    </javadoc>
994  </target>
995
996  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
997
998  <target name="4jdk7clean">
999    <delete dir="${build.4jdk7.dir}"/>
1000  </target>
1001
1002  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1003    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1004  </target>
1005
1006  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1007    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1008  </target>
1009
1010
671    <!-- jsr166x (no longer maintained) -->
1012
1013  <target name="jsr166xcompile" depends="configure-compiler">
1014    <mkdir dir="${build.jsr166x.classes.dir}"/>
1015
1016    <javac srcdir="${topsrc.dir}"
1017           destdir="${build.jsr166x.classes.dir}"
1018           debug="${build.debug}"
1019           debuglevel="${build.debuglevel}"
1020           deprecation="${build.deprecation}"
1021           classpath=""
1022           bootclasspath="${bootclasspath6}"
1023           source="5"
1024           target="5"
1025           includeAntRuntime="false"
1026           includeJavaRuntime="false"
1027           encoding="ASCII"
1028           executable="${javac7}"
1029           fork="true">
1030      <include name="jsr166x/**/*.java"/>
1031      <compilerarg value="-XDignore.symbol.file=true"/>
1032      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1033      <compilerarg value="-Werror"/>
1034      <compilerarg line="${build.args}"/>
1035    </javac>
1036  </target>
1037
1038  <target name="jsr166xjar" depends="jsr166xcompile">
1039    <jar destfile="${jsr166x.jar}">
1040      <fileset dir="${build.jsr166x.classes.dir}"/>
1041      <manifest>
1042        <attribute name="Built-By" value="${user.name}"/>
1043        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1044      </manifest>
1045    </jar>
1046  </target>
1047
1048  <target name="jsr166xdocs">
1049    <delete dir="${jsr166xdocs.dir}"/>
1050    <mkdir dir="${jsr166xdocs.dir}"/>
1051
1052    <javadoc destdir="${jsr166xdocs.dir}"
1053             packagenames="jsr166x.*"
1054             link="${java.api.url}"
1055             access="${build.javadoc.access}"
1056             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1057             bootclasspath="${bootclasspath6}"
1058             source="5"
1059             executable="${javadoc7}"
1060             failonerror = "true">
1061      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1062      <arg value="-XDignore.symbol.file=true"/>
1063    </javadoc>
1064  </target>
1065
1066  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1067
1068  <target name="jsr166xclean">
1069    <delete dir="${build.jsr166x.dir}"/>
1070  </target>
1071
1072  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1073    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1074  </target>
1075
1076  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1077    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1078  </target>
1079
1080
672    <!-- jsr166y (no longer maintained) -->
1082
1083  <target name="jsr166ycompile" depends="configure-compiler">
1084    <mkdir dir="${build.jsr166y.classes.dir}"/>
1085
1086    <javac srcdir="${topsrc.dir}"
1087           destdir="${build.jsr166y.classes.dir}"
1088           debug="${build.debug}"
1089           debuglevel="${build.debuglevel}"
1090           deprecation="${build.deprecation}"
1091           source="6"
1092           target="6"
1093           classpath=""
1094           bootclasspath="${bootclasspath6}"
1095           includeAntRuntime="false"
1096           includeJavaRuntime="false"
1097           encoding="ASCII"
1098           executable="${javac7}"
1099           fork="true">
1100
1101      <include name="jsr166y/**/*.java"/>
1102      <compilerarg value="-XDignore.symbol.file=true"/>
1103      <compilerarg value="-Xlint:all"/>
1104      <compilerarg value="-Werror"/>
1105      <compilerarg line="${build.args}"/>
1106    </javac>
1107  </target>
1108
1109  <target name="jsr166yjar" depends="jsr166ycompile">
1110    <jar destfile="${jsr166y.jar}" index="true">
1111      <fileset dir="${build.jsr166y.classes.dir}"/>
1112      <manifest>
1113        <attribute name="Built-By" value="${user.name}"/>
1114        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1115      </manifest>
1116    </jar>
1117  </target>
1118
1119  <target name="jsr166ydocs">
1120    <delete dir="${jsr166ydocs.dir}"/>
1121    <mkdir dir="${jsr166ydocs.dir}"/>
1122
1123    <javadoc destdir="${jsr166ydocs.dir}"
1124             packagenames="jsr166y.*"
1125             link="${java.api.url}"
1126             access="${build.javadoc.access}"
1127             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1128             bootclasspath="${bootclasspath6}"
1129             source="6"
1130             executable="${javadoc7}"
1131             failonerror = "true">
1132      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1133      <arg value="-XDignore.symbol.file=true"/>
1134    </javadoc>
1135  </target>
1136
1137  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1138
1139  <target name="jsr166yclean">
1140    <delete dir="${build.jsr166y.dir}"/>
1141  </target>
1142
1143  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1144    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1145  </target>
1146
1147  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1148    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1149  </target>
1150
1151
673    <!-- extra166y (no longer maintained) -->
1153
1154  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1155    <mkdir dir="${build.extra166y.classes.dir}"/>
1156
1157    <javac srcdir="${topsrc.dir}"
1158           destdir="${build.extra166y.classes.dir}"
1159           debug="${build.debug}"
1160           debuglevel="${build.debuglevel}"
1161           deprecation="${build.deprecation}"
1162           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1163           classpath=""
1164           source="6"
1165           target="6"
1166           includeAntRuntime="false"
1167           includeJavaRuntime="false"
1168           encoding="ASCII"
1169           executable="${javac7}"
1170           fork="true">
1171
1172      <include name="extra166y/**/*.java"/>
1173      <compilerarg value="-XDignore.symbol.file=true"/>
1174      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1175      <compilerarg value="-Werror"/>
1176      <compilerarg line="${build.args}"/>
1177    </javac>
1178  </target>
1179
1180  <target name="extra166yjar" depends="extra166ycompile">
1181    <jar destfile="${extra166y.jar}" index="true">
1182      <fileset dir="${build.extra166y.classes.dir}"/>
1183      <manifest>
1184        <attribute name="Built-By" value="${user.name}"/>
1185        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1186      </manifest>
1187    </jar>
1188  </target>
1189
1190  <target name="extra166ydocs">
1191    <delete dir="${extra166ydocs.dir}"/>
1192    <mkdir dir="${extra166ydocs.dir}"/>
1193
1194    <javadoc destdir="${extra166ydocs.dir}"
1195             packagenames="extra166y.*"
1196             link="${java.api.url}"
1197             access="${build.javadoc.access}"
1198             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1199             bootclasspath="${bootclasspath6}"
1200             source="6"
1201             executable="${javadoc7}">
1202      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1203      <arg value="-XDignore.symbol.file=true"/>
1204    </javadoc>
1205  </target>
1206
1207  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1208
1209  <target name="extra166yclean">
1210    <delete dir="${build.extra166y.dir}"/>
1211  </target>
1212
1213  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1214    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1215  </target>
1216
1217  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1218    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1219  </target>
1220
1221
674    <!-- jsr166e (no longer maintained) -->
675  
1224  <property name="build.jsr166e.java.version" value="6"/>
1225  <property name="build.jsr166e.javac" value="${javac6}"/>
1226
1227  <target name="jsr166ecompile" depends="configure-compiler">
1228    <mkdir dir="${build.jsr166e.classes.dir}"/>
1229
1230    <javac srcdir="${topsrc.dir}"
1231           destdir="${build.jsr166e.classes.dir}"
1232           debug="${build.debug}"
1233           debuglevel="${build.debuglevel}"
1234           deprecation="${build.deprecation}"
1235           source="${build.jsr166e.java.version}"
1236           target="${build.jsr166e.java.version}"
1237           classpath=""
1238           includeAntRuntime="false"
1239           includeJavaRuntime="false"
1240           executable="${build.jsr166e.javac}"
1241           fork="true">
1242
1243      <include name="jsr166e/**/*.java"/>
1244      <compilerarg value="-XDignore.symbol.file=true"/>
1245      <compilerarg value="-Xlint:all"/>
1246      <compilerarg value="-Werror"/>
1247      <compilerarg line="${build.args}"/>
1248    </javac>
1249  </target>
1250
1251  <target name="jsr166edoclint">
1252    <mkdir dir="${build.jsr166e.classes.dir}"/>
1253
1254    <javac srcdir="${topsrc.dir}"
1255           destdir="${build.jsr166e.classes.dir}"
1256           debug="${build.debug}"
1257           debuglevel="${build.debuglevel}"
1258           deprecation="${build.deprecation}"
1259           source="${build.jsr166e.java.version}"
1260           target="${build.jsr166e.java.version}"
1261           classpath=""
1262           bootclasspath="${bootclasspath6}"
1263           includeAntRuntime="false"
1264           includeJavaRuntime="false"
1265           executable="${javac8}"
1266           fork="true">
1267
1268      <include name="jsr166e/**/*.java"/>
1269      <compilerarg value="-XDignore.symbol.file=true"/>
1270      <compilerarg value="-Xlint:all"/>
1271      <compilerarg value="-Werror"/>
1272      <compilerarg value="-Xdoclint:all/protected"/>
1273    </javac>
1274  </target>
1275
1276  <target name="jsr166ejar" depends="jsr166ecompile">
1277    <jar destfile="${jsr166e.jar}" index="true">
1278      <fileset dir="${build.jsr166e.classes.dir}"/>
1279      <manifest>
1280        <attribute name="Built-By" value="${user.name}"/>
1281        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1282      </manifest>
1283    </jar>
1284  </target>
1285
1286  <target name="jsr166edocs">
1287    <delete dir="${jsr166edocs.dir}"/>
1288    <mkdir dir="${jsr166edocs.dir}"/>
1289
1290    <javadoc destdir="${jsr166edocs.dir}"
1291             packagenames="jsr166e.*"
1292             link="${java.api.url}"
1293             access="${build.javadoc.access}"
1294             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1295             source="${build.jsr166e.java.version}"
1296             executable="${javadoc7}"
1297             failonerror = "true">
1298      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1299      <arg value="-XDignore.symbol.file=true"/>
1300    </javadoc>
1301  </target>
1302
1303  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1304    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1305    <run-tck-tests
1306      tck.src.dir="${test.src.dir}/tck-jsr166e"
1307      target="${build.jsr166e.java.version}"
1308      workdir="${build.jsr166e.dir}"
1309      classes="${jsr166e.jar}"/>
1310  </target>
1311
1312  <target name="jsr166e-tck">
1313
1314 <!--     <antcall target="clean"/> -->
1315 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1316 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1317 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1318 <!--     </antcall> -->
1319
1320    <antcall target="clean"/>
1321    <antcall target="jsr166e-tck-one-java-version">
1322      <param name="build.jsr166e.java.version" value="7"/>
1323      <param name="build.jsr166e.javac" value="${javac7}"/>
1324    </antcall>
1325
1326    <antcall target="clean"/>
1327    <antcall target="jsr166e-tck-one-java-version">
1328      <param name="build.jsr166e.java.version" value="6"/>
1329      <param name="build.jsr166e.javac" value="${javac6}"/>
1330    </antcall>
1331  </target>
1332
1333  <target name="jsr166e-test" depends="jsr166e-tck"/>
1334
1335  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1336
1337  <target name="jsr166eclean">
1338    <delete dir="${build.jsr166e.dir}"/>
1339  </target>
1340
1341  <target name="jsr166edist-jar"
1342          depends="jsr166eclean, jsr166ejar">
1343    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1344  </target>
1345
1346  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1347    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1348  </target>
1349
1350
676   <!-- Find buglets that can be detected by static build tools -->
677  
678 <  <target name="lint">
679 <    <antcall target="dists">
680 <      <param name="build.javadoc.access" value="public"/>
681 <    </antcall>
682 <  </target>
678 > <!--   <target name="lint"> -->
679 > <!--     <antcall target="dists"> -->
680 > <!--       <param name="build.javadoc.access" value="protected"/> -->
681 > <!--     </antcall> -->
682 > <!--   </target> -->
683  
684   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
685 <  <target name="lint-private">
685 >  <target name="doclint-private">
686      <antcall target="dist">
687        <param name="build.javadoc.access" value="private"/>
688      </antcall>
# Line 1365 | Line 690
690  
691  
692   <!-- ==============================================================
693 <  Experimental errorprone support - http://errorprone.info
694 <  You may need to bring your own errorprone jar.
693 >  Experimental errorprone support
694 >  https://errorprone.info
695 >  https://errorprone.info/docs/installation
696 >  https://github.com/google/error-prone/issues/1143
697   =================================================================== -->
698 +  <path id="errorprone.processorpath.path">
699 +    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
700 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
701 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
702 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
703 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
704 +  </path>
705 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
706 +  <property name="errorprone.jsr166.user.flags" value=""/>
707 +  <property name="errorprone.jsr166.flags"
708 +            value="-Xep:HashtableContains:OFF
709 +                   -Xep:JdkObsolete:OFF
710 +                   -Xep:MissingOverride:OFF
711 +                   -Xep:MissingFail:OFF
712 +                   -Xep:ThreadPriorityCheck:OFF
713 +                   -Xep:MixedArrayDimensions:ERROR
714 +                   -Xep:RemoveUnusedImports:ERROR
715 +                   -Xep:EmptyIf:ERROR
716 +                   -Xep:MultipleTopLevelClasses:ERROR
717 +                   -Xep:ClassName:ERROR
718 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
719 +                   -Xep:RedundantThrows:ERROR
720 +                   -Xep:IdentityBinaryExpression:WARN
721 +                   -Xep:ConstructorInvokesOverridable:WARN
722 +                   -Xep:MethodCanBeStatic:WARN
723 +                   ${errorprone.jsr166.user.flags}"/>
724 +  <!-- -Xep:WildcardImport:ERROR -->
725 +  <property name="errorprone.jsr166.test.flags"
726 +            value="-Xep:StringSplitter:OFF
727 +                   -Xep:BoxedPrimitiveConstructor:OFF
728 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
729 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
730    <target name="errorprone"
731            depends="clean, configure-compiler"
732            description="Run errorprone over jsr166 source code (experimental)">
# Line 1389 | Line 748
748             fork="true">
749  
750        <include name="**/*.java"/>
751 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
752 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
753 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
754 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
755 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1397 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1398 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1399 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1400 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1401 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
751 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
752 >      <compilerarg value="-J--illegal-access=permit"/>
753 >      <compilerarg value="-XDcompilePolicy=simple"/>
754 >      <compilerarg value="-processorpath"/>
755 >      <compilerarg pathref="errorprone.processorpath.path"/>
756        <compilerarg value="-Xplugin:ErrorProne
757 <                          -Xep:IdentityBinaryExpression:WARN
1404 <                          -Xep:MissingOverride:OFF
1405 <                          -Xep:MixedArrayDimensions:WARN
1406 <                          -Xep:RemoveUnusedImports:ERROR
1407 <                          -Xep:MethodCanBeStatic:WARN"/>
757 >                          ${errorprone.jsr166.flags}"/>
758        <compilerarg value="--patch-module=java.base=${src.dir}"/>
759        <compilerarg value="-Xprefer:source"/>
760        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1419 | Line 769
769      </jar>
770  
771      <run-tck-tests
772 <      target="${build.main.java.version}"
772 >      target="${java.runtime.target}"
773        workdir="${build.dir}"
774        classes="${product.jar}">
775        <javac-elements>
776 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
777 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
778 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
779 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1430 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1431 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1432 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1433 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1434 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1435 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
776 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
777 >        <compilerarg value="-J--illegal-access=permit"/>
778 >        <compilerarg value="-XDcompilePolicy=simple"/>
779 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
780          <compilerarg value="-Xplugin:ErrorProne
781 <                            -Xep:IdentityBinaryExpression:WARN
782 <                            -Xep:BoxedPrimitiveConstructor:OFF
1439 <                            -Xep:HashtableContains:OFF
1440 <                            -Xep:ModifyingCollectionWithItself:OFF
1441 <                            -Xep:MissingOverride:OFF
1442 <                            -Xep:MixedArrayDimensions:WARN
1443 <                            -Xep:RemoveUnusedImports:ERROR
1444 <                            -Xep:MethodCanBeStatic:WARN"/>
781 >                            ${errorprone.jsr166.flags}
782 >                            ${errorprone.jsr166.test.flags}"/>
783          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
784        </javac-elements>
785      </run-tck-tests>
786    </target>
787  
788 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
789 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
790 +  <target name="errorprone-jtreg"
791 +          depends="jar"
792 +          description="Run errorprone over jtreg tests (experimental)">
793 +
794 +    <run-jtreg-tests
795 +       target="${java.runtime.target}"
796 +       workdir="${build.dir}"
797 +       classes="${product.jar}"
798 +       verbose="all">
799 +      <jtreg-elements>
800 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
801 +        <arg value="-javacoption:-processorpath"/>
802 +        <arg value="-javacoption:${errorprone.processorpath}"/>
803 +        <arg value="-javacoption:-Xplugin:ErrorProne
804 +                            ${errorprone.jsr166.flags}
805 +                            ${errorprone.jsr166.test.flags}
806 +                            -Xep:MultipleTopLevelClasses:WARN
807 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
808 +      </jtreg-elements>
809 +    </run-jtreg-tests>
810 +  </target>
811 +
812  
813   <!-- ==============================================================
814    Running guava tests against jsr166 code
# Line 1500 | Line 862
862      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
863           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
864      <junit printsummary="true" showoutput="true" haltonfailure="true"
865 <           jvm="${java9}" fork="true">
866 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
865 >           jvm="${build.main.java}" fork="true">
866 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
867        <formatter type="brief"/>
868        <classpath>
869          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines