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.292 by jsr166, Thu Dec 13 01:12:01 2018 UTC vs.
Revision 1.294 by jsr166, Mon Dec 31 07:05:54 2018 UTC

# Line 24 | Line 24
24    $HOME/jdk/jdk10
25    $HOME/jdk/jdk11
26    $HOME/jdk/jdk12
27 +  $HOME/jdk/jdk13
28    where each of the above is a JDK or a symlink to same, and
29    $HOME/jdk/src/jdk8
30    $HOME/jdk/src/jdk9
31    $HOME/jdk/src/jdk10
32    $HOME/jdk/src/jdk11
33    $HOME/jdk/src/jdk12
34 +  $HOME/jdk/src/jdk13
35    where each of the above is a complete JDK source tree
36    (e.g. mercurial forest) or a symlink to same.
37  
38    Alternatively, define ant variables thus:
39    ant -Djdk$N.home=... -Djdk$N.src.home=...
40 <  for $N in 8 9 10 ...
40 >  for $N in 8 .. 13 ...
41  
42    As of 2016-03, the sources in src/main are for jdk9+ only.
43   ------------------------------------------------------------------------------
# Line 138 | Line 140
140    <defjdklocations v="10"/>
141    <defjdklocations v="11"/>
142    <defjdklocations v="12"/>
143 +  <defjdklocations v="13"/>
144  
145    <!-- Source locations -->
146    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 150 | Line 153
153    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
154    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
155    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
156 +  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
157    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
158    <property name="lib.dir"              location="${basedir}/lib"/>
159    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 202 | Line 206
206    <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
207    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
208    <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
209 +  <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
210    <!-- Default jdk doc location (latest stable LTS release seems best) -->
211    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
212  
# Line 214 | Line 219
219    <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
220    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
221    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
222 +  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
223    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
224  
225    <!-- Define the "jtreg" task -->
# Line 327 | Line 333
333      </sequential>
334    </macrodef>
335  
336 +  <defjtregtests v="13"/>
337    <defjtregtests v="12"/>
338    <defjtregtests v="11"/>
339    <defjtregtests v="10"/>
# Line 582 | Line 589
589            description="Runs tck and jtreg tests for src/main"/>
590  
591    <target name="test-version-permutations"
592 <          depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
592 >          depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
593    </target>
594  
595    <target name="test9">
# Line 633 | Line 640
640      </antcall>
641    </target>
642  
643 +  <target name="test13">
644 +    <antcall target="clean"/>
645 +    <antcall>
646 +      <param name="java.runtime.target" value="13"/>
647 +      <param name="build.main.javac" value="${javac13}"/>
648 +      <param name="build.main.javadoc" value="${javadoc13}"/>
649 +      <param name="build.main.javadoc.source" value="13"/>
650 +      <target name="test"/>
651 +      <target name="docs"/>
652 +    </antcall>
653 +  </target>
654 +
655    <target name="test9-11">
656      <antcall target="clean"/>
657      <antcall>
# Line 654 | Line 673
673        <param name="build.main.javadoc.source" value="9"/>
674        <target name="test"/>
675        <target name="docs"/>
676 +    </antcall>
677 +  </target>
678 +
679 +  <target name="test9-13">
680 +    <antcall target="clean"/>
681 +    <antcall>
682 +      <param name="java.runtime.target" value="13"/>
683 +      <param name="build.main.javac" value="${javac9}"/>
684 +      <param name="build.main.javadoc" value="${javadoc13}"/>
685 +      <param name="build.main.javadoc.source" value="9"/>
686 +      <target name="test"/>
687 +      <target name="docs"/>
688      </antcall>
689    </target>
690  

Diff Legend

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