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.298 by jsr166, Wed May 22 17:36:58 2019 UTC vs.
Revision 1.300 by jsr166, Sat Jul 13 18:31:40 2019 UTC

# Line 25 | Line 25
25    $HOME/jdk/jdk11
26    $HOME/jdk/jdk12
27    $HOME/jdk/jdk13
28 +  $HOME/jdk/jdk14
29    where each of the above is a JDK or a symlink to same, and
30    $HOME/jdk/src/jdk8
31    $HOME/jdk/src/jdk9
# Line 32 | Line 33
33    $HOME/jdk/src/jdk11
34    $HOME/jdk/src/jdk12
35    $HOME/jdk/src/jdk13
36 +  $HOME/jdk/src/jdk14
37    where each of the above is a complete JDK source tree
38    (e.g. mercurial forest) or a symlink to same.
39  
40    Alternatively, define ant variables thus:
41    ant -Djdk$N.home=... -Djdk$N.src.home=...
42 <  for $N in 8 .. 13 ...
42 >  for $N in 8 .. 14 ...
43  
44    As of 2016-03, the sources in src/main are for jdk9+ only.
45   ------------------------------------------------------------------------------
# Line 141 | Line 143
143    <defjdklocations v="11"/>
144    <defjdklocations v="12"/>
145    <defjdklocations v="13"/>
146 +  <defjdklocations v="14"/>
147  
148    <!-- Source locations -->
149    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 154 | Line 157
157    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
158    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
159    <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
160 +  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
161    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
162    <property name="lib.dir"              location="${basedir}/lib"/>
163    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 208 | Line 212
212    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
213   <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
214    <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
215 +  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
216    <!-- Default jdk doc location (latest stable LTS release seems best) -->
217    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
218  
# Line 221 | Line 226
226    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
227    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
228    <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
229 +  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
230    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
231  
232    <!-- Define the "jtreg" task -->
# Line 334 | Line 340
340      </sequential>
341    </macrodef>
342  
343 +  <defjtregtests v="14"/>
344    <defjtregtests v="13"/>
345    <defjtregtests v="12"/>
346    <defjtregtests v="11"/>
# Line 391 | Line 398
398    </path>
399  
400    <!-- Support @jls tag, used in jdk8+ javadoc -->
401 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
402    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
403    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
404  
# Line 592 | Line 600
600            description="Runs tck and jtreg tests for src/main"/>
601  
602    <target name="test-version-permutations"
603 <          depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
603 >          depends="test9, test10, test11, test12, test13, test14, test9-11, test9-12, test9-13, test9-14, clean, test, docs">
604    </target>
605  
606    <target name="test9">
# Line 655 | Line 663
663      </antcall>
664    </target>
665  
666 +  <target name="test14">
667 +    <antcall target="clean"/>
668 +    <antcall>
669 +      <param name="java.runtime.target" value="14"/>
670 +      <param name="build.main.javac" value="${javac14}"/>
671 +      <param name="build.main.javadoc" value="${javadoc14}"/>
672 +      <param name="build.main.javadoc.source" value="14"/>
673 +      <target name="test"/>
674 +      <target name="docs"/>
675 +    </antcall>
676 +  </target>
677 +
678    <target name="test9-11">
679      <antcall target="clean"/>
680      <antcall>
# Line 688 | Line 708
708        <param name="build.main.javadoc.source" value="9"/>
709        <target name="test"/>
710        <target name="docs"/>
711 +    </antcall>
712 +  </target>
713 +
714 +  <target name="test9-14">
715 +    <antcall target="clean"/>
716 +    <antcall>
717 +      <param name="java.runtime.target" value="14"/>
718 +      <param name="build.main.javac" value="${javac9}"/>
719 +      <param name="build.main.javadoc" value="${javadoc14}"/>
720 +      <param name="build.main.javadoc.source" value="9"/>
721 +      <target name="test"/>
722 +      <target name="docs"/>
723      </antcall>
724    </target>
725  

Diff Legend

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