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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines