| 24 |
|
$HOME/jdk/jdk10 |
| 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 |
| 32 |
|
$HOME/jdk/src/jdk10 |
| 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 9 10 ... |
| 42 |
> |
for $N in 8 .. 14 ... |
| 43 |
|
|
| 44 |
|
As of 2016-03, the sources in src/main are for jdk9+ only. |
| 45 |
|
------------------------------------------------------------------------------ |
| 142 |
|
<defjdklocations v="10"/> |
| 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"/> |
| 156 |
|
<property name="jtreg10.src.dir" location="${test.src.dir}/jtreg"/> |
| 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"/> |
| 205 |
|
<property name="java9.docroot.url" value="https://docs.oracle.com/javase/9/docs"/> |
| 206 |
|
<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/> |
| 207 |
|
<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/> |
| 208 |
+ |
<property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/> |
| 209 |
|
<!-- The location of jdk early access docs (RIP) --> |
| 210 |
|
<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> --> |
| 211 |
|
<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> --> |
| 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"/> |
| 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 |
|
|
| 225 |
|
<property name="java10.api.url" value="${java10.docroot.url}/api/"/> |
| 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 --> |
| 340 |
|
</sequential> |
| 341 |
|
</macrodef> |
| 342 |
|
|
| 343 |
+ |
<defjtregtests v="14"/> |
| 344 |
+ |
<defjtregtests v="13"/> |
| 345 |
|
<defjtregtests v="12"/> |
| 346 |
|
<defjtregtests v="11"/> |
| 347 |
|
<defjtregtests v="10"/> |
| 451 |
|
<compilerarg value="-Xlint:all,-removal"/> |
| 452 |
|
<compilerarg line="--doclint-format html5"/> |
| 453 |
|
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
| 454 |
+ |
<compilerarg value="-Xdoclint/package:java.util.*"/> |
| 455 |
|
<compilerarg value="-Werror"/> |
| 456 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
| 457 |
|
<compilerarg line="${build.args}"/> |
| 508 |
|
<arg value="-html5"/> |
| 509 |
|
<arg value="--patch-module=java.base=${src.dir}"/> |
| 510 |
|
<!-- old school frames via docs/index.html?overview-summary.html --> |
| 511 |
+ |
<!-- TODO: - -frames no longer a supported option in jdk13+ --> |
| 512 |
|
<arg value="--frames"/> |
| 513 |
|
<arg value="--override-methods=summary"/> |
| 514 |
|
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
| 599 |
|
description="Runs tck and jtreg tests for src/main"/> |
| 600 |
|
|
| 601 |
|
<target name="test-version-permutations" |
| 602 |
< |
depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs"> |
| 602 |
> |
depends="test9, test10, test11, test12, test13, test14, test9-11, test9-12, test9-13, test9-14, clean, test, docs"> |
| 603 |
|
</target> |
| 604 |
|
|
| 605 |
|
<target name="test9"> |
| 650 |
|
</antcall> |
| 651 |
|
</target> |
| 652 |
|
|
| 653 |
+ |
<target name="test13"> |
| 654 |
+ |
<antcall target="clean"/> |
| 655 |
+ |
<antcall> |
| 656 |
+ |
<param name="java.runtime.target" value="13"/> |
| 657 |
+ |
<param name="build.main.javac" value="${javac13}"/> |
| 658 |
+ |
<param name="build.main.javadoc" value="${javadoc13}"/> |
| 659 |
+ |
<param name="build.main.javadoc.source" value="13"/> |
| 660 |
+ |
<target name="test"/> |
| 661 |
+ |
<target name="docs"/> |
| 662 |
+ |
</antcall> |
| 663 |
+ |
</target> |
| 664 |
+ |
|
| 665 |
+ |
<target name="test14"> |
| 666 |
+ |
<antcall target="clean"/> |
| 667 |
+ |
<antcall> |
| 668 |
+ |
<param name="java.runtime.target" value="14"/> |
| 669 |
+ |
<param name="build.main.javac" value="${javac14}"/> |
| 670 |
+ |
<param name="build.main.javadoc" value="${javadoc14}"/> |
| 671 |
+ |
<param name="build.main.javadoc.source" value="14"/> |
| 672 |
+ |
<target name="test"/> |
| 673 |
+ |
<target name="docs"/> |
| 674 |
+ |
</antcall> |
| 675 |
+ |
</target> |
| 676 |
+ |
|
| 677 |
|
<target name="test9-11"> |
| 678 |
|
<antcall target="clean"/> |
| 679 |
|
<antcall> |
| 695 |
|
<param name="build.main.javadoc.source" value="9"/> |
| 696 |
|
<target name="test"/> |
| 697 |
|
<target name="docs"/> |
| 698 |
+ |
</antcall> |
| 699 |
+ |
</target> |
| 700 |
+ |
|
| 701 |
+ |
<target name="test9-13"> |
| 702 |
+ |
<antcall target="clean"/> |
| 703 |
+ |
<antcall> |
| 704 |
+ |
<param name="java.runtime.target" value="13"/> |
| 705 |
+ |
<param name="build.main.javac" value="${javac9}"/> |
| 706 |
+ |
<param name="build.main.javadoc" value="${javadoc13}"/> |
| 707 |
+ |
<param name="build.main.javadoc.source" value="9"/> |
| 708 |
+ |
<target name="test"/> |
| 709 |
+ |
<target name="docs"/> |
| 710 |
+ |
</antcall> |
| 711 |
+ |
</target> |
| 712 |
+ |
|
| 713 |
+ |
<target name="test9-14"> |
| 714 |
+ |
<antcall target="clean"/> |
| 715 |
+ |
<antcall> |
| 716 |
+ |
<param name="java.runtime.target" value="14"/> |
| 717 |
+ |
<param name="build.main.javac" value="${javac9}"/> |
| 718 |
+ |
<param name="build.main.javadoc" value="${javadoc14}"/> |
| 719 |
+ |
<param name="build.main.javadoc.source" value="9"/> |
| 720 |
+ |
<target name="test"/> |
| 721 |
+ |
<target name="docs"/> |
| 722 |
|
</antcall> |
| 723 |
|
</target> |
| 724 |
|
|
