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

Diff of /jsr166/build.xml

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

revision 1.314 by jsr166, Wed May 6 16:51:05 2020 UTC revision 1.322 by jsr166, Sat Dec 12 22:13:53 2020 UTC
# Line 24  Line 24 
24    $HOME/jdk/jdk13    $HOME/jdk/jdk13
25    $HOME/jdk/jdk14    $HOME/jdk/jdk14
26    $HOME/jdk/jdk15    $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    $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 .. 15 ...    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 99  Line 103 
103    <defjdklocations v="13"/>    <defjdklocations v="13"/>
104    <defjdklocations v="14"/>    <defjdklocations v="14"/>
105    <defjdklocations v="15"/>    <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 110  Line 116 
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"/>    <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 137  Line 145 
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://docs.oracle.com/en/java/javase/14/docs"/>    <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"/>    <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 147  Line 157 
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/"/>    <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 248  Line 260 
260      </sequential>      </sequential>
261    </macrodef>    </macrodef>
262    
263      <defjtregtests v="17"/>
264      <defjtregtests v="16"/>
265    <defjtregtests v="15"/>    <defjtregtests v="15"/>
266    <defjtregtests v="14"/>    <defjtregtests v="14"/>
267    <defjtregtests v="13"/>    <defjtregtests v="13"/>
# Line 271  Line 285 
285      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
286      <property name="jtreg.verbose" value="nopass,fail,error"/>      <property name="jtreg.verbose" value="nopass,fail,error"/>
287    
288      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
289        <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
290        <!-- In 2020 concurrency:3 seems like a sweet spot -->
291        <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
292        <property name="jtreg.concurrency" value="3"/>
293    
294        <delete dir="@{workdir}/JTwork" quiet="true"/>
295      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
296             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
297             workDir="@{workdir}/JTwork">             workDir="@{workdir}/JTwork">
298        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
299        <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>        <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
300        <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>        <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
301          <arg value="-vmoption:-Xmx256m"/>
302          <arg value="-concurrency:${jtreg.concurrency}"/>
303          <arg value="-vmoptions:-esa -ea"/>
304        <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>        <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
305        <arg value="-agentvm"/>        <arg value="-agentvm"/>
306        <arg value="-noreport"/>        <arg value="-noreport"/>
307        <arg value="-verbose:@{verbose}"/>        <arg value="-verbose:@{verbose}"/>
       <arg value="-vmoptions:-esa -ea"/>  
308        <arg value="-automatic"/>        <arg value="-automatic"/>
309        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
310        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
# Line 413  Line 435 
435               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
436  <!-- TODO: JDK-8214571 failonerror = "true" -->  <!-- TODO: JDK-8214571 failonerror = "true" -->
437        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
438          <include name="**/*.java"/>          <include name="java/**/*.java"/>
439        </fileset>        </fileset>
440        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
441        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
442        <arg value="-quiet"/>        <arg value="-quiet"/>
443        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
444        <arg value="-html5"/>        <arg value="-html5"/>
445          <arg value="-Xdoclint:all,-missing"/>
446        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
447        <arg value="--frames" if:set="use-frames"/>        <arg value="--frames" if:set="use-frames"/>
448        <arg value="--override-methods=summary"/>        <arg value="--override-methods=summary"/>
# Line 511  Line 534 
534            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
535    
536    <target name="test-version-permutations"    <target name="test-version-permutations"
537            depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"            depends="test11, test12, test13, test14, test15, test16,
538              test11-12, test11-13, test11-14, test11-15, test11-16,
539              clean, test, docs"
540            description="Runs tck and jtreg tests for various build-time and runtime java versions"/>            description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
541    
542    <target name="test11">    <target name="test11">
# Line 574  Line 599 
599      </antcall>      </antcall>
600    </target>    </target>
601    
602      <target name="test16">
603        <antcall>
604          <param name="java.runtime.target" value="16"/>
605          <param name="build.main.javac" value="${javac16}"/>
606          <param name="build.main.javadoc" value="${javadoc16}"/>
607          <param name="build.main.javadoc.source" value="16"/>
608          <target name="clean"/>
609          <target name="test"/>
610          <target name="docs"/>
611        </antcall>
612      </target>
613    
614    <target name="test11-12">    <target name="test11-12">
615      <antcall>      <antcall>
616        <param name="java.runtime.target" value="12"/>        <param name="java.runtime.target" value="12"/>
# Line 622  Line 659 
659      </antcall>      </antcall>
660    </target>    </target>
661    
662      <target name="test11-16">
663        <antcall>
664          <param name="java.runtime.target" value="16"/>
665          <param name="build.main.javac" value="${javac11}"/>
666          <param name="build.main.javadoc" value="${javadoc16}"/>
667          <param name="build.main.javadoc.source" value="11"/>
668          <target name="clean"/>
669          <target name="test"/>
670          <target name="docs"/>
671        </antcall>
672      </target>
673    
674      <target name="docs16">
675        <antcall>
676          <param name="java.runtime.target" value="16"/>
677          <param name="build.main.javac" value="${javac16}"/>
678          <param name="build.main.javadoc" value="${javadoc16}"/>
679          <param name="build.main.javadoc.source" value="16"/>
680          <target name="clean"/>
681          <target name="docs"/>
682        </antcall>
683      </target>
684    
685    
686    <target name="configure-compiler">    <target name="configure-compiler">
687      <fail message="ant version too old">      <fail message="ant version too old">
# Line 709  Line 769 
769    <property name="errorprone.jsr166.user.flags" value=""/>    <property name="errorprone.jsr166.user.flags" value=""/>
770    <property name="errorprone.jsr166.flags"    <property name="errorprone.jsr166.flags"
771              value="-Xep:HashtableContains:OFF              value="-Xep:HashtableContains:OFF
772                       -Xep:PreferJavaTimeOverload:OFF
773                     -Xep:JdkObsolete:OFF                     -Xep:JdkObsolete:OFF
774                     -Xep:MissingOverride:OFF                     -Xep:MissingOverride:OFF
775                     -Xep:MissingFail:OFF                     -Xep:MissingFail:OFF
# Line 728  Line 789 
789    <property name="errorprone.jsr166.test.flags"    <property name="errorprone.jsr166.test.flags"
790              value="-Xep:StringSplitter:OFF              value="-Xep:StringSplitter:OFF
791                     -Xep:BoxedPrimitiveConstructor:OFF                     -Xep:BoxedPrimitiveConstructor:OFF
792                       -Xep:UnnecessaryParentheses:OFF
793                     -Xep:ModifyingCollectionWithItself:OFF"/>                     -Xep:ModifyingCollectionWithItself:OFF"/>
794    <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->    <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
795    <target name="errorprone"    <target name="errorprone"

Legend:
Removed from v.1.314  
changed lines
  Added in v.1.322

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