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.237 by jsr166, Fri Mar 24 15:57:26 2017 UTC vs.
Revision 1.305 by jsr166, Sun Oct 6 17:51:03 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
174      <mkdir dir="@{workdir}/tck-classes"/>
175  
176      <javac srcdir="@{tck.src.dir}"
# Line 254 | Line 191
191        <compilerarg value="-XDignore.symbol.file=true"/>
192        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
193        <compilerarg value="-Xdoclint:reference/private"/>
194 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
258 <      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
194 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
195        <compilerarg line="${build.args}"/>
196        <javac-elements/>
197  
# Line 265 | 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"/>
289 <        </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>
312 <  </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 -->
319 <    <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  
330    <local name="modules"/>
331    <condition property="modules">
332      <available file="${jdk@{target}.home}/jmods" type="dir"/>
333    </condition>
334
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"/>
342 <      <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 358 | 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  
377    <local name="modules"/>
378    <condition property="modules">
379      <and>
380        <available file="${jdk9.home}/jmods" type="dir"/>
381        <equals arg1="9" arg2="${build.main.java.version}"/>
382      </and>
383    </condition>
384
323      <local name="destdir"/>
324 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
387 <    <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 401 | 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 435 | 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 445 | 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"/>
467 <      <arg value="implSpec:a:Implementation Requirements:"/>
468 <      <arg value="-tag"/>
469 <      <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"/> -->
473 < <!--       <arg value="-tag"/> -->
474 < <!--       <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 481 | Line 426
426            description="Puts all distributable products in single hierarchy"/>
427  
428  
484  <target name="release"
485          depends="dist"
486          description="Puts entire CVS tree, plus distribution productions, in a jar">
487
488    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
489
490    <jar basedir="${basedir}" destfile="${release.jar}">
491      <!-- <exclude name="build/**"/> -->
492      <exclude name="${release.jar}"/>
493      <exclude name="user.properties"/>
494      <exclude name="etc/notes/**"/>
495      <exclude name="src/emulation/**"/>
496      <exclude name="**/SyntaxTest.java"/>
497      <exclude name="**/SuperfluousAbstract.java"/>
498      <manifest>
499        <attribute name="Built-By" value="${user.name}"/>
500        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
501      </manifest>
502    </jar>
503  </target>
504
505
429    <target name="clean"
430            description="Removes all build products">
508
431      <delete dir="${build.dir}"/>
510
432    </target>
433  
434  
435    <target name="dist-clean"
436            description="Removes all build and distribution products">
516
437      <delete dir="${build.dir}"/>
438      <delete dir="${dist.dir}"/>
519
439    </target>
440  
441  
# Line 531 | 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 566 | 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">
580 <  </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 target="clean"/>
506 >    <antcall>
507 >      <param name="java.runtime.target" value="11"/>
508 >      <param name="build.main.javac" value="${javac11}"/>
509 >      <param name="build.main.javadoc" value="${javadoc12}"/>
510 >      <param name="build.main.javadoc.source" value="11"/>
511 >      <target name="test"/>
512 >      <target name="docs"/>
513 >    </antcall>
514 >  </target>
515  
516 < <!--   </target> -->
516 >  <target name="test12">
517 >    <antcall target="clean"/>
518 >    <antcall>
519 >      <param name="java.runtime.target" value="12"/>
520 >      <param name="build.main.javac" value="${javac12}"/>
521 >      <param name="build.main.javadoc" value="${javadoc12}"/>
522 >      <param name="build.main.javadoc.source" value="12"/>
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 target="clean"/>
530 >    <antcall>
531 >      <param name="java.runtime.target" value="13"/>
532 >      <param name="build.main.javac" value="${javac13}"/>
533 >      <param name="build.main.javadoc" value="${javadoc13}"/>
534 >      <param name="build.main.javadoc.source" value="13"/>
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 target="clean"/>
542 >    <antcall>
543 >      <param name="java.runtime.target" value="14"/>
544 >      <param name="build.main.javac" value="${javac14}"/>
545 >      <param name="build.main.javadoc" value="${javadoc14}"/>
546 >      <param name="build.main.javadoc.source" value="14"/>
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 target="clean"/>
554 >    <antcall>
555 >      <param name="java.runtime.target" value="12"/>
556 >      <param name="build.main.javac" value="${javac11}"/>
557 >      <param name="build.main.javadoc" value="${javadoc12}"/>
558 >      <param name="build.main.javadoc.source" value="11"/>
559 >      <target name="test"/>
560 >      <target name="docs"/>
561 >    </antcall>
562 >  </target>
563  
564 < <!--   </target> -->
564 >  <target name="test11-13">
565 >    <antcall target="clean"/>
566 >    <antcall>
567 >      <param name="java.runtime.target" value="13"/>
568 >      <param name="build.main.javac" value="${javac11}"/>
569 >      <param name="build.main.javadoc" value="${javadoc13}"/>
570 >      <param name="build.main.javadoc.source" value="11"/>
571 >      <target name="test"/>
572 >      <target name="docs"/>
573 >    </antcall>
574 >  </target>
575  
576 +  <target name="test11-14">
577 +    <antcall target="clean"/>
578 +    <antcall>
579 +      <param name="java.runtime.target" value="14"/>
580 +      <param name="build.main.javac" value="${javac11}"/>
581 +      <param name="build.main.javadoc" value="${javadoc14}"/>
582 +      <param name="build.main.javadoc.source" value="11"/>
583 +      <target name="test"/>
584 +      <target name="docs"/>
585 +    </antcall>
586 +  </target>
587  
588  
589    <target name="configure-compiler">
# Line 627 | Line 606
606    </target>
607  
608  
630
631  <!-- Various demos and test programs -->
632
633
634  <!-- description="Benchmark from Doug Lea's AQS paper" -->
635  <target name="loops" depends="configure-compiler">
636
637    <mkdir dir="${build.loops.dir}"/>
638
639    <javac srcdir="${loops.src.dir}"
640          destdir="${build.loops.dir}"
641            debug="${build.debug}"
642       debuglevel="${build.debuglevel}"
643      deprecation="${build.deprecation}"
644           source="${build.sourcelevel}"
645           target="${build.sourcelevel}"
646         encoding="ASCII"
647             fork="true">
648
649      <compilerarg line="${build.args}"/>
650      <classpath refid="loops.classpath"/>
651      <compilerarg value="-XDignore.symbol.file=true"/>
652
653    </javac>
654
655    <java classname="ALoops" fork="true">
656      <classpath refid="loops.classpath"/>
657    </java>
658
659  </target>
660
661
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 672 | 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}"/>
682 <      <compilerarg line="${build.args}"/>
683 <
684 <    </javac>
685 <
686 <  </target>
687 <
688 <
689 <  <!-- jsr166 4jdk8 -->
690 <
691 <  <target name="4jdk8compile"
692 <          depends="configure-compiler"
693 <          description="Compiles src/jdk8 sources, targeting jdk8">
694 <
695 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
696 <
697 <    <javac srcdir="${4jdk8src.dir}"
698 <           destdir="${build.4jdk8.classes.dir}"
699 <           debug="${build.debug}"
700 <           debuglevel="${build.debuglevel}"
701 <           deprecation="${build.deprecation}"
702 <           source="8"
703 <           target="8"
704 <           classpath=""
705 <           bootclasspath="${bootclasspath8}"
706 <           includeAntRuntime="false"
707 <           includeJavaRuntime="false"
708 <           encoding="ASCII"
709 <           executable="${javac8}"
710 <           fork="true">
711 <
712 <      <include name="**/*.java"/>
713 <      <compilerarg value="-Xprefer:source"/>
714 <      <compilerarg value="-XDignore.symbol.file=true"/>
715 <      <compilerarg value="-Xlint:all"/>
716 <      <compilerarg value="-Werror"/>
717 <      <compilerarg line="${build.args}"/>
718 <
719 <    </javac>
720 <  </target>
721 <
722 <  <target name="4jdk8doclint"
723 <          depends="configure-compiler"
724 <          description="Finds doclint warnings">
725 <
726 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
727 <
728 <    <javac srcdir="${4jdk8src.dir}"
729 <           destdir="${build.4jdk8.classes.dir}"
730 <           debug="${build.debug}"
731 <           debuglevel="${build.debuglevel}"
732 <           deprecation="${build.deprecation}"
733 <           source="8"
734 <           target="8"
735 <           classpath=""
736 <           bootclasspath="${bootclasspath8}"
737 <           includeAntRuntime="false"
738 <           includeJavaRuntime="false"
739 <           encoding="ASCII"
740 <           executable="${javac8}"
741 <           fork="true">
742 <
743 <      <include name="**/*.java"/>
744 <      <compilerarg value="-Xprefer:source"/>
745 <      <compilerarg value="-XDignore.symbol.file=true"/>
746 <      <compilerarg value="-Xlint:all"/>
747 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
748 <      <compilerarg line="${build.args}"/>
749 <
750 <    </javac>
751 <  </target>
752 <
753 <
754 <  <target name="4jdk8jar"
755 <          depends="4jdk8compile"
756 <          description="Builds library jar from compiled sources">
757 <
758 <    <jar destfile="${4jdk8product.jar}">
759 <      <fileset dir="${build.4jdk8.classes.dir}"/>
760 <      <manifest>
761 <        <attribute name="Built-By" value="${user.name}"/>
762 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
763 <      </manifest>
764 <    </jar>
765 <
766 <  </target>
767 <
768 <
769 <  <target name="4jdk8-tck"
770 <          depends="4jdk8jar"
771 <          description="Runs tck tests for jsr166-4jdk8 directly">
772 <
773 <    <run-tck-tests
774 <      target="8"
775 <      workdir="${build.4jdk8.dir}"
776 <      classes="${4jdk8product.jar}">
777 <      <javac-elements>
778 <        <!-- JDK9+ test classes -->
779 <        <exclude name="*9Test.java"/>
780 <        <exclude name="*10Test.java"/>
781 <        <compilerarg value="-Werror"/>
782 <      </javac-elements>
783 <    </run-tck-tests>
784 <  </target>
785 <
786 <
787 <  <target name="4jdk8-jtreg"
788 <          depends="4jdk8jar"
789 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
790 <    <run-jtreg-tests
791 <       target="8"
792 <       workdir="${build.4jdk8.dir}"
793 <       classes="${4jdk8product.jar}"/>
794 <  </target>
795 <
796 <
797 <  <target name="4jdk8-test"
798 <          depends="4jdk8-tck, 4jdk8-jtreg"
799 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
800 <  </target>
801 <
802 <
803 <  <target name="4jdk8docs"
804 <          description="Builds javadocs for src/jdk8 to dist dir">
805 <
806 <    <delete dir="${4jdk8docs.dir}"/>
807 <    <mkdir dir="${4jdk8docs.dir}"/>
808 <
809 <    <javadoc destdir="${4jdk8docs.dir}"
810 <             packagenames="none"
811 <             link="${java8.api.url}"
812 <             overview="${4jdk8src.dir}/intro.html"
813 <             access="${build.javadoc.access}"
814 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
815 <             classpath=""
816 <             executable="${javadoc8}"
817 <             failonerror = "true">
818 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
819 <        <include name="**/*.java"/>
820 <      </fileset>
821 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
822 <      <arg value="-XDignore.symbol.file=true"/>
823 <      <arg value="-tag"/>
824 <      <arg value="${javadoc.jls.option}"/>
825 < <!-- @apiNote currently unused -->
826 < <!--       <arg value="-tag"/> -->
827 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
828 <      <arg value="-tag"/>
829 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
830 <      <arg value="-tag"/>
831 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
832 <    </javadoc>
833 <  </target>
834 <
835 <
836 <  <target name="4jdk8dist"
837 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
838 <          description="Puts all distributable products in single hierarchy"/>
839 <
840 <
841 <  <target name="4jdk8clean"
842 <          description="Removes all 4jdk8 build products">
843 <
844 <    <delete dir="${build.4jdk8.dir}"/>
845 <
846 <  </target>
847 <
848 <
849 <  <target name="4jdk8dist-jar"
850 <          depends="4jdk8clean, 4jdk8jar">
851 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
852 <  </target>
853 <
854 <
855 <  <target name="4jdk8dist-docs"
856 <          depends="4jdk8clean, 4jdk8docs">
857 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
858 <  </target>
859 <
860 <
861 <
862 <  <!-- jsr166 4jdk7 -->
863 <
864 <  <target name="4jdk7compile"
865 <          depends="configure-compiler"
866 <          description="Compiles src/jdk7 sources, targeting jdk7">
867 <
868 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
869 <
870 <    <javac srcdir="${4jdk7src.dir}"
871 <           destdir="${build.4jdk7.classes.dir}"
872 <           debug="${build.debug}"
873 <           debuglevel="${build.debuglevel}"
874 <           deprecation="${build.deprecation}"
875 <           source="6"
876 <           target="6"
877 <           classpath=""
878 <           bootclasspath="${bootclasspath6}"
879 <           includeAntRuntime="false"
880 <           includeJavaRuntime="false"
881 <           encoding="ASCII"
882 <           executable="${javac7}"
883 <           fork="true">
884 <
885 <      <include name="**/*.java"/>
886 <      <compilerarg value="-Xprefer:source"/>
887 <      <compilerarg value="-XDignore.symbol.file=true"/>
888 <      <compilerarg value="-Xlint:all"/>
889 <      <compilerarg value="-Werror"/>
890 <      <compilerarg line="${build.args}"/>
891 <
892 <    </javac>
893 <  </target>
894 <
895 <  <target name="4jdk7doclint"
896 <          depends="configure-compiler"
897 <          description="Finds doclint warnings">
898 <
899 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
900 <
901 <    <javac srcdir="${4jdk7src.dir}"
902 <           destdir="${build.4jdk7.classes.dir}"
903 <           debug="${build.debug}"
904 <           debuglevel="${build.debuglevel}"
905 <           deprecation="${build.deprecation}"
906 <           source="6"
907 <           target="6"
908 <           classpath=""
909 <           bootclasspath="${bootclasspath6}"
910 <           includeAntRuntime="false"
911 <           includeJavaRuntime="false"
912 <           encoding="ASCII"
913 <           executable="${javac8}"
914 <           fork="true">
915 <
916 <      <include name="**/*.java"/>
917 <      <compilerarg value="-Xprefer:source"/>
918 <      <compilerarg value="-XDignore.symbol.file=true"/>
919 <      <compilerarg value="-Xlint:all"/>
920 <      <compilerarg value="-Xdoclint:all/protected"/>
921 <      <compilerarg line="${build.args}"/>
922 <
923 <    </javac>
924 <  </target>
925 <
926 <
927 <  <target name="4jdk7jar"
928 <          depends="4jdk7compile"
929 <          description="Builds library jar from compiled sources">
930 <
931 <    <jar destfile="${4jdk7product.jar}">
932 <      <fileset dir="${build.4jdk7.classes.dir}"/>
933 <      <manifest>
934 <        <attribute name="Built-By" value="${user.name}"/>
935 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
936 <      </manifest>
937 <    </jar>
938 <
939 <  </target>
940 <
941 <
942 <  <target name="4jdk7-tck"
943 <          depends="4jdk7jar"
944 <          description="Runs tck tests for jsr166-4jdk7 directly">
945 <
946 <    <run-tck-tests
947 <      target="7"
948 <      workdir="${build.4jdk7.dir}"
949 <      classes="${4jdk7product.jar}">
950 <      <javac-elements>
951 <        <!-- JDK8+ test classes -->
952 <        <exclude name="*8Test.java"/>
953 <        <exclude name="*9Test.java"/>
954 <        <exclude name="*10Test.java"/>
955 <        <exclude name="DoubleAccumulatorTest.java"/>
956 <        <exclude name="DoubleAdderTest.java"/>
957 <        <exclude name="LongAccumulatorTest.java"/>
958 <        <exclude name="LongAdderTest.java"/>
959 <        <exclude name="CompletableFutureTest.java"/>
960 <        <exclude name="SplittableRandomTest.java"/>
961 <        <exclude name="StampedLockTest.java"/>
962 <        <exclude name="SubmissionPublisherTest.java"/>
963 <        <compilerarg value="-Werror"/>
964 <      </javac-elements>
965 <    </run-tck-tests>
966 <  </target>
967 <
968 <
969 <  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
970 <  <target name="4jdk7-tck-junit"
971 <          depends="4jdk7compile">
972 <
973 <    <junit printsummary="true"
974 <           showoutput="true"
975 <           errorProperty="junit.failed"
976 <           failureProperty="junit.failed"
977 <           includeantruntime="true"
978 <           jvm="${java7}"
979 <           fork="true">
980 <
981 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
982 <      <jvmarg value="-server"/>
983 <
984 <      <classpath>
985 <        <pathelement location="${junit.jar}"/>
986 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
987 <      </classpath>
988 <
989 <      <formatter type="brief"/>
990 <
991 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
992 <      </test>
993 <
994 <    </junit>
995 <  </target>
996 <
997 <  <target name="4jdk7-jtreg"
998 <          depends="4jdk7jar"
999 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
1000 <    <run-jtreg-tests
1001 <       target="7"
1002 <       workdir="${build.4jdk7.dir}"
1003 <       classes="${4jdk7product.jar}"/>
1004 <  </target>
1005 <
1006 <
1007 <  <target name="4jdk7-test"
1008 <          depends="4jdk7-tck, 4jdk7-jtreg"
1009 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
1010 <  </target>
1011 <
1012 <
1013 <  <target name="4jdk7docs"
1014 <          description="Builds javadocs for src/jdk7 to dist dir">
1015 <
1016 <    <delete dir="${4jdk7docs.dir}"/>
1017 <    <mkdir dir="${4jdk7docs.dir}"/>
1018 <
1019 <    <javadoc destdir="${4jdk7docs.dir}"
1020 <             packagenames="none"
1021 <             link="${java7.api.url}"
1022 <             overview="${4jdk7src.dir}/intro.html"
1023 <             access="${build.javadoc.access}"
1024 <             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1025 <             classpath=""
1026 <             executable="${javadoc7}"
1027 <             failonerror = "true">
1028 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1029 <        <include name="**/*.java"/>
1030 <      </fileset>
1031 <      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1032 <      <arg value="-XDignore.symbol.file=true"/>
1033 <    </javadoc>
1034 <  </target>
1035 <
1036 <
1037 <  <target name="4jdk7dist"
1038 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1039 <          description="Puts all distributable products in single hierarchy"/>
1040 <
1041 <
1042 <  <target name="4jdk7clean"
1043 <          description="Removes all 4jdk7 build products">
1044 <
1045 <    <delete dir="${build.4jdk7.dir}"/>
1046 <
1047 <  </target>
1048 <
1049 <
1050 <  <target name="4jdk7dist-jar"
1051 <          depends="4jdk7clean, 4jdk7jar">
1052 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1053 <  </target>
1054 <
1055 <
1056 <  <target name="4jdk7dist-docs"
1057 <          depends="4jdk7clean, 4jdk7docs">
1058 <    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1059 <  </target>
1060 <
1061 <
1062 <  <!-- jsr166x -->
1063 <
1064 <  <target name="jsr166xcompile"
1065 <          depends="configure-compiler"
1066 <          description="Compiles jsr166x sources to build dir">
1067 <
1068 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
1069 <
1070 <    <javac srcdir="${topsrc.dir}"
1071 <           destdir="${build.jsr166x.classes.dir}"
1072 <           debug="${build.debug}"
1073 <           debuglevel="${build.debuglevel}"
1074 <           deprecation="${build.deprecation}"
1075 <           classpath=""
1076 <           bootclasspath="${bootclasspath6}"
1077 <           source="5"
1078 <           target="5"
1079 <           includeAntRuntime="false"
1080 <           includeJavaRuntime="false"
1081 <           encoding="ASCII"
1082 <           executable="${javac7}"
1083 <           fork="true">
1084 <
1085 <      <include name="jsr166x/**/*.java"/>
1086 <      <compilerarg value="-XDignore.symbol.file=true"/>
1087 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1088 <      <compilerarg value="-Werror"/>
1089 <      <compilerarg line="${build.args}"/>
1090 <
1091 <    </javac>
1092 <  </target>
1093 <
1094 <
1095 <  <target name="jsr166xjar"
1096 <          depends="jsr166xcompile"
1097 <          description="Builds library jar from compiled sources">
1098 <
1099 <    <jar destfile="${jsr166x.jar}">
1100 <      <fileset dir="${build.jsr166x.classes.dir}"/>
1101 <      <manifest>
1102 <        <attribute name="Built-By" value="${user.name}"/>
1103 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1104 <      </manifest>
1105 <    </jar>
1106 <
1107 <  </target>
1108 <
1109 <
1110 <  <target name="jsr166xdocs"
1111 <          description="Builds javadocs to dist dir">
1112 <
1113 <    <delete dir="${jsr166xdocs.dir}"/>
1114 <    <mkdir dir="${jsr166xdocs.dir}"/>
1115 <
1116 <    <javadoc destdir="${jsr166xdocs.dir}"
1117 <             packagenames="jsr166x.*"
1118 <             link="${java.api.url}"
1119 <             access="${build.javadoc.access}"
1120 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1121 <             bootclasspath="${bootclasspath6}"
1122 <             source="5"
1123 <             executable="${javadoc7}"
1124 <             failonerror = "true">
1125 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1126 <      <arg value="-XDignore.symbol.file=true"/>
1127 <
1128 <    </javadoc>
1129 <  </target>
1130 <
1131 <
1132 <  <target name="jsr166xdist"
1133 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1134 <          description="Puts all distributable products in single hierarchy"/>
1135 <
1136 <
1137 <  <target name="jsr166xclean"
1138 <          description="Removes all jsr166x build products">
1139 <
1140 <    <delete dir="${build.jsr166x.dir}"/>
1141 <
1142 <  </target>
1143 <
1144 <
1145 <  <target name="jsr166xdist-jar"
1146 <          depends="jsr166xclean, jsr166xjar">
1147 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1148 <  </target>
1149 <
1150 <  <target name="jsr166xdist-docs"
1151 <          depends="jsr166xclean, jsr166xdocs">
1152 <    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1153 <  </target>
1154 <
1155 <  <!-- jsr166y -->
1156 <
1157 <
1158 <  <target name="jsr166ycompile"
1159 <          depends="configure-compiler"
1160 <          description="Compiles jsr166y sources">
1161 <
1162 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
1163 <
1164 <    <javac srcdir="${topsrc.dir}"
1165 <           destdir="${build.jsr166y.classes.dir}"
1166 <           debug="${build.debug}"
1167 <           debuglevel="${build.debuglevel}"
1168 <           deprecation="${build.deprecation}"
1169 <           source="6"
1170 <           target="6"
1171 <           classpath=""
1172 <           bootclasspath="${bootclasspath6}"
1173 <           includeAntRuntime="false"
1174 <           includeJavaRuntime="false"
1175 <           encoding="ASCII"
1176 <           executable="${javac7}"
1177 <           fork="true">
1178 <
1179 <      <include name="jsr166y/**/*.java"/>
1180 <      <compilerarg value="-XDignore.symbol.file=true"/>
1181 <      <compilerarg value="-Xlint:all"/>
1182 <      <compilerarg value="-Werror"/>
1183 <      <compilerarg line="${build.args}"/>
1184 <
1185 <    </javac>
1186 <  </target>
1187 <
1188 <
1189 <  <target name="jsr166yjar"
1190 <          depends="jsr166ycompile"
1191 <          description="Builds library jar from compiled sources">
1192 <
1193 <    <jar destfile="${jsr166y.jar}" index="true">
1194 <      <fileset dir="${build.jsr166y.classes.dir}"/>
1195 <      <manifest>
1196 <        <attribute name="Built-By" value="${user.name}"/>
1197 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1198 <      </manifest>
1199 <    </jar>
1200 <
1201 <  </target>
1202 <
1203 <
1204 <  <target name="jsr166ydocs"
1205 <          description="Builds javadocs to dist dir">
1206 <
1207 <    <delete dir="${jsr166ydocs.dir}"/>
1208 <    <mkdir dir="${jsr166ydocs.dir}"/>
1209 <
1210 <    <javadoc destdir="${jsr166ydocs.dir}"
1211 <             packagenames="jsr166y.*"
1212 <             link="${java.api.url}"
1213 <             access="${build.javadoc.access}"
1214 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1215 <             bootclasspath="${bootclasspath6}"
1216 <             source="6"
1217 <             executable="${javadoc7}"
1218 <             failonerror = "true">
1219 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1220 <      <arg value="-XDignore.symbol.file=true"/>
1221 <
1222 <    </javadoc>
1223 <  </target>
1224 <
1225 <
1226 <  <target name="jsr166ydist"
1227 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1228 <          description="Puts all distributable products in single hierarchy"/>
1229 <
1230 <
1231 <  <target name="jsr166yclean"
1232 <          description="Removes all jsr166y build products">
1233 <
1234 <    <delete dir="${build.jsr166y.dir}"/>
1235 <
1236 <  </target>
1237 <
1238 <
1239 <  <target name="jsr166ydist-jar"
1240 <          depends="jsr166yclean, jsr166yjar">
1241 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1242 <  </target>
1243 <
1244 <  <target name="jsr166ydist-docs"
1245 <          depends="jsr166yclean, jsr166ydocs">
1246 <    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1247 <  </target>
1248 <
1249 <
1250 <  <!-- extra166y -->
1251 <
1252 <
1253 <  <target name="extra166ycompile"
1254 <          depends="configure-compiler, jsr166yjar"
1255 <          description="Compiles extra166y sources">
1256 <
1257 <    <mkdir dir="${build.extra166y.classes.dir}"/>
1258 <
1259 <    <javac srcdir="${topsrc.dir}"
1260 <           destdir="${build.extra166y.classes.dir}"
1261 <           debug="${build.debug}"
1262 <           debuglevel="${build.debuglevel}"
1263 <           deprecation="${build.deprecation}"
1264 <           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1265 <           classpath=""
1266 <           source="6"
1267 <           target="6"
1268 <           includeAntRuntime="false"
1269 <           includeJavaRuntime="false"
1270 <           encoding="ASCII"
1271 <           executable="${javac7}"
1272 <           fork="true">
1273 <
1274 <      <include name="extra166y/**/*.java"/>
1275 <      <compilerarg value="-XDignore.symbol.file=true"/>
1276 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1277 <      <compilerarg value="-Werror"/>
1278 <      <compilerarg line="${build.args}"/>
1279 <
1280 <    </javac>
1281 <  </target>
1282 <
1283 <
1284 <  <target name="extra166yjar"
1285 <          depends="extra166ycompile"
1286 <          description="Builds library jar from compiled sources">
1287 <
1288 <    <jar destfile="${extra166y.jar}" index="true">
1289 <      <fileset dir="${build.extra166y.classes.dir}"/>
1290 <      <manifest>
1291 <        <attribute name="Built-By" value="${user.name}"/>
1292 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1293 <      </manifest>
1294 <    </jar>
1295 <
1296 <  </target>
1297 <
1298 <
1299 <  <target name="extra166ydocs"
1300 <          description="Builds javadocs to build dir">
1301 <
1302 <    <delete dir="${extra166ydocs.dir}"/>
1303 <    <mkdir dir="${extra166ydocs.dir}"/>
1304 <
1305 <    <javadoc destdir="${extra166ydocs.dir}"
1306 <             packagenames="extra166y.*"
1307 <             link="${java.api.url}"
1308 <             access="${build.javadoc.access}"
1309 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1310 <             bootclasspath="${bootclasspath6}"
1311 <             source="6"
1312 <             executable="${javadoc7}">
1313 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1314 <      <arg value="-XDignore.symbol.file=true"/>
1315 <
1316 <    </javadoc>
1317 <  </target>
1318 <
1319 <
1320 <  <target name="extra166ydist"
1321 <          depends="extra166ydist-jar, extra166ydist-docs"
1322 <          description="Puts all distributable products in single hierarchy"/>
1323 <
1324 <
1325 <  <target name="extra166yclean"
1326 <          description="Removes all extra166y build products">
1327 <
1328 <    <delete dir="${build.extra166y.dir}"/>
1329 <
1330 <  </target>
1331 <
1332 <
1333 <  <target name="extra166ydist-jar"
1334 <          depends="extra166yclean, extra166yjar">
1335 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1336 <  </target>
1337 <
1338 <  <target name="extra166ydist-docs"
1339 <          depends="extra166yclean, extra166ydocs">
1340 <    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1341 <  </target>
1342 <
1343 <  <!-- jsr166e -->
1344 <
1345 <  <property name="build.jsr166e.java.version" value="6"/>
1346 <  <property name="build.jsr166e.javac" value="${javac6}"/>
1347 <
1348 <  <target name="jsr166ecompile"
1349 <          depends="configure-compiler"
1350 <          description="Compiles jsr166e sources">
1351 <
1352 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
1353 <
1354 <    <javac srcdir="${topsrc.dir}"
1355 <           destdir="${build.jsr166e.classes.dir}"
1356 <           debug="${build.debug}"
1357 <           debuglevel="${build.debuglevel}"
1358 <           deprecation="${build.deprecation}"
1359 <           source="${build.jsr166e.java.version}"
1360 <           target="${build.jsr166e.java.version}"
1361 <           classpath=""
1362 <           includeAntRuntime="false"
1363 <           includeJavaRuntime="false"
1364 <           executable="${build.jsr166e.javac}"
1365 <           fork="true">
1366 <
1367 <      <include name="jsr166e/**/*.java"/>
1368 <      <compilerarg value="-XDignore.symbol.file=true"/>
1369 <      <compilerarg value="-Xlint:all"/>
1370 <      <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}"/>
1372
630      </javac>
631    </target>
632  
1376  <!-- jsr166e: find doclint errors -->
1377  <target name="jsr166edoclint">
1378
1379    <mkdir dir="${build.jsr166e.classes.dir}"/>
1380
1381    <javac srcdir="${topsrc.dir}"
1382           destdir="${build.jsr166e.classes.dir}"
1383           debug="${build.debug}"
1384           debuglevel="${build.debuglevel}"
1385           deprecation="${build.deprecation}"
1386           source="${build.jsr166e.java.version}"
1387           target="${build.jsr166e.java.version}"
1388           classpath=""
1389           bootclasspath="${bootclasspath6}"
1390           includeAntRuntime="false"
1391           includeJavaRuntime="false"
1392           executable="${javac8}"
1393           fork="true">
1394
1395      <include name="jsr166e/**/*.java"/>
1396      <compilerarg value="-XDignore.symbol.file=true"/>
1397      <compilerarg value="-Xlint:all"/>
1398      <compilerarg value="-Werror"/>
1399      <compilerarg value="-Xdoclint:all/protected"/>
1400
1401    </javac>
1402  </target>
1403
1404
1405  <target name="jsr166ejar"
1406          depends="jsr166ecompile"
1407          description="Builds library jar from compiled sources">
1408
1409    <jar destfile="${jsr166e.jar}" index="true">
1410      <fileset dir="${build.jsr166e.classes.dir}"/>
1411      <manifest>
1412        <attribute name="Built-By" value="${user.name}"/>
1413        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1414      </manifest>
1415    </jar>
1416
1417  </target>
1418
1419
1420  <target name="jsr166edocs"
1421          description="Builds javadocs to build dir">
1422
1423    <delete dir="${jsr166edocs.dir}"/>
1424    <mkdir dir="${jsr166edocs.dir}"/>
1425
1426    <javadoc destdir="${jsr166edocs.dir}"
1427             packagenames="jsr166e.*"
1428             link="${java.api.url}"
1429             access="${build.javadoc.access}"
1430             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1431             source="${build.jsr166e.java.version}"
1432             executable="${javadoc7}"
1433             failonerror = "true">
1434      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1435      <arg value="-XDignore.symbol.file=true"/>
1436
1437    </javadoc>
1438  </target>
1439
1440
1441  <target name="jsr166e-tck-one-java-version"
1442          depends="jsr166ejar">
1443
1444    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1445
1446    <run-tck-tests
1447      tck.src.dir="${test.src.dir}/tck-jsr166e"
1448      target="${build.jsr166e.java.version}"
1449      workdir="${build.jsr166e.dir}"
1450      classes="${jsr166e.jar}"/>
1451  </target>
1452
1453  <target name="jsr166e-tck"
1454          description="Runs tck tests for jsr166e for multiple java versions">
1455
1456 <!--     <antcall target="clean"/> -->
1457 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1458 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1459 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1460 <!--     </antcall> -->
1461
1462    <antcall target="clean"/>
1463    <antcall target="jsr166e-tck-one-java-version">
1464      <param name="build.jsr166e.java.version" value="7"/>
1465      <param name="build.jsr166e.javac" value="${javac7}"/>
1466    </antcall>
1467
1468    <antcall target="clean"/>
1469    <antcall target="jsr166e-tck-one-java-version">
1470      <param name="build.jsr166e.java.version" value="6"/>
1471      <param name="build.jsr166e.javac" value="${javac6}"/>
1472    </antcall>
1473  </target>
1474
1475
1476  <target name="jsr166e-test"
1477          depends="jsr166e-tck"
1478          description="Runs all tests for jsr166e">
1479  </target>
1480
1481  <target name="jsr166edist"
1482          depends="jsr166edist-jar, jsr166edist-docs"
1483          description="Puts all distributable products in single hierarchy"/>
1484
1485
1486  <target name="jsr166eclean"
1487          description="Removes all jsr166e build products">
1488    <delete dir="${build.jsr166e.dir}"/>
1489  </target>
1490
1491
1492  <target name="jsr166edist-jar"
1493          depends="jsr166eclean, jsr166ejar">
1494    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1495  </target>
1496
1497  <target name="jsr166edist-docs"
1498          depends="jsr166eclean, jsr166edocs">
1499    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1500  </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 1517 | 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 1541 | 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"/>
1549 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1550 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1551 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1552 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1553 <      <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
1556 <                          -Xep:MissingOverride:OFF
1557 <                          -Xep:MixedArrayDimensions:WARN
1558 <                          -Xep:RemoveUnusedImports:ERROR
1559 <                          -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 1571 | 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"/>
1585 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1586 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1587 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1588 <        <compilerarg value="-Xplugin:ErrorProne
1589 <                            -Xep:IdentityBinaryExpression:WARN
1590 <                            -Xep:BoxedPrimitiveConstructor:OFF
1591 <                            -Xep:HashtableContains:OFF
1592 <                            -Xep:ModifyingCollectionWithItself:OFF
1593 <                            -Xep:MissingOverride:OFF
1594 <                            -Xep:MixedArrayDimensions:WARN
1595 <                            -Xep:RemoveUnusedImports:ERROR
1596 <                            -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 1652 | 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