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 |
|
------------------------------------------------------------------------------ |
319 |
|
|
320 |
|
<macrodef name="run-jtreg-tests"> |
321 |
|
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
324 |
– |
<attribute name="source" default="7"/> |
322 |
|
<attribute name="target"/> |
323 |
|
<attribute name="workdir"/> |
324 |
|
<attribute name="classes"/> |
369 |
|
<property name="build.main.javac" value="${javac9}"/> |
370 |
|
|
371 |
|
<target name="dists" |
372 |
+ |
depends="dist, 4jdk8dist" |
373 |
+ |
description="Builds all public jars and docs"/> |
374 |
|
<!-- |
375 |
|
depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
376 |
|
--> |
378 |
– |
depends="dist, 4jdk8dist" |
379 |
– |
description="Builds all public jars and docs"/> |
377 |
|
|
378 |
|
<target name="compile" |
379 |
|
depends="configure-compiler" |
410 |
|
<compilerarg value="-Xprefer:source"/> |
411 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
412 |
|
<compilerarg value="-Xlint:all"/> |
413 |
< |
<compilerarg value="-Werror"/> |
413 |
> |
<compilerarg line="--doclint-format html5"/> |
414 |
|
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
415 |
+ |
<compilerarg value="-Werror"/> |
416 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
417 |
|
<compilerarg line="${build.args}"/> |
418 |
|
|
456 |
|
access="${build.javadoc.access}" |
457 |
|
sourcepath="${src.dir}" |
458 |
|
classpath="" |
459 |
+ |
source="9" |
460 |
|
executable="${javadoc9}"> |
461 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
462 |
|
<include name="**/*.java"/> |
464 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
465 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
466 |
|
<arg value="-XDignore.symbol.file=true"/> |
467 |
+ |
<arg value="-html5"/> |
468 |
|
<arg value="--patch-module=java.base=${src.dir}"/> |
469 |
|
<arg value="-tag"/> |
470 |
|
<arg value="${javadoc.jls.option}"/> |
513 |
|
|
514 |
|
<target name="clean" |
515 |
|
description="Removes all build products"> |
516 |
– |
|
516 |
|
<delete dir="${build.dir}"/> |
518 |
– |
|
517 |
|
</target> |
518 |
|
|
519 |
|
|
520 |
|
<target name="dist-clean" |
521 |
|
description="Removes all build and distribution products"> |
524 |
– |
|
522 |
|
<delete dir="${build.dir}"/> |
523 |
|
<delete dir="${dist.dir}"/> |
527 |
– |
|
524 |
|
</target> |
525 |
|
|
526 |
|
|
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"> |
588 |
< |
</target> |
583 |
> |
description="Runs tck and jtreg tests for src/main"/> |
584 |
|
|
585 |
|
<!-- <target name="jtreg8" description="Runs jtreg tests with jdk8"> --> |
586 |
|
|
658 |
|
<java classname="ALoops" fork="true"> |
659 |
|
<classpath refid="loops.classpath"/> |
660 |
|
</java> |
666 |
– |
|
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}"/> |
691 |
– |
|
685 |
|
</javac> |
693 |
– |
|
686 |
|
</target> |
687 |
|
|
688 |
|
|
708 |
|
encoding="ASCII" |
709 |
|
executable="${javac8}" |
710 |
|
fork="true"> |
719 |
– |
|
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}"/> |
726 |
– |
|
717 |
|
</javac> |
718 |
|
</target> |
719 |
|
|
737 |
|
encoding="ASCII" |
738 |
|
executable="${javac8}" |
739 |
|
fork="true"> |
750 |
– |
|
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,reference/private"/> |
745 |
|
<compilerarg line="${build.args}"/> |
757 |
– |
|
746 |
|
</javac> |
747 |
|
</target> |
748 |
|
|
758 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
759 |
|
</manifest> |
760 |
|
</jar> |
773 |
– |
|
761 |
|
</target> |
762 |
|
|
763 |
|
|
791 |
|
|
792 |
|
<target name="4jdk8-test" |
793 |
|
depends="4jdk8-tck, 4jdk8-jtreg" |
794 |
< |
description="Runs tck and jtreg tests for jsr166-4jdk8"> |
808 |
< |
</target> |
794 |
> |
description="Runs tck and jtreg tests for jsr166-4jdk8"/> |
795 |
|
|
796 |
|
|
797 |
|
<target name="4jdk8docs" |
807 |
|
access="${build.javadoc.access}" |
808 |
|
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}" |
809 |
|
classpath="" |
810 |
+ |
source="8" |
811 |
|
executable="${javadoc8}" |
812 |
|
failonerror = "true"> |
813 |
|
<fileset dir="${4jdk8src.dir}" defaultexcludes="yes"> |
835 |
|
|
836 |
|
<target name="4jdk8clean" |
837 |
|
description="Removes all 4jdk8 build products"> |
851 |
– |
|
838 |
|
<delete dir="${build.4jdk8.dir}"/> |
853 |
– |
|
839 |
|
</target> |
840 |
|
|
841 |
|
|
851 |
|
</target> |
852 |
|
|
853 |
|
|
854 |
+ |
<!-- jsr166 4jdk7 (no longer maintained) --> |
855 |
|
|
856 |
< |
<!-- jsr166 4jdk7 --> |
871 |
< |
|
872 |
< |
<target name="4jdk7compile" |
873 |
< |
depends="configure-compiler" |
874 |
< |
description="Compiles src/jdk7 sources, targeting jdk7"> |
875 |
< |
|
856 |
> |
<target name="4jdk7compile" depends="configure-compiler"> |
857 |
|
<mkdir dir="${build.4jdk7.classes.dir}"/> |
858 |
|
|
859 |
|
<javac srcdir="${4jdk7src.dir}" |
877 |
|
<compilerarg value="-Xlint:all"/> |
878 |
|
<compilerarg value="-Werror"/> |
879 |
|
<compilerarg line="${build.args}"/> |
899 |
– |
|
880 |
|
</javac> |
881 |
|
</target> |
882 |
|
|
883 |
< |
<target name="4jdk7doclint" |
904 |
< |
depends="configure-compiler" |
905 |
< |
description="Finds doclint warnings"> |
906 |
< |
|
883 |
> |
<target name="4jdk7doclint" depends="configure-compiler"> |
884 |
|
<mkdir dir="${build.4jdk7.classes.dir}"/> |
885 |
|
|
886 |
|
<javac srcdir="${4jdk7src.dir}" |
904 |
|
<compilerarg value="-Xlint:all"/> |
905 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
906 |
|
<compilerarg line="${build.args}"/> |
930 |
– |
|
907 |
|
</javac> |
908 |
|
</target> |
909 |
|
|
910 |
< |
|
935 |
< |
<target name="4jdk7jar" |
936 |
< |
depends="4jdk7compile" |
937 |
< |
description="Builds library jar from compiled sources"> |
938 |
< |
|
910 |
> |
<target name="4jdk7jar" depends="4jdk7compile"> |
911 |
|
<jar destfile="${4jdk7product.jar}"> |
912 |
|
<fileset dir="${build.4jdk7.classes.dir}"/> |
913 |
|
<manifest> |
915 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
916 |
|
</manifest> |
917 |
|
</jar> |
946 |
– |
|
918 |
|
</target> |
919 |
|
|
920 |
< |
|
950 |
< |
<target name="4jdk7-tck" |
951 |
< |
depends="4jdk7jar" |
952 |
< |
description="Runs tck tests for jsr166-4jdk7 directly"> |
953 |
< |
|
920 |
> |
<target name="4jdk7-tck" depends="4jdk7jar"> |
921 |
|
<run-tck-tests |
922 |
|
target="7" |
923 |
|
workdir="${build.4jdk7.dir}" |
940 |
|
</run-tck-tests> |
941 |
|
</target> |
942 |
|
|
976 |
– |
|
943 |
|
<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) --> |
944 |
< |
<target name="4jdk7-tck-junit" |
979 |
< |
depends="4jdk7compile"> |
944 |
> |
<target name="4jdk7-tck-junit" depends="4jdk7compile"> |
945 |
|
|
946 |
|
<junit printsummary="true" |
947 |
|
showoutput="true" |
963 |
|
|
964 |
|
<test name="${jsr166.tckTestClass}" haltonfailure="no"> |
965 |
|
</test> |
1001 |
– |
|
966 |
|
</junit> |
967 |
|
</target> |
968 |
|
|
969 |
< |
<target name="4jdk7-jtreg" |
1006 |
< |
depends="4jdk7jar" |
1007 |
< |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
969 |
> |
<target name="4jdk7-jtreg" depends="4jdk7jar"> |
970 |
|
<run-jtreg-tests |
971 |
|
target="7" |
972 |
|
workdir="${build.4jdk7.dir}" |
973 |
|
classes="${4jdk7product.jar}"/> |
974 |
|
</target> |
975 |
|
|
976 |
+ |
<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/> |
977 |
|
|
978 |
< |
<target name="4jdk7-test" |
1016 |
< |
depends="4jdk7-tck, 4jdk7-jtreg" |
1017 |
< |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
1018 |
< |
</target> |
1019 |
< |
|
1020 |
< |
|
1021 |
< |
<target name="4jdk7docs" |
1022 |
< |
description="Builds javadocs for src/jdk7 to dist dir"> |
1023 |
< |
|
978 |
> |
<target name="4jdk7docs"> |
979 |
|
<delete dir="${4jdk7docs.dir}"/> |
980 |
|
<mkdir dir="${4jdk7docs.dir}"/> |
981 |
|
|
996 |
|
</javadoc> |
997 |
|
</target> |
998 |
|
|
999 |
+ |
<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/> |
1000 |
|
|
1001 |
< |
<target name="4jdk7dist" |
1046 |
< |
depends="4jdk7dist-jar, 4jdk7dist-docs" |
1047 |
< |
description="Puts all distributable products in single hierarchy"/> |
1048 |
< |
|
1049 |
< |
|
1050 |
< |
<target name="4jdk7clean" |
1051 |
< |
description="Removes all 4jdk7 build products"> |
1052 |
< |
|
1001 |
> |
<target name="4jdk7clean"> |
1002 |
|
<delete dir="${build.4jdk7.dir}"/> |
1054 |
– |
|
1003 |
|
</target> |
1004 |
|
|
1005 |
< |
|
1058 |
< |
<target name="4jdk7dist-jar" |
1059 |
< |
depends="4jdk7clean, 4jdk7jar"> |
1005 |
> |
<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar"> |
1006 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
1007 |
|
</target> |
1008 |
|
|
1009 |
< |
|
1064 |
< |
<target name="4jdk7dist-docs" |
1065 |
< |
depends="4jdk7clean, 4jdk7docs"> |
1009 |
> |
<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs"> |
1010 |
|
<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/> |
1011 |
|
</target> |
1012 |
|
|
1013 |
|
|
1014 |
< |
<!-- jsr166x --> |
1071 |
< |
|
1072 |
< |
<target name="jsr166xcompile" |
1073 |
< |
depends="configure-compiler" |
1074 |
< |
description="Compiles jsr166x sources to build dir"> |
1014 |
> |
<!-- jsr166x (no longer maintained) --> |
1015 |
|
|
1016 |
+ |
<target name="jsr166xcompile" depends="configure-compiler"> |
1017 |
|
<mkdir dir="${build.jsr166x.classes.dir}"/> |
1018 |
|
|
1019 |
|
<javac srcdir="${topsrc.dir}" |
1030 |
|
encoding="ASCII" |
1031 |
|
executable="${javac7}" |
1032 |
|
fork="true"> |
1092 |
– |
|
1033 |
|
<include name="jsr166x/**/*.java"/> |
1034 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1035 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
1036 |
|
<compilerarg value="-Werror"/> |
1037 |
|
<compilerarg line="${build.args}"/> |
1098 |
– |
|
1038 |
|
</javac> |
1039 |
|
</target> |
1040 |
|
|
1041 |
< |
|
1103 |
< |
<target name="jsr166xjar" |
1104 |
< |
depends="jsr166xcompile" |
1105 |
< |
description="Builds library jar from compiled sources"> |
1106 |
< |
|
1041 |
> |
<target name="jsr166xjar" depends="jsr166xcompile"> |
1042 |
|
<jar destfile="${jsr166x.jar}"> |
1043 |
|
<fileset dir="${build.jsr166x.classes.dir}"/> |
1044 |
|
<manifest> |
1046 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1047 |
|
</manifest> |
1048 |
|
</jar> |
1114 |
– |
|
1049 |
|
</target> |
1050 |
|
|
1051 |
< |
|
1118 |
< |
<target name="jsr166xdocs" |
1119 |
< |
description="Builds javadocs to dist dir"> |
1120 |
< |
|
1051 |
> |
<target name="jsr166xdocs"> |
1052 |
|
<delete dir="${jsr166xdocs.dir}"/> |
1053 |
|
<mkdir dir="${jsr166xdocs.dir}"/> |
1054 |
|
|
1063 |
|
failonerror = "true"> |
1064 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1065 |
|
<arg value="-XDignore.symbol.file=true"/> |
1135 |
– |
|
1066 |
|
</javadoc> |
1067 |
|
</target> |
1068 |
|
|
1069 |
+ |
<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/> |
1070 |
|
|
1071 |
< |
<target name="jsr166xdist" |
1141 |
< |
depends="jsr166xdist-jar, jsr166xdist-docs" |
1142 |
< |
description="Puts all distributable products in single hierarchy"/> |
1143 |
< |
|
1144 |
< |
|
1145 |
< |
<target name="jsr166xclean" |
1146 |
< |
description="Removes all jsr166x build products"> |
1147 |
< |
|
1071 |
> |
<target name="jsr166xclean"> |
1072 |
|
<delete dir="${build.jsr166x.dir}"/> |
1149 |
– |
|
1073 |
|
</target> |
1074 |
|
|
1075 |
< |
|
1153 |
< |
<target name="jsr166xdist-jar" |
1154 |
< |
depends="jsr166xclean, jsr166xjar"> |
1075 |
> |
<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar"> |
1076 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
1077 |
|
</target> |
1078 |
|
|
1079 |
< |
<target name="jsr166xdist-docs" |
1159 |
< |
depends="jsr166xclean, jsr166xdocs"> |
1079 |
> |
<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs"> |
1080 |
|
<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/> |
1081 |
|
</target> |
1082 |
|
|
1163 |
– |
<!-- jsr166y --> |
1083 |
|
|
1084 |
+ |
<!-- jsr166y (no longer maintained) --> |
1085 |
|
|
1086 |
< |
<target name="jsr166ycompile" |
1167 |
< |
depends="configure-compiler" |
1168 |
< |
description="Compiles jsr166y sources"> |
1169 |
< |
|
1086 |
> |
<target name="jsr166ycompile" depends="configure-compiler"> |
1087 |
|
<mkdir dir="${build.jsr166y.classes.dir}"/> |
1088 |
|
|
1089 |
|
<javac srcdir="${topsrc.dir}" |
1106 |
|
<compilerarg value="-Xlint:all"/> |
1107 |
|
<compilerarg value="-Werror"/> |
1108 |
|
<compilerarg line="${build.args}"/> |
1192 |
– |
|
1109 |
|
</javac> |
1110 |
|
</target> |
1111 |
|
|
1112 |
< |
|
1197 |
< |
<target name="jsr166yjar" |
1198 |
< |
depends="jsr166ycompile" |
1199 |
< |
description="Builds library jar from compiled sources"> |
1200 |
< |
|
1112 |
> |
<target name="jsr166yjar" depends="jsr166ycompile"> |
1113 |
|
<jar destfile="${jsr166y.jar}" index="true"> |
1114 |
|
<fileset dir="${build.jsr166y.classes.dir}"/> |
1115 |
|
<manifest> |
1117 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1118 |
|
</manifest> |
1119 |
|
</jar> |
1208 |
– |
|
1120 |
|
</target> |
1121 |
|
|
1122 |
< |
|
1212 |
< |
<target name="jsr166ydocs" |
1213 |
< |
description="Builds javadocs to dist dir"> |
1214 |
< |
|
1122 |
> |
<target name="jsr166ydocs"> |
1123 |
|
<delete dir="${jsr166ydocs.dir}"/> |
1124 |
|
<mkdir dir="${jsr166ydocs.dir}"/> |
1125 |
|
|
1134 |
|
failonerror = "true"> |
1135 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1136 |
|
<arg value="-XDignore.symbol.file=true"/> |
1229 |
– |
|
1137 |
|
</javadoc> |
1138 |
|
</target> |
1139 |
|
|
1140 |
+ |
<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/> |
1141 |
|
|
1142 |
< |
<target name="jsr166ydist" |
1235 |
< |
depends="jsr166ydist-jar, jsr166ydist-docs" |
1236 |
< |
description="Puts all distributable products in single hierarchy"/> |
1237 |
< |
|
1238 |
< |
|
1239 |
< |
<target name="jsr166yclean" |
1240 |
< |
description="Removes all jsr166y build products"> |
1241 |
< |
|
1142 |
> |
<target name="jsr166yclean"> |
1143 |
|
<delete dir="${build.jsr166y.dir}"/> |
1243 |
– |
|
1144 |
|
</target> |
1145 |
|
|
1146 |
< |
|
1247 |
< |
<target name="jsr166ydist-jar" |
1248 |
< |
depends="jsr166yclean, jsr166yjar"> |
1146 |
> |
<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar"> |
1147 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
1148 |
|
</target> |
1149 |
|
|
1150 |
< |
<target name="jsr166ydist-docs" |
1253 |
< |
depends="jsr166yclean, jsr166ydocs"> |
1150 |
> |
<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs"> |
1151 |
|
<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/> |
1152 |
|
</target> |
1153 |
|
|
1154 |
|
|
1155 |
< |
<!-- extra166y --> |
1259 |
< |
|
1260 |
< |
|
1261 |
< |
<target name="extra166ycompile" |
1262 |
< |
depends="configure-compiler, jsr166yjar" |
1263 |
< |
description="Compiles extra166y sources"> |
1155 |
> |
<!-- extra166y (no longer maintained) --> |
1156 |
|
|
1157 |
+ |
<target name="extra166ycompile" depends="configure-compiler, jsr166yjar"> |
1158 |
|
<mkdir dir="${build.extra166y.classes.dir}"/> |
1159 |
|
|
1160 |
|
<javac srcdir="${topsrc.dir}" |
1177 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
1178 |
|
<compilerarg value="-Werror"/> |
1179 |
|
<compilerarg line="${build.args}"/> |
1287 |
– |
|
1180 |
|
</javac> |
1181 |
|
</target> |
1182 |
|
|
1183 |
< |
|
1292 |
< |
<target name="extra166yjar" |
1293 |
< |
depends="extra166ycompile" |
1294 |
< |
description="Builds library jar from compiled sources"> |
1295 |
< |
|
1183 |
> |
<target name="extra166yjar" depends="extra166ycompile"> |
1184 |
|
<jar destfile="${extra166y.jar}" index="true"> |
1185 |
|
<fileset dir="${build.extra166y.classes.dir}"/> |
1186 |
|
<manifest> |
1188 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1189 |
|
</manifest> |
1190 |
|
</jar> |
1303 |
– |
|
1191 |
|
</target> |
1192 |
|
|
1193 |
< |
|
1307 |
< |
<target name="extra166ydocs" |
1308 |
< |
description="Builds javadocs to build dir"> |
1309 |
< |
|
1193 |
> |
<target name="extra166ydocs"> |
1194 |
|
<delete dir="${extra166ydocs.dir}"/> |
1195 |
|
<mkdir dir="${extra166ydocs.dir}"/> |
1196 |
|
|
1204 |
|
executable="${javadoc7}"> |
1205 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1206 |
|
<arg value="-XDignore.symbol.file=true"/> |
1323 |
– |
|
1207 |
|
</javadoc> |
1208 |
|
</target> |
1209 |
|
|
1210 |
+ |
<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/> |
1211 |
|
|
1212 |
< |
<target name="extra166ydist" |
1329 |
< |
depends="extra166ydist-jar, extra166ydist-docs" |
1330 |
< |
description="Puts all distributable products in single hierarchy"/> |
1331 |
< |
|
1332 |
< |
|
1333 |
< |
<target name="extra166yclean" |
1334 |
< |
description="Removes all extra166y build products"> |
1335 |
< |
|
1212 |
> |
<target name="extra166yclean"> |
1213 |
|
<delete dir="${build.extra166y.dir}"/> |
1337 |
– |
|
1214 |
|
</target> |
1215 |
|
|
1216 |
< |
|
1341 |
< |
<target name="extra166ydist-jar" |
1342 |
< |
depends="extra166yclean, extra166yjar"> |
1216 |
> |
<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar"> |
1217 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
1218 |
|
</target> |
1219 |
|
|
1220 |
< |
<target name="extra166ydist-docs" |
1347 |
< |
depends="extra166yclean, extra166ydocs"> |
1220 |
> |
<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs"> |
1221 |
|
<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/> |
1222 |
|
</target> |
1223 |
|
|
1224 |
< |
<!-- jsr166e --> |
1224 |
> |
|
1225 |
> |
<!-- jsr166e (no longer maintained) --> |
1226 |
|
|
1227 |
|
<property name="build.jsr166e.java.version" value="6"/> |
1228 |
|
<property name="build.jsr166e.javac" value="${javac6}"/> |
1229 |
|
|
1230 |
< |
<target name="jsr166ecompile" |
1357 |
< |
depends="configure-compiler" |
1358 |
< |
description="Compiles jsr166e sources"> |
1359 |
< |
|
1230 |
> |
<target name="jsr166ecompile" depends="configure-compiler"> |
1231 |
|
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1232 |
|
|
1233 |
|
<javac srcdir="${topsrc.dir}" |
1248 |
|
<compilerarg value="-Xlint:all"/> |
1249 |
|
<compilerarg value="-Werror"/> |
1250 |
|
<compilerarg line="${build.args}"/> |
1380 |
– |
|
1251 |
|
</javac> |
1252 |
|
</target> |
1253 |
|
|
1384 |
– |
<!-- jsr166e: find doclint errors --> |
1254 |
|
<target name="jsr166edoclint"> |
1386 |
– |
|
1255 |
|
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1256 |
|
|
1257 |
|
<javac srcdir="${topsrc.dir}" |
1273 |
|
<compilerarg value="-Xlint:all"/> |
1274 |
|
<compilerarg value="-Werror"/> |
1275 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
1408 |
– |
|
1276 |
|
</javac> |
1277 |
|
</target> |
1278 |
|
|
1279 |
< |
|
1413 |
< |
<target name="jsr166ejar" |
1414 |
< |
depends="jsr166ecompile" |
1415 |
< |
description="Builds library jar from compiled sources"> |
1416 |
< |
|
1279 |
> |
<target name="jsr166ejar" depends="jsr166ecompile"> |
1280 |
|
<jar destfile="${jsr166e.jar}" index="true"> |
1281 |
|
<fileset dir="${build.jsr166e.classes.dir}"/> |
1282 |
|
<manifest> |
1284 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1285 |
|
</manifest> |
1286 |
|
</jar> |
1424 |
– |
|
1287 |
|
</target> |
1288 |
|
|
1289 |
< |
|
1428 |
< |
<target name="jsr166edocs" |
1429 |
< |
description="Builds javadocs to build dir"> |
1430 |
< |
|
1289 |
> |
<target name="jsr166edocs"> |
1290 |
|
<delete dir="${jsr166edocs.dir}"/> |
1291 |
|
<mkdir dir="${jsr166edocs.dir}"/> |
1292 |
|
|
1300 |
|
failonerror = "true"> |
1301 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1302 |
|
<arg value="-XDignore.symbol.file=true"/> |
1444 |
– |
|
1303 |
|
</javadoc> |
1304 |
|
</target> |
1305 |
|
|
1306 |
< |
|
1449 |
< |
<target name="jsr166e-tck-one-java-version" |
1450 |
< |
depends="jsr166ejar"> |
1451 |
< |
|
1306 |
> |
<target name="jsr166e-tck-one-java-version" depends="jsr166ejar"> |
1307 |
|
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
1453 |
– |
|
1308 |
|
<run-tck-tests |
1309 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1310 |
|
target="${build.jsr166e.java.version}" |
1312 |
|
classes="${jsr166e.jar}"/> |
1313 |
|
</target> |
1314 |
|
|
1315 |
< |
<target name="jsr166e-tck" |
1462 |
< |
description="Runs tck tests for jsr166e for multiple java versions"> |
1315 |
> |
<target name="jsr166e-tck"> |
1316 |
|
|
1317 |
|
<!-- <antcall target="clean"/> --> |
1318 |
|
<!-- <antcall target="jsr166e-tck-one-java-version"> --> |
1333 |
|
</antcall> |
1334 |
|
</target> |
1335 |
|
|
1336 |
+ |
<target name="jsr166e-test" depends="jsr166e-tck"/> |
1337 |
|
|
1338 |
< |
<target name="jsr166e-test" |
1485 |
< |
depends="jsr166e-tck" |
1486 |
< |
description="Runs all tests for jsr166e"> |
1487 |
< |
</target> |
1338 |
> |
<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/> |
1339 |
|
|
1340 |
< |
<target name="jsr166edist" |
1490 |
< |
depends="jsr166edist-jar, jsr166edist-docs" |
1491 |
< |
description="Puts all distributable products in single hierarchy"/> |
1492 |
< |
|
1493 |
< |
|
1494 |
< |
<target name="jsr166eclean" |
1495 |
< |
description="Removes all jsr166e build products"> |
1340 |
> |
<target name="jsr166eclean"> |
1341 |
|
<delete dir="${build.jsr166e.dir}"/> |
1342 |
|
</target> |
1343 |
|
|
1499 |
– |
|
1344 |
|
<target name="jsr166edist-jar" |
1345 |
|
depends="jsr166eclean, jsr166ejar"> |
1346 |
|
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1347 |
|
</target> |
1348 |
|
|
1349 |
< |
<target name="jsr166edist-docs" |
1506 |
< |
depends="jsr166eclean, jsr166edocs"> |
1349 |
> |
<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs"> |
1350 |
|
<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/> |
1351 |
|
</target> |
1352 |
|
|
1373 |
|
=================================================================== --> |
1374 |
|
<target name="errorprone" |
1375 |
|
depends="clean, configure-compiler" |
1376 |
< |
description="Run errorprone over jsr166 source code"> |
1376 |
> |
description="Run errorprone over jsr166 source code (experimental)"> |
1377 |
|
|
1378 |
|
<local name="destdir"/> |
1379 |
|
<property name="destdir" value="${build.classes.dir}/java.base"/> |
1403 |
|
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1404 |
|
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/> |
1405 |
|
<compilerarg value="-Xplugin:ErrorProne |
1406 |
< |
-Xep:IdentityBinaryExpression:WARN |
1406 |
> |
-Xep:IdentityBinaryExpression:WARN |
1407 |
|
-Xep:MissingOverride:OFF |
1408 |
< |
-Xep:MixedArrayDimensions:WARN |
1409 |
< |
-Xep:RemoveUnusedImports:ERROR |
1408 |
> |
-Xep:MixedArrayDimensions:WARN |
1409 |
> |
-Xep:RemoveUnusedImports:ERROR |
1410 |
> |
-Xep:ClassName:ERROR |
1411 |
> |
-Xep:MultipleTopLevelClasses:ERROR |
1412 |
> |
-Xep:EmptyIf:ERROR |
1413 |
> |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1414 |
> |
-Xep:ArgumentParameterSwap:ERROR |
1415 |
> |
-Xep:RedundantThrows:ERROR |
1416 |
|
-Xep:MethodCanBeStatic:WARN"/> |
1417 |
|
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
1418 |
|
<compilerarg value="-Xprefer:source"/> |
1442 |
|
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1443 |
|
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1444 |
|
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/> |
1445 |
< |
<compilerarg value="-Xplugin:ErrorProne |
1446 |
< |
-Xep:IdentityBinaryExpression:WARN |
1447 |
< |
-Xep:BoxedPrimitiveConstructor:OFF |
1448 |
< |
-Xep:HashtableContains:OFF |
1449 |
< |
-Xep:ModifyingCollectionWithItself:OFF |
1450 |
< |
-Xep:MissingOverride:OFF |
1451 |
< |
-Xep:MixedArrayDimensions:WARN |
1452 |
< |
-Xep:RemoveUnusedImports:ERROR |
1445 |
> |
<compilerarg value="-Xplugin:ErrorProne |
1446 |
> |
-Xep:IdentityBinaryExpression:WARN |
1447 |
> |
-Xep:BoxedPrimitiveConstructor:OFF |
1448 |
> |
-Xep:HashtableContains:OFF |
1449 |
> |
-Xep:ModifyingCollectionWithItself:OFF |
1450 |
> |
-Xep:MissingOverride:OFF |
1451 |
> |
-Xep:MixedArrayDimensions:WARN |
1452 |
> |
-Xep:RemoveUnusedImports:ERROR |
1453 |
> |
-Xep:ClassName:ERROR |
1454 |
> |
-Xep:MultipleTopLevelClasses:ERROR |
1455 |
> |
-Xep:EmptyIf:ERROR |
1456 |
> |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1457 |
> |
-Xep:ArgumentParameterSwap:ERROR |
1458 |
> |
-Xep:RedundantThrows:ERROR |
1459 |
|
-Xep:MethodCanBeStatic:WARN"/> |
1460 |
|
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1461 |
|
</javac-elements> |