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

Diff of /jsr166/build.xml

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

revision 1.313 by jsr166, Mon Apr 27 23:47:11 2020 UTC revision 1.316 by jsr166, Fri Jun 19 17:40:45 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    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
29    $HOME/jdk/src/jdk11    $HOME/jdk/src/jdk11
30    $HOME/jdk/src/jdk12    $HOME/jdk/src/jdk12
31    $HOME/jdk/src/jdk13    $HOME/jdk/src/jdk13
32    $HOME/jdk/src/jdk14    $HOME/jdk/src/jdk14
33    $HOME/jdk/src/jdk15    $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.    where each of the above is a JDK source tree or a symlink to same.
36    
37    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
38    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
39    for $N in 11 .. 15 ...    for $N in 11 .. 16 ...
40    
41    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.
42    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 101 
101    <defjdklocations v="13"/>    <defjdklocations v="13"/>
102    <defjdklocations v="14"/>    <defjdklocations v="14"/>
103    <defjdklocations v="15"/>    <defjdklocations v="15"/>
104      <defjdklocations v="16"/>
105    
106    <!-- Source locations -->    <!-- Source locations -->
107    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 110  Line 113 
113    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
114    <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>    <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
115    <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>    <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}"/>    <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
118    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
119    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 138  Line 142 
142    <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"/>
143    <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"/>
144    <property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/docs"/>    <property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/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) -->    <!-- Default jdk doc location (latest stable LTS release seems best) -->
147    <property name="java.docroot.url"   value="${java11.docroot.url}"/>    <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/"/>    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
153    <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>    <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
154    <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>    <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/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
157    
158    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 248  Line 254 
254      </sequential>      </sequential>
255    </macrodef>    </macrodef>
256    
257      <defjtregtests v="16"/>
258    <defjtregtests v="15"/>    <defjtregtests v="15"/>
259    <defjtregtests v="14"/>    <defjtregtests v="14"/>
260    <defjtregtests v="13"/>    <defjtregtests v="13"/>
# Line 352  Line 359 
359  <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->  <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
360        <compilerarg value="-Xlint:all,-removal"/>        <compilerarg value="-Xlint:all,-removal"/>
361        <compilerarg line="--doclint-format html5"/>        <compilerarg line="--doclint-format html5"/>
362  <!--  Temporarily disable doclint, due to https://bugs.openjdk.java.net/browse/JDK-8214571 -->  <!--  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"/> -->  <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
366          <compilerarg value="-Xdoclint:all/protected"/>
367        <compilerarg value="-Xdoclint/package:java.util.*"/>        <compilerarg value="-Xdoclint/package:java.util.*"/>
368        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
369        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
# Line 410  Line 420 
420               executable="${build.main.javadoc}">               executable="${build.main.javadoc}">
421  <!-- TODO: JDK-8214571 failonerror = "true" -->  <!-- TODO: JDK-8214571 failonerror = "true" -->
422        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
423          <include name="**/*.java"/>          <include name="java/**/*.java"/>
424        </fileset>        </fileset>
425        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
426        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
# Line 508  Line 518 
518            description="Runs tck and jtreg tests for src/main"/>            description="Runs tck and jtreg tests for src/main"/>
519    
520    <target name="test-version-permutations"    <target name="test-version-permutations"
521            depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"            depends="test11, test12, test13, test14, test15, test16,
522              test11-12, test11-13, test11-14, test11-15, test11-16,
523              clean, test, docs"
524            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"/>
525    
526    <target name="test11">    <target name="test11">
# Line 571  Line 583 
583      </antcall>      </antcall>
584    </target>    </target>
585    
586      <target name="test16">
587        <antcall>
588          <param name="java.runtime.target" value="16"/>
589          <param name="build.main.javac" value="${javac16}"/>
590          <param name="build.main.javadoc" value="${javadoc16}"/>
591          <param name="build.main.javadoc.source" value="16"/>
592          <target name="clean"/>
593          <target name="test"/>
594          <target name="docs"/>
595        </antcall>
596      </target>
597    
598    <target name="test11-12">    <target name="test11-12">
599      <antcall>      <antcall>
600        <param name="java.runtime.target" value="12"/>        <param name="java.runtime.target" value="12"/>
# Line 619  Line 643 
643      </antcall>      </antcall>
644    </target>    </target>
645    
646      <target name="test11-16">
647        <antcall>
648          <param name="java.runtime.target" value="16"/>
649          <param name="build.main.javac" value="${javac11}"/>
650          <param name="build.main.javadoc" value="${javadoc16}"/>
651          <param name="build.main.javadoc.source" value="11"/>
652          <target name="clean"/>
653          <target name="test"/>
654          <target name="docs"/>
655        </antcall>
656      </target>
657    
658    
659    <target name="configure-compiler">    <target name="configure-compiler">
660      <fail message="ant version too old">      <fail message="ant version too old">
Legend:
Removed from v.1.313  
changed lines
  Added in v.1.316
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27