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.163 by jsr166, Fri Feb 20 22:33:13 2015 UTC vs.
Revision 1.316 by jsr166, Fri Jun 19 17:40:45 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://download.java.net/java/early_access/jdk15/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 215 | Line 195
195             classpath="${junit.jar}"
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"/>
205 <      <compilerarg value="-Xbootclasspath/p:@{classes}"/>
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="--patch-module=java.base=${src.dir}"/>
431 >      <arg value="--frames" if:set="use-frames"/>
432 >      <arg value="--override-methods=summary"/>
433 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
434 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
435 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
436 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
437 > <!-- tags added in jdk9: currently unused -->
438 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
439 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
440      </javadoc>
441    </target>
442  
# Line 377 | Line 446
446            description="Puts all distributable products in single hierarchy"/>
447  
448  
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
449    <target name="clean"
450            description="Removes all build products">
400
451      <delete dir="${build.dir}"/>
402
452    </target>
453  
454  
455    <target name="dist-clean"
456            description="Removes all build and distribution products">
408
457      <delete dir="${build.dir}"/>
458      <delete dir="${dist.dir}"/>
411
459    </target>
460  
461  
# Line 422 | Line 469
469      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
470    </target>
471  
472 <  <target name="tck" depends="test-tck" description="alias for test-tck"/>
473 <  <target name="test-tck"
474 <          depends="jar"
428 <          description="Runs tck tests for main directly">
472 >  <target name="tck"
473 >          depends="jar"
474 >          description="Runs tck tests for src/main directly">
475  
476      <run-tck-tests
477 <      target="${build.main.java.version}"
477 >      target="${java.runtime.target}"
478        workdir="${build.dir}"
479 <      classes="${product.jar}"/>
479 >      classes="${product.jar}">
480 >      <javac-elements>
481 >        <compilerarg value="-Werror"/>
482 >      </javac-elements>
483 >    </run-tck-tests>
484    </target>
485  
486 <  <target name="test-tck-parallelism-1"
487 <          description="Runs test-tck with given common pool parallelism">
488 <    <antcall target="test-tck">
486 >  <target name="tck-parallelism-1"
487 >          description="Runs tck with common pool parallelism 1">
488 >    <antcall target="tck">
489        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
490      </antcall>
491    </target>
492  
493 <  <target name="test-tck-parallelism-0"
494 <          description="Runs test-tck with given common pool parallelism">
495 <    <antcall target="test-tck">
493 >  <target name="tck-parallelism-0"
494 >          description="Runs tck with common pool parallelism 0">
495 >    <antcall target="tck">
496        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
497      </antcall>
498    </target>
499  
500 <  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
501 <  <target name="test-jtreg"
502 <          depends="jar"
503 <          description="Runs jtreg tests for main using the jtreg ant task">
500 >  <target name="tck-security-manager"
501 >          description="Runs tck with a security manager">
502 >    <antcall target="tck">
503 >      <param name="jsr166.useSecurityManager" value="true"/>
504 >    </antcall>
505 >  </target>
506 >
507 >  <target name="jtreg"
508 >          depends="jar"
509 >          description="Runs jtreg tests for src/main using the jtreg ant task">
510      <run-jtreg-tests
511 <       target="${build.main.java.version}"
511 >       target="${java.runtime.target}"
512         workdir="${build.dir}"
513         classes="${product.jar}"/>
514    </target>
515  
516    <target name="test"
517 <          depends="test-tck, test-tck-parallelism-1, test-jtreg"
518 <          description="Runs tck and jtreg tests for main">
463 <  </target>
464 <
465 <  <target name="test89"
466 <          description="Runs tck and jtreg tests for main for multiple java versions">
467 <
468 <    <antcall target="clean"/>
469 <    <antcall target="test">
470 <      <param name="build.main.java.version" value="8"/>
471 <      <param name="build.main.javac" value="${javac8}"/>
472 <    </antcall>
517 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
518 >          description="Runs tck and jtreg tests for src/main"/>
519  
520 <    <antcall target="clean"/>
521 <    <antcall target="test">
522 <      <param name="build.main.java.version" value="9"/>
523 <      <param name="build.main.javac" value="${javac9}"/>
520 >  <target name="test-version-permutations"
521 >          depends="test11, test12, test13, test14, test15, test16,
522 >          test11-12, test11-13, test11-14, test11-15, test11-16,
523 >          clean, test, docs"
524 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
525 >
526 >  <target name="test11">
527 >    <antcall>
528 >      <param name="java.runtime.target" value="11"/>
529 >      <param name="build.main.javac" value="${javac11}"/>
530 >      <param name="build.main.javadoc" value="${javadoc12}"/>
531 >      <param name="build.main.javadoc.source" value="11"/>
532 >      <target name="clean"/>
533 >      <target name="test"/>
534 >      <target name="docs"/>
535      </antcall>
479
480  </target>
481
482
483
484  <target name="configure-compiler">
485
486    <property name="unchecked.option" value="-Xlint:unchecked"/>
487
488    <condition property="warnunchecked.arg" value="${unchecked.option}">
489      <istrue value="${build.warnunchecked}"/>
490    </condition>
491
492    <property name="warnunchecked.arg" value=""/>
493
494
495    <!-- Common options in javac invocations -->
496    <property name="build.args" value="${warnunchecked.arg}"/>
497
498  </target>
499
500
501
502  <!-- Various demos and test programs -->
503
504
505  <target name="loops" depends="configure-compiler"
506          description="Benchmark from Doug Lea's AQS paper">
507
508    <mkdir dir="${build.loops.dir}"/>
509
510    <javac srcdir="${loops.src.dir}"
511          destdir="${build.loops.dir}"
512            debug="${build.debug}"
513       debuglevel="${build.debuglevel}"
514      deprecation="${build.deprecation}"
515           source="${build.sourcelevel}"
516             fork="true">
517
518      <compilerarg line="${build.args}"/>
519      <classpath refid="loops.classpath"/>
520      <compilerarg value="-XDignore.symbol.file=true"/>
521
522    </javac>
523
524    <java classname="ALoops" fork="true">
525      <classpath refid="loops.classpath"/>
526    </java>
527
528  </target>
529
530
531  <!-- jsr166 4jdk7 -->
532
533  <target name="4jdk7compile"
534          depends="configure-compiler"
535          description="Compiles src/jdk7 sources, targeting jdk7">
536
537    <mkdir dir="${build.4jdk7.classes.dir}"/>
538
539    <javac srcdir="${4jdk7src.dir}"
540           destdir="${build.4jdk7.classes.dir}"
541           debug="${build.debug}"
542           debuglevel="${build.debuglevel}"
543           deprecation="${build.deprecation}"
544           source="6"
545           classpath=""
546           bootclasspath="${bootclasspath6}"
547           includeAntRuntime="false"
548           includeJavaRuntime="false"
549           executable="${javac7}"
550           fork="true">
551
552      <include name="**/*.java"/>
553      <compilerarg value="-Xprefer:source"/>
554      <compilerarg value="-XDignore.symbol.file=true"/>
555      <compilerarg value="-Xlint:all"/>
556      <compilerarg line="${build.args}"/>
557
558    </javac>
536    </target>
537  
538 <  <target name="4jdk7doclint"
539 <          depends="configure-compiler"
540 <          description="Finds doclint warnings">
541 <
542 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
543 <
544 <    <javac srcdir="${4jdk7src.dir}"
545 <           destdir="${build.4jdk7.classes.dir}"
546 <           debug="${build.debug}"
547 <           debuglevel="${build.debuglevel}"
571 <           deprecation="${build.deprecation}"
572 <           source="6"
573 <           classpath=""
574 <           bootclasspath="${bootclasspath7}"
575 <           includeAntRuntime="false"
576 <           includeJavaRuntime="false"
577 <           executable="${javac8}"
578 <           fork="true">
579 <
580 <      <include name="**/*.java"/>
581 <      <compilerarg value="-Xprefer:source"/>
582 <      <compilerarg value="-XDignore.symbol.file=true"/>
583 <      <compilerarg value="-Xlint:all"/>
584 <      <compilerarg value="-Xdoclint:all/protected"/>
585 <      <compilerarg line="${build.args}"/>
586 <
587 <    </javac>
588 <  </target>
589 <
590 <
591 <  <target name="4jdk7jar"
592 <          depends="4jdk7compile"
593 <          description="Builds library jar from compiled sources">
594 <
595 <    <jar destfile="${4jdk7product.jar}">
596 <      <fileset dir="${build.4jdk7.classes.dir}"/>
597 <    </jar>
598 <
599 <  </target>
600 <
601 <
602 <  <target name="4jdk7-test-tck"
603 <          depends="4jdk7jar"
604 <          description="Runs tck tests for jsr166-4jdk7 directly">
605 <
606 <    <run-tck-tests
607 <      target="7"
608 <      workdir="${build.4jdk7.dir}"
609 <      classes="${4jdk7product.jar}">
610 <      <javac-elements>
611 <        <!-- JDK8+ test classes -->
612 <        <exclude name="*8Test.java"/>
613 <        <exclude name="*9Test.java"/>
614 <        <exclude name="DoubleAccumulatorTest.java"/>
615 <        <exclude name="DoubleAdderTest.java"/>
616 <        <exclude name="LongAccumulatorTest.java"/>
617 <        <exclude name="LongAdderTest.java"/>
618 <        <exclude name="CompletableFutureTest.java"/>
619 <        <exclude name="SplittableRandomTest.java"/>
620 <        <exclude name="StampedLockTest.java"/>
621 <      </javac-elements>
622 <    </run-tck-tests>
623 <  </target>
624 <
625 <
626 <  <target name="4jdk7-test-tck-junit"
627 <          depends="4jdk7compile"
628 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
629 <
630 <    <junit printsummary="true"
631 <           showoutput="true"
632 <           errorProperty="junit.failed"
633 <           failureProperty="junit.failed"
634 <           includeantruntime="true"
635 <           jvm="${java7}"
636 <           fork="true">
637 <
638 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
639 <      <jvmarg value="-server"/>
640 <
641 <      <classpath>
642 <        <pathelement location="${junit.jar}"/>
643 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
644 <      </classpath>
645 <
646 <      <formatter type="brief"/>
647 <
648 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
649 <      </test>
650 <
651 <    </junit>
652 <  </target>
653 <
654 <  <target name="4jdk7-test-jtreg"
655 <          depends="4jdk7jar"
656 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
657 <    <run-jtreg-tests
658 <       target="7"
659 <       workdir="${build.4jdk7.dir}"
660 <       classes="${4jdk7product.jar}"
661 <       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
662 <  </target>
663 <
664 <
665 <  <target name="4jdk7-test"
666 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
667 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
668 <  </target>
669 <
670 <
671 <  <target name="4jdk7docs"
672 <          description="Builds javadocs for src/jdk7 to dist dir">
673 <
674 <    <delete dir="${4jdk7docs.dir}"/>
675 <    <mkdir dir="${4jdk7docs.dir}"/>
676 <
677 <    <javadoc destdir="${4jdk7docs.dir}"
678 <             packagenames="none"
679 <             link="${java7.api.url}"
680 <             overview="${4jdk7src.dir}/intro.html"
681 <             access="${build.javadoc.access}"
682 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
683 <             classpath=""
684 <             executable="${javadoc7}">
685 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
686 <        <include name="**/*.java"/>
687 <      </fileset>
688 <      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
689 <      <arg value="-XDignore.symbol.file=true"/>
690 <    </javadoc>
691 <  </target>
692 <
693 <
694 <  <target name="4jdk7dist"
695 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
696 <          description="Puts all distributable products in single hierarchy"/>
697 <
698 <
699 <  <target name="4jdk7clean"
700 <          description="Removes all 4jdk7 build products">
701 <
702 <    <delete dir="${build.4jdk7.dir}"/>
703 <
704 <  </target>
705 <
706 <
707 <  <target name="4jdk7dist-jar"
708 <          depends="4jdk7clean, 4jdk7jar">
709 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
710 <  </target>
711 <
712 <
713 <  <target name="4jdk7dist-docs"
714 <          depends="4jdk7clean, 4jdk7docs">
715 <    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
538 >  <target name="test12">
539 >    <antcall>
540 >      <param name="java.runtime.target" value="12"/>
541 >      <param name="build.main.javac" value="${javac12}"/>
542 >      <param name="build.main.javadoc" value="${javadoc12}"/>
543 >      <param name="build.main.javadoc.source" value="12"/>
544 >      <target name="clean"/>
545 >      <target name="test"/>
546 >      <target name="docs"/>
547 >    </antcall>
548    </target>
549  
550 <
551 <  <!-- jsr166x -->
552 <
553 <  <target name="jsr166xcompile"
554 <          depends="configure-compiler"
555 <          description="Compiles jsr166x sources to build dir">
556 <
557 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
558 <
559 <    <javac srcdir="${topsrc.dir}"
728 <           destdir="${build.jsr166x.classes.dir}"
729 <           debug="${build.debug}"
730 <           debuglevel="${build.debuglevel}"
731 <           deprecation="${build.deprecation}"
732 <           classpath=""
733 <           bootclasspath="${bootclasspath6}"
734 <           source="5"
735 <           includeAntRuntime="false"
736 <           includeJavaRuntime="false"
737 <           executable="${javac7}"
738 <           fork="true">
739 <
740 <      <include name="jsr166x/**/*.java"/>
741 <      <compilerarg value="-XDignore.symbol.file=true"/>
742 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
743 <      <compilerarg line="${build.args}"/>
744 <
745 <    </javac>
550 >  <target name="test13">
551 >    <antcall>
552 >      <param name="java.runtime.target" value="13"/>
553 >      <param name="build.main.javac" value="${javac13}"/>
554 >      <param name="build.main.javadoc" value="${javadoc13}"/>
555 >      <param name="build.main.javadoc.source" value="13"/>
556 >      <target name="clean"/>
557 >      <target name="test"/>
558 >      <target name="docs"/>
559 >    </antcall>
560    </target>
561  
562 <
563 <  <target name="jsr166xjar"
564 <          depends="jsr166xcompile"
565 <          description="Builds library jar from compiled sources">
566 <
567 <    <jar destfile="${jsr166x.jar}">
568 <      <fileset dir="${build.jsr166x.classes.dir}"/>
569 <    </jar>
570 <
562 >  <target name="test14">
563 >    <antcall>
564 >      <param name="java.runtime.target" value="14"/>
565 >      <param name="build.main.javac" value="${javac14}"/>
566 >      <param name="build.main.javadoc" value="${javadoc14}"/>
567 >      <param name="build.main.javadoc.source" value="14"/>
568 >      <target name="clean"/>
569 >      <target name="test"/>
570 >      <target name="docs"/>
571 >    </antcall>
572    </target>
573  
574 <
575 <  <target name="jsr166xdocs"
576 <          description="Builds javadocs to dist dir">
577 <
578 <    <delete dir="${jsr166xdocs.dir}"/>
579 <    <mkdir dir="${jsr166xdocs.dir}"/>
580 <
581 <    <javadoc destdir="${jsr166xdocs.dir}"
582 <             packagenames="jsr166x.*"
583 <             link="${java.api.url}"
769 <             access="${build.javadoc.access}"
770 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
771 <             bootclasspath="${bootclasspath6}"
772 <             source="5"
773 <             executable="${javadoc7}">
774 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
775 <      <arg value="-XDignore.symbol.file=true"/>
776 <
777 <    </javadoc>
574 >  <target name="test15">
575 >    <antcall>
576 >      <param name="java.runtime.target" value="15"/>
577 >      <param name="build.main.javac" value="${javac15}"/>
578 >      <param name="build.main.javadoc" value="${javadoc15}"/>
579 >      <param name="build.main.javadoc.source" value="15"/>
580 >      <target name="clean"/>
581 >      <target name="test"/>
582 >      <target name="docs"/>
583 >    </antcall>
584    </target>
585  
586 <
587 <  <target name="jsr166xdist"
588 <          depends="jsr166xdist-jar, jsr166xdist-docs"
589 <          description="Puts all distributable products in single hierarchy"/>
590 <
591 <
592 <  <target name="jsr166xclean"
593 <          description="Removes all jsr166x build products">
594 <
595 <    <delete dir="${build.jsr166x.dir}"/>
790 <
586 >  <target name="test16">
587 >    <antcall>
588 >      <param name="java.runtime.target" value="16"/>
589 >      <param name="build.main.javac" value="${javac16}"/>
590 >      <param name="build.main.javadoc" value="${javadoc16}"/>
591 >      <param name="build.main.javadoc.source" value="16"/>
592 >      <target name="clean"/>
593 >      <target name="test"/>
594 >      <target name="docs"/>
595 >    </antcall>
596    </target>
597  
598 <
599 <  <target name="jsr166xdist-jar"
600 <          depends="jsr166xclean, jsr166xjar">
601 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
598 >  <target name="test11-12">
599 >    <antcall>
600 >      <param name="java.runtime.target" value="12"/>
601 >      <param name="build.main.javac" value="${javac11}"/>
602 >      <param name="build.main.javadoc" value="${javadoc12}"/>
603 >      <param name="build.main.javadoc.source" value="11"/>
604 >      <target name="clean"/>
605 >      <target name="test"/>
606 >      <target name="docs"/>
607 >    </antcall>
608    </target>
609  
610 <  <target name="jsr166xdist-docs"
611 <          depends="jsr166xclean, jsr166xdocs">
612 <    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
610 >  <target name="test11-13">
611 >    <antcall>
612 >      <param name="java.runtime.target" value="13"/>
613 >      <param name="build.main.javac" value="${javac11}"/>
614 >      <param name="build.main.javadoc" value="${javadoc13}"/>
615 >      <param name="build.main.javadoc.source" value="11"/>
616 >      <target name="clean"/>
617 >      <target name="test"/>
618 >      <target name="docs"/>
619 >    </antcall>
620    </target>
621  
622 <  <!-- jsr166y -->
623 <
624 <
625 <  <target name="jsr166ycompile"
626 <          depends="configure-compiler"
627 <          description="Compiles jsr166y sources">
628 <
629 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
630 <
631 <    <javac srcdir="${topsrc.dir}"
814 <           destdir="${build.jsr166y.classes.dir}"
815 <           debug="${build.debug}"
816 <           debuglevel="${build.debuglevel}"
817 <           deprecation="${build.deprecation}"
818 <           source="6"
819 <           classpath=""
820 <           bootclasspath="${bootclasspath6}"
821 <           includeAntRuntime="false"
822 <           includeJavaRuntime="false"
823 <           executable="${javac7}"
824 <           fork="true">
825 <
826 <      <include name="jsr166y/**/*.java"/>
827 <      <compilerarg value="-XDignore.symbol.file=true"/>
828 <      <compilerarg value="-Xlint:all"/>
829 <      <compilerarg line="${build.args}"/>
830 <
831 <    </javac>
622 >  <target name="test11-14">
623 >    <antcall>
624 >      <param name="java.runtime.target" value="14"/>
625 >      <param name="build.main.javac" value="${javac11}"/>
626 >      <param name="build.main.javadoc" value="${javadoc14}"/>
627 >      <param name="build.main.javadoc.source" value="11"/>
628 >      <target name="clean"/>
629 >      <target name="test"/>
630 >      <target name="docs"/>
631 >    </antcall>
632    </target>
633  
634 <
635 <  <target name="jsr166yjar"
636 <          depends="jsr166ycompile"
637 <          description="Builds library jar from compiled sources">
638 <
639 <    <jar destfile="${jsr166y.jar}" index="true">
640 <      <fileset dir="${build.jsr166y.classes.dir}"/>
641 <    </jar>
642 <
634 >  <target name="test11-15">
635 >    <antcall>
636 >      <param name="java.runtime.target" value="15"/>
637 >      <param name="build.main.javac" value="${javac11}"/>
638 >      <param name="build.main.javadoc" value="${javadoc15}"/>
639 >      <param name="build.main.javadoc.source" value="11"/>
640 >      <target name="clean"/>
641 >      <target name="test"/>
642 >      <target name="docs"/>
643 >    </antcall>
644    </target>
645  
646 <
647 <  <target name="jsr166ydocs"
648 <          description="Builds javadocs to dist dir">
649 <
650 <    <delete dir="${jsr166ydocs.dir}"/>
651 <    <mkdir dir="${jsr166ydocs.dir}"/>
652 <
653 <    <javadoc destdir="${jsr166ydocs.dir}"
654 <             packagenames="jsr166y.*"
655 <             link="${java.api.url}"
855 <             access="${build.javadoc.access}"
856 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
857 <             bootclasspath="${bootclasspath6}"
858 <             source="6"
859 <             executable="${javadoc7}">
860 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
861 <      <arg value="-XDignore.symbol.file=true"/>
862 <
863 <    </javadoc>
646 >  <target name="test11-16">
647 >    <antcall>
648 >      <param name="java.runtime.target" value="16"/>
649 >      <param name="build.main.javac" value="${javac11}"/>
650 >      <param name="build.main.javadoc" value="${javadoc16}"/>
651 >      <param name="build.main.javadoc.source" value="11"/>
652 >      <target name="clean"/>
653 >      <target name="test"/>
654 >      <target name="docs"/>
655 >    </antcall>
656    </target>
657  
658  
659 <  <target name="jsr166ydist"
660 <          depends="jsr166ydist-jar, jsr166ydist-docs"
661 <          description="Puts all distributable products in single hierarchy"/>
662 <
659 >  <target name="configure-compiler">
660 >    <fail message="ant version too old">
661 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
662 >    </fail>
663  
664 <  <target name="jsr166yclean"
873 <          description="Removes all jsr166y build products">
664 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
665  
666 <    <delete dir="${build.jsr166y.dir}"/>
666 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
667 >      <istrue value="${build.warnunchecked}"/>
668 >    </condition>
669  
670 <  </target>
670 >    <property name="warnunchecked.arg" value=""/>
671  
672  
673 <  <target name="jsr166ydist-jar"
674 <          depends="jsr166yclean, jsr166yjar">
882 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
883 <  </target>
673 >    <!-- Common options in javac invocations -->
674 >    <property name="build.args" value="${warnunchecked.arg}"/>
675  
885  <target name="jsr166ydist-docs"
886          depends="jsr166yclean, jsr166ydocs">
887    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
676    </target>
677  
678  
679 <  <!-- extra166y -->
679 >  <target name="compile-test-loops" depends="jar"
680 >          description="Compiles all the perf tests in src/test/loops">
681  
682 +    <mkdir dir="${build.dir}/test/loops"/>
683  
684 <  <target name="extra166ycompile"
685 <          depends="configure-compiler, jsr166yjar"
896 <          description="Compiles extra166y sources">
897 <
898 <    <mkdir dir="${build.extra166y.classes.dir}"/>
899 <
900 <    <javac srcdir="${topsrc.dir}"
901 <           destdir="${build.extra166y.classes.dir}"
684 >    <javac srcdir="${basedir}/src/test/loops"
685 >           destdir="${build.dir}/test/loops"
686             debug="${build.debug}"
687             debuglevel="${build.debuglevel}"
688             deprecation="${build.deprecation}"
905           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
906           classpath=""
907           source="6"
689             includeAntRuntime="false"
690             includeJavaRuntime="false"
691 <           executable="${javac7}"
691 >           encoding="ASCII"
692 >           executable="${build.main.javac}"
693             fork="true">
694  
695 <      <include name="extra166y/**/*.java"/>
695 >      <include name="*.java"/>
696        <compilerarg value="-XDignore.symbol.file=true"/>
697 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
697 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
698 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
699        <compilerarg line="${build.args}"/>
917
700      </javac>
701    </target>
702  
703  
704 <  <target name="extra166yjar"
705 <          depends="extra166ycompile"
706 <          description="Builds library jar from compiled sources">
707 <
708 <    <jar destfile="${extra166y.jar}" index="true">
709 <      <fileset dir="${build.extra166y.classes.dir}"/>
710 <    </jar>
929 <
930 <  </target>
931 <
932 <
933 <  <target name="extra166ydocs"
934 <          description="Builds javadocs to build dir">
935 <
936 <    <delete dir="${extra166ydocs.dir}"/>
937 <    <mkdir dir="${extra166ydocs.dir}"/>
938 <
939 <    <javadoc destdir="${extra166ydocs.dir}"
940 <             packagenames="extra166y.*"
941 <             link="${java.api.url}"
942 <             access="${build.javadoc.access}"
943 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
944 <             bootclasspath="${bootclasspath6}"
945 <             source="6"
946 <             executable="${javadoc7}">
947 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
948 <      <arg value="-XDignore.symbol.file=true"/>
949 <
950 <    </javadoc>
951 <  </target>
952 <
953 <
954 <  <target name="extra166ydist"
955 <          depends="extra166ydist-jar, extra166ydist-docs"
956 <          description="Puts all distributable products in single hierarchy"/>
957 <
958 <
959 <  <target name="extra166yclean"
960 <          description="Removes all extra166y build products">
961 <
962 <    <delete dir="${build.extra166y.dir}"/>
963 <
964 <  </target>
704 >  <!-- old branches no longer maintained.  build support deleted -->
705 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
706 >  <!-- jsr166 4jdk7 (no longer maintained) -->
707 >  <!-- jsr166x (no longer maintained) -->
708 >  <!-- jsr166y (no longer maintained) -->
709 >  <!-- extra166y (no longer maintained) -->
710 >  <!-- jsr166e (no longer maintained) -->
711  
712 + <!-- Find buglets that can be detected by static build tools -->
713  
714 <  <target name="extra166ydist-jar"
715 <          depends="extra166yclean, extra166yjar">
716 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
717 <  </target>
714 > <!--   <target name="lint"> -->
715 > <!--     <antcall target="dists"> -->
716 > <!--       <param name="build.javadoc.access" value="protected"/> -->
717 > <!--     </antcall> -->
718 > <!--   </target> -->
719  
720 <  <target name="extra166ydist-docs"
721 <          depends="extra166yclean, extra166ydocs">
722 <    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
720 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
721 >  <target name="doclint-private">
722 >    <antcall target="dist">
723 >      <param name="build.javadoc.access" value="private"/>
724 >    </antcall>
725    </target>
726  
977  <!-- jsr166e -->
978
979  <property name="build.jsr166e.java.version" value="6"/>
980  <property name="build.jsr166e.javac" value="${javac6}"/>
727  
728 <  <target name="jsr166ecompile"
729 <          depends="configure-compiler"
730 <          description="Compiles jsr166e sources">
731 <
732 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
728 > <!-- ==============================================================
729 >  Experimental errorprone support
730 >  https://errorprone.info
731 >  https://errorprone.info/docs/installation
732 >  https://github.com/google/error-prone/issues/1143
733 > =================================================================== -->
734 >  <path id="errorprone.processorpath.path">
735 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
736 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
737 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
738 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
739 >    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
740 >  </path>
741 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
742 >  <property name="errorprone.jsr166.user.flags" value=""/>
743 >  <property name="errorprone.jsr166.flags"
744 >            value="-Xep:HashtableContains:OFF
745 >                   -Xep:JdkObsolete:OFF
746 >                   -Xep:MissingOverride:OFF
747 >                   -Xep:MissingFail:OFF
748 >                   -Xep:ThreadPriorityCheck:OFF
749 >                   -Xep:MixedArrayDimensions:ERROR
750 >                   -Xep:RemoveUnusedImports:ERROR
751 >                   -Xep:EmptyIf:ERROR
752 >                   -Xep:MultipleTopLevelClasses:ERROR
753 >                   -Xep:ClassName:ERROR
754 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
755 >                   -Xep:RedundantThrows:ERROR
756 >                   -Xep:IdentityBinaryExpression:WARN
757 >                   -Xep:ConstructorInvokesOverridable:WARN
758 >                   -Xep:MethodCanBeStatic:WARN
759 >                   ${errorprone.jsr166.user.flags}"/>
760 >  <!-- -Xep:WildcardImport:ERROR -->
761 >  <property name="errorprone.jsr166.test.flags"
762 >            value="-Xep:StringSplitter:OFF
763 >                   -Xep:BoxedPrimitiveConstructor:OFF
764 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
765 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
766 >  <target name="errorprone"
767 >          depends="clean, configure-compiler"
768 >          description="Run errorprone over jsr166 source code (experimental)">
769 >
770 >    <local name="destdir"/>
771 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
772 >    <mkdir dir="${destdir}"/>
773  
774 <    <javac srcdir="${topsrc.dir}"
775 <           destdir="${build.jsr166e.classes.dir}"
774 >    <javac srcdir="${src.dir}"
775 >           destdir="${destdir}"
776             debug="${build.debug}"
777             debuglevel="${build.debuglevel}"
778             deprecation="${build.deprecation}"
993           source="${build.jsr166e.java.version}"
779             classpath=""
780             includeAntRuntime="false"
781             includeJavaRuntime="false"
782 <           executable="${build.jsr166e.javac}"
782 >           encoding="ASCII"
783 >           executable="${build.main.javac}"
784             fork="true">
785  
786 <      <include name="jsr166e/**/*.java"/>
786 >      <include name="**/*.java"/>
787 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
788 >      <compilerarg value="-J--illegal-access=permit"/>
789 >      <compilerarg value="-XDcompilePolicy=simple"/>
790 >      <compilerarg value="-processorpath"/>
791 >      <compilerarg pathref="errorprone.processorpath.path"/>
792 >      <compilerarg value="-Xplugin:ErrorProne
793 >                          ${errorprone.jsr166.flags}"/>
794 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
795 >      <compilerarg value="-Xprefer:source"/>
796        <compilerarg value="-XDignore.symbol.file=true"/>
797        <compilerarg value="-Xlint:all"/>
798 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
799 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
800        <compilerarg line="${build.args}"/>
1004
801      </javac>
1006  </target>
802  
803 <  <!-- jsr166e: find doclint errors -->
804 <  <target name="jsr166edoclint">
1010 <
1011 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
1012 <
1013 <    <javac srcdir="${topsrc.dir}"
1014 <           destdir="${build.jsr166e.classes.dir}"
1015 <           debug="${build.debug}"
1016 <           debuglevel="${build.debuglevel}"
1017 <           deprecation="${build.deprecation}"
1018 <           source="${build.jsr166e.java.version}"
1019 <           classpath=""
1020 <           bootclasspath="${bootclasspath7}"
1021 <           includeAntRuntime="false"
1022 <           includeJavaRuntime="false"
1023 <           executable="${javac8}"
1024 <           fork="true">
1025 <
1026 <      <include name="jsr166e/**/*.java"/>
1027 <      <compilerarg value="-XDignore.symbol.file=true"/>
1028 <      <compilerarg value="-Xlint:all"/>
1029 <      <compilerarg value="-Xdoclint:all/protected"/>
1030 <
1031 <    </javac>
1032 <  </target>
1033 <
1034 <
1035 <  <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}"/>
803 >    <jar destfile="${product.jar}">
804 >      <fileset dir="${destdir}"/>
805      </jar>
806  
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="${java.api.url}"
1055             access="${build.javadoc.access}"
1056             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1057             source="${build.jsr166e.java.version}"
1058             executable="${javadoc7}">
1059      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1060      <arg value="-XDignore.symbol.file=true"/>
1061
1062    </javadoc>
1063  </target>
1064
1065
1066  <target name="jsr166e-test-tck-one-java-version"
1067          depends="jsr166ejar">
1068
1069    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1070
807      <run-tck-tests
808 <      tck.src.dir="${test.src.dir}/tck-jsr166e"
809 <      target="${build.jsr166e.java.version}"
810 <      workdir="${build.jsr166e.dir}"
811 <      classes="${jsr166e.jar}"/>
812 <  </target>
813 <
814 <  <target name="jsr166e-test-tck"
815 <          description="Runs tck tests for jsr166e for multiple java versions">
816 <
817 < <!--     <antcall target="clean"/> -->
818 < <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
819 < <!--       <param name="build.jsr166e.java.version" value="8"/> -->
820 < <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
821 < <!--     </antcall> -->
1086 <
1087 <    <antcall target="clean"/>
1088 <    <antcall target="jsr166e-test-tck-one-java-version">
1089 <      <param name="build.jsr166e.java.version" value="7"/>
1090 <      <param name="build.jsr166e.javac" value="${javac7}"/>
1091 <    </antcall>
1092 <
1093 <    <antcall target="clean"/>
1094 <    <antcall target="jsr166e-test-tck-one-java-version">
1095 <      <param name="build.jsr166e.java.version" value="6"/>
1096 <      <param name="build.jsr166e.javac" value="${javac6}"/>
1097 <    </antcall>
1098 <  </target>
1099 <
1100 <
1101 <  <target name="jsr166e-test"
1102 <          depends="jsr166e-test-tck"
1103 <          description="Runs all tests for jsr166e">
1104 <  </target>
1105 <
1106 <  <target name="jsr166edist"
1107 <          depends="jsr166edist-jar, jsr166edist-docs"
1108 <          description="Puts all distributable products in single hierarchy"/>
1109 <
1110 <
1111 <  <target name="jsr166eclean"
1112 <          description="Removes all jsr166e build products">
1113 <    <delete dir="${build.jsr166e.dir}"/>
1114 <  </target>
1115 <
1116 <
1117 <  <target name="jsr166edist-jar"
1118 <          depends="jsr166eclean, jsr166ejar">
1119 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1120 <  </target>
1121 <
1122 <  <target name="jsr166edist-docs"
1123 <          depends="jsr166eclean, jsr166edocs">
1124 <    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
808 >      target="${java.runtime.target}"
809 >      workdir="${build.dir}"
810 >      classes="${product.jar}">
811 >      <javac-elements>
812 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
813 >        <compilerarg value="-J--illegal-access=permit"/>
814 >        <compilerarg value="-XDcompilePolicy=simple"/>
815 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
816 >        <compilerarg value="-Xplugin:ErrorProne
817 >                            ${errorprone.jsr166.flags}
818 >                            ${errorprone.jsr166.test.flags}"/>
819 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
820 >      </javac-elements>
821 >    </run-tck-tests>
822    </target>
823  
824 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
825 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
826 +  <target name="errorprone-jtreg"
827 +          depends="jar"
828 +          description="Run errorprone over jtreg tests (experimental)">
829  
830 < <!-- Find buglets that can be detected by static build tools -->
831 <
832 <  <target name="lint">
833 <    <antcall target="dists">
834 <      <param name="build.javadoc.access" value="public"/>
835 <    </antcall>
836 <  </target>
830 >    <run-jtreg-tests
831 >       target="${java.runtime.target}"
832 >       workdir="${build.dir}"
833 >       classes="${product.jar}"
834 >       verbose="all">
835 >      <jtreg-elements>
836 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
837 >        <arg value="-javacoption:-processorpath"/>
838 >        <arg value="-javacoption:${errorprone.processorpath}"/>
839 >        <arg value="-javacoption:-Xplugin:ErrorProne
840 >                            ${errorprone.jsr166.flags}
841 >                            ${errorprone.jsr166.test.flags}
842 >                            -Xep:MultipleTopLevelClasses:WARN
843 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
844 >      </jtreg-elements>
845 >    </run-jtreg-tests>
846 >  </target>
847 >
848 >
849 > <!-- ==============================================================
850 >  Running guava tests against jsr166 code
851 > =================================================================== -->
852 >
853 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
854 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
855 > <!-- <property name="guava.version" value="21.0"/> -->
856 >
857 > <!-- HOWTO debug print a path id -->
858 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
859 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
860 >
861 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
862 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
863 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
864 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
865 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
866 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
867 >
868 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
869 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
870 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
871 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
872 >
873 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
874 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
875 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
876 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
877 >
878 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
879 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
880 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
881 >
882 >  <target name="init-ivy">
883 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
884 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
885 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
886 >             classpath="${build.dir}/ivy.jar"/>
887 >  </target>
888 >
889 >  <target name="guava-tests" depends="jar, init-ivy"
890 >          description="Guava tests run against jsr166 collections">
891 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
892 >    <mkdir dir="${guava.dir}"/>
893 >    <ivy:retrieve pathid="guava.testlib.classpath"
894 >      type="jar,bundle" inline="true" conf="default,master"
895 >      pattern="${guava.dir}/[artifact].[ext]"
896 >      organisation="com.google.guava" module="guava-testlib"/>
897 >    <property name="guava.version" value="21.0"/>
898 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
899 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
900 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
901 >           jvm="${build.main.java}" fork="true">
902 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
903 >      <formatter type="brief"/>
904 >      <classpath>
905 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
906 >        <path refid="guava.testlib.classpath"/>
907 >      </classpath>
908  
909 < <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
910 <  <target name="lint-private">
911 <    <antcall target="dist">
1139 <      <param name="build.javadoc.access" value="private"/>
1140 <    </antcall>
909 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
910 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
911 >    </junit>
912    </target>
913  
1143
914   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines