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.238 by jsr166, Fri Mar 24 16:33:02 2017 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>
# Line 18 | 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:
21 –  $HOME/jdk/jdk7
22    $HOME/jdk/jdk8
23 <  $HOME/jdk/jdk9
24 <  $HOME/jdk/jdk10
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
26 –  $HOME/jdk/src/jdk7
28    $HOME/jdk/src/jdk8
29 <  $HOME/jdk/src/jdk9
30 <  $HOME/jdk/src/jdk10
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 7 8 9 10 ...
38 >  for $N in 8 .. 14 ...
39  
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 103 | 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 129 | Line 132
132      </sequential>
133    </macrodef>
134  
132 –  <defjdklocations v="6"/>
133 –  <defjdklocations v="7"/>
135    <defjdklocations v="8"/>
136 <  <defjdklocations v="9"/>
137 <  <defjdklocations v="10"/>
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="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
149 <  <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 183 | 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 -->
197 –  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
198 –  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
199 –  <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 231 | 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"/>
# Line 298 | 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 <    </patternset>
321 <  </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 -->
324 <    <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 334 | 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 343 | 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=@{classes}" if:set="modules"/>
360 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" 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 363 | 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  
382 –    <local name="modules"/>
383 –    <condition property="modules">
384 –      <and>
385 –        <available file="${jdk9.home}/jmods" type="dir"/>
386 –        <equals arg1="9" arg2="${build.main.java.version}"/>
387 –      </and>
388 –    </condition>
389 –
411      <local name="destdir"/>
412 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
392 <    <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 406 | Line 426
426             fork="true">
427  
428        <include name="**/*.java"/>
429 <      <compilerarg value="--patch-module=java.base=${src.dir}" 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"/>
433 <      <compilerarg value="-Werror"/>
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"/>
438        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
439        <compilerarg line="${build.args}"/>
440  
# Line 450 | Line 473
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="-html5"/>
491        <arg value="--patch-module=java.base=${src.dir}"/>
492 <      <arg value="-tag"/>
493 <      <arg value="${javadoc.jls.option}"/>
494 < <!-- @apiNote currently unused -->
495 < <!--       <arg value="-tag"/> -->
496 < <!--       <arg value="apiNote:a:API Note:"/> -->
497 <      <arg value="-tag"/>
498 <      <arg value="implSpec:a:Implementation Requirements:"/>
499 <      <arg value="-tag"/>
474 <      <arg value="implNote:a:Implementation Note:"/>
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"/> -->
478 < <!--       <arg value="-tag"/> -->
479 < <!--       <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 486 | Line 509
509            description="Puts all distributable products in single hierarchy"/>
510  
511  
489 –  <target name="release"
490 –          depends="dist"
491 –          description="Puts entire CVS tree, plus distribution productions, in a jar">
492 –
493 –    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
494 –
495 –    <jar basedir="${basedir}" destfile="${release.jar}">
496 –      <!-- <exclude name="build/**"/> -->
497 –      <exclude name="${release.jar}"/>
498 –      <exclude name="user.properties"/>
499 –      <exclude name="etc/notes/**"/>
500 –      <exclude name="src/emulation/**"/>
501 –      <exclude name="**/SyntaxTest.java"/>
502 –      <exclude name="**/SuperfluousAbstract.java"/>
503 –      <manifest>
504 –        <attribute name="Built-By" value="${user.name}"/>
505 –        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
506 –      </manifest>
507 –    </jar>
508 –  </target>
509 –
510 –
512    <target name="clean"
513            description="Removes all build products">
513 –
514      <delete dir="${build.dir}"/>
515 –
515    </target>
516  
517  
518    <target name="dist-clean"
519            description="Removes all build and distribution products">
521 –
520      <delete dir="${build.dir}"/>
521      <delete dir="${dist.dir}"/>
524 –
522    </target>
523  
524  
# Line 540 | 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}">
543        <javac-elements>
# Line 574 | 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">
585 <  </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> -->
593 –
598   <!--   </target> -->
599  
600 < <!--   <target name="test89" -->
601 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
598 <
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">
# Line 632 | Line 715
715    </target>
716  
717  
635 –
636 –  <!-- Various demos and test programs -->
637 –
638 –
639 –  <!-- description="Benchmark from Doug Lea's AQS paper" -->
640 –  <target name="loops" depends="configure-compiler">
641 –
642 –    <mkdir dir="${build.loops.dir}"/>
643 –
644 –    <javac srcdir="${loops.src.dir}"
645 –          destdir="${build.loops.dir}"
646 –            debug="${build.debug}"
647 –       debuglevel="${build.debuglevel}"
648 –      deprecation="${build.deprecation}"
649 –           source="${build.sourcelevel}"
650 –           target="${build.sourcelevel}"
651 –         encoding="ASCII"
652 –             fork="true">
653 –
654 –      <compilerarg line="${build.args}"/>
655 –      <classpath refid="loops.classpath"/>
656 –      <compilerarg value="-XDignore.symbol.file=true"/>
657 –
658 –    </javac>
659 –
660 –    <java classname="ALoops" fork="true">
661 –      <classpath refid="loops.classpath"/>
662 –    </java>
663 –
664 –  </target>
665 –
666 –
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 677 | 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 685 | Line 736
736        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
737        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
738        <compilerarg line="${build.args}"/>
688 –
739      </javac>
690 –
740    </target>
741  
742  
# Line 713 | Line 762
762             encoding="ASCII"
763             executable="${javac8}"
764             fork="true">
716 –
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}"/>
723 –
771      </javac>
772    </target>
773  
# Line 744 | Line 791
791             encoding="ASCII"
792             executable="${javac8}"
793             fork="true">
747 –
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,reference/private"/>
799        <compilerarg line="${build.args}"/>
754 –
800      </javac>
801    </target>
802  
# Line 767 | Line 812
812          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
813        </manifest>
814      </jar>
770 –
815    </target>
816  
817  
# Line 801 | Line 845
845  
846    <target name="4jdk8-test"
847            depends="4jdk8-tck, 4jdk8-jtreg"
848 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
805 <  </target>
848 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
849  
850  
851    <target name="4jdk8docs"
# Line 818 | 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 825 | 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;"/> -->
833 <      <arg value="-tag"/>
834 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
835 <      <arg value="-tag"/>
836 <      <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 845 | Line 885
885  
886    <target name="4jdk8clean"
887            description="Removes all 4jdk8 build products">
848 –
888      <delete dir="${build.4jdk8.dir}"/>
850 –
889    </target>
890  
891  
# Line 863 | Line 901
901    </target>
902  
903  
904 +  <!-- jsr166 4jdk7 (no longer maintained) -->
905  
906 <  <!-- jsr166 4jdk7 -->
868 <
869 <  <target name="4jdk7compile"
870 <          depends="configure-compiler"
871 <          description="Compiles src/jdk7 sources, targeting jdk7">
872 <
906 >  <target name="4jdk7compile" depends="configure-compiler">
907      <mkdir dir="${build.4jdk7.classes.dir}"/>
908  
909      <javac srcdir="${4jdk7src.dir}"
# Line 893 | Line 927
927        <compilerarg value="-Xlint:all"/>
928        <compilerarg value="-Werror"/>
929        <compilerarg line="${build.args}"/>
896 –
930      </javac>
931    </target>
932  
933 <  <target name="4jdk7doclint"
901 <          depends="configure-compiler"
902 <          description="Finds doclint warnings">
903 <
933 >  <target name="4jdk7doclint" depends="configure-compiler">
934      <mkdir dir="${build.4jdk7.classes.dir}"/>
935  
936      <javac srcdir="${4jdk7src.dir}"
# Line 924 | Line 954
954        <compilerarg value="-Xlint:all"/>
955        <compilerarg value="-Xdoclint:all/protected"/>
956        <compilerarg line="${build.args}"/>
927 –
957      </javac>
958    </target>
959  
960 <
932 <  <target name="4jdk7jar"
933 <          depends="4jdk7compile"
934 <          description="Builds library jar from compiled sources">
935 <
960 >  <target name="4jdk7jar" depends="4jdk7compile">
961      <jar destfile="${4jdk7product.jar}">
962        <fileset dir="${build.4jdk7.classes.dir}"/>
963        <manifest>
# Line 940 | Line 965
965          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
966        </manifest>
967      </jar>
943 –
968    </target>
969  
970 <
947 <  <target name="4jdk7-tck"
948 <          depends="4jdk7jar"
949 <          description="Runs tck tests for jsr166-4jdk7 directly">
950 <
970 >  <target name="4jdk7-tck" depends="4jdk7jar">
971      <run-tck-tests
972        target="7"
973        workdir="${build.4jdk7.dir}"
# Line 970 | Line 990
990      </run-tck-tests>
991    </target>
992  
973 –
993    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
994 <  <target name="4jdk7-tck-junit"
976 <          depends="4jdk7compile">
994 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
995  
996      <junit printsummary="true"
997             showoutput="true"
# Line 995 | Line 1013
1013  
1014        <test name="${jsr166.tckTestClass}" haltonfailure="no">
1015        </test>
998 –
1016      </junit>
1017    </target>
1018  
1019 <  <target name="4jdk7-jtreg"
1003 <          depends="4jdk7jar"
1004 <          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"
1013 <          depends="4jdk7-tck, 4jdk7-jtreg"
1014 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
1015 <  </target>
1016 <
1017 <
1018 <  <target name="4jdk7docs"
1019 <          description="Builds javadocs for src/jdk7 to dist dir">
1020 <
1028 >  <target name="4jdk7docs">
1029      <delete dir="${4jdk7docs.dir}"/>
1030      <mkdir dir="${4jdk7docs.dir}"/>
1031  
# Line 1038 | Line 1046
1046      </javadoc>
1047    </target>
1048  
1049 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1050  
1051 <  <target name="4jdk7dist"
1043 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1044 <          description="Puts all distributable products in single hierarchy"/>
1045 <
1046 <
1047 <  <target name="4jdk7clean"
1048 <          description="Removes all 4jdk7 build products">
1049 <
1051 >  <target name="4jdk7clean">
1052      <delete dir="${build.4jdk7.dir}"/>
1051 –
1053    </target>
1054  
1055 <
1055 <  <target name="4jdk7dist-jar"
1056 <          depends="4jdk7clean, 4jdk7jar">
1055 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1056      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1057    </target>
1058  
1059 <
1061 <  <target name="4jdk7dist-docs"
1062 <          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 -->
1068 <
1069 <  <target name="jsr166xcompile"
1070 <          depends="configure-compiler"
1071 <          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 1086 | Line 1080
1080             encoding="ASCII"
1081             executable="${javac7}"
1082             fork="true">
1089 –
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}"/>
1095 –
1088      </javac>
1089    </target>
1090  
1091 <
1100 <  <target name="jsr166xjar"
1101 <          depends="jsr166xcompile"
1102 <          description="Builds library jar from compiled sources">
1103 <
1091 >  <target name="jsr166xjar" depends="jsr166xcompile">
1092      <jar destfile="${jsr166x.jar}">
1093        <fileset dir="${build.jsr166x.classes.dir}"/>
1094        <manifest>
# Line 1108 | Line 1096
1096          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1097        </manifest>
1098      </jar>
1111 –
1099    </target>
1100  
1101 <
1115 <  <target name="jsr166xdocs"
1116 <          description="Builds javadocs to dist dir">
1117 <
1101 >  <target name="jsr166xdocs">
1102      <delete dir="${jsr166xdocs.dir}"/>
1103      <mkdir dir="${jsr166xdocs.dir}"/>
1104  
# Line 1129 | Line 1113
1113               failonerror = "true">
1114        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1115        <arg value="-XDignore.symbol.file=true"/>
1132 –
1116      </javadoc>
1117    </target>
1118  
1119 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1120  
1121 <  <target name="jsr166xdist"
1138 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1139 <          description="Puts all distributable products in single hierarchy"/>
1140 <
1141 <
1142 <  <target name="jsr166xclean"
1143 <          description="Removes all jsr166x build products">
1144 <
1121 >  <target name="jsr166xclean">
1122      <delete dir="${build.jsr166x.dir}"/>
1146 –
1123    </target>
1124  
1125 <
1150 <  <target name="jsr166xdist-jar"
1151 <          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"
1156 <          depends="jsr166xclean, jsr166xdocs">
1129 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1130      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1131    </target>
1132  
1160 –  <!-- jsr166y -->
1133  
1134 +  <!-- jsr166y (no longer maintained) -->
1135  
1136 <  <target name="jsr166ycompile"
1164 <          depends="configure-compiler"
1165 <          description="Compiles jsr166y sources">
1166 <
1136 >  <target name="jsr166ycompile" depends="configure-compiler">
1137      <mkdir dir="${build.jsr166y.classes.dir}"/>
1138  
1139      <javac srcdir="${topsrc.dir}"
# Line 1186 | Line 1156
1156        <compilerarg value="-Xlint:all"/>
1157        <compilerarg value="-Werror"/>
1158        <compilerarg line="${build.args}"/>
1189 –
1159      </javac>
1160    </target>
1161  
1162 <
1194 <  <target name="jsr166yjar"
1195 <          depends="jsr166ycompile"
1196 <          description="Builds library jar from compiled sources">
1197 <
1162 >  <target name="jsr166yjar" depends="jsr166ycompile">
1163      <jar destfile="${jsr166y.jar}" index="true">
1164        <fileset dir="${build.jsr166y.classes.dir}"/>
1165        <manifest>
# Line 1202 | Line 1167
1167          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1168        </manifest>
1169      </jar>
1205 –
1170    </target>
1171  
1172 <
1209 <  <target name="jsr166ydocs"
1210 <          description="Builds javadocs to dist dir">
1211 <
1172 >  <target name="jsr166ydocs">
1173      <delete dir="${jsr166ydocs.dir}"/>
1174      <mkdir dir="${jsr166ydocs.dir}"/>
1175  
# Line 1223 | Line 1184
1184               failonerror = "true">
1185        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1186        <arg value="-XDignore.symbol.file=true"/>
1226 –
1187      </javadoc>
1188    </target>
1189  
1190 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1191  
1192 <  <target name="jsr166ydist"
1232 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1233 <          description="Puts all distributable products in single hierarchy"/>
1234 <
1235 <
1236 <  <target name="jsr166yclean"
1237 <          description="Removes all jsr166y build products">
1238 <
1192 >  <target name="jsr166yclean">
1193      <delete dir="${build.jsr166y.dir}"/>
1240 –
1194    </target>
1195  
1196 <
1244 <  <target name="jsr166ydist-jar"
1245 <          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"
1250 <          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 -->
1256 <
1257 <
1258 <  <target name="extra166ycompile"
1259 <          depends="configure-compiler, jsr166yjar"
1260 <          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 1281 | Line 1227
1227        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1228        <compilerarg value="-Werror"/>
1229        <compilerarg line="${build.args}"/>
1284 –
1230      </javac>
1231    </target>
1232  
1233 <
1289 <  <target name="extra166yjar"
1290 <          depends="extra166ycompile"
1291 <          description="Builds library jar from compiled sources">
1292 <
1233 >  <target name="extra166yjar" depends="extra166ycompile">
1234      <jar destfile="${extra166y.jar}" index="true">
1235        <fileset dir="${build.extra166y.classes.dir}"/>
1236        <manifest>
# Line 1297 | Line 1238
1238          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1239        </manifest>
1240      </jar>
1300 –
1241    </target>
1242  
1243 <
1304 <  <target name="extra166ydocs"
1305 <          description="Builds javadocs to build dir">
1306 <
1243 >  <target name="extra166ydocs">
1244      <delete dir="${extra166ydocs.dir}"/>
1245      <mkdir dir="${extra166ydocs.dir}"/>
1246  
# Line 1317 | Line 1254
1254               executable="${javadoc7}">
1255        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1256        <arg value="-XDignore.symbol.file=true"/>
1320 –
1257      </javadoc>
1258    </target>
1259  
1260 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1261  
1262 <  <target name="extra166ydist"
1326 <          depends="extra166ydist-jar, extra166ydist-docs"
1327 <          description="Puts all distributable products in single hierarchy"/>
1328 <
1329 <
1330 <  <target name="extra166yclean"
1331 <          description="Removes all extra166y build products">
1332 <
1262 >  <target name="extra166yclean">
1263      <delete dir="${build.extra166y.dir}"/>
1334 –
1264    </target>
1265  
1266 <
1338 <  <target name="extra166ydist-jar"
1339 <          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"
1344 <          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"
1354 <          depends="configure-compiler"
1355 <          description="Compiles jsr166e sources">
1356 <
1280 >  <target name="jsr166ecompile" depends="configure-compiler">
1281      <mkdir dir="${build.jsr166e.classes.dir}"/>
1282  
1283      <javac srcdir="${topsrc.dir}"
# Line 1374 | Line 1298
1298        <compilerarg value="-Xlint:all"/>
1299        <compilerarg value="-Werror"/>
1300        <compilerarg line="${build.args}"/>
1377 –
1301      </javac>
1302    </target>
1303  
1381 –  <!-- jsr166e: find doclint errors -->
1304    <target name="jsr166edoclint">
1383 –
1305      <mkdir dir="${build.jsr166e.classes.dir}"/>
1306  
1307      <javac srcdir="${topsrc.dir}"
# Line 1402 | Line 1323
1323        <compilerarg value="-Xlint:all"/>
1324        <compilerarg value="-Werror"/>
1325        <compilerarg value="-Xdoclint:all/protected"/>
1405 –
1326      </javac>
1327    </target>
1328  
1329 <
1410 <  <target name="jsr166ejar"
1411 <          depends="jsr166ecompile"
1412 <          description="Builds library jar from compiled sources">
1413 <
1329 >  <target name="jsr166ejar" depends="jsr166ecompile">
1330      <jar destfile="${jsr166e.jar}" index="true">
1331        <fileset dir="${build.jsr166e.classes.dir}"/>
1332        <manifest>
# Line 1418 | Line 1334
1334          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1335        </manifest>
1336      </jar>
1421 –
1337    </target>
1338  
1339 <
1425 <  <target name="jsr166edocs"
1426 <          description="Builds javadocs to build dir">
1427 <
1339 >  <target name="jsr166edocs">
1340      <delete dir="${jsr166edocs.dir}"/>
1341      <mkdir dir="${jsr166edocs.dir}"/>
1342  
# Line 1438 | Line 1350
1350               failonerror = "true">
1351        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1352        <arg value="-XDignore.symbol.file=true"/>
1441 –
1353      </javadoc>
1354    </target>
1355  
1356 <
1446 <  <target name="jsr166e-tck-one-java-version"
1447 <          depends="jsr166ejar">
1448 <
1356 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1357      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1450 –
1358      <run-tck-tests
1359        tck.src.dir="${test.src.dir}/tck-jsr166e"
1360        target="${build.jsr166e.java.version}"
# Line 1455 | Line 1362
1362        classes="${jsr166e.jar}"/>
1363    </target>
1364  
1365 <  <target name="jsr166e-tck"
1459 <          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 1477 | Line 1383
1383      </antcall>
1384    </target>
1385  
1386 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1387  
1388 <  <target name="jsr166e-test"
1482 <          depends="jsr166e-tck"
1483 <          description="Runs all tests for jsr166e">
1484 <  </target>
1485 <
1486 <  <target name="jsr166edist"
1487 <          depends="jsr166edist-jar, jsr166edist-docs"
1488 <          description="Puts all distributable products in single hierarchy"/>
1388 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1389  
1390 <
1491 <  <target name="jsr166eclean"
1492 <          description="Removes all jsr166e build products">
1390 >  <target name="jsr166eclean">
1391      <delete dir="${build.jsr166e.dir}"/>
1392    </target>
1393  
1496 –
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"
1503 <          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>
# Line 1522 | Line 1418
1418  
1419  
1420   <!-- ==============================================================
1421 <  Experimental errorprone support - http://errorprone.info
1422 <  You may need to bring your own errorprone jar.
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">
1459 >          description="Run errorprone over jsr166 source code (experimental)">
1460  
1461      <local name="destdir"/>
1462      <property name="destdir" value="${build.classes.dir}/java.base"/>
# Line 1546 | Line 1475
1475             fork="true">
1476  
1477        <include name="**/*.java"/>
1478 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1479 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1480 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1481 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1482 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1554 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1555 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1556 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1557 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1558 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
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 <                          -Xep:IdentityBinaryExpression:WARN
1561 <                          -Xep:MissingOverride:OFF
1562 <                          -Xep:MixedArrayDimensions:WARN
1563 <                          -Xep:RemoveUnusedImports:ERROR
1564 <                          -Xep:MethodCanBeStatic:WARN"/>
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"/>
# Line 1576 | Line 1496
1496      </jar>
1497  
1498      <run-tck-tests
1499 <      target="${build.main.java.version}"
1499 >      target="${java.runtime.target}"
1500        workdir="${build.dir}"
1501        classes="${product.jar}">
1502        <javac-elements>
1503 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1504 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1505 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1506 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1507 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1508 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1509 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1590 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1591 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1592 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1593 <        <compilerarg value="-Xplugin:ErrorProne
1594 <                            -Xep:IdentityBinaryExpression:WARN
1595 <                            -Xep:BoxedPrimitiveConstructor:OFF
1596 <                            -Xep:HashtableContains:OFF
1597 <                            -Xep:ModifyingCollectionWithItself:OFF
1598 <                            -Xep:MissingOverride:OFF
1599 <                            -Xep:MixedArrayDimensions:WARN
1600 <                            -Xep:RemoveUnusedImports:ERROR
1601 <                            -Xep:MethodCanBeStatic:WARN"/>
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
# Line 1657 | Line 1589
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="${java9}" fork="true">
1593 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
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"/>

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines