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.182 by jsr166, Sun Sep 13 17:46:07 2015 UTC vs.
Revision 1.259 by jsr166, Mon Dec 18 21:07:18 2017 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless">
2 >  xmlns:if="ant:if" xmlns:unless="ant:unless"
3 >  xmlns:ivy="antlib:org.apache.ivy.ant">
4  
5    <description>
6   ------------------------------------------------------------------------------
# Line 7 | Line 8
8  
9    Usage: ant [target]
10  
11 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
12 +  more details.
13 +
14    User-specific settings are read from user.properties.
15    See user.properties.sample for an explanation of some useful settings.
16  
# Line 14 | Line 18
18    itself.  Because the JDK version matters and because different
19    targets require different JDKs, we assume that users have created a
20    hierarchy containing:
17  $HOME/jdk/jdk6
18  $HOME/jdk/jdk7
21    $HOME/jdk/jdk8
22    $HOME/jdk/jdk9
23 +  $HOME/jdk/jdk10
24    where each of the above is a JDK or a symlink to same, and
22  $HOME/jdk/src/jdk6
23  $HOME/jdk/src/jdk7
25    $HOME/jdk/src/jdk8
26    $HOME/jdk/src/jdk9
27 +  $HOME/jdk/src/jdk10
28    where each of the above is a complete JDK source tree
29    (e.g. mercurial forest) or a symlink to same.
30  
31    Alternatively, define ant variables thus:
32 <  ant -Djdk$N.home=...
33 <  for $N in 6 7 8 9 ...
32 >  ant -Djdk$N.home=... -Djdk$N.src.home=...
33 >  for $N in 8 9 10 ...
34  
35 <  As of 2015-09, there is incomplete hacky support for jigsaw
34 <  Build for jigsaw using something like:
35 <  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
36 <  "docs" target is still broken.
35 >  As of 2016-03, the sources in src/main are for jdk9+ only.
36   ------------------------------------------------------------------------------
37    </description>
38  
39 <  <!-- Display main targets by running 'ant -projecthelp' -->
39 >  <!-- Run 'ant -projecthelp' (default target) -->
40    <target name="usage">
41      <java classname="org.apache.tools.ant.Main">
42        <arg value="-projecthelp" />
# Line 57 | Line 56
56    <property name="build.deprecation"    value="false"/>
57    <property name="build.javadoc.access" value="protected"/>
58  
60  <!-- Tck options; see JSR166TestCase.java
61   To profile a single tck test class:
62   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
63   To stress test a single tck test class:
64   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
65  -->
66  <property name="jsr166.profileTests"     value="false"/>
67  <property name="jsr166.profileThreshold" value="100"/>
68  <property name="jsr166.runsPerTest"      value="1"/>
69  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
70
59    <!-- Build locations -->
60    <property name="build.dir"                   location="build"/>
61    <property name="build.classes.dir"           location="${build.dir}/classes"/>
62    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
63    <property name="build.loops.dir"             location="${build.dir}/loops"/>
76  <property name="build.reports.dir"           location="${build.dir}/reports"/>
64  
65    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
66    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
67    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
68    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
69  
70 +  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
71 +  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
72 +  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
73 +  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
74 +
75    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
76    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
77    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
# Line 96 | Line 88
88    <macrodef name="defjdklocations">
89      <attribute name="v"/>
90      <sequential>
91 <    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
92 <    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
93 <    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
94 <    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
91 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
92 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
93 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
94 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
95 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
96      <local name="have.java.base"/>
97      <available property="have.java.base"
98 <      file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
99 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
98 >      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
99 >    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
100        if:set="have.java.base"/>
101 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
101 >    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
102        unless:set="have.java.base"/>
103      <local name="modules"/>
104      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
# Line 138 | Line 131
131    <defjdklocations v="7"/>
132    <defjdklocations v="8"/>
133    <defjdklocations v="9"/>
134 +  <defjdklocations v="10"/>
135  
136    <!-- Source locations -->
137    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 145 | Line 139
139    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
140    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
141    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
142 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
142 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
143    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
144 +  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
145    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
146    <property name="lib.dir"              location="${basedir}/lib"/>
147    <property name="dist.dir"             location="${basedir}/dist"/>
148    <property name="topsrc.dir"           location="${basedir}/src"/>
149    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150 +  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 160 | Line 156
156    <!-- Javadoc locations -->
157    <property name="docs.dir"          location="${build.dir}/docs"/>
158    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159 +  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
# Line 167 | Line 164
164  
165    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167 +  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 175 | Line 173
173    <!-- Jar locations -->
174    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176 +  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
# Line 182 | Line 181
181    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
182  
183    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
184 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
185 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
186 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
187 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
188 <  <!-- The expected canonical location does not yet exist as of 2014-07 -->
189 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
190 <  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
184 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
185 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
186 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
187 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
188 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
189 >  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
190 >  <!-- The location of jdk9 early access docs (RIP) -->
191 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
192    <!-- Default jdk doc location (latest stable release seems best) -->
193 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
193 >  <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
194 >  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
195  
196    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
197    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 198 | Line 199
199    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
200    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
201    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
202 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
203    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
204  
205    <!-- Define the "jtreg" task -->
# Line 205 | Line 207
207    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
208             classpath="${lib.dir}/jtreg.jar" />
209  
210 <  <!-- Test classpath -->
211 <  <path id="test.classpath">
212 <    <pathelement location="${build.testcases.dir}"/>
213 <    <pathelement location="${junit.jar}"/>
214 <  </path>
215 <
210 >  <!-- Tck options; see JSR166TestCase.java
211 >   To profile a single tck test class:
212 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
213 >   To stress test a single tck test class:
214 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
215 >   To stress test a single tck test method:
216 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
217 >  -->
218 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
219    <macrodef name="run-tck-tests">
220      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
221      <attribute name="target"/>
222      <attribute name="compile-target" default="@{target}"/>
223      <attribute name="workdir"/>
224      <attribute name="classes"/>
225 <    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
225 >    <!--
226 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
227 >    -->
228 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
229      <element name="javac-elements" optional="true"/>
230  
231      <sequential>
# Line 227 | Line 235
235        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
236      </condition>
237  
238 +    <local name="use-doclint"/>
239 +    <condition property="use-doclint">
240 +      <not> <equals arg1="@{target}" arg2="7"/> </not>
241 +    </condition>
242 +
243      <mkdir dir="@{workdir}/tck-classes"/>
244  
245      <javac srcdir="@{tck.src.dir}"
# Line 239 | Line 252
252             classpath="${junit.jar}"
253             includeAntRuntime="false"
254             includeJavaRuntime="false"
255 +           encoding="ASCII"
256             executable="${javac@{compile-target}}"
257             fork="true">
258  
259        <include name="*.java"/>
260        <compilerarg value="-XDignore.symbol.file=true"/>
261 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
261 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
262 >      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
263        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
264 <      <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
264 >      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
265        <compilerarg line="${build.args}"/>
266        <javac-elements/>
267  
# Line 257 | Line 272
272            jvm="${java@{target}}"
273            fork="true">
274          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
275 <        <jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
275 >        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
276 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
277 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
278 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
279 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
280 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
281          <jvmarg line="@{jvmflags}"/>
282 +        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
283 +        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
284  
285 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
286 <        <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
285 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
286 >        <syspropertyset id="system-properties-used-by-tck">
287            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
288 +          <propertyref prefix="jsr166."/>
289 +          <propertyref name="test.timeout.factor"/>
290          </syspropertyset>
291  
268        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
269        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
270        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
292          <classpath>
293            <pathelement location="${junit.jar}"/>
294            <pathelement location="@{workdir}/tck-classes"/>
# Line 278 | Line 299
299    </macrodef>
300  
301    <!-- Define jtreg test sets for different jdk versions -->
302 +  <fileset dir="${jtreg10.src.dir}">
303 +    <patternset id="jdk10.jtreg.tests">
304 +      <include name="**/*.java"/>
305 +    </patternset>
306 +  </fileset>
307 +
308    <fileset dir="${jtreg9.src.dir}">
309      <patternset id="jdk9.jtreg.tests">
310        <include name="**/*.java"/>
# Line 287 | Line 314
314    <fileset dir="${jtreg8.src.dir}">
315      <patternset id="jdk8.jtreg.tests">
316        <include name="**/*.java"/>
290      <exclude name="**/SpliteratorCharacteristics.java"/>
291      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
292      <exclude name="**/GCDuringIteration.java"/>
317      </patternset>
318    </fileset>
319  
# Line 299 | Line 323
323      </patternset>
324    </fileset>
325  
326 +  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
327 +  <property name="jtreg.flags" value=""/>
328 +
329    <macrodef name="run-jtreg-tests">
330      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
304    <attribute name="source" default="7"/>
331      <attribute name="target"/>
332      <attribute name="workdir"/>
333      <attribute name="classes"/>
334 +    <attribute name="verbose" default="${jtreg.verbose}"/>
335      <attribute name="jtregflags" default=""/>
336 +    <element name="jtreg-elements" optional="true"/>
337  
338      <sequential>
339  
340 +    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
341 +    <property name="jtreg.verbose" value="nopass,fail,error"/>
342 +
343      <local name="modules"/>
344      <condition property="modules">
345        <available file="${jdk@{target}.home}/jmods" type="dir"/>
346      </condition>
347  
348      <delete dir="@{workdir}/JTwork"   quiet="true"/>
318    <delete dir="@{workdir}/JTreport" quiet="true"/>
319    <mkdir dir="@{workdir}/JTwork/scratch"/>
320    <mkdir dir="@{workdir}/JTreport"/>
349      <jtreg dir="${jtreg@{target}.src.dir}"
350             jdk="${jdk@{target}.home}"
351 <           workDir="@{workdir}/JTwork"
324 <           reportDir="@{workdir}/JTreport">
351 >           workDir="@{workdir}/JTwork">
352        <patternset refid="jdk@{target}.jtreg.tests"/>
353        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
354 <      <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
354 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
355 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
356        <arg value="-agentvm"/>
357 <      <arg value="-v:nopass,fail"/>
357 >      <arg value="-noreport"/>
358 >      <arg value="-verbose:@{verbose}"/>
359        <arg value="-vmoptions:-esa -ea"/>
360        <arg value="-automatic"/>
361        <arg value="-k:!ignore"/>
362        <arg line="@{jtregflags}"/>
363 +      <arg line="${jtreg.flags}"/>
364 +      <jtreg-elements/>
365      </jtreg>
366      </sequential>
367    </macrodef>
# Line 347 | Line 378
378    <!-- Main targets -->
379  
380    <property name="build.main.java.version" value="9"/>
381 <  <property name="build.main.javac" value="${javac9}"/>
381 >  <!-- Workaround "no nested properties in ant" -->
382 >  <macrodef name="define-build-main-properties">
383 >    <attribute name="v"/>
384 >    <sequential>
385 >      <property name="build.main.java"    value="${java@{v}}"/>
386 >      <property name="build.main.javac"   value="${javac@{v}}"/>
387 >      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
388 >    </sequential>
389 >  </macrodef>
390 >  <define-build-main-properties v="${build.main.java.version}"/>
391  
392    <target name="dists"
393 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
393 >          depends="dist, 4jdk8dist"
394            description="Builds all public jars and docs"/>
395 +          <!--
396 +              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
397 +          -->
398  
399    <target name="compile"
400            depends="configure-compiler"
401            description="Compiles src/main sources to build dir">
402  
360    <local name="modules"/>
361    <condition property="modules">
362      <and>
363        <available file="${jdk9.home}/jmods" type="dir"/>
364        <equals arg1="9" arg2="${build.main.java.version}"/>
365      </and>
366    </condition>
367
403      <local name="destdir"/>
404 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
370 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
404 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
405  
406      <mkdir dir="${destdir}"/>
407  
# Line 379 | Line 413
413             classpath=""
414             includeAntRuntime="false"
415             includeJavaRuntime="false"
416 +           encoding="ASCII"
417             executable="${build.main.javac}"
418             fork="true">
419  
420        <include name="**/*.java"/>
421 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
421 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
422        <compilerarg value="-Xprefer:source"/>
423        <compilerarg value="-XDignore.symbol.file=true"/>
424        <compilerarg value="-Xlint:all"/>
425 +      <compilerarg line="--doclint-format html5"/>
426 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
427        <compilerarg value="-Werror"/>
391      <compilerarg value="-Xdoclint:all/protected"/>
428        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
429        <compilerarg line="${build.args}"/>
430  
# Line 398 | Line 434
434  
435    <target name="jar"
436            depends="compile"
437 <          description="Builds library jar from compiled sources">
438 <
437 >          description="Builds library jar for src/main from compiled sources">
438 >    <local name="subdir"/>
439 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
440      <jar destfile="${product.jar}">
441 <      <fileset dir="${build.classes.dir}"/>
441 >      <fileset dir="${build.classes.dir}${subdir}"/>
442        <manifest>
443          <attribute name="Built-By" value="${user.name}"/>
444          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 419 | Line 456
456      <!-- the packagenames="none" hack below prevents scanning the -->
457      <!-- sourcepath for packages -->
458  
459 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
460 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
461 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
462 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
463 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
464      <javadoc destdir="${docs.dir}"
465               packagenames="none"
466               link="${java9.api.url}"
467               overview="${src.dir}/intro.html"
468               access="${build.javadoc.access}"
469 <             sourcepath="${src.dir}:${jdk9src.dir}"
469 >             sourcepath="${src.dir}"
470               classpath=""
471 <             executable="${javadoc9}">
471 >             source="9"
472 >             executable="${build.main.javadoc}">
473        <fileset dir="${src.dir}" defaultexcludes="yes">
474          <include name="**/*.java"/>
475        </fileset>
476        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
477        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
478        <arg value="-XDignore.symbol.file=true"/>
479 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
479 >      <arg value="-html5"/>
480 >      <arg value="--patch-module=java.base=${src.dir}"/>
481        <arg value="-tag"/>
482        <arg value="${javadoc.jls.option}"/>
483 + <!-- @apiNote currently unused -->
484 + <!--       <arg value="-tag"/> -->
485 + <!--       <arg value="apiNote:a:API Note:"/> -->
486        <arg value="-tag"/>
487 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
487 >      <arg value="implSpec:a:Implementation Requirements:"/>
488        <arg value="-tag"/>
489 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
490 <      <arg value="-tag"/>
491 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
489 >      <arg value="implNote:a:Implementation Note:"/>
490 > <!-- tags added in jdk9: currently unused -->
491 > <!--       <arg value="-tag"/> -->
492 > <!--       <arg value="revised:X"/> -->
493 > <!--       <arg value="-tag"/> -->
494 > <!--       <arg value="spec:X"/> -->
495      </javadoc>
496    </target>
497  
# Line 475 | Line 525
525  
526    <target name="clean"
527            description="Removes all build products">
478
528      <delete dir="${build.dir}"/>
480
529    </target>
530  
531  
532    <target name="dist-clean"
533            description="Removes all build and distribution products">
486
534      <delete dir="${build.dir}"/>
535      <delete dir="${dist.dir}"/>
489
536    </target>
537  
538  
# Line 502 | Line 548
548  
549    <target name="tck"
550            depends="jar"
551 <          description="Runs tck tests for main directly">
551 >          description="Runs tck tests for src/main directly">
552  
553      <run-tck-tests
554        target="${build.main.java.version}"
555        workdir="${build.dir}"
556 <      classes="${product.jar}"/>
556 >      classes="${product.jar}">
557 >      <javac-elements>
558 >        <compilerarg value="-Werror"/>
559 >      </javac-elements>
560 >    </run-tck-tests>
561    </target>
562  
563    <target name="tck-parallelism-1"
564 <          description="Runs tck with given common pool parallelism">
564 >          description="Runs tck with common pool parallelism 1">
565      <antcall target="tck">
566        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
567      </antcall>
568    </target>
569  
570    <target name="tck-parallelism-0"
571 <          description="Runs tck with given common pool parallelism">
571 >          description="Runs tck with common pool parallelism 0">
572      <antcall target="tck">
573        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
574      </antcall>
575    </target>
576  
577 +  <target name="tck-security-manager"
578 +          description="Runs tck with a security manager">
579 +    <antcall target="tck">
580 +      <param name="jsr166.useSecurityManager" value="true"/>
581 +    </antcall>
582 +  </target>
583 +
584    <target name="jtreg"
585            depends="jar"
586 <          description="Runs jtreg tests for main using the jtreg ant task">
586 >          description="Runs jtreg tests for src/main using the jtreg ant task">
587      <run-jtreg-tests
588         target="${build.main.java.version}"
589         workdir="${build.dir}"
# Line 534 | Line 591
591    </target>
592  
593    <target name="test"
594 <          depends="tck, tck-parallelism-1, jtreg"
595 <          description="Runs tck and jtreg tests for main">
539 <  </target>
594 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
595 >          description="Runs tck and jtreg tests for src/main"/>
596  
597 <  <target name="jtreg8" description="Runs jtreg tests with jdk8">
597 > <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
598  
599 <    <antcall target="jtreg">
600 <      <param name="build.main.java.version" value="8"/>
601 <      <param name="build.main.javac" value="${javac8}"/>
602 <    </antcall>
599 > <!--     <antcall target="jtreg"> -->
600 > <!--       <param name="build.main.java.version" value="8"/> -->
601 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
602 > <!--     </antcall> -->
603  
604 <  </target>
604 > <!--   </target> -->
605  
606 <  <target name="test89"
607 <          description="Runs tck and jtreg tests for main for multiple java versions">
606 >  <target name="test910"
607 >          description="Runs tck and jtreg tests for src/main for multiple java versions">
608  
609      <antcall target="clean"/>
610      <antcall target="test">
611 <      <param name="build.main.java.version" value="8"/>
556 <      <param name="build.main.javac" value="${javac8}"/>
611 >      <param name="build.main.java.version" value="9"/>
612      </antcall>
613  
614      <antcall target="clean"/>
615      <antcall target="test">
616 <      <param name="build.main.java.version" value="9"/>
562 <      <param name="build.main.javac" value="${javac9}"/>
616 >      <param name="build.main.java.version" value="10"/>
617      </antcall>
618  
619 +    <!-- Clean up to avoid obscure wrong class file version bugs -->
620 +    <antcall target="clean"/>
621 +
622    </target>
623  
624  
625  
626    <target name="configure-compiler">
627      <fail message="ant version too old">
628 <      <condition>
572 <        <not> <antversion atleast="1.9.1"/> </not>
573 <      </condition>
628 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
629      </fail>
630  
631      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 592 | Line 647
647    <!-- Various demos and test programs -->
648  
649  
650 <  <target name="loops" depends="configure-compiler"
651 <          description="Benchmark from Doug Lea's AQS paper">
650 >  <!-- description="Benchmark from Doug Lea's AQS paper" -->
651 >  <target name="loops" depends="configure-compiler">
652  
653      <mkdir dir="${build.loops.dir}"/>
654  
# Line 603 | Line 658
658         debuglevel="${build.debuglevel}"
659        deprecation="${build.deprecation}"
660             source="${build.sourcelevel}"
661 +           target="${build.sourcelevel}"
662 +         encoding="ASCII"
663               fork="true">
664  
665        <compilerarg line="${build.args}"/>
# Line 614 | Line 671
671      <java classname="ALoops" fork="true">
672        <classpath refid="loops.classpath"/>
673      </java>
617
674    </target>
675  
676  
677    <target name="compile-test-loops" depends="jar"
678 <          description="compile all the perf tests in src/test/loops">
678 >          description="Compiles all the perf tests in src/test/loops">
679  
680      <mkdir dir="${build.dir}/test/loops"/>
681  
# Line 630 | Line 686
686             deprecation="${build.deprecation}"
687             includeAntRuntime="false"
688             includeJavaRuntime="false"
689 <           executable="${javac9}"
689 >           encoding="ASCII"
690 >           executable="${build.main.javac}"
691             fork="true">
692  
693        <include name="*.java"/>
# Line 638 | Line 695
695        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
696        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
697        <compilerarg line="${build.args}"/>
698 +    </javac>
699 +  </target>
700 +
701  
702 +  <!-- jsr166 4jdk8 -->
703 +
704 +  <target name="4jdk8compile"
705 +          depends="configure-compiler"
706 +          description="Compiles src/jdk8 sources, targeting jdk8">
707 +
708 +    <mkdir dir="${build.4jdk8.classes.dir}"/>
709 +
710 +    <javac srcdir="${4jdk8src.dir}"
711 +           destdir="${build.4jdk8.classes.dir}"
712 +           debug="${build.debug}"
713 +           debuglevel="${build.debuglevel}"
714 +           deprecation="${build.deprecation}"
715 +           source="8"
716 +           target="8"
717 +           classpath=""
718 +           bootclasspath="${bootclasspath8}"
719 +           includeAntRuntime="false"
720 +           includeJavaRuntime="false"
721 +           encoding="ASCII"
722 +           executable="${javac8}"
723 +           fork="true">
724 +      <include name="**/*.java"/>
725 +      <compilerarg value="-Xprefer:source"/>
726 +      <compilerarg value="-XDignore.symbol.file=true"/>
727 +      <compilerarg value="-Xlint:all"/>
728 +      <compilerarg value="-Werror"/>
729 +      <compilerarg line="${build.args}"/>
730 +    </javac>
731 +  </target>
732 +
733 +  <target name="4jdk8doclint"
734 +          depends="configure-compiler"
735 +          description="Finds doclint warnings">
736 +
737 +    <mkdir dir="${build.4jdk8.classes.dir}"/>
738 +
739 +    <javac srcdir="${4jdk8src.dir}"
740 +           destdir="${build.4jdk8.classes.dir}"
741 +           debug="${build.debug}"
742 +           debuglevel="${build.debuglevel}"
743 +           deprecation="${build.deprecation}"
744 +           source="8"
745 +           target="8"
746 +           classpath=""
747 +           bootclasspath="${bootclasspath8}"
748 +           includeAntRuntime="false"
749 +           includeJavaRuntime="false"
750 +           encoding="ASCII"
751 +           executable="${javac8}"
752 +           fork="true">
753 +      <include name="**/*.java"/>
754 +      <compilerarg value="-Xprefer:source"/>
755 +      <compilerarg value="-XDignore.symbol.file=true"/>
756 +      <compilerarg value="-Xlint:all"/>
757 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
758 +      <compilerarg line="${build.args}"/>
759      </javac>
760 +  </target>
761 +
762  
763 +  <target name="4jdk8jar"
764 +          depends="4jdk8compile"
765 +          description="Builds library jar from compiled sources">
766 +
767 +    <jar destfile="${4jdk8product.jar}">
768 +      <fileset dir="${build.4jdk8.classes.dir}"/>
769 +      <manifest>
770 +        <attribute name="Built-By" value="${user.name}"/>
771 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
772 +      </manifest>
773 +    </jar>
774    </target>
775  
776  
777 <  <!-- jsr166 4jdk7 -->
777 >  <target name="4jdk8-tck"
778 >          depends="4jdk8jar"
779 >          description="Runs tck tests for jsr166-4jdk8 directly">
780 >
781 >    <run-tck-tests
782 >      target="8"
783 >      workdir="${build.4jdk8.dir}"
784 >      classes="${4jdk8product.jar}">
785 >      <javac-elements>
786 >        <!-- JDK9+ test classes -->
787 >        <exclude name="*9Test.java"/>
788 >        <exclude name="*10Test.java"/>
789 >        <compilerarg value="-Werror"/>
790 >      </javac-elements>
791 >    </run-tck-tests>
792 >  </target>
793 >
794 >
795 >  <target name="4jdk8-jtreg"
796 >          depends="4jdk8jar"
797 >          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
798 >    <run-jtreg-tests
799 >       target="8"
800 >       workdir="${build.4jdk8.dir}"
801 >       classes="${4jdk8product.jar}"/>
802 >  </target>
803 >
804 >
805 >  <target name="4jdk8-test"
806 >          depends="4jdk8-tck, 4jdk8-jtreg"
807 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
808 >
809 >
810 >  <target name="4jdk8docs"
811 >          description="Builds javadocs for src/jdk8 to dist dir">
812 >
813 >    <delete dir="${4jdk8docs.dir}"/>
814 >    <mkdir dir="${4jdk8docs.dir}"/>
815 >
816 >    <javadoc destdir="${4jdk8docs.dir}"
817 >             packagenames="none"
818 >             link="${java8.api.url}"
819 >             overview="${4jdk8src.dir}/intro.html"
820 >             access="${build.javadoc.access}"
821 >             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
822 >             classpath=""
823 >             source="8"
824 >             executable="${javadoc8}"
825 >             failonerror = "true">
826 >      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
827 >        <include name="**/*.java"/>
828 >      </fileset>
829 >      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
830 >      <arg value="-XDignore.symbol.file=true"/>
831 >      <arg value="-tag"/>
832 >      <arg value="${javadoc.jls.option}"/>
833 > <!-- @apiNote currently unused -->
834 > <!--       <arg value="-tag"/> -->
835 > <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
836 >      <arg value="-tag"/>
837 >      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
838 >      <arg value="-tag"/>
839 >      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
840 >    </javadoc>
841 >  </target>
842 >
843 >
844 >  <target name="4jdk8dist"
845 >          depends="4jdk8dist-jar, 4jdk8dist-docs"
846 >          description="Puts all distributable products in single hierarchy"/>
847 >
848 >
849 >  <target name="4jdk8clean"
850 >          description="Removes all 4jdk8 build products">
851 >    <delete dir="${build.4jdk8.dir}"/>
852 >  </target>
853  
649  <target name="4jdk7compile"
650          depends="configure-compiler"
651          description="Compiles src/jdk7 sources, targeting jdk7">
854  
855 +  <target name="4jdk8dist-jar"
856 +          depends="4jdk8clean, 4jdk8jar">
857 +    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
858 +  </target>
859 +
860 +
861 +  <target name="4jdk8dist-docs"
862 +          depends="4jdk8clean, 4jdk8docs">
863 +    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
864 +  </target>
865 +
866 +
867 +  <!-- jsr166 4jdk7 (no longer maintained) -->
868 +
869 +  <target name="4jdk7compile" depends="configure-compiler">
870      <mkdir dir="${build.4jdk7.classes.dir}"/>
871  
872      <javac srcdir="${4jdk7src.dir}"
# Line 658 | Line 875
875             debuglevel="${build.debuglevel}"
876             deprecation="${build.deprecation}"
877             source="6"
878 +           target="6"
879             classpath=""
880             bootclasspath="${bootclasspath6}"
881             includeAntRuntime="false"
882             includeJavaRuntime="false"
883 +           encoding="ASCII"
884             executable="${javac7}"
885             fork="true">
886  
# Line 671 | Line 890
890        <compilerarg value="-Xlint:all"/>
891        <compilerarg value="-Werror"/>
892        <compilerarg line="${build.args}"/>
674
893      </javac>
894    </target>
895  
896 <  <target name="4jdk7doclint"
679 <          depends="configure-compiler"
680 <          description="Finds doclint warnings">
681 <
896 >  <target name="4jdk7doclint" depends="configure-compiler">
897      <mkdir dir="${build.4jdk7.classes.dir}"/>
898  
899      <javac srcdir="${4jdk7src.dir}"
# Line 687 | Line 902
902             debuglevel="${build.debuglevel}"
903             deprecation="${build.deprecation}"
904             source="6"
905 +           target="6"
906             classpath=""
907 <           bootclasspath="${bootclasspath7}"
907 >           bootclasspath="${bootclasspath6}"
908             includeAntRuntime="false"
909             includeJavaRuntime="false"
910 +           encoding="ASCII"
911             executable="${javac8}"
912             fork="true">
913  
# Line 700 | Line 917
917        <compilerarg value="-Xlint:all"/>
918        <compilerarg value="-Xdoclint:all/protected"/>
919        <compilerarg line="${build.args}"/>
703
920      </javac>
921    </target>
922  
923 <
708 <  <target name="4jdk7jar"
709 <          depends="4jdk7compile"
710 <          description="Builds library jar from compiled sources">
711 <
923 >  <target name="4jdk7jar" depends="4jdk7compile">
924      <jar destfile="${4jdk7product.jar}">
925        <fileset dir="${build.4jdk7.classes.dir}"/>
926        <manifest>
# Line 716 | Line 928
928          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
929        </manifest>
930      </jar>
719
931    </target>
932  
933 <
723 <  <target name="4jdk7-tck"
724 <          depends="4jdk7jar"
725 <          description="Runs tck tests for jsr166-4jdk7 directly">
726 <
933 >  <target name="4jdk7-tck" depends="4jdk7jar">
934      <run-tck-tests
935        target="7"
936        workdir="${build.4jdk7.dir}"
# Line 741 | Line 948
948          <exclude name="SplittableRandomTest.java"/>
949          <exclude name="StampedLockTest.java"/>
950          <exclude name="SubmissionPublisherTest.java"/>
951 +        <compilerarg value="-Werror"/>
952        </javac-elements>
953      </run-tck-tests>
954    </target>
955  
956 <
957 <  <target name="4jdk7-tck-junit"
750 <          depends="4jdk7compile"
751 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
956 >  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
957 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
958  
959      <junit printsummary="true"
960             showoutput="true"
# Line 770 | Line 976
976  
977        <test name="${jsr166.tckTestClass}" haltonfailure="no">
978        </test>
773
979      </junit>
980    </target>
981  
982 <  <target name="4jdk7-jtreg"
778 <          depends="4jdk7jar"
779 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
982 >  <target name="4jdk7-jtreg" depends="4jdk7jar">
983      <run-jtreg-tests
984         target="7"
985         workdir="${build.4jdk7.dir}"
986         classes="${4jdk7product.jar}"/>
987    </target>
988  
989 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
990  
991 <  <target name="4jdk7-test"
788 <          depends="4jdk7-tck, 4jdk7-jtreg"
789 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
790 <  </target>
791 <
792 <
793 <  <target name="4jdk7docs"
794 <          description="Builds javadocs for src/jdk7 to dist dir">
795 <
991 >  <target name="4jdk7docs">
992      <delete dir="${4jdk7docs.dir}"/>
993      <mkdir dir="${4jdk7docs.dir}"/>
994  
# Line 801 | Line 997
997               link="${java7.api.url}"
998               overview="${4jdk7src.dir}/intro.html"
999               access="${build.javadoc.access}"
1000 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
1000 >             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1001               classpath=""
1002 <             executable="${javadoc7}">
1002 >             executable="${javadoc7}"
1003 >             failonerror = "true">
1004        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1005          <include name="**/*.java"/>
1006        </fileset>
# Line 812 | Line 1009
1009      </javadoc>
1010    </target>
1011  
1012 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1013  
1014 <  <target name="4jdk7dist"
817 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
818 <          description="Puts all distributable products in single hierarchy"/>
819 <
820 <
821 <  <target name="4jdk7clean"
822 <          description="Removes all 4jdk7 build products">
823 <
1014 >  <target name="4jdk7clean">
1015      <delete dir="${build.4jdk7.dir}"/>
825
1016    </target>
1017  
1018 <
829 <  <target name="4jdk7dist-jar"
830 <          depends="4jdk7clean, 4jdk7jar">
1018 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1019      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1020    </target>
1021  
1022 <
835 <  <target name="4jdk7dist-docs"
836 <          depends="4jdk7clean, 4jdk7docs">
1022 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1023      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1024    </target>
1025  
1026  
1027 <  <!-- jsr166x -->
842 <
843 <  <target name="jsr166xcompile"
844 <          depends="configure-compiler"
845 <          description="Compiles jsr166x sources to build dir">
1027 >  <!-- jsr166x (no longer maintained) -->
1028  
1029 +  <target name="jsr166xcompile" depends="configure-compiler">
1030      <mkdir dir="${build.jsr166x.classes.dir}"/>
1031  
1032      <javac srcdir="${topsrc.dir}"
# Line 854 | Line 1037
1037             classpath=""
1038             bootclasspath="${bootclasspath6}"
1039             source="5"
1040 +           target="5"
1041             includeAntRuntime="false"
1042             includeJavaRuntime="false"
1043 +           encoding="ASCII"
1044             executable="${javac7}"
1045             fork="true">
861
1046        <include name="jsr166x/**/*.java"/>
1047        <compilerarg value="-XDignore.symbol.file=true"/>
1048        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1049        <compilerarg value="-Werror"/>
1050        <compilerarg line="${build.args}"/>
867
1051      </javac>
1052    </target>
1053  
1054 <
872 <  <target name="jsr166xjar"
873 <          depends="jsr166xcompile"
874 <          description="Builds library jar from compiled sources">
875 <
1054 >  <target name="jsr166xjar" depends="jsr166xcompile">
1055      <jar destfile="${jsr166x.jar}">
1056        <fileset dir="${build.jsr166x.classes.dir}"/>
1057        <manifest>
# Line 880 | Line 1059
1059          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1060        </manifest>
1061      </jar>
883
1062    </target>
1063  
1064 <
887 <  <target name="jsr166xdocs"
888 <          description="Builds javadocs to dist dir">
889 <
1064 >  <target name="jsr166xdocs">
1065      <delete dir="${jsr166xdocs.dir}"/>
1066      <mkdir dir="${jsr166xdocs.dir}"/>
1067  
# Line 894 | Line 1069
1069               packagenames="jsr166x.*"
1070               link="${java.api.url}"
1071               access="${build.javadoc.access}"
1072 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1072 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1073               bootclasspath="${bootclasspath6}"
1074               source="5"
1075 <             executable="${javadoc7}">
1075 >             executable="${javadoc7}"
1076 >             failonerror = "true">
1077        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1078        <arg value="-XDignore.symbol.file=true"/>
903
1079      </javadoc>
1080    </target>
1081  
1082 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1083  
1084 <  <target name="jsr166xdist"
909 <          depends="jsr166xdist-jar, jsr166xdist-docs"
910 <          description="Puts all distributable products in single hierarchy"/>
911 <
912 <
913 <  <target name="jsr166xclean"
914 <          description="Removes all jsr166x build products">
915 <
1084 >  <target name="jsr166xclean">
1085      <delete dir="${build.jsr166x.dir}"/>
917
1086    </target>
1087  
1088 <
921 <  <target name="jsr166xdist-jar"
922 <          depends="jsr166xclean, jsr166xjar">
1088 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1089      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1090    </target>
1091  
1092 <  <target name="jsr166xdist-docs"
927 <          depends="jsr166xclean, jsr166xdocs">
1092 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1093      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1094    </target>
1095  
931  <!-- jsr166y -->
1096  
1097 +  <!-- jsr166y (no longer maintained) -->
1098  
1099 <  <target name="jsr166ycompile"
935 <          depends="configure-compiler"
936 <          description="Compiles jsr166y sources">
937 <
1099 >  <target name="jsr166ycompile" depends="configure-compiler">
1100      <mkdir dir="${build.jsr166y.classes.dir}"/>
1101  
1102      <javac srcdir="${topsrc.dir}"
# Line 943 | Line 1105
1105             debuglevel="${build.debuglevel}"
1106             deprecation="${build.deprecation}"
1107             source="6"
1108 +           target="6"
1109             classpath=""
1110             bootclasspath="${bootclasspath6}"
1111             includeAntRuntime="false"
1112             includeJavaRuntime="false"
1113 +           encoding="ASCII"
1114             executable="${javac7}"
1115             fork="true">
1116  
# Line 955 | Line 1119
1119        <compilerarg value="-Xlint:all"/>
1120        <compilerarg value="-Werror"/>
1121        <compilerarg line="${build.args}"/>
958
1122      </javac>
1123    </target>
1124  
1125 <
963 <  <target name="jsr166yjar"
964 <          depends="jsr166ycompile"
965 <          description="Builds library jar from compiled sources">
966 <
1125 >  <target name="jsr166yjar" depends="jsr166ycompile">
1126      <jar destfile="${jsr166y.jar}" index="true">
1127        <fileset dir="${build.jsr166y.classes.dir}"/>
1128        <manifest>
# Line 971 | Line 1130
1130          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1131        </manifest>
1132      </jar>
974
1133    </target>
1134  
1135 <
978 <  <target name="jsr166ydocs"
979 <          description="Builds javadocs to dist dir">
980 <
1135 >  <target name="jsr166ydocs">
1136      <delete dir="${jsr166ydocs.dir}"/>
1137      <mkdir dir="${jsr166ydocs.dir}"/>
1138  
# Line 985 | Line 1140
1140               packagenames="jsr166y.*"
1141               link="${java.api.url}"
1142               access="${build.javadoc.access}"
1143 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1143 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1144               bootclasspath="${bootclasspath6}"
1145               source="6"
1146 <             executable="${javadoc7}">
1146 >             executable="${javadoc7}"
1147 >             failonerror = "true">
1148        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1149        <arg value="-XDignore.symbol.file=true"/>
994
1150      </javadoc>
1151    </target>
1152  
1153 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1154  
1155 <  <target name="jsr166ydist"
1000 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1001 <          description="Puts all distributable products in single hierarchy"/>
1002 <
1003 <
1004 <  <target name="jsr166yclean"
1005 <          description="Removes all jsr166y build products">
1006 <
1155 >  <target name="jsr166yclean">
1156      <delete dir="${build.jsr166y.dir}"/>
1008
1157    </target>
1158  
1159 <
1012 <  <target name="jsr166ydist-jar"
1013 <          depends="jsr166yclean, jsr166yjar">
1159 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1160      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1161    </target>
1162  
1163 <  <target name="jsr166ydist-docs"
1018 <          depends="jsr166yclean, jsr166ydocs">
1163 >  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1164      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1165    </target>
1166  
1167  
1168 <  <!-- extra166y -->
1024 <
1025 <
1026 <  <target name="extra166ycompile"
1027 <          depends="configure-compiler, jsr166yjar"
1028 <          description="Compiles extra166y sources">
1168 >  <!-- extra166y (no longer maintained) -->
1169  
1170 +  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1171      <mkdir dir="${build.extra166y.classes.dir}"/>
1172  
1173      <javac srcdir="${topsrc.dir}"
# Line 1037 | Line 1178
1178             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1179             classpath=""
1180             source="6"
1181 +           target="6"
1182             includeAntRuntime="false"
1183             includeJavaRuntime="false"
1184 +           encoding="ASCII"
1185             executable="${javac7}"
1186             fork="true">
1187  
# Line 1047 | Line 1190
1190        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1191        <compilerarg value="-Werror"/>
1192        <compilerarg line="${build.args}"/>
1050
1193      </javac>
1194    </target>
1195  
1196 <
1055 <  <target name="extra166yjar"
1056 <          depends="extra166ycompile"
1057 <          description="Builds library jar from compiled sources">
1058 <
1196 >  <target name="extra166yjar" depends="extra166ycompile">
1197      <jar destfile="${extra166y.jar}" index="true">
1198        <fileset dir="${build.extra166y.classes.dir}"/>
1199        <manifest>
# Line 1063 | Line 1201
1201          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1202        </manifest>
1203      </jar>
1066
1204    </target>
1205  
1206 <
1070 <  <target name="extra166ydocs"
1071 <          description="Builds javadocs to build dir">
1072 <
1206 >  <target name="extra166ydocs">
1207      <delete dir="${extra166ydocs.dir}"/>
1208      <mkdir dir="${extra166ydocs.dir}"/>
1209  
# Line 1077 | Line 1211
1211               packagenames="extra166y.*"
1212               link="${java.api.url}"
1213               access="${build.javadoc.access}"
1214 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1214 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1215               bootclasspath="${bootclasspath6}"
1216               source="6"
1217               executable="${javadoc7}">
1218        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1219        <arg value="-XDignore.symbol.file=true"/>
1086
1220      </javadoc>
1221    </target>
1222  
1223 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1224  
1225 <  <target name="extra166ydist"
1092 <          depends="extra166ydist-jar, extra166ydist-docs"
1093 <          description="Puts all distributable products in single hierarchy"/>
1094 <
1095 <
1096 <  <target name="extra166yclean"
1097 <          description="Removes all extra166y build products">
1098 <
1225 >  <target name="extra166yclean">
1226      <delete dir="${build.extra166y.dir}"/>
1100
1227    </target>
1228  
1229 <
1104 <  <target name="extra166ydist-jar"
1105 <          depends="extra166yclean, extra166yjar">
1229 >  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1230      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1231    </target>
1232  
1233 <  <target name="extra166ydist-docs"
1110 <          depends="extra166yclean, extra166ydocs">
1233 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1234      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1235    </target>
1236  
1237 <  <!-- jsr166e -->
1237 >
1238 >  <!-- jsr166e (no longer maintained) -->
1239  
1240    <property name="build.jsr166e.java.version" value="6"/>
1241    <property name="build.jsr166e.javac" value="${javac6}"/>
1242  
1243 <  <target name="jsr166ecompile"
1120 <          depends="configure-compiler"
1121 <          description="Compiles jsr166e sources">
1122 <
1243 >  <target name="jsr166ecompile" depends="configure-compiler">
1244      <mkdir dir="${build.jsr166e.classes.dir}"/>
1245  
1246      <javac srcdir="${topsrc.dir}"
# Line 1128 | Line 1249
1249             debuglevel="${build.debuglevel}"
1250             deprecation="${build.deprecation}"
1251             source="${build.jsr166e.java.version}"
1252 +           target="${build.jsr166e.java.version}"
1253             classpath=""
1254             includeAntRuntime="false"
1255             includeJavaRuntime="false"
# Line 1139 | Line 1261
1261        <compilerarg value="-Xlint:all"/>
1262        <compilerarg value="-Werror"/>
1263        <compilerarg line="${build.args}"/>
1142
1264      </javac>
1265    </target>
1266  
1146  <!-- jsr166e: find doclint errors -->
1267    <target name="jsr166edoclint">
1148
1268      <mkdir dir="${build.jsr166e.classes.dir}"/>
1269  
1270      <javac srcdir="${topsrc.dir}"
# Line 1154 | Line 1273
1273             debuglevel="${build.debuglevel}"
1274             deprecation="${build.deprecation}"
1275             source="${build.jsr166e.java.version}"
1276 +           target="${build.jsr166e.java.version}"
1277             classpath=""
1278 <           bootclasspath="${bootclasspath7}"
1278 >           bootclasspath="${bootclasspath6}"
1279             includeAntRuntime="false"
1280             includeJavaRuntime="false"
1281             executable="${javac8}"
# Line 1166 | Line 1286
1286        <compilerarg value="-Xlint:all"/>
1287        <compilerarg value="-Werror"/>
1288        <compilerarg value="-Xdoclint:all/protected"/>
1169
1289      </javac>
1290    </target>
1291  
1292 <
1174 <  <target name="jsr166ejar"
1175 <          depends="jsr166ecompile"
1176 <          description="Builds library jar from compiled sources">
1177 <
1292 >  <target name="jsr166ejar" depends="jsr166ecompile">
1293      <jar destfile="${jsr166e.jar}" index="true">
1294        <fileset dir="${build.jsr166e.classes.dir}"/>
1295        <manifest>
# Line 1182 | Line 1297
1297          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1298        </manifest>
1299      </jar>
1185
1300    </target>
1301  
1302 <
1189 <  <target name="jsr166edocs"
1190 <          description="Builds javadocs to build dir">
1191 <
1302 >  <target name="jsr166edocs">
1303      <delete dir="${jsr166edocs.dir}"/>
1304      <mkdir dir="${jsr166edocs.dir}"/>
1305  
# Line 1196 | Line 1307
1307               packagenames="jsr166e.*"
1308               link="${java.api.url}"
1309               access="${build.javadoc.access}"
1310 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1310 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1311               source="${build.jsr166e.java.version}"
1312 <             executable="${javadoc7}">
1312 >             executable="${javadoc7}"
1313 >             failonerror = "true">
1314        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1315        <arg value="-XDignore.symbol.file=true"/>
1204
1316      </javadoc>
1317    </target>
1318  
1319 <
1209 <  <target name="jsr166e-tck-one-java-version"
1210 <          depends="jsr166ejar">
1211 <
1319 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1320      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1213
1321      <run-tck-tests
1322        tck.src.dir="${test.src.dir}/tck-jsr166e"
1323        target="${build.jsr166e.java.version}"
# Line 1218 | Line 1325
1325        classes="${jsr166e.jar}"/>
1326    </target>
1327  
1328 <  <target name="jsr166e-tck"
1222 <          description="Runs tck tests for jsr166e for multiple java versions">
1328 >  <target name="jsr166e-tck">
1329  
1330   <!--     <antcall target="clean"/> -->
1331   <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1240 | Line 1346
1346      </antcall>
1347    </target>
1348  
1349 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1350  
1351 <  <target name="jsr166e-test"
1245 <          depends="jsr166e-tck"
1246 <          description="Runs all tests for jsr166e">
1247 <  </target>
1248 <
1249 <  <target name="jsr166edist"
1250 <          depends="jsr166edist-jar, jsr166edist-docs"
1251 <          description="Puts all distributable products in single hierarchy"/>
1351 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1352  
1353 <
1254 <  <target name="jsr166eclean"
1255 <          description="Removes all jsr166e build products">
1353 >  <target name="jsr166eclean">
1354      <delete dir="${build.jsr166e.dir}"/>
1355    </target>
1356  
1259
1357    <target name="jsr166edist-jar"
1358            depends="jsr166eclean, jsr166ejar">
1359      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1360    </target>
1361  
1362 <  <target name="jsr166edist-docs"
1266 <          depends="jsr166eclean, jsr166edocs">
1362 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1363      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1364    </target>
1365  
# Line 1284 | Line 1380
1380    </target>
1381  
1382  
1383 + <!-- ==============================================================
1384 +  Experimental errorprone support - http://errorprone.info
1385 + =================================================================== -->
1386 +  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.1.2.jar"/>
1387 +  <target name="errorprone"
1388 +          depends="clean, configure-compiler"
1389 +          description="Run errorprone over jsr166 source code (experimental)">
1390 +
1391 +    <local name="destdir"/>
1392 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1393 +    <mkdir dir="${destdir}"/>
1394 +
1395 +    <javac srcdir="${src.dir}"
1396 +           destdir="${destdir}"
1397 +           debug="${build.debug}"
1398 +           debuglevel="${build.debuglevel}"
1399 +           deprecation="${build.deprecation}"
1400 +           classpath=""
1401 +           includeAntRuntime="false"
1402 +           includeJavaRuntime="false"
1403 +           encoding="ASCII"
1404 +           executable="${build.main.javac}"
1405 +           fork="true">
1406 +
1407 +      <include name="**/*.java"/>
1408 +      <compilerarg line="-processorpath ${errorprone.jar}"/>
1409 +      <compilerarg value="-Xplugin:ErrorProne
1410 +                          -Xep:IdentityBinaryExpression:WARN
1411 +                          -Xep:MissingOverride:OFF
1412 +                          -Xep:MixedArrayDimensions:ERROR
1413 +                          -Xep:RemoveUnusedImports:ERROR
1414 +                          -Xep:ClassName:ERROR
1415 +                          -Xep:MultipleTopLevelClasses:ERROR
1416 +                          -Xep:EmptyIf:ERROR
1417 +                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1418 +                          -Xep:RedundantThrows:ERROR
1419 +                          -Xep:MethodCanBeStatic:WARN"/>
1420 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1421 +      <compilerarg value="-Xprefer:source"/>
1422 +      <compilerarg value="-XDignore.symbol.file=true"/>
1423 +      <compilerarg value="-Xlint:all"/>
1424 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1425 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1426 +      <compilerarg line="${build.args}"/>
1427 +    </javac>
1428 +
1429 +    <jar destfile="${product.jar}">
1430 +      <fileset dir="${destdir}"/>
1431 +    </jar>
1432 +
1433 +    <run-tck-tests
1434 +      target="${build.main.java.version}"
1435 +      workdir="${build.dir}"
1436 +      classes="${product.jar}">
1437 +      <javac-elements>
1438 +        <compilerarg line="-processorpath ${errorprone.jar}"/>
1439 +        <compilerarg value="-Xplugin:ErrorProne
1440 +                            -Xep:IdentityBinaryExpression:WARN
1441 +                            -Xep:BoxedPrimitiveConstructor:OFF
1442 +                            -Xep:HashtableContains:OFF
1443 +                            -Xep:ModifyingCollectionWithItself:OFF
1444 +                            -Xep:MissingOverride:OFF
1445 +                            -Xep:MissingFail:OFF
1446 +                            -Xep:JdkObsolete:OFF
1447 +                            -Xep:MixedArrayDimensions:ERROR
1448 +                            -Xep:RemoveUnusedImports:ERROR
1449 +                            -Xep:ClassName:ERROR
1450 +                            -Xep:MultipleTopLevelClasses:ERROR
1451 +                            -Xep:EmptyIf:ERROR
1452 +                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1453 +                            -Xep:RedundantThrows:ERROR
1454 +                            -Xep:MethodCanBeStatic:WARN"/>
1455 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1456 +      </javac-elements>
1457 +    </run-tck-tests>
1458 +  </target>
1459 +
1460 +  <!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1461 +  <target name="errorprone-jtreg"
1462 +          depends="jar"
1463 +          description="Run errorprone over jtreg tests (experimental)">
1464 +
1465 +    <run-jtreg-tests
1466 +       target="${build.main.java.version}"
1467 +       workdir="${build.dir}"
1468 +       classes="${product.jar}"
1469 +       verbose="all">
1470 +      <jtreg-elements>
1471 +        <arg value="-javacoption:-processorpath"/>
1472 +        <arg value="-javacoption:${errorprone.jar}"/>
1473 +        <arg value="-javacoption:-Xplugin:ErrorProne
1474 +                            -Xep:IdentityBinaryExpression:WARN
1475 +                            -Xep:BoxedPrimitiveConstructor:OFF
1476 +                            -Xep:HashtableContains:OFF
1477 +                            -Xep:ModifyingCollectionWithItself:OFF
1478 +                            -Xep:MissingOverride:OFF
1479 +                            -Xep:JdkObsolete:OFF
1480 +                            -Xep:NonAtomicVolatileUpdate:OFF
1481 +                            -Xep:MixedArrayDimensions:ERROR
1482 +                            -Xep:RemoveUnusedImports:ERROR
1483 +                            -Xep:ClassName:ERROR
1484 +                            -Xep:MultipleTopLevelClasses:ERROR
1485 +                            -Xep:EmptyIf:ERROR
1486 +                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1487 +                            -Xep:RedundantThrows:ERROR
1488 +                            -Xep:MethodCanBeStatic:WARN"/>
1489 +      </jtreg-elements>
1490 +    </run-jtreg-tests>
1491 +  </target>
1492 +
1493 +
1494 + <!-- ==============================================================
1495 +  Running guava tests against jsr166 code
1496 + =================================================================== -->
1497 +
1498 + <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1499 + <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1500 + <!-- <property name="guava.version" value="21.0"/> -->
1501 +
1502 + <!-- HOWTO debug print a path id -->
1503 + <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1504 + <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1505 +
1506 + <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1507 + <!--   organisation="com.google.guava" module="guava-tests"/> -->
1508 + <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1509 + <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1510 + <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1511 + <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1512 +
1513 + <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1514 + <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1515 + <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1516 + <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1517 +
1518 + <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1519 + <!--   type="*" inline="true" conf="*(private),*(public)" -->
1520 + <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1521 + <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1522 +
1523 + <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1524 + <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1525 + <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1526 +
1527 +  <target name="init-ivy">
1528 +    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1529 +         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1530 +    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1531 +             classpath="${build.dir}/ivy.jar"/>
1532 +  </target>
1533 +
1534 +  <target name="guava-tests" depends="jar, init-ivy"
1535 +          description="Guava tests run against jsr166 collections">
1536 +    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1537 +    <mkdir dir="${guava.dir}"/>
1538 +    <ivy:retrieve pathid="guava.testlib.classpath"
1539 +      type="jar,bundle" inline="true" conf="default,master"
1540 +      pattern="${guava.dir}/[artifact].[ext]"
1541 +      organisation="com.google.guava" module="guava-testlib"/>
1542 +    <property name="guava.version" value="21.0"/>
1543 +    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1544 +         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1545 +    <junit printsummary="true" showoutput="true" haltonfailure="true"
1546 +           jvm="${build.main.java}" fork="true">
1547 +      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1548 +      <formatter type="brief"/>
1549 +      <classpath>
1550 +        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1551 +        <path refid="guava.testlib.classpath"/>
1552 +      </classpath>
1553 +
1554 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1555 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1556 +    </junit>
1557 +  </target>
1558 +
1559   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines