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 |
|
|
106 |
|
<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes" |
107 |
|
unless:set="have.java.base"/> |
108 |
|
<local name="modules"/> |
109 |
< |
<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/> |
109 |
> |
<available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/> |
110 |
|
<local name="boot.jar.dir"/> |
111 |
|
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib" unless:set="modules"/> |
112 |
|
<path id="bootclasspath@{v}" unless:set="modules"> |
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"/> |
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"/> |
197 |
|
<property name="java8.docroot.url" value="https://docs.oracle.com/javase/8/docs"/> |
198 |
|
<property name="java9.docroot.url" value="https://docs.oracle.com/javase/9/docs"/> |
199 |
|
<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/> |
200 |
+ |
<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/> |
201 |
|
<!-- The location of jdk early access docs (RIP) --> |
202 |
|
<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> --> |
203 |
|
<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> --> |
204 |
< |
<property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> |
204 |
> |
<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> --> |
205 |
> |
<property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> |
206 |
|
<!-- Default jdk doc location (latest stable release seems best) --> |
207 |
< |
<property name="java.docroot.url" value="${java10.docroot.url}"/> |
207 |
> |
<property name="java.docroot.url" value="${java11.docroot.url}"/> |
208 |
|
|
209 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
210 |
|
<property name="java5.api.url" value="${java5.docroot.url}/api/"/> |
214 |
|
<property name="java9.api.url" value="${java9.docroot.url}/api/"/> |
215 |
|
<property name="java10.api.url" value="${java10.docroot.url}/api/"/> |
216 |
|
<property name="java11.api.url" value="${java11.docroot.url}/api/"/> |
217 |
+ |
<property name="java12.api.url" value="${java12.docroot.url}/api/"/> |
218 |
|
<property name="java.api.url" value="${java.docroot.url}/api/"/> |
219 |
|
|
220 |
|
<!-- Define the "jtreg" task --> |
247 |
|
|
248 |
|
<local name="modules"/> |
249 |
|
<condition property="modules"> |
250 |
< |
<available file="${jdk@{compile-target}.home}/jmods" type="dir"/> |
250 |
> |
<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/> |
251 |
|
</condition> |
252 |
|
|
253 |
|
<local name="use-doclint"/> |
328 |
|
</sequential> |
329 |
|
</macrodef> |
330 |
|
|
331 |
+ |
<defjtregtests v="12"/> |
332 |
|
<defjtregtests v="11"/> |
333 |
|
<defjtregtests v="10"/> |
334 |
|
<defjtregtests v="9"/> |
354 |
|
|
355 |
|
<local name="modules"/> |
356 |
|
<condition property="modules"> |
357 |
< |
<available file="${jdk@{target}.home}/jmods" type="dir"/> |
357 |
> |
<available file="${jdk@{target}.home}/lib/modules" type="file"/> |
358 |
|
</condition> |
359 |
|
|
360 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
615 |
|
|
616 |
|
<!-- </target> --> |
617 |
|
|
618 |
< |
<target name="test91011" |
618 |
> |
<target name="test9101112" |
619 |
|
description="Runs tck and jtreg tests for src/main for multiple java versions"> |
620 |
|
|
621 |
|
<antcall target="clean"/> |
633 |
|
<param name="build.main.java.version" value="11"/> |
634 |
|
</antcall> |
635 |
|
|
636 |
+ |
<antcall target="clean"/> |
637 |
+ |
<antcall target="test"> |
638 |
+ |
<param name="build.main.java.version" value="12"/> |
639 |
+ |
</antcall> |
640 |
+ |
|
641 |
|
<!-- Clean up to avoid obscure wrong class file version bugs --> |
642 |
|
<antcall target="clean"/> |
643 |
|
|