1 |
|
<project name="jsr166" default="usage" |
2 |
< |
xmlns:if="ant:if" |
2 |
> |
xmlns:if="ant:if" |
3 |
|
xmlns:unless="ant:unless" |
4 |
|
xmlns:ivy="antlib:org.apache.ivy.ant"> |
5 |
|
|
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 |
|
|
55 |
|
|
56 |
|
|
57 |
|
<!-- Compilation options --> |
56 |
– |
<property name="build.sourcelevel" value="6"/> |
58 |
|
<property name="build.debug" value="true"/> |
59 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
60 |
|
<property name="build.deprecation" value="false"/> |
105 |
|
<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes" |
106 |
|
unless:set="have.java.base"/> |
107 |
|
<local name="modules"/> |
108 |
< |
<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/> |
108 |
> |
<available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/> |
109 |
|
<local name="boot.jar.dir"/> |
110 |
|
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib" unless:set="modules"/> |
111 |
|
<path id="bootclasspath@{v}" unless:set="modules"> |
137 |
|
<defjdklocations v="9"/> |
138 |
|
<defjdklocations v="10"/> |
139 |
|
<defjdklocations v="11"/> |
140 |
+ |
<defjdklocations v="12"/> |
141 |
|
|
142 |
|
<!-- Source locations --> |
143 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
149 |
|
<property name="jtreg9.src.dir" location="${test.src.dir}/jtreg"/> |
150 |
|
<property name="jtreg10.src.dir" location="${test.src.dir}/jtreg"/> |
151 |
|
<property name="jtreg11.src.dir" location="${test.src.dir}/jtreg"/> |
152 |
+ |
<property name="jtreg12.src.dir" location="${test.src.dir}/jtreg"/> |
153 |
|
<property name="jtreg.src.dir" location="${jtreg9.src.dir}"/> |
154 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
155 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
196 |
|
<property name="java8.docroot.url" value="https://docs.oracle.com/javase/8/docs"/> |
197 |
|
<property name="java9.docroot.url" value="https://docs.oracle.com/javase/9/docs"/> |
198 |
|
<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/> |
199 |
+ |
<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/> |
200 |
|
<!-- The location of jdk early access docs (RIP) --> |
201 |
|
<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> --> |
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"/> |
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}"/> |
209 |
|
|
210 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
215 |
|
<property name="java9.api.url" value="${java9.docroot.url}/api/"/> |
216 |
|
<property name="java10.api.url" value="${java10.docroot.url}/api/"/> |
217 |
|
<property name="java11.api.url" value="${java11.docroot.url}/api/"/> |
218 |
+ |
<property name="java12.api.url" value="${java12.docroot.url}/api/"/> |
219 |
|
<property name="java.api.url" value="${java.docroot.url}/api/"/> |
220 |
|
|
221 |
|
<!-- Define the "jtreg" task --> |
248 |
|
|
249 |
|
<local name="modules"/> |
250 |
|
<condition property="modules"> |
251 |
< |
<available file="${jdk@{compile-target}.home}/jmods" type="dir"/> |
251 |
> |
<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/> |
252 |
|
</condition> |
253 |
|
|
254 |
|
<local name="use-doclint"/> |
329 |
|
</sequential> |
330 |
|
</macrodef> |
331 |
|
|
332 |
+ |
<defjtregtests v="12"/> |
333 |
|
<defjtregtests v="11"/> |
334 |
|
<defjtregtests v="10"/> |
335 |
|
<defjtregtests v="9"/> |
355 |
|
|
356 |
|
<local name="modules"/> |
357 |
|
<condition property="modules"> |
358 |
< |
<available file="${jdk@{target}.home}/jmods" type="dir"/> |
358 |
> |
<available file="${jdk@{target}.home}/lib/modules" type="file"/> |
359 |
|
</condition> |
360 |
|
|
361 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
390 |
|
|
391 |
|
<!-- Main targets --> |
392 |
|
|
393 |
< |
<property name="build.main.java.version" value="9"/> |
394 |
< |
<!-- Workaround "no nested properties in ant" --> |
395 |
< |
<macrodef name="define-build-main-properties"> |
396 |
< |
<attribute name="v"/> |
397 |
< |
<sequential> |
398 |
< |
<property name="build.main.java" value="${java@{v}}"/> |
399 |
< |
<property name="build.main.javac" value="${javac@{v}}"/> |
400 |
< |
<!-- Force javadoc version to be at least 10, |
392 |
< |
so we can use override-methods=summary --> |
393 |
< |
<condition property="build.main.javadoc" |
394 |
< |
value="${javadoc11}" |
395 |
< |
else="${javadoc@{v}}"> |
396 |
< |
<equals arg1="@{v}" arg2="9"/> |
397 |
< |
</condition> |
398 |
< |
</sequential> |
399 |
< |
</macrodef> |
400 |
< |
<define-build-main-properties v="${build.main.java.version}"/> |
393 |
> |
<!-- Default values: may seem strange ... --> |
394 |
> |
<!-- At runtime, target latest LTS, i.e. jdk11 --> |
395 |
> |
<!-- But at build time, target jdk9, for maximal binary portability --> |
396 |
> |
<!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 --> |
397 |
> |
<property name="build.main.java.version" value="11"/> |
398 |
> |
<property name="build.main.java" value="${java11}"/> |
399 |
> |
<property name="build.main.javac" value="${javac9}"/> |
400 |
> |
<property name="build.main.javadoc" value="${javadoc12}"/> |
401 |
|
|
402 |
|
<target name="dists" |
403 |
|
depends="dist, 4jdk8dist" |
404 |
|
description="Builds all public jars and docs"/> |
405 |
< |
<!-- |
406 |
< |
depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
407 |
< |
--> |
405 |
> |
<!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist --> |
406 |
|
|
407 |
|
<target name="compile" |
408 |
|
depends="configure-compiler" |
429 |
|
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
430 |
|
<compilerarg value="-Xprefer:source"/> |
431 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
432 |
< |
<compilerarg value="-Xlint:all"/> |
432 |
> |
<compilerarg value="-Xlint:all,-removal"/> |
433 |
|
<compilerarg line="--doclint-format html5"/> |
434 |
|
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
435 |
|
<compilerarg value="-Werror"/> |
471 |
|
<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> --> |
472 |
|
<javadoc destdir="${docs.dir}" |
473 |
|
packagenames="none" |
474 |
< |
link="${java9.api.url}" |
474 |
> |
link="${java11.api.url}" |
475 |
|
overview="${src.dir}/intro.html" |
476 |
|
access="${build.javadoc.access}" |
477 |
|
sourcepath="${src.dir}" |
478 |
|
classpath="" |
479 |
< |
source="9" |
479 |
> |
source="11" |
480 |
|
executable="${build.main.javadoc}"> |
481 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
482 |
|
<include name="**/*.java"/> |
483 |
|
</fileset> |
484 |
< |
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
484 |
> |
<arg line="-Xdocrootparent ${java10.docroot.url}"/> |
485 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
486 |
|
<arg value="-XDignore.symbol.file=true"/> |
487 |
|
<arg value="-html5"/> |
488 |
|
<arg value="--patch-module=java.base=${src.dir}"/> |
489 |
+ |
<arg value="--frames"/> |
490 |
|
<arg value="--override-methods=summary"/> |
491 |
|
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
492 |
|
<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/> |
493 |
|
<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/> |
494 |
< |
<!-- @apiNote tag currently unused --> |
496 |
< |
<!-- <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> --> |
494 |
> |
<arg value="-tag"/> <arg value="apiNote:a:API Note:"/> |
495 |
|
<!-- tags added in jdk9: currently unused --> |
496 |
|
<!-- <arg value="-tag"/> <arg value="revised:X"/> --> |
497 |
|
<!-- <arg value="-tag"/> <arg value="spec:X"/> --> |
504 |
|
description="Puts all distributable products in single hierarchy"/> |
505 |
|
|
506 |
|
|
509 |
– |
<target name="release" |
510 |
– |
depends="dist" |
511 |
– |
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
512 |
– |
|
513 |
– |
<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/> |
514 |
– |
|
515 |
– |
<jar basedir="${basedir}" destfile="${release.jar}"> |
516 |
– |
<!-- <exclude name="build/**"/> --> |
517 |
– |
<exclude name="${release.jar}"/> |
518 |
– |
<exclude name="user.properties"/> |
519 |
– |
<exclude name="etc/notes/**"/> |
520 |
– |
<exclude name="src/emulation/**"/> |
521 |
– |
<exclude name="**/SyntaxTest.java"/> |
522 |
– |
<exclude name="**/SuperfluousAbstract.java"/> |
523 |
– |
<manifest> |
524 |
– |
<attribute name="Built-By" value="${user.name}"/> |
525 |
– |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
526 |
– |
</manifest> |
527 |
– |
</jar> |
528 |
– |
</target> |
529 |
– |
|
530 |
– |
|
507 |
|
<target name="clean" |
508 |
|
description="Removes all build products"> |
509 |
|
<delete dir="${build.dir}"/> |
575 |
|
depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg" |
576 |
|
description="Runs tck and jtreg tests for src/main"/> |
577 |
|
|
578 |
< |
<!-- <target name="jtreg8" description="Runs jtreg tests with jdk8"> --> |
579 |
< |
|
580 |
< |
<!-- <antcall target="jtreg"> --> |
605 |
< |
<!-- <param name="build.main.java.version" value="8"/> --> |
606 |
< |
<!-- <param name="build.main.javac" value="${javac8}"/> --> |
607 |
< |
<!-- </antcall> --> |
608 |
< |
|
609 |
< |
<!-- </target> --> |
610 |
< |
|
611 |
< |
<target name="test91011" |
612 |
< |
description="Runs tck and jtreg tests for src/main for multiple java versions"> |
578 |
> |
<target name="test-version-permutations" |
579 |
> |
depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs"> |
580 |
> |
</target> |
581 |
|
|
582 |
+ |
<target name="test9"> |
583 |
|
<antcall target="clean"/> |
584 |
< |
<antcall target="test"> |
584 |
> |
<antcall> |
585 |
|
<param name="build.main.java.version" value="9"/> |
586 |
+ |
<param name="build.main.java" value="${java9}"/> |
587 |
+ |
<param name="build.main.javac" value="${javac9}"/> |
588 |
+ |
<target name="test"/> |
589 |
|
</antcall> |
590 |
+ |
</target> |
591 |
|
|
592 |
+ |
<target name="test10"> |
593 |
|
<antcall target="clean"/> |
594 |
< |
<antcall target="test"> |
594 |
> |
<antcall> |
595 |
|
<param name="build.main.java.version" value="10"/> |
596 |
+ |
<param name="build.main.java" value="${java10}"/> |
597 |
+ |
<param name="build.main.javac" value="${javac10}"/> |
598 |
+ |
<param name="build.main.javadoc" value="${javadoc10}"/> |
599 |
+ |
<target name="test"/> |
600 |
+ |
<target name="docs"/> |
601 |
|
</antcall> |
602 |
+ |
</target> |
603 |
|
|
604 |
+ |
<target name="test11"> |
605 |
|
<antcall target="clean"/> |
606 |
< |
<antcall target="test"> |
606 |
> |
<antcall> |
607 |
|
<param name="build.main.java.version" value="11"/> |
608 |
+ |
<param name="build.main.java" value="${java11}"/> |
609 |
+ |
<param name="build.main.javac" value="${javac11}"/> |
610 |
+ |
<param name="build.main.javadoc" value="${javadoc11}"/> |
611 |
+ |
<target name="test"/> |
612 |
+ |
<target name="docs"/> |
613 |
|
</antcall> |
614 |
+ |
</target> |
615 |
|
|
616 |
< |
<!-- Clean up to avoid obscure wrong class file version bugs --> |
616 |
> |
<target name="test12"> |
617 |
|
<antcall target="clean"/> |
618 |
+ |
<antcall> |
619 |
+ |
<param name="build.main.java.version" value="12"/> |
620 |
+ |
<param name="build.main.java" value="${java12}"/> |
621 |
+ |
<param name="build.main.javac" value="${javac12}"/> |
622 |
+ |
<param name="build.main.javadoc" value="${javadoc12}"/> |
623 |
+ |
<target name="test"/> |
624 |
+ |
<target name="docs"/> |
625 |
+ |
</antcall> |
626 |
+ |
</target> |
627 |
|
|
628 |
+ |
<target name="test9-11"> |
629 |
+ |
<antcall target="clean"/> |
630 |
+ |
<antcall> |
631 |
+ |
<param name="build.main.java.version" value="11"/> |
632 |
+ |
<param name="build.main.java" value="${java11}"/> |
633 |
+ |
<param name="build.main.javac" value="${javac9}"/> |
634 |
+ |
<param name="build.main.javadoc" value="${javadoc11}"/> |
635 |
+ |
<target name="test"/> |
636 |
+ |
<target name="docs"/> |
637 |
+ |
</antcall> |
638 |
|
</target> |
639 |
|
|
640 |
+ |
<target name="test9-12"> |
641 |
+ |
<antcall target="clean"/> |
642 |
+ |
<antcall> |
643 |
+ |
<param name="build.main.java.version" value="12"/> |
644 |
+ |
<param name="build.main.java" value="${java12}"/> |
645 |
+ |
<param name="build.main.javac" value="${javac9}"/> |
646 |
+ |
<param name="build.main.javadoc" value="${javadoc12}"/> |
647 |
+ |
<target name="test"/> |
648 |
+ |
<target name="docs"/> |
649 |
+ |
</antcall> |
650 |
+ |
</target> |
651 |
|
|
652 |
|
|
653 |
|
<target name="configure-compiler"> |
670 |
|
</target> |
671 |
|
|
672 |
|
|
656 |
– |
|
657 |
– |
<!-- Various demos and test programs --> |
658 |
– |
|
659 |
– |
|
660 |
– |
<!-- description="Benchmark from Doug Lea's AQS paper" --> |
661 |
– |
<target name="loops" depends="configure-compiler"> |
662 |
– |
|
663 |
– |
<mkdir dir="${build.loops.dir}"/> |
664 |
– |
|
665 |
– |
<javac srcdir="${loops.src.dir}" |
666 |
– |
destdir="${build.loops.dir}" |
667 |
– |
debug="${build.debug}" |
668 |
– |
debuglevel="${build.debuglevel}" |
669 |
– |
deprecation="${build.deprecation}" |
670 |
– |
source="${build.sourcelevel}" |
671 |
– |
target="${build.sourcelevel}" |
672 |
– |
encoding="ASCII" |
673 |
– |
fork="true"> |
674 |
– |
|
675 |
– |
<compilerarg line="${build.args}"/> |
676 |
– |
<classpath refid="loops.classpath"/> |
677 |
– |
<compilerarg value="-XDignore.symbol.file=true"/> |
678 |
– |
|
679 |
– |
</javac> |
680 |
– |
|
681 |
– |
<java classname="ALoops" fork="true"> |
682 |
– |
<classpath refid="loops.classpath"/> |
683 |
– |
</java> |
684 |
– |
</target> |
685 |
– |
|
686 |
– |
|
673 |
|
<target name="compile-test-loops" depends="jar" |
674 |
|
description="Compiles all the perf tests in src/test/loops"> |
675 |
|
|
1373 |
|
|
1374 |
|
|
1375 |
|
<!-- ============================================================== |
1376 |
< |
Experimental errorprone support - http://errorprone.info |
1376 |
> |
Experimental errorprone support |
1377 |
> |
https://errorprone.info |
1378 |
> |
https://errorprone.info/docs/installation |
1379 |
> |
https://github.com/google/error-prone/issues/1143 |
1380 |
|
=================================================================== --> |
1381 |
< |
<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/> |
1381 |
> |
<property name="errorprone.jar" location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/> |
1382 |
> |
<property name="dataflow.jar" location="${lib.dir}/dataflow-2.5.7.jar"/> |
1383 |
> |
<property name="javacutil.jar" location="${lib.dir}/javacutil-2.5.7.jar"/> |
1384 |
> |
<property name="jFormatString.jar" location="${lib.dir}/jFormatString-3.0.0.jar"/> |
1385 |
> |
<property name="errorprone.processorpath" value="${errorprone.jar}:${jFormatString.jar}:${dataflow.jar}:${javacutil.jar}" /> |
1386 |
|
<property name="errorprone.jsr166.user.flags" value=""/> |
1387 |
|
<property name="errorprone.jsr166.flags" |
1388 |
|
value="-Xep:HashtableContains:OFF |
1397 |
|
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1398 |
|
-Xep:RedundantThrows:ERROR |
1399 |
|
-Xep:IdentityBinaryExpression:WARN |
1400 |
+ |
-Xep:ConstructorInvokesOverridable:WARN |
1401 |
|
-Xep:MethodCanBeStatic:WARN |
1402 |
|
${errorprone.jsr166.user.flags}"/> |
1403 |
|
<!-- -Xep:WildcardImport:ERROR --> |
1427 |
|
fork="true"> |
1428 |
|
|
1429 |
|
<include name="**/*.java"/> |
1430 |
< |
<compilerarg value="-J--illegal-access=debug"/> |
1430 |
> |
<!-- Needed to silence -Xep:FutureReturnValueIgnored --> |
1431 |
> |
<compilerarg value="-J--illegal-access=permit"/> |
1432 |
|
<compilerarg value="-XDcompilePolicy=simple"/> |
1433 |
< |
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1433 |
> |
<compilerarg line="-processorpath ${errorprone.processorpath}"/> |
1434 |
|
<compilerarg value="-Xplugin:ErrorProne |
1435 |
|
${errorprone.jsr166.flags}"/> |
1436 |
|
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
1451 |
|
workdir="${build.dir}" |
1452 |
|
classes="${product.jar}"> |
1453 |
|
<javac-elements> |
1454 |
< |
<compilerarg value="-J--illegal-access=debug"/> |
1454 |
> |
<!-- Needed to silence -Xep:FutureReturnValueIgnored --> |
1455 |
> |
<compilerarg value="-J--illegal-access=permit"/> |
1456 |
|
<compilerarg value="-XDcompilePolicy=simple"/> |
1457 |
< |
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1457 |
> |
<compilerarg line="-processorpath ${errorprone.processorpath}"/> |
1458 |
|
<compilerarg value="-Xplugin:ErrorProne |
1459 |
|
${errorprone.jsr166.flags} |
1460 |
|
${errorprone.jsr166.test.flags}"/> |
1477 |
|
<jtreg-elements> |
1478 |
|
<arg value="-javacoption:-XDcompilePolicy=simple"/> |
1479 |
|
<arg value="-javacoption:-processorpath"/> |
1480 |
< |
<arg value="-javacoption:${errorprone.jar}"/> |
1480 |
> |
<arg value="-javacoption:${errorprone.processorpath}"/> |
1481 |
|
<arg value="-javacoption:-Xplugin:ErrorProne |
1482 |
|
${errorprone.jsr166.flags} |
1483 |
|
${errorprone.jsr166.test.flags} |