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

Diff of /jsr166/build.xml

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

revision 1.320 by jsr166, Tue Sep 15 19:09:50 2020 UTC revision 1.321 by jsr166, Sat Dec 12 18:58:10 2020 UTC
# Line 25  Line 25 
25    $HOME/jdk/jdk14    $HOME/jdk/jdk14
26    $HOME/jdk/jdk15    $HOME/jdk/jdk15
27    $HOME/jdk/jdk16    $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
# Line 32  Line 33 
33    $HOME/jdk/src/jdk14    $HOME/jdk/src/jdk14
34    $HOME/jdk/src/jdk15    $HOME/jdk/src/jdk15
35    $HOME/jdk/src/jdk16    $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 .. 16 ...    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 102  Line 104 
104    <defjdklocations v="14"/>    <defjdklocations v="14"/>
105    <defjdklocations v="15"/>    <defjdklocations v="15"/>
106    <defjdklocations v="16"/>    <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 114  Line 117 
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"/>    <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 143  Line 147 
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://docs.oracle.com/en/java/javase/15/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"/>    <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 152  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="${java15.docroot.url}/api/"/>    <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 254  Line 260 
260      </sequential>      </sequential>
261    </macrodef>    </macrodef>
262    
263      <defjtregtests v="17"/>
264    <defjtregtests v="16"/>    <defjtregtests v="16"/>
265    <defjtregtests v="15"/>    <defjtregtests v="15"/>
266    <defjtregtests v="14"/>    <defjtregtests v="14"/>

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

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