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.316 by jsr166, Fri Jun 19 17:40:45 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 138 | Line 142
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"/>
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 511 | Line 518
518            description="Runs tck and jtreg tests for src/main"/>
519  
520    <target name="test-version-permutations"
521 <          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
521 >          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"/>
525  
526    <target name="test11">
# Line 574 | Line 583
583      </antcall>
584    </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">
599      <antcall>
600        <param name="java.runtime.target" value="12"/>
# Line 618 | Line 639
639        <param name="build.main.javadoc.source" value="11"/>
640        <target name="clean"/>
641        <target name="test"/>
642 +      <target name="docs"/>
643 +    </antcall>
644 +  </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>

Diff Legend

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