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.274 by jsr166, Fri Jun 22 18:55:33 2018 UTC vs.
Revision 1.275 by jsr166, Wed Jul 18 01:16:42 2018 UTC

# Line 23 | Line 23
23    $HOME/jdk/jdk9
24    $HOME/jdk/jdk10
25    $HOME/jdk/jdk11
26 +  $HOME/jdk/jdk12
27    where each of the above is a JDK or a symlink to same, and
28    $HOME/jdk/src/jdk8
29    $HOME/jdk/src/jdk9
30    $HOME/jdk/src/jdk10
31    $HOME/jdk/src/jdk11
32 +  $HOME/jdk/src/jdk12
33    where each of the above is a complete JDK source tree
34    (e.g. mercurial forest) or a symlink to same.
35  
# Line 136 | Line 138
138    <defjdklocations v="9"/>
139    <defjdklocations v="10"/>
140    <defjdklocations v="11"/>
141 +  <defjdklocations v="12"/>
142  
143    <!-- Source locations -->
144    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 147 | Line 150
150    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
151    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
152    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
153 +  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
154    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
155    <property name="lib.dir"              location="${basedir}/lib"/>
156    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 197 | Line 201
201    <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
202    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
203    <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
204 +  <property name="java12.docroot.url" value="http://download.java.net/java/jdk12/docs"/>
205    <!-- Default jdk doc location (latest stable release seems best) -->
206    <property name="java.docroot.url"   value="${java10.docroot.url}"/>
207  
# Line 208 | Line 213
213    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
214    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
215    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
216 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
217    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
218  
219    <!-- Define the "jtreg" task -->
# Line 321 | Line 327
327      </sequential>
328    </macrodef>
329  
330 +  <defjtregtests v="12"/>
331    <defjtregtests v="11"/>
332    <defjtregtests v="10"/>
333    <defjtregtests v="9"/>
# Line 607 | Line 614
614  
615   <!--   </target> -->
616  
617 <  <target name="test91011"
617 >  <target name="test9101112"
618            description="Runs tck and jtreg tests for src/main for multiple java versions">
619  
620      <antcall target="clean"/>
# Line 625 | Line 632
632        <param name="build.main.java.version" value="11"/>
633      </antcall>
634  
635 +    <antcall target="clean"/>
636 +    <antcall target="test">
637 +      <param name="build.main.java.version" value="12"/>
638 +    </antcall>
639 +
640      <!-- Clean up to avoid obscure wrong class file version bugs -->
641      <antcall target="clean"/>
642  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines