18 |
|
itself. Because the JDK version matters and because different |
19 |
|
targets require different JDKs, we assume that users have created a |
20 |
|
hierarchy containing: |
21 |
– |
$HOME/jdk/jdk7 |
21 |
|
$HOME/jdk/jdk8 |
22 |
|
$HOME/jdk/jdk9 |
23 |
|
$HOME/jdk/jdk10 |
24 |
|
where each of the above is a JDK or a symlink to same, and |
26 |
– |
$HOME/jdk/src/jdk7 |
25 |
|
$HOME/jdk/src/jdk8 |
26 |
|
$HOME/jdk/src/jdk9 |
27 |
|
$HOME/jdk/src/jdk10 |
30 |
|
|
31 |
|
Alternatively, define ant variables thus: |
32 |
|
ant -Djdk$N.home=... -Djdk$N.src.home=... |
33 |
< |
for $N in 7 8 9 10 ... |
33 |
> |
for $N in 8 9 10 ... |
34 |
|
|
35 |
|
As of 2016-03, the sources in src/main are for jdk9+ only. |
36 |
|
------------------------------------------------------------------------------ |
232 |
|
<available file="${jdk@{compile-target}.home}/jmods" type="dir"/> |
233 |
|
</condition> |
234 |
|
|
235 |
+ |
<local name="use-doclint"/> |
236 |
+ |
<condition property="use-doclint"> |
237 |
+ |
<not> <equals arg1="@{target}" arg2="7"/> </not> |
238 |
+ |
</condition> |
239 |
+ |
|
240 |
|
<mkdir dir="@{workdir}/tck-classes"/> |
241 |
|
|
242 |
|
<javac srcdir="@{tck.src.dir}" |
256 |
|
<include name="*.java"/> |
257 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
258 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/> |
259 |
+ |
<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/> |
260 |
|
<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
261 |
< |
<compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/> |
261 |
> |
<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/> |
262 |
|
<compilerarg line="${build.args}"/> |
263 |
|
<javac-elements/> |
264 |
|
|
269 |
|
jvm="${java@{target}}" |
270 |
|
fork="true"> |
271 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
272 |
< |
<jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/> |
273 |
< |
<jvmarg line="--add-opens java.base/java.lang=ALL-UNNAMED" if:set="modules"/> |
274 |
< |
<jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/> |
275 |
< |
<jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/> |
276 |
< |
<jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/> |
277 |
< |
<jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/> |
272 |
> |
<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/> |
273 |
> |
<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/> |
274 |
> |
<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/> |
275 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/> |
276 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/> |
277 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/> |
278 |
|
<jvmarg line="@{jvmflags}"/> |
279 |
|
<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck --> |
280 |
|
<jvmarg line="${vmoptions}" if:set="vmoptions"/> |
296 |
|
</macrodef> |
297 |
|
|
298 |
|
<!-- Define jtreg test sets for different jdk versions --> |
299 |
+ |
<fileset dir="${jtreg10.src.dir}"> |
300 |
+ |
<patternset id="jdk10.jtreg.tests"> |
301 |
+ |
<include name="**/*.java"/> |
302 |
+ |
</patternset> |
303 |
+ |
</fileset> |
304 |
+ |
|
305 |
|
<fileset dir="${jtreg9.src.dir}"> |
306 |
|
<patternset id="jdk9.jtreg.tests"> |
307 |
|
<include name="**/*.java"/> |
325 |
|
|
326 |
|
<macrodef name="run-jtreg-tests"> |
327 |
|
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
318 |
– |
<attribute name="source" default="7"/> |
328 |
|
<attribute name="target"/> |
329 |
|
<attribute name="workdir"/> |
330 |
|
<attribute name="classes"/> |
375 |
|
<property name="build.main.javac" value="${javac9}"/> |
376 |
|
|
377 |
|
<target name="dists" |
378 |
< |
depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
378 |
> |
depends="dist, 4jdk8dist" |
379 |
|
description="Builds all public jars and docs"/> |
380 |
+ |
<!-- |
381 |
+ |
depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
382 |
+ |
--> |
383 |
|
|
384 |
|
<target name="compile" |
385 |
|
depends="configure-compiler" |
412 |
|
fork="true"> |
413 |
|
|
414 |
|
<include name="**/*.java"/> |
415 |
< |
<compilerarg value="-Xmodule:java.base" if:set="modules"/> |
415 |
> |
<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/> |
416 |
|
<compilerarg value="-Xprefer:source"/> |
417 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
418 |
|
<compilerarg value="-Xlint:all"/> |
419 |
+ |
<compilerarg line="--doclint-format html5"/> |
420 |
+ |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
421 |
|
<compilerarg value="-Werror"/> |
408 |
– |
<compilerarg value="-Xdoclint:all/protected"/> |
422 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
423 |
|
<compilerarg line="${build.args}"/> |
424 |
|
|
462 |
|
access="${build.javadoc.access}" |
463 |
|
sourcepath="${src.dir}" |
464 |
|
classpath="" |
465 |
+ |
source="9" |
466 |
|
executable="${javadoc9}"> |
467 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
468 |
|
<include name="**/*.java"/> |
470 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
471 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
472 |
|
<arg value="-XDignore.symbol.file=true"/> |
473 |
< |
<arg value="-Xmodule:java.base"/> |
473 |
> |
<arg value="-html5"/> |
474 |
> |
<arg value="--patch-module=java.base=${src.dir}"/> |
475 |
|
<arg value="-tag"/> |
476 |
|
<arg value="${javadoc.jls.option}"/> |
477 |
|
<!-- @apiNote currently unused --> |
519 |
|
|
520 |
|
<target name="clean" |
521 |
|
description="Removes all build products"> |
507 |
– |
|
522 |
|
<delete dir="${build.dir}"/> |
509 |
– |
|
523 |
|
</target> |
524 |
|
|
525 |
|
|
526 |
|
<target name="dist-clean" |
527 |
|
description="Removes all build and distribution products"> |
515 |
– |
|
528 |
|
<delete dir="${build.dir}"/> |
529 |
|
<delete dir="${dist.dir}"/> |
518 |
– |
|
530 |
|
</target> |
531 |
|
|
532 |
|
|
547 |
|
<run-tck-tests |
548 |
|
target="${build.main.java.version}" |
549 |
|
workdir="${build.dir}" |
550 |
< |
classes="${product.jar}"/> |
550 |
> |
classes="${product.jar}"> |
551 |
> |
<javac-elements> |
552 |
> |
<compilerarg value="-Werror"/> |
553 |
> |
</javac-elements> |
554 |
> |
</run-tck-tests> |
555 |
|
</target> |
556 |
|
|
557 |
|
<target name="tck-parallelism-1" |
586 |
|
|
587 |
|
<target name="test" |
588 |
|
depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg" |
589 |
< |
description="Runs tck and jtreg tests for src/main"> |
575 |
< |
</target> |
589 |
> |
description="Runs tck and jtreg tests for src/main"/> |
590 |
|
|
591 |
|
<!-- <target name="jtreg8" description="Runs jtreg tests with jdk8"> --> |
592 |
|
|
618 |
|
|
619 |
|
<target name="configure-compiler"> |
620 |
|
<fail message="ant version too old"> |
621 |
< |
<condition> |
608 |
< |
<not> <antversion atleast="1.9.1"/> </not> |
609 |
< |
</condition> |
621 |
> |
<condition> <not> <antversion atleast="1.9.1"/> </not> </condition> |
622 |
|
</fail> |
623 |
|
|
624 |
|
<property name="unchecked.option" value="-Xlint:unchecked"/> |
664 |
|
<java classname="ALoops" fork="true"> |
665 |
|
<classpath refid="loops.classpath"/> |
666 |
|
</java> |
655 |
– |
|
667 |
|
</target> |
668 |
|
|
669 |
|
|
670 |
|
<target name="compile-test-loops" depends="jar" |
671 |
< |
description="compile all the perf tests in src/test/loops"> |
671 |
> |
description="Compiles all the perf tests in src/test/loops"> |
672 |
|
|
673 |
|
<mkdir dir="${build.dir}/test/loops"/> |
674 |
|
|
688 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
689 |
|
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
690 |
|
<compilerarg line="${build.args}"/> |
680 |
– |
|
691 |
|
</javac> |
682 |
– |
|
692 |
|
</target> |
693 |
|
|
694 |
|
|
714 |
|
encoding="ASCII" |
715 |
|
executable="${javac8}" |
716 |
|
fork="true"> |
708 |
– |
|
717 |
|
<include name="**/*.java"/> |
718 |
|
<compilerarg value="-Xprefer:source"/> |
719 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
720 |
|
<compilerarg value="-Xlint:all"/> |
721 |
|
<compilerarg value="-Werror"/> |
722 |
|
<compilerarg line="${build.args}"/> |
715 |
– |
|
723 |
|
</javac> |
724 |
|
</target> |
725 |
|
|
743 |
|
encoding="ASCII" |
744 |
|
executable="${javac8}" |
745 |
|
fork="true"> |
739 |
– |
|
746 |
|
<include name="**/*.java"/> |
747 |
|
<compilerarg value="-Xprefer:source"/> |
748 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
749 |
|
<compilerarg value="-Xlint:all"/> |
750 |
< |
<compilerarg value="-Xdoclint:all/protected"/> |
750 |
> |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
751 |
|
<compilerarg line="${build.args}"/> |
746 |
– |
|
752 |
|
</javac> |
753 |
|
</target> |
754 |
|
|
764 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
765 |
|
</manifest> |
766 |
|
</jar> |
762 |
– |
|
767 |
|
</target> |
768 |
|
|
769 |
|
|
779 |
|
<!-- JDK9+ test classes --> |
780 |
|
<exclude name="*9Test.java"/> |
781 |
|
<exclude name="*10Test.java"/> |
782 |
+ |
<compilerarg value="-Werror"/> |
783 |
|
</javac-elements> |
784 |
|
</run-tck-tests> |
785 |
|
</target> |
797 |
|
|
798 |
|
<target name="4jdk8-test" |
799 |
|
depends="4jdk8-tck, 4jdk8-jtreg" |
800 |
< |
description="Runs tck and jtreg tests for jsr166-4jdk8"> |
796 |
< |
</target> |
800 |
> |
description="Runs tck and jtreg tests for jsr166-4jdk8"/> |
801 |
|
|
802 |
|
|
803 |
|
<target name="4jdk8docs" |
813 |
|
access="${build.javadoc.access}" |
814 |
|
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}" |
815 |
|
classpath="" |
816 |
+ |
source="8" |
817 |
|
executable="${javadoc8}" |
818 |
|
failonerror = "true"> |
819 |
|
<fileset dir="${4jdk8src.dir}" defaultexcludes="yes"> |
841 |
|
|
842 |
|
<target name="4jdk8clean" |
843 |
|
description="Removes all 4jdk8 build products"> |
839 |
– |
|
844 |
|
<delete dir="${build.4jdk8.dir}"/> |
841 |
– |
|
845 |
|
</target> |
846 |
|
|
847 |
|
|
857 |
|
</target> |
858 |
|
|
859 |
|
|
860 |
+ |
<!-- jsr166 4jdk7 (no longer maintained) --> |
861 |
|
|
862 |
< |
<!-- jsr166 4jdk7 --> |
859 |
< |
|
860 |
< |
<target name="4jdk7compile" |
861 |
< |
depends="configure-compiler" |
862 |
< |
description="Compiles src/jdk7 sources, targeting jdk7"> |
863 |
< |
|
862 |
> |
<target name="4jdk7compile" depends="configure-compiler"> |
863 |
|
<mkdir dir="${build.4jdk7.classes.dir}"/> |
864 |
|
|
865 |
|
<javac srcdir="${4jdk7src.dir}" |
883 |
|
<compilerarg value="-Xlint:all"/> |
884 |
|
<compilerarg value="-Werror"/> |
885 |
|
<compilerarg line="${build.args}"/> |
887 |
– |
|
886 |
|
</javac> |
887 |
|
</target> |
888 |
|
|
889 |
< |
<target name="4jdk7doclint" |
892 |
< |
depends="configure-compiler" |
893 |
< |
description="Finds doclint warnings"> |
894 |
< |
|
889 |
> |
<target name="4jdk7doclint" depends="configure-compiler"> |
890 |
|
<mkdir dir="${build.4jdk7.classes.dir}"/> |
891 |
|
|
892 |
|
<javac srcdir="${4jdk7src.dir}" |
910 |
|
<compilerarg value="-Xlint:all"/> |
911 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
912 |
|
<compilerarg line="${build.args}"/> |
918 |
– |
|
913 |
|
</javac> |
914 |
|
</target> |
915 |
|
|
916 |
< |
|
923 |
< |
<target name="4jdk7jar" |
924 |
< |
depends="4jdk7compile" |
925 |
< |
description="Builds library jar from compiled sources"> |
926 |
< |
|
916 |
> |
<target name="4jdk7jar" depends="4jdk7compile"> |
917 |
|
<jar destfile="${4jdk7product.jar}"> |
918 |
|
<fileset dir="${build.4jdk7.classes.dir}"/> |
919 |
|
<manifest> |
921 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
922 |
|
</manifest> |
923 |
|
</jar> |
934 |
– |
|
924 |
|
</target> |
925 |
|
|
926 |
< |
|
938 |
< |
<target name="4jdk7-tck" |
939 |
< |
depends="4jdk7jar" |
940 |
< |
description="Runs tck tests for jsr166-4jdk7 directly"> |
941 |
< |
|
926 |
> |
<target name="4jdk7-tck" depends="4jdk7jar"> |
927 |
|
<run-tck-tests |
928 |
|
target="7" |
929 |
|
workdir="${build.4jdk7.dir}" |
941 |
|
<exclude name="SplittableRandomTest.java"/> |
942 |
|
<exclude name="StampedLockTest.java"/> |
943 |
|
<exclude name="SubmissionPublisherTest.java"/> |
944 |
+ |
<compilerarg value="-Werror"/> |
945 |
|
</javac-elements> |
946 |
|
</run-tck-tests> |
947 |
|
</target> |
948 |
|
|
963 |
– |
|
949 |
|
<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) --> |
950 |
< |
<target name="4jdk7-tck-junit" |
966 |
< |
depends="4jdk7compile"> |
950 |
> |
<target name="4jdk7-tck-junit" depends="4jdk7compile"> |
951 |
|
|
952 |
|
<junit printsummary="true" |
953 |
|
showoutput="true" |
969 |
|
|
970 |
|
<test name="${jsr166.tckTestClass}" haltonfailure="no"> |
971 |
|
</test> |
988 |
– |
|
972 |
|
</junit> |
973 |
|
</target> |
974 |
|
|
975 |
< |
<target name="4jdk7-jtreg" |
993 |
< |
depends="4jdk7jar" |
994 |
< |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
975 |
> |
<target name="4jdk7-jtreg" depends="4jdk7jar"> |
976 |
|
<run-jtreg-tests |
977 |
|
target="7" |
978 |
|
workdir="${build.4jdk7.dir}" |
979 |
|
classes="${4jdk7product.jar}"/> |
980 |
|
</target> |
981 |
|
|
982 |
+ |
<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/> |
983 |
|
|
984 |
< |
<target name="4jdk7-test" |
1003 |
< |
depends="4jdk7-tck, 4jdk7-jtreg" |
1004 |
< |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
1005 |
< |
</target> |
1006 |
< |
|
1007 |
< |
|
1008 |
< |
<target name="4jdk7docs" |
1009 |
< |
description="Builds javadocs for src/jdk7 to dist dir"> |
1010 |
< |
|
984 |
> |
<target name="4jdk7docs"> |
985 |
|
<delete dir="${4jdk7docs.dir}"/> |
986 |
|
<mkdir dir="${4jdk7docs.dir}"/> |
987 |
|
|
1002 |
|
</javadoc> |
1003 |
|
</target> |
1004 |
|
|
1005 |
+ |
<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/> |
1006 |
|
|
1007 |
< |
<target name="4jdk7dist" |
1033 |
< |
depends="4jdk7dist-jar, 4jdk7dist-docs" |
1034 |
< |
description="Puts all distributable products in single hierarchy"/> |
1035 |
< |
|
1036 |
< |
|
1037 |
< |
<target name="4jdk7clean" |
1038 |
< |
description="Removes all 4jdk7 build products"> |
1039 |
< |
|
1007 |
> |
<target name="4jdk7clean"> |
1008 |
|
<delete dir="${build.4jdk7.dir}"/> |
1041 |
– |
|
1009 |
|
</target> |
1010 |
|
|
1011 |
< |
|
1045 |
< |
<target name="4jdk7dist-jar" |
1046 |
< |
depends="4jdk7clean, 4jdk7jar"> |
1011 |
> |
<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar"> |
1012 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
1013 |
|
</target> |
1014 |
|
|
1015 |
< |
|
1051 |
< |
<target name="4jdk7dist-docs" |
1052 |
< |
depends="4jdk7clean, 4jdk7docs"> |
1015 |
> |
<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs"> |
1016 |
|
<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/> |
1017 |
|
</target> |
1018 |
|
|
1019 |
|
|
1020 |
< |
<!-- jsr166x --> |
1058 |
< |
|
1059 |
< |
<target name="jsr166xcompile" |
1060 |
< |
depends="configure-compiler" |
1061 |
< |
description="Compiles jsr166x sources to build dir"> |
1020 |
> |
<!-- jsr166x (no longer maintained) --> |
1021 |
|
|
1022 |
+ |
<target name="jsr166xcompile" depends="configure-compiler"> |
1023 |
|
<mkdir dir="${build.jsr166x.classes.dir}"/> |
1024 |
|
|
1025 |
|
<javac srcdir="${topsrc.dir}" |
1036 |
|
encoding="ASCII" |
1037 |
|
executable="${javac7}" |
1038 |
|
fork="true"> |
1079 |
– |
|
1039 |
|
<include name="jsr166x/**/*.java"/> |
1040 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1041 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
1042 |
|
<compilerarg value="-Werror"/> |
1043 |
|
<compilerarg line="${build.args}"/> |
1085 |
– |
|
1044 |
|
</javac> |
1045 |
|
</target> |
1046 |
|
|
1047 |
< |
|
1090 |
< |
<target name="jsr166xjar" |
1091 |
< |
depends="jsr166xcompile" |
1092 |
< |
description="Builds library jar from compiled sources"> |
1093 |
< |
|
1047 |
> |
<target name="jsr166xjar" depends="jsr166xcompile"> |
1048 |
|
<jar destfile="${jsr166x.jar}"> |
1049 |
|
<fileset dir="${build.jsr166x.classes.dir}"/> |
1050 |
|
<manifest> |
1052 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1053 |
|
</manifest> |
1054 |
|
</jar> |
1101 |
– |
|
1055 |
|
</target> |
1056 |
|
|
1057 |
< |
|
1105 |
< |
<target name="jsr166xdocs" |
1106 |
< |
description="Builds javadocs to dist dir"> |
1107 |
< |
|
1057 |
> |
<target name="jsr166xdocs"> |
1058 |
|
<delete dir="${jsr166xdocs.dir}"/> |
1059 |
|
<mkdir dir="${jsr166xdocs.dir}"/> |
1060 |
|
|
1069 |
|
failonerror = "true"> |
1070 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1071 |
|
<arg value="-XDignore.symbol.file=true"/> |
1122 |
– |
|
1072 |
|
</javadoc> |
1073 |
|
</target> |
1074 |
|
|
1075 |
+ |
<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/> |
1076 |
|
|
1077 |
< |
<target name="jsr166xdist" |
1128 |
< |
depends="jsr166xdist-jar, jsr166xdist-docs" |
1129 |
< |
description="Puts all distributable products in single hierarchy"/> |
1130 |
< |
|
1131 |
< |
|
1132 |
< |
<target name="jsr166xclean" |
1133 |
< |
description="Removes all jsr166x build products"> |
1134 |
< |
|
1077 |
> |
<target name="jsr166xclean"> |
1078 |
|
<delete dir="${build.jsr166x.dir}"/> |
1136 |
– |
|
1079 |
|
</target> |
1080 |
|
|
1081 |
< |
|
1140 |
< |
<target name="jsr166xdist-jar" |
1141 |
< |
depends="jsr166xclean, jsr166xjar"> |
1081 |
> |
<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar"> |
1082 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
1083 |
|
</target> |
1084 |
|
|
1085 |
< |
<target name="jsr166xdist-docs" |
1146 |
< |
depends="jsr166xclean, jsr166xdocs"> |
1085 |
> |
<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs"> |
1086 |
|
<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/> |
1087 |
|
</target> |
1088 |
|
|
1150 |
– |
<!-- jsr166y --> |
1089 |
|
|
1090 |
+ |
<!-- jsr166y (no longer maintained) --> |
1091 |
|
|
1092 |
< |
<target name="jsr166ycompile" |
1154 |
< |
depends="configure-compiler" |
1155 |
< |
description="Compiles jsr166y sources"> |
1156 |
< |
|
1092 |
> |
<target name="jsr166ycompile" depends="configure-compiler"> |
1093 |
|
<mkdir dir="${build.jsr166y.classes.dir}"/> |
1094 |
|
|
1095 |
|
<javac srcdir="${topsrc.dir}" |
1112 |
|
<compilerarg value="-Xlint:all"/> |
1113 |
|
<compilerarg value="-Werror"/> |
1114 |
|
<compilerarg line="${build.args}"/> |
1179 |
– |
|
1115 |
|
</javac> |
1116 |
|
</target> |
1117 |
|
|
1118 |
< |
|
1184 |
< |
<target name="jsr166yjar" |
1185 |
< |
depends="jsr166ycompile" |
1186 |
< |
description="Builds library jar from compiled sources"> |
1187 |
< |
|
1118 |
> |
<target name="jsr166yjar" depends="jsr166ycompile"> |
1119 |
|
<jar destfile="${jsr166y.jar}" index="true"> |
1120 |
|
<fileset dir="${build.jsr166y.classes.dir}"/> |
1121 |
|
<manifest> |
1123 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1124 |
|
</manifest> |
1125 |
|
</jar> |
1195 |
– |
|
1126 |
|
</target> |
1127 |
|
|
1128 |
< |
|
1199 |
< |
<target name="jsr166ydocs" |
1200 |
< |
description="Builds javadocs to dist dir"> |
1201 |
< |
|
1128 |
> |
<target name="jsr166ydocs"> |
1129 |
|
<delete dir="${jsr166ydocs.dir}"/> |
1130 |
|
<mkdir dir="${jsr166ydocs.dir}"/> |
1131 |
|
|
1140 |
|
failonerror = "true"> |
1141 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1142 |
|
<arg value="-XDignore.symbol.file=true"/> |
1216 |
– |
|
1143 |
|
</javadoc> |
1144 |
|
</target> |
1145 |
|
|
1146 |
+ |
<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/> |
1147 |
|
|
1148 |
< |
<target name="jsr166ydist" |
1222 |
< |
depends="jsr166ydist-jar, jsr166ydist-docs" |
1223 |
< |
description="Puts all distributable products in single hierarchy"/> |
1224 |
< |
|
1225 |
< |
|
1226 |
< |
<target name="jsr166yclean" |
1227 |
< |
description="Removes all jsr166y build products"> |
1228 |
< |
|
1148 |
> |
<target name="jsr166yclean"> |
1149 |
|
<delete dir="${build.jsr166y.dir}"/> |
1230 |
– |
|
1150 |
|
</target> |
1151 |
|
|
1152 |
< |
|
1234 |
< |
<target name="jsr166ydist-jar" |
1235 |
< |
depends="jsr166yclean, jsr166yjar"> |
1152 |
> |
<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar"> |
1153 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
1154 |
|
</target> |
1155 |
|
|
1156 |
< |
<target name="jsr166ydist-docs" |
1240 |
< |
depends="jsr166yclean, jsr166ydocs"> |
1156 |
> |
<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs"> |
1157 |
|
<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/> |
1158 |
|
</target> |
1159 |
|
|
1160 |
|
|
1161 |
< |
<!-- extra166y --> |
1246 |
< |
|
1247 |
< |
|
1248 |
< |
<target name="extra166ycompile" |
1249 |
< |
depends="configure-compiler, jsr166yjar" |
1250 |
< |
description="Compiles extra166y sources"> |
1161 |
> |
<!-- extra166y (no longer maintained) --> |
1162 |
|
|
1163 |
+ |
<target name="extra166ycompile" depends="configure-compiler, jsr166yjar"> |
1164 |
|
<mkdir dir="${build.extra166y.classes.dir}"/> |
1165 |
|
|
1166 |
|
<javac srcdir="${topsrc.dir}" |
1183 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
1184 |
|
<compilerarg value="-Werror"/> |
1185 |
|
<compilerarg line="${build.args}"/> |
1274 |
– |
|
1186 |
|
</javac> |
1187 |
|
</target> |
1188 |
|
|
1189 |
< |
|
1279 |
< |
<target name="extra166yjar" |
1280 |
< |
depends="extra166ycompile" |
1281 |
< |
description="Builds library jar from compiled sources"> |
1282 |
< |
|
1189 |
> |
<target name="extra166yjar" depends="extra166ycompile"> |
1190 |
|
<jar destfile="${extra166y.jar}" index="true"> |
1191 |
|
<fileset dir="${build.extra166y.classes.dir}"/> |
1192 |
|
<manifest> |
1194 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1195 |
|
</manifest> |
1196 |
|
</jar> |
1290 |
– |
|
1197 |
|
</target> |
1198 |
|
|
1199 |
< |
|
1294 |
< |
<target name="extra166ydocs" |
1295 |
< |
description="Builds javadocs to build dir"> |
1296 |
< |
|
1199 |
> |
<target name="extra166ydocs"> |
1200 |
|
<delete dir="${extra166ydocs.dir}"/> |
1201 |
|
<mkdir dir="${extra166ydocs.dir}"/> |
1202 |
|
|
1210 |
|
executable="${javadoc7}"> |
1211 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1212 |
|
<arg value="-XDignore.symbol.file=true"/> |
1310 |
– |
|
1213 |
|
</javadoc> |
1214 |
|
</target> |
1215 |
|
|
1216 |
+ |
<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/> |
1217 |
|
|
1218 |
< |
<target name="extra166ydist" |
1316 |
< |
depends="extra166ydist-jar, extra166ydist-docs" |
1317 |
< |
description="Puts all distributable products in single hierarchy"/> |
1318 |
< |
|
1319 |
< |
|
1320 |
< |
<target name="extra166yclean" |
1321 |
< |
description="Removes all extra166y build products"> |
1322 |
< |
|
1218 |
> |
<target name="extra166yclean"> |
1219 |
|
<delete dir="${build.extra166y.dir}"/> |
1324 |
– |
|
1220 |
|
</target> |
1221 |
|
|
1222 |
< |
|
1328 |
< |
<target name="extra166ydist-jar" |
1329 |
< |
depends="extra166yclean, extra166yjar"> |
1222 |
> |
<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar"> |
1223 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
1224 |
|
</target> |
1225 |
|
|
1226 |
< |
<target name="extra166ydist-docs" |
1334 |
< |
depends="extra166yclean, extra166ydocs"> |
1226 |
> |
<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs"> |
1227 |
|
<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/> |
1228 |
|
</target> |
1229 |
|
|
1230 |
< |
<!-- jsr166e --> |
1230 |
> |
|
1231 |
> |
<!-- jsr166e (no longer maintained) --> |
1232 |
|
|
1233 |
|
<property name="build.jsr166e.java.version" value="6"/> |
1234 |
|
<property name="build.jsr166e.javac" value="${javac6}"/> |
1235 |
|
|
1236 |
< |
<target name="jsr166ecompile" |
1344 |
< |
depends="configure-compiler" |
1345 |
< |
description="Compiles jsr166e sources"> |
1346 |
< |
|
1236 |
> |
<target name="jsr166ecompile" depends="configure-compiler"> |
1237 |
|
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1238 |
|
|
1239 |
|
<javac srcdir="${topsrc.dir}" |
1254 |
|
<compilerarg value="-Xlint:all"/> |
1255 |
|
<compilerarg value="-Werror"/> |
1256 |
|
<compilerarg line="${build.args}"/> |
1367 |
– |
|
1257 |
|
</javac> |
1258 |
|
</target> |
1259 |
|
|
1371 |
– |
<!-- jsr166e: find doclint errors --> |
1260 |
|
<target name="jsr166edoclint"> |
1373 |
– |
|
1261 |
|
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1262 |
|
|
1263 |
|
<javac srcdir="${topsrc.dir}" |
1279 |
|
<compilerarg value="-Xlint:all"/> |
1280 |
|
<compilerarg value="-Werror"/> |
1281 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
1395 |
– |
|
1282 |
|
</javac> |
1283 |
|
</target> |
1284 |
|
|
1285 |
< |
|
1400 |
< |
<target name="jsr166ejar" |
1401 |
< |
depends="jsr166ecompile" |
1402 |
< |
description="Builds library jar from compiled sources"> |
1403 |
< |
|
1285 |
> |
<target name="jsr166ejar" depends="jsr166ecompile"> |
1286 |
|
<jar destfile="${jsr166e.jar}" index="true"> |
1287 |
|
<fileset dir="${build.jsr166e.classes.dir}"/> |
1288 |
|
<manifest> |
1290 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1291 |
|
</manifest> |
1292 |
|
</jar> |
1411 |
– |
|
1293 |
|
</target> |
1294 |
|
|
1295 |
< |
|
1415 |
< |
<target name="jsr166edocs" |
1416 |
< |
description="Builds javadocs to build dir"> |
1417 |
< |
|
1295 |
> |
<target name="jsr166edocs"> |
1296 |
|
<delete dir="${jsr166edocs.dir}"/> |
1297 |
|
<mkdir dir="${jsr166edocs.dir}"/> |
1298 |
|
|
1306 |
|
failonerror = "true"> |
1307 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1308 |
|
<arg value="-XDignore.symbol.file=true"/> |
1431 |
– |
|
1309 |
|
</javadoc> |
1310 |
|
</target> |
1311 |
|
|
1312 |
< |
|
1436 |
< |
<target name="jsr166e-tck-one-java-version" |
1437 |
< |
depends="jsr166ejar"> |
1438 |
< |
|
1312 |
> |
<target name="jsr166e-tck-one-java-version" depends="jsr166ejar"> |
1313 |
|
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
1440 |
– |
|
1314 |
|
<run-tck-tests |
1315 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1316 |
|
target="${build.jsr166e.java.version}" |
1318 |
|
classes="${jsr166e.jar}"/> |
1319 |
|
</target> |
1320 |
|
|
1321 |
< |
<target name="jsr166e-tck" |
1449 |
< |
description="Runs tck tests for jsr166e for multiple java versions"> |
1321 |
> |
<target name="jsr166e-tck"> |
1322 |
|
|
1323 |
|
<!-- <antcall target="clean"/> --> |
1324 |
|
<!-- <antcall target="jsr166e-tck-one-java-version"> --> |
1339 |
|
</antcall> |
1340 |
|
</target> |
1341 |
|
|
1342 |
+ |
<target name="jsr166e-test" depends="jsr166e-tck"/> |
1343 |
|
|
1344 |
< |
<target name="jsr166e-test" |
1472 |
< |
depends="jsr166e-tck" |
1473 |
< |
description="Runs all tests for jsr166e"> |
1474 |
< |
</target> |
1475 |
< |
|
1476 |
< |
<target name="jsr166edist" |
1477 |
< |
depends="jsr166edist-jar, jsr166edist-docs" |
1478 |
< |
description="Puts all distributable products in single hierarchy"/> |
1479 |
< |
|
1344 |
> |
<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/> |
1345 |
|
|
1346 |
< |
<target name="jsr166eclean" |
1482 |
< |
description="Removes all jsr166e build products"> |
1346 |
> |
<target name="jsr166eclean"> |
1347 |
|
<delete dir="${build.jsr166e.dir}"/> |
1348 |
|
</target> |
1349 |
|
|
1486 |
– |
|
1350 |
|
<target name="jsr166edist-jar" |
1351 |
|
depends="jsr166eclean, jsr166ejar"> |
1352 |
|
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1353 |
|
</target> |
1354 |
|
|
1355 |
< |
<target name="jsr166edist-docs" |
1493 |
< |
depends="jsr166eclean, jsr166edocs"> |
1355 |
> |
<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs"> |
1356 |
|
<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/> |
1357 |
|
</target> |
1358 |
|
|
1372 |
|
</antcall> |
1373 |
|
</target> |
1374 |
|
|
1375 |
+ |
|
1376 |
+ |
<!-- ============================================================== |
1377 |
+ |
Experimental errorprone support - http://errorprone.info |
1378 |
+ |
You may need to bring your own errorprone jar. |
1379 |
+ |
=================================================================== --> |
1380 |
+ |
<target name="errorprone" |
1381 |
+ |
depends="clean, configure-compiler" |
1382 |
+ |
description="Run errorprone over jsr166 source code (experimental)"> |
1383 |
+ |
|
1384 |
+ |
<local name="destdir"/> |
1385 |
+ |
<property name="destdir" value="${build.classes.dir}/java.base"/> |
1386 |
+ |
<mkdir dir="${destdir}"/> |
1387 |
+ |
|
1388 |
+ |
<javac srcdir="${src.dir}" |
1389 |
+ |
destdir="${destdir}" |
1390 |
+ |
debug="${build.debug}" |
1391 |
+ |
debuglevel="${build.debuglevel}" |
1392 |
+ |
deprecation="${build.deprecation}" |
1393 |
+ |
classpath="" |
1394 |
+ |
includeAntRuntime="false" |
1395 |
+ |
includeJavaRuntime="false" |
1396 |
+ |
encoding="ASCII" |
1397 |
+ |
executable="${build.main.javac}" |
1398 |
+ |
fork="true"> |
1399 |
+ |
|
1400 |
+ |
<include name="**/*.java"/> |
1401 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1402 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1403 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1404 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/> |
1405 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/> |
1406 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/> |
1407 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/> |
1408 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1409 |
+ |
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1410 |
+ |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/> |
1411 |
+ |
<compilerarg value="-Xplugin:ErrorProne |
1412 |
+ |
-Xep:IdentityBinaryExpression:WARN |
1413 |
+ |
-Xep:MissingOverride:OFF |
1414 |
+ |
-Xep:MixedArrayDimensions:WARN |
1415 |
+ |
-Xep:RemoveUnusedImports:ERROR |
1416 |
+ |
-Xep:ClassName:ERROR |
1417 |
+ |
-Xep:MultipleTopLevelClasses:ERROR |
1418 |
+ |
-Xep:EmptyIf:ERROR |
1419 |
+ |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1420 |
+ |
-Xep:ArgumentParameterSwap:ERROR |
1421 |
+ |
-Xep:RedundantThrows:ERROR |
1422 |
+ |
-Xep:MethodCanBeStatic:WARN"/> |
1423 |
+ |
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
1424 |
+ |
<compilerarg value="-Xprefer:source"/> |
1425 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
1426 |
+ |
<compilerarg value="-Xlint:all"/> |
1427 |
+ |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
1428 |
+ |
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1429 |
+ |
<compilerarg line="${build.args}"/> |
1430 |
+ |
</javac> |
1431 |
+ |
|
1432 |
+ |
<jar destfile="${product.jar}"> |
1433 |
+ |
<fileset dir="${destdir}"/> |
1434 |
+ |
</jar> |
1435 |
+ |
|
1436 |
+ |
<run-tck-tests |
1437 |
+ |
target="${build.main.java.version}" |
1438 |
+ |
workdir="${build.dir}" |
1439 |
+ |
classes="${product.jar}"> |
1440 |
+ |
<javac-elements> |
1441 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1442 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1443 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1444 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/> |
1445 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/> |
1446 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/> |
1447 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/> |
1448 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1449 |
+ |
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1450 |
+ |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/> |
1451 |
+ |
<compilerarg value="-Xplugin:ErrorProne |
1452 |
+ |
-Xep:IdentityBinaryExpression:WARN |
1453 |
+ |
-Xep:BoxedPrimitiveConstructor:OFF |
1454 |
+ |
-Xep:HashtableContains:OFF |
1455 |
+ |
-Xep:ModifyingCollectionWithItself:OFF |
1456 |
+ |
-Xep:MissingOverride:OFF |
1457 |
+ |
-Xep:MixedArrayDimensions:WARN |
1458 |
+ |
-Xep:RemoveUnusedImports:ERROR |
1459 |
+ |
-Xep:ClassName:ERROR |
1460 |
+ |
-Xep:MultipleTopLevelClasses:ERROR |
1461 |
+ |
-Xep:EmptyIf:ERROR |
1462 |
+ |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1463 |
+ |
-Xep:ArgumentParameterSwap:ERROR |
1464 |
+ |
-Xep:RedundantThrows:ERROR |
1465 |
+ |
-Xep:MethodCanBeStatic:WARN"/> |
1466 |
+ |
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1467 |
+ |
</javac-elements> |
1468 |
+ |
</run-tck-tests> |
1469 |
+ |
</target> |
1470 |
+ |
|
1471 |
+ |
|
1472 |
|
<!-- ============================================================== |
1473 |
|
Running guava tests against jsr166 code |
1474 |
|
=================================================================== --> |