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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines