ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/build.xml

Comparing jsr166/build.xml (file contents):
Revision 1.239 by dl, Sun Mar 26 10:40:29 2017 UTC vs.
Revision 1.243 by jsr166, Sat May 13 20:16:55 2017 UTC

#	Line 18 | Line 18
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
#	Line 32 | Line 30
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		------------------------------------------------------------------------------
#	Line 372 | Line 370
370		<property name="build.main.javac" value="${javac9}"/>
371
372		<target name="dists"
373	+	depends="dist, 4jdk8dist"
374	+	description="Builds all public jars and docs"/>
375		<!--
376		depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
377		-->
378	–	depends="dist, 4jdk8dist"
379	–	description="Builds all public jars and docs"/>
378
379		<target name="compile"
380		depends="configure-compiler"
#	Line 413 | Line 411
411		<compilerarg value="-Xprefer:source"/>
412		<compilerarg value="-XDignore.symbol.file=true"/>
413		<compilerarg value="-Xlint:all"/>
414	<	<compilerarg value="-Werror"/>
414	>	<compilerarg line="--doclint-format html5"/>
415		<compilerarg value="-Xdoclint:all/protected,reference/private"/>
416	+	<compilerarg value="-Werror"/>
417		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
418		<compilerarg line="${build.args}"/>
419
#	Line 465 | Line 464
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}"/>
#	Line 513 | Line 513
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
#	Line 584 | Line 580
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
#	Line 663 | Line 658
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
#	Line 688 | Line 682
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
#	Line 716 | Line 708
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
#	Line 747 | Line 737
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
#	Line 770 | Line 758
758		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
759		</manifest>
760		</jar>
773	–
761		</target>
762
763
#	Line 804 | Line 791
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"
#	Line 848 | Line 834
834
835		<target name="4jdk8clean"
836		description="Removes all 4jdk8 build products">
851	–
837		<delete dir="${build.4jdk8.dir}"/>
853	–
838		</target>
839
840
#	Line 866 | Line 850
850		</target>
851
852
853	+	<!-- jsr166 4jdk7 (no longer maintained) -->
854
855	<	<!-- jsr166 4jdk7 -->
871	<
872	<	<target name="4jdk7compile"
873	<	depends="configure-compiler"
874	<	description="Compiles src/jdk7 sources, targeting jdk7">
875	<
855	>	<target name="4jdk7compile" depends="configure-compiler">
856		<mkdir dir="${build.4jdk7.classes.dir}"/>
857
858		<javac srcdir="${4jdk7src.dir}"
#	Line 896 | Line 876
876		<compilerarg value="-Xlint:all"/>
877		<compilerarg value="-Werror"/>
878		<compilerarg line="${build.args}"/>
899	–
879		</javac>
880		</target>
881
882	<	<target name="4jdk7doclint"
904	<	depends="configure-compiler"
905	<	description="Finds doclint warnings">
906	<
882	>	<target name="4jdk7doclint" depends="configure-compiler">
883		<mkdir dir="${build.4jdk7.classes.dir}"/>
884
885		<javac srcdir="${4jdk7src.dir}"
#	Line 927 | Line 903
903		<compilerarg value="-Xlint:all"/>
904		<compilerarg value="-Xdoclint:all/protected"/>
905		<compilerarg line="${build.args}"/>
930	–
906		</javac>
907		</target>
908
909	<
935	<	<target name="4jdk7jar"
936	<	depends="4jdk7compile"
937	<	description="Builds library jar from compiled sources">
938	<
909	>	<target name="4jdk7jar" depends="4jdk7compile">
910		<jar destfile="${4jdk7product.jar}">
911		<fileset dir="${build.4jdk7.classes.dir}"/>
912		<manifest>
#	Line 943 | Line 914
914		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
915		</manifest>
916		</jar>
946	–
917		</target>
918
919	<
950	<	<target name="4jdk7-tck"
951	<	depends="4jdk7jar"
952	<	description="Runs tck tests for jsr166-4jdk7 directly">
953	<
919	>	<target name="4jdk7-tck" depends="4jdk7jar">
920		<run-tck-tests
921		target="7"
922		workdir="${build.4jdk7.dir}"
#	Line 973 | Line 939
939		</run-tck-tests>
940		</target>
941
976	–
942		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
943	<	<target name="4jdk7-tck-junit"
979	<	depends="4jdk7compile">
943	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
944
945		<junit printsummary="true"
946		showoutput="true"
#	Line 998 | Line 962
962
963		<test name="${jsr166.tckTestClass}" haltonfailure="no">
964		</test>
1001	–
965		</junit>
966		</target>
967
968	<	<target name="4jdk7-jtreg"
1006	<	depends="4jdk7jar"
1007	<	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"
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	<
977	>	<target name="4jdk7docs">
978		<delete dir="${4jdk7docs.dir}"/>
979		<mkdir dir="${4jdk7docs.dir}"/>
980
#	Line 1041 | Line 995
995		</javadoc>
996		</target>
997
998	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
999
1000	<	<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	<
1000	>	<target name="4jdk7clean">
1001		<delete dir="${build.4jdk7.dir}"/>
1054	–
1002		</target>
1003
1004	<
1058	<	<target name="4jdk7dist-jar"
1059	<	depends="4jdk7clean, 4jdk7jar">
1004	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1005		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1006		</target>
1007
1008	<
1064	<	<target name="4jdk7dist-docs"
1065	<	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 -->
1071	<
1072	<	<target name="jsr166xcompile"
1073	<	depends="configure-compiler"
1074	<	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}"
#	Line 1089 | Line 1029
1029		encoding="ASCII"
1030		executable="${javac7}"
1031		fork="true">
1092	–
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}"/>
1098	–
1037		</javac>
1038		</target>
1039
1040	<
1103	<	<target name="jsr166xjar"
1104	<	depends="jsr166xcompile"
1105	<	description="Builds library jar from compiled sources">
1106	<
1040	>	<target name="jsr166xjar" depends="jsr166xcompile">
1041		<jar destfile="${jsr166x.jar}">
1042		<fileset dir="${build.jsr166x.classes.dir}"/>
1043		<manifest>
#	Line 1111 | Line 1045
1045		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1046		</manifest>
1047		</jar>
1114	–
1048		</target>
1049
1050	<
1118	<	<target name="jsr166xdocs"
1119	<	description="Builds javadocs to dist dir">
1120	<
1050	>	<target name="jsr166xdocs">
1051		<delete dir="${jsr166xdocs.dir}"/>
1052		<mkdir dir="${jsr166xdocs.dir}"/>
1053
#	Line 1132 | Line 1062
1062		failonerror = "true">
1063		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1064		<arg value="-XDignore.symbol.file=true"/>
1135	–
1065		</javadoc>
1066		</target>
1067
1068	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1069
1070	<	<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	<
1070	>	<target name="jsr166xclean">
1071		<delete dir="${build.jsr166x.dir}"/>
1149	–
1072		</target>
1073
1074	<
1153	<	<target name="jsr166xdist-jar"
1154	<	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"
1159	<	depends="jsr166xclean, jsr166xdocs">
1078	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1079		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1080		</target>
1081
1163	–	<!-- jsr166y -->
1082
1083	+	<!-- jsr166y (no longer maintained) -->
1084
1085	<	<target name="jsr166ycompile"
1167	<	depends="configure-compiler"
1168	<	description="Compiles jsr166y sources">
1169	<
1085	>	<target name="jsr166ycompile" depends="configure-compiler">
1086		<mkdir dir="${build.jsr166y.classes.dir}"/>
1087
1088		<javac srcdir="${topsrc.dir}"
#	Line 1189 | Line 1105
1105		<compilerarg value="-Xlint:all"/>
1106		<compilerarg value="-Werror"/>
1107		<compilerarg line="${build.args}"/>
1192	–
1108		</javac>
1109		</target>
1110
1111	<
1197	<	<target name="jsr166yjar"
1198	<	depends="jsr166ycompile"
1199	<	description="Builds library jar from compiled sources">
1200	<
1111	>	<target name="jsr166yjar" depends="jsr166ycompile">
1112		<jar destfile="${jsr166y.jar}" index="true">
1113		<fileset dir="${build.jsr166y.classes.dir}"/>
1114		<manifest>
#	Line 1205 | Line 1116
1116		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1117		</manifest>
1118		</jar>
1208	–
1119		</target>
1120
1121	<
1212	<	<target name="jsr166ydocs"
1213	<	description="Builds javadocs to dist dir">
1214	<
1121	>	<target name="jsr166ydocs">
1122		<delete dir="${jsr166ydocs.dir}"/>
1123		<mkdir dir="${jsr166ydocs.dir}"/>
1124
#	Line 1226 | Line 1133
1133		failonerror = "true">
1134		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1135		<arg value="-XDignore.symbol.file=true"/>
1229	–
1136		</javadoc>
1137		</target>
1138
1139	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1140
1141	<	<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	<
1141	>	<target name="jsr166yclean">
1142		<delete dir="${build.jsr166y.dir}"/>
1243	–
1143		</target>
1144
1145	<
1247	<	<target name="jsr166ydist-jar"
1248	<	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"
1253	<	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 -->
1259	<
1260	<
1261	<	<target name="extra166ycompile"
1262	<	depends="configure-compiler, jsr166yjar"
1263	<	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}"
#	Line 1284 | Line 1176
1176		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1177		<compilerarg value="-Werror"/>
1178		<compilerarg line="${build.args}"/>
1287	–
1179		</javac>
1180		</target>
1181
1182	<
1292	<	<target name="extra166yjar"
1293	<	depends="extra166ycompile"
1294	<	description="Builds library jar from compiled sources">
1295	<
1182	>	<target name="extra166yjar" depends="extra166ycompile">
1183		<jar destfile="${extra166y.jar}" index="true">
1184		<fileset dir="${build.extra166y.classes.dir}"/>
1185		<manifest>
#	Line 1300 | Line 1187
1187		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1188		</manifest>
1189		</jar>
1303	–
1190		</target>
1191
1192	<
1307	<	<target name="extra166ydocs"
1308	<	description="Builds javadocs to build dir">
1309	<
1192	>	<target name="extra166ydocs">
1193		<delete dir="${extra166ydocs.dir}"/>
1194		<mkdir dir="${extra166ydocs.dir}"/>
1195
#	Line 1320 | Line 1203
1203		executable="${javadoc7}">
1204		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1205		<arg value="-XDignore.symbol.file=true"/>
1323	–
1206		</javadoc>
1207		</target>
1208
1209	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1210
1211	<	<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	<
1211	>	<target name="extra166yclean">
1212		<delete dir="${build.extra166y.dir}"/>
1337	–
1213		</target>
1214
1215	<
1341	<	<target name="extra166ydist-jar"
1342	<	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"
1347	<	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"
1357	<	depends="configure-compiler"
1358	<	description="Compiles jsr166e sources">
1359	<
1229	>	<target name="jsr166ecompile" depends="configure-compiler">
1230		<mkdir dir="${build.jsr166e.classes.dir}"/>
1231
1232		<javac srcdir="${topsrc.dir}"
#	Line 1377 | Line 1247
1247		<compilerarg value="-Xlint:all"/>
1248		<compilerarg value="-Werror"/>
1249		<compilerarg line="${build.args}"/>
1380	–
1250		</javac>
1251		</target>
1252
1384	–	<!-- jsr166e: find doclint errors -->
1253		<target name="jsr166edoclint">
1386	–
1254		<mkdir dir="${build.jsr166e.classes.dir}"/>
1255
1256		<javac srcdir="${topsrc.dir}"
#	Line 1405 | Line 1272
1272		<compilerarg value="-Xlint:all"/>
1273		<compilerarg value="-Werror"/>
1274		<compilerarg value="-Xdoclint:all/protected"/>
1408	–
1275		</javac>
1276		</target>
1277
1278	<
1413	<	<target name="jsr166ejar"
1414	<	depends="jsr166ecompile"
1415	<	description="Builds library jar from compiled sources">
1416	<
1278	>	<target name="jsr166ejar" depends="jsr166ecompile">
1279		<jar destfile="${jsr166e.jar}" index="true">
1280		<fileset dir="${build.jsr166e.classes.dir}"/>
1281		<manifest>
#	Line 1421 | Line 1283
1283		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1284		</manifest>
1285		</jar>
1424	–
1286		</target>
1287
1288	<
1428	<	<target name="jsr166edocs"
1429	<	description="Builds javadocs to build dir">
1430	<
1288	>	<target name="jsr166edocs">
1289		<delete dir="${jsr166edocs.dir}"/>
1290		<mkdir dir="${jsr166edocs.dir}"/>
1291
#	Line 1441 | Line 1299
1299		failonerror = "true">
1300		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1301		<arg value="-XDignore.symbol.file=true"/>
1444	–
1302		</javadoc>
1303		</target>
1304
1305	<
1449	<	<target name="jsr166e-tck-one-java-version"
1450	<	depends="jsr166ejar">
1451	<
1305	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1306		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1453	–
1307		<run-tck-tests
1308		tck.src.dir="${test.src.dir}/tck-jsr166e"
1309		target="${build.jsr166e.java.version}"
#	Line 1458 | Line 1311
1311		classes="${jsr166e.jar}"/>
1312		</target>
1313
1314	<	<target name="jsr166e-tck"
1462	<	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"> -->
#	Line 1480 | Line 1332
1332		</antcall>
1333		</target>
1334
1335	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1336
1337	<	<target name="jsr166e-test"
1485	<	depends="jsr166e-tck"
1486	<	description="Runs all tests for jsr166e">
1487	<	</target>
1337	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1338
1339	<	<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">
1339	>	<target name="jsr166eclean">
1340		<delete dir="${build.jsr166e.dir}"/>
1341		</target>
1342
1499	–
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"
1506	<	depends="jsr166eclean, jsr166edocs">
1348	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1349		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1350		</target>
1351
#	Line 1530 | Line 1372
1372		=================================================================== -->
1373		<target name="errorprone"
1374		depends="clean, configure-compiler"
1375	<	description="Run errorprone over jsr166 source code">
1375	>	description="Run errorprone over jsr166 source code (experimental)">
1376
1377		<local name="destdir"/>
1378		<property name="destdir" value="${build.classes.dir}/java.base"/>
#	Line 1560 | Line 1402
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
1405	>	-Xep:IdentityBinaryExpression:WARN
1406		-Xep:MissingOverride:OFF
1407	<	-Xep:MixedArrayDimensions:WARN
1408	<	-Xep:RemoveUnusedImports:ERROR
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"/>
#	Line 1593 | Line 1441
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
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>

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines