202 |
|
<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> --> |
203 |
|
<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> --> |
204 |
|
<property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> |
205 |
< |
<!-- Default jdk doc location (latest stable release seems best) --> |
206 |
< |
<!-- But pin to jdk 10 until fix for --> |
207 |
< |
<!-- 8211194: javadoc -link doesn't take module path into consideration --> |
208 |
< |
<property name="java.docroot.url" value="${java10.docroot.url}"/> |
205 |
> |
<!-- Default jdk doc location (latest stable LTS release seems best) --> |
206 |
> |
<property name="java.docroot.url" value="${java11.docroot.url}"/> |
207 |
|
|
208 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
209 |
|
<property name="java5.api.url" value="${java5.docroot.url}/api/"/> |
338 |
|
<property name="jtreg.flags" value=""/> |
339 |
|
|
340 |
|
<macrodef name="run-jtreg-tests"> |
341 |
< |
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
341 |
> |
<!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
342 |
|
<attribute name="target"/> |
343 |
|
<attribute name="workdir"/> |
344 |
|
<attribute name="classes"/> |
391 |
|
<!-- Default values: may seem strange ... --> |
392 |
|
<!-- At runtime, target latest LTS, i.e. jdk11 --> |
393 |
|
<!-- But at build time, target jdk9, for maximal binary portability --> |
394 |
< |
<!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 --> |
395 |
< |
<property name="build.main.java.version" value="11"/> |
394 |
> |
<!-- Use javadoc12 (but -link to jdk11 api docs!), to get: |
395 |
> |
o override-methods=summary |
396 |
> |
o {@systemProperty ...} |
397 |
> |
o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation) |
398 |
> |
o 8202628: javadoc generates bad links in TestModules.java |
399 |
> |
--> |
400 |
> |
<property name="java.runtime.target" value="11"/> |
401 |
|
<property name="build.main.java" value="${java11}"/> |
402 |
|
<property name="build.main.javac" value="${javac9}"/> |
403 |
|
<property name="build.main.javadoc" value="${javadoc12}"/> |
404 |
+ |
<property name="build.main.javadoc.source" value="${java.runtime.target}"/> |
405 |
|
|
406 |
|
<target name="dists" |
407 |
|
depends="dist, 4jdk8dist" |
475 |
|
<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> --> |
476 |
|
<javadoc destdir="${docs.dir}" |
477 |
|
packagenames="none" |
478 |
< |
link="${java11.api.url}" |
478 |
> |
link="${java.api.url}" |
479 |
|
overview="${src.dir}/intro.html" |
480 |
|
access="${build.javadoc.access}" |
481 |
|
sourcepath="${src.dir}" |
482 |
|
classpath="" |
483 |
< |
source="11" |
483 |
> |
source="${build.main.javadoc.source}" |
484 |
|
executable="${build.main.javadoc}"> |
485 |
+ |
<!-- TODO: JDK-8214571 failonerror = "true" --> |
486 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
487 |
|
<include name="**/*.java"/> |
488 |
|
</fileset> |
489 |
< |
<arg line="-Xdocrootparent ${java10.docroot.url}"/> |
489 |
> |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
490 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
491 |
|
<arg value="-XDignore.symbol.file=true"/> |
492 |
|
<arg value="-html5"/> |
493 |
|
<arg value="--patch-module=java.base=${src.dir}"/> |
494 |
+ |
<!-- old school frames via docs/index.html?overview-summary.html --> |
495 |
|
<arg value="--frames"/> |
496 |
|
<arg value="--override-methods=summary"/> |
497 |
|
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
538 |
|
description="Runs tck tests for src/main directly"> |
539 |
|
|
540 |
|
<run-tck-tests |
541 |
< |
target="${build.main.java.version}" |
541 |
> |
target="${java.runtime.target}" |
542 |
|
workdir="${build.dir}" |
543 |
|
classes="${product.jar}"> |
544 |
|
<javac-elements> |
572 |
|
depends="jar" |
573 |
|
description="Runs jtreg tests for src/main using the jtreg ant task"> |
574 |
|
<run-jtreg-tests |
575 |
< |
target="${build.main.java.version}" |
575 |
> |
target="${java.runtime.target}" |
576 |
|
workdir="${build.dir}" |
577 |
|
classes="${product.jar}"/> |
578 |
|
</target> |
588 |
|
<target name="test9"> |
589 |
|
<antcall target="clean"/> |
590 |
|
<antcall> |
591 |
< |
<param name="build.main.java.version" value="9"/> |
586 |
< |
<param name="build.main.java" value="${java9}"/> |
591 |
> |
<param name="java.runtime.target" value="9"/> |
592 |
|
<param name="build.main.javac" value="${javac9}"/> |
593 |
+ |
<param name="build.main.javadoc" value="${javadoc12}"/> |
594 |
+ |
<param name="build.main.javadoc.source" value="9"/> |
595 |
|
<target name="test"/> |
596 |
+ |
<target name="docs"/> |
597 |
|
</antcall> |
598 |
|
</target> |
599 |
|
|
600 |
|
<target name="test10"> |
601 |
|
<antcall target="clean"/> |
602 |
|
<antcall> |
603 |
< |
<param name="build.main.java.version" value="10"/> |
596 |
< |
<param name="build.main.java" value="${java10}"/> |
603 |
> |
<param name="java.runtime.target" value="10"/> |
604 |
|
<param name="build.main.javac" value="${javac10}"/> |
605 |
< |
<param name="build.main.javadoc" value="${javadoc10}"/> |
605 |
> |
<param name="build.main.javadoc" value="${javadoc12}"/> |
606 |
> |
<param name="build.main.javadoc.source" value="10"/> |
607 |
|
<target name="test"/> |
608 |
|
<target name="docs"/> |
609 |
|
</antcall> |
612 |
|
<target name="test11"> |
613 |
|
<antcall target="clean"/> |
614 |
|
<antcall> |
615 |
< |
<param name="build.main.java.version" value="11"/> |
608 |
< |
<param name="build.main.java" value="${java11}"/> |
615 |
> |
<param name="java.runtime.target" value="11"/> |
616 |
|
<param name="build.main.javac" value="${javac11}"/> |
617 |
< |
<param name="build.main.javadoc" value="${javadoc11}"/> |
617 |
> |
<param name="build.main.javadoc" value="${javadoc12}"/> |
618 |
> |
<param name="build.main.javadoc.source" value="11"/> |
619 |
|
<target name="test"/> |
620 |
|
<target name="docs"/> |
621 |
|
</antcall> |
624 |
|
<target name="test12"> |
625 |
|
<antcall target="clean"/> |
626 |
|
<antcall> |
627 |
< |
<param name="build.main.java.version" value="12"/> |
620 |
< |
<param name="build.main.java" value="${java12}"/> |
627 |
> |
<param name="java.runtime.target" value="12"/> |
628 |
|
<param name="build.main.javac" value="${javac12}"/> |
629 |
|
<param name="build.main.javadoc" value="${javadoc12}"/> |
630 |
+ |
<param name="build.main.javadoc.source" value="12"/> |
631 |
|
<target name="test"/> |
632 |
|
<target name="docs"/> |
633 |
|
</antcall> |
636 |
|
<target name="test9-11"> |
637 |
|
<antcall target="clean"/> |
638 |
|
<antcall> |
639 |
< |
<param name="build.main.java.version" value="11"/> |
632 |
< |
<param name="build.main.java" value="${java11}"/> |
639 |
> |
<param name="java.runtime.target" value="11"/> |
640 |
|
<param name="build.main.javac" value="${javac9}"/> |
641 |
< |
<param name="build.main.javadoc" value="${javadoc11}"/> |
641 |
> |
<param name="build.main.javadoc" value="${javadoc12}"/> |
642 |
> |
<param name="build.main.javadoc.source" value="9"/> |
643 |
|
<target name="test"/> |
644 |
|
<target name="docs"/> |
645 |
|
</antcall> |
648 |
|
<target name="test9-12"> |
649 |
|
<antcall target="clean"/> |
650 |
|
<antcall> |
651 |
< |
<param name="build.main.java.version" value="12"/> |
644 |
< |
<param name="build.main.java" value="${java12}"/> |
651 |
> |
<param name="java.runtime.target" value="12"/> |
652 |
|
<param name="build.main.javac" value="${javac9}"/> |
653 |
|
<param name="build.main.javadoc" value="${javadoc12}"/> |
654 |
+ |
<param name="build.main.javadoc.source" value="9"/> |
655 |
|
<target name="test"/> |
656 |
|
<target name="docs"/> |
657 |
|
</antcall> |
1381 |
|
|
1382 |
|
|
1383 |
|
<!-- ============================================================== |
1384 |
< |
Experimental errorprone support - https://errorprone.info |
1384 |
> |
Experimental errorprone support |
1385 |
> |
https://errorprone.info |
1386 |
> |
https://errorprone.info/docs/installation |
1387 |
> |
https://github.com/google/error-prone/issues/1143 |
1388 |
|
=================================================================== --> |
1389 |
< |
<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/> |
1389 |
> |
<path id="errorprone.processorpath.path"> |
1390 |
> |
<pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/> |
1391 |
> |
<pathelement location="${lib.dir}/dataflow-2.5.7.jar"/> |
1392 |
> |
<pathelement location="${lib.dir}/javacutil-2.5.7.jar"/> |
1393 |
> |
<pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/> |
1394 |
> |
</path> |
1395 |
> |
<property name="errorprone.processorpath" refid="errorprone.processorpath.path" /> |
1396 |
|
<property name="errorprone.jsr166.user.flags" value=""/> |
1397 |
|
<property name="errorprone.jsr166.flags" |
1398 |
|
value="-Xep:HashtableContains:OFF |
1399 |
|
-Xep:JdkObsolete:OFF |
1400 |
|
-Xep:MissingOverride:OFF |
1401 |
|
-Xep:MissingFail:OFF |
1402 |
+ |
-Xep:ThreadPriorityCheck:OFF |
1403 |
|
-Xep:MixedArrayDimensions:ERROR |
1404 |
|
-Xep:RemoveUnusedImports:ERROR |
1405 |
|
-Xep:EmptyIf:ERROR |
1408 |
|
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1409 |
|
-Xep:RedundantThrows:ERROR |
1410 |
|
-Xep:IdentityBinaryExpression:WARN |
1411 |
+ |
-Xep:ConstructorInvokesOverridable:WARN |
1412 |
|
-Xep:MethodCanBeStatic:WARN |
1413 |
|
${errorprone.jsr166.user.flags}"/> |
1414 |
|
<!-- -Xep:WildcardImport:ERROR --> |
1441 |
|
<!-- Needed to silence -Xep:FutureReturnValueIgnored --> |
1442 |
|
<compilerarg value="-J--illegal-access=permit"/> |
1443 |
|
<compilerarg value="-XDcompilePolicy=simple"/> |
1444 |
< |
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1444 |
> |
<compilerarg value="-processorpath"/> |
1445 |
> |
<compilerarg pathref="errorprone.processorpath.path"/> |
1446 |
|
<compilerarg value="-Xplugin:ErrorProne |
1447 |
|
${errorprone.jsr166.flags}"/> |
1448 |
|
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
1459 |
|
</jar> |
1460 |
|
|
1461 |
|
<run-tck-tests |
1462 |
< |
target="${build.main.java.version}" |
1462 |
> |
target="${java.runtime.target}" |
1463 |
|
workdir="${build.dir}" |
1464 |
|
classes="${product.jar}"> |
1465 |
|
<javac-elements> |
1466 |
|
<!-- Needed to silence -Xep:FutureReturnValueIgnored --> |
1467 |
|
<compilerarg value="-J--illegal-access=permit"/> |
1468 |
|
<compilerarg value="-XDcompilePolicy=simple"/> |
1469 |
< |
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1469 |
> |
<compilerarg line="-processorpath ${errorprone.processorpath}"/> |
1470 |
|
<compilerarg value="-Xplugin:ErrorProne |
1471 |
|
${errorprone.jsr166.flags} |
1472 |
|
${errorprone.jsr166.test.flags}"/> |
1482 |
|
description="Run errorprone over jtreg tests (experimental)"> |
1483 |
|
|
1484 |
|
<run-jtreg-tests |
1485 |
< |
target="${build.main.java.version}" |
1485 |
> |
target="${java.runtime.target}" |
1486 |
|
workdir="${build.dir}" |
1487 |
|
classes="${product.jar}" |
1488 |
|
verbose="all"> |
1489 |
|
<jtreg-elements> |
1490 |
|
<arg value="-javacoption:-XDcompilePolicy=simple"/> |
1491 |
|
<arg value="-javacoption:-processorpath"/> |
1492 |
< |
<arg value="-javacoption:${errorprone.jar}"/> |
1492 |
> |
<arg value="-javacoption:${errorprone.processorpath}"/> |
1493 |
|
<arg value="-javacoption:-Xplugin:ErrorProne |
1494 |
|
${errorprone.jsr166.flags} |
1495 |
|
${errorprone.jsr166.test.flags} |