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.246 by jsr166, Fri Jun 16 20:56:47 2017 UTC vs.
Revision 1.302 by jsr166, Sun Aug 18 18:55:55 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 19 | Line 20
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
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
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 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 50 | Line 56
56  
57  
58    <!-- Compilation options -->
53 –  <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 101 | 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 127 | Line 132
132      </sequential>
133    </macrodef>
134  
130 –  <defjdklocations v="6"/>
131 –  <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"/>
141 –  <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 181 | 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 >  <!-- The location of jdk early access docs (RIP) -->
198 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
199 > <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
200 >  <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
201 >  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
202 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
203 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
204  
205    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
195 –  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
196 –  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
197 –  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
206    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
207 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
207 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
208 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
209 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
210 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
211    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
212  
213    <!-- Define the "jtreg" task -->
# Line 229 | Line 240
240  
241      <local name="modules"/>
242      <condition property="modules">
243 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
243 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
244      </condition>
245  
246      <local name="use-doclint"/>
# Line 296 | Line 307
307    </macrodef>
308  
309    <!-- Define jtreg test sets for different jdk versions -->
310 <  <fileset dir="${jtreg10.src.dir}">
311 <    <patternset id="jdk10.jtreg.tests">
312 <      <include name="**/*.java"/>
313 <    </patternset>
314 <  </fileset>
315 <
316 <  <fileset dir="${jtreg9.src.dir}">
317 <    <patternset id="jdk9.jtreg.tests">
318 <      <include name="**/*.java"/>
319 <    </patternset>
320 <  </fileset>
321 <
322 <  <fileset dir="${jtreg8.src.dir}">
312 <    <patternset id="jdk8.jtreg.tests">
313 <      <include name="**/*.java"/>
314 <    </patternset>
315 <  </fileset>
310 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
311 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
312 >  <property name="jtreg.test.pattern" value="**/*.java"/>
313 >  <macrodef name="defjtregtests">
314 >    <attribute name="v"/>
315 >    <sequential>
316 >      <fileset dir="${jtreg@{v}.src.dir}">
317 >        <patternset id="jdk@{v}.jtreg.tests">
318 >          <include name="${jtreg.test.pattern}"/>
319 >        </patternset>
320 >      </fileset>
321 >    </sequential>
322 >  </macrodef>
323  
324 <  <fileset dir="${jtreg7.src.dir}">
325 <    <patternset id="jdk7.jtreg.tests">
326 <      <include name="**/*.java"/>
327 <    </patternset>
328 <  </fileset>
324 >  <defjtregtests v="14"/>
325 >  <defjtregtests v="13"/>
326 >  <defjtregtests v="12"/>
327 >  <defjtregtests v="11"/>
328 >  <defjtregtests v="8"/>
329  
330    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
331    <property name="jtreg.flags" value=""/>
332  
333    <macrodef name="run-jtreg-tests">
334 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
334 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
335      <attribute name="target"/>
336      <attribute name="workdir"/>
337      <attribute name="classes"/>
338 +    <attribute name="verbose" default="${jtreg.verbose}"/>
339      <attribute name="jtregflags" default=""/>
340 +    <element name="jtreg-elements" optional="true"/>
341  
342      <sequential>
343  
# Line 337 | Line 346
346  
347      <local name="modules"/>
348      <condition property="modules">
349 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
349 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
350      </condition>
351  
352      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 346 | Line 355
355             workDir="@{workdir}/JTwork">
356        <patternset refid="jdk@{target}.jtreg.tests"/>
357        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
358 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
359 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
358 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
359 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
360        <arg value="-agentvm"/>
361        <arg value="-noreport"/>
362 <      <arg value="-verbose:${jtreg.verbose}"/>
362 >      <arg value="-verbose:@{verbose}"/>
363        <arg value="-vmoptions:-esa -ea"/>
364        <arg value="-automatic"/>
365        <arg value="-k:!ignore"/>
366        <arg line="@{jtregflags}"/>
367        <arg line="${jtreg.flags}"/>
368 +      <jtreg-elements/>
369      </jtreg>
370      </sequential>
371    </macrodef>
# Line 366 | Line 376
376    </path>
377  
378    <!-- Support @jls tag, used in jdk8+ javadoc -->
379 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
380    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
381    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
382  
383    <!-- Main targets -->
384  
385 <  <property name="build.main.java.version" value="9"/>
386 <  <property name="build.main.javac" value="${javac9}"/>
385 >  <!-- Default values: may seem strange ... -->
386 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
387 >  <!-- But at build time, target jdk9, for maximal binary portability -->
388 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
389 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
390 >    o override-methods=summary
391 >    o {@systemProperty ...}
392 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
393 >    o 8202628: javadoc generates bad links in TestModules.java
394 >    -->
395 >  <property name="java.runtime.target" value="11"/>
396 >  <property name="build.main.java" value="${java11}"/>
397 >  <property name="build.main.javac" value="${javac11}"/>
398 >  <property name="build.main.javadoc" value="${javadoc12}"/>
399 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
400  
401    <target name="dists"
402            depends="dist, 4jdk8dist"
403            description="Builds all public jars and docs"/>
404 <          <!--
381 <              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
382 <          -->
404 >          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
405  
406    <target name="compile"
407            depends="configure-compiler"
408            description="Compiles src/main sources to build dir">
409  
388 –    <local name="modules"/>
389 –    <condition property="modules">
390 –      <and>
391 –        <available file="${jdk9.home}/jmods" type="dir"/>
392 –        <equals arg1="9" arg2="${build.main.java.version}"/>
393 –      </and>
394 –    </condition>
395 –
410      <local name="destdir"/>
411 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
398 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
411 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
412  
413      <mkdir dir="${destdir}"/>
414  
# Line 412 | Line 425
425             fork="true">
426  
427        <include name="**/*.java"/>
428 <      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
428 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
429        <compilerarg value="-Xprefer:source"/>
430        <compilerarg value="-XDignore.symbol.file=true"/>
431 <      <compilerarg value="-Xlint:all"/>
431 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
432 >      <compilerarg value="-Xlint:all,-removal"/>
433        <compilerarg line="--doclint-format html5"/>
434        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
435 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
436        <compilerarg value="-Werror"/>
437        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
438        <compilerarg line="${build.args}"/>
# Line 457 | Line 472
472   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
473      <javadoc destdir="${docs.dir}"
474               packagenames="none"
475 <             link="${java9.api.url}"
475 >             link="${java.api.url}"
476               overview="${src.dir}/intro.html"
477               access="${build.javadoc.access}"
478               sourcepath="${src.dir}"
479               classpath=""
480 <             source="9"
481 <             executable="${javadoc9}">
480 >             source="${build.main.javadoc.source}"
481 >             executable="${build.main.javadoc}">
482 > <!-- TODO: JDK-8214571 failonerror = "true" -->
483        <fileset dir="${src.dir}" defaultexcludes="yes">
484          <include name="**/*.java"/>
485        </fileset>
486 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
486 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
487        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
488        <arg value="-XDignore.symbol.file=true"/>
489        <arg value="-html5"/>
490        <arg value="--patch-module=java.base=${src.dir}"/>
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"/>
483 <      <arg value="implNote:a:Implementation Note:"/>
491 > <!-- old school frames via docs/index.html?overview-summary.html -->
492 > <!-- TODO: - -frames no longer a supported option in jdk13+ -->
493 >      <arg value="--frames"/>
494 >      <arg value="--override-methods=summary"/>
495 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
496 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
497 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
498 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
499   <!-- tags added in jdk9: currently unused -->
500 < <!--       <arg value="-tag"/> -->
501 < <!--       <arg value="revised:X"/> -->
487 < <!--       <arg value="-tag"/> -->
488 < <!--       <arg value="spec:X"/> -->
500 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
501 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
502      </javadoc>
503    </target>
504  
# Line 495 | Line 508
508            description="Puts all distributable products in single hierarchy"/>
509  
510  
498 –  <target name="release"
499 –          depends="dist"
500 –          description="Puts entire CVS tree, plus distribution productions, in a jar">
501 –
502 –    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
503 –
504 –    <jar basedir="${basedir}" destfile="${release.jar}">
505 –      <!-- <exclude name="build/**"/> -->
506 –      <exclude name="${release.jar}"/>
507 –      <exclude name="user.properties"/>
508 –      <exclude name="etc/notes/**"/>
509 –      <exclude name="src/emulation/**"/>
510 –      <exclude name="**/SyntaxTest.java"/>
511 –      <exclude name="**/SuperfluousAbstract.java"/>
512 –      <manifest>
513 –        <attribute name="Built-By" value="${user.name}"/>
514 –        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
515 –      </manifest>
516 –    </jar>
517 –  </target>
518 –
519 –
511    <target name="clean"
512            description="Removes all build products">
513      <delete dir="${build.dir}"/>
# Line 545 | Line 536
536            description="Runs tck tests for src/main directly">
537  
538      <run-tck-tests
539 <      target="${build.main.java.version}"
539 >      target="${java.runtime.target}"
540        workdir="${build.dir}"
541        classes="${product.jar}">
542        <javac-elements>
# Line 579 | Line 570
570            depends="jar"
571            description="Runs jtreg tests for src/main using the jtreg ant task">
572      <run-jtreg-tests
573 <       target="${build.main.java.version}"
573 >       target="${java.runtime.target}"
574         workdir="${build.dir}"
575         classes="${product.jar}"/>
576    </target>
# Line 588 | Line 579
579            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
580            description="Runs tck and jtreg tests for src/main"/>
581  
582 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
582 >  <target name="test-version-permutations"
583 >          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
584 >  </target>
585  
586 < <!--     <antcall target="jtreg"> -->
587 < <!--       <param name="build.main.java.version" value="8"/> -->
588 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
586 >  <!-- jdk9 is unsupported as of 2019-08 -->
587 > <!--   <target name="test9"> -->
588 > <!--     <antcall target="clean"/> -->
589 > <!--     <antcall> -->
590 > <!--       <param name="java.runtime.target" value="9"/> -->
591 > <!--       <param name="build.main.javac" value="${javac9}"/> -->
592 > <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
593 > <!--       <param name="build.main.javadoc.source" value="9"/> -->
594 > <!--       <target name="test"/> -->
595 > <!--       <target name="docs"/> -->
596   <!--     </antcall> -->
597 –
597   <!--   </target> -->
598  
599 < <!--   <target name="test89" -->
600 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
602 <
599 >  <!-- jdk10 is unsupported as of 2019-08 -->
600 > <!--   <target name="test10"> -->
601   <!--     <antcall target="clean"/> -->
602 < <!--     <antcall target="test"> -->
603 < <!--       <param name="build.main.java.version" value="8"/> -->
604 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
602 > <!--     <antcall> -->
603 > <!--       <param name="java.runtime.target" value="10"/> -->
604 > <!--       <param name="build.main.javac" value="${javac10}"/> -->
605 > <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
606 > <!--       <param name="build.main.javadoc.source" value="10"/> -->
607 > <!--       <target name="test"/> -->
608 > <!--       <target name="docs"/> -->
609   <!--     </antcall> -->
610 + <!--   </target> -->
611  
612 < <!--     <antcall target="clean"/> -->
613 < <!--     <antcall target="test"> -->
614 < <!--       <param name="build.main.java.version" value="9"/> -->
615 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
616 < <!--     </antcall> -->
612 >  <target name="test11">
613 >    <antcall target="clean"/>
614 >    <antcall>
615 >      <param name="java.runtime.target" value="11"/>
616 >      <param name="build.main.javac" value="${javac11}"/>
617 >      <param name="build.main.javadoc" value="${javadoc12}"/>
618 >      <param name="build.main.javadoc.source" value="11"/>
619 >      <target name="test"/>
620 >      <target name="docs"/>
621 >    </antcall>
622 >  </target>
623  
624 < <!--   </target> -->
624 >  <target name="test12">
625 >    <antcall target="clean"/>
626 >    <antcall>
627 >      <param name="java.runtime.target" value="12"/>
628 >      <param name="build.main.javac" value="${javac12}"/>
629 >      <param name="build.main.javadoc" value="${javadoc12}"/>
630 >      <param name="build.main.javadoc.source" value="12"/>
631 >      <target name="test"/>
632 >      <target name="docs"/>
633 >    </antcall>
634 >  </target>
635  
636 +  <target name="test13">
637 +    <antcall target="clean"/>
638 +    <antcall>
639 +      <param name="java.runtime.target" value="13"/>
640 +      <param name="build.main.javac" value="${javac13}"/>
641 +      <param name="build.main.javadoc" value="${javadoc13}"/>
642 +      <param name="build.main.javadoc.source" value="13"/>
643 +      <target name="test"/>
644 +      <target name="docs"/>
645 +    </antcall>
646 +  </target>
647 +
648 +  <target name="test14">
649 +    <antcall target="clean"/>
650 +    <antcall>
651 +      <param name="java.runtime.target" value="14"/>
652 +      <param name="build.main.javac" value="${javac14}"/>
653 +      <param name="build.main.javadoc" value="${javadoc14}"/>
654 +      <param name="build.main.javadoc.source" value="14"/>
655 +      <target name="test"/>
656 +      <target name="docs"/>
657 +    </antcall>
658 +  </target>
659 +
660 +  <target name="test11-12">
661 +    <antcall target="clean"/>
662 +    <antcall>
663 +      <param name="java.runtime.target" value="12"/>
664 +      <param name="build.main.javac" value="${javac11}"/>
665 +      <param name="build.main.javadoc" value="${javadoc12}"/>
666 +      <param name="build.main.javadoc.source" value="11"/>
667 +      <target name="test"/>
668 +      <target name="docs"/>
669 +    </antcall>
670 +  </target>
671 +
672 +  <target name="test11-13">
673 +    <antcall target="clean"/>
674 +    <antcall>
675 +      <param name="java.runtime.target" value="13"/>
676 +      <param name="build.main.javac" value="${javac11}"/>
677 +      <param name="build.main.javadoc" value="${javadoc13}"/>
678 +      <param name="build.main.javadoc.source" value="11"/>
679 +      <target name="test"/>
680 +      <target name="docs"/>
681 +    </antcall>
682 +  </target>
683 +
684 +  <target name="test11-14">
685 +    <antcall target="clean"/>
686 +    <antcall>
687 +      <param name="java.runtime.target" value="14"/>
688 +      <param name="build.main.javac" value="${javac11}"/>
689 +      <param name="build.main.javadoc" value="${javadoc14}"/>
690 +      <param name="build.main.javadoc.source" value="11"/>
691 +      <target name="test"/>
692 +      <target name="docs"/>
693 +    </antcall>
694 +  </target>
695  
696  
697    <target name="configure-compiler">
# Line 636 | Line 714
714    </target>
715  
716  
639 –
640 –  <!-- Various demos and test programs -->
641 –
642 –
643 –  <!-- description="Benchmark from Doug Lea's AQS paper" -->
644 –  <target name="loops" depends="configure-compiler">
645 –
646 –    <mkdir dir="${build.loops.dir}"/>
647 –
648 –    <javac srcdir="${loops.src.dir}"
649 –          destdir="${build.loops.dir}"
650 –            debug="${build.debug}"
651 –       debuglevel="${build.debuglevel}"
652 –      deprecation="${build.deprecation}"
653 –           source="${build.sourcelevel}"
654 –           target="${build.sourcelevel}"
655 –         encoding="ASCII"
656 –             fork="true">
657 –
658 –      <compilerarg line="${build.args}"/>
659 –      <classpath refid="loops.classpath"/>
660 –      <compilerarg value="-XDignore.symbol.file=true"/>
661 –
662 –    </javac>
663 –
664 –    <java classname="ALoops" fork="true">
665 –      <classpath refid="loops.classpath"/>
666 –    </java>
667 –  </target>
668 –
669 –
717    <target name="compile-test-loops" depends="jar"
718            description="Compiles all the perf tests in src/test/loops">
719  
# Line 680 | Line 727
727             includeAntRuntime="false"
728             includeJavaRuntime="false"
729             encoding="ASCII"
730 <           executable="${javac9}"
730 >           executable="${build.main.javac}"
731             fork="true">
732  
733        <include name="*.java"/>
# Line 821 | Line 868
868        </fileset>
869        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
870        <arg value="-XDignore.symbol.file=true"/>
871 <      <arg value="-tag"/>
872 <      <arg value="${javadoc.jls.option}"/>
873 < <!-- @apiNote currently unused -->
874 < <!--       <arg value="-tag"/> -->
875 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
829 <      <arg value="-tag"/>
830 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
831 <      <arg value="-tag"/>
832 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
871 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
872 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
873 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
874 > <!-- @apiNote tag currently unused -->
875 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
876      </javadoc>
877    </target>
878  
# Line 1359 | Line 1402
1402  
1403   <!-- Find buglets that can be detected by static build tools -->
1404  
1405 <  <target name="lint">
1406 <    <antcall target="dists">
1407 <      <param name="build.javadoc.access" value="public"/>
1408 <    </antcall>
1409 <  </target>
1405 > <!--   <target name="lint"> -->
1406 > <!--     <antcall target="dists"> -->
1407 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1408 > <!--     </antcall> -->
1409 > <!--   </target> -->
1410  
1411   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1412 <  <target name="lint-private">
1412 >  <target name="doclint-private">
1413      <antcall target="dist">
1414        <param name="build.javadoc.access" value="private"/>
1415      </antcall>
# Line 1374 | Line 1417
1417  
1418  
1419   <!-- ==============================================================
1420 <  Experimental errorprone support - http://errorprone.info
1421 <  You may need to bring your own errorprone jar.
1420 >  Experimental errorprone support
1421 >  https://errorprone.info
1422 >  https://errorprone.info/docs/installation
1423 >  https://github.com/google/error-prone/issues/1143
1424   =================================================================== -->
1425 +  <path id="errorprone.processorpath.path">
1426 +    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1427 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1428 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1429 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1430 +  </path>
1431 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1432 +  <property name="errorprone.jsr166.user.flags" value=""/>
1433 +  <property name="errorprone.jsr166.flags"
1434 +            value="-Xep:HashtableContains:OFF
1435 +                   -Xep:JdkObsolete:OFF
1436 +                   -Xep:MissingOverride:OFF
1437 +                   -Xep:MissingFail:OFF
1438 +                   -Xep:ThreadPriorityCheck:OFF
1439 +                   -Xep:MixedArrayDimensions:ERROR
1440 +                   -Xep:RemoveUnusedImports:ERROR
1441 +                   -Xep:EmptyIf:ERROR
1442 +                   -Xep:MultipleTopLevelClasses:ERROR
1443 +                   -Xep:ClassName:ERROR
1444 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1445 +                   -Xep:RedundantThrows:ERROR
1446 +                   -Xep:IdentityBinaryExpression:WARN
1447 +                   -Xep:ConstructorInvokesOverridable:WARN
1448 +                   -Xep:MethodCanBeStatic:WARN
1449 +                   ${errorprone.jsr166.user.flags}"/>
1450 +  <!-- -Xep:WildcardImport:ERROR -->
1451 +  <property name="errorprone.jsr166.test.flags"
1452 +            value="-Xep:StringSplitter:OFF
1453 +                   -Xep:BoxedPrimitiveConstructor:OFF
1454 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1455 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1456    <target name="errorprone"
1457            depends="clean, configure-compiler"
1458            description="Run errorprone over jsr166 source code (experimental)">
# Line 1398 | Line 1474
1474             fork="true">
1475  
1476        <include name="**/*.java"/>
1477 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1478 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1479 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1480 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1481 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1406 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1407 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1408 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1409 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1410 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1477 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1478 >      <compilerarg value="-J--illegal-access=permit"/>
1479 >      <compilerarg value="-XDcompilePolicy=simple"/>
1480 >      <compilerarg value="-processorpath"/>
1481 >      <compilerarg pathref="errorprone.processorpath.path"/>
1482        <compilerarg value="-Xplugin:ErrorProne
1483 <                          -Xep:IdentityBinaryExpression:WARN
1413 <                          -Xep:MissingOverride:OFF
1414 <                          -Xep:MixedArrayDimensions:WARN
1415 <                          -Xep:RemoveUnusedImports:ERROR
1416 <                          -Xep:ClassName:ERROR
1417 <                          -Xep:MultipleTopLevelClasses:ERROR
1418 <                          -Xep:EmptyIf:ERROR
1419 <                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1420 <                          -Xep:ArgumentParameterSwap:ERROR
1421 <                          -Xep:RedundantThrows:ERROR
1422 <                          -Xep:MethodCanBeStatic:WARN"/>
1483 >                          ${errorprone.jsr166.flags}"/>
1484        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1485        <compilerarg value="-Xprefer:source"/>
1486        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1434 | Line 1495
1495      </jar>
1496  
1497      <run-tck-tests
1498 <      target="${build.main.java.version}"
1498 >      target="${java.runtime.target}"
1499        workdir="${build.dir}"
1500        classes="${product.jar}">
1501        <javac-elements>
1502 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1503 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1504 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1505 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1445 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1446 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1447 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1448 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1449 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1450 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1502 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1503 >        <compilerarg value="-J--illegal-access=permit"/>
1504 >        <compilerarg value="-XDcompilePolicy=simple"/>
1505 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1506          <compilerarg value="-Xplugin:ErrorProne
1507 <                            -Xep:IdentityBinaryExpression:WARN
1508 <                            -Xep:BoxedPrimitiveConstructor:OFF
1454 <                            -Xep:HashtableContains:OFF
1455 <                            -Xep:ModifyingCollectionWithItself:OFF
1456 <                            -Xep:MissingOverride:OFF
1457 <                            -Xep:MixedArrayDimensions:WARN
1458 <                            -Xep:RemoveUnusedImports:ERROR
1459 <                            -Xep:ClassName:ERROR
1460 <                            -Xep:MultipleTopLevelClasses:ERROR
1461 <                            -Xep:EmptyIf:ERROR
1462 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1463 <                            -Xep:ArgumentParameterSwap:ERROR
1464 <                            -Xep:RedundantThrows:ERROR
1465 <                            -Xep:MethodCanBeStatic:WARN"/>
1507 >                            ${errorprone.jsr166.flags}
1508 >                            ${errorprone.jsr166.test.flags}"/>
1509          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1510        </javac-elements>
1511      </run-tck-tests>
1512    </target>
1513  
1514 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1515 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1516 +  <target name="errorprone-jtreg"
1517 +          depends="jar"
1518 +          description="Run errorprone over jtreg tests (experimental)">
1519 +
1520 +    <run-jtreg-tests
1521 +       target="${java.runtime.target}"
1522 +       workdir="${build.dir}"
1523 +       classes="${product.jar}"
1524 +       verbose="all">
1525 +      <jtreg-elements>
1526 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1527 +        <arg value="-javacoption:-processorpath"/>
1528 +        <arg value="-javacoption:${errorprone.processorpath}"/>
1529 +        <arg value="-javacoption:-Xplugin:ErrorProne
1530 +                            ${errorprone.jsr166.flags}
1531 +                            ${errorprone.jsr166.test.flags}
1532 +                            -Xep:MultipleTopLevelClasses:WARN
1533 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1534 +      </jtreg-elements>
1535 +    </run-jtreg-tests>
1536 +  </target>
1537 +
1538  
1539   <!-- ==============================================================
1540    Running guava tests against jsr166 code
# Line 1521 | Line 1588
1588      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1589           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1590      <junit printsummary="true" showoutput="true" haltonfailure="true"
1591 <           jvm="${java9}" fork="true">
1592 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1591 >           jvm="${build.main.java}" fork="true">
1592 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1593        <formatter type="brief"/>
1594        <classpath>
1595          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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