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.315 by jsr166, Fri Jun 5 00:59:33 2020 UTC vs.
Revision 1.321 by jsr166, Sat Dec 12 18:58:10 2020 UTC

# Line 24 | Line 24
24    $HOME/jdk/jdk13
25    $HOME/jdk/jdk14
26    $HOME/jdk/jdk15
27 +  $HOME/jdk/jdk16
28 +  $HOME/jdk/jdk17
29    where each of the above is a JDK or a symlink to same, and
30    $HOME/jdk/src/jdk11
31    $HOME/jdk/src/jdk12
32    $HOME/jdk/src/jdk13
33    $HOME/jdk/src/jdk14
34    $HOME/jdk/src/jdk15
35 +  $HOME/jdk/src/jdk16
36 +  $HOME/jdk/src/jdk17
37    where each of the above is a JDK source tree or a symlink to same.
38  
39    Alternatively, define ant variables thus:
40    ant -Djdk$N.home=... -Djdk$N.src.home=...
41 <  for $N in 11 .. 15 ...
41 >  for $N in 11 .. 17 ...
42  
43    As of 2016-03, the sources in src/main are for jdk9+ only.
44    As of 2019-08, the sources in src/main are for jdk11+ only.
# Line 99 | Line 103
103    <defjdklocations v="13"/>
104    <defjdklocations v="14"/>
105    <defjdklocations v="15"/>
106 +  <defjdklocations v="16"/>
107 +  <defjdklocations v="17"/>
108  
109    <!-- Source locations -->
110    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 110 | Line 116
116    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
117    <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
118    <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
119 +  <property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
120 +  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
121    <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
122    <property name="lib.dir"              location="${basedir}/lib"/>
123    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 137 | Line 145
145    <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
146    <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
147    <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
148 <  <property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/docs"/>
148 >  <property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/>
149 >  <property name="java16.docroot.url" value="https://download.java.net/java/early_access/jdk16/docs"/>
150 >  <property name="java17.docroot.url" value="https://download.java.net/java/early_access/jdk17/docs"/>
151    <!-- Default jdk doc location (latest stable LTS release seems best) -->
152    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
153  
# Line 147 | Line 157
157    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
158    <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
159    <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
160 +  <property name="java16.api.url"     value="${java16.docroot.url}/api/"/>
161 +  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
162    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
163  
164    <!-- Define the "jtreg" task -->
# Line 248 | Line 260
260      </sequential>
261    </macrodef>
262  
263 +  <defjtregtests v="17"/>
264 +  <defjtregtests v="16"/>
265    <defjtregtests v="15"/>
266    <defjtregtests v="14"/>
267    <defjtregtests v="13"/>
# Line 420 | Line 434
434        <arg value="-quiet"/>
435        <arg value="-XDignore.symbol.file=true"/>
436        <arg value="-html5"/>
437 +      <arg value="-Xdoclint:all,-missing"/>
438        <arg value="--patch-module=java.base=${src.dir}"/>
439        <arg value="--frames" if:set="use-frames"/>
440        <arg value="--override-methods=summary"/>
# Line 511 | Line 526
526            description="Runs tck and jtreg tests for src/main"/>
527  
528    <target name="test-version-permutations"
529 <          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
529 >          depends="test11, test12, test13, test14, test15, test16,
530 >          test11-12, test11-13, test11-14, test11-15, test11-16,
531 >          clean, test, docs"
532            description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
533  
534    <target name="test11">
# Line 574 | Line 591
591      </antcall>
592    </target>
593  
594 +  <target name="test16">
595 +    <antcall>
596 +      <param name="java.runtime.target" value="16"/>
597 +      <param name="build.main.javac" value="${javac16}"/>
598 +      <param name="build.main.javadoc" value="${javadoc16}"/>
599 +      <param name="build.main.javadoc.source" value="16"/>
600 +      <target name="clean"/>
601 +      <target name="test"/>
602 +      <target name="docs"/>
603 +    </antcall>
604 +  </target>
605 +
606    <target name="test11-12">
607      <antcall>
608        <param name="java.runtime.target" value="12"/>
# Line 622 | Line 651
651      </antcall>
652    </target>
653  
654 +  <target name="test11-16">
655 +    <antcall>
656 +      <param name="java.runtime.target" value="16"/>
657 +      <param name="build.main.javac" value="${javac11}"/>
658 +      <param name="build.main.javadoc" value="${javadoc16}"/>
659 +      <param name="build.main.javadoc.source" value="11"/>
660 +      <target name="clean"/>
661 +      <target name="test"/>
662 +      <target name="docs"/>
663 +    </antcall>
664 +  </target>
665 +
666 +  <target name="docs16">
667 +    <antcall>
668 +      <param name="java.runtime.target" value="16"/>
669 +      <param name="build.main.javac" value="${javac16}"/>
670 +      <param name="build.main.javadoc" value="${javadoc16}"/>
671 +      <param name="build.main.javadoc.source" value="16"/>
672 +      <target name="clean"/>
673 +      <target name="docs"/>
674 +    </antcall>
675 +  </target>
676 +
677  
678    <target name="configure-compiler">
679      <fail message="ant version too old">
# Line 709 | Line 761
761    <property name="errorprone.jsr166.user.flags" value=""/>
762    <property name="errorprone.jsr166.flags"
763              value="-Xep:HashtableContains:OFF
764 +                   -Xep:PreferJavaTimeOverload:OFF
765                     -Xep:JdkObsolete:OFF
766                     -Xep:MissingOverride:OFF
767                     -Xep:MissingFail:OFF
# Line 728 | Line 781
781    <property name="errorprone.jsr166.test.flags"
782              value="-Xep:StringSplitter:OFF
783                     -Xep:BoxedPrimitiveConstructor:OFF
784 +                   -Xep:UnnecessaryParentheses:OFF
785                     -Xep:ModifyingCollectionWithItself:OFF"/>
786    <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
787    <target name="errorprone"

Diff Legend

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