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 |
+ |
<!-- 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 --> |
216 |
|
<property name="java9.api.url" value="${java9.docroot.url}/api/"/> |
217 |
|
<property name="java10.api.url" value="${java10.docroot.url}/api/"/> |
218 |
|
<property name="java11.api.url" value="${java11.docroot.url}/api/"/> |
219 |
+ |
<property name="java12.api.url" value="${java12.docroot.url}/api/"/> |
220 |
|
<property name="java.api.url" value="${java.docroot.url}/api/"/> |
221 |
|
|
222 |
|
<!-- Define the "jtreg" task --> |
249 |
|
|
250 |
|
<local name="modules"/> |
251 |
|
<condition property="modules"> |
252 |
< |
<available file="${jdk@{compile-target}.home}/jmods" type="dir"/> |
252 |
> |
<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/> |
253 |
|
</condition> |
254 |
|
|
255 |
|
<local name="use-doclint"/> |
330 |
|
</sequential> |
331 |
|
</macrodef> |
332 |
|
|
333 |
+ |
<defjtregtests v="12"/> |
334 |
|
<defjtregtests v="11"/> |
335 |
|
<defjtregtests v="10"/> |
336 |
|
<defjtregtests v="9"/> |
356 |
|
|
357 |
|
<local name="modules"/> |
358 |
|
<condition property="modules"> |
359 |
< |
<available file="${jdk@{target}.home}/jmods" type="dir"/> |
359 |
> |
<available file="${jdk@{target}.home}/lib/modules" type="file"/> |
360 |
|
</condition> |
361 |
|
|
362 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
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 |
|
</sequential> |
409 |
|
</macrodef> |
412 |
|
<target name="dists" |
413 |
|
depends="dist, 4jdk8dist" |
414 |
|
description="Builds all public jars and docs"/> |
415 |
< |
<!-- |
406 |
< |
depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
407 |
< |
--> |
415 |
> |
<!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist --> |
416 |
|
|
417 |
|
<target name="compile" |
418 |
|
depends="configure-compiler" |
481 |
|
<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> --> |
482 |
|
<javadoc destdir="${docs.dir}" |
483 |
|
packagenames="none" |
484 |
< |
link="${java9.api.url}" |
484 |
> |
link="${java11.api.url}" |
485 |
|
overview="${src.dir}/intro.html" |
486 |
|
access="${build.javadoc.access}" |
487 |
|
sourcepath="${src.dir}" |
488 |
|
classpath="" |
489 |
< |
source="9" |
489 |
> |
source="11" |
490 |
|
executable="${build.main.javadoc}"> |
491 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
492 |
|
<include name="**/*.java"/> |
493 |
|
</fileset> |
494 |
< |
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
494 |
> |
<arg line="-Xdocrootparent ${java10.docroot.url}"/> |
495 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
496 |
|
<arg value="-XDignore.symbol.file=true"/> |
497 |
|
<arg value="-html5"/> |
498 |
|
<arg value="--patch-module=java.base=${src.dir}"/> |
499 |
+ |
<arg value="--frames"/> |
500 |
|
<arg value="--override-methods=summary"/> |
501 |
|
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
502 |
|
<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/> |
503 |
|
<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/> |
504 |
< |
<!-- @apiNote tag currently unused --> |
496 |
< |
<!-- <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> --> |
504 |
> |
<arg value="-tag"/> <arg value="apiNote:a:API Note:"/> |
505 |
|
<!-- tags added in jdk9: currently unused --> |
506 |
|
<!-- <arg value="-tag"/> <arg value="revised:X"/> --> |
507 |
|
<!-- <arg value="-tag"/> <arg value="spec:X"/> --> |
616 |
|
|
617 |
|
<!-- </target> --> |
618 |
|
|
619 |
< |
<target name="test91011" |
619 |
> |
<target name="test9101112" |
620 |
|
description="Runs tck and jtreg tests for src/main for multiple java versions"> |
621 |
|
|
622 |
|
<antcall target="clean"/> |
623 |
|
<antcall target="test"> |
624 |
|
<param name="build.main.java.version" value="9"/> |
625 |
+ |
<param name="build.main.java" value="${java9}"/> |
626 |
+ |
<param name="build.main.javac" value="${javac9}"/> |
627 |
|
</antcall> |
628 |
|
|
629 |
|
<antcall target="clean"/> |
630 |
|
<antcall target="test"> |
631 |
|
<param name="build.main.java.version" value="10"/> |
632 |
+ |
<param name="build.main.java" value="${java10}"/> |
633 |
+ |
<param name="build.main.javac" value="${javac10}"/> |
634 |
|
</antcall> |
635 |
|
|
636 |
|
<antcall target="clean"/> |
637 |
|
<antcall target="test"> |
638 |
|
<param name="build.main.java.version" value="11"/> |
639 |
+ |
<param name="build.main.java" value="${java11}"/> |
640 |
+ |
<param name="build.main.javac" value="${javac11}"/> |
641 |
+ |
</antcall> |
642 |
+ |
|
643 |
+ |
<antcall target="clean"/> |
644 |
+ |
<antcall target="test"> |
645 |
+ |
<param name="build.main.java.version" value="12"/> |
646 |
+ |
<param name="build.main.java" value="${java12}"/> |
647 |
+ |
<param name="build.main.javac" value="${javac12}"/> |
648 |
+ |
</antcall> |
649 |
+ |
<antcall target="docs"> |
650 |
+ |
<param name="build.main.java.version" value="12"/> |
651 |
+ |
<param name="build.main.java" value="${java12}"/> |
652 |
+ |
<param name="build.main.javac" value="${javac12}"/> |
653 |
+ |
<param name="build.main.javadoc" value="${javadoc12}"/> |
654 |
|
</antcall> |
655 |
|
|
656 |
|
<!-- Clean up to avoid obscure wrong class file version bugs --> |
1414 |
|
|
1415 |
|
|
1416 |
|
<!-- ============================================================== |
1417 |
< |
Experimental errorprone support - http://errorprone.info |
1417 |
> |
Experimental errorprone support - https://errorprone.info |
1418 |
|
=================================================================== --> |
1419 |
|
<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/> |
1420 |
|
<property name="errorprone.jsr166.user.flags" value=""/> |
1460 |
|
fork="true"> |
1461 |
|
|
1462 |
|
<include name="**/*.java"/> |
1463 |
< |
<compilerarg value="-J--illegal-access=debug"/> |
1463 |
> |
<!-- Needed to silence -Xep:FutureReturnValueIgnored --> |
1464 |
> |
<compilerarg value="-J--illegal-access=permit"/> |
1465 |
|
<compilerarg value="-XDcompilePolicy=simple"/> |
1466 |
|
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1467 |
|
<compilerarg value="-Xplugin:ErrorProne |
1484 |
|
workdir="${build.dir}" |
1485 |
|
classes="${product.jar}"> |
1486 |
|
<javac-elements> |
1487 |
< |
<compilerarg value="-J--illegal-access=debug"/> |
1487 |
> |
<!-- Needed to silence -Xep:FutureReturnValueIgnored --> |
1488 |
> |
<compilerarg value="-J--illegal-access=permit"/> |
1489 |
|
<compilerarg value="-XDcompilePolicy=simple"/> |
1490 |
|
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1491 |
|
<compilerarg value="-Xplugin:ErrorProne |