23 |
|
$HOME/jdk/jdk12 |
24 |
|
$HOME/jdk/jdk13 |
25 |
|
$HOME/jdk/jdk14 |
26 |
+ |
$HOME/jdk/jdk15 |
27 |
+ |
$HOME/jdk/jdk16 |
28 |
|
where each of the above is a JDK or a symlink to same, and |
29 |
|
$HOME/jdk/src/jdk11 |
30 |
|
$HOME/jdk/src/jdk12 |
31 |
|
$HOME/jdk/src/jdk13 |
32 |
|
$HOME/jdk/src/jdk14 |
33 |
+ |
$HOME/jdk/src/jdk15 |
34 |
+ |
$HOME/jdk/src/jdk16 |
35 |
|
where each of the above is a JDK source tree or a symlink to same. |
36 |
|
|
37 |
|
Alternatively, define ant variables thus: |
38 |
|
ant -Djdk$N.home=... -Djdk$N.src.home=... |
39 |
< |
for $N in 11 .. 14 ... |
39 |
> |
for $N in 11 .. 16 ... |
40 |
|
|
41 |
|
As of 2016-03, the sources in src/main are for jdk9+ only. |
42 |
|
As of 2019-08, the sources in src/main are for jdk11+ only. |
100 |
|
<defjdklocations v="12"/> |
101 |
|
<defjdklocations v="13"/> |
102 |
|
<defjdklocations v="14"/> |
103 |
+ |
<defjdklocations v="15"/> |
104 |
+ |
<defjdklocations v="16"/> |
105 |
|
|
106 |
|
<!-- Source locations --> |
107 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
112 |
|
<property name="jtreg12.src.dir" location="${test.src.dir}/jtreg"/> |
113 |
|
<property name="jtreg13.src.dir" location="${test.src.dir}/jtreg"/> |
114 |
|
<property name="jtreg14.src.dir" location="${test.src.dir}/jtreg"/> |
115 |
+ |
<property name="jtreg15.src.dir" location="${test.src.dir}/jtreg"/> |
116 |
+ |
<property name="jtreg16.src.dir" location="${test.src.dir}/jtreg"/> |
117 |
|
<property name="jtreg.src.dir" location="${jtreg11.src.dir}"/> |
118 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
119 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
140 |
|
<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/> |
141 |
|
<property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/> |
142 |
|
<property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/> |
143 |
< |
<property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/> |
143 |
> |
<property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/> |
144 |
> |
<property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/> |
145 |
> |
<property name="java16.docroot.url" value="https://download.java.net/java/early_access/jdk16/docs"/> |
146 |
|
<!-- Default jdk doc location (latest stable LTS release seems best) --> |
147 |
|
<property name="java.docroot.url" value="${java11.docroot.url}"/> |
148 |
|
|
151 |
|
<property name="java12.api.url" value="${java12.docroot.url}/api/"/> |
152 |
|
<property name="java13.api.url" value="${java13.docroot.url}/api/"/> |
153 |
|
<property name="java14.api.url" value="${java14.docroot.url}/api/"/> |
154 |
+ |
<property name="java15.api.url" value="${java15.docroot.url}/api/"/> |
155 |
+ |
<property name="java16.api.url" value="${java15.docroot.url}/api/"/> |
156 |
|
<property name="java.api.url" value="${java.docroot.url}/api/"/> |
157 |
|
|
158 |
|
<!-- Define the "jtreg" task --> |
254 |
|
</sequential> |
255 |
|
</macrodef> |
256 |
|
|
257 |
+ |
<defjtregtests v="16"/> |
258 |
+ |
<defjtregtests v="15"/> |
259 |
|
<defjtregtests v="14"/> |
260 |
|
<defjtregtests v="13"/> |
261 |
|
<defjtregtests v="12"/> |
285 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
286 |
|
<arg value="-javacoptions:--patch-module=java.base=@{classes}"/> |
287 |
|
<arg value="-vmoptions:--patch-module=java.base=@{classes}"/> |
288 |
+ |
<arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/> |
289 |
|
<arg value="-agentvm"/> |
290 |
|
<arg value="-noreport"/> |
291 |
|
<arg value="-verbose:@{verbose}"/> |
359 |
|
<!-- Xlint:-removal for jdk12 Unsafe Object -> Reference renaming --> |
360 |
|
<compilerarg value="-Xlint:all,-removal"/> |
361 |
|
<compilerarg line="--doclint-format html5"/> |
362 |
< |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
362 |
> |
<!-- Temporarily disable doclint for private elements, due to --> |
363 |
> |
<!-- https://bugs.openjdk.java.net/browse/JDK-8214571 --> |
364 |
> |
<!-- which is expected to be fixed in openjdk 11.0.8 --> |
365 |
> |
<!-- <compilerarg value="-Xdoclint:all/protected,reference/private"/> --> |
366 |
> |
<compilerarg value="-Xdoclint:all/protected"/> |
367 |
|
<compilerarg value="-Xdoclint/package:java.util.*"/> |
368 |
|
<compilerarg value="-Werror"/> |
369 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
391 |
|
<target name="docs" |
392 |
|
description="Builds javadocs for src/main to dist dir"> |
393 |
|
|
394 |
< |
<delete dir="${docs.dir}"/> |
394 |
> |
<delete dir="${docs.dir}" quiet="true"/> |
395 |
|
<mkdir dir="${docs.dir}"/> |
396 |
|
|
397 |
+ |
<!-- old school frames via docs/index.html?overview-summary.html --> |
398 |
+ |
<!-- dash-dash-frames no longer a supported option in jdk13+ --> |
399 |
+ |
<local name="use-frames"/> |
400 |
+ |
<condition property="use-frames"> |
401 |
+ |
<equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/> |
402 |
+ |
</condition> |
403 |
+ |
|
404 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
405 |
|
<!-- sourcepath for packages --> |
406 |
|
|
420 |
|
executable="${build.main.javadoc}"> |
421 |
|
<!-- TODO: JDK-8214571 failonerror = "true" --> |
422 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
423 |
< |
<include name="**/*.java"/> |
423 |
> |
<include name="java/**/*.java"/> |
424 |
|
</fileset> |
425 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
426 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
427 |
+ |
<arg value="-quiet"/> |
428 |
|
<arg value="-XDignore.symbol.file=true"/> |
429 |
|
<arg value="-html5"/> |
430 |
+ |
<arg value="-Xdoclint:all,-missing"/> |
431 |
|
<arg value="--patch-module=java.base=${src.dir}"/> |
432 |
< |
<!-- old school frames via docs/index.html?overview-summary.html --> |
405 |
< |
<!-- TODO: - -frames no longer a supported option in jdk13+ --> |
406 |
< |
<arg value="--frames"/> |
432 |
> |
<arg value="--frames" if:set="use-frames"/> |
433 |
|
<arg value="--override-methods=summary"/> |
434 |
|
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
435 |
|
<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/> |
519 |
|
description="Runs tck and jtreg tests for src/main"/> |
520 |
|
|
521 |
|
<target name="test-version-permutations" |
522 |
< |
depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs"> |
523 |
< |
</target> |
522 |
> |
depends="test11, test12, test13, test14, test15, test16, |
523 |
> |
test11-12, test11-13, test11-14, test11-15, test11-16, |
524 |
> |
clean, test, docs" |
525 |
> |
description="Runs tck and jtreg tests for various build-time and runtime java versions"/> |
526 |
|
|
527 |
|
<target name="test11"> |
500 |
– |
<antcall target="clean"/> |
528 |
|
<antcall> |
529 |
|
<param name="java.runtime.target" value="11"/> |
530 |
|
<param name="build.main.javac" value="${javac11}"/> |
531 |
|
<param name="build.main.javadoc" value="${javadoc12}"/> |
532 |
|
<param name="build.main.javadoc.source" value="11"/> |
533 |
+ |
<target name="clean"/> |
534 |
|
<target name="test"/> |
535 |
|
<target name="docs"/> |
536 |
|
</antcall> |
537 |
|
</target> |
538 |
|
|
539 |
|
<target name="test12"> |
512 |
– |
<antcall target="clean"/> |
540 |
|
<antcall> |
541 |
|
<param name="java.runtime.target" value="12"/> |
542 |
|
<param name="build.main.javac" value="${javac12}"/> |
543 |
|
<param name="build.main.javadoc" value="${javadoc12}"/> |
544 |
|
<param name="build.main.javadoc.source" value="12"/> |
545 |
+ |
<target name="clean"/> |
546 |
|
<target name="test"/> |
547 |
|
<target name="docs"/> |
548 |
|
</antcall> |
549 |
|
</target> |
550 |
|
|
551 |
|
<target name="test13"> |
524 |
– |
<antcall target="clean"/> |
552 |
|
<antcall> |
553 |
|
<param name="java.runtime.target" value="13"/> |
554 |
|
<param name="build.main.javac" value="${javac13}"/> |
555 |
|
<param name="build.main.javadoc" value="${javadoc13}"/> |
556 |
|
<param name="build.main.javadoc.source" value="13"/> |
557 |
+ |
<target name="clean"/> |
558 |
|
<target name="test"/> |
559 |
|
<target name="docs"/> |
560 |
|
</antcall> |
561 |
|
</target> |
562 |
|
|
563 |
|
<target name="test14"> |
536 |
– |
<antcall target="clean"/> |
564 |
|
<antcall> |
565 |
|
<param name="java.runtime.target" value="14"/> |
566 |
|
<param name="build.main.javac" value="${javac14}"/> |
567 |
|
<param name="build.main.javadoc" value="${javadoc14}"/> |
568 |
|
<param name="build.main.javadoc.source" value="14"/> |
569 |
+ |
<target name="clean"/> |
570 |
+ |
<target name="test"/> |
571 |
+ |
<target name="docs"/> |
572 |
+ |
</antcall> |
573 |
+ |
</target> |
574 |
+ |
|
575 |
+ |
<target name="test15"> |
576 |
+ |
<antcall> |
577 |
+ |
<param name="java.runtime.target" value="15"/> |
578 |
+ |
<param name="build.main.javac" value="${javac15}"/> |
579 |
+ |
<param name="build.main.javadoc" value="${javadoc15}"/> |
580 |
+ |
<param name="build.main.javadoc.source" value="15"/> |
581 |
+ |
<target name="clean"/> |
582 |
+ |
<target name="test"/> |
583 |
+ |
<target name="docs"/> |
584 |
+ |
</antcall> |
585 |
+ |
</target> |
586 |
+ |
|
587 |
+ |
<target name="test16"> |
588 |
+ |
<antcall> |
589 |
+ |
<param name="java.runtime.target" value="16"/> |
590 |
+ |
<param name="build.main.javac" value="${javac16}"/> |
591 |
+ |
<param name="build.main.javadoc" value="${javadoc16}"/> |
592 |
+ |
<param name="build.main.javadoc.source" value="16"/> |
593 |
+ |
<target name="clean"/> |
594 |
|
<target name="test"/> |
595 |
|
<target name="docs"/> |
596 |
|
</antcall> |
597 |
|
</target> |
598 |
|
|
599 |
|
<target name="test11-12"> |
548 |
– |
<antcall target="clean"/> |
600 |
|
<antcall> |
601 |
|
<param name="java.runtime.target" value="12"/> |
602 |
|
<param name="build.main.javac" value="${javac11}"/> |
603 |
|
<param name="build.main.javadoc" value="${javadoc12}"/> |
604 |
|
<param name="build.main.javadoc.source" value="11"/> |
605 |
+ |
<target name="clean"/> |
606 |
|
<target name="test"/> |
607 |
|
<target name="docs"/> |
608 |
|
</antcall> |
609 |
|
</target> |
610 |
|
|
611 |
|
<target name="test11-13"> |
560 |
– |
<antcall target="clean"/> |
612 |
|
<antcall> |
613 |
|
<param name="java.runtime.target" value="13"/> |
614 |
|
<param name="build.main.javac" value="${javac11}"/> |
615 |
|
<param name="build.main.javadoc" value="${javadoc13}"/> |
616 |
|
<param name="build.main.javadoc.source" value="11"/> |
617 |
+ |
<target name="clean"/> |
618 |
|
<target name="test"/> |
619 |
|
<target name="docs"/> |
620 |
|
</antcall> |
621 |
|
</target> |
622 |
|
|
623 |
|
<target name="test11-14"> |
572 |
– |
<antcall target="clean"/> |
624 |
|
<antcall> |
625 |
|
<param name="java.runtime.target" value="14"/> |
626 |
|
<param name="build.main.javac" value="${javac11}"/> |
627 |
|
<param name="build.main.javadoc" value="${javadoc14}"/> |
628 |
|
<param name="build.main.javadoc.source" value="11"/> |
629 |
+ |
<target name="clean"/> |
630 |
+ |
<target name="test"/> |
631 |
+ |
<target name="docs"/> |
632 |
+ |
</antcall> |
633 |
+ |
</target> |
634 |
+ |
|
635 |
+ |
<target name="test11-15"> |
636 |
+ |
<antcall> |
637 |
+ |
<param name="java.runtime.target" value="15"/> |
638 |
+ |
<param name="build.main.javac" value="${javac11}"/> |
639 |
+ |
<param name="build.main.javadoc" value="${javadoc15}"/> |
640 |
+ |
<param name="build.main.javadoc.source" value="11"/> |
641 |
+ |
<target name="clean"/> |
642 |
+ |
<target name="test"/> |
643 |
+ |
<target name="docs"/> |
644 |
+ |
</antcall> |
645 |
+ |
</target> |
646 |
+ |
|
647 |
+ |
<target name="test11-16"> |
648 |
+ |
<antcall> |
649 |
+ |
<param name="java.runtime.target" value="16"/> |
650 |
+ |
<param name="build.main.javac" value="${javac11}"/> |
651 |
+ |
<param name="build.main.javadoc" value="${javadoc16}"/> |
652 |
+ |
<param name="build.main.javadoc.source" value="11"/> |
653 |
+ |
<target name="clean"/> |
654 |
|
<target name="test"/> |
655 |
|
<target name="docs"/> |
656 |
|
</antcall> |
657 |
|
</target> |
658 |
|
|
659 |
+ |
<target name="docs16"> |
660 |
+ |
<antcall> |
661 |
+ |
<param name="java.runtime.target" value="16"/> |
662 |
+ |
<param name="build.main.javac" value="${javac16}"/> |
663 |
+ |
<param name="build.main.javadoc" value="${javadoc16}"/> |
664 |
+ |
<param name="build.main.javadoc.source" value="16"/> |
665 |
+ |
<target name="clean"/> |
666 |
+ |
<target name="docs"/> |
667 |
+ |
</antcall> |
668 |
+ |
</target> |
669 |
+ |
|
670 |
|
|
671 |
|
<target name="configure-compiler"> |
672 |
|
<fail message="ant version too old"> |
744 |
|
https://github.com/google/error-prone/issues/1143 |
745 |
|
=================================================================== --> |
746 |
|
<path id="errorprone.processorpath.path"> |
747 |
< |
<pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/> |
747 |
> |
<pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/> |
748 |
|
<pathelement location="${lib.dir}/dataflow-2.5.7.jar"/> |
749 |
|
<pathelement location="${lib.dir}/javacutil-2.5.7.jar"/> |
750 |
|
<pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/> |
751 |
+ |
<pathelement location="${lib.dir}/caffeine-2.8.0.jar"/> |
752 |
|
</path> |
753 |
|
<property name="errorprone.processorpath" refid="errorprone.processorpath.path" /> |
754 |
|
<property name="errorprone.jsr166.user.flags" value=""/> |
755 |
|
<property name="errorprone.jsr166.flags" |
756 |
|
value="-Xep:HashtableContains:OFF |
757 |
+ |
-Xep:PreferJavaTimeOverload:OFF |
758 |
|
-Xep:JdkObsolete:OFF |
759 |
|
-Xep:MissingOverride:OFF |
760 |
|
-Xep:MissingFail:OFF |
774 |
|
<property name="errorprone.jsr166.test.flags" |
775 |
|
value="-Xep:StringSplitter:OFF |
776 |
|
-Xep:BoxedPrimitiveConstructor:OFF |
777 |
+ |
-Xep:UnnecessaryParentheses:OFF |
778 |
|
-Xep:ModifyingCollectionWithItself:OFF"/> |
779 |
|
<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' --> |
780 |
|
<target name="errorprone" |