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.309 by jsr166, Mon Dec 16 22:12:32 2019 UTC vs.
Revision 1.310 by jsr166, Tue Dec 17 02:09:40 2019 UTC

# Line 23 | Line 23
23    $HOME/jdk/jdk12
24    $HOME/jdk/jdk13
25    $HOME/jdk/jdk14
26 +  $HOME/jdk/jdk15
27    where each of the above is a JDK or a symlink to same, and
28    $HOME/jdk/src/jdk11
29    $HOME/jdk/src/jdk12
30    $HOME/jdk/src/jdk13
31    $HOME/jdk/src/jdk14
32 +  $HOME/jdk/src/jdk15
33    where each of the above is a JDK source tree or a symlink to same.
34  
35    Alternatively, define ant variables thus:
36    ant -Djdk$N.home=... -Djdk$N.src.home=...
37 <  for $N in 11 .. 14 ...
37 >  for $N in 11 .. 15 ...
38  
39    As of 2016-03, the sources in src/main are for jdk9+ only.
40    As of 2019-08, the sources in src/main are for jdk11+ only.
# Line 96 | Line 98
98    <defjdklocations v="12"/>
99    <defjdklocations v="13"/>
100    <defjdklocations v="14"/>
101 +  <defjdklocations v="15"/>
102  
103    <!-- Source locations -->
104    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 106 | Line 109
109    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
110    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
111    <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
112 +  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
113    <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
114    <property name="lib.dir"              location="${basedir}/lib"/>
115    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 133 | Line 137
137    <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
138    <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
139    <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
140 +  <property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/docs"/>
141    <!-- Default jdk doc location (latest stable LTS release seems best) -->
142    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
143  
# Line 141 | Line 146
146    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
147    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
148    <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
149 +  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
150    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
151  
152    <!-- Define the "jtreg" task -->
# Line 242 | Line 248
248      </sequential>
249    </macrodef>
250  
251 +  <defjtregtests v="15"/>
252    <defjtregtests v="14"/>
253    <defjtregtests v="13"/>
254    <defjtregtests v="12"/>
# Line 500 | Line 507
507            description="Runs tck and jtreg tests for src/main"/>
508  
509    <target name="test-version-permutations"
510 <          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
510 >          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs">
511    </target>
512  
513    <target name="test11">
# Line 551 | Line 558
558      </antcall>
559    </target>
560  
561 +  <target name="test15">
562 +    <antcall>
563 +      <param name="java.runtime.target" value="15"/>
564 +      <param name="build.main.javac" value="${javac15}"/>
565 +      <param name="build.main.javadoc" value="${javadoc15}"/>
566 +      <param name="build.main.javadoc.source" value="15"/>
567 +      <target name="clean"/>
568 +      <target name="test"/>
569 +      <target name="docs"/>
570 +    </antcall>
571 +  </target>
572 +
573    <target name="test11-12">
574      <antcall>
575        <param name="java.runtime.target" value="12"/>
# Line 583 | Line 602
602        <param name="build.main.javadoc.source" value="11"/>
603        <target name="clean"/>
604        <target name="test"/>
605 +      <target name="docs"/>
606 +    </antcall>
607 +  </target>
608 +
609 +  <target name="test11-15">
610 +    <antcall>
611 +      <param name="java.runtime.target" value="15"/>
612 +      <param name="build.main.javac" value="${javac11}"/>
613 +      <param name="build.main.javadoc" value="${javadoc15}"/>
614 +      <param name="build.main.javadoc.source" value="11"/>
615 +      <target name="clean"/>
616 +      <target name="test"/>
617        <target name="docs"/>
618      </antcall>
619    </target>

Diff Legend

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