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.223 by jsr166, Thu Nov 24 01:53:50 2016 UTC vs.
Revision 1.303 by jsr166, Tue Sep 17 16:20:44 2019 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless">
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 17 | 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:
20  $HOME/jdk/jdk6
21  $HOME/jdk/jdk7
22    $HOME/jdk/jdk8
23 <  $HOME/jdk/jdk9
23 >  $HOME/jdk/jdk11
24 >  $HOME/jdk/jdk12
25 >  $HOME/jdk/jdk13
26 >  $HOME/jdk/jdk14
27    where each of the above is a JDK or a symlink to same, and
25  $HOME/jdk/src/jdk6
26  $HOME/jdk/src/jdk7
28    $HOME/jdk/src/jdk8
29 <  $HOME/jdk/src/jdk9
29 >  $HOME/jdk/src/jdk11
30 >  $HOME/jdk/src/jdk12
31 >  $HOME/jdk/src/jdk13
32 >  $HOME/jdk/src/jdk14
33    where each of the above is a complete JDK source tree
34    (e.g. mercurial forest) or a symlink to same.
35  
36    Alternatively, define ant variables thus:
37    ant -Djdk$N.home=... -Djdk$N.src.home=...
38 <  for $N in 6 7 8 9 ...
38 >  for $N in 8 .. 14 ...
39  
40 <  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
41 <  target is currently broken.
40 >  As of 2016-03, the sources in src/main are for jdk9+ only.
41 >  As of 2019-08, the sources in src/main are for jdk11+ only.
42   ------------------------------------------------------------------------------
43    </description>
44  
# Line 52 | Line 56
56  
57  
58    <!-- Compilation options -->
55  <property name="build.sourcelevel"    value="6"/>
59    <property name="build.debug"          value="true"/>
60    <property name="build.debuglevel"     value="source,lines,vars"/>
61    <property name="build.deprecation"    value="false"/>
# Line 63 | Line 66
66    <property name="build.classes.dir"           location="${build.dir}/classes"/>
67    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
68    <property name="build.loops.dir"             location="${build.dir}/loops"/>
66  <property name="build.reports.dir"           location="${build.dir}/reports"/>
69  
70    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
71    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
# Line 104 | Line 106
106      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
107        unless:set="have.java.base"/>
108      <local name="modules"/>
109 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
109 >    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
110      <local name="boot.jar.dir"/>
111      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
112      <path id="bootclasspath@{v}" unless:set="modules">
# Line 130 | Line 132
132      </sequential>
133    </macrodef>
134  
133  <defjdklocations v="6"/>
134  <defjdklocations v="7"/>
135    <defjdklocations v="8"/>
136 <  <defjdklocations v="9"/>
136 >  <defjdklocations v="11"/>
137 >  <defjdklocations v="12"/>
138 >  <defjdklocations v="13"/>
139 >  <defjdklocations v="14"/>
140  
141    <!-- Source locations -->
142    <property name="src.dir"              location="${basedir}/src/main"/>
143    <property name="test.src.dir"         location="${basedir}/src/test"/>
144    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
145    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
143  <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="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
147 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
148 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
149 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
150 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
151 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
152    <property name="lib.dir"              location="${basedir}/lib"/>
153    <property name="dist.dir"             location="${basedir}/dist"/>
154    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 182 | Line 187
187    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
188  
189    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
190 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
191 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
192 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
193 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
194 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
195 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
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}"/>
190 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
191 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
192 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
193 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
194 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
195 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
196 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
197 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
198 >  <!-- The location of jdk early access docs (RIP) -->
199 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
200 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
201 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
202 >  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
203 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
204 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
205  
206    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
196  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
197  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
198  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
207    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
208 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
208 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
209 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
210 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
211 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
212    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
213  
214    <!-- Define the "jtreg" task -->
# Line 230 | Line 241
241  
242      <local name="modules"/>
243      <condition property="modules">
244 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
244 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
245 >    </condition>
246 >
247 >    <local name="use-doclint"/>
248 >    <condition property="use-doclint">
249 >      <not> <equals arg1="@{target}" arg2="7"/> </not>
250      </condition>
251  
252      <mkdir dir="@{workdir}/tck-classes"/>
# Line 252 | Line 268
268        <include name="*.java"/>
269        <compilerarg value="-XDignore.symbol.file=true"/>
270        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
271 +      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
272        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
273 <      <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
273 >      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
274        <compilerarg line="${build.args}"/>
275        <javac-elements/>
276  
# Line 264 | Line 281
281            jvm="${java@{target}}"
282            fork="true">
283          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
284 <        <jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
284 >        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
285 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
286 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
287 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
288 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
289 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
290          <jvmarg line="@{jvmflags}"/>
291          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
292          <jvmarg line="${vmoptions}" if:set="vmoptions"/>
# Line 286 | Line 308
308    </macrodef>
309  
310    <!-- Define jtreg test sets for different jdk versions -->
311 <  <fileset dir="${jtreg9.src.dir}">
312 <    <patternset id="jdk9.jtreg.tests">
313 <      <include name="**/*.java"/>
314 <    </patternset>
315 <  </fileset>
316 <
317 <  <fileset dir="${jtreg8.src.dir}">
318 <    <patternset id="jdk8.jtreg.tests">
319 <      <include name="**/*.java"/>
320 <      <exclude name="**/SpliteratorCharacteristics.java"/>
321 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
322 <      <exclude name="**/GCDuringIteration.java"/>
323 <    </patternset>
302 <  </fileset>
311 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
312 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
313 >  <property name="jtreg.test.pattern" value="**/*.java"/>
314 >  <macrodef name="defjtregtests">
315 >    <attribute name="v"/>
316 >    <sequential>
317 >      <fileset dir="${jtreg@{v}.src.dir}">
318 >        <patternset id="jdk@{v}.jtreg.tests">
319 >          <include name="${jtreg.test.pattern}"/>
320 >        </patternset>
321 >      </fileset>
322 >    </sequential>
323 >  </macrodef>
324  
325 <  <fileset dir="${jtreg7.src.dir}">
326 <    <patternset id="jdk7.jtreg.tests">
327 <      <include name="**/*.java"/>
328 <    </patternset>
329 <  </fileset>
325 >  <defjtregtests v="14"/>
326 >  <defjtregtests v="13"/>
327 >  <defjtregtests v="12"/>
328 >  <defjtregtests v="11"/>
329 >  <defjtregtests v="8"/>
330  
331    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
332    <property name="jtreg.flags" value=""/>
333  
334    <macrodef name="run-jtreg-tests">
335 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
315 <    <attribute name="source" default="7"/>
335 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
336      <attribute name="target"/>
337      <attribute name="workdir"/>
338      <attribute name="classes"/>
339 +    <attribute name="verbose" default="${jtreg.verbose}"/>
340      <attribute name="jtregflags" default=""/>
341 +    <element name="jtreg-elements" optional="true"/>
342  
343      <sequential>
344  
# Line 325 | Line 347
347  
348      <local name="modules"/>
349      <condition property="modules">
350 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
350 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
351      </condition>
352  
353      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 334 | Line 356
356             workDir="@{workdir}/JTwork">
357        <patternset refid="jdk@{target}.jtreg.tests"/>
358        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
359 <      <arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
360 <      <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
359 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
360 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
361        <arg value="-agentvm"/>
362        <arg value="-noreport"/>
363 <      <arg value="-verbose:${jtreg.verbose}"/>
363 >      <arg value="-verbose:@{verbose}"/>
364        <arg value="-vmoptions:-esa -ea"/>
365        <arg value="-automatic"/>
366        <arg value="-k:!ignore"/>
367        <arg line="@{jtregflags}"/>
368        <arg line="${jtreg.flags}"/>
369 +      <jtreg-elements/>
370      </jtreg>
371      </sequential>
372    </macrodef>
# Line 354 | Line 377
377    </path>
378  
379    <!-- Support @jls tag, used in jdk8+ javadoc -->
380 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
381    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
382    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
383  
384    <!-- Main targets -->
385  
386 <  <property name="build.main.java.version" value="9"/>
387 <  <property name="build.main.javac" value="${javac9}"/>
386 >  <!-- Default values: may seem strange ... -->
387 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
388 >  <!-- But at build time, target jdk9, for maximal binary portability -->
389 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
390 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
391 >    o override-methods=summary
392 >    o {@systemProperty ...}
393 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
394 >    o 8202628: javadoc generates bad links in TestModules.java
395 >    -->
396 >  <property name="java.runtime.target" value="11"/>
397 >  <property name="build.main.java" value="${java11}"/>
398 >  <property name="build.main.javac" value="${javac11}"/>
399 >  <property name="build.main.javadoc" value="${javadoc12}"/>
400 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
401  
402    <target name="dists"
403 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
403 >          depends="dist, 4jdk8dist"
404            description="Builds all public jars and docs"/>
405 +          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
406  
407    <target name="compile"
408            depends="configure-compiler"
409            description="Compiles src/main sources to build dir">
410  
373    <local name="modules"/>
374    <condition property="modules">
375      <and>
376        <available file="${jdk9.home}/jmods" type="dir"/>
377        <equals arg1="9" arg2="${build.main.java.version}"/>
378      </and>
379    </condition>
380
411      <local name="destdir"/>
412 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
383 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
412 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
413  
414      <mkdir dir="${destdir}"/>
415  
# Line 397 | Line 426
426             fork="true">
427  
428        <include name="**/*.java"/>
429 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
429 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
430        <compilerarg value="-Xprefer:source"/>
431        <compilerarg value="-XDignore.symbol.file=true"/>
432 <      <compilerarg value="-Xlint:all"/>
432 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
433 >      <compilerarg value="-Xlint:all,-removal"/>
434 >      <compilerarg line="--doclint-format html5"/>
435 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
436 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
437        <compilerarg value="-Werror"/>
405      <compilerarg value="-Xdoclint:all/protected"/>
438        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
439        <compilerarg line="${build.args}"/>
440  
# Line 434 | Line 466
466      <!-- the packagenames="none" hack below prevents scanning the -->
467      <!-- sourcepath for packages -->
468  
469 < <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
470 < <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
469 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
470 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
471 > <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
472 > <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
473 > <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
474      <javadoc destdir="${docs.dir}"
475               packagenames="none"
476 <             link="${java9.api.url}"
476 >             link="${java.api.url}"
477               overview="${src.dir}/intro.html"
478               access="${build.javadoc.access}"
479               sourcepath="${src.dir}"
480               classpath=""
481 <             executable="${javadoc9}">
481 >             source="${build.main.javadoc.source}"
482 >             executable="${build.main.javadoc}">
483 > <!-- TODO: JDK-8214571 failonerror = "true" -->
484        <fileset dir="${src.dir}" defaultexcludes="yes">
485          <include name="**/*.java"/>
486        </fileset>
487 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
487 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
488        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
489        <arg value="-XDignore.symbol.file=true"/>
490 <      <arg value="-Xmodule:java.base"/>
491 <      <arg value="-tag"/>
492 <      <arg value="${javadoc.jls.option}"/>
493 < <!-- @apiNote currently unused -->
494 < <!--       <arg value="-tag"/> -->
495 < <!--       <arg value="apiNote:a:API Note:"/> -->
496 <      <arg value="-tag"/>
497 <      <arg value="implSpec:a:Implementation Requirements:"/>
498 <      <arg value="-tag"/>
499 <      <arg value="implNote:a:Implementation Note:"/>
490 >      <arg value="-html5"/>
491 >      <arg value="--patch-module=java.base=${src.dir}"/>
492 > <!-- old school frames via docs/index.html?overview-summary.html -->
493 > <!-- TODO: - -frames no longer a supported option in jdk13+ -->
494 >      <arg value="--frames"/>
495 >      <arg value="--override-methods=summary"/>
496 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
497 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
498 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
499 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
500   <!-- tags added in jdk9: currently unused -->
501 < <!--       <arg value="-tag"/> -->
502 < <!--       <arg value="revised:X"/> -->
466 < <!--       <arg value="-tag"/> -->
467 < <!--       <arg value="spec:X"/> -->
501 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
502 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
503      </javadoc>
504    </target>
505  
# Line 474 | Line 509
509            description="Puts all distributable products in single hierarchy"/>
510  
511  
477  <target name="release"
478          depends="dist"
479          description="Puts entire CVS tree, plus distribution productions, in a jar">
480
481    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
482
483    <jar basedir="${basedir}" destfile="${release.jar}">
484      <!-- <exclude name="build/**"/> -->
485      <exclude name="${release.jar}"/>
486      <exclude name="user.properties"/>
487      <exclude name="etc/notes/**"/>
488      <exclude name="src/emulation/**"/>
489      <exclude name="**/SyntaxTest.java"/>
490      <exclude name="**/SuperfluousAbstract.java"/>
491      <manifest>
492        <attribute name="Built-By" value="${user.name}"/>
493        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
494      </manifest>
495    </jar>
496  </target>
497
498
512    <target name="clean"
513            description="Removes all build products">
501
514      <delete dir="${build.dir}"/>
503
515    </target>
516  
517  
518    <target name="dist-clean"
519            description="Removes all build and distribution products">
509
520      <delete dir="${build.dir}"/>
521      <delete dir="${dist.dir}"/>
512
522    </target>
523  
524  
# Line 528 | Line 537
537            description="Runs tck tests for src/main directly">
538  
539      <run-tck-tests
540 <      target="${build.main.java.version}"
540 >      target="${java.runtime.target}"
541        workdir="${build.dir}"
542 <      classes="${product.jar}"/>
542 >      classes="${product.jar}">
543 >      <javac-elements>
544 >        <compilerarg value="-Werror"/>
545 >      </javac-elements>
546 >    </run-tck-tests>
547    </target>
548  
549    <target name="tck-parallelism-1"
# Line 558 | Line 571
571            depends="jar"
572            description="Runs jtreg tests for src/main using the jtreg ant task">
573      <run-jtreg-tests
574 <       target="${build.main.java.version}"
574 >       target="${java.runtime.target}"
575         workdir="${build.dir}"
576         classes="${product.jar}"/>
577    </target>
578  
579    <target name="test"
580            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
581 <          description="Runs tck and jtreg tests for src/main">
569 <  </target>
581 >          description="Runs tck and jtreg tests for src/main"/>
582  
583 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
583 >  <target name="test-version-permutations"
584 >          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
585 >  </target>
586  
587 < <!--     <antcall target="jtreg"> -->
588 < <!--       <param name="build.main.java.version" value="8"/> -->
589 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
587 >  <!-- jdk9 is unsupported as of 2019-08 -->
588 > <!--   <target name="test9"> -->
589 > <!--     <antcall target="clean"/> -->
590 > <!--     <antcall> -->
591 > <!--       <param name="java.runtime.target" value="9"/> -->
592 > <!--       <param name="build.main.javac" value="${javac9}"/> -->
593 > <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
594 > <!--       <param name="build.main.javadoc.source" value="9"/> -->
595 > <!--       <target name="test"/> -->
596 > <!--       <target name="docs"/> -->
597   <!--     </antcall> -->
577
598   <!--   </target> -->
599  
600 < <!--   <target name="test89" -->
601 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
582 <
600 >  <!-- jdk10 is unsupported as of 2019-08 -->
601 > <!--   <target name="test10"> -->
602   <!--     <antcall target="clean"/> -->
603 < <!--     <antcall target="test"> -->
604 < <!--       <param name="build.main.java.version" value="8"/> -->
605 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
603 > <!--     <antcall> -->
604 > <!--       <param name="java.runtime.target" value="10"/> -->
605 > <!--       <param name="build.main.javac" value="${javac10}"/> -->
606 > <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
607 > <!--       <param name="build.main.javadoc.source" value="10"/> -->
608 > <!--       <target name="test"/> -->
609 > <!--       <target name="docs"/> -->
610   <!--     </antcall> -->
611 + <!--   </target> -->
612  
613 < <!--     <antcall target="clean"/> -->
614 < <!--     <antcall target="test"> -->
615 < <!--       <param name="build.main.java.version" value="9"/> -->
616 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
617 < <!--     </antcall> -->
613 >  <target name="test11">
614 >    <antcall target="clean"/>
615 >    <antcall>
616 >      <param name="java.runtime.target" value="11"/>
617 >      <param name="build.main.javac" value="${javac11}"/>
618 >      <param name="build.main.javadoc" value="${javadoc12}"/>
619 >      <param name="build.main.javadoc.source" value="11"/>
620 >      <target name="test"/>
621 >      <target name="docs"/>
622 >    </antcall>
623 >  </target>
624  
625 < <!--   </target> -->
625 >  <target name="test12">
626 >    <antcall target="clean"/>
627 >    <antcall>
628 >      <param name="java.runtime.target" value="12"/>
629 >      <param name="build.main.javac" value="${javac12}"/>
630 >      <param name="build.main.javadoc" value="${javadoc12}"/>
631 >      <param name="build.main.javadoc.source" value="12"/>
632 >      <target name="test"/>
633 >      <target name="docs"/>
634 >    </antcall>
635 >  </target>
636 >
637 >  <target name="test13">
638 >    <antcall target="clean"/>
639 >    <antcall>
640 >      <param name="java.runtime.target" value="13"/>
641 >      <param name="build.main.javac" value="${javac13}"/>
642 >      <param name="build.main.javadoc" value="${javadoc13}"/>
643 >      <param name="build.main.javadoc.source" value="13"/>
644 >      <target name="test"/>
645 >      <target name="docs"/>
646 >    </antcall>
647 >  </target>
648 >
649 >  <target name="test14">
650 >    <antcall target="clean"/>
651 >    <antcall>
652 >      <param name="java.runtime.target" value="14"/>
653 >      <param name="build.main.javac" value="${javac14}"/>
654 >      <param name="build.main.javadoc" value="${javadoc14}"/>
655 >      <param name="build.main.javadoc.source" value="14"/>
656 >      <target name="test"/>
657 >      <target name="docs"/>
658 >    </antcall>
659 >  </target>
660 >
661 >  <target name="test11-12">
662 >    <antcall target="clean"/>
663 >    <antcall>
664 >      <param name="java.runtime.target" value="12"/>
665 >      <param name="build.main.javac" value="${javac11}"/>
666 >      <param name="build.main.javadoc" value="${javadoc12}"/>
667 >      <param name="build.main.javadoc.source" value="11"/>
668 >      <target name="test"/>
669 >      <target name="docs"/>
670 >    </antcall>
671 >  </target>
672 >
673 >  <target name="test11-13">
674 >    <antcall target="clean"/>
675 >    <antcall>
676 >      <param name="java.runtime.target" value="13"/>
677 >      <param name="build.main.javac" value="${javac11}"/>
678 >      <param name="build.main.javadoc" value="${javadoc13}"/>
679 >      <param name="build.main.javadoc.source" value="11"/>
680 >      <target name="test"/>
681 >      <target name="docs"/>
682 >    </antcall>
683 >  </target>
684  
685 +  <target name="test11-14">
686 +    <antcall target="clean"/>
687 +    <antcall>
688 +      <param name="java.runtime.target" value="14"/>
689 +      <param name="build.main.javac" value="${javac11}"/>
690 +      <param name="build.main.javadoc" value="${javadoc14}"/>
691 +      <param name="build.main.javadoc.source" value="11"/>
692 +      <target name="test"/>
693 +      <target name="docs"/>
694 +    </antcall>
695 +  </target>
696  
697  
698    <target name="configure-compiler">
699      <fail message="ant version too old">
700 <      <condition>
602 <        <not> <antversion atleast="1.9.1"/> </not>
603 <      </condition>
700 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
701      </fail>
702  
703      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 618 | Line 715
715    </target>
716  
717  
621
622  <!-- Various demos and test programs -->
623
624
625  <!-- description="Benchmark from Doug Lea's AQS paper" -->
626  <target name="loops" depends="configure-compiler">
627
628    <mkdir dir="${build.loops.dir}"/>
629
630    <javac srcdir="${loops.src.dir}"
631          destdir="${build.loops.dir}"
632            debug="${build.debug}"
633       debuglevel="${build.debuglevel}"
634      deprecation="${build.deprecation}"
635           source="${build.sourcelevel}"
636           target="${build.sourcelevel}"
637         encoding="ASCII"
638             fork="true">
639
640      <compilerarg line="${build.args}"/>
641      <classpath refid="loops.classpath"/>
642      <compilerarg value="-XDignore.symbol.file=true"/>
643
644    </javac>
645
646    <java classname="ALoops" fork="true">
647      <classpath refid="loops.classpath"/>
648    </java>
649
650  </target>
651
652
718    <target name="compile-test-loops" depends="jar"
719 <          description="compile all the perf tests in src/test/loops">
719 >          description="Compiles all the perf tests in src/test/loops">
720  
721      <mkdir dir="${build.dir}/test/loops"/>
722  
# Line 663 | Line 728
728             includeAntRuntime="false"
729             includeJavaRuntime="false"
730             encoding="ASCII"
731 <           executable="${javac9}"
731 >           executable="${build.main.javac}"
732             fork="true">
733  
734        <include name="*.java"/>
# Line 671 | Line 736
736        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
737        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
738        <compilerarg line="${build.args}"/>
674
739      </javac>
676
740    </target>
741  
742  
# Line 699 | Line 762
762             encoding="ASCII"
763             executable="${javac8}"
764             fork="true">
702
765        <include name="**/*.java"/>
766        <compilerarg value="-Xprefer:source"/>
767        <compilerarg value="-XDignore.symbol.file=true"/>
768        <compilerarg value="-Xlint:all"/>
769        <compilerarg value="-Werror"/>
770        <compilerarg line="${build.args}"/>
709
771      </javac>
772    </target>
773  
# Line 730 | Line 791
791             encoding="ASCII"
792             executable="${javac8}"
793             fork="true">
733
794        <include name="**/*.java"/>
795        <compilerarg value="-Xprefer:source"/>
796        <compilerarg value="-XDignore.symbol.file=true"/>
797        <compilerarg value="-Xlint:all"/>
798 <      <compilerarg value="-Xdoclint:all/protected"/>
798 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
799        <compilerarg line="${build.args}"/>
740
800      </javac>
801    </target>
802  
# Line 753 | Line 812
812          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
813        </manifest>
814      </jar>
756
815    </target>
816  
817  
# Line 769 | Line 827
827          <!-- JDK9+ test classes -->
828          <exclude name="*9Test.java"/>
829          <exclude name="*10Test.java"/>
830 +        <compilerarg value="-Werror"/>
831        </javac-elements>
832      </run-tck-tests>
833    </target>
# Line 786 | Line 845
845  
846    <target name="4jdk8-test"
847            depends="4jdk8-tck, 4jdk8-jtreg"
848 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
790 <  </target>
848 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
849  
850  
851    <target name="4jdk8docs"
# Line 803 | Line 861
861               access="${build.javadoc.access}"
862               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
863               classpath=""
864 +             source="8"
865               executable="${javadoc8}"
866               failonerror = "true">
867        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 810 | Line 869
869        </fileset>
870        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
871        <arg value="-XDignore.symbol.file=true"/>
872 <      <arg value="-tag"/>
873 <      <arg value="${javadoc.jls.option}"/>
874 < <!-- @apiNote currently unused -->
875 < <!--       <arg value="-tag"/> -->
876 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
818 <      <arg value="-tag"/>
819 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
820 <      <arg value="-tag"/>
821 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
872 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
873 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
874 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
875 > <!-- @apiNote tag currently unused -->
876 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
877      </javadoc>
878    </target>
879  
# Line 830 | Line 885
885  
886    <target name="4jdk8clean"
887            description="Removes all 4jdk8 build products">
833
888      <delete dir="${build.4jdk8.dir}"/>
835
889    </target>
890  
891  
# Line 848 | Line 901
901    </target>
902  
903  
904 +  <!-- jsr166 4jdk7 (no longer maintained) -->
905  
906 <  <!-- jsr166 4jdk7 -->
853 <
854 <  <target name="4jdk7compile"
855 <          depends="configure-compiler"
856 <          description="Compiles src/jdk7 sources, targeting jdk7">
857 <
906 >  <target name="4jdk7compile" depends="configure-compiler">
907      <mkdir dir="${build.4jdk7.classes.dir}"/>
908  
909      <javac srcdir="${4jdk7src.dir}"
# Line 878 | Line 927
927        <compilerarg value="-Xlint:all"/>
928        <compilerarg value="-Werror"/>
929        <compilerarg line="${build.args}"/>
881
930      </javac>
931    </target>
932  
933 <  <target name="4jdk7doclint"
886 <          depends="configure-compiler"
887 <          description="Finds doclint warnings">
888 <
933 >  <target name="4jdk7doclint" depends="configure-compiler">
934      <mkdir dir="${build.4jdk7.classes.dir}"/>
935  
936      <javac srcdir="${4jdk7src.dir}"
# Line 909 | Line 954
954        <compilerarg value="-Xlint:all"/>
955        <compilerarg value="-Xdoclint:all/protected"/>
956        <compilerarg line="${build.args}"/>
912
957      </javac>
958    </target>
959  
960 <
917 <  <target name="4jdk7jar"
918 <          depends="4jdk7compile"
919 <          description="Builds library jar from compiled sources">
920 <
960 >  <target name="4jdk7jar" depends="4jdk7compile">
961      <jar destfile="${4jdk7product.jar}">
962        <fileset dir="${build.4jdk7.classes.dir}"/>
963        <manifest>
# Line 925 | Line 965
965          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
966        </manifest>
967      </jar>
928
968    </target>
969  
970 <
932 <  <target name="4jdk7-tck"
933 <          depends="4jdk7jar"
934 <          description="Runs tck tests for jsr166-4jdk7 directly">
935 <
970 >  <target name="4jdk7-tck" depends="4jdk7jar">
971      <run-tck-tests
972        target="7"
973        workdir="${build.4jdk7.dir}"
# Line 950 | Line 985
985          <exclude name="SplittableRandomTest.java"/>
986          <exclude name="StampedLockTest.java"/>
987          <exclude name="SubmissionPublisherTest.java"/>
988 +        <compilerarg value="-Werror"/>
989        </javac-elements>
990      </run-tck-tests>
991    </target>
992  
957
993    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
994 <  <target name="4jdk7-tck-junit"
960 <          depends="4jdk7compile">
994 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
995  
996      <junit printsummary="true"
997             showoutput="true"
# Line 979 | Line 1013
1013  
1014        <test name="${jsr166.tckTestClass}" haltonfailure="no">
1015        </test>
982
1016      </junit>
1017    </target>
1018  
1019 <  <target name="4jdk7-jtreg"
987 <          depends="4jdk7jar"
988 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
1019 >  <target name="4jdk7-jtreg" depends="4jdk7jar">
1020      <run-jtreg-tests
1021         target="7"
1022         workdir="${build.4jdk7.dir}"
1023         classes="${4jdk7product.jar}"/>
1024    </target>
1025  
1026 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1027  
1028 <  <target name="4jdk7-test"
997 <          depends="4jdk7-tck, 4jdk7-jtreg"
998 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
999 <  </target>
1000 <
1001 <
1002 <  <target name="4jdk7docs"
1003 <          description="Builds javadocs for src/jdk7 to dist dir">
1004 <
1028 >  <target name="4jdk7docs">
1029      <delete dir="${4jdk7docs.dir}"/>
1030      <mkdir dir="${4jdk7docs.dir}"/>
1031  
# Line 1022 | Line 1046
1046      </javadoc>
1047    </target>
1048  
1049 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1050  
1051 <  <target name="4jdk7dist"
1027 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1028 <          description="Puts all distributable products in single hierarchy"/>
1029 <
1030 <
1031 <  <target name="4jdk7clean"
1032 <          description="Removes all 4jdk7 build products">
1033 <
1051 >  <target name="4jdk7clean">
1052      <delete dir="${build.4jdk7.dir}"/>
1035
1053    </target>
1054  
1055 <
1039 <  <target name="4jdk7dist-jar"
1040 <          depends="4jdk7clean, 4jdk7jar">
1055 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1056      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1057    </target>
1058  
1059 <
1045 <  <target name="4jdk7dist-docs"
1046 <          depends="4jdk7clean, 4jdk7docs">
1059 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1060      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1061    </target>
1062  
1063  
1064 <  <!-- jsr166x -->
1052 <
1053 <  <target name="jsr166xcompile"
1054 <          depends="configure-compiler"
1055 <          description="Compiles jsr166x sources to build dir">
1064 >  <!-- jsr166x (no longer maintained) -->
1065  
1066 +  <target name="jsr166xcompile" depends="configure-compiler">
1067      <mkdir dir="${build.jsr166x.classes.dir}"/>
1068  
1069      <javac srcdir="${topsrc.dir}"
# Line 1070 | Line 1080
1080             encoding="ASCII"
1081             executable="${javac7}"
1082             fork="true">
1073
1083        <include name="jsr166x/**/*.java"/>
1084        <compilerarg value="-XDignore.symbol.file=true"/>
1085        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1086        <compilerarg value="-Werror"/>
1087        <compilerarg line="${build.args}"/>
1079
1088      </javac>
1089    </target>
1090  
1091 <
1084 <  <target name="jsr166xjar"
1085 <          depends="jsr166xcompile"
1086 <          description="Builds library jar from compiled sources">
1087 <
1091 >  <target name="jsr166xjar" depends="jsr166xcompile">
1092      <jar destfile="${jsr166x.jar}">
1093        <fileset dir="${build.jsr166x.classes.dir}"/>
1094        <manifest>
# Line 1092 | Line 1096
1096          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1097        </manifest>
1098      </jar>
1095
1099    </target>
1100  
1101 <
1099 <  <target name="jsr166xdocs"
1100 <          description="Builds javadocs to dist dir">
1101 <
1101 >  <target name="jsr166xdocs">
1102      <delete dir="${jsr166xdocs.dir}"/>
1103      <mkdir dir="${jsr166xdocs.dir}"/>
1104  
# Line 1113 | Line 1113
1113               failonerror = "true">
1114        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1115        <arg value="-XDignore.symbol.file=true"/>
1116
1116      </javadoc>
1117    </target>
1118  
1119 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1120  
1121 <  <target name="jsr166xdist"
1122 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1123 <          description="Puts all distributable products in single hierarchy"/>
1124 <
1125 <
1126 <  <target name="jsr166xclean"
1127 <          description="Removes all jsr166x build products">
1128 <
1121 >  <target name="jsr166xclean">
1122      <delete dir="${build.jsr166x.dir}"/>
1130
1123    </target>
1124  
1125 <
1134 <  <target name="jsr166xdist-jar"
1135 <          depends="jsr166xclean, jsr166xjar">
1125 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1126      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1127    </target>
1128  
1129 <  <target name="jsr166xdist-docs"
1140 <          depends="jsr166xclean, jsr166xdocs">
1129 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1130      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1131    </target>
1132  
1144  <!-- jsr166y -->
1145
1133  
1134 <  <target name="jsr166ycompile"
1148 <          depends="configure-compiler"
1149 <          description="Compiles jsr166y sources">
1134 >  <!-- jsr166y (no longer maintained) -->
1135  
1136 +  <target name="jsr166ycompile" depends="configure-compiler">
1137      <mkdir dir="${build.jsr166y.classes.dir}"/>
1138  
1139      <javac srcdir="${topsrc.dir}"
# Line 1170 | Line 1156
1156        <compilerarg value="-Xlint:all"/>
1157        <compilerarg value="-Werror"/>
1158        <compilerarg line="${build.args}"/>
1173
1159      </javac>
1160    </target>
1161  
1162 <
1178 <  <target name="jsr166yjar"
1179 <          depends="jsr166ycompile"
1180 <          description="Builds library jar from compiled sources">
1181 <
1162 >  <target name="jsr166yjar" depends="jsr166ycompile">
1163      <jar destfile="${jsr166y.jar}" index="true">
1164        <fileset dir="${build.jsr166y.classes.dir}"/>
1165        <manifest>
# Line 1186 | Line 1167
1167          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1168        </manifest>
1169      </jar>
1189
1170    </target>
1171  
1172 <
1193 <  <target name="jsr166ydocs"
1194 <          description="Builds javadocs to dist dir">
1195 <
1172 >  <target name="jsr166ydocs">
1173      <delete dir="${jsr166ydocs.dir}"/>
1174      <mkdir dir="${jsr166ydocs.dir}"/>
1175  
# Line 1207 | Line 1184
1184               failonerror = "true">
1185        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1186        <arg value="-XDignore.symbol.file=true"/>
1210
1187      </javadoc>
1188    </target>
1189  
1190 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1191  
1192 <  <target name="jsr166ydist"
1216 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1217 <          description="Puts all distributable products in single hierarchy"/>
1218 <
1219 <
1220 <  <target name="jsr166yclean"
1221 <          description="Removes all jsr166y build products">
1222 <
1192 >  <target name="jsr166yclean">
1193      <delete dir="${build.jsr166y.dir}"/>
1224
1194    </target>
1195  
1196 <
1228 <  <target name="jsr166ydist-jar"
1229 <          depends="jsr166yclean, jsr166yjar">
1196 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1197      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1198    </target>
1199  
1200 <  <target name="jsr166ydist-docs"
1234 <          depends="jsr166yclean, jsr166ydocs">
1200 >  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1201      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1202    </target>
1203  
1204  
1205 <  <!-- extra166y -->
1240 <
1241 <
1242 <  <target name="extra166ycompile"
1243 <          depends="configure-compiler, jsr166yjar"
1244 <          description="Compiles extra166y sources">
1205 >  <!-- extra166y (no longer maintained) -->
1206  
1207 +  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1208      <mkdir dir="${build.extra166y.classes.dir}"/>
1209  
1210      <javac srcdir="${topsrc.dir}"
# Line 1265 | Line 1227
1227        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1228        <compilerarg value="-Werror"/>
1229        <compilerarg line="${build.args}"/>
1268
1230      </javac>
1231    </target>
1232  
1233 <
1273 <  <target name="extra166yjar"
1274 <          depends="extra166ycompile"
1275 <          description="Builds library jar from compiled sources">
1276 <
1233 >  <target name="extra166yjar" depends="extra166ycompile">
1234      <jar destfile="${extra166y.jar}" index="true">
1235        <fileset dir="${build.extra166y.classes.dir}"/>
1236        <manifest>
# Line 1281 | Line 1238
1238          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1239        </manifest>
1240      </jar>
1284
1241    </target>
1242  
1243 <
1288 <  <target name="extra166ydocs"
1289 <          description="Builds javadocs to build dir">
1290 <
1243 >  <target name="extra166ydocs">
1244      <delete dir="${extra166ydocs.dir}"/>
1245      <mkdir dir="${extra166ydocs.dir}"/>
1246  
# Line 1301 | Line 1254
1254               executable="${javadoc7}">
1255        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1256        <arg value="-XDignore.symbol.file=true"/>
1304
1257      </javadoc>
1258    </target>
1259  
1260 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1261  
1262 <  <target name="extra166ydist"
1310 <          depends="extra166ydist-jar, extra166ydist-docs"
1311 <          description="Puts all distributable products in single hierarchy"/>
1312 <
1313 <
1314 <  <target name="extra166yclean"
1315 <          description="Removes all extra166y build products">
1316 <
1262 >  <target name="extra166yclean">
1263      <delete dir="${build.extra166y.dir}"/>
1318
1264    </target>
1265  
1266 <
1322 <  <target name="extra166ydist-jar"
1323 <          depends="extra166yclean, extra166yjar">
1266 >  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1267      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1268    </target>
1269  
1270 <  <target name="extra166ydist-docs"
1328 <          depends="extra166yclean, extra166ydocs">
1270 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1271      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1272    </target>
1273  
1274 <  <!-- jsr166e -->
1274 >
1275 >  <!-- jsr166e (no longer maintained) -->
1276  
1277    <property name="build.jsr166e.java.version" value="6"/>
1278    <property name="build.jsr166e.javac" value="${javac6}"/>
1279  
1280 <  <target name="jsr166ecompile"
1338 <          depends="configure-compiler"
1339 <          description="Compiles jsr166e sources">
1340 <
1280 >  <target name="jsr166ecompile" depends="configure-compiler">
1281      <mkdir dir="${build.jsr166e.classes.dir}"/>
1282  
1283      <javac srcdir="${topsrc.dir}"
# Line 1358 | Line 1298
1298        <compilerarg value="-Xlint:all"/>
1299        <compilerarg value="-Werror"/>
1300        <compilerarg line="${build.args}"/>
1361
1301      </javac>
1302    </target>
1303  
1365  <!-- jsr166e: find doclint errors -->
1304    <target name="jsr166edoclint">
1367
1305      <mkdir dir="${build.jsr166e.classes.dir}"/>
1306  
1307      <javac srcdir="${topsrc.dir}"
# Line 1386 | Line 1323
1323        <compilerarg value="-Xlint:all"/>
1324        <compilerarg value="-Werror"/>
1325        <compilerarg value="-Xdoclint:all/protected"/>
1389
1326      </javac>
1327    </target>
1328  
1329 <
1394 <  <target name="jsr166ejar"
1395 <          depends="jsr166ecompile"
1396 <          description="Builds library jar from compiled sources">
1397 <
1329 >  <target name="jsr166ejar" depends="jsr166ecompile">
1330      <jar destfile="${jsr166e.jar}" index="true">
1331        <fileset dir="${build.jsr166e.classes.dir}"/>
1332        <manifest>
# Line 1402 | Line 1334
1334          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1335        </manifest>
1336      </jar>
1405
1337    </target>
1338  
1339 <
1409 <  <target name="jsr166edocs"
1410 <          description="Builds javadocs to build dir">
1411 <
1339 >  <target name="jsr166edocs">
1340      <delete dir="${jsr166edocs.dir}"/>
1341      <mkdir dir="${jsr166edocs.dir}"/>
1342  
# Line 1422 | Line 1350
1350               failonerror = "true">
1351        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1352        <arg value="-XDignore.symbol.file=true"/>
1425
1353      </javadoc>
1354    </target>
1355  
1356 <
1430 <  <target name="jsr166e-tck-one-java-version"
1431 <          depends="jsr166ejar">
1432 <
1356 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1357      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1434
1358      <run-tck-tests
1359        tck.src.dir="${test.src.dir}/tck-jsr166e"
1360        target="${build.jsr166e.java.version}"
# Line 1439 | Line 1362
1362        classes="${jsr166e.jar}"/>
1363    </target>
1364  
1365 <  <target name="jsr166e-tck"
1443 <          description="Runs tck tests for jsr166e for multiple java versions">
1365 >  <target name="jsr166e-tck">
1366  
1367   <!--     <antcall target="clean"/> -->
1368   <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1461 | Line 1383
1383      </antcall>
1384    </target>
1385  
1386 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1387  
1388 <  <target name="jsr166e-test"
1466 <          depends="jsr166e-tck"
1467 <          description="Runs all tests for jsr166e">
1468 <  </target>
1469 <
1470 <  <target name="jsr166edist"
1471 <          depends="jsr166edist-jar, jsr166edist-docs"
1472 <          description="Puts all distributable products in single hierarchy"/>
1473 <
1388 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1389  
1390 <  <target name="jsr166eclean"
1476 <          description="Removes all jsr166e build products">
1390 >  <target name="jsr166eclean">
1391      <delete dir="${build.jsr166e.dir}"/>
1392    </target>
1393  
1480
1394    <target name="jsr166edist-jar"
1395            depends="jsr166eclean, jsr166ejar">
1396      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1397    </target>
1398  
1399 <  <target name="jsr166edist-docs"
1487 <          depends="jsr166eclean, jsr166edocs">
1399 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1400      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1401    </target>
1402  
1403  
1404   <!-- Find buglets that can be detected by static build tools -->
1405  
1406 <  <target name="lint">
1407 <    <antcall target="dists">
1408 <      <param name="build.javadoc.access" value="public"/>
1409 <    </antcall>
1410 <  </target>
1406 > <!--   <target name="lint"> -->
1407 > <!--     <antcall target="dists"> -->
1408 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1409 > <!--     </antcall> -->
1410 > <!--   </target> -->
1411  
1412   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1413 <  <target name="lint-private">
1413 >  <target name="doclint-private">
1414      <antcall target="dist">
1415        <param name="build.javadoc.access" value="private"/>
1416      </antcall>
1417    </target>
1418  
1419  
1420 + <!-- ==============================================================
1421 +  Experimental errorprone support
1422 +  https://errorprone.info
1423 +  https://errorprone.info/docs/installation
1424 +  https://github.com/google/error-prone/issues/1143
1425 + =================================================================== -->
1426 +  <path id="errorprone.processorpath.path">
1427 +    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1428 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1429 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1430 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1431 +  </path>
1432 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1433 +  <property name="errorprone.jsr166.user.flags" value=""/>
1434 +  <property name="errorprone.jsr166.flags"
1435 +            value="-Xep:HashtableContains:OFF
1436 +                   -Xep:JdkObsolete:OFF
1437 +                   -Xep:MissingOverride:OFF
1438 +                   -Xep:MissingFail:OFF
1439 +                   -Xep:ThreadPriorityCheck:OFF
1440 +                   -Xep:MixedArrayDimensions:ERROR
1441 +                   -Xep:RemoveUnusedImports:ERROR
1442 +                   -Xep:EmptyIf:ERROR
1443 +                   -Xep:MultipleTopLevelClasses:ERROR
1444 +                   -Xep:ClassName:ERROR
1445 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1446 +                   -Xep:RedundantThrows:ERROR
1447 +                   -Xep:IdentityBinaryExpression:WARN
1448 +                   -Xep:ConstructorInvokesOverridable:WARN
1449 +                   -Xep:MethodCanBeStatic:WARN
1450 +                   ${errorprone.jsr166.user.flags}"/>
1451 +  <!-- -Xep:WildcardImport:ERROR -->
1452 +  <property name="errorprone.jsr166.test.flags"
1453 +            value="-Xep:StringSplitter:OFF
1454 +                   -Xep:BoxedPrimitiveConstructor:OFF
1455 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1456 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1457 +  <target name="errorprone"
1458 +          depends="clean, configure-compiler"
1459 +          description="Run errorprone over jsr166 source code (experimental)">
1460 +
1461 +    <local name="destdir"/>
1462 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1463 +    <mkdir dir="${destdir}"/>
1464 +
1465 +    <javac srcdir="${src.dir}"
1466 +           destdir="${destdir}"
1467 +           debug="${build.debug}"
1468 +           debuglevel="${build.debuglevel}"
1469 +           deprecation="${build.deprecation}"
1470 +           classpath=""
1471 +           includeAntRuntime="false"
1472 +           includeJavaRuntime="false"
1473 +           encoding="ASCII"
1474 +           executable="${build.main.javac}"
1475 +           fork="true">
1476 +
1477 +      <include name="**/*.java"/>
1478 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1479 +      <compilerarg value="-J--illegal-access=permit"/>
1480 +      <compilerarg value="-XDcompilePolicy=simple"/>
1481 +      <compilerarg value="-processorpath"/>
1482 +      <compilerarg pathref="errorprone.processorpath.path"/>
1483 +      <compilerarg value="-Xplugin:ErrorProne
1484 +                          ${errorprone.jsr166.flags}"/>
1485 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1486 +      <compilerarg value="-Xprefer:source"/>
1487 +      <compilerarg value="-XDignore.symbol.file=true"/>
1488 +      <compilerarg value="-Xlint:all"/>
1489 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1490 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1491 +      <compilerarg line="${build.args}"/>
1492 +    </javac>
1493 +
1494 +    <jar destfile="${product.jar}">
1495 +      <fileset dir="${destdir}"/>
1496 +    </jar>
1497 +
1498 +    <run-tck-tests
1499 +      target="${java.runtime.target}"
1500 +      workdir="${build.dir}"
1501 +      classes="${product.jar}">
1502 +      <javac-elements>
1503 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1504 +        <compilerarg value="-J--illegal-access=permit"/>
1505 +        <compilerarg value="-XDcompilePolicy=simple"/>
1506 +        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1507 +        <compilerarg value="-Xplugin:ErrorProne
1508 +                            ${errorprone.jsr166.flags}
1509 +                            ${errorprone.jsr166.test.flags}"/>
1510 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1511 +      </javac-elements>
1512 +    </run-tck-tests>
1513 +  </target>
1514 +
1515 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1516 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1517 +  <target name="errorprone-jtreg"
1518 +          depends="jar"
1519 +          description="Run errorprone over jtreg tests (experimental)">
1520 +
1521 +    <run-jtreg-tests
1522 +       target="${java.runtime.target}"
1523 +       workdir="${build.dir}"
1524 +       classes="${product.jar}"
1525 +       verbose="all">
1526 +      <jtreg-elements>
1527 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1528 +        <arg value="-javacoption:-processorpath"/>
1529 +        <arg value="-javacoption:${errorprone.processorpath}"/>
1530 +        <arg value="-javacoption:-Xplugin:ErrorProne
1531 +                            ${errorprone.jsr166.flags}
1532 +                            ${errorprone.jsr166.test.flags}
1533 +                            -Xep:MultipleTopLevelClasses:WARN
1534 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1535 +      </jtreg-elements>
1536 +    </run-jtreg-tests>
1537 +  </target>
1538 +
1539 +
1540 + <!-- ==============================================================
1541 +  Running guava tests against jsr166 code
1542 + =================================================================== -->
1543 +
1544 + <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1545 + <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1546 + <!-- <property name="guava.version" value="21.0"/> -->
1547 +
1548 + <!-- HOWTO debug print a path id -->
1549 + <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1550 + <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1551 +
1552 + <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1553 + <!--   organisation="com.google.guava" module="guava-tests"/> -->
1554 + <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1555 + <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1556 + <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1557 + <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1558 +
1559 + <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1560 + <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1561 + <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1562 + <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1563 +
1564 + <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1565 + <!--   type="*" inline="true" conf="*(private),*(public)" -->
1566 + <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1567 + <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1568 +
1569 + <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1570 + <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1571 + <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1572 +
1573 +  <target name="init-ivy">
1574 +    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1575 +         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1576 +    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1577 +             classpath="${build.dir}/ivy.jar"/>
1578 +  </target>
1579 +
1580 +  <target name="guava-tests" depends="jar, init-ivy"
1581 +          description="Guava tests run against jsr166 collections">
1582 +    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1583 +    <mkdir dir="${guava.dir}"/>
1584 +    <ivy:retrieve pathid="guava.testlib.classpath"
1585 +      type="jar,bundle" inline="true" conf="default,master"
1586 +      pattern="${guava.dir}/[artifact].[ext]"
1587 +      organisation="com.google.guava" module="guava-testlib"/>
1588 +    <property name="guava.version" value="21.0"/>
1589 +    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1590 +         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1591 +    <junit printsummary="true" showoutput="true" haltonfailure="true"
1592 +           jvm="${build.main.java}" fork="true">
1593 +      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1594 +      <formatter type="brief"/>
1595 +      <classpath>
1596 +        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1597 +        <path refid="guava.testlib.classpath"/>
1598 +      </classpath>
1599 +
1600 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1601 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1602 +    </junit>
1603 +  </target>
1604 +
1605   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines