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.244 by jsr166, Wed May 17 00:17:49 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 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 >  <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 -->
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/"/>
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 229 | 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 296 | 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 -->
322 <    <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 332 | 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 341 | 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 361 | 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"
404            description="Builds all public jars and docs"/>
405 <          <!--
376 <              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
377 <          -->
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  
383 –    <local name="modules"/>
384 –    <condition property="modules">
385 –      <and>
386 –        <available file="${jdk9.home}/jmods" type="dir"/>
387 –        <equals arg1="9" arg2="${build.main.java.version}"/>
388 –      </and>
389 –    </condition>
390 –
411      <local name="destdir"/>
412 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
393 <    <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 407 | 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"/>
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}"/>
# Line 452 | 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 <             source="9"
482 <             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"/>
478 <      <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"/> -->
482 < <!--       <arg value="-tag"/> -->
483 < <!--       <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 490 | Line 509
509            description="Puts all distributable products in single hierarchy"/>
510  
511  
493 –  <target name="release"
494 –          depends="dist"
495 –          description="Puts entire CVS tree, plus distribution productions, in a jar">
496 –
497 –    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
498 –
499 –    <jar basedir="${basedir}" destfile="${release.jar}">
500 –      <!-- <exclude name="build/**"/> -->
501 –      <exclude name="${release.jar}"/>
502 –      <exclude name="user.properties"/>
503 –      <exclude name="etc/notes/**"/>
504 –      <exclude name="src/emulation/**"/>
505 –      <exclude name="**/SyntaxTest.java"/>
506 –      <exclude name="**/SuperfluousAbstract.java"/>
507 –      <manifest>
508 –        <attribute name="Built-By" value="${user.name}"/>
509 –        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
510 –      </manifest>
511 –    </jar>
512 –  </target>
513 –
514 –
512    <target name="clean"
513            description="Removes all build products">
514      <delete dir="${build.dir}"/>
# 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>
# Line 583 | Line 580
580            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
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> -->
592 –
598   <!--   </target> -->
599  
600 < <!--   <target name="test89" -->
601 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
597 <
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 631 | Line 715
715    </target>
716  
717  
634 –
635 –  <!-- Various demos and test programs -->
636 –
637 –
638 –  <!-- description="Benchmark from Doug Lea's AQS paper" -->
639 –  <target name="loops" depends="configure-compiler">
640 –
641 –    <mkdir dir="${build.loops.dir}"/>
642 –
643 –    <javac srcdir="${loops.src.dir}"
644 –          destdir="${build.loops.dir}"
645 –            debug="${build.debug}"
646 –       debuglevel="${build.debuglevel}"
647 –      deprecation="${build.deprecation}"
648 –           source="${build.sourcelevel}"
649 –           target="${build.sourcelevel}"
650 –         encoding="ASCII"
651 –             fork="true">
652 –
653 –      <compilerarg line="${build.args}"/>
654 –      <classpath refid="loops.classpath"/>
655 –      <compilerarg value="-XDignore.symbol.file=true"/>
656 –
657 –    </javac>
658 –
659 –    <java classname="ALoops" fork="true">
660 –      <classpath refid="loops.classpath"/>
661 –    </java>
662 –  </target>
663 –
664 –
718    <target name="compile-test-loops" depends="jar"
719            description="Compiles all the perf tests in src/test/loops">
720  
# Line 675 | 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 816 | 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;"/> -->
824 <      <arg value="-tag"/>
825 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
826 <      <arg value="-tag"/>
827 <      <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 1354 | Line 1403
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 1369 | 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 (experimental)">
# Line 1393 | 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"/>
1401 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1402 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1403 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1404 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1405 <      <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
1408 <                          -Xep:MissingOverride:OFF
1409 <                          -Xep:MixedArrayDimensions:WARN
1410 <                          -Xep:RemoveUnusedImports:ERROR
1411 <                          -Xep:ClassName:ERROR
1412 <                          -Xep:MultipleTopLevelClasses:ERROR
1413 <                          -Xep:EmptyIf:ERROR
1414 <                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1415 <                          -Xep:ArgumentParameterSwap:ERROR
1416 <                          -Xep:RedundantThrows:ERROR
1417 <                          -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 1429 | 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"/>
1440 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1441 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1442 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1443 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1444 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1445 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
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 <                            -Xep:IdentityBinaryExpression:WARN
1509 <                            -Xep:BoxedPrimitiveConstructor:OFF
1449 <                            -Xep:HashtableContains:OFF
1450 <                            -Xep:ModifyingCollectionWithItself:OFF
1451 <                            -Xep:MissingOverride:OFF
1452 <                            -Xep:MixedArrayDimensions:WARN
1453 <                            -Xep:RemoveUnusedImports:ERROR
1454 <                            -Xep:ClassName:ERROR
1455 <                            -Xep:MultipleTopLevelClasses:ERROR
1456 <                            -Xep:EmptyIf:ERROR
1457 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1458 <                            -Xep:ArgumentParameterSwap:ERROR
1459 <                            -Xep:RedundantThrows:ERROR
1460 <                            -Xep:MethodCanBeStatic:WARN"/>
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 1516 | 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