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.166 by jsr166, Mon Aug 10 06:32:23 2015 UTC vs.
Revision 1.267 by jsr166, Tue Feb 27 21:18:06 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines