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"/> |
205 |
< |
<property name="java12.docroot.url" value="http://download.java.net/java/jdk12/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 |
+ |
<!-- But pin to jdk 10 until fix for --> |
208 |
+ |
<!-- 8211194: javadoc -link doesn't take module path into consideration --> |
209 |
|
<property name="java.docroot.url" value="${java10.docroot.url}"/> |
210 |
|
|
211 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
391 |
|
|
392 |
|
<!-- Main targets --> |
393 |
|
|
394 |
< |
<property name="build.main.java.version" value="9"/> |
394 |
> |
<property name="build.main.java.version" value="11"/> |
395 |
|
<!-- Workaround "no nested properties in ant" --> |
396 |
|
<macrodef name="define-build-main-properties"> |
397 |
|
<attribute name="v"/> |
398 |
|
<sequential> |
399 |
|
<property name="build.main.java" value="${java@{v}}"/> |
400 |
|
<property name="build.main.javac" value="${javac@{v}}"/> |
401 |
< |
<!-- Force javadoc version to be at least 10, |
402 |
< |
so we can use override-methods=summary --> |
401 |
> |
<!-- Force javadoc version to be at least 10, so we can use override-methods=summary --> |
402 |
> |
<!-- Force javadoc version to be at least 12, due to JDK-8202628 --> |
403 |
|
<condition property="build.main.javadoc" |
404 |
< |
value="${javadoc11}" |
404 |
> |
value="${javadoc12}" |
405 |
|
else="${javadoc@{v}}"> |
406 |
< |
<equals arg1="@{v}" arg2="9"/> |
406 |
> |
<matches pattern="^(9|10|11)$" string="@{v}"/> |
407 |
|
</condition> |
408 |
+ |
<property name="build.main.javadoc" value="${javadoc12}"/> |
409 |
|
</sequential> |
410 |
|
</macrodef> |
411 |
|
<define-build-main-properties v="${build.main.java.version}"/> |
484 |
|
<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> --> |
485 |
|
<javadoc destdir="${docs.dir}" |
486 |
|
packagenames="none" |
487 |
< |
link="${java9.api.url}" |
487 |
> |
link="${java11.api.url}" |
488 |
|
overview="${src.dir}/intro.html" |
489 |
|
access="${build.javadoc.access}" |
490 |
|
sourcepath="${src.dir}" |
491 |
|
classpath="" |
492 |
< |
source="9" |
492 |
> |
source="11" |
493 |
|
executable="${build.main.javadoc}"> |
494 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
495 |
|
<include name="**/*.java"/> |
496 |
|
</fileset> |
497 |
< |
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
497 |
> |
<arg line="-Xdocrootparent ${java10.docroot.url}"/> |
498 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
499 |
|
<arg value="-XDignore.symbol.file=true"/> |
500 |
|
<arg value="-html5"/> |
624 |
|
<antcall target="clean"/> |
625 |
|
<antcall target="test"> |
626 |
|
<param name="build.main.java.version" value="9"/> |
627 |
+ |
<param name="build.main.java" value="${java9}"/> |
628 |
+ |
<param name="build.main.javac" value="${javac9}"/> |
629 |
|
</antcall> |
630 |
|
|
631 |
|
<antcall target="clean"/> |
632 |
|
<antcall target="test"> |
633 |
|
<param name="build.main.java.version" value="10"/> |
634 |
+ |
<param name="build.main.java" value="${java10}"/> |
635 |
+ |
<param name="build.main.javac" value="${javac10}"/> |
636 |
|
</antcall> |
637 |
|
|
638 |
|
<antcall target="clean"/> |
639 |
|
<antcall target="test"> |
640 |
|
<param name="build.main.java.version" value="11"/> |
641 |
+ |
<param name="build.main.java" value="${java11}"/> |
642 |
+ |
<param name="build.main.javac" value="${javac11}"/> |
643 |
|
</antcall> |
644 |
|
|
645 |
|
<antcall target="clean"/> |
646 |
|
<antcall target="test"> |
647 |
|
<param name="build.main.java.version" value="12"/> |
648 |
+ |
<param name="build.main.java" value="${java12}"/> |
649 |
+ |
<param name="build.main.javac" value="${javac12}"/> |
650 |
+ |
</antcall> |
651 |
+ |
<antcall target="docs"> |
652 |
+ |
<param name="build.main.java.version" value="12"/> |
653 |
+ |
<param name="build.main.java" value="${java12}"/> |
654 |
+ |
<param name="build.main.javac" value="${javac12}"/> |
655 |
+ |
<param name="build.main.javadoc" value="${javadoc12}"/> |
656 |
|
</antcall> |
657 |
|
|
658 |
|
<!-- Clean up to avoid obscure wrong class file version bugs --> |
1416 |
|
|
1417 |
|
|
1418 |
|
<!-- ============================================================== |
1419 |
< |
Experimental errorprone support - http://errorprone.info |
1419 |
> |
Experimental errorprone support - https://errorprone.info |
1420 |
|
=================================================================== --> |
1421 |
|
<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/> |
1422 |
|
<property name="errorprone.jsr166.user.flags" value=""/> |