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.313 by jsr166, Mon Apr 27 23:47:11 2020 UTC vs.
Revision 1.320 by jsr166, Tue Sep 15 19:09:50 2020 UTC

# Line 24 | Line 24
24    $HOME/jdk/jdk13
25    $HOME/jdk/jdk14
26    $HOME/jdk/jdk15
27 +  $HOME/jdk/jdk16
28    where each of the above is a JDK or a symlink to same, and
29    $HOME/jdk/src/jdk11
30    $HOME/jdk/src/jdk12
31    $HOME/jdk/src/jdk13
32    $HOME/jdk/src/jdk14
33    $HOME/jdk/src/jdk15
34 +  $HOME/jdk/src/jdk16
35    where each of the above is a JDK source tree or a symlink to same.
36  
37    Alternatively, define ant variables thus:
38    ant -Djdk$N.home=... -Djdk$N.src.home=...
39 <  for $N in 11 .. 15 ...
39 >  for $N in 11 .. 16 ...
40  
41    As of 2016-03, the sources in src/main are for jdk9+ only.
42    As of 2019-08, the sources in src/main are for jdk11+ only.
# Line 99 | Line 101
101    <defjdklocations v="13"/>
102    <defjdklocations v="14"/>
103    <defjdklocations v="15"/>
104 +  <defjdklocations v="16"/>
105  
106    <!-- Source locations -->
107    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 110 | Line 113
113    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
114    <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
115    <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
116 +  <property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
117    <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
118    <property name="lib.dir"              location="${basedir}/lib"/>
119    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 137 | Line 141
141    <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
142    <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
143    <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
144 <  <property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/docs"/>
144 >  <property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/>
145 >  <property name="java16.docroot.url" value="https://download.java.net/java/early_access/jdk16/docs"/>
146    <!-- Default jdk doc location (latest stable LTS release seems best) -->
147    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
148  
# Line 147 | Line 152
152    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
153    <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
154    <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
155 +  <property name="java16.api.url"     value="${java15.docroot.url}/api/"/>
156    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
157  
158    <!-- Define the "jtreg" task -->
# Line 248 | Line 254
254      </sequential>
255    </macrodef>
256  
257 +  <defjtregtests v="16"/>
258    <defjtregtests v="15"/>
259    <defjtregtests v="14"/>
260    <defjtregtests v="13"/>
# Line 352 | Line 359
359   <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
360        <compilerarg value="-Xlint:all,-removal"/>
361        <compilerarg line="--doclint-format html5"/>
362 < <!--  Temporarily disable doclint, due to https://bugs.openjdk.java.net/browse/JDK-8214571 -->
362 > <!--  Temporarily disable doclint for private elements, due to -->
363 > <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
364 > <!--  which is expected to be fixed in openjdk 11.0.8 -->
365   <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
366 +      <compilerarg value="-Xdoclint:all/protected"/>
367        <compilerarg value="-Xdoclint/package:java.util.*"/>
368        <compilerarg value="-Werror"/>
369        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
# Line 410 | Line 420
420               executable="${build.main.javadoc}">
421   <!-- TODO: JDK-8214571 failonerror = "true" -->
422        <fileset dir="${src.dir}" defaultexcludes="yes">
423 <        <include name="**/*.java"/>
423 >        <include name="java/**/*.java"/>
424        </fileset>
425        <arg line="-Xdocrootparent ${java.docroot.url}"/>
426        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
427        <arg value="-quiet"/>
428        <arg value="-XDignore.symbol.file=true"/>
429        <arg value="-html5"/>
430 +      <arg value="-Xdoclint:all,-missing"/>
431        <arg value="--patch-module=java.base=${src.dir}"/>
432        <arg value="--frames" if:set="use-frames"/>
433        <arg value="--override-methods=summary"/>
# Line 508 | Line 519
519            description="Runs tck and jtreg tests for src/main"/>
520  
521    <target name="test-version-permutations"
522 <          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
522 >          depends="test11, test12, test13, test14, test15, test16,
523 >          test11-12, test11-13, test11-14, test11-15, test11-16,
524 >          clean, test, docs"
525            description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
526  
527    <target name="test11">
# Line 571 | Line 584
584      </antcall>
585    </target>
586  
587 +  <target name="test16">
588 +    <antcall>
589 +      <param name="java.runtime.target" value="16"/>
590 +      <param name="build.main.javac" value="${javac16}"/>
591 +      <param name="build.main.javadoc" value="${javadoc16}"/>
592 +      <param name="build.main.javadoc.source" value="16"/>
593 +      <target name="clean"/>
594 +      <target name="test"/>
595 +      <target name="docs"/>
596 +    </antcall>
597 +  </target>
598 +
599    <target name="test11-12">
600      <antcall>
601        <param name="java.runtime.target" value="12"/>
# Line 619 | Line 644
644      </antcall>
645    </target>
646  
647 +  <target name="test11-16">
648 +    <antcall>
649 +      <param name="java.runtime.target" value="16"/>
650 +      <param name="build.main.javac" value="${javac11}"/>
651 +      <param name="build.main.javadoc" value="${javadoc16}"/>
652 +      <param name="build.main.javadoc.source" value="11"/>
653 +      <target name="clean"/>
654 +      <target name="test"/>
655 +      <target name="docs"/>
656 +    </antcall>
657 +  </target>
658 +
659 +  <target name="docs16">
660 +    <antcall>
661 +      <param name="java.runtime.target" value="16"/>
662 +      <param name="build.main.javac" value="${javac16}"/>
663 +      <param name="build.main.javadoc" value="${javadoc16}"/>
664 +      <param name="build.main.javadoc.source" value="16"/>
665 +      <target name="clean"/>
666 +      <target name="docs"/>
667 +    </antcall>
668 +  </target>
669 +
670  
671    <target name="configure-compiler">
672      <fail message="ant version too old">
# Line 706 | Line 754
754    <property name="errorprone.jsr166.user.flags" value=""/>
755    <property name="errorprone.jsr166.flags"
756              value="-Xep:HashtableContains:OFF
757 +                   -Xep:PreferJavaTimeOverload:OFF
758                     -Xep:JdkObsolete:OFF
759                     -Xep:MissingOverride:OFF
760                     -Xep:MissingFail:OFF
# Line 725 | Line 774
774    <property name="errorprone.jsr166.test.flags"
775              value="-Xep:StringSplitter:OFF
776                     -Xep:BoxedPrimitiveConstructor:OFF
777 +                   -Xep:UnnecessaryParentheses:OFF
778                     -Xep:ModifyingCollectionWithItself:OFF"/>
779    <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
780    <target name="errorprone"

Diff Legend

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