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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines