| 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 |
|
------------------------------------------------------------------------------ |
| 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"/> |
| 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"/> |
| 201 |
|
<property name="java9.docroot.url" value="https://docs.oracle.com/javase/9/docs"/> |
| 202 |
|
<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/> |
| 203 |
|
<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/> |
| 204 |
+ |
<property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/> |
| 205 |
|
<!-- The location of jdk early access docs (RIP) --> |
| 206 |
|
<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> --> |
| 207 |
|
<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> --> |
| 208 |
|
<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> --> |
| 209 |
< |
<property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> |
| 209 |
> |
<!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> --> |
| 210 |
> |
<property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> |
| 211 |
|
<!-- Default jdk doc location (latest stable LTS release seems best) --> |
| 212 |
|
<property name="java.docroot.url" value="${java11.docroot.url}"/> |
| 213 |
|
|
| 220 |
|
<property name="java10.api.url" value="${java10.docroot.url}/api/"/> |
| 221 |
|
<property name="java11.api.url" value="${java11.docroot.url}/api/"/> |
| 222 |
|
<property name="java12.api.url" value="${java12.docroot.url}/api/"/> |
| 223 |
+ |
<property name="java13.api.url" value="${java13.docroot.url}/api/"/> |
| 224 |
|
<property name="java.api.url" value="${java.docroot.url}/api/"/> |
| 225 |
|
|
| 226 |
|
<!-- Define the "jtreg" task --> |
| 334 |
|
</sequential> |
| 335 |
|
</macrodef> |
| 336 |
|
|
| 337 |
+ |
<defjtregtests v="13"/> |
| 338 |
|
<defjtregtests v="12"/> |
| 339 |
|
<defjtregtests v="11"/> |
| 340 |
|
<defjtregtests v="10"/> |
| 500 |
|
<arg value="-html5"/> |
| 501 |
|
<arg value="--patch-module=java.base=${src.dir}"/> |
| 502 |
|
<!-- old school frames via docs/index.html?overview-summary.html --> |
| 503 |
+ |
<!-- TODO: - -frames no longer a supported option in jdk13+ --> |
| 504 |
|
<arg value="--frames"/> |
| 505 |
|
<arg value="--override-methods=summary"/> |
| 506 |
|
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
| 591 |
|
description="Runs tck and jtreg tests for src/main"/> |
| 592 |
|
|
| 593 |
|
<target name="test-version-permutations" |
| 594 |
< |
depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs"> |
| 594 |
> |
depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs"> |
| 595 |
|
</target> |
| 596 |
|
|
| 597 |
|
<target name="test9"> |
| 642 |
|
</antcall> |
| 643 |
|
</target> |
| 644 |
|
|
| 645 |
+ |
<target name="test13"> |
| 646 |
+ |
<antcall target="clean"/> |
| 647 |
+ |
<antcall> |
| 648 |
+ |
<param name="java.runtime.target" value="13"/> |
| 649 |
+ |
<param name="build.main.javac" value="${javac13}"/> |
| 650 |
+ |
<param name="build.main.javadoc" value="${javadoc13}"/> |
| 651 |
+ |
<param name="build.main.javadoc.source" value="13"/> |
| 652 |
+ |
<target name="test"/> |
| 653 |
+ |
<target name="docs"/> |
| 654 |
+ |
</antcall> |
| 655 |
+ |
</target> |
| 656 |
+ |
|
| 657 |
|
<target name="test9-11"> |
| 658 |
|
<antcall target="clean"/> |
| 659 |
|
<antcall> |
| 675 |
|
<param name="build.main.javadoc.source" value="9"/> |
| 676 |
|
<target name="test"/> |
| 677 |
|
<target name="docs"/> |
| 678 |
+ |
</antcall> |
| 679 |
+ |
</target> |
| 680 |
+ |
|
| 681 |
+ |
<target name="test9-13"> |
| 682 |
+ |
<antcall target="clean"/> |
| 683 |
+ |
<antcall> |
| 684 |
+ |
<param name="java.runtime.target" value="13"/> |
| 685 |
+ |
<param name="build.main.javac" value="${javac9}"/> |
| 686 |
+ |
<param name="build.main.javadoc" value="${javadoc13}"/> |
| 687 |
+ |
<param name="build.main.javadoc.source" value="9"/> |
| 688 |
+ |
<target name="test"/> |
| 689 |
+ |
<target name="docs"/> |
| 690 |
|
</antcall> |
| 691 |
|
</target> |
| 692 |
|
|
