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/jdk6 |
22 |
– |
$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/jdk6 |
27 |
– |
$HOME/jdk/src/jdk7 |
25 |
|
$HOME/jdk/src/jdk8 |
26 |
|
$HOME/jdk/src/jdk9 |
27 |
+ |
$HOME/jdk/src/jdk10 |
28 |
|
where each of the above is a complete JDK source tree |
29 |
|
(e.g. mercurial forest) or a symlink to same. |
30 |
|
|
31 |
|
Alternatively, define ant variables thus: |
32 |
|
ant -Djdk$N.home=... -Djdk$N.src.home=... |
33 |
< |
for $N in 6 7 8 9 ... |
33 |
> |
for $N in 8 9 10 ... |
34 |
|
|
35 |
< |
As of 2016-03, the sources in src/main are for jdk9+ only. The "docs" |
38 |
< |
target is currently broken. |
35 |
> |
As of 2016-03, the sources in src/main are for jdk9+ only. |
36 |
|
------------------------------------------------------------------------------ |
37 |
|
</description> |
38 |
|
|
131 |
|
<defjdklocations v="7"/> |
132 |
|
<defjdklocations v="8"/> |
133 |
|
<defjdklocations v="9"/> |
134 |
+ |
<defjdklocations v="10"/> |
135 |
|
|
136 |
|
<!-- Source locations --> |
137 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
141 |
|
<property name="jtreg7.src.dir" location="${test.src.dir}/jtreg-jdk7"/> |
142 |
|
<property name="jtreg8.src.dir" location="${test.src.dir}/jtreg-jdk8"/> |
143 |
|
<property name="jtreg9.src.dir" location="${test.src.dir}/jtreg"/> |
144 |
+ |
<property name="jtreg10.src.dir" location="${test.src.dir}/jtreg"/> |
145 |
|
<property name="jtreg.src.dir" location="${jtreg9.src.dir}"/> |
146 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
147 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
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.util=ALL-UNNAMED" if:set="modules"/> |
274 |
< |
<jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/> |
275 |
< |
<jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/> |
276 |
< |
<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"/> |
370 |
|
<property name="build.main.javac" value="${javac9}"/> |
371 |
|
|
372 |
|
<target name="dists" |
373 |
< |
depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
373 |
> |
depends="dist, 4jdk8dist" |
374 |
|
description="Builds all public jars and docs"/> |
375 |
+ |
<!-- |
376 |
+ |
depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
377 |
+ |
--> |
378 |
|
|
379 |
|
<target name="compile" |
380 |
|
depends="configure-compiler" |
407 |
|
fork="true"> |
408 |
|
|
409 |
|
<include name="**/*.java"/> |
410 |
< |
<compilerarg value="-Xmodule:java.base" if:set="modules"/> |
410 |
> |
<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/> |
411 |
|
<compilerarg value="-Xprefer:source"/> |
412 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
413 |
|
<compilerarg value="-Xlint:all"/> |
414 |
+ |
<compilerarg line="--doclint-format html5"/> |
415 |
+ |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
416 |
|
<compilerarg value="-Werror"/> |
406 |
– |
<compilerarg value="-Xdoclint:all/protected"/> |
417 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
418 |
|
<compilerarg line="${build.args}"/> |
419 |
|
|
464 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
465 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
466 |
|
<arg value="-XDignore.symbol.file=true"/> |
467 |
< |
<arg value="-Xmodule:java.base"/> |
467 |
> |
<arg value="-html5"/> |
468 |
> |
<arg value="--patch-module=java.base=${src.dir}"/> |
469 |
|
<arg value="-tag"/> |
470 |
|
<arg value="${javadoc.jls.option}"/> |
471 |
|
<!-- @apiNote currently unused --> |
513 |
|
|
514 |
|
<target name="clean" |
515 |
|
description="Removes all build products"> |
505 |
– |
|
516 |
|
<delete dir="${build.dir}"/> |
507 |
– |
|
517 |
|
</target> |
518 |
|
|
519 |
|
|
520 |
|
<target name="dist-clean" |
521 |
|
description="Removes all build and distribution products"> |
513 |
– |
|
522 |
|
<delete dir="${build.dir}"/> |
523 |
|
<delete dir="${dist.dir}"/> |
516 |
– |
|
524 |
|
</target> |
525 |
|
|
526 |
|
|
541 |
|
<run-tck-tests |
542 |
|
target="${build.main.java.version}" |
543 |
|
workdir="${build.dir}" |
544 |
< |
classes="${product.jar}"/> |
544 |
> |
classes="${product.jar}"> |
545 |
> |
<javac-elements> |
546 |
> |
<compilerarg value="-Werror"/> |
547 |
> |
</javac-elements> |
548 |
> |
</run-tck-tests> |
549 |
|
</target> |
550 |
|
|
551 |
|
<target name="tck-parallelism-1" |
580 |
|
|
581 |
|
<target name="test" |
582 |
|
depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg" |
583 |
< |
description="Runs tck and jtreg tests for src/main"> |
573 |
< |
</target> |
583 |
> |
description="Runs tck and jtreg tests for src/main"/> |
584 |
|
|
585 |
|
<!-- <target name="jtreg8" description="Runs jtreg tests with jdk8"> --> |
586 |
|
|
612 |
|
|
613 |
|
<target name="configure-compiler"> |
614 |
|
<fail message="ant version too old"> |
615 |
< |
<condition> |
606 |
< |
<not> <antversion atleast="1.9.1"/> </not> |
607 |
< |
</condition> |
615 |
> |
<condition> <not> <antversion atleast="1.9.1"/> </not> </condition> |
616 |
|
</fail> |
617 |
|
|
618 |
|
<property name="unchecked.option" value="-Xlint:unchecked"/> |
658 |
|
<java classname="ALoops" fork="true"> |
659 |
|
<classpath refid="loops.classpath"/> |
660 |
|
</java> |
653 |
– |
|
661 |
|
</target> |
662 |
|
|
663 |
|
|
664 |
|
<target name="compile-test-loops" depends="jar" |
665 |
< |
description="compile all the perf tests in src/test/loops"> |
665 |
> |
description="Compiles all the perf tests in src/test/loops"> |
666 |
|
|
667 |
|
<mkdir dir="${build.dir}/test/loops"/> |
668 |
|
|
682 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
683 |
|
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
684 |
|
<compilerarg line="${build.args}"/> |
678 |
– |
|
685 |
|
</javac> |
680 |
– |
|
686 |
|
</target> |
687 |
|
|
688 |
|
|
708 |
|
encoding="ASCII" |
709 |
|
executable="${javac8}" |
710 |
|
fork="true"> |
706 |
– |
|
711 |
|
<include name="**/*.java"/> |
712 |
|
<compilerarg value="-Xprefer:source"/> |
713 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
714 |
|
<compilerarg value="-Xlint:all"/> |
715 |
|
<compilerarg value="-Werror"/> |
716 |
|
<compilerarg line="${build.args}"/> |
713 |
– |
|
717 |
|
</javac> |
718 |
|
</target> |
719 |
|
|
737 |
|
encoding="ASCII" |
738 |
|
executable="${javac8}" |
739 |
|
fork="true"> |
737 |
– |
|
740 |
|
<include name="**/*.java"/> |
741 |
|
<compilerarg value="-Xprefer:source"/> |
742 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
743 |
|
<compilerarg value="-Xlint:all"/> |
744 |
< |
<compilerarg value="-Xdoclint:all/protected"/> |
744 |
> |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
745 |
|
<compilerarg line="${build.args}"/> |
744 |
– |
|
746 |
|
</javac> |
747 |
|
</target> |
748 |
|
|
758 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
759 |
|
</manifest> |
760 |
|
</jar> |
760 |
– |
|
761 |
|
</target> |
762 |
|
|
763 |
|
|
773 |
|
<!-- JDK9+ test classes --> |
774 |
|
<exclude name="*9Test.java"/> |
775 |
|
<exclude name="*10Test.java"/> |
776 |
+ |
<compilerarg value="-Werror"/> |
777 |
|
</javac-elements> |
778 |
|
</run-tck-tests> |
779 |
|
</target> |
791 |
|
|
792 |
|
<target name="4jdk8-test" |
793 |
|
depends="4jdk8-tck, 4jdk8-jtreg" |
794 |
< |
description="Runs tck and jtreg tests for jsr166-4jdk8"> |
794 |
< |
</target> |
794 |
> |
description="Runs tck and jtreg tests for jsr166-4jdk8"/> |
795 |
|
|
796 |
|
|
797 |
|
<target name="4jdk8docs" |
834 |
|
|
835 |
|
<target name="4jdk8clean" |
836 |
|
description="Removes all 4jdk8 build products"> |
837 |
– |
|
837 |
|
<delete dir="${build.4jdk8.dir}"/> |
839 |
– |
|
838 |
|
</target> |
839 |
|
|
840 |
|
|
850 |
|
</target> |
851 |
|
|
852 |
|
|
853 |
+ |
<!-- jsr166 4jdk7 (no longer maintained) --> |
854 |
|
|
855 |
< |
<!-- jsr166 4jdk7 --> |
857 |
< |
|
858 |
< |
<target name="4jdk7compile" |
859 |
< |
depends="configure-compiler" |
860 |
< |
description="Compiles src/jdk7 sources, targeting jdk7"> |
861 |
< |
|
855 |
> |
<target name="4jdk7compile" depends="configure-compiler"> |
856 |
|
<mkdir dir="${build.4jdk7.classes.dir}"/> |
857 |
|
|
858 |
|
<javac srcdir="${4jdk7src.dir}" |
876 |
|
<compilerarg value="-Xlint:all"/> |
877 |
|
<compilerarg value="-Werror"/> |
878 |
|
<compilerarg line="${build.args}"/> |
885 |
– |
|
879 |
|
</javac> |
880 |
|
</target> |
881 |
|
|
882 |
< |
<target name="4jdk7doclint" |
890 |
< |
depends="configure-compiler" |
891 |
< |
description="Finds doclint warnings"> |
892 |
< |
|
882 |
> |
<target name="4jdk7doclint" depends="configure-compiler"> |
883 |
|
<mkdir dir="${build.4jdk7.classes.dir}"/> |
884 |
|
|
885 |
|
<javac srcdir="${4jdk7src.dir}" |
903 |
|
<compilerarg value="-Xlint:all"/> |
904 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
905 |
|
<compilerarg line="${build.args}"/> |
916 |
– |
|
906 |
|
</javac> |
907 |
|
</target> |
908 |
|
|
909 |
< |
|
921 |
< |
<target name="4jdk7jar" |
922 |
< |
depends="4jdk7compile" |
923 |
< |
description="Builds library jar from compiled sources"> |
924 |
< |
|
909 |
> |
<target name="4jdk7jar" depends="4jdk7compile"> |
910 |
|
<jar destfile="${4jdk7product.jar}"> |
911 |
|
<fileset dir="${build.4jdk7.classes.dir}"/> |
912 |
|
<manifest> |
914 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
915 |
|
</manifest> |
916 |
|
</jar> |
932 |
– |
|
917 |
|
</target> |
918 |
|
|
919 |
< |
|
936 |
< |
<target name="4jdk7-tck" |
937 |
< |
depends="4jdk7jar" |
938 |
< |
description="Runs tck tests for jsr166-4jdk7 directly"> |
939 |
< |
|
919 |
> |
<target name="4jdk7-tck" depends="4jdk7jar"> |
920 |
|
<run-tck-tests |
921 |
|
target="7" |
922 |
|
workdir="${build.4jdk7.dir}" |
934 |
|
<exclude name="SplittableRandomTest.java"/> |
935 |
|
<exclude name="StampedLockTest.java"/> |
936 |
|
<exclude name="SubmissionPublisherTest.java"/> |
937 |
+ |
<compilerarg value="-Werror"/> |
938 |
|
</javac-elements> |
939 |
|
</run-tck-tests> |
940 |
|
</target> |
941 |
|
|
961 |
– |
|
942 |
|
<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) --> |
943 |
< |
<target name="4jdk7-tck-junit" |
964 |
< |
depends="4jdk7compile"> |
943 |
> |
<target name="4jdk7-tck-junit" depends="4jdk7compile"> |
944 |
|
|
945 |
|
<junit printsummary="true" |
946 |
|
showoutput="true" |
962 |
|
|
963 |
|
<test name="${jsr166.tckTestClass}" haltonfailure="no"> |
964 |
|
</test> |
986 |
– |
|
965 |
|
</junit> |
966 |
|
</target> |
967 |
|
|
968 |
< |
<target name="4jdk7-jtreg" |
991 |
< |
depends="4jdk7jar" |
992 |
< |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
968 |
> |
<target name="4jdk7-jtreg" depends="4jdk7jar"> |
969 |
|
<run-jtreg-tests |
970 |
|
target="7" |
971 |
|
workdir="${build.4jdk7.dir}" |
972 |
|
classes="${4jdk7product.jar}"/> |
973 |
|
</target> |
974 |
|
|
975 |
+ |
<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/> |
976 |
|
|
977 |
< |
<target name="4jdk7-test" |
1001 |
< |
depends="4jdk7-tck, 4jdk7-jtreg" |
1002 |
< |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
1003 |
< |
</target> |
1004 |
< |
|
1005 |
< |
|
1006 |
< |
<target name="4jdk7docs" |
1007 |
< |
description="Builds javadocs for src/jdk7 to dist dir"> |
1008 |
< |
|
977 |
> |
<target name="4jdk7docs"> |
978 |
|
<delete dir="${4jdk7docs.dir}"/> |
979 |
|
<mkdir dir="${4jdk7docs.dir}"/> |
980 |
|
|
995 |
|
</javadoc> |
996 |
|
</target> |
997 |
|
|
998 |
+ |
<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/> |
999 |
|
|
1000 |
< |
<target name="4jdk7dist" |
1031 |
< |
depends="4jdk7dist-jar, 4jdk7dist-docs" |
1032 |
< |
description="Puts all distributable products in single hierarchy"/> |
1033 |
< |
|
1034 |
< |
|
1035 |
< |
<target name="4jdk7clean" |
1036 |
< |
description="Removes all 4jdk7 build products"> |
1037 |
< |
|
1000 |
> |
<target name="4jdk7clean"> |
1001 |
|
<delete dir="${build.4jdk7.dir}"/> |
1039 |
– |
|
1002 |
|
</target> |
1003 |
|
|
1004 |
< |
|
1043 |
< |
<target name="4jdk7dist-jar" |
1044 |
< |
depends="4jdk7clean, 4jdk7jar"> |
1004 |
> |
<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar"> |
1005 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
1006 |
|
</target> |
1007 |
|
|
1008 |
< |
|
1049 |
< |
<target name="4jdk7dist-docs" |
1050 |
< |
depends="4jdk7clean, 4jdk7docs"> |
1008 |
> |
<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs"> |
1009 |
|
<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/> |
1010 |
|
</target> |
1011 |
|
|
1012 |
|
|
1013 |
< |
<!-- jsr166x --> |
1056 |
< |
|
1057 |
< |
<target name="jsr166xcompile" |
1058 |
< |
depends="configure-compiler" |
1059 |
< |
description="Compiles jsr166x sources to build dir"> |
1013 |
> |
<!-- jsr166x (no longer maintained) --> |
1014 |
|
|
1015 |
+ |
<target name="jsr166xcompile" depends="configure-compiler"> |
1016 |
|
<mkdir dir="${build.jsr166x.classes.dir}"/> |
1017 |
|
|
1018 |
|
<javac srcdir="${topsrc.dir}" |
1029 |
|
encoding="ASCII" |
1030 |
|
executable="${javac7}" |
1031 |
|
fork="true"> |
1077 |
– |
|
1032 |
|
<include name="jsr166x/**/*.java"/> |
1033 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1034 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
1035 |
|
<compilerarg value="-Werror"/> |
1036 |
|
<compilerarg line="${build.args}"/> |
1083 |
– |
|
1037 |
|
</javac> |
1038 |
|
</target> |
1039 |
|
|
1040 |
< |
|
1088 |
< |
<target name="jsr166xjar" |
1089 |
< |
depends="jsr166xcompile" |
1090 |
< |
description="Builds library jar from compiled sources"> |
1091 |
< |
|
1040 |
> |
<target name="jsr166xjar" depends="jsr166xcompile"> |
1041 |
|
<jar destfile="${jsr166x.jar}"> |
1042 |
|
<fileset dir="${build.jsr166x.classes.dir}"/> |
1043 |
|
<manifest> |
1045 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1046 |
|
</manifest> |
1047 |
|
</jar> |
1099 |
– |
|
1048 |
|
</target> |
1049 |
|
|
1050 |
< |
|
1103 |
< |
<target name="jsr166xdocs" |
1104 |
< |
description="Builds javadocs to dist dir"> |
1105 |
< |
|
1050 |
> |
<target name="jsr166xdocs"> |
1051 |
|
<delete dir="${jsr166xdocs.dir}"/> |
1052 |
|
<mkdir dir="${jsr166xdocs.dir}"/> |
1053 |
|
|
1062 |
|
failonerror = "true"> |
1063 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1064 |
|
<arg value="-XDignore.symbol.file=true"/> |
1120 |
– |
|
1065 |
|
</javadoc> |
1066 |
|
</target> |
1067 |
|
|
1068 |
+ |
<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/> |
1069 |
|
|
1070 |
< |
<target name="jsr166xdist" |
1126 |
< |
depends="jsr166xdist-jar, jsr166xdist-docs" |
1127 |
< |
description="Puts all distributable products in single hierarchy"/> |
1128 |
< |
|
1129 |
< |
|
1130 |
< |
<target name="jsr166xclean" |
1131 |
< |
description="Removes all jsr166x build products"> |
1132 |
< |
|
1070 |
> |
<target name="jsr166xclean"> |
1071 |
|
<delete dir="${build.jsr166x.dir}"/> |
1134 |
– |
|
1072 |
|
</target> |
1073 |
|
|
1074 |
< |
|
1138 |
< |
<target name="jsr166xdist-jar" |
1139 |
< |
depends="jsr166xclean, jsr166xjar"> |
1074 |
> |
<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar"> |
1075 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
1076 |
|
</target> |
1077 |
|
|
1078 |
< |
<target name="jsr166xdist-docs" |
1144 |
< |
depends="jsr166xclean, jsr166xdocs"> |
1078 |
> |
<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs"> |
1079 |
|
<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/> |
1080 |
|
</target> |
1081 |
|
|
1148 |
– |
<!-- jsr166y --> |
1082 |
|
|
1083 |
+ |
<!-- jsr166y (no longer maintained) --> |
1084 |
|
|
1085 |
< |
<target name="jsr166ycompile" |
1152 |
< |
depends="configure-compiler" |
1153 |
< |
description="Compiles jsr166y sources"> |
1154 |
< |
|
1085 |
> |
<target name="jsr166ycompile" depends="configure-compiler"> |
1086 |
|
<mkdir dir="${build.jsr166y.classes.dir}"/> |
1087 |
|
|
1088 |
|
<javac srcdir="${topsrc.dir}" |
1105 |
|
<compilerarg value="-Xlint:all"/> |
1106 |
|
<compilerarg value="-Werror"/> |
1107 |
|
<compilerarg line="${build.args}"/> |
1177 |
– |
|
1108 |
|
</javac> |
1109 |
|
</target> |
1110 |
|
|
1111 |
< |
|
1182 |
< |
<target name="jsr166yjar" |
1183 |
< |
depends="jsr166ycompile" |
1184 |
< |
description="Builds library jar from compiled sources"> |
1185 |
< |
|
1111 |
> |
<target name="jsr166yjar" depends="jsr166ycompile"> |
1112 |
|
<jar destfile="${jsr166y.jar}" index="true"> |
1113 |
|
<fileset dir="${build.jsr166y.classes.dir}"/> |
1114 |
|
<manifest> |
1116 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1117 |
|
</manifest> |
1118 |
|
</jar> |
1193 |
– |
|
1119 |
|
</target> |
1120 |
|
|
1121 |
< |
|
1197 |
< |
<target name="jsr166ydocs" |
1198 |
< |
description="Builds javadocs to dist dir"> |
1199 |
< |
|
1121 |
> |
<target name="jsr166ydocs"> |
1122 |
|
<delete dir="${jsr166ydocs.dir}"/> |
1123 |
|
<mkdir dir="${jsr166ydocs.dir}"/> |
1124 |
|
|
1133 |
|
failonerror = "true"> |
1134 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1135 |
|
<arg value="-XDignore.symbol.file=true"/> |
1214 |
– |
|
1136 |
|
</javadoc> |
1137 |
|
</target> |
1138 |
|
|
1139 |
+ |
<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/> |
1140 |
|
|
1141 |
< |
<target name="jsr166ydist" |
1220 |
< |
depends="jsr166ydist-jar, jsr166ydist-docs" |
1221 |
< |
description="Puts all distributable products in single hierarchy"/> |
1222 |
< |
|
1223 |
< |
|
1224 |
< |
<target name="jsr166yclean" |
1225 |
< |
description="Removes all jsr166y build products"> |
1226 |
< |
|
1141 |
> |
<target name="jsr166yclean"> |
1142 |
|
<delete dir="${build.jsr166y.dir}"/> |
1228 |
– |
|
1143 |
|
</target> |
1144 |
|
|
1145 |
< |
|
1232 |
< |
<target name="jsr166ydist-jar" |
1233 |
< |
depends="jsr166yclean, jsr166yjar"> |
1145 |
> |
<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar"> |
1146 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
1147 |
|
</target> |
1148 |
|
|
1149 |
< |
<target name="jsr166ydist-docs" |
1238 |
< |
depends="jsr166yclean, jsr166ydocs"> |
1149 |
> |
<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs"> |
1150 |
|
<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/> |
1151 |
|
</target> |
1152 |
|
|
1153 |
|
|
1154 |
< |
<!-- extra166y --> |
1244 |
< |
|
1245 |
< |
|
1246 |
< |
<target name="extra166ycompile" |
1247 |
< |
depends="configure-compiler, jsr166yjar" |
1248 |
< |
description="Compiles extra166y sources"> |
1154 |
> |
<!-- extra166y (no longer maintained) --> |
1155 |
|
|
1156 |
+ |
<target name="extra166ycompile" depends="configure-compiler, jsr166yjar"> |
1157 |
|
<mkdir dir="${build.extra166y.classes.dir}"/> |
1158 |
|
|
1159 |
|
<javac srcdir="${topsrc.dir}" |
1176 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
1177 |
|
<compilerarg value="-Werror"/> |
1178 |
|
<compilerarg line="${build.args}"/> |
1272 |
– |
|
1179 |
|
</javac> |
1180 |
|
</target> |
1181 |
|
|
1182 |
< |
|
1277 |
< |
<target name="extra166yjar" |
1278 |
< |
depends="extra166ycompile" |
1279 |
< |
description="Builds library jar from compiled sources"> |
1280 |
< |
|
1182 |
> |
<target name="extra166yjar" depends="extra166ycompile"> |
1183 |
|
<jar destfile="${extra166y.jar}" index="true"> |
1184 |
|
<fileset dir="${build.extra166y.classes.dir}"/> |
1185 |
|
<manifest> |
1187 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1188 |
|
</manifest> |
1189 |
|
</jar> |
1288 |
– |
|
1190 |
|
</target> |
1191 |
|
|
1192 |
< |
|
1292 |
< |
<target name="extra166ydocs" |
1293 |
< |
description="Builds javadocs to build dir"> |
1294 |
< |
|
1192 |
> |
<target name="extra166ydocs"> |
1193 |
|
<delete dir="${extra166ydocs.dir}"/> |
1194 |
|
<mkdir dir="${extra166ydocs.dir}"/> |
1195 |
|
|
1203 |
|
executable="${javadoc7}"> |
1204 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1205 |
|
<arg value="-XDignore.symbol.file=true"/> |
1308 |
– |
|
1206 |
|
</javadoc> |
1207 |
|
</target> |
1208 |
|
|
1209 |
+ |
<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/> |
1210 |
|
|
1211 |
< |
<target name="extra166ydist" |
1314 |
< |
depends="extra166ydist-jar, extra166ydist-docs" |
1315 |
< |
description="Puts all distributable products in single hierarchy"/> |
1316 |
< |
|
1317 |
< |
|
1318 |
< |
<target name="extra166yclean" |
1319 |
< |
description="Removes all extra166y build products"> |
1320 |
< |
|
1211 |
> |
<target name="extra166yclean"> |
1212 |
|
<delete dir="${build.extra166y.dir}"/> |
1322 |
– |
|
1213 |
|
</target> |
1214 |
|
|
1215 |
< |
|
1326 |
< |
<target name="extra166ydist-jar" |
1327 |
< |
depends="extra166yclean, extra166yjar"> |
1215 |
> |
<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar"> |
1216 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
1217 |
|
</target> |
1218 |
|
|
1219 |
< |
<target name="extra166ydist-docs" |
1332 |
< |
depends="extra166yclean, extra166ydocs"> |
1219 |
> |
<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs"> |
1220 |
|
<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/> |
1221 |
|
</target> |
1222 |
|
|
1223 |
< |
<!-- jsr166e --> |
1223 |
> |
|
1224 |
> |
<!-- jsr166e (no longer maintained) --> |
1225 |
|
|
1226 |
|
<property name="build.jsr166e.java.version" value="6"/> |
1227 |
|
<property name="build.jsr166e.javac" value="${javac6}"/> |
1228 |
|
|
1229 |
< |
<target name="jsr166ecompile" |
1342 |
< |
depends="configure-compiler" |
1343 |
< |
description="Compiles jsr166e sources"> |
1344 |
< |
|
1229 |
> |
<target name="jsr166ecompile" depends="configure-compiler"> |
1230 |
|
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1231 |
|
|
1232 |
|
<javac srcdir="${topsrc.dir}" |
1247 |
|
<compilerarg value="-Xlint:all"/> |
1248 |
|
<compilerarg value="-Werror"/> |
1249 |
|
<compilerarg line="${build.args}"/> |
1365 |
– |
|
1250 |
|
</javac> |
1251 |
|
</target> |
1252 |
|
|
1369 |
– |
<!-- jsr166e: find doclint errors --> |
1253 |
|
<target name="jsr166edoclint"> |
1371 |
– |
|
1254 |
|
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1255 |
|
|
1256 |
|
<javac srcdir="${topsrc.dir}" |
1272 |
|
<compilerarg value="-Xlint:all"/> |
1273 |
|
<compilerarg value="-Werror"/> |
1274 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
1393 |
– |
|
1275 |
|
</javac> |
1276 |
|
</target> |
1277 |
|
|
1278 |
< |
|
1398 |
< |
<target name="jsr166ejar" |
1399 |
< |
depends="jsr166ecompile" |
1400 |
< |
description="Builds library jar from compiled sources"> |
1401 |
< |
|
1278 |
> |
<target name="jsr166ejar" depends="jsr166ecompile"> |
1279 |
|
<jar destfile="${jsr166e.jar}" index="true"> |
1280 |
|
<fileset dir="${build.jsr166e.classes.dir}"/> |
1281 |
|
<manifest> |
1283 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1284 |
|
</manifest> |
1285 |
|
</jar> |
1409 |
– |
|
1286 |
|
</target> |
1287 |
|
|
1288 |
< |
|
1413 |
< |
<target name="jsr166edocs" |
1414 |
< |
description="Builds javadocs to build dir"> |
1415 |
< |
|
1288 |
> |
<target name="jsr166edocs"> |
1289 |
|
<delete dir="${jsr166edocs.dir}"/> |
1290 |
|
<mkdir dir="${jsr166edocs.dir}"/> |
1291 |
|
|
1299 |
|
failonerror = "true"> |
1300 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1301 |
|
<arg value="-XDignore.symbol.file=true"/> |
1429 |
– |
|
1302 |
|
</javadoc> |
1303 |
|
</target> |
1304 |
|
|
1305 |
< |
|
1434 |
< |
<target name="jsr166e-tck-one-java-version" |
1435 |
< |
depends="jsr166ejar"> |
1436 |
< |
|
1305 |
> |
<target name="jsr166e-tck-one-java-version" depends="jsr166ejar"> |
1306 |
|
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
1438 |
– |
|
1307 |
|
<run-tck-tests |
1308 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1309 |
|
target="${build.jsr166e.java.version}" |
1311 |
|
classes="${jsr166e.jar}"/> |
1312 |
|
</target> |
1313 |
|
|
1314 |
< |
<target name="jsr166e-tck" |
1447 |
< |
description="Runs tck tests for jsr166e for multiple java versions"> |
1314 |
> |
<target name="jsr166e-tck"> |
1315 |
|
|
1316 |
|
<!-- <antcall target="clean"/> --> |
1317 |
|
<!-- <antcall target="jsr166e-tck-one-java-version"> --> |
1332 |
|
</antcall> |
1333 |
|
</target> |
1334 |
|
|
1335 |
+ |
<target name="jsr166e-test" depends="jsr166e-tck"/> |
1336 |
|
|
1337 |
< |
<target name="jsr166e-test" |
1470 |
< |
depends="jsr166e-tck" |
1471 |
< |
description="Runs all tests for jsr166e"> |
1472 |
< |
</target> |
1473 |
< |
|
1474 |
< |
<target name="jsr166edist" |
1475 |
< |
depends="jsr166edist-jar, jsr166edist-docs" |
1476 |
< |
description="Puts all distributable products in single hierarchy"/> |
1477 |
< |
|
1337 |
> |
<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/> |
1338 |
|
|
1339 |
< |
<target name="jsr166eclean" |
1480 |
< |
description="Removes all jsr166e build products"> |
1339 |
> |
<target name="jsr166eclean"> |
1340 |
|
<delete dir="${build.jsr166e.dir}"/> |
1341 |
|
</target> |
1342 |
|
|
1484 |
– |
|
1343 |
|
<target name="jsr166edist-jar" |
1344 |
|
depends="jsr166eclean, jsr166ejar"> |
1345 |
|
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1346 |
|
</target> |
1347 |
|
|
1348 |
< |
<target name="jsr166edist-docs" |
1491 |
< |
depends="jsr166eclean, jsr166edocs"> |
1348 |
> |
<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs"> |
1349 |
|
<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/> |
1350 |
|
</target> |
1351 |
|
|
1365 |
|
</antcall> |
1366 |
|
</target> |
1367 |
|
|
1368 |
+ |
|
1369 |
+ |
<!-- ============================================================== |
1370 |
+ |
Experimental errorprone support - http://errorprone.info |
1371 |
+ |
You may need to bring your own errorprone jar. |
1372 |
+ |
=================================================================== --> |
1373 |
+ |
<target name="errorprone" |
1374 |
+ |
depends="clean, configure-compiler" |
1375 |
+ |
description="Run errorprone over jsr166 source code (experimental)"> |
1376 |
+ |
|
1377 |
+ |
<local name="destdir"/> |
1378 |
+ |
<property name="destdir" value="${build.classes.dir}/java.base"/> |
1379 |
+ |
<mkdir dir="${destdir}"/> |
1380 |
+ |
|
1381 |
+ |
<javac srcdir="${src.dir}" |
1382 |
+ |
destdir="${destdir}" |
1383 |
+ |
debug="${build.debug}" |
1384 |
+ |
debuglevel="${build.debuglevel}" |
1385 |
+ |
deprecation="${build.deprecation}" |
1386 |
+ |
classpath="" |
1387 |
+ |
includeAntRuntime="false" |
1388 |
+ |
includeJavaRuntime="false" |
1389 |
+ |
encoding="ASCII" |
1390 |
+ |
executable="${build.main.javac}" |
1391 |
+ |
fork="true"> |
1392 |
+ |
|
1393 |
+ |
<include name="**/*.java"/> |
1394 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1395 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1396 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1397 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/> |
1398 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/> |
1399 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/> |
1400 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/> |
1401 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1402 |
+ |
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1403 |
+ |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/> |
1404 |
+ |
<compilerarg value="-Xplugin:ErrorProne |
1405 |
+ |
-Xep:IdentityBinaryExpression:WARN |
1406 |
+ |
-Xep:MissingOverride:OFF |
1407 |
+ |
-Xep:MixedArrayDimensions:WARN |
1408 |
+ |
-Xep:RemoveUnusedImports:ERROR |
1409 |
+ |
-Xep:ClassName:ERROR |
1410 |
+ |
-Xep:MultipleTopLevelClasses:ERROR |
1411 |
+ |
-Xep:EmptyIf:ERROR |
1412 |
+ |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1413 |
+ |
-Xep:ArgumentParameterSwap:ERROR |
1414 |
+ |
-Xep:RedundantThrows:ERROR |
1415 |
+ |
-Xep:MethodCanBeStatic:WARN"/> |
1416 |
+ |
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
1417 |
+ |
<compilerarg value="-Xprefer:source"/> |
1418 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
1419 |
+ |
<compilerarg value="-Xlint:all"/> |
1420 |
+ |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
1421 |
+ |
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1422 |
+ |
<compilerarg line="${build.args}"/> |
1423 |
+ |
</javac> |
1424 |
+ |
|
1425 |
+ |
<jar destfile="${product.jar}"> |
1426 |
+ |
<fileset dir="${destdir}"/> |
1427 |
+ |
</jar> |
1428 |
+ |
|
1429 |
+ |
<run-tck-tests |
1430 |
+ |
target="${build.main.java.version}" |
1431 |
+ |
workdir="${build.dir}" |
1432 |
+ |
classes="${product.jar}"> |
1433 |
+ |
<javac-elements> |
1434 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1435 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1436 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1437 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/> |
1438 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/> |
1439 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/> |
1440 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/> |
1441 |
+ |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1442 |
+ |
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1443 |
+ |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/> |
1444 |
+ |
<compilerarg value="-Xplugin:ErrorProne |
1445 |
+ |
-Xep:IdentityBinaryExpression:WARN |
1446 |
+ |
-Xep:BoxedPrimitiveConstructor:OFF |
1447 |
+ |
-Xep:HashtableContains:OFF |
1448 |
+ |
-Xep:ModifyingCollectionWithItself:OFF |
1449 |
+ |
-Xep:MissingOverride:OFF |
1450 |
+ |
-Xep:MixedArrayDimensions:WARN |
1451 |
+ |
-Xep:RemoveUnusedImports:ERROR |
1452 |
+ |
-Xep:ClassName:ERROR |
1453 |
+ |
-Xep:MultipleTopLevelClasses:ERROR |
1454 |
+ |
-Xep:EmptyIf:ERROR |
1455 |
+ |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1456 |
+ |
-Xep:ArgumentParameterSwap:ERROR |
1457 |
+ |
-Xep:RedundantThrows:ERROR |
1458 |
+ |
-Xep:MethodCanBeStatic:WARN"/> |
1459 |
+ |
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1460 |
+ |
</javac-elements> |
1461 |
+ |
</run-tck-tests> |
1462 |
+ |
</target> |
1463 |
+ |
|
1464 |
+ |
|
1465 |
|
<!-- ============================================================== |
1466 |
|
Running guava tests against jsr166 code |
1467 |
|
=================================================================== --> |