23 |
|
$HOME/jdk/jdk12 |
24 |
|
$HOME/jdk/jdk13 |
25 |
|
$HOME/jdk/jdk14 |
26 |
+ |
$HOME/jdk/jdk15 |
27 |
|
where each of the above is a JDK or a symlink to same, and |
28 |
|
$HOME/jdk/src/jdk11 |
29 |
|
$HOME/jdk/src/jdk12 |
30 |
|
$HOME/jdk/src/jdk13 |
31 |
|
$HOME/jdk/src/jdk14 |
32 |
+ |
$HOME/jdk/src/jdk15 |
33 |
|
where each of the above is a JDK source tree or a symlink to same. |
34 |
|
|
35 |
|
Alternatively, define ant variables thus: |
36 |
|
ant -Djdk$N.home=... -Djdk$N.src.home=... |
37 |
< |
for $N in 11 .. 14 ... |
37 |
> |
for $N in 11 .. 15 ... |
38 |
|
|
39 |
|
As of 2016-03, the sources in src/main are for jdk9+ only. |
40 |
|
As of 2019-08, the sources in src/main are for jdk11+ only. |
98 |
|
<defjdklocations v="12"/> |
99 |
|
<defjdklocations v="13"/> |
100 |
|
<defjdklocations v="14"/> |
101 |
+ |
<defjdklocations v="15"/> |
102 |
|
|
103 |
|
<!-- Source locations --> |
104 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
109 |
|
<property name="jtreg12.src.dir" location="${test.src.dir}/jtreg"/> |
110 |
|
<property name="jtreg13.src.dir" location="${test.src.dir}/jtreg"/> |
111 |
|
<property name="jtreg14.src.dir" location="${test.src.dir}/jtreg"/> |
112 |
+ |
<property name="jtreg15.src.dir" location="${test.src.dir}/jtreg"/> |
113 |
|
<property name="jtreg.src.dir" location="${jtreg11.src.dir}"/> |
114 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
115 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
136 |
|
<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/> |
137 |
|
<property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/> |
138 |
|
<property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/> |
139 |
< |
<property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/> |
139 |
> |
<property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/> |
140 |
> |
<property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/docs"/> |
141 |
|
<!-- Default jdk doc location (latest stable LTS release seems best) --> |
142 |
|
<property name="java.docroot.url" value="${java11.docroot.url}"/> |
143 |
|
|
146 |
|
<property name="java12.api.url" value="${java12.docroot.url}/api/"/> |
147 |
|
<property name="java13.api.url" value="${java13.docroot.url}/api/"/> |
148 |
|
<property name="java14.api.url" value="${java14.docroot.url}/api/"/> |
149 |
+ |
<property name="java15.api.url" value="${java15.docroot.url}/api/"/> |
150 |
|
<property name="java.api.url" value="${java.docroot.url}/api/"/> |
151 |
|
|
152 |
|
<!-- Define the "jtreg" task --> |
248 |
|
</sequential> |
249 |
|
</macrodef> |
250 |
|
|
251 |
+ |
<defjtregtests v="15"/> |
252 |
|
<defjtregtests v="14"/> |
253 |
|
<defjtregtests v="13"/> |
254 |
|
<defjtregtests v="12"/> |
352 |
|
<!-- Xlint:-removal for jdk12 Unsafe Object -> Reference renaming --> |
353 |
|
<compilerarg value="-Xlint:all,-removal"/> |
354 |
|
<compilerarg line="--doclint-format html5"/> |
355 |
< |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
355 |
> |
<!-- Temporarily disable doclint for private elements, due to --> |
356 |
> |
<!-- https://bugs.openjdk.java.net/browse/JDK-8214571 --> |
357 |
> |
<!-- which is expected to be fixed in openjdk 11.0.8 --> |
358 |
> |
<!-- <compilerarg value="-Xdoclint:all/protected,reference/private"/> --> |
359 |
> |
<compilerarg value="-Xdoclint:all/protected"/> |
360 |
|
<compilerarg value="-Xdoclint/package:java.util.*"/> |
361 |
|
<compilerarg value="-Werror"/> |
362 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
413 |
|
executable="${build.main.javadoc}"> |
414 |
|
<!-- TODO: JDK-8214571 failonerror = "true" --> |
415 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
416 |
< |
<include name="**/*.java"/> |
416 |
> |
<include name="java/**/*.java"/> |
417 |
|
</fileset> |
418 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
419 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
511 |
|
description="Runs tck and jtreg tests for src/main"/> |
512 |
|
|
513 |
|
<target name="test-version-permutations" |
514 |
< |
depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs"> |
515 |
< |
</target> |
514 |
> |
depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs" |
515 |
> |
description="Runs tck and jtreg tests for various build-time and runtime java versions"/> |
516 |
|
|
517 |
|
<target name="test11"> |
518 |
|
<antcall> |
562 |
|
</antcall> |
563 |
|
</target> |
564 |
|
|
565 |
+ |
<target name="test15"> |
566 |
+ |
<antcall> |
567 |
+ |
<param name="java.runtime.target" value="15"/> |
568 |
+ |
<param name="build.main.javac" value="${javac15}"/> |
569 |
+ |
<param name="build.main.javadoc" value="${javadoc15}"/> |
570 |
+ |
<param name="build.main.javadoc.source" value="15"/> |
571 |
+ |
<target name="clean"/> |
572 |
+ |
<target name="test"/> |
573 |
+ |
<target name="docs"/> |
574 |
+ |
</antcall> |
575 |
+ |
</target> |
576 |
+ |
|
577 |
|
<target name="test11-12"> |
578 |
|
<antcall> |
579 |
|
<param name="java.runtime.target" value="12"/> |
610 |
|
</antcall> |
611 |
|
</target> |
612 |
|
|
613 |
+ |
<target name="test11-15"> |
614 |
+ |
<antcall> |
615 |
+ |
<param name="java.runtime.target" value="15"/> |
616 |
+ |
<param name="build.main.javac" value="${javac11}"/> |
617 |
+ |
<param name="build.main.javadoc" value="${javadoc15}"/> |
618 |
+ |
<param name="build.main.javadoc.source" value="11"/> |
619 |
+ |
<target name="clean"/> |
620 |
+ |
<target name="test"/> |
621 |
+ |
<target name="docs"/> |
622 |
+ |
</antcall> |
623 |
+ |
</target> |
624 |
+ |
|
625 |
|
|
626 |
|
<target name="configure-compiler"> |
627 |
|
<fail message="ant version too old"> |
699 |
|
https://github.com/google/error-prone/issues/1143 |
700 |
|
=================================================================== --> |
701 |
|
<path id="errorprone.processorpath.path"> |
702 |
< |
<pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/> |
702 |
> |
<pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/> |
703 |
|
<pathelement location="${lib.dir}/dataflow-2.5.7.jar"/> |
704 |
|
<pathelement location="${lib.dir}/javacutil-2.5.7.jar"/> |
705 |
|
<pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/> |
706 |
+ |
<pathelement location="${lib.dir}/caffeine-2.8.0.jar"/> |
707 |
|
</path> |
708 |
|
<property name="errorprone.processorpath" refid="errorprone.processorpath.path" /> |
709 |
|
<property name="errorprone.jsr166.user.flags" value=""/> |