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.157 by jsr166, Tue Jul 8 00:01:39 2014 UTC vs.
Revision 1.254 by jsr166, Mon Sep 25 22:54:09 2017 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if" xmlns:unless="ant:unless"
3 >  xmlns:ivy="antlib:org.apache.ivy.ant">
4  
5    <description>
6   ------------------------------------------------------------------------------
# Line 6 | 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 13 | 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:
16  $HOME/jdk/jdk6
17  $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
21  $HOME/jdk/src/jdk6
22  $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=... -Djdk$N.src.home=...
33 +  for $N in 8 9 10 ...
34 +
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" />
43      </java>
44    </target>
45  
46 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
47  
48    <!-- User-specific settings -->
49    <property file="user.properties"/>
# Line 46 | Line 56
56    <property name="build.deprecation"    value="false"/>
57    <property name="build.javadoc.access" value="protected"/>
58  
49  <!-- Tck options; see JSR166TestCase.java
50   Profiling a tck test class:
51   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
52   Stress test a tck test class:
53   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
54  -->
55  <property name="jsr166.profileTests"     value="false"/>
56  <property name="jsr166.profileThreshold" value="100"/>
57  <property name="jsr166.runsPerTest"      value="1"/>
58  <!-- Stress test an individual tck test class:
59  ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
60  -->
61  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
62
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"/>
68  <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 88 | 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"/>
95 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
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="${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="${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"/>
105      <local name="boot.jar.dir"/>
106 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
107 <    <path id="bootclasspath@{v}">
106 >    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
107 >    <path id="bootclasspath@{v}" unless:set="modules">
108        <pathelement path="${boot.jar.dir}/resources.jar"/>
109        <pathelement path="${boot.jar.dir}/rt.jar"/>
110        <pathelement path="${boot.jar.dir}/jsse.jar"/>
111        <pathelement path="${boot.jar.dir}/jce.jar"/>
112        <pathelement path="${boot.jar.dir}/charsets.jar"/>
113      </path>
114 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
114 >    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
115      </sequential>
116    </macrodef>
117  
# Line 122 | 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"/>
138    <property name="test.src.dir"         location="${basedir}/src/test"/>
139    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
140    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
141 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
141 >  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
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 141 | 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 148 | 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 156 | 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 163 | 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 >  <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 >  <property name="java9.docroot.url"  value="http://docs.oracle.com/javase/9/docs"/>
189 >  <!-- The location of jdk9 early access docs -->
190 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
191    <!-- Default jdk doc location (latest stable release seems best) -->
192 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
192 >  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
193  
194    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
195    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 186 | Line 204
204    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
205             classpath="${lib.dir}/jtreg.jar" />
206  
207 <  <!-- Test classpath -->
208 <  <path id="test.classpath">
209 <    <pathelement location="${build.testcases.dir}"/>
210 <    <pathelement location="${junit.jar}"/>
211 <  </path>
212 <
207 >  <!-- Tck options; see JSR166TestCase.java
208 >   To profile a single tck test class:
209 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
210 >   To stress test a single tck test class:
211 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
212 >   To stress test a single tck test method:
213 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
214 >  -->
215 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
216    <macrodef name="run-tck-tests">
217      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
218      <attribute name="target"/>
219      <attribute name="compile-target" default="@{target}"/>
220      <attribute name="workdir"/>
221      <attribute name="classes"/>
222 <    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
222 >    <!--
223 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
224 >    -->
225 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
226      <element name="javac-elements" optional="true"/>
227 +
228      <sequential>
229  
230 +    <local name="modules"/>
231 +    <condition property="modules">
232 +      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233 +    </condition>
234 +
235 +    <local name="use-doclint"/>
236 +    <condition property="use-doclint">
237 +      <not> <equals arg1="@{target}" arg2="7"/> </not>
238 +    </condition>
239 +
240      <mkdir dir="@{workdir}/tck-classes"/>
241  
242      <javac srcdir="@{tck.src.dir}"
# Line 212 | Line 247
247             source="@{compile-target}"
248             target="@{compile-target}"
249             classpath="${junit.jar}"
215           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
250             includeAntRuntime="false"
251             includeJavaRuntime="false"
252 +           encoding="ASCII"
253             executable="${javac@{compile-target}}"
254             fork="true">
255  
256        <include name="*.java"/>
257        <compilerarg value="-XDignore.symbol.file=true"/>
258 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
258 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
259 >      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
260 >      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
261 >      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
262        <compilerarg line="${build.args}"/>
263        <javac-elements/>
264  
# Line 230 | Line 268
268            failonerror="true"
269            jvm="${java@{target}}"
270            fork="true">
271 <        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
271 >        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
272 >        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
273 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
274 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
275 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
276 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
277 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
278          <jvmarg line="@{jvmflags}"/>
279 <        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
280 <        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
281 <        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
279 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
280 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
281 >
282 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
283 >        <syspropertyset id="system-properties-used-by-tck">
284 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
285 >          <propertyref prefix="jsr166."/>
286 >          <propertyref name="test.timeout.factor"/>
287 >        </syspropertyset>
288 >
289          <classpath>
290            <pathelement location="${junit.jar}"/>
291            <pathelement location="@{workdir}/tck-classes"/>
# Line 244 | Line 295
295      </sequential>
296    </macrodef>
297  
298 +  <!-- Define jtreg test sets for different jdk versions -->
299 +  <fileset dir="${jtreg10.src.dir}">
300 +    <patternset id="jdk10.jtreg.tests">
301 +      <include name="**/*.java"/>
302 +    </patternset>
303 +  </fileset>
304 +
305 +  <fileset dir="${jtreg9.src.dir}">
306 +    <patternset id="jdk9.jtreg.tests">
307 +      <include name="**/*.java"/>
308 +    </patternset>
309 +  </fileset>
310 +
311 +  <fileset dir="${jtreg8.src.dir}">
312 +    <patternset id="jdk8.jtreg.tests">
313 +      <include name="**/*.java"/>
314 +    </patternset>
315 +  </fileset>
316 +
317 +  <fileset dir="${jtreg7.src.dir}">
318 +    <patternset id="jdk7.jtreg.tests">
319 +      <include name="**/*.java"/>
320 +    </patternset>
321 +  </fileset>
322 +
323 +  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
324 +  <property name="jtreg.flags" value=""/>
325 +
326    <macrodef name="run-jtreg-tests">
327 <    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
249 <    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
250 <    <attribute name="source" default="7"/>
327 >    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
328      <attribute name="target"/>
329      <attribute name="workdir"/>
330      <attribute name="classes"/>
331      <attribute name="jtregflags" default=""/>
332 +
333      <sequential>
334 +
335 +    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
336 +    <property name="jtreg.verbose" value="nopass,fail,error"/>
337 +
338 +    <local name="modules"/>
339 +    <condition property="modules">
340 +      <available file="${jdk@{target}.home}/jmods" type="dir"/>
341 +    </condition>
342 +
343      <delete dir="@{workdir}/JTwork"   quiet="true"/>
344 <    <delete dir="@{workdir}/JTreport" quiet="true"/>
258 <    <mkdir dir="@{workdir}/JTwork/scratch"/>
259 <    <mkdir dir="@{workdir}/JTreport"/>
260 <    <jtreg dir="@{jtreg.src.dir}"
344 >    <jtreg dir="${jtreg@{target}.src.dir}"
345             jdk="${jdk@{target}.home}"
346 <           workDir="@{workdir}/JTwork"
347 <           reportDir="@{workdir}/JTreport">
348 <
349 <      <arg value="-Xbootclasspath/p:@{classes}"/>
346 >           workDir="@{workdir}/JTwork">
347 >      <patternset refid="jdk@{target}.jtreg.tests"/>
348 >      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
349 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
350 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
351        <arg value="-agentvm"/>
352 <      <arg value="-v:nopass,fail"/>
352 >      <arg value="-noreport"/>
353 >      <arg value="-verbose:${jtreg.verbose}"/>
354        <arg value="-vmoptions:-esa -ea"/>
355        <arg value="-automatic"/>
356        <arg value="-k:!ignore"/>
357        <arg line="@{jtregflags}"/>
358 +      <arg line="${jtreg.flags}"/>
359      </jtreg>
360      </sequential>
361    </macrodef>
# Line 285 | Line 372
372    <!-- Main targets -->
373  
374    <property name="build.main.java.version" value="9"/>
375 <  <property name="build.main.javac" value="${javac9}"/>
375 >  <!-- Workaround "no nested properties in ant" -->
376 >  <macrodef name="define-build-main-properties">
377 >    <attribute name="v"/>
378 >    <sequential>
379 >      <property name="build.main.java"    value="${java@{v}}"/>
380 >      <property name="build.main.javac"   value="${javac@{v}}"/>
381 >      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
382 >    </sequential>
383 >  </macrodef>
384 >  <define-build-main-properties v="${build.main.java.version}"/>
385  
386    <target name="dists"
387 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
387 >          depends="dist, 4jdk8dist"
388            description="Builds all public jars and docs"/>
389 +          <!--
390 +              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
391 +          -->
392  
393    <target name="compile"
394            depends="configure-compiler"
395            description="Compiles src/main sources to build dir">
396  
397 <    <mkdir dir="${build.classes.dir}"/>
397 >    <local name="destdir"/>
398 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
399 >
400 >    <mkdir dir="${destdir}"/>
401  
402      <javac srcdir="${src.dir}"
403 <           destdir="${build.classes.dir}"
403 >           destdir="${destdir}"
404             debug="${build.debug}"
405             debuglevel="${build.debuglevel}"
406             deprecation="${build.deprecation}"
407             classpath=""
408             includeAntRuntime="false"
409             includeJavaRuntime="false"
410 +           encoding="ASCII"
411             executable="${build.main.javac}"
412             fork="true">
413  
414        <include name="**/*.java"/>
415 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
416        <compilerarg value="-Xprefer:source"/>
417        <compilerarg value="-XDignore.symbol.file=true"/>
418        <compilerarg value="-Xlint:all"/>
419 <      <compilerarg value="-Xdoclint:all/protected"/>
419 >      <compilerarg line="--doclint-format html5"/>
420 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
421 >      <compilerarg value="-Werror"/>
422        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
423        <compilerarg line="${build.args}"/>
424  
# Line 322 | Line 428
428  
429    <target name="jar"
430            depends="compile"
431 <          description="Builds library jar from compiled sources">
432 <
431 >          description="Builds library jar for src/main from compiled sources">
432 >    <local name="subdir"/>
433 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
434      <jar destfile="${product.jar}">
435 <      <fileset dir="${build.classes.dir}"/>
435 >      <fileset dir="${build.classes.dir}${subdir}"/>
436 >      <manifest>
437 >        <attribute name="Built-By" value="${user.name}"/>
438 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
439 >      </manifest>
440      </jar>
441    </target>
442  
# Line 339 | Line 450
450      <!-- the packagenames="none" hack below prevents scanning the -->
451      <!-- sourcepath for packages -->
452  
453 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
454 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
455 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
456 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
457 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
458      <javadoc destdir="${docs.dir}"
459               packagenames="none"
460               link="${java9.api.url}"
461               overview="${src.dir}/intro.html"
462               access="${build.javadoc.access}"
463 <             sourcepath="${src.dir}:${jdk9src.dir}"
463 >             sourcepath="${src.dir}"
464               classpath=""
465 <             executable="${javadoc9}">
465 >             source="9"
466 >             executable="${build.main.javadoc}">
467        <fileset dir="${src.dir}" defaultexcludes="yes">
468          <include name="**/*.java"/>
469        </fileset>
470        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
471        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
472        <arg value="-XDignore.symbol.file=true"/>
473 +      <arg value="-html5"/>
474 +      <arg value="--patch-module=java.base=${src.dir}"/>
475        <arg value="-tag"/>
476        <arg value="${javadoc.jls.option}"/>
477 + <!-- @apiNote currently unused -->
478 + <!--       <arg value="-tag"/> -->
479 + <!--       <arg value="apiNote:a:API Note:"/> -->
480        <arg value="-tag"/>
481 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
360 <      <arg value="-tag"/>
361 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
481 >      <arg value="implSpec:a:Implementation Requirements:"/>
482        <arg value="-tag"/>
483 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
483 >      <arg value="implNote:a:Implementation Note:"/>
484 > <!-- tags added in jdk9: currently unused -->
485 > <!--       <arg value="-tag"/> -->
486 > <!--       <arg value="revised:X"/> -->
487 > <!--       <arg value="-tag"/> -->
488 > <!--       <arg value="spec:X"/> -->
489      </javadoc>
490    </target>
491  
# Line 384 | Line 509
509        <exclude name="src/emulation/**"/>
510        <exclude name="**/SyntaxTest.java"/>
511        <exclude name="**/SuperfluousAbstract.java"/>
512 +      <manifest>
513 +        <attribute name="Built-By" value="${user.name}"/>
514 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
515 +      </manifest>
516      </jar>
517    </target>
518  
519  
520    <target name="clean"
521            description="Removes all build products">
393
522      <delete dir="${build.dir}"/>
395
523    </target>
524  
525  
526    <target name="dist-clean"
527            description="Removes all build and distribution products">
401
528      <delete dir="${build.dir}"/>
529      <delete dir="${dist.dir}"/>
404
530    </target>
531  
532  
# Line 415 | Line 540
540      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
541    </target>
542  
543 <
419 <  <target name="test-tck"
543 >  <target name="tck"
544            depends="jar"
545 <          description="Runs tck tests for main directly">
545 >          description="Runs tck tests for src/main directly">
546  
547      <run-tck-tests
548        target="${build.main.java.version}"
549        workdir="${build.dir}"
550 <      classes="${product.jar}"/>
550 >      classes="${product.jar}">
551 >      <javac-elements>
552 >        <compilerarg value="-Werror"/>
553 >      </javac-elements>
554 >    </run-tck-tests>
555 >  </target>
556 >
557 >  <target name="tck-parallelism-1"
558 >          description="Runs tck with common pool parallelism 1">
559 >    <antcall target="tck">
560 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
561 >    </antcall>
562 >  </target>
563 >
564 >  <target name="tck-parallelism-0"
565 >          description="Runs tck with common pool parallelism 0">
566 >    <antcall target="tck">
567 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
568 >    </antcall>
569    </target>
570  
571 <  <target name="test-jtreg"
571 >  <target name="tck-security-manager"
572 >          description="Runs tck with a security manager">
573 >    <antcall target="tck">
574 >      <param name="jsr166.useSecurityManager" value="true"/>
575 >    </antcall>
576 >  </target>
577 >
578 >  <target name="jtreg"
579            depends="jar"
580 <          description="Runs jtreg tests for main using the jtreg ant task">
580 >          description="Runs jtreg tests for src/main using the jtreg ant task">
581      <run-jtreg-tests
582         target="${build.main.java.version}"
583         workdir="${build.dir}"
# Line 436 | Line 585
585    </target>
586  
587    <target name="test"
588 <          depends="test-tck, test-jtreg"
589 <          description="Runs tck and jtreg tests for main">
441 <  </target>
588 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
589 >          description="Runs tck and jtreg tests for src/main"/>
590  
591 <  <target name="test89"
592 <          description="Runs tck and jtreg tests for main for multiple java versions">
591 > <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
592 >
593 > <!--     <antcall target="jtreg"> -->
594 > <!--       <param name="build.main.java.version" value="8"/> -->
595 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
596 > <!--     </antcall> -->
597 >
598 > <!--   </target> -->
599 >
600 >  <target name="test910"
601 >          description="Runs tck and jtreg tests for src/main for multiple java versions">
602  
603      <antcall target="clean"/>
604      <antcall target="test">
605 <      <param name="build.main.java.version" value="8"/>
449 <      <param name="build.main.javac" value="${javac8}"/>
605 >      <param name="build.main.java.version" value="9"/>
606      </antcall>
607  
608      <antcall target="clean"/>
609      <antcall target="test">
610 <      <param name="build.main.java.version" value="9"/>
455 <      <param name="build.main.javac" value="${javac9}"/>
610 >      <param name="build.main.java.version" value="10"/>
611      </antcall>
612  
613 +    <!-- Clean up to avoid obscure wrong class file version bugs -->
614 +    <antcall target="clean"/>
615 +
616    </target>
617  
618  
619  
620    <target name="configure-compiler">
621 +    <fail message="ant version too old">
622 +      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
623 +    </fail>
624  
625      <property name="unchecked.option" value="-Xlint:unchecked"/>
626  
# Line 480 | Line 641
641    <!-- Various demos and test programs -->
642  
643  
644 <  <target name="loops" depends="configure-compiler"
645 <          description="Benchmark from Doug Lea's AQS paper">
644 >  <!-- description="Benchmark from Doug Lea's AQS paper" -->
645 >  <target name="loops" depends="configure-compiler">
646  
647      <mkdir dir="${build.loops.dir}"/>
648  
# Line 491 | Line 652
652         debuglevel="${build.debuglevel}"
653        deprecation="${build.deprecation}"
654             source="${build.sourcelevel}"
655 +           target="${build.sourcelevel}"
656 +         encoding="ASCII"
657               fork="true">
658  
659        <compilerarg line="${build.args}"/>
# Line 502 | Line 665
665      <java classname="ALoops" fork="true">
666        <classpath refid="loops.classpath"/>
667      </java>
668 +  </target>
669 +
670 +
671 +  <target name="compile-test-loops" depends="jar"
672 +          description="Compiles all the perf tests in src/test/loops">
673 +
674 +    <mkdir dir="${build.dir}/test/loops"/>
675 +
676 +    <javac srcdir="${basedir}/src/test/loops"
677 +           destdir="${build.dir}/test/loops"
678 +           debug="${build.debug}"
679 +           debuglevel="${build.debuglevel}"
680 +           deprecation="${build.deprecation}"
681 +           includeAntRuntime="false"
682 +           includeJavaRuntime="false"
683 +           encoding="ASCII"
684 +           executable="${build.main.javac}"
685 +           fork="true">
686  
687 +      <include name="*.java"/>
688 +      <compilerarg value="-XDignore.symbol.file=true"/>
689 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
690 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
691 +      <compilerarg line="${build.args}"/>
692 +    </javac>
693    </target>
694  
695  
696 <  <!-- jsr166 4jdk7 -->
696 >  <!-- jsr166 4jdk8 -->
697 >
698 >  <target name="4jdk8compile"
699 >          depends="configure-compiler"
700 >          description="Compiles src/jdk8 sources, targeting jdk8">
701 >
702 >    <mkdir dir="${build.4jdk8.classes.dir}"/>
703 >
704 >    <javac srcdir="${4jdk8src.dir}"
705 >           destdir="${build.4jdk8.classes.dir}"
706 >           debug="${build.debug}"
707 >           debuglevel="${build.debuglevel}"
708 >           deprecation="${build.deprecation}"
709 >           source="8"
710 >           target="8"
711 >           classpath=""
712 >           bootclasspath="${bootclasspath8}"
713 >           includeAntRuntime="false"
714 >           includeJavaRuntime="false"
715 >           encoding="ASCII"
716 >           executable="${javac8}"
717 >           fork="true">
718 >      <include name="**/*.java"/>
719 >      <compilerarg value="-Xprefer:source"/>
720 >      <compilerarg value="-XDignore.symbol.file=true"/>
721 >      <compilerarg value="-Xlint:all"/>
722 >      <compilerarg value="-Werror"/>
723 >      <compilerarg line="${build.args}"/>
724 >    </javac>
725 >  </target>
726  
727 <  <target name="4jdk7compile"
727 >  <target name="4jdk8doclint"
728            depends="configure-compiler"
729 <          description="Compiles src/jdk7 sources, targeting jdk7">
729 >          description="Finds doclint warnings">
730 >
731 >    <mkdir dir="${build.4jdk8.classes.dir}"/>
732 >
733 >    <javac srcdir="${4jdk8src.dir}"
734 >           destdir="${build.4jdk8.classes.dir}"
735 >           debug="${build.debug}"
736 >           debuglevel="${build.debuglevel}"
737 >           deprecation="${build.deprecation}"
738 >           source="8"
739 >           target="8"
740 >           classpath=""
741 >           bootclasspath="${bootclasspath8}"
742 >           includeAntRuntime="false"
743 >           includeJavaRuntime="false"
744 >           encoding="ASCII"
745 >           executable="${javac8}"
746 >           fork="true">
747 >      <include name="**/*.java"/>
748 >      <compilerarg value="-Xprefer:source"/>
749 >      <compilerarg value="-XDignore.symbol.file=true"/>
750 >      <compilerarg value="-Xlint:all"/>
751 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
752 >      <compilerarg line="${build.args}"/>
753 >    </javac>
754 >  </target>
755 >
756 >
757 >  <target name="4jdk8jar"
758 >          depends="4jdk8compile"
759 >          description="Builds library jar from compiled sources">
760 >
761 >    <jar destfile="${4jdk8product.jar}">
762 >      <fileset dir="${build.4jdk8.classes.dir}"/>
763 >      <manifest>
764 >        <attribute name="Built-By" value="${user.name}"/>
765 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
766 >      </manifest>
767 >    </jar>
768 >  </target>
769 >
770 >
771 >  <target name="4jdk8-tck"
772 >          depends="4jdk8jar"
773 >          description="Runs tck tests for jsr166-4jdk8 directly">
774 >
775 >    <run-tck-tests
776 >      target="8"
777 >      workdir="${build.4jdk8.dir}"
778 >      classes="${4jdk8product.jar}">
779 >      <javac-elements>
780 >        <!-- JDK9+ test classes -->
781 >        <exclude name="*9Test.java"/>
782 >        <exclude name="*10Test.java"/>
783 >        <compilerarg value="-Werror"/>
784 >      </javac-elements>
785 >    </run-tck-tests>
786 >  </target>
787 >
788 >
789 >  <target name="4jdk8-jtreg"
790 >          depends="4jdk8jar"
791 >          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
792 >    <run-jtreg-tests
793 >       target="8"
794 >       workdir="${build.4jdk8.dir}"
795 >       classes="${4jdk8product.jar}"/>
796 >  </target>
797 >
798 >
799 >  <target name="4jdk8-test"
800 >          depends="4jdk8-tck, 4jdk8-jtreg"
801 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
802 >
803 >
804 >  <target name="4jdk8docs"
805 >          description="Builds javadocs for src/jdk8 to dist dir">
806 >
807 >    <delete dir="${4jdk8docs.dir}"/>
808 >    <mkdir dir="${4jdk8docs.dir}"/>
809 >
810 >    <javadoc destdir="${4jdk8docs.dir}"
811 >             packagenames="none"
812 >             link="${java8.api.url}"
813 >             overview="${4jdk8src.dir}/intro.html"
814 >             access="${build.javadoc.access}"
815 >             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
816 >             classpath=""
817 >             source="8"
818 >             executable="${javadoc8}"
819 >             failonerror = "true">
820 >      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
821 >        <include name="**/*.java"/>
822 >      </fileset>
823 >      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
824 >      <arg value="-XDignore.symbol.file=true"/>
825 >      <arg value="-tag"/>
826 >      <arg value="${javadoc.jls.option}"/>
827 > <!-- @apiNote currently unused -->
828 > <!--       <arg value="-tag"/> -->
829 > <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
830 >      <arg value="-tag"/>
831 >      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
832 >      <arg value="-tag"/>
833 >      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
834 >    </javadoc>
835 >  </target>
836 >
837 >
838 >  <target name="4jdk8dist"
839 >          depends="4jdk8dist-jar, 4jdk8dist-docs"
840 >          description="Puts all distributable products in single hierarchy"/>
841 >
842 >
843 >  <target name="4jdk8clean"
844 >          description="Removes all 4jdk8 build products">
845 >    <delete dir="${build.4jdk8.dir}"/>
846 >  </target>
847 >
848 >
849 >  <target name="4jdk8dist-jar"
850 >          depends="4jdk8clean, 4jdk8jar">
851 >    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
852 >  </target>
853 >
854 >
855 >  <target name="4jdk8dist-docs"
856 >          depends="4jdk8clean, 4jdk8docs">
857 >    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
858 >  </target>
859 >
860 >
861 >  <!-- jsr166 4jdk7 (no longer maintained) -->
862  
863 +  <target name="4jdk7compile" depends="configure-compiler">
864      <mkdir dir="${build.4jdk7.classes.dir}"/>
865  
866      <javac srcdir="${4jdk7src.dir}"
# Line 520 | Line 869
869             debuglevel="${build.debuglevel}"
870             deprecation="${build.deprecation}"
871             source="6"
872 +           target="6"
873             classpath=""
874             bootclasspath="${bootclasspath6}"
875             includeAntRuntime="false"
876             includeJavaRuntime="false"
877 +           encoding="ASCII"
878             executable="${javac7}"
879             fork="true">
880  
# Line 531 | Line 882
882        <compilerarg value="-Xprefer:source"/>
883        <compilerarg value="-XDignore.symbol.file=true"/>
884        <compilerarg value="-Xlint:all"/>
885 +      <compilerarg value="-Werror"/>
886        <compilerarg line="${build.args}"/>
535
887      </javac>
888    </target>
889  
890 <  <target name="4jdk7doclint"
540 <          depends="configure-compiler"
541 <          description="Finds doclint warnings">
542 <
890 >  <target name="4jdk7doclint" depends="configure-compiler">
891      <mkdir dir="${build.4jdk7.classes.dir}"/>
892  
893      <javac srcdir="${4jdk7src.dir}"
# Line 548 | Line 896
896             debuglevel="${build.debuglevel}"
897             deprecation="${build.deprecation}"
898             source="6"
899 +           target="6"
900             classpath=""
901 <           bootclasspath="${bootclasspath7}"
901 >           bootclasspath="${bootclasspath6}"
902             includeAntRuntime="false"
903             includeJavaRuntime="false"
904 +           encoding="ASCII"
905             executable="${javac8}"
906             fork="true">
907  
# Line 561 | Line 911
911        <compilerarg value="-Xlint:all"/>
912        <compilerarg value="-Xdoclint:all/protected"/>
913        <compilerarg line="${build.args}"/>
564
914      </javac>
915    </target>
916  
917 <
569 <  <target name="4jdk7jar"
570 <          depends="4jdk7compile"
571 <          description="Builds library jar from compiled sources">
572 <
917 >  <target name="4jdk7jar" depends="4jdk7compile">
918      <jar destfile="${4jdk7product.jar}">
919        <fileset dir="${build.4jdk7.classes.dir}"/>
920 +      <manifest>
921 +        <attribute name="Built-By" value="${user.name}"/>
922 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
923 +      </manifest>
924      </jar>
576
925    </target>
926  
927 <
580 <  <target name="4jdk7-test-tck"
581 <          depends="4jdk7jar"
582 <          description="Runs tck tests for jsr166-4jdk7 directly">
583 <
927 >  <target name="4jdk7-tck" depends="4jdk7jar">
928      <run-tck-tests
929        target="7"
930        workdir="${build.4jdk7.dir}"
# Line 589 | Line 933
933          <!-- JDK8+ test classes -->
934          <exclude name="*8Test.java"/>
935          <exclude name="*9Test.java"/>
936 +        <exclude name="*10Test.java"/>
937          <exclude name="DoubleAccumulatorTest.java"/>
938          <exclude name="DoubleAdderTest.java"/>
939          <exclude name="LongAccumulatorTest.java"/>
# Line 596 | Line 941
941          <exclude name="CompletableFutureTest.java"/>
942          <exclude name="SplittableRandomTest.java"/>
943          <exclude name="StampedLockTest.java"/>
944 +        <exclude name="SubmissionPublisherTest.java"/>
945 +        <compilerarg value="-Werror"/>
946        </javac-elements>
947      </run-tck-tests>
948    </target>
949  
950 <
951 <  <target name="4jdk7-test-tck-junit"
605 <          depends="4jdk7compile"
606 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
950 >  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
951 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
952  
953      <junit printsummary="true"
954             showoutput="true"
# Line 625 | Line 970
970  
971        <test name="${jsr166.tckTestClass}" haltonfailure="no">
972        </test>
628
973      </junit>
974    </target>
975  
976 <  <target name="4jdk7-test-jtreg"
633 <          depends="4jdk7jar"
634 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
976 >  <target name="4jdk7-jtreg" depends="4jdk7jar">
977      <run-jtreg-tests
978         target="7"
979         workdir="${build.4jdk7.dir}"
980 <       classes="${4jdk7product.jar}"
639 <       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
640 <  </target>
641 <
642 <
643 <  <target name="4jdk7-test"
644 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
645 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
980 >       classes="${4jdk7product.jar}"/>
981    </target>
982  
983 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
984  
985 <  <target name="4jdk7docs"
650 <          description="Builds javadocs for src/jdk7 to dist dir">
651 <
985 >  <target name="4jdk7docs">
986      <delete dir="${4jdk7docs.dir}"/>
987      <mkdir dir="${4jdk7docs.dir}"/>
988  
# Line 657 | Line 991
991               link="${java7.api.url}"
992               overview="${4jdk7src.dir}/intro.html"
993               access="${build.javadoc.access}"
994 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
994 >             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
995               classpath=""
996 <             executable="${javadoc7}">
996 >             executable="${javadoc7}"
997 >             failonerror = "true">
998        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
999          <include name="**/*.java"/>
1000        </fileset>
# Line 668 | Line 1003
1003      </javadoc>
1004    </target>
1005  
1006 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1007  
1008 <  <target name="4jdk7dist"
673 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
674 <          description="Puts all distributable products in single hierarchy"/>
675 <
676 <
677 <  <target name="4jdk7clean"
678 <          description="Removes all 4jdk7 build products">
679 <
1008 >  <target name="4jdk7clean">
1009      <delete dir="${build.4jdk7.dir}"/>
681
1010    </target>
1011  
1012 <
685 <  <target name="4jdk7dist-jar"
686 <          depends="4jdk7clean, 4jdk7jar">
1012 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1013      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1014    </target>
1015  
1016 <
691 <  <target name="4jdk7dist-docs"
692 <          depends="4jdk7clean, 4jdk7docs">
1016 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1017      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1018    </target>
1019  
1020  
1021 <  <!-- jsr166x -->
698 <
699 <  <target name="jsr166xcompile"
700 <          depends="configure-compiler"
701 <          description="Compiles jsr166x sources to build dir">
1021 >  <!-- jsr166x (no longer maintained) -->
1022  
1023 +  <target name="jsr166xcompile" depends="configure-compiler">
1024      <mkdir dir="${build.jsr166x.classes.dir}"/>
1025  
1026      <javac srcdir="${topsrc.dir}"
# Line 710 | Line 1031
1031             classpath=""
1032             bootclasspath="${bootclasspath6}"
1033             source="5"
1034 +           target="5"
1035             includeAntRuntime="false"
1036             includeJavaRuntime="false"
1037 +           encoding="ASCII"
1038             executable="${javac7}"
1039             fork="true">
717
1040        <include name="jsr166x/**/*.java"/>
1041        <compilerarg value="-XDignore.symbol.file=true"/>
1042        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1043 +      <compilerarg value="-Werror"/>
1044        <compilerarg line="${build.args}"/>
722
1045      </javac>
1046    </target>
1047  
1048 <
727 <  <target name="jsr166xjar"
728 <          depends="jsr166xcompile"
729 <          description="Builds library jar from compiled sources">
730 <
1048 >  <target name="jsr166xjar" depends="jsr166xcompile">
1049      <jar destfile="${jsr166x.jar}">
1050        <fileset dir="${build.jsr166x.classes.dir}"/>
1051 +      <manifest>
1052 +        <attribute name="Built-By" value="${user.name}"/>
1053 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1054 +      </manifest>
1055      </jar>
734
1056    </target>
1057  
1058 <
738 <  <target name="jsr166xdocs"
739 <          description="Builds javadocs to dist dir">
740 <
1058 >  <target name="jsr166xdocs">
1059      <delete dir="${jsr166xdocs.dir}"/>
1060      <mkdir dir="${jsr166xdocs.dir}"/>
1061  
# Line 745 | Line 1063
1063               packagenames="jsr166x.*"
1064               link="${java.api.url}"
1065               access="${build.javadoc.access}"
1066 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1066 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1067               bootclasspath="${bootclasspath6}"
1068               source="5"
1069 <             executable="${javadoc7}">
1069 >             executable="${javadoc7}"
1070 >             failonerror = "true">
1071        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1072        <arg value="-XDignore.symbol.file=true"/>
754
1073      </javadoc>
1074    </target>
1075  
1076 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1077  
1078 <  <target name="jsr166xdist"
760 <          depends="jsr166xdist-jar, jsr166xdist-docs"
761 <          description="Puts all distributable products in single hierarchy"/>
762 <
763 <
764 <  <target name="jsr166xclean"
765 <          description="Removes all jsr166x build products">
766 <
1078 >  <target name="jsr166xclean">
1079      <delete dir="${build.jsr166x.dir}"/>
768
1080    </target>
1081  
1082 <
772 <  <target name="jsr166xdist-jar"
773 <          depends="jsr166xclean, jsr166xjar">
1082 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1083      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1084    </target>
1085  
1086 <  <target name="jsr166xdist-docs"
778 <          depends="jsr166xclean, jsr166xdocs">
1086 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1087      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1088    </target>
1089  
782  <!-- jsr166y -->
783
1090  
1091 <  <target name="jsr166ycompile"
786 <          depends="configure-compiler"
787 <          description="Compiles jsr166y sources">
1091 >  <!-- jsr166y (no longer maintained) -->
1092  
1093 +  <target name="jsr166ycompile" depends="configure-compiler">
1094      <mkdir dir="${build.jsr166y.classes.dir}"/>
1095  
1096      <javac srcdir="${topsrc.dir}"
# Line 794 | Line 1099
1099             debuglevel="${build.debuglevel}"
1100             deprecation="${build.deprecation}"
1101             source="6"
1102 +           target="6"
1103             classpath=""
1104             bootclasspath="${bootclasspath6}"
1105             includeAntRuntime="false"
1106             includeJavaRuntime="false"
1107 +           encoding="ASCII"
1108             executable="${javac7}"
1109             fork="true">
1110  
1111        <include name="jsr166y/**/*.java"/>
1112        <compilerarg value="-XDignore.symbol.file=true"/>
1113        <compilerarg value="-Xlint:all"/>
1114 +      <compilerarg value="-Werror"/>
1115        <compilerarg line="${build.args}"/>
808
1116      </javac>
1117    </target>
1118  
1119 <
813 <  <target name="jsr166yjar"
814 <          depends="jsr166ycompile"
815 <          description="Builds library jar from compiled sources">
816 <
1119 >  <target name="jsr166yjar" depends="jsr166ycompile">
1120      <jar destfile="${jsr166y.jar}" index="true">
1121        <fileset dir="${build.jsr166y.classes.dir}"/>
1122 +      <manifest>
1123 +        <attribute name="Built-By" value="${user.name}"/>
1124 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1125 +      </manifest>
1126      </jar>
820
1127    </target>
1128  
1129 <
824 <  <target name="jsr166ydocs"
825 <          description="Builds javadocs to dist dir">
826 <
1129 >  <target name="jsr166ydocs">
1130      <delete dir="${jsr166ydocs.dir}"/>
1131      <mkdir dir="${jsr166ydocs.dir}"/>
1132  
# Line 831 | Line 1134
1134               packagenames="jsr166y.*"
1135               link="${java.api.url}"
1136               access="${build.javadoc.access}"
1137 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1137 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1138               bootclasspath="${bootclasspath6}"
1139               source="6"
1140 <             executable="${javadoc7}">
1140 >             executable="${javadoc7}"
1141 >             failonerror = "true">
1142        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1143        <arg value="-XDignore.symbol.file=true"/>
840
1144      </javadoc>
1145    </target>
1146  
1147 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1148  
1149 <  <target name="jsr166ydist"
846 <          depends="jsr166ydist-jar, jsr166ydist-docs"
847 <          description="Puts all distributable products in single hierarchy"/>
848 <
849 <
850 <  <target name="jsr166yclean"
851 <          description="Removes all jsr166y build products">
852 <
1149 >  <target name="jsr166yclean">
1150      <delete dir="${build.jsr166y.dir}"/>
854
1151    </target>
1152  
1153 <
858 <  <target name="jsr166ydist-jar"
859 <          depends="jsr166yclean, jsr166yjar">
1153 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1154      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1155    </target>
1156  
1157 <  <target name="jsr166ydist-docs"
864 <          depends="jsr166yclean, jsr166ydocs">
1157 >  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1158      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1159    </target>
1160  
1161  
1162 <  <!-- extra166y -->
870 <
871 <
872 <  <target name="extra166ycompile"
873 <          depends="configure-compiler, jsr166yjar"
874 <          description="Compiles extra166y sources">
1162 >  <!-- extra166y (no longer maintained) -->
1163  
1164 +  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1165      <mkdir dir="${build.extra166y.classes.dir}"/>
1166  
1167      <javac srcdir="${topsrc.dir}"
# Line 883 | Line 1172
1172             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1173             classpath=""
1174             source="6"
1175 +           target="6"
1176             includeAntRuntime="false"
1177             includeJavaRuntime="false"
1178 +           encoding="ASCII"
1179             executable="${javac7}"
1180             fork="true">
1181  
1182        <include name="extra166y/**/*.java"/>
1183        <compilerarg value="-XDignore.symbol.file=true"/>
1184        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1185 +      <compilerarg value="-Werror"/>
1186        <compilerarg line="${build.args}"/>
895
1187      </javac>
1188    </target>
1189  
1190 <
900 <  <target name="extra166yjar"
901 <          depends="extra166ycompile"
902 <          description="Builds library jar from compiled sources">
903 <
1190 >  <target name="extra166yjar" depends="extra166ycompile">
1191      <jar destfile="${extra166y.jar}" index="true">
1192        <fileset dir="${build.extra166y.classes.dir}"/>
1193 +      <manifest>
1194 +        <attribute name="Built-By" value="${user.name}"/>
1195 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1196 +      </manifest>
1197      </jar>
907
1198    </target>
1199  
1200 <
911 <  <target name="extra166ydocs"
912 <          description="Builds javadocs to build dir">
913 <
1200 >  <target name="extra166ydocs">
1201      <delete dir="${extra166ydocs.dir}"/>
1202      <mkdir dir="${extra166ydocs.dir}"/>
1203  
# Line 918 | Line 1205
1205               packagenames="extra166y.*"
1206               link="${java.api.url}"
1207               access="${build.javadoc.access}"
1208 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1208 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1209               bootclasspath="${bootclasspath6}"
1210               source="6"
1211               executable="${javadoc7}">
1212        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1213        <arg value="-XDignore.symbol.file=true"/>
927
1214      </javadoc>
1215    </target>
1216  
1217 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1218  
1219 <  <target name="extra166ydist"
933 <          depends="extra166ydist-jar, extra166ydist-docs"
934 <          description="Puts all distributable products in single hierarchy"/>
935 <
936 <
937 <  <target name="extra166yclean"
938 <          description="Removes all extra166y build products">
939 <
1219 >  <target name="extra166yclean">
1220      <delete dir="${build.extra166y.dir}"/>
941
1221    </target>
1222  
1223 <
945 <  <target name="extra166ydist-jar"
946 <          depends="extra166yclean, extra166yjar">
1223 >  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1224      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1225    </target>
1226  
1227 <  <target name="extra166ydist-docs"
951 <          depends="extra166yclean, extra166ydocs">
1227 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1228      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1229    </target>
1230  
1231 <  <!-- jsr166e -->
1231 >
1232 >  <!-- jsr166e (no longer maintained) -->
1233  
1234    <property name="build.jsr166e.java.version" value="6"/>
1235    <property name="build.jsr166e.javac" value="${javac6}"/>
1236  
1237 <  <target name="jsr166ecompile"
961 <          depends="configure-compiler"
962 <          description="Compiles jsr166e sources">
963 <
1237 >  <target name="jsr166ecompile" depends="configure-compiler">
1238      <mkdir dir="${build.jsr166e.classes.dir}"/>
1239  
1240      <javac srcdir="${topsrc.dir}"
# Line 969 | Line 1243
1243             debuglevel="${build.debuglevel}"
1244             deprecation="${build.deprecation}"
1245             source="${build.jsr166e.java.version}"
1246 +           target="${build.jsr166e.java.version}"
1247             classpath=""
1248             includeAntRuntime="false"
1249             includeJavaRuntime="false"
# Line 978 | Line 1253
1253        <include name="jsr166e/**/*.java"/>
1254        <compilerarg value="-XDignore.symbol.file=true"/>
1255        <compilerarg value="-Xlint:all"/>
1256 +      <compilerarg value="-Werror"/>
1257        <compilerarg line="${build.args}"/>
982
1258      </javac>
1259    </target>
1260  
986  <!-- jsr166e: find doclint errors -->
1261    <target name="jsr166edoclint">
988
1262      <mkdir dir="${build.jsr166e.classes.dir}"/>
1263  
1264      <javac srcdir="${topsrc.dir}"
# Line 994 | Line 1267
1267             debuglevel="${build.debuglevel}"
1268             deprecation="${build.deprecation}"
1269             source="${build.jsr166e.java.version}"
1270 +           target="${build.jsr166e.java.version}"
1271             classpath=""
1272 <           bootclasspath="${bootclasspath7}"
1272 >           bootclasspath="${bootclasspath6}"
1273             includeAntRuntime="false"
1274             includeJavaRuntime="false"
1275             executable="${javac8}"
# Line 1004 | Line 1278
1278        <include name="jsr166e/**/*.java"/>
1279        <compilerarg value="-XDignore.symbol.file=true"/>
1280        <compilerarg value="-Xlint:all"/>
1281 +      <compilerarg value="-Werror"/>
1282        <compilerarg value="-Xdoclint:all/protected"/>
1008
1283      </javac>
1284    </target>
1285  
1286 <
1013 <  <target name="jsr166ejar"
1014 <          depends="jsr166ecompile"
1015 <          description="Builds library jar from compiled sources">
1016 <
1286 >  <target name="jsr166ejar" depends="jsr166ecompile">
1287      <jar destfile="${jsr166e.jar}" index="true">
1288        <fileset dir="${build.jsr166e.classes.dir}"/>
1289 +      <manifest>
1290 +        <attribute name="Built-By" value="${user.name}"/>
1291 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1292 +      </manifest>
1293      </jar>
1020
1294    </target>
1295  
1296 <
1024 <  <target name="jsr166edocs"
1025 <          description="Builds javadocs to build dir">
1026 <
1296 >  <target name="jsr166edocs">
1297      <delete dir="${jsr166edocs.dir}"/>
1298      <mkdir dir="${jsr166edocs.dir}"/>
1299  
# Line 1031 | Line 1301
1301               packagenames="jsr166e.*"
1302               link="${java.api.url}"
1303               access="${build.javadoc.access}"
1304 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1304 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1305               source="${build.jsr166e.java.version}"
1306 <             executable="${javadoc7}">
1306 >             executable="${javadoc7}"
1307 >             failonerror = "true">
1308        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1309        <arg value="-XDignore.symbol.file=true"/>
1039
1310      </javadoc>
1311    </target>
1312  
1313 <
1044 <  <target name="jsr166e-test-tck-one-java-version"
1045 <          depends="jsr166ejar">
1046 <
1313 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1314      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1048
1315      <run-tck-tests
1316        tck.src.dir="${test.src.dir}/tck-jsr166e"
1317        target="${build.jsr166e.java.version}"
# Line 1053 | Line 1319
1319        classes="${jsr166e.jar}"/>
1320    </target>
1321  
1322 <  <target name="jsr166e-test-tck"
1057 <          description="Runs tck tests for jsr166e for multiple java versions">
1322 >  <target name="jsr166e-tck">
1323  
1324   <!--     <antcall target="clean"/> -->
1325 < <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1325 > <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1326   <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1327   <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1328   <!--     </antcall> -->
1329  
1330      <antcall target="clean"/>
1331 <    <antcall target="jsr166e-test-tck-one-java-version">
1331 >    <antcall target="jsr166e-tck-one-java-version">
1332        <param name="build.jsr166e.java.version" value="7"/>
1333        <param name="build.jsr166e.javac" value="${javac7}"/>
1334      </antcall>
1335  
1336      <antcall target="clean"/>
1337 <    <antcall target="jsr166e-test-tck-one-java-version">
1337 >    <antcall target="jsr166e-tck-one-java-version">
1338        <param name="build.jsr166e.java.version" value="6"/>
1339        <param name="build.jsr166e.javac" value="${javac6}"/>
1340      </antcall>
1341    </target>
1342  
1343 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1344  
1345 <  <target name="jsr166e-test"
1080 <          depends="jsr166e-test-tck"
1081 <          description="Runs all tests for jsr166e">
1082 <  </target>
1083 <
1084 <  <target name="jsr166edist"
1085 <          depends="jsr166edist-jar, jsr166edist-docs"
1086 <          description="Puts all distributable products in single hierarchy"/>
1345 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1346  
1347 <
1089 <  <target name="jsr166eclean"
1090 <          description="Removes all jsr166e build products">
1347 >  <target name="jsr166eclean">
1348      <delete dir="${build.jsr166e.dir}"/>
1349    </target>
1350  
1094
1351    <target name="jsr166edist-jar"
1352            depends="jsr166eclean, jsr166ejar">
1353      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1354    </target>
1355  
1356 <  <target name="jsr166edist-docs"
1101 <          depends="jsr166eclean, jsr166edocs">
1356 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1357      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1358    </target>
1359  
# Line 1107 | Line 1362
1362  
1363    <target name="lint">
1364      <antcall target="dists">
1365 +      <param name="build.javadoc.access" value="public"/>
1366 +    </antcall>
1367 +  </target>
1368 +
1369 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1370 +  <target name="lint-private">
1371 +    <antcall target="dist">
1372        <param name="build.javadoc.access" value="private"/>
1373      </antcall>
1374    </target>
1375  
1376  
1377 + <!-- ==============================================================
1378 +  Experimental errorprone support - http://errorprone.info
1379 + =================================================================== -->
1380 +  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.0.21.jar"/>
1381 +  <target name="errorprone"
1382 +          depends="clean, configure-compiler"
1383 +          description="Run errorprone over jsr166 source code (experimental)">
1384 +
1385 +    <local name="destdir"/>
1386 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1387 +    <mkdir dir="${destdir}"/>
1388 +
1389 +    <javac srcdir="${src.dir}"
1390 +           destdir="${destdir}"
1391 +           debug="${build.debug}"
1392 +           debuglevel="${build.debuglevel}"
1393 +           deprecation="${build.deprecation}"
1394 +           classpath=""
1395 +           includeAntRuntime="false"
1396 +           includeJavaRuntime="false"
1397 +           encoding="ASCII"
1398 +           executable="${build.main.javac}"
1399 +           fork="true">
1400 +
1401 +      <include name="**/*.java"/>
1402 +      <compilerarg line="-processorpath ${errorprone.jar}"/>
1403 +      <compilerarg value="-Xplugin:ErrorProne
1404 +                          -Xep:IdentityBinaryExpression:WARN
1405 +                          -Xep:MissingOverride:OFF
1406 +                          -Xep:MixedArrayDimensions:WARN
1407 +                          -Xep:RemoveUnusedImports:ERROR
1408 +                          -Xep:ClassName:ERROR
1409 +                          -Xep:MultipleTopLevelClasses:ERROR
1410 +                          -Xep:EmptyIf:ERROR
1411 +                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1412 +                          -Xep:RedundantThrows:ERROR
1413 +                          -Xep:MethodCanBeStatic:WARN"/>
1414 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1415 +      <compilerarg value="-Xprefer:source"/>
1416 +      <compilerarg value="-XDignore.symbol.file=true"/>
1417 +      <compilerarg value="-Xlint:all"/>
1418 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1419 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1420 +      <compilerarg line="${build.args}"/>
1421 +    </javac>
1422 +
1423 +    <jar destfile="${product.jar}">
1424 +      <fileset dir="${destdir}"/>
1425 +    </jar>
1426 +
1427 +    <run-tck-tests
1428 +      target="${build.main.java.version}"
1429 +      workdir="${build.dir}"
1430 +      classes="${product.jar}">
1431 +      <javac-elements>
1432 +        <compilerarg line="-processorpath ${errorprone.jar}"/>
1433 +        <compilerarg value="-Xplugin:ErrorProne
1434 +                            -Xep:IdentityBinaryExpression:WARN
1435 +                            -Xep:BoxedPrimitiveConstructor:OFF
1436 +                            -Xep:HashtableContains:OFF
1437 +                            -Xep:ModifyingCollectionWithItself:OFF
1438 +                            -Xep:MissingOverride:OFF
1439 +                            -Xep:MixedArrayDimensions:WARN
1440 +                            -Xep:RemoveUnusedImports:ERROR
1441 +                            -Xep:ClassName:ERROR
1442 +                            -Xep:MultipleTopLevelClasses:ERROR
1443 +                            -Xep:EmptyIf:ERROR
1444 +                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1445 +                            -Xep:RedundantThrows:ERROR
1446 +                            -Xep:MethodCanBeStatic:WARN"/>
1447 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1448 +      </javac-elements>
1449 +    </run-tck-tests>
1450 +  </target>
1451 +
1452 +
1453 + <!-- ==============================================================
1454 +  Running guava tests against jsr166 code
1455 + =================================================================== -->
1456 +
1457 + <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1458 + <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1459 + <!-- <property name="guava.version" value="21.0"/> -->
1460 +
1461 + <!-- HOWTO debug print a path id -->
1462 + <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1463 + <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1464 +
1465 + <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1466 + <!--   organisation="com.google.guava" module="guava-tests"/> -->
1467 + <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1468 + <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1469 + <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1470 + <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1471 +
1472 + <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1473 + <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1474 + <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1475 + <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1476 +
1477 + <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1478 + <!--   type="*" inline="true" conf="*(private),*(public)" -->
1479 + <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1480 + <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1481 +
1482 + <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1483 + <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1484 + <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1485 +
1486 +  <target name="init-ivy">
1487 +    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1488 +         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1489 +    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1490 +             classpath="${build.dir}/ivy.jar"/>
1491 +  </target>
1492 +
1493 +  <target name="guava-tests" depends="jar, init-ivy"
1494 +          description="Guava tests run against jsr166 collections">
1495 +    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1496 +    <mkdir dir="${guava.dir}"/>
1497 +    <ivy:retrieve pathid="guava.testlib.classpath"
1498 +      type="jar,bundle" inline="true" conf="default,master"
1499 +      pattern="${guava.dir}/[artifact].[ext]"
1500 +      organisation="com.google.guava" module="guava-testlib"/>
1501 +    <property name="guava.version" value="21.0"/>
1502 +    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1503 +         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1504 +    <junit printsummary="true" showoutput="true" haltonfailure="true"
1505 +           jvm="${build.main.java}" fork="true">
1506 +      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1507 +      <formatter type="brief"/>
1508 +      <classpath>
1509 +        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1510 +        <path refid="guava.testlib.classpath"/>
1511 +      </classpath>
1512 +
1513 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1514 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1515 +    </junit>
1516 +  </target>
1517 +
1518   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines