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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines