/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.308 by jsr166, Thu Oct 17 17:28:49 2019 UTC revision 1.321 by jsr166, Sat Dec 12 18:58:10 2020 UTC
# Line 23  Line 23 
23    $HOME/jdk/jdk12    $HOME/jdk/jdk12
24    $HOME/jdk/jdk13    $HOME/jdk/jdk13
25    $HOME/jdk/jdk14    $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    where each of the above is a JDK or a symlink to same, and
30    $HOME/jdk/src/jdk11    $HOME/jdk/src/jdk11
31    $HOME/jdk/src/jdk12    $HOME/jdk/src/jdk12
32    $HOME/jdk/src/jdk13    $HOME/jdk/src/jdk13
33    $HOME/jdk/src/jdk14    $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.    where each of the above is a JDK source tree or a symlink to same.
38    
39    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
40    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
41    for $N in 11 .. 14 ...    for $N in 11 .. 17 ...
42    
43    As of 2016-03, the sources in src/main are for jdk9+ only.    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.    As of 2019-08, the sources in src/main are for jdk11+ only.
# Line 96  Line 102 
102    <defjdklocations v="12"/>    <defjdklocations v="12"/>
103    <defjdklocations v="13"/>    <defjdklocations v="13"/>
104    <defjdklocations v="14"/>    <defjdklocations v="14"/>
105      <defjdklocations v="15"/>
106      <defjdklocations v="16"/>
107      <defjdklocations v="17"/>
108    
109    <!-- Source locations -->    <!-- Source locations -->
110    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 106  Line 115 
115    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
116    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
117    <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>    <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}"/>    <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
122    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
123    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 132  Line 144 
144    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
145    <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>    <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"/>    <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
147    <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>    <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/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) -->    <!-- Default jdk doc location (latest stable LTS release seems best) -->
152    <property name="java.docroot.url"   value="${java11.docroot.url}"/>    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
153    
# Line 141  Line 156 
156    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
157    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
158    <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>    <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/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
163    
164    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 242  Line 260 
260      </sequential>      </sequential>
261    </macrodef>    </macrodef>
262    
263      <defjtregtests v="17"/>
264      <defjtregtests v="16"/>
265      <defjtregtests v="15"/>
266    <defjtregtests v="14"/>    <defjtregtests v="14"/>
267    <defjtregtests v="13"/>    <defjtregtests v="13"/>
268    <defjtregtests v="12"/>    <defjtregtests v="12"/>
# Line 345  Line 366 
366  <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->  <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
367        <compilerarg value="-Xlint:all,-removal"/>        <compilerarg value="-Xlint:all,-removal"/>
368        <compilerarg line="--doclint-format html5"/>        <compilerarg line="--doclint-format html5"/>
369        <compilerarg value="-Xdoclint:all/protected,reference/private"/>  <!--  Temporarily disable doclint for private elements, due to -->
370    <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
371    <!--  which is expected to be fixed in openjdk 11.0.8 -->
372    <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
373          <compilerarg value="-Xdoclint:all/protected"/>
374        <compilerarg value="-Xdoclint/package:java.util.*"/>        <compilerarg value="-Xdoclint/package:java.util.*"/>
375        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
376        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
# Line 402  Line 427 
427               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
428  <!-- TODO: JDK-8214571 failonerror = "true" -->  <!-- TODO: JDK-8214571 failonerror = "true" -->
429        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
430          <include name="**/*.java"/>          <include name="java/**/*.java"/>
431        </fileset>        </fileset>
432        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
433        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
434        <arg value="-quiet"/>        <arg value="-quiet"/>
435        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
436        <arg value="-html5"/>        <arg value="-html5"/>
437          <arg value="-Xdoclint:all,-missing"/>
438        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
439        <arg value="--frames" if:set="use-frames"/>        <arg value="--frames" if:set="use-frames"/>
440        <arg value="--override-methods=summary"/>        <arg value="--override-methods=summary"/>
# Line 500  Line 526 
526            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
527    
528    <target name="test-version-permutations"    <target name="test-version-permutations"
529            depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">            depends="test11, test12, test13, test14, test15, test16,
530    </target>            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">    <target name="test11">
535      <antcall>      <antcall>
# Line 551  Line 579 
579      </antcall>      </antcall>
580    </target>    </target>
581    
582      <target name="test15">
583        <antcall>
584          <param name="java.runtime.target" value="15"/>
585          <param name="build.main.javac" value="${javac15}"/>
586          <param name="build.main.javadoc" value="${javadoc15}"/>
587          <param name="build.main.javadoc.source" value="15"/>
588          <target name="clean"/>
589          <target name="test"/>
590          <target name="docs"/>
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">    <target name="test11-12">
607      <antcall>      <antcall>
608        <param name="java.runtime.target" value="12"/>        <param name="java.runtime.target" value="12"/>
# Line 587  Line 639 
639      </antcall>      </antcall>
640    </target>    </target>
641    
642      <target name="test11-15">
643        <antcall>
644          <param name="java.runtime.target" value="15"/>
645          <param name="build.main.javac" value="${javac11}"/>
646          <param name="build.main.javadoc" value="${javadoc15}"/>
647          <param name="build.main.javadoc.source" value="11"/>
648          <target name="clean"/>
649          <target name="test"/>
650          <target name="docs"/>
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">    <target name="configure-compiler">
679      <fail message="ant version too old">      <fail message="ant version too old">
# Line 664  Line 751 
751    https://github.com/google/error-prone/issues/1143    https://github.com/google/error-prone/issues/1143
752  =================================================================== -->  =================================================================== -->
753    <path id="errorprone.processorpath.path">    <path id="errorprone.processorpath.path">
754      <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>      <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
755      <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>      <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
756      <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>      <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
757      <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>      <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
758        <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
759    </path>    </path>
760    <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />    <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
761    <property name="errorprone.jsr166.user.flags" value=""/>    <property name="errorprone.jsr166.user.flags" value=""/>
762    <property name="errorprone.jsr166.flags"    <property name="errorprone.jsr166.flags"
763              value="-Xep:HashtableContains:OFF              value="-Xep:HashtableContains:OFF
764                       -Xep:PreferJavaTimeOverload:OFF
765                     -Xep:JdkObsolete:OFF                     -Xep:JdkObsolete:OFF
766                     -Xep:MissingOverride:OFF                     -Xep:MissingOverride:OFF
767                     -Xep:MissingFail:OFF                     -Xep:MissingFail:OFF
# Line 692  Line 781 
781    <property name="errorprone.jsr166.test.flags"    <property name="errorprone.jsr166.test.flags"
782              value="-Xep:StringSplitter:OFF              value="-Xep:StringSplitter:OFF
783                     -Xep:BoxedPrimitiveConstructor:OFF                     -Xep:BoxedPrimitiveConstructor:OFF
784                       -Xep:UnnecessaryParentheses:OFF
785                     -Xep:ModifyingCollectionWithItself:OFF"/>                     -Xep:ModifyingCollectionWithItself:OFF"/>
786    <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->    <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
787    <target name="errorprone"    <target name="errorprone"

Legend:
Removed from v.1.308  
changed lines
  Added in v.1.321

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27