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.71 by peierls, Thu Dec 30 21:43:34 2004 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 +
18 +  The repository contains all dependencies except for ant and the JDK
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/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/jdk11
31 +  $HOME/jdk/src/jdk12
32 +  $HOME/jdk/src/jdk13
33 +  $HOME/jdk/src/jdk14
34 +  $HOME/jdk/src/jdk15
35 +  $HOME/jdk/src/jdk16
36 +  $HOME/jdk/src/jdk17
37 +  where each of the above is a JDK source tree or a symlink to same.
38 +
39 +  Alternatively, define ant variables thus:
40 +  ant -Djdk$N.home=... -Djdk$N.src.home=...
41 +  for $N in 11 .. 17 ...
42 +
43 +  As of 2016-03, the sources in src/main are for jdk9+ only.
44 +  As of 2019-08, the sources in src/main are for jdk11+ only.
45 +  As of 2019-10, compatibility support for jdk8 is dropped entirely.
46   ------------------------------------------------------------------------------
47    </description>
48  
49 <  <target name="usage" description="Advises user to run with -projecthelp">
50 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
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 -->
24  <property name="build.sourcelevel"    value="1.5"/>
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  
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.j1.dir"         location="${build.dir}/j1"/>
73 <  <property name="build.loops.dir"      location="${build.dir}/loops"/>
74 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
75 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
76 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
77 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
78 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
79 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
80 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
81 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
82 <  <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
83 <  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
84 <  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
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"/>
73 >
74 >  <!-- JDK locations -->
75 >  <property name="jdks.home"  location="${user.home}/jdk"/>
76 >
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.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 >
89 >  <macrodef name="mirror-dir">
90 >    <attribute name="src"/>
91 >    <attribute name="dst"/>
92 >    <sequential>
93 >    <delete dir="@{dst}"/>
94 >    <mkdir dir="@{dst}"/>
95 >    <copy todir="@{dst}" preservelastmodified="true">
96 >      <fileset dir="@{src}"/>
97 >    </copy>
98 >    </sequential>
99 >  </macrodef>
100 >
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"/>
50  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
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"/>
115 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
116 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
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"/>
59  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
125  
126 <  <!-- Distribution locations -->
127 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
128 <  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
126 >  <!-- Javadoc locations -->
127 >  <property name="docs.dir"          location="${build.dir}/docs"/>
128 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
129  
130    <!-- Jar locations -->
131 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
132 <  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
133 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
134 <  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
135 <
136 <  <!-- Bootclasspath argument -->
137 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
138 <
139 <  <!-- Test classpath -->
140 <  <path id="test.classpath">
141 <    <pathelement location="${build.testcases.dir}"/>
142 <    <pathelement location="${junit.jar}"/>
143 <  </path>
131 >  <property name="product.jar"      location="${build.dir}/jsr166.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 >  <!-- 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="java11.api.url"     value="${java11.docroot.url}/api/"/>
156 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
157 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
158 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
159 >  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
160 >  <property name="java16.api.url"     value="${java16.docroot.url}/api/"/>
161 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
162 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
163 >
164 >  <!-- Define the "jtreg" task -->
165 >  <!-- See the docs in "jtreg -onlineHelp" -->
166 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
167 >           classpath="${lib.dir}/jtreg.jar" />
168 >
169 >  <!-- 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 >    <!--
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"/>
193 >
194 >    <javac srcdir="@{tck.src.dir}"
195 >           destdir="@{workdir}/tck-classes"
196 >           debug="${build.debug}"
197 >           debuglevel="${build.debuglevel}"
198 >           deprecation="${build.deprecation}"
199 >           source="@{compile-target}"
200 >           target="@{compile-target}"
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,-try"/>
211 >      <compilerarg value="-Xdoclint:reference/private"/>
212 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
213 >      <compilerarg line="${build.args}"/>
214 >      <javac-elements/>
215 >
216 >    </javac>
217 >
218 >    <java classname="${jsr166.tckTestClass}"
219 >          failonerror="true"
220 >          jvm="${java@{target}}"
221 >          fork="true">
222 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
223 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
224 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
225 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
226 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
227 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
228 >        <jvmarg line="@{jvmflags}"/>
229 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
230 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
231 >
232 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
233 >        <syspropertyset id="system-properties-used-by-tck">
234 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
235 >          <propertyref prefix="jsr166."/>
236 >          <propertyref name="test.timeout.factor"/>
237 >        </syspropertyset>
238 >
239 >        <classpath>
240 >          <pathelement location="${junit.jar}"/>
241 >          <pathelement location="@{workdir}/tck-classes"/>
242 >        </classpath>
243 >    </java>
244 >
245 >    </sequential>
246 >  </macrodef>
247 >
248 >  <!-- Define jtreg test sets for different jdk versions -->
249 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
250 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
251 >  <property name="jtreg.test.pattern" value="**/*.java"/>
252 >  <macrodef name="defjtregtests">
253 >    <attribute name="v"/>
254 >    <sequential>
255 >      <fileset dir="${jtreg@{v}.src.dir}">
256 >        <patternset id="jdk@{v}.jtreg.tests">
257 >          <include name="${jtreg.test.pattern}"/>
258 >        </patternset>
259 >      </fileset>
260 >    </sequential>
261 >  </macrodef>
262 >
263 >  <defjtregtests v="17"/>
264 >  <defjtregtests v="16"/>
265 >  <defjtregtests v="15"/>
266 >  <defjtregtests v="14"/>
267 >  <defjtregtests v="13"/>
268 >  <defjtregtests v="12"/>
269 >  <defjtregtests v="11"/>
270 >
271 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
272 >  <property name="jtreg.flags" value=""/>
273 >
274 >  <macrodef name="run-jtreg-tests">
275 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
276 >    <attribute name="target"/>
277 >    <attribute name="workdir"/>
278 >    <attribute name="classes"/>
279 >    <attribute name="verbose" default="${jtreg.verbose}"/>
280 >    <attribute name="jtregflags" default=""/>
281 >    <element name="jtreg-elements" optional="true"/>
282 >
283 >    <sequential>
284 >
285 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
286 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
287 >
288 >    <!-- 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>
316  
317    <!-- ALoops classpath -->
318    <path id="loops.classpath">
319      <pathelement location="${build.loops.dir}"/>
320    </path>
321  
322 <  <!-- J1 classpath -->
323 <  <path id="j1.classpath">
324 <    <pathelement location="${build.classes.dir}"/>
325 <    <pathelement location="${build.j1.dir}"/>
89 <    <pathelement location="${junit.jar}"/>
90 <
91 <    <!-- Include dl.u.c for BoundedBuffer comparison -->
92 <    <pathelement location="${concurrent.jar}"/>
93 <  </path>
94 <
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 +  <!-- 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"
347 +          description="Builds all public jars and docs"/>
348  
349    <target name="compile"
350 <          depends="init, configure-compiler"
351 <          description="Compiles main sources to build folder">
350 >          depends="configure-compiler"
351 >          description="Compiles src/main sources to build dir">
352 >
353 >    <local name="destdir"/>
354 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
355  
356 <    <mkdir dir="${build.classes.dir}"/>
356 >    <mkdir dir="${destdir}"/>
357  
358      <javac srcdir="${src.dir}"
359 <          destdir="${build.classes.dir}"
360 <            debug="${build.debug}"
361 <       debuglevel="${build.debuglevel}"
362 <      deprecation="${build.deprecation}"
363 <           source="${build.sourcelevel}"
364 <             fork="true">
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 <      <exclude name="java/lang/**"/>
371 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
372 >      <compilerarg value="-Xprefer:source"/>
373 >      <compilerarg value="-XDignore.symbol.file=true"/>
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  
387      </javac>
118
388    </target>
389  
390  
122
391    <target name="jar"
392            depends="compile"
393 <          description="Builds library jar from compiled sources">
394 <
395 <    <mkdir dir="${build.lib.dir}"/>
128 <
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>
132
403    </target>
404  
405  
136
137  <target name="test"
138          depends="init, configure-tests, report-tests"
139          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
140
141
142
406    <target name="docs"
407 <          description="Builds javadocs with custom tags to build folder">
145 <
146 <    <delete dir="${build.javadocs.dir}"/>
147 <    <mkdir dir="${build.javadocs.dir}"/>
148 <
149 <    <javadoc destdir="${build.javadocs.dir}"
150 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
151 <            overview="${src.dir}/intro.html"
152 <              source="${build.sourcelevel}">
407 >          description="Builds javadocs for src/main to dist dir">
408  
409 <      <tag name="revised" description="Last revised:"/>
410 <      <tag name="spec"    description="Specified by:"/>
156 <
157 <      <packageset dir="${src.dir}"/>
158 <
159 <    </javadoc>
160 <
161 <  </target>
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 <  <target name="doccheck"
423 <          depends="filter-doccheck"
424 <          description="Reports on javadoc style errors">
425 <
426 <    <delete dir="${build.doccheck.dir}"/>
427 <    <mkdir dir="${build.doccheck.dir}"/>
428 <
429 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
430 <         docletpath="${lib.dir}/doccheck.jar"
431 <            destdir="${build.doccheck.dir}">
432 <      <packageset dir="${build.dc-filter.dir}"/>
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="${java.api.url}"
430 >             overview="${src.dir}/intro.html"
431 >             access="${build.javadoc.access}"
432 >             sourcepath="${src.dir}"
433 >             classpath=""
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/**/*.java"/>
439 >      </fileset>
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="-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>
177
178    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
179
457    </target>
458  
459  
183
184  <target name="checkstyle"
185          depends="filter-src"
186          description="Reports on style errors in Java source (verbose, mostly chaff)">
187
188    <taskdef resource="checkstyletask.properties"
189            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
190
191    <mkdir dir="${build.checkstyle.dir}"/>
192
193    <checkstyle config="etc/checkstyle/sun_checks.xml"
194       failOnViolation="false">
195      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
196      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
197    </checkstyle>
198
199    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
200          out="${build.checkstyle.dir}/checkstyle-report.html"
201        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
202
203  </target>
204
205
206
460    <target name="dist"
461 <          depends="init, dist-clean, dist-jar, dist-docs"
461 >          depends="dist-clean, dist-jar, dist-docs"
462            description="Puts all distributable products in single hierarchy"/>
463  
464  
212
213  <target name="release"
214          depends="dist"
215          description="Puts entire CVS tree, plus distribution productions, in a jar">
216
217    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
218
219    <jar basedir="${basedir}" destfile="${release.jar}">
220      <!-- <exclude name="build/**"/> -->
221      <exclude name="${release.jar}"/>
222      <exclude name="user.properties"/>
223      <exclude name="etc/notes/**"/>
224      <exclude name="src/emulation/**"/>
225      <exclude name="**/SyntaxTest.java"/>
226      <exclude name="**/SuperfluousAbstract.java"/>
227    </jar>
228
229  </target>
230
231
232
465    <target name="clean"
466            description="Removes all build products">
235
467      <delete dir="${build.dir}"/>
237    <delete dir="${build.classes.dir}"/>
238    <delete dir="${build.lib.dir}"/>
239
468    </target>
469  
470  
243
471    <target name="dist-clean"
472            description="Removes all build and distribution products">
473 <
473 >    <delete dir="${build.dir}"/>
474      <delete dir="${dist.dir}"/>
248
249  </target>
250
251
252
253  <target name="dist-docs"
254          description="Builds javadocs without custom tags to dist folder">
255
256    <delete dir="${dist.javadocs.dir}"/>
257    <mkdir dir="${dist.javadocs.dir}"/>
258
259    <javadoc destdir="${dist.javadocs.dir}"
260                link="http://java.sun.com/j2se/1.4.2/docs/api"
261            overview="${src.dir}/intro.html"
262              source="${build.sourcelevel}">
263
264      <packageset dir="${src.dir}"/>
265
266    </javadoc>
267
268  </target>
269
270
271
272  <!-- Internal targets -->
273
274
275  <target name="init">
276
277    <!-- Version is kept in a separate file -->
278    <loadfile property="version" srcFile="version.properties"/>
279    <echo>Building JSR-166 version ${version}</echo>
280    <echo>java.home is ${java.home}</echo>
281
475    </target>
476  
477  
478    <target name="dist-jar"
479            depends="clean, jar">
287
480      <copy file="${product.jar}" todir="${dist.dir}"/>
289
290  </target>
291
292
293  <target name="compile-ant-filter"
294          depends="init">
295
296    <mkdir dir="${build.ant.dir}"/>
297
298    <javac srcdir="${ant.src.dir}"
299          destdir="${build.ant.dir}"
300           source="1.4"/>
301
302  </target>
303
304
305  <target name="filter-src"
306          depends="compile-ant-filter">
307
308    <mkdir dir="${build.filter.src.dir}"/>
309
310    <copy todir="${build.filter.src.dir}">
311      <fileset dir="${src.dir}">
312        <include name="**/*.html"/>
313      </fileset>
314    </copy>
315
316    <copy todir="${build.filter.src.dir}">
317      <fileset dir="${src.dir}">
318        <exclude name="**/*.html"/>
319        <!-- Files excluded from dist-docs -->
320        <exclude name="java/util/Random.*"/>
321        <exclude name="sun/misc/Unsafe.*"/>
322      </fileset>
323      <!--
324      <filterchain>
325      -->
326
327        <!--
328         # This filter gets rid of angle-bracketed type parameters
329         # so that javadoc can run on the result. The following
330         # heuristic seems to work:
331         #
332         # For all lines not starting with space(s)-asterisk-space(s),
333         #   replace <something> with a space, where there may be more
334         #   than one right angle bracket at the end, and "something"
335         #   must not contain parens or pipes. (This may need some
336         #   tweaking.)
337         -->
338
339        <!--
340        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
341                      classpath="${build.ant.dir}">
342          <param name="notmatching" value="^\s+\*\s.*$"/>
343          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
344          <param name="replacement" value=" "/>
345        </filterreader>
346        -->
347
348      <!--
349      </filterchain>
350      -->
351    </copy>
352
481    </target>
482  
483 <
484 <  <target name="filter-doccheck"
485 <          depends="filter-src">
358 <
359 <    <mkdir dir="${build.dc-filter.dir}"/>
360 <
361 <    <copy todir="${build.dc-filter.dir}">
362 <      <fileset dir="${build.filter.src.dir}">
363 <        <include name="**/*.html"/>
364 <      </fileset>
365 <    </copy>
366 <
367 <    <property name="generic.declarations"
368 <             value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
369 <    />
370 <
371 <    <copy todir="${build.dc-filter.dir}">
372 <      <fileset dir="${build.filter.src.dir}">
373 <        <exclude name="**/*.html"/>
374 <      </fileset>
375 <      <filterchain>
376 <        <!--
377 <         # These two filters try to make the source look like
378 <         # something that doccheck can process. The first removes
379 <         # -source 1.4 assertions and the second adds in a bunch
380 <         # of single letter public nested marker interfaces so that
381 <         # the generic type parameters are recognized.
382 <         -->
383 <
384 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
385 <                      classpath="${build.ant.dir}">
386 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
387 <          <param name="pattern"     value="assert"/>
388 <          <param name="replacement" value="//assert"/>
389 <        </filterreader>
390 <
391 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
392 <                      classpath="${build.ant.dir}">
393 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
394 <          <param name="pattern"     value="$"/>
395 <          <param name="replacement" value=" ${generic.declarations}"/>
396 <        </filterreader>
397 <
398 <      </filterchain>
399 <    </copy>
400 <
401 <  </target>
402 <
403 <
404 <  <target name="compile-tests"
405 <          depends="jar">
406 <
407 <    <mkdir dir="${build.testcases.dir}"/>
408 <
409 <    <javac srcdir="${tck.src.dir}"
410 <          destdir="${build.testcases.dir}"
411 <            debug="${build.debug}"
412 <       debuglevel="${build.debuglevel}"
413 <      deprecation="${build.deprecation}"
414 <           source="${build.sourcelevel}"
415 <             fork="true">
416 <
417 <      <compilerarg value="${bootclasspath.args}"/>
418 <      <compilerarg line="${build.args}"/>
419 <
420 <      <classpath refid="test.classpath"/>
421 <
422 <    </javac>
423 <
424 <    <javac srcdir="${test.src.dir}"
425 <          destdir="${build.testcases.dir}"
426 <            debug="${build.debug}"
427 <       debuglevel="${build.debuglevel}"
428 <      deprecation="${build.deprecation}"
429 <           source="${build.sourcelevel}"
430 <             fork="true">
431 <
432 <      <include name="jsr166/test/**"/>
433 <
434 <      <compilerarg value="${bootclasspath.args}"/>
435 <      <compilerarg line="${build.args}"/>
436 <
437 <      <classpath refid="test.classpath"/>
438 <
439 <    </javac>
440 <
441 < <!--
442 <    <javac srcdir="${jtreg.src.dir}"
443 <          destdir="${build.testcases.dir}"
444 <            debug="${build.debug}"
445 <       debuglevel="${build.debuglevel}"
446 <      deprecation="${build.deprecation}"
447 <           source="${build.sourcelevel}"
448 <             fork="true">
449 <
450 <      <compilerarg value="${bootclasspath.args}"/>
451 <      <compilerarg line="${build.args}"/>
452 <
453 <      <classpath refid="test.classpath"/>
454 <
455 <    </javac>
456 < -->
457 <
483 >  <target name="dist-docs"
484 >          depends="clean, docs">
485 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
486    </target>
487  
488 <
489 <  <target name="run-tests"
490 <          depends="compile-tests">
491 <
492 <    <!-- May be overridden by user.properties -->
493 <    <property name="testcase" value="*"/>
494 <
495 <    <mkdir dir="${build.reports.dir}"/>
496 <
497 <    <junit printsummary="true"
498 <             showoutput="true"
499 <          errorProperty="junit.failed"
500 <        failureProperty="junit.failed"
501 <                    dir="${build.reports.dir}"
502 <                   fork="true">
503 <
504 <      <jvmarg value="${bootclasspath.args}"/>
505 <      <jvmarg value="-server"/>
506 <      <jvmarg value="-showversion"/>
507 <
508 <      <classpath refid="test.classpath"/>
509 <
510 <      <formatter type="xml"/>
511 <
512 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
513 <        <fileset dir="${tck.src.dir}">
514 <          <include name="**/${testcase}Test.java"/>
515 <        </fileset>
516 <      </batchtest>
517 <
518 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
519 <        <fileset dir="${test.src.dir}">
520 <          <include name="jsr166/test/**/${testcase}Test.java"/>
521 <        </fileset>
522 <      </batchtest>
523 <
524 < <!--
525 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
526 <        <fileset dir="${jtreg.src.dir}">
527 <          <include name="**/${testcase}Test.java"/>
528 <        </fileset>
529 <      </batchtest>
502 < -->
503 <
504 <    </junit>
505 <
488 >  <target name="tck"
489 >          depends="jar"
490 >          description="Runs tck tests for src/main directly">
491 >
492 >    <run-tck-tests
493 >      target="${java.runtime.target}"
494 >      workdir="${build.dir}"
495 >      classes="${product.jar}">
496 >      <javac-elements>
497 >        <compilerarg value="-Werror"/>
498 >      </javac-elements>
499 >    </run-tck-tests>
500 >  </target>
501 >
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="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="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="${java.runtime.target}"
528 >       workdir="${build.dir}"
529 >       classes="${product.jar}"/>
530    </target>
531  
532 +  <target name="test"
533 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
534 +          description="Runs tck and jtreg tests for src/main"/>
535  
536 <  <target name="report-tests"
537 <          depends="run-tests">
538 <
539 <    <!-- Sets junit.report.format to frames if redirection is present,
540 <         otherwise sets it to noframes. -->
541 <    <available property="junit.report.format"
542 <                  value="frames"
543 <              classname="org.apache.xalan.lib.Redirect"
544 <    />
545 <    <property name="junit.report.format" value="noframes"/>
546 <
547 <    <junitreport todir="${build.reports.dir}">
548 <      <fileset dir="${build.reports.dir}">
549 <        <include name="TEST-*.xml"/>
550 <      </fileset>
551 <      <report styledir="${stylesheet.dir}"
552 <                format="${junit.report.format}"
553 <                 todir="${build.reports.dir}"
554 <      />
555 <    </junitreport>
556 <
557 <    <fail message="Test Cases Failed" if="junit.failed"/>
558 <
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>
552 >  </target>
553 >
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 >  <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 >  <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 >  <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 >  <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 >  <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 >  <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="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 >  <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 >  <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 >  <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="configure-compiler">
687 +    <fail message="ant version too old">
688 +      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
689 +    </fail>
690  
691      <property name="unchecked.option" value="-Xlint:unchecked"/>
692  
# Line 549 | Line 703
703    </target>
704  
705  
706 <  <target name="configure-tests"
707 <       depends="configure-compiler">
554 <
555 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
556 <    <available property="junit.available"
557 <               classname="junit.framework.Protectable"/>
558 <
559 <    <!-- Xalan -->
560 <    <available property="xalan.available"
561 <               classname="org.apache.xalan.Version"/>
562 <
563 <
564 <    <!-- Ant 1.6beta and later don't need or want this check -->
565 <    <!--
566 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
567 <          unless="junit.available"/>
568 <
569 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
570 <          unless="xalan.available"/>
571 <    -->
572 <
573 <  </target>
574 <
575 <
576 <
577 <  <!-- Anthill targets -->
578 <
579 <  <target name="anthill-build">
580 <
581 <    <!-- Override this in user.properties -->
582 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
583 <
584 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
585 <      <arg value="-Xmx256000000"/>
586 <      <!-- classpath of new JVM -->
587 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
588 <      <!-- location of Ant home directory -->
589 <      <arg value="-Dant.home=${ant.home}"/>
590 <      <!-- the Ant main class -->
591 <      <arg value="org.apache.tools.ant.Main"/>
592 <      <!-- The build file -->
593 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
594 <      <!-- the target to build on the new Ant instance -->
595 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
596 <      <arg value="do-anthill-build"/>
597 <    </exec>
598 <  </target>
599 <
600 <  <target name="do-anthill-build"
601 <          depends="jar, test, docs, dist-docs"/>
602 <
603 <  <target name="anthill-publish">
604 <
605 <    <copy todir="${deployDir}/docs/private">
606 <      <fileset dir="${build.javadocs.dir}"/>
607 <    </copy>
608 <
609 <    <copy todir="${deployDir}/docs/public">
610 <      <fileset dir="${dist.javadocs.dir}"/>
611 <    </copy>
612 <
613 <    <copy tofile="${deployDir}/index.html"
614 <          file="${basedir}/etc/anthill-index.html"/>
615 <
616 <    <copy todir="${deployDir}/notes">
617 <      <fileset dir="${basedir}/etc/notes"/>
618 <    </copy>
619 <
620 <  </target>
621 <
622 <
623 <
624 <  <!-- Various demos and test programs -->
625 <
626 <
627 <  <target name="sample" depends="init, configure-compiler"
628 <          description="Standalone demo program">
629 <
630 <    <mkdir dir="${build.testcases.dir}"/>
631 <
632 <    <javac srcdir="${test.src.dir}"
633 <          destdir="${build.testcases.dir}"
634 <            debug="${build.debug}"
635 <       debuglevel="${build.debuglevel}"
636 <      deprecation="${build.deprecation}"
637 <           source="${build.sourcelevel}"
638 <             fork="true">
639 <
640 <      <include name="jsr166/test/Sample.java"/>
641 <
642 <    </javac>
643 <
644 <    <copy todir="${build.testcases.dir}">
645 <      <fileset dir="${test.src.dir}">
646 <        <include name="**/*.properties"/>
647 <      </fileset>
648 <    </copy>
649 <
650 <
651 <    <java classname="jsr166.test.Sample" fork="true">
652 <      <classpath refid="test.classpath"/>
653 <      <!-- <jvmarg value="-ea"/> -->
654 <      <!-- <jvmarg value="-server"/> -->
655 <      <!-- <arg value="1000"/> -->
656 <    </java>
657 <  </target>
658 <
659 <
660 <  <target name="loops" depends="init, configure-compiler"
661 <          description="Benchmark from Doug Lea's AQS paper">
662 <
663 <    <mkdir dir="${build.loops.dir}"/>
664 <
665 <    <javac srcdir="${loops.src.dir}"
666 <          destdir="${build.loops.dir}"
667 <            debug="${build.debug}"
668 <       debuglevel="${build.debuglevel}"
669 <      deprecation="${build.deprecation}"
670 <           source="${build.sourcelevel}"
671 <             fork="true">
672 <
673 <      <compilerarg line="${build.args}"/>
674 <      <classpath refid="loops.classpath"/>
675 <
676 <    </javac>
677 <
678 <    <java classname="ALoops" fork="true">
679 <      <classpath refid="loops.classpath"/>
680 <    </java>
681 <
682 <  </target>
683 <
684 <
685 <  <target name="compile-j1" depends="init, configure-compiler, compile">
686 <
687 <    <mkdir dir="${build.j1.dir}"/>
688 <
689 <    <javac srcdir="${j1.src.dir}"
690 <          destdir="${build.j1.dir}"
691 <            debug="${build.debug}"
692 <       debuglevel="${build.debuglevel}"
693 <      deprecation="${build.deprecation}"
694 <           source="${build.sourcelevel}" >
695 <
696 <      <include name="**/*.java"/>
697 <      <exclude name="**/dijkstra/**"/>
698 <
699 <      <compilerarg line="${build.args}"/>
700 <      <classpath refid="j1.classpath"/>
701 <
702 <    </javac>
703 <
704 <  </target>
705 <
706 <
707 <  <target name="sw" depends="compile-j1"
708 <          description="Runs the SwingWorker demo">
709 <
710 <    <!--
711 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
712 <      <classpath refid="j1.classpath"/>
713 <    </java>
714 <    -->
715 <
716 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
717 <
718 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
719 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
720 <    </exec>
721 <
722 <  </target>
723 <
724 <  <target name="j1" depends="compile-j1"
725 <          description="Runs a standalone JavaOne program">
726 <
727 <    <java classname="${j1.test}" fork="true">
728 <      <classpath refid="j1.classpath"/>
729 <      <jvmarg value="-client"/>
730 <
731 <      <!-- TestPseudoRandom args -->
732 <      <arg value="2"/>
733 <      <arg value="25"/>
734 <      <arg value="100000"/>
735 <
736 <      <!-- WebCrawler args -->
737 <      <!--
738 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
739 <      <arg value="http://www.priorartisans.com"/>
740 <      <arg value="25"/>
741 <      -->
742 <
743 <    </java>
744 <
745 <  </target>
746 <
747 <
748 <  <target name="test-j1" depends="compile-j1"
749 <          description="Runs testcases from the JavaOne source directories">
750 <
751 <    <junit printsummary="true"
752 <             showoutput="true"
753 <          errorProperty="junit.failed"
754 <        failureProperty="junit.failed"
755 <                    dir="${build.j1.dir}"
756 <                   fork="true">
757 <
758 <      <!-- <jvmarg value="-server"/> -->
759 <      <classpath refid="j1.classpath"/>
760 <      <formatter type="xml"/>
761 <
762 <      <batchtest todir="${build.j1.dir}">
763 <        <fileset dir="${j1.src.dir}">
764 <          <include name="**/*Test.java"/>
765 <        </fileset>
766 <      </batchtest>
767 <
768 <    </junit>
769 <
770 <    <available property="junit.report.format"
771 <                  value="frames"
772 <              classname="org.apache.xalan.lib.Redirect"/>
773 <    <property name="junit.report.format" value="noframes"/>
774 <
775 <    <junitreport todir="${build.j1.dir}">
776 <      <fileset dir="${build.j1.dir}">
777 <        <include name="TEST-*.xml"/>
778 <      </fileset>
779 <      <report styledir="${stylesheet.dir}"
780 <                format="${junit.report.format}"
781 <                 todir="${build.j1.dir}"
782 <      />
783 <    </junitreport>
784 <
785 <    <fail message="Test Cases Failed" if="junit.failed"/>
786 <
787 <  </target>
788 <
789 <
790 <
791 <  <!-- C++ and JNI definitions and demos -->
792 <
793 <  <target name="configure-cpp">
794 <
795 <    <!-- Define tasks and types -->
796 <
797 <    <path id="cpptasks.path">
798 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
799 <    </path>
800 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
801 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
802 <
803 <    <!-- Set platform property for JNI includes -->
804 <
805 <    <condition property="platform" value="linux">
806 <      <os name="Linux"/>
807 <    </condition>
808 <    <condition property="platform" value="win32">
809 <      <os family="windows"/>
810 <    </condition>
811 <    <condition property="platform" value="solaris">
812 <      <os name="SunOS"/>
813 <    </condition>
814 <
815 <  </target>
816 <
817 <
818 <  <target name="cppdemo" depends="configure-cpp">
819 <
820 <    <mkdir dir="${build.dir}"/>
821 <
822 <    <cc multithreaded="true"
823 <                 name="g++"
824 <               objdir="${build.dir}"
825 <              outfile="${build.dir}/CppDemo">
826 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
827 <      <libset libs="stdc++"/>
828 <    </cc>
829 <
830 <    <exec executable="${build.dir}/CppDemo">
831 <      <arg line="count in word frequency of word in command line count"/>
832 <    </exec>
833 <
834 <  </target>
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="jnidemo" depends="init, configure-compiler, configure-cpp">
712 <
713 <    <mkdir dir="${build.testcases.dir}"/>
714 <
715 <    <javac srcdir="${test.src.dir}"
716 <          destdir="${build.testcases.dir}"
717 <            debug="${build.debug}"
718 <       debuglevel="${build.debuglevel}"
719 <      deprecation="${build.deprecation}"
720 <           source="${build.sourcelevel}"
721 <             fork="true">
722 <      <compilerarg value="${bootclasspath.args}"/>
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}"
716 >           includeAntRuntime="false"
717 >           includeJavaRuntime="false"
718 >           encoding="ASCII"
719 >           executable="${build.main.javac}"
720 >           fork="true">
721 >
722 >      <include name="*.java"/>
723 >      <compilerarg value="-XDignore.symbol.file=true"/>
724 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
725 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
726        <compilerarg line="${build.args}"/>
850      <classpath refid="test.classpath"/>
851      <include name="JniDemo.java"/>
727      </javac>
853
854    <javah destdir="${build.testcases.dir}"
855      classpathref="test.classpath">
856      <class name="JniDemo"/>
857    </javah>
858
859    <cc multithreaded="true"
860                 name="g++"
861               objdir="${build.dir}"
862              outfile="${build.dir}/JniDemo"
863              outtype="shared">
864
865      <compiler>
866        <defineset>
867          <define name="__int64" value="long long"/>
868        </defineset>
869        <includepath location="${java.home}/../include"/>
870        <includepath location="${java.home}/../include/${platform}"/>
871        <compilerarg value="-mno-cygwin"/>
872      </compiler>
873
874      <linker>
875        <linkerarg value="--add-stdcall-alias"/>
876      </linker>
877
878      <includepath location="${build.testcases.dir}"/>
879
880      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
881
882      <libset libs="stdc++"/>
883
884    </cc>
885
886    <!-- Necessary if windows, harmless if not -->
887    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
888
889    <java classname="JniDemo" fork="true">
890      <!-- Watch out: path separator hardwired to semicolon here! -->
891      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
892      <classpath refid="test.classpath"/>
893      <arg line="count in word frequency of word in command line count"/>
894    </java>
895
728    </target>
729  
730  
731 <
732 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
733 <
734 <
735 <
736 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
737 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
738 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
739 <  <property name="pretiger.sourcelevel" value="1.4"/>
740 <
741 <  <target name="defang"
742 <       depends="init"
743 <   description="Generates pre-Tiger compatible source">
744 <
745 <    <delete dir="${pretiger.src.dir}"/>
746 <    <mkdir dir="${pretiger.src.dir}"/>
747 <
748 <    <exec executable="perl">
749 <      <arg file="etc/defang.pl"/>
750 <      <!-- <arg value="-v"/> -->
751 <      <arg value="-s"/> <arg file="${src.dir}"/>
920 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
921 <    </exec>
922 <
923 <  </target>
924 <
925 <  <target name="compile-pretiger"
926 <          depends="init, configure-compiler, defang"
927 <          description="Compiles pre-Tiger sources to build folder">
928 <
929 <    <mkdir dir="${build.pretiger.dir}"/>
930 <
931 <    <javac srcdir="${pretiger.src.dir}"
932 <          destdir="${build.pretiger.dir}"
933 <            debug="${build.debug}"
934 <       debuglevel="${build.debuglevel}"
935 <      deprecation="${build.deprecation}"
936 <           source="${pretiger.sourcelevel}"
937 <             fork="true">
938 <
939 <      <compilerarg line="${build.args}"/>
940 <      <exclude name="**/Thread.java"/>
941 <
942 <    </javac>
943 <
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="lint"> -->
742 > <!--     <antcall target="dists"> -->
743 > <!--       <param name="build.javadoc.access" value="protected"/> -->
744 > <!--     </antcall> -->
745 > <!--   </target> -->
746 >
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  
946  <target name="pretiger" depends="compile-pretiger">
947
948    <mkdir dir="${build.lib.dir}"/>
949
950    <jar destfile="${pretiger.jar}">
951      <fileset dir="${build.pretiger.dir}">
952      </fileset>
953    </jar>
954
955  </target>
956
957  <!-- jsr166x -->
754  
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 <  <target name="jsr166xcompile"
804 <          depends="init, configure-compiler"
805 <          description="Compiles jsr166x sources">
806 <
807 <    <mkdir dir="${build.jsr166x.dir}"/>
808 <
809 <    <javac srcdir="${jsr166xsrc.dir}"
810 <          destdir="${build.jsr166x.dir}"
811 <            debug="${build.debug}"
812 <       debuglevel="${build.debuglevel}"
813 <      deprecation="${build.deprecation}"
971 <           source="${build.sourcelevel}"
972 <             fork="true">
803 >    <javac srcdir="${src.dir}"
804 >           destdir="${destdir}"
805 >           debug="${build.debug}"
806 >           debuglevel="${build.debuglevel}"
807 >           deprecation="${build.deprecation}"
808 >           classpath=""
809 >           includeAntRuntime="false"
810 >           includeJavaRuntime="false"
811 >           encoding="ASCII"
812 >           executable="${build.main.javac}"
813 >           fork="true">
814  
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}"/>
976
830      </javac>
831  
832 <  </target>
833 <
981 <
982 <
983 <  <target name="jsr166xjar"
984 <          depends="jsr166xcompile"
985 <          description="Builds library jar from compiled sources">
986 <
987 <    <mkdir dir="${build.jsr166xlib.dir}"/>
988 <
989 <    <jar destfile="${jsr166xproduct.jar}">
990 <      <fileset dir="${build.jsr166x.dir}"/>
832 >    <jar destfile="${product.jar}">
833 >      <fileset dir="${destdir}"/>
834      </jar>
835  
836 <  </target>
837 <
838 <
839 <
840 <  <target name="jsr166xdocs"
841 <          description="Builds javadocs with custom tags to build folder">
842 <
843 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
844 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
845 <
846 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
847 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
848 <    >
849 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
850 <      <include name="jsr166x"/>
851 <      </packageset>
852 <
853 <
854 <    </javadoc>
855 <
856 <  </target>
857 <
858 <
859 <  <target name="jsr166xdist"
860 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
861 <          description="Puts all distributable products in single hierarchy"/>
862 <
863 <
864 <
865 <  <target name="jsr166xclean"
866 <          description="Removes all build products">
867 <
868 <    <delete dir="${build.jsr166x.dir}"/>
869 <    <delete dir="${build.jsr166xlib.dir}"/>
870 <
871 <  </target>
872 <
873 <
874 <
875 <  <target name="jsr166xdist-clean"
876 <          description="Removes all build and distribution products">
877 <
878 <  </target>
879 <
880 <
881 <
882 <  <target name="jsr166xdist-docs"
883 <          description="Builds javadocs without custom tags to dist folder">
884 <
885 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
886 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
887 <
888 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
889 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
890 <              source="${build.sourcelevel}">
891 <
892 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
893 <      <include name="jsr166x"/>
894 <      </packageset>
895 <
896 <    </javadoc>
897 <
898 <  </target>
899 <
900 <  <target name="jsr166xdist-jar"
901 <          depends="jsr166xclean, jsr166xjar">
902 <
903 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
836 >    <run-tck-tests
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 >    <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 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
939 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
940 +    </junit>
941    </target>
942  
943   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines