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.154 by jsr166, Mon Jun 16 15:55:54 2014 UTC vs.
Revision 1.324 by jsr166, Wed Sep 29 01:13:44 2021 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 6 | Line 9
9  
10    Usage: ant [target]
11  
12 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
13 +  more details.
14 +
15    User-specific settings are read from user.properties.
16    See user.properties.sample for an explanation of some useful settings.
17  
# Line 13 | 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/jdk6
23 <  $HOME/jdk/jdk7
24 <  $HOME/jdk/jdk8
25 <  $HOME/jdk/jdk9
22 >  $HOME/jdk/jdk11
23 >  $HOME/jdk/jdk12
24 >  $HOME/jdk/jdk13
25 >  $HOME/jdk/jdk14
26 >  $HOME/jdk/jdk15
27 >  $HOME/jdk/jdk16
28 >  $HOME/jdk/jdk17
29 >  $HOME/jdk/jdk18
30    where each of the above is a JDK or a symlink to same, and
31 <  $HOME/jdk/src/jdk6
32 <  $HOME/jdk/src/jdk7
33 <  $HOME/jdk/src/jdk8
34 <  $HOME/jdk/src/jdk9
35 <  where each of the above is a complete JDK source tree
36 <  (e.g. mercurial forest) or a symlink to same.
31 >  $HOME/jdk/src/jdk11
32 >  $HOME/jdk/src/jdk12
33 >  $HOME/jdk/src/jdk13
34 >  $HOME/jdk/src/jdk14
35 >  $HOME/jdk/src/jdk15
36 >  $HOME/jdk/src/jdk16
37 >  $HOME/jdk/src/jdk17
38 >  $HOME/jdk/src/jdk18
39 >  where each of the above is a JDK source tree or a symlink to same.
40 >
41 >  Alternatively, define ant variables thus:
42 >  ant -Djdk$N.home=... -Djdk$N.src.home=...
43 >  for $N in 11 .. 18 ...
44 >
45 >  As of 2016-03, the sources in src/main are for jdk9+ only.
46 >  As of 2019-08, the sources in src/main are for jdk11+ only.
47 >  As of 2019-10, compatibility support for jdk8 is dropped entirely.
48   ------------------------------------------------------------------------------
49    </description>
50  
51 <  <!-- Display main targets by running 'ant -projecthelp' -->
51 >  <!-- Run 'ant -projecthelp' (default target) -->
52    <target name="usage">
53      <java classname="org.apache.tools.ant.Main">
54        <arg value="-projecthelp" />
55      </java>
56    </target>
57  
58 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
59  
60    <!-- User-specific settings -->
61    <property file="user.properties"/>
62  
63  
64    <!-- Compilation options -->
43  <property name="build.sourcelevel"    value="6"/>
65    <property name="build.debug"          value="true"/>
66    <property name="build.debuglevel"     value="source,lines,vars"/>
67    <property name="build.deprecation"    value="false"/>
68    <property name="build.javadoc.access" value="protected"/>
69  
49  <!-- Tck options; see JSR166TestCase.java -->
50  <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
51  <property name="jsr166.profileTests"     value="false"/>
52  <property name="jsr166.profileThreshold" value="100"/>
53  <property name="jsr166.runsPerTest"      value="1"/>
54  <!-- Allow running an individual tck test class -->
55  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
56  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
57
70    <!-- Build locations -->
71    <property name="build.dir"                   location="build"/>
72    <property name="build.classes.dir"           location="${build.dir}/classes"/>
73    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
74    <property name="build.loops.dir"             location="${build.dir}/loops"/>
63  <property name="build.reports.dir"           location="${build.dir}/reports"/>
64
65  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
66  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
67  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
68  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
69
70  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
71  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
72  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
73  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
74
75  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
76  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
77  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
78  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
75  
76    <!-- JDK locations -->
77    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 83 | Line 79
79    <macrodef name="defjdklocations">
80      <attribute name="v"/>
81      <sequential>
82 <    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
83 <    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
84 <    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
85 <    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
86 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
87 <    <local name="boot.jar.dir"/>
92 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
93 <    <path id="bootclasspath@{v}">
94 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
95 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
96 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
97 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
98 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
99 <    </path>
100 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
82 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
83 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
84 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
85 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
86 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
87 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
88      </sequential>
89    </macrodef>
90  
# Line 113 | Line 100
100      </sequential>
101    </macrodef>
102  
103 <  <defjdklocations v="6"/>
104 <  <defjdklocations v="7"/>
105 <  <defjdklocations v="8"/>
106 <  <defjdklocations v="9"/>
103 >  <defjdklocations v="11"/>
104 >  <defjdklocations v="12"/>
105 >  <defjdklocations v="13"/>
106 >  <defjdklocations v="14"/>
107 >  <defjdklocations v="15"/>
108 >  <defjdklocations v="16"/>
109 >  <defjdklocations v="17"/>
110 >  <defjdklocations v="18"/>
111  
112    <!-- Source locations -->
113    <property name="src.dir"              location="${basedir}/src/main"/>
114    <property name="test.src.dir"         location="${basedir}/src/test"/>
115    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
116    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
117 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
117 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
118 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
119 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
120 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
121 >  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
122 >  <property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
123 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
124 >  <property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
125 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
126    <property name="lib.dir"              location="${basedir}/lib"/>
127    <property name="dist.dir"             location="${basedir}/dist"/>
128    <property name="topsrc.dir"           location="${basedir}/src"/>
130  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
131  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
132  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
133  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
134  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
129  
130    <!-- Javadoc locations -->
131    <property name="docs.dir"          location="${build.dir}/docs"/>
132 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
139 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
140 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
141 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
142 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
143 <
144 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
145 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
146 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
147 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
148 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
149 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
132 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
133  
134    <!-- Jar locations -->
135    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
153  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
154  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
155  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
156  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
157  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
136    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
137  
138    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
139 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
140 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
141 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
142 <  <!-- The expected canonical location does not yet exist as of 2014-02 -->
143 <  <!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> -->
144 <  <property name="java8.docroot.url"      value="http://download.java.net/jdk8/docs"/>
145 <  <!-- No published jdk9 docs exist as of 2014-02 -->
146 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
147 <  <property name="java9.docroot.url"      value="${java8.docroot.url}"/>
148 <  <!-- Default jdk doc location (latest stable release seems best) -->
149 <  <property name="java.docroot.url"       value="${java7.docroot.url}"/>
139 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
140 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
141 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
142 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
143 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
144 >  <!-- The location of jdk early access docs (RIP) -->
145 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
146 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
147 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
148 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
149 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
150 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
151 >  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
152 >  <property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/>
153 >  <property name="java16.docroot.url" value="https://docs.oracle.com/en/java/javase/16/docs"/>
154 >  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
155 >  <property name="java18.docroot.url" value="https://download.java.net/java/early_access/jdk18/docs"/>
156 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
157 >  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
158  
159    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
160 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
161 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
162 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
163 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
164 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
160 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
161 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
162 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
163 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
164 >  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
165 >  <property name="java16.api.url"     value="${java16.docroot.url}/api/"/>
166 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
167 >  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
168    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
169  
170    <!-- Define the "jtreg" task -->
# Line 183 | Line 172
172    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
173             classpath="${lib.dir}/jtreg.jar" />
174  
175 <  <!-- Test classpath -->
176 <  <path id="test.classpath">
177 <    <pathelement location="${build.testcases.dir}"/>
178 <    <pathelement location="${junit.jar}"/>
179 <  </path>
180 <
175 >  <!-- Tck configuration options; see JSR166TestCase.java
176 >   To profile a single tck test class:
177 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
178 >   To stress test a single tck test class:
179 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
180 >   To stress test a single tck test method:
181 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
182 >  -->
183 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
184    <macrodef name="run-tck-tests">
185      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
186      <attribute name="target"/>
187      <attribute name="compile-target" default="@{target}"/>
188      <attribute name="workdir"/>
189      <attribute name="classes"/>
190 <    <attribute name="jvmflags" default="-ea -esa"/>
190 >    <!--
191 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
192 >    -->
193 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
194      <element name="javac-elements" optional="true"/>
195 +
196      <sequential>
197  
198      <mkdir dir="@{workdir}/tck-classes"/>
# Line 209 | Line 205
205             source="@{compile-target}"
206             target="@{compile-target}"
207             classpath="${junit.jar}"
212           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
208             includeAntRuntime="false"
209             includeJavaRuntime="false"
210 +           encoding="ASCII"
211             executable="${javac@{compile-target}}"
212             fork="true">
213  
214        <include name="*.java"/>
215        <compilerarg value="-XDignore.symbol.file=true"/>
216 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
216 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
217 >      <compilerarg value="-Xdoclint:reference/private"/>
218 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
219        <compilerarg line="${build.args}"/>
220        <javac-elements/>
221  
# Line 227 | Line 225
225            failonerror="true"
226            jvm="${java@{target}}"
227            fork="true">
228 <        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
229 <        <jvmarg line="@{jvmflags}"/>
230 <        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
231 <        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
232 <        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
233 <        <classpath>
234 <          <pathelement location="${junit.jar}"/>
235 <          <pathelement location="@{workdir}/tck-classes"/>
236 <        </classpath>
228 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
229 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
230 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
231 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
232 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
233 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
234 >        <jvmarg line="@{jvmflags}"/>
235 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
236 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
237 >
238 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
239 >        <syspropertyset id="system-properties-used-by-tck">
240 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
241 >          <propertyref prefix="jsr166."/>
242 >          <propertyref name="test.timeout.factor"/>
243 >        </syspropertyset>
244 >
245 >        <classpath>
246 >          <pathelement location="${junit.jar}"/>
247 >          <pathelement location="@{workdir}/tck-classes"/>
248 >        </classpath>
249      </java>
250  
251      </sequential>
252    </macrodef>
253  
254 +  <!-- Define jtreg test sets for different jdk versions -->
255 +  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
256 +  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
257 +  <property name="jtreg.test.pattern" value="**/*.java"/>
258 +  <macrodef name="defjtregtests">
259 +    <attribute name="v"/>
260 +    <sequential>
261 +      <fileset dir="${jtreg@{v}.src.dir}">
262 +        <patternset id="jdk@{v}.jtreg.tests">
263 +          <include name="${jtreg.test.pattern}"/>
264 +        </patternset>
265 +      </fileset>
266 +    </sequential>
267 +  </macrodef>
268 +
269 +  <defjtregtests v="18"/>
270 +  <defjtregtests v="17"/>
271 +  <defjtregtests v="16"/>
272 +  <defjtregtests v="15"/>
273 +  <defjtregtests v="14"/>
274 +  <defjtregtests v="13"/>
275 +  <defjtregtests v="12"/>
276 +  <defjtregtests v="11"/>
277 +
278 +  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
279 +  <property name="jtreg.flags" value=""/>
280 +
281    <macrodef name="run-jtreg-tests">
282 <    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
246 <    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
247 <    <attribute name="source" default="7"/>
282 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
283      <attribute name="target"/>
284      <attribute name="workdir"/>
285      <attribute name="classes"/>
286 +    <attribute name="verbose" default="${jtreg.verbose}"/>
287      <attribute name="jtregflags" default=""/>
288 +    <element name="jtreg-elements" optional="true"/>
289 +
290      <sequential>
253    <delete dir="@{workdir}/JTwork"   quiet="true"/>
254    <delete dir="@{workdir}/JTreport" quiet="true"/>
255    <mkdir dir="@{workdir}/JTwork/scratch"/>
256    <mkdir dir="@{workdir}/JTreport"/>
257    <jtreg dir="@{jtreg.src.dir}"
258           jdk="${jdk@{target}.home}"
259           workDir="@{workdir}/JTwork"
260           reportDir="@{workdir}/JTreport">
291  
292 <      <arg value="-Xbootclasspath/p:@{classes}"/>
293 <      <arg value="-agentvm"/>
294 <      <arg value="-v:nopass,fail"/>
292 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
293 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
294 >
295 >    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
296 >    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
297 >    <!-- In 2020 concurrency:3 seems like a sweet spot -->
298 >    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
299 >    <property name="jtreg.concurrency" value="3"/>
300 >
301 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
302 >    <jtreg dir="${jtreg@{target}.src.dir}"
303 >           jdk="${jdk@{target}.home}"
304 >           workDir="@{workdir}/JTwork">
305 >      <patternset refid="jdk@{target}.jtreg.tests"/>
306 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
307 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
308 >      <arg value="-vmoption:-Xmx256m"/>
309 >      <arg value="-concurrency:${jtreg.concurrency}"/>
310        <arg value="-vmoptions:-esa -ea"/>
311 +      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
312 +      <arg value="-agentvm"/>
313 +      <arg value="-noreport"/>
314 +      <arg value="-verbose:@{verbose}"/>
315        <arg value="-automatic"/>
316        <arg value="-k:!ignore"/>
317        <arg line="@{jtregflags}"/>
318 +      <arg line="${jtreg.flags}"/>
319 +      <jtreg-elements/>
320      </jtreg>
321      </sequential>
322    </macrodef>
# Line 276 | Line 327
327    </path>
328  
329    <!-- Support @jls tag, used in jdk8+ javadoc -->
330 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
331    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
332    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
333  
334    <!-- Main targets -->
335  
336 <  <property name="build.main.java.version" value="9"/>
337 <  <property name="build.main.javac" value="${javac9}"/>
336 >  <!-- Default values: may seem strange ... -->
337 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
338 >  <!-- But at build time, target jdk9, for maximal binary portability -->
339 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
340 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
341 >    o override-methods=summary
342 >    o {@systemProperty ...}
343 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
344 >    o 8202628: javadoc generates bad links in TestModules.java
345 >    -->
346 >  <property name="java.runtime.target" value="11"/>
347 >  <property name="build.main.java" value="${java11}"/>
348 >  <property name="build.main.javac" value="${javac11}"/>
349 >  <property name="build.main.javadoc" value="${javadoc12}"/>
350 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
351  
352    <target name="dists"
353 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
353 >          depends="dist"
354            description="Builds all public jars and docs"/>
355  
356    <target name="compile"
357            depends="configure-compiler"
358            description="Compiles src/main sources to build dir">
359  
360 <    <mkdir dir="${build.classes.dir}"/>
360 >    <local name="destdir"/>
361 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
362 >
363 >    <mkdir dir="${destdir}"/>
364  
365      <javac srcdir="${src.dir}"
366 <           destdir="${build.classes.dir}"
366 >           destdir="${destdir}"
367             debug="${build.debug}"
368             debuglevel="${build.debuglevel}"
369             deprecation="${build.deprecation}"
370             classpath=""
371             includeAntRuntime="false"
372             includeJavaRuntime="false"
373 +           encoding="ASCII"
374             executable="${build.main.javac}"
375             fork="true">
376  
377        <include name="**/*.java"/>
378 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
379        <compilerarg value="-Xprefer:source"/>
380        <compilerarg value="-XDignore.symbol.file=true"/>
381 <      <compilerarg value="-Xlint:all"/>
381 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
382 >      <compilerarg value="-Xlint:all,-removal"/>
383 >      <compilerarg line="--doclint-format html5"/>
384 > <!--  Temporarily disable doclint for private elements, due to -->
385 > <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
386 > <!--  which is expected to be fixed in openjdk 11.0.8 -->
387 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
388        <compilerarg value="-Xdoclint:all/protected"/>
389 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
390 +      <compilerarg value="-Werror"/>
391        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
392        <compilerarg line="${build.args}"/>
393  
# Line 319 | Line 397
397  
398    <target name="jar"
399            depends="compile"
400 <          description="Builds library jar from compiled sources">
401 <
400 >          description="Builds library jar for src/main from compiled sources">
401 >    <local name="subdir"/>
402 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
403      <jar destfile="${product.jar}">
404 <      <fileset dir="${build.classes.dir}"/>
404 >      <fileset dir="${build.classes.dir}${subdir}"/>
405 >      <manifest>
406 >        <attribute name="Built-By" value="${user.name}"/>
407 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
408 >      </manifest>
409      </jar>
410    </target>
411  
# Line 330 | Line 413
413    <target name="docs"
414            description="Builds javadocs for src/main to dist dir">
415  
416 <    <delete dir="${docs.dir}"/>
416 >    <delete dir="${docs.dir}" quiet="true"/>
417      <mkdir dir="${docs.dir}"/>
418  
419 +    <!-- old school frames via docs/index.html?overview-summary.html -->
420 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
421 +    <local name="use-frames"/>
422 +    <condition property="use-frames">
423 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
424 +    </condition>
425 +
426      <!-- the packagenames="none" hack below prevents scanning the -->
427      <!-- sourcepath for packages -->
428  
429 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
430 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
431 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
432 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
433 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
434      <javadoc destdir="${docs.dir}"
435               packagenames="none"
436 <             link="${java9.api.url}"
436 >             link="${java.api.url}"
437               overview="${src.dir}/intro.html"
438               access="${build.javadoc.access}"
439 <             sourcepath="${src.dir}:${jdk9src.dir}"
439 >             sourcepath="${src.dir}"
440               classpath=""
441 <             executable="${javadoc9}">
441 >             source="${build.main.javadoc.source}"
442 >             executable="${build.main.javadoc}">
443 > <!-- TODO: JDK-8214571 failonerror = "true" -->
444        <fileset dir="${src.dir}" defaultexcludes="yes">
445 <        <include name="**/*.java"/>
445 >        <include name="java/**/*.java"/>
446        </fileset>
447 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
447 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
448        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
449 +      <arg value="-quiet"/>
450        <arg value="-XDignore.symbol.file=true"/>
451 <      <arg value="-tag"/>
452 <      <arg value="${javadoc.jls.option}"/>
453 <      <arg value="-tag"/>
454 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
455 <      <arg value="-tag"/>
456 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
457 <      <arg value="-tag"/>
458 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
451 >      <arg value="-html5"/>
452 >      <arg value="-Xdoclint:all,-missing"/>
453 >      <arg value="--patch-module=java.base=${src.dir}"/>
454 >      <arg value="--frames" if:set="use-frames"/>
455 >      <arg value="--override-methods=summary"/>
456 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
457 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
458 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
459 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
460 > <!-- tags added in jdk9: currently unused -->
461 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
462 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
463      </javadoc>
464    </target>
465  
# Line 367 | Line 469
469            description="Puts all distributable products in single hierarchy"/>
470  
471  
370  <target name="release"
371          depends="dist"
372          description="Puts entire CVS tree, plus distribution productions, in a jar">
373
374    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
375
376    <jar basedir="${basedir}" destfile="${release.jar}">
377      <!-- <exclude name="build/**"/> -->
378      <exclude name="${release.jar}"/>
379      <exclude name="user.properties"/>
380      <exclude name="etc/notes/**"/>
381      <exclude name="src/emulation/**"/>
382      <exclude name="**/SyntaxTest.java"/>
383      <exclude name="**/SuperfluousAbstract.java"/>
384    </jar>
385  </target>
386
387
472    <target name="clean"
473            description="Removes all build products">
390
474      <delete dir="${build.dir}"/>
392
475    </target>
476  
477  
478    <target name="dist-clean"
479            description="Removes all build and distribution products">
398
480      <delete dir="${build.dir}"/>
481      <delete dir="${dist.dir}"/>
401
482    </target>
483  
484  
# Line 412 | Line 492
492      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
493    </target>
494  
495 <
496 <  <target name="test-tck"
497 <          depends="jar"
418 <          description="Runs tck tests for main directly">
495 >  <target name="tck"
496 >          depends="jar"
497 >          description="Runs tck tests for src/main directly">
498  
499      <run-tck-tests
500 <      target="${build.main.java.version}"
500 >      target="${java.runtime.target}"
501        workdir="${build.dir}"
502 <      classes="${product.jar}"/>
424 <  </target>
425 <
426 <  <target name="test-jtreg"
427 <          depends="jar"
428 <          description="Runs jtreg tests for main using the jtreg ant task">
429 <    <run-jtreg-tests
430 <       target="${build.main.java.version}"
431 <       workdir="${build.dir}"
432 <       classes="${product.jar}"/>
433 <  </target>
434 <
435 <  <target name="test"
436 <          depends="test-tck, test-jtreg"
437 <          description="Runs tck and jtreg tests for main">
438 <  </target>
439 <
440 <  <target name="test89"
441 <          description="Runs tck and jtreg tests for main for multiple java versions">
442 <
443 <    <antcall target="clean"/>
444 <    <antcall target="test">
445 <      <param name="build.main.java.version" value="8"/>
446 <      <param name="build.main.javac" value="${javac8}"/>
447 <    </antcall>
448 <
449 <    <antcall target="clean"/>
450 <    <antcall target="test">
451 <      <param name="build.main.java.version" value="9"/>
452 <      <param name="build.main.javac" value="${javac9}"/>
453 <    </antcall>
454 <
455 <  </target>
456 <
457 <
458 <
459 <  <target name="configure-compiler">
460 <
461 <    <property name="unchecked.option" value="-Xlint:unchecked"/>
462 <
463 <    <condition property="warnunchecked.arg" value="${unchecked.option}">
464 <      <istrue value="${build.warnunchecked}"/>
465 <    </condition>
466 <
467 <    <property name="warnunchecked.arg" value=""/>
468 <
469 <
470 <    <!-- Common options in javac invocations -->
471 <    <property name="build.args" value="${warnunchecked.arg}"/>
472 <
473 <  </target>
474 <
475 <
476 <
477 <  <!-- Various demos and test programs -->
478 <
479 <
480 <  <target name="loops" depends="configure-compiler"
481 <          description="Benchmark from Doug Lea's AQS paper">
482 <
483 <    <mkdir dir="${build.loops.dir}"/>
484 <
485 <    <javac srcdir="${loops.src.dir}"
486 <          destdir="${build.loops.dir}"
487 <            debug="${build.debug}"
488 <       debuglevel="${build.debuglevel}"
489 <      deprecation="${build.deprecation}"
490 <           source="${build.sourcelevel}"
491 <             fork="true">
492 <
493 <      <compilerarg line="${build.args}"/>
494 <      <classpath refid="loops.classpath"/>
495 <      <compilerarg value="-XDignore.symbol.file=true"/>
496 <
497 <    </javac>
498 <
499 <    <java classname="ALoops" fork="true">
500 <      <classpath refid="loops.classpath"/>
501 <    </java>
502 <
503 <  </target>
504 <
505 <
506 <  <!-- jsr166 4jdk7 -->
507 <
508 <  <target name="4jdk7compile"
509 <          depends="configure-compiler"
510 <          description="Compiles src/jdk7 sources, targeting jdk7">
511 <
512 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
513 <
514 <    <javac srcdir="${4jdk7src.dir}"
515 <           destdir="${build.4jdk7.classes.dir}"
516 <           debug="${build.debug}"
517 <           debuglevel="${build.debuglevel}"
518 <           deprecation="${build.deprecation}"
519 <           source="6"
520 <           classpath=""
521 <           bootclasspath="${bootclasspath6}"
522 <           includeAntRuntime="false"
523 <           includeJavaRuntime="false"
524 <           executable="${javac7}"
525 <           fork="true">
526 <
527 <      <include name="**/*.java"/>
528 <      <compilerarg value="-Xprefer:source"/>
529 <      <compilerarg value="-XDignore.symbol.file=true"/>
530 <      <compilerarg value="-Xlint:all"/>
531 <      <compilerarg line="${build.args}"/>
532 <
533 <    </javac>
534 <  </target>
535 <
536 <  <target name="4jdk7doclint"
537 <          depends="configure-compiler"
538 <          description="Finds doclint warnings">
539 <
540 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
541 <
542 <    <javac srcdir="${4jdk7src.dir}"
543 <           destdir="${build.4jdk7.classes.dir}"
544 <           debug="${build.debug}"
545 <           debuglevel="${build.debuglevel}"
546 <           deprecation="${build.deprecation}"
547 <           source="6"
548 <           classpath=""
549 <           bootclasspath="${bootclasspath7}"
550 <           includeAntRuntime="false"
551 <           includeJavaRuntime="false"
552 <           executable="${javac8}"
553 <           fork="true">
554 <
555 <      <include name="**/*.java"/>
556 <      <compilerarg value="-Xprefer:source"/>
557 <      <compilerarg value="-XDignore.symbol.file=true"/>
558 <      <compilerarg value="-Xlint:all"/>
559 <      <compilerarg value="-Xdoclint:all/protected"/>
560 <      <compilerarg line="${build.args}"/>
561 <
562 <    </javac>
563 <  </target>
564 <
565 <
566 <  <target name="4jdk7jar"
567 <          depends="4jdk7compile"
568 <          description="Builds library jar from compiled sources">
569 <
570 <    <jar destfile="${4jdk7product.jar}">
571 <      <fileset dir="${build.4jdk7.classes.dir}"/>
572 <    </jar>
573 <
574 <  </target>
575 <
576 <
577 <  <target name="4jdk7-test-tck"
578 <          depends="4jdk7jar"
579 <          description="Runs tck tests for jsr166-4jdk7 directly">
580 <
581 <    <run-tck-tests
582 <      target="7"
583 <      workdir="${build.4jdk7.dir}"
584 <      classes="${4jdk7product.jar}">
502 >      classes="${product.jar}">
503        <javac-elements>
504 <        <!-- JDK8+ test classes -->
587 <        <exclude name="*8Test.java"/>
588 <        <exclude name="*9Test.java"/>
589 <        <exclude name="DoubleAccumulatorTest.java"/>
590 <        <exclude name="DoubleAdderTest.java"/>
591 <        <exclude name="LongAccumulatorTest.java"/>
592 <        <exclude name="LongAdderTest.java"/>
593 <        <exclude name="CompletableFutureTest.java"/>
594 <        <exclude name="SplittableRandomTest.java"/>
595 <        <exclude name="StampedLockTest.java"/>
504 >        <compilerarg value="-Werror"/>
505        </javac-elements>
506      </run-tck-tests>
507    </target>
508  
509 <
510 <  <target name="4jdk7-test-tck-junit"
511 <          depends="4jdk7compile"
512 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
513 <
605 <    <junit printsummary="true"
606 <           showoutput="true"
607 <           errorProperty="junit.failed"
608 <           failureProperty="junit.failed"
609 <           includeantruntime="true"
610 <           jvm="${java7}"
611 <           fork="true">
612 <
613 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
614 <      <jvmarg value="-server"/>
615 <
616 <      <classpath>
617 <        <pathelement location="${junit.jar}"/>
618 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
619 <      </classpath>
620 <
621 <      <formatter type="brief"/>
622 <
623 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
624 <      </test>
625 <
626 <    </junit>
509 >  <target name="tck-parallelism-1"
510 >          description="Runs tck with common pool parallelism 1">
511 >    <antcall target="tck">
512 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
513 >    </antcall>
514    </target>
515  
516 <  <target name="4jdk7-test-jtreg"
517 <          depends="4jdk7jar"
518 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
519 <    <run-jtreg-tests
520 <       target="7"
634 <       workdir="${build.4jdk7.dir}"
635 <       classes="${4jdk7product.jar}"
636 <       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
516 >  <target name="tck-parallelism-0"
517 >          description="Runs tck with common pool parallelism 0">
518 >    <antcall target="tck">
519 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
520 >    </antcall>
521    </target>
522  
523 <
524 <  <target name="4jdk7-test"
525 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
526 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
523 >  <target name="tck-security-manager"
524 >          description="Runs tck with a security manager">
525 >    <antcall target="tck">
526 >      <param name="jsr166.useSecurityManager" value="true"/>
527 >    </antcall>
528    </target>
529  
530 <
531 <  <target name="4jdk7docs"
532 <          description="Builds javadocs for src/jdk7 to dist dir">
533 <
534 <    <delete dir="${4jdk7docs.dir}"/>
535 <    <mkdir dir="${4jdk7docs.dir}"/>
536 <
652 <    <javadoc destdir="${4jdk7docs.dir}"
653 <             packagenames="none"
654 <             link="${java7.api.url}"
655 <             overview="${4jdk7src.dir}/intro.html"
656 <             access="${build.javadoc.access}"
657 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
658 <             classpath=""
659 <             executable="${javadoc7}">
660 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
661 <        <include name="**/*.java"/>
662 <      </fileset>
663 <      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
664 <      <arg value="-XDignore.symbol.file=true"/>
665 <    </javadoc>
530 >  <target name="jtreg"
531 >          depends="jar"
532 >          description="Runs jtreg tests for src/main using the jtreg ant task">
533 >    <run-jtreg-tests
534 >       target="${java.runtime.target}"
535 >       workdir="${build.dir}"
536 >       classes="${product.jar}"/>
537    </target>
538  
539 +  <target name="test"
540 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
541 +          description="Runs tck and jtreg tests for src/main"/>
542  
543 <  <target name="4jdk7dist"
544 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
545 <          description="Puts all distributable products in single hierarchy"/>
546 <
547 <
548 <  <target name="4jdk7clean"
549 <          description="Removes all 4jdk7 build products">
550 <
551 <    <delete dir="${build.4jdk7.dir}"/>
552 <
543 >  <target name="test-version-permutations"
544 >          depends="test11, test12, test13, test14, test15, test16,
545 >          test11-12, test11-13, test11-14, test11-15, test11-16,
546 >          clean, test, docs"
547 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
548 >
549 >  <target name="test11">
550 >    <antcall>
551 >      <param name="java.runtime.target" value="11"/>
552 >      <param name="build.main.javac" value="${javac11}"/>
553 >      <param name="build.main.javadoc" value="${javadoc12}"/>
554 >      <param name="build.main.javadoc.source" value="11"/>
555 >      <target name="clean"/>
556 >      <target name="test"/>
557 >      <target name="docs"/>
558 >    </antcall>
559    </target>
560  
561 <
562 <  <target name="4jdk7dist-jar"
563 <          depends="4jdk7clean, 4jdk7jar">
564 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
561 >  <target name="test12">
562 >    <antcall>
563 >      <param name="java.runtime.target" value="12"/>
564 >      <param name="build.main.javac" value="${javac12}"/>
565 >      <param name="build.main.javadoc" value="${javadoc12}"/>
566 >      <param name="build.main.javadoc.source" value="12"/>
567 >      <target name="clean"/>
568 >      <target name="test"/>
569 >      <target name="docs"/>
570 >    </antcall>
571    </target>
572  
573 <
574 <  <target name="4jdk7dist-docs"
575 <          depends="4jdk7clean, 4jdk7docs">
576 <    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
573 >  <target name="test13">
574 >    <antcall>
575 >      <param name="java.runtime.target" value="13"/>
576 >      <param name="build.main.javac" value="${javac13}"/>
577 >      <param name="build.main.javadoc" value="${javadoc13}"/>
578 >      <param name="build.main.javadoc.source" value="13"/>
579 >      <target name="clean"/>
580 >      <target name="test"/>
581 >      <target name="docs"/>
582 >    </antcall>
583    </target>
584  
585 <
586 <  <!-- jsr166x -->
587 <
588 <  <target name="jsr166xcompile"
589 <          depends="configure-compiler"
590 <          description="Compiles jsr166x sources to build dir">
591 <
592 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
593 <
594 <    <javac srcdir="${topsrc.dir}"
703 <           destdir="${build.jsr166x.classes.dir}"
704 <           debug="${build.debug}"
705 <           debuglevel="${build.debuglevel}"
706 <           deprecation="${build.deprecation}"
707 <           classpath=""
708 <           bootclasspath="${bootclasspath6}"
709 <           source="5"
710 <           includeAntRuntime="false"
711 <           includeJavaRuntime="false"
712 <           executable="${javac7}"
713 <           fork="true">
714 <
715 <      <include name="jsr166x/**/*.java"/>
716 <      <compilerarg value="-XDignore.symbol.file=true"/>
717 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
718 <      <compilerarg line="${build.args}"/>
719 <
720 <    </javac>
585 >  <target name="test14">
586 >    <antcall>
587 >      <param name="java.runtime.target" value="14"/>
588 >      <param name="build.main.javac" value="${javac14}"/>
589 >      <param name="build.main.javadoc" value="${javadoc14}"/>
590 >      <param name="build.main.javadoc.source" value="14"/>
591 >      <target name="clean"/>
592 >      <target name="test"/>
593 >      <target name="docs"/>
594 >    </antcall>
595    </target>
596  
597 <
598 <  <target name="jsr166xjar"
599 <          depends="jsr166xcompile"
600 <          description="Builds library jar from compiled sources">
601 <
602 <    <jar destfile="${jsr166x.jar}">
603 <      <fileset dir="${build.jsr166x.classes.dir}"/>
604 <    </jar>
605 <
597 >  <target name="test15">
598 >    <antcall>
599 >      <param name="java.runtime.target" value="15"/>
600 >      <param name="build.main.javac" value="${javac15}"/>
601 >      <param name="build.main.javadoc" value="${javadoc15}"/>
602 >      <param name="build.main.javadoc.source" value="15"/>
603 >      <target name="clean"/>
604 >      <target name="test"/>
605 >      <target name="docs"/>
606 >    </antcall>
607    </target>
608  
609 <
610 <  <target name="jsr166xdocs"
611 <          description="Builds javadocs to dist dir">
612 <
613 <    <delete dir="${jsr166xdocs.dir}"/>
614 <    <mkdir dir="${jsr166xdocs.dir}"/>
615 <
616 <    <javadoc destdir="${jsr166xdocs.dir}"
617 <             packagenames="jsr166x.*"
618 <             link="${java.api.url}"
744 <             access="${build.javadoc.access}"
745 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
746 <             bootclasspath="${bootclasspath6}"
747 <             source="5"
748 <             executable="${javadoc7}">
749 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
750 <      <arg value="-XDignore.symbol.file=true"/>
751 <
752 <    </javadoc>
609 >  <target name="test16">
610 >    <antcall>
611 >      <param name="java.runtime.target" value="16"/>
612 >      <param name="build.main.javac" value="${javac16}"/>
613 >      <param name="build.main.javadoc" value="${javadoc16}"/>
614 >      <param name="build.main.javadoc.source" value="16"/>
615 >      <target name="clean"/>
616 >      <target name="test"/>
617 >      <target name="docs"/>
618 >    </antcall>
619    </target>
620  
621 <
622 <  <target name="jsr166xdist"
623 <          depends="jsr166xdist-jar, jsr166xdist-docs"
624 <          description="Puts all distributable products in single hierarchy"/>
625 <
626 <
627 <  <target name="jsr166xclean"
628 <          description="Removes all jsr166x build products">
629 <
630 <    <delete dir="${build.jsr166x.dir}"/>
765 <
621 >  <target name="test11-12">
622 >    <antcall>
623 >      <param name="java.runtime.target" value="12"/>
624 >      <param name="build.main.javac" value="${javac11}"/>
625 >      <param name="build.main.javadoc" value="${javadoc12}"/>
626 >      <param name="build.main.javadoc.source" value="11"/>
627 >      <target name="clean"/>
628 >      <target name="test"/>
629 >      <target name="docs"/>
630 >    </antcall>
631    </target>
632  
633 <
634 <  <target name="jsr166xdist-jar"
635 <          depends="jsr166xclean, jsr166xjar">
636 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
633 >  <target name="test11-13">
634 >    <antcall>
635 >      <param name="java.runtime.target" value="13"/>
636 >      <param name="build.main.javac" value="${javac11}"/>
637 >      <param name="build.main.javadoc" value="${javadoc13}"/>
638 >      <param name="build.main.javadoc.source" value="11"/>
639 >      <target name="clean"/>
640 >      <target name="test"/>
641 >      <target name="docs"/>
642 >    </antcall>
643    </target>
644  
645 <  <target name="jsr166xdist-docs"
646 <          depends="jsr166xclean, jsr166xdocs">
647 <    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
645 >  <target name="test11-14">
646 >    <antcall>
647 >      <param name="java.runtime.target" value="14"/>
648 >      <param name="build.main.javac" value="${javac11}"/>
649 >      <param name="build.main.javadoc" value="${javadoc14}"/>
650 >      <param name="build.main.javadoc.source" value="11"/>
651 >      <target name="clean"/>
652 >      <target name="test"/>
653 >      <target name="docs"/>
654 >    </antcall>
655    </target>
656  
657 <  <!-- jsr166y -->
658 <
659 <
660 <  <target name="jsr166ycompile"
661 <          depends="configure-compiler"
662 <          description="Compiles jsr166y sources">
663 <
664 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
665 <
666 <    <javac srcdir="${topsrc.dir}"
789 <           destdir="${build.jsr166y.classes.dir}"
790 <           debug="${build.debug}"
791 <           debuglevel="${build.debuglevel}"
792 <           deprecation="${build.deprecation}"
793 <           source="6"
794 <           classpath=""
795 <           bootclasspath="${bootclasspath6}"
796 <           includeAntRuntime="false"
797 <           includeJavaRuntime="false"
798 <           executable="${javac7}"
799 <           fork="true">
800 <
801 <      <include name="jsr166y/**/*.java"/>
802 <      <compilerarg value="-XDignore.symbol.file=true"/>
803 <      <compilerarg value="-Xlint:all"/>
804 <      <compilerarg line="${build.args}"/>
805 <
806 <    </javac>
657 >  <target name="test11-15">
658 >    <antcall>
659 >      <param name="java.runtime.target" value="15"/>
660 >      <param name="build.main.javac" value="${javac11}"/>
661 >      <param name="build.main.javadoc" value="${javadoc15}"/>
662 >      <param name="build.main.javadoc.source" value="11"/>
663 >      <target name="clean"/>
664 >      <target name="test"/>
665 >      <target name="docs"/>
666 >    </antcall>
667    </target>
668  
669 <
670 <  <target name="jsr166yjar"
671 <          depends="jsr166ycompile"
672 <          description="Builds library jar from compiled sources">
673 <
674 <    <jar destfile="${jsr166y.jar}" index="true">
675 <      <fileset dir="${build.jsr166y.classes.dir}"/>
676 <    </jar>
677 <
669 >  <target name="test11-16">
670 >    <antcall>
671 >      <param name="java.runtime.target" value="16"/>
672 >      <param name="build.main.javac" value="${javac11}"/>
673 >      <param name="build.main.javadoc" value="${javadoc16}"/>
674 >      <param name="build.main.javadoc.source" value="11"/>
675 >      <target name="clean"/>
676 >      <target name="test"/>
677 >      <target name="docs"/>
678 >    </antcall>
679    </target>
680  
681 <
682 <  <target name="jsr166ydocs"
683 <          description="Builds javadocs to dist dir">
684 <
685 <    <delete dir="${jsr166ydocs.dir}"/>
686 <    <mkdir dir="${jsr166ydocs.dir}"/>
687 <
688 <    <javadoc destdir="${jsr166ydocs.dir}"
689 <             packagenames="jsr166y.*"
829 <             link="${java.api.url}"
830 <             access="${build.javadoc.access}"
831 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
832 <             bootclasspath="${bootclasspath6}"
833 <             source="6"
834 <             executable="${javadoc7}">
835 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
836 <      <arg value="-XDignore.symbol.file=true"/>
837 <
838 <    </javadoc>
681 >  <target name="docs16">
682 >    <antcall>
683 >      <param name="java.runtime.target" value="16"/>
684 >      <param name="build.main.javac" value="${javac16}"/>
685 >      <param name="build.main.javadoc" value="${javadoc16}"/>
686 >      <param name="build.main.javadoc.source" value="16"/>
687 >      <target name="clean"/>
688 >      <target name="docs"/>
689 >    </antcall>
690    </target>
691  
692  
693 <  <target name="jsr166ydist"
694 <          depends="jsr166ydist-jar, jsr166ydist-docs"
695 <          description="Puts all distributable products in single hierarchy"/>
696 <
693 >  <target name="configure-compiler">
694 >    <fail message="ant version too old">
695 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
696 >    </fail>
697  
698 <  <target name="jsr166yclean"
848 <          description="Removes all jsr166y build products">
698 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
699  
700 <    <delete dir="${build.jsr166y.dir}"/>
700 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
701 >      <istrue value="${build.warnunchecked}"/>
702 >    </condition>
703  
704 <  </target>
704 >    <property name="warnunchecked.arg" value=""/>
705  
706  
707 <  <target name="jsr166ydist-jar"
708 <          depends="jsr166yclean, jsr166yjar">
857 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
858 <  </target>
707 >    <!-- Common options in javac invocations -->
708 >    <property name="build.args" value="${warnunchecked.arg}"/>
709  
860  <target name="jsr166ydist-docs"
861          depends="jsr166yclean, jsr166ydocs">
862    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
710    </target>
711  
712  
713 <  <!-- extra166y -->
713 >  <target name="compile-test-loops" depends="jar"
714 >          description="Compiles all the perf tests in src/test/loops">
715  
716 +    <mkdir dir="${build.dir}/test/loops"/>
717  
718 <  <target name="extra166ycompile"
719 <          depends="configure-compiler, jsr166yjar"
871 <          description="Compiles extra166y sources">
872 <
873 <    <mkdir dir="${build.extra166y.classes.dir}"/>
874 <
875 <    <javac srcdir="${topsrc.dir}"
876 <           destdir="${build.extra166y.classes.dir}"
718 >    <javac srcdir="${basedir}/src/test/loops"
719 >           destdir="${build.dir}/test/loops"
720             debug="${build.debug}"
721             debuglevel="${build.debuglevel}"
722             deprecation="${build.deprecation}"
880           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
881           classpath=""
882           source="6"
723             includeAntRuntime="false"
724             includeJavaRuntime="false"
725 <           executable="${javac7}"
725 >           encoding="ASCII"
726 >           executable="${build.main.javac}"
727             fork="true">
728  
729 <      <include name="extra166y/**/*.java"/>
729 >      <include name="*.java"/>
730        <compilerarg value="-XDignore.symbol.file=true"/>
731 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
731 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
732 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
733        <compilerarg line="${build.args}"/>
892
734      </javac>
735    </target>
736  
737  
738 <  <target name="extra166yjar"
739 <          depends="extra166ycompile"
740 <          description="Builds library jar from compiled sources">
741 <
742 <    <jar destfile="${extra166y.jar}" index="true">
743 <      <fileset dir="${build.extra166y.classes.dir}"/>
744 <    </jar>
904 <
905 <  </target>
906 <
907 <
908 <  <target name="extra166ydocs"
909 <          description="Builds javadocs to build dir">
910 <
911 <    <delete dir="${extra166ydocs.dir}"/>
912 <    <mkdir dir="${extra166ydocs.dir}"/>
913 <
914 <    <javadoc destdir="${extra166ydocs.dir}"
915 <             packagenames="extra166y.*"
916 <             link="${java.api.url}"
917 <             access="${build.javadoc.access}"
918 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
919 <             bootclasspath="${bootclasspath6}"
920 <             source="6"
921 <             executable="${javadoc7}">
922 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
923 <      <arg value="-XDignore.symbol.file=true"/>
924 <
925 <    </javadoc>
926 <  </target>
927 <
928 <
929 <  <target name="extra166ydist"
930 <          depends="extra166ydist-jar, extra166ydist-docs"
931 <          description="Puts all distributable products in single hierarchy"/>
932 <
933 <
934 <  <target name="extra166yclean"
935 <          description="Removes all extra166y build products">
936 <
937 <    <delete dir="${build.extra166y.dir}"/>
938 <
939 <  </target>
738 >  <!-- old branches no longer maintained.  build support deleted -->
739 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
740 >  <!-- jsr166 4jdk7 (no longer maintained) -->
741 >  <!-- jsr166x (no longer maintained) -->
742 >  <!-- jsr166y (no longer maintained) -->
743 >  <!-- extra166y (no longer maintained) -->
744 >  <!-- jsr166e (no longer maintained) -->
745  
746 + <!-- Find buglets that can be detected by static build tools -->
747  
748 <  <target name="extra166ydist-jar"
749 <          depends="extra166yclean, extra166yjar">
750 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
751 <  </target>
748 > <!--   <target name="lint"> -->
749 > <!--     <antcall target="dists"> -->
750 > <!--       <param name="build.javadoc.access" value="protected"/> -->
751 > <!--     </antcall> -->
752 > <!--   </target> -->
753  
754 <  <target name="extra166ydist-docs"
755 <          depends="extra166yclean, extra166ydocs">
756 <    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
754 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
755 >  <target name="doclint-private">
756 >    <antcall target="dist">
757 >      <param name="build.javadoc.access" value="private"/>
758 >    </antcall>
759    </target>
760  
952  <!-- jsr166e -->
953
954  <property name="build.jsr166e.java.version" value="6"/>
955  <property name="build.jsr166e.javac" value="${javac6}"/>
956
957  <target name="jsr166ecompile"
958          depends="configure-compiler"
959          description="Compiles jsr166e sources">
761  
762 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
762 > <!-- ==============================================================
763 >  Experimental errorprone support
764 >  https://errorprone.info
765 >  https://errorprone.info/docs/installation
766 >  https://github.com/google/error-prone/issues/1143
767 > =================================================================== -->
768 >  <path id="errorprone.processorpath.path">
769 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
770 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
771 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
772 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
773 >    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
774 >  </path>
775 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
776 >  <property name="errorprone.jsr166.user.flags" value=""/>
777 >  <property name="errorprone.jsr166.flags"
778 >            value="-Xep:HashtableContains:OFF
779 >                   -Xep:PreferJavaTimeOverload:OFF
780 >                   -Xep:JdkObsolete:OFF
781 >                   -Xep:MissingOverride:OFF
782 >                   -Xep:MissingFail:OFF
783 >                   -Xep:ThreadPriorityCheck:OFF
784 >                   -Xep:MixedArrayDimensions:ERROR
785 >                   -Xep:RemoveUnusedImports:ERROR
786 >                   -Xep:EmptyIf:ERROR
787 >                   -Xep:MultipleTopLevelClasses:ERROR
788 >                   -Xep:ClassName:ERROR
789 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
790 >                   -Xep:RedundantThrows:ERROR
791 >                   -Xep:IdentityBinaryExpression:WARN
792 >                   -Xep:ConstructorInvokesOverridable:WARN
793 >                   -Xep:MethodCanBeStatic:WARN
794 >                   ${errorprone.jsr166.user.flags}"/>
795 >  <!-- -Xep:WildcardImport:ERROR -->
796 >  <property name="errorprone.jsr166.test.flags"
797 >            value="-Xep:StringSplitter:OFF
798 >                   -Xep:BoxedPrimitiveConstructor:OFF
799 >                   -Xep:UnnecessaryParentheses:OFF
800 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
801 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
802 >  <target name="errorprone"
803 >          depends="clean, configure-compiler"
804 >          description="Run errorprone over jsr166 source code (experimental)">
805 >
806 >    <local name="destdir"/>
807 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
808 >    <mkdir dir="${destdir}"/>
809  
810 <    <javac srcdir="${topsrc.dir}"
811 <           destdir="${build.jsr166e.classes.dir}"
810 >    <javac srcdir="${src.dir}"
811 >           destdir="${destdir}"
812             debug="${build.debug}"
813             debuglevel="${build.debuglevel}"
814             deprecation="${build.deprecation}"
968           source="${build.jsr166e.java.version}"
815             classpath=""
816             includeAntRuntime="false"
817             includeJavaRuntime="false"
818 <           executable="${build.jsr166e.javac}"
818 >           encoding="ASCII"
819 >           executable="${build.main.javac}"
820             fork="true">
821  
822 <      <include name="jsr166e/**/*.java"/>
822 >      <include name="**/*.java"/>
823 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
824 >      <compilerarg value="-J--illegal-access=permit"/>
825 >      <compilerarg value="-XDcompilePolicy=simple"/>
826 >      <compilerarg value="-processorpath"/>
827 >      <compilerarg pathref="errorprone.processorpath.path"/>
828 >      <compilerarg value="-Xplugin:ErrorProne
829 >                          ${errorprone.jsr166.flags}"/>
830 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
831 >      <compilerarg value="-Xprefer:source"/>
832        <compilerarg value="-XDignore.symbol.file=true"/>
833        <compilerarg value="-Xlint:all"/>
834 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
835 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
836        <compilerarg line="${build.args}"/>
979
980    </javac>
981  </target>
982
983  <!-- jsr166e: find doclint errors -->
984  <target name="jsr166edoclint">
985
986    <mkdir dir="${build.jsr166e.classes.dir}"/>
987
988    <javac srcdir="${topsrc.dir}"
989           destdir="${build.jsr166e.classes.dir}"
990           debug="${build.debug}"
991           debuglevel="${build.debuglevel}"
992           deprecation="${build.deprecation}"
993           source="${build.jsr166e.java.version}"
994           classpath=""
995           bootclasspath="${bootclasspath7}"
996           includeAntRuntime="false"
997           includeJavaRuntime="false"
998           executable="${javac8}"
999           fork="true">
1000
1001      <include name="jsr166e/**/*.java"/>
1002      <compilerarg value="-XDignore.symbol.file=true"/>
1003      <compilerarg value="-Xlint:all"/>
1004      <compilerarg value="-Xdoclint:all/protected"/>
1005
837      </javac>
1007  </target>
1008
1009
1010  <target name="jsr166ejar"
1011          depends="jsr166ecompile"
1012          description="Builds library jar from compiled sources">
838  
839 <    <jar destfile="${jsr166e.jar}" index="true">
840 <      <fileset dir="${build.jsr166e.classes.dir}"/>
839 >    <jar destfile="${product.jar}">
840 >      <fileset dir="${destdir}"/>
841      </jar>
842  
1018  </target>
1019
1020
1021  <target name="jsr166edocs"
1022          description="Builds javadocs to build dir">
1023
1024    <delete dir="${jsr166edocs.dir}"/>
1025    <mkdir dir="${jsr166edocs.dir}"/>
1026
1027    <javadoc destdir="${jsr166edocs.dir}"
1028             packagenames="jsr166e.*"
1029             link="${java.api.url}"
1030             access="${build.javadoc.access}"
1031             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1032             source="${build.jsr166e.java.version}"
1033             executable="${javadoc7}">
1034      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1035      <arg value="-XDignore.symbol.file=true"/>
1036
1037    </javadoc>
1038  </target>
1039
1040
1041  <target name="jsr166e-test-tck-one-java-version"
1042          depends="jsr166ejar">
1043
1044    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1045
843      <run-tck-tests
844 <      tck.src.dir="${test.src.dir}/tck-jsr166e"
845 <      target="${build.jsr166e.java.version}"
846 <      workdir="${build.jsr166e.dir}"
847 <      classes="${jsr166e.jar}"/>
848 <  </target>
849 <
850 <  <target name="jsr166e-test-tck"
851 <          description="Runs tck tests for jsr166e for multiple java versions">
852 <
853 < <!--     <antcall target="clean"/> -->
854 < <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
855 < <!--       <param name="build.jsr166e.java.version" value="8"/> -->
856 < <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
857 < <!--     </antcall> -->
1061 <
1062 <    <antcall target="clean"/>
1063 <    <antcall target="jsr166e-test-tck-one-java-version">
1064 <      <param name="build.jsr166e.java.version" value="7"/>
1065 <      <param name="build.jsr166e.javac" value="${javac7}"/>
1066 <    </antcall>
1067 <
1068 <    <antcall target="clean"/>
1069 <    <antcall target="jsr166e-test-tck-one-java-version">
1070 <      <param name="build.jsr166e.java.version" value="6"/>
1071 <      <param name="build.jsr166e.javac" value="${javac6}"/>
1072 <    </antcall>
1073 <  </target>
1074 <
1075 <
1076 <  <target name="jsr166e-test"
1077 <          depends="jsr166e-test-tck"
1078 <          description="Runs all tests for jsr166e">
1079 <  </target>
1080 <
1081 <  <target name="jsr166edist"
1082 <          depends="jsr166edist-jar, jsr166edist-docs"
1083 <          description="Puts all distributable products in single hierarchy"/>
1084 <
1085 <
1086 <  <target name="jsr166eclean"
1087 <          description="Removes all jsr166e build products">
1088 <    <delete dir="${build.jsr166e.dir}"/>
1089 <  </target>
1090 <
1091 <
1092 <  <target name="jsr166edist-jar"
1093 <          depends="jsr166eclean, jsr166ejar">
1094 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1095 <  </target>
1096 <
1097 <  <target name="jsr166edist-docs"
1098 <          depends="jsr166eclean, jsr166edocs">
1099 <    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
844 >      target="${java.runtime.target}"
845 >      workdir="${build.dir}"
846 >      classes="${product.jar}">
847 >      <javac-elements>
848 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
849 >        <compilerarg value="-J--illegal-access=permit"/>
850 >        <compilerarg value="-XDcompilePolicy=simple"/>
851 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
852 >        <compilerarg value="-Xplugin:ErrorProne
853 >                            ${errorprone.jsr166.flags}
854 >                            ${errorprone.jsr166.test.flags}"/>
855 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
856 >      </javac-elements>
857 >    </run-tck-tests>
858    </target>
859  
860 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
861 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
862 +  <target name="errorprone-jtreg"
863 +          depends="jar"
864 +          description="Run errorprone over jtreg tests (experimental)">
865  
866 < <!-- Find buglets that can be detected by static build tools -->
866 >    <run-jtreg-tests
867 >       target="${java.runtime.target}"
868 >       workdir="${build.dir}"
869 >       classes="${product.jar}"
870 >       verbose="all">
871 >      <jtreg-elements>
872 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
873 >        <arg value="-javacoption:-processorpath"/>
874 >        <arg value="-javacoption:${errorprone.processorpath}"/>
875 >        <arg value="-javacoption:-Xplugin:ErrorProne
876 >                            ${errorprone.jsr166.flags}
877 >                            ${errorprone.jsr166.test.flags}
878 >                            -Xep:MultipleTopLevelClasses:WARN
879 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
880 >      </jtreg-elements>
881 >    </run-jtreg-tests>
882 >  </target>
883 >
884 >
885 > <!-- ==============================================================
886 >  Running guava tests against jsr166 code
887 > =================================================================== -->
888 >
889 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
890 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
891 > <!-- <property name="guava.version" value="21.0"/> -->
892 >
893 > <!-- HOWTO debug print a path id -->
894 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
895 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
896 >
897 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
898 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
899 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
900 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
901 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
902 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
903 >
904 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
905 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
906 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
907 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
908 >
909 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
910 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
911 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
912 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
913 >
914 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
915 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
916 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
917 >
918 >  <target name="init-ivy">
919 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
920 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
921 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
922 >             classpath="${build.dir}/ivy.jar"/>
923 >  </target>
924 >
925 >  <target name="guava-tests" depends="jar, init-ivy"
926 >          description="Guava tests run against jsr166 collections">
927 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
928 >    <mkdir dir="${guava.dir}"/>
929 >    <ivy:retrieve pathid="guava.testlib.classpath"
930 >      type="jar,bundle" inline="true" conf="default,master"
931 >      pattern="${guava.dir}/[artifact].[ext]"
932 >      organisation="com.google.guava" module="guava-testlib"/>
933 >    <property name="guava.version" value="21.0"/>
934 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
935 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
936 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
937 >           jvm="${build.main.java}" fork="true">
938 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
939 >      <formatter type="brief"/>
940 >      <classpath>
941 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
942 >        <path refid="guava.testlib.classpath"/>
943 >      </classpath>
944  
945 <  <target name="lint">
946 <    <antcall target="dists">
947 <      <param name="build.javadoc.access" value="private"/>
1108 <    </antcall>
945 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
946 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
947 >    </junit>
948    </target>
949  
1111
950   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines