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.236 by jsr166, Mon Mar 20 00:03:57 2017 UTC vs.
Revision 1.245 by jsr166, Fri Jun 16 20:50:16 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 234 | Line 232
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}"
#	Line 253 | Line 256
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"/>
259	>	<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
260		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
261		<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
262		<compilerarg line="${build.args}"/>
#	Line 316 | Line 319
319
320		<macrodef name="run-jtreg-tests">
321		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
319	–	<attribute name="source" default="7"/>
322		<attribute name="target"/>
323		<attribute name="workdir"/>
324		<attribute name="classes"/>
#	Line 367 | Line 369
369		<property name="build.main.javac" value="${javac9}"/>
370
371		<target name="dists"
372	<	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
372	>	depends="dist, 4jdk8dist"
373		description="Builds all public jars and docs"/>
374	+	<!--
375	+	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
376	+	-->
377
378		<target name="compile"
379		depends="configure-compiler"
#	Line 405 | Line 410
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
#	Line 450 | Line 456
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"/>
#	Line 457 | 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 505 | Line 513
513
514		<target name="clean"
515		description="Removes all build products">
508	–
516		<delete dir="${build.dir}"/>
510	–
517		</target>
518
519
520		<target name="dist-clean"
521		description="Removes all build and distribution products">
516	–
522		<delete dir="${build.dir}"/>
523		<delete dir="${dist.dir}"/>
519	–
524		</target>
525
526
#	Line 576 | 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">
580	<	</target>
583	>	description="Runs tck and jtreg tests for src/main"/>
584
585		<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
586
#	Line 609 | Line 612
612
613		<target name="configure-compiler">
614		<fail message="ant version too old">
615	<	<condition>
613	<	<not> <antversion atleast="1.9.1"/> </not>
614	<	</condition>
615	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
616		</fail>
617
618		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 657 | Line 658
658		<java classname="ALoops" fork="true">
659		<classpath refid="loops.classpath"/>
660		</java>
660	–
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 682 | Line 682
682		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
683		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
684		<compilerarg line="${build.args}"/>
685	–
685		</javac>
687	–
686		</target>
687
688
#	Line 710 | Line 708
708		encoding="ASCII"
709		executable="${javac8}"
710		fork="true">
713	–
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}"/>
720	–
717		</javac>
718		</target>
719
#	Line 741 | Line 737
737		encoding="ASCII"
738		executable="${javac8}"
739		fork="true">
744	–
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}"/>
751	–
746		</javac>
747		</target>
748
#	Line 764 | Line 758
758		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
759		</manifest>
760		</jar>
767	–
761		</target>
762
763
#	Line 798 | Line 791
791
792		<target name="4jdk8-test"
793		depends="4jdk8-tck, 4jdk8-jtreg"
794	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
802	<	</target>
794	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
795
796
797		<target name="4jdk8docs"
#	Line 815 | Line 807
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">
#	Line 842 | Line 835
835
836		<target name="4jdk8clean"
837		description="Removes all 4jdk8 build products">
845	–
838		<delete dir="${build.4jdk8.dir}"/>
847	–
839		</target>
840
841
#	Line 860 | Line 851
851		</target>
852
853
854	+	<!-- jsr166 4jdk7 (no longer maintained) -->
855
856	<	<!-- jsr166 4jdk7 -->
865	<
866	<	<target name="4jdk7compile"
867	<	depends="configure-compiler"
868	<	description="Compiles src/jdk7 sources, targeting jdk7">
869	<
856	>	<target name="4jdk7compile" depends="configure-compiler">
857		<mkdir dir="${build.4jdk7.classes.dir}"/>
858
859		<javac srcdir="${4jdk7src.dir}"
#	Line 890 | Line 877
877		<compilerarg value="-Xlint:all"/>
878		<compilerarg value="-Werror"/>
879		<compilerarg line="${build.args}"/>
893	–
880		</javac>
881		</target>
882
883	<	<target name="4jdk7doclint"
898	<	depends="configure-compiler"
899	<	description="Finds doclint warnings">
900	<
883	>	<target name="4jdk7doclint" depends="configure-compiler">
884		<mkdir dir="${build.4jdk7.classes.dir}"/>
885
886		<javac srcdir="${4jdk7src.dir}"
#	Line 921 | Line 904
904		<compilerarg value="-Xlint:all"/>
905		<compilerarg value="-Xdoclint:all/protected"/>
906		<compilerarg line="${build.args}"/>
924	–
907		</javac>
908		</target>
909
910	<
929	<	<target name="4jdk7jar"
930	<	depends="4jdk7compile"
931	<	description="Builds library jar from compiled sources">
932	<
910	>	<target name="4jdk7jar" depends="4jdk7compile">
911		<jar destfile="${4jdk7product.jar}">
912		<fileset dir="${build.4jdk7.classes.dir}"/>
913		<manifest>
#	Line 937 | Line 915
915		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
916		</manifest>
917		</jar>
940	–
918		</target>
919
920	<
944	<	<target name="4jdk7-tck"
945	<	depends="4jdk7jar"
946	<	description="Runs tck tests for jsr166-4jdk7 directly">
947	<
920	>	<target name="4jdk7-tck" depends="4jdk7jar">
921		<run-tck-tests
922		target="7"
923		workdir="${build.4jdk7.dir}"
#	Line 967 | Line 940
940		</run-tck-tests>
941		</target>
942
970	–
943		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
944	<	<target name="4jdk7-tck-junit"
973	<	depends="4jdk7compile">
944	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
945
946		<junit printsummary="true"
947		showoutput="true"
#	Line 992 | Line 963
963
964		<test name="${jsr166.tckTestClass}" haltonfailure="no">
965		</test>
995	–
966		</junit>
967		</target>
968
969	<	<target name="4jdk7-jtreg"
1000	<	depends="4jdk7jar"
1001	<	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"
1010	<	depends="4jdk7-tck, 4jdk7-jtreg"
1011	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
1012	<	</target>
1013	<
1014	<
1015	<	<target name="4jdk7docs"
1016	<	description="Builds javadocs for src/jdk7 to dist dir">
1017	<
978	>	<target name="4jdk7docs">
979		<delete dir="${4jdk7docs.dir}"/>
980		<mkdir dir="${4jdk7docs.dir}"/>
981
#	Line 1035 | Line 996
996		</javadoc>
997		</target>
998
999	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1000
1001	<	<target name="4jdk7dist"
1040	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1041	<	description="Puts all distributable products in single hierarchy"/>
1042	<
1043	<
1044	<	<target name="4jdk7clean"
1045	<	description="Removes all 4jdk7 build products">
1046	<
1001	>	<target name="4jdk7clean">
1002		<delete dir="${build.4jdk7.dir}"/>
1048	–
1003		</target>
1004
1005	<
1052	<	<target name="4jdk7dist-jar"
1053	<	depends="4jdk7clean, 4jdk7jar">
1005	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1006		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1007		</target>
1008
1009	<
1058	<	<target name="4jdk7dist-docs"
1059	<	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 -->
1065	<
1066	<	<target name="jsr166xcompile"
1067	<	depends="configure-compiler"
1068	<	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}"
#	Line 1083 | Line 1030
1030		encoding="ASCII"
1031		executable="${javac7}"
1032		fork="true">
1086	–
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}"/>
1092	–
1038		</javac>
1039		</target>
1040
1041	<
1097	<	<target name="jsr166xjar"
1098	<	depends="jsr166xcompile"
1099	<	description="Builds library jar from compiled sources">
1100	<
1041	>	<target name="jsr166xjar" depends="jsr166xcompile">
1042		<jar destfile="${jsr166x.jar}">
1043		<fileset dir="${build.jsr166x.classes.dir}"/>
1044		<manifest>
#	Line 1105 | Line 1046
1046		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1047		</manifest>
1048		</jar>
1108	–
1049		</target>
1050
1051	<
1112	<	<target name="jsr166xdocs"
1113	<	description="Builds javadocs to dist dir">
1114	<
1051	>	<target name="jsr166xdocs">
1052		<delete dir="${jsr166xdocs.dir}"/>
1053		<mkdir dir="${jsr166xdocs.dir}"/>
1054
#	Line 1126 | Line 1063
1063		failonerror = "true">
1064		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1065		<arg value="-XDignore.symbol.file=true"/>
1129	–
1066		</javadoc>
1067		</target>
1068
1069	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1070
1071	<	<target name="jsr166xdist"
1135	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1136	<	description="Puts all distributable products in single hierarchy"/>
1137	<
1138	<
1139	<	<target name="jsr166xclean"
1140	<	description="Removes all jsr166x build products">
1141	<
1071	>	<target name="jsr166xclean">
1072		<delete dir="${build.jsr166x.dir}"/>
1143	–
1073		</target>
1074
1075	<
1147	<	<target name="jsr166xdist-jar"
1148	<	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"
1153	<	depends="jsr166xclean, jsr166xdocs">
1079	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1080		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1081		</target>
1082
1157	–	<!-- jsr166y -->
1158	–
1083
1084	<	<target name="jsr166ycompile"
1161	<	depends="configure-compiler"
1162	<	description="Compiles jsr166y sources">
1084	>	<!-- jsr166y (no longer maintained) -->
1085
1086	+	<target name="jsr166ycompile" depends="configure-compiler">
1087		<mkdir dir="${build.jsr166y.classes.dir}"/>
1088
1089		<javac srcdir="${topsrc.dir}"
#	Line 1183 | Line 1106
1106		<compilerarg value="-Xlint:all"/>
1107		<compilerarg value="-Werror"/>
1108		<compilerarg line="${build.args}"/>
1186	–
1109		</javac>
1110		</target>
1111
1112	<
1191	<	<target name="jsr166yjar"
1192	<	depends="jsr166ycompile"
1193	<	description="Builds library jar from compiled sources">
1194	<
1112	>	<target name="jsr166yjar" depends="jsr166ycompile">
1113		<jar destfile="${jsr166y.jar}" index="true">
1114		<fileset dir="${build.jsr166y.classes.dir}"/>
1115		<manifest>
#	Line 1199 | Line 1117
1117		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1118		</manifest>
1119		</jar>
1202	–
1120		</target>
1121
1122	<
1206	<	<target name="jsr166ydocs"
1207	<	description="Builds javadocs to dist dir">
1208	<
1122	>	<target name="jsr166ydocs">
1123		<delete dir="${jsr166ydocs.dir}"/>
1124		<mkdir dir="${jsr166ydocs.dir}"/>
1125
#	Line 1220 | Line 1134
1134		failonerror = "true">
1135		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1136		<arg value="-XDignore.symbol.file=true"/>
1223	–
1137		</javadoc>
1138		</target>
1139
1140	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1141
1142	<	<target name="jsr166ydist"
1229	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1230	<	description="Puts all distributable products in single hierarchy"/>
1231	<
1232	<
1233	<	<target name="jsr166yclean"
1234	<	description="Removes all jsr166y build products">
1235	<
1142	>	<target name="jsr166yclean">
1143		<delete dir="${build.jsr166y.dir}"/>
1237	–
1144		</target>
1145
1146	<
1241	<	<target name="jsr166ydist-jar"
1242	<	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"
1247	<	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 -->
1253	<
1254	<
1255	<	<target name="extra166ycompile"
1256	<	depends="configure-compiler, jsr166yjar"
1257	<	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}"
#	Line 1278 | Line 1177
1177		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1178		<compilerarg value="-Werror"/>
1179		<compilerarg line="${build.args}"/>
1281	–
1180		</javac>
1181		</target>
1182
1183	<
1286	<	<target name="extra166yjar"
1287	<	depends="extra166ycompile"
1288	<	description="Builds library jar from compiled sources">
1289	<
1183	>	<target name="extra166yjar" depends="extra166ycompile">
1184		<jar destfile="${extra166y.jar}" index="true">
1185		<fileset dir="${build.extra166y.classes.dir}"/>
1186		<manifest>
#	Line 1294 | Line 1188
1188		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1189		</manifest>
1190		</jar>
1297	–
1191		</target>
1192
1193	<
1301	<	<target name="extra166ydocs"
1302	<	description="Builds javadocs to build dir">
1303	<
1193	>	<target name="extra166ydocs">
1194		<delete dir="${extra166ydocs.dir}"/>
1195		<mkdir dir="${extra166ydocs.dir}"/>
1196
#	Line 1314 | Line 1204
1204		executable="${javadoc7}">
1205		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1206		<arg value="-XDignore.symbol.file=true"/>
1317	–
1207		</javadoc>
1208		</target>
1209
1210	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1211
1212	<	<target name="extra166ydist"
1323	<	depends="extra166ydist-jar, extra166ydist-docs"
1324	<	description="Puts all distributable products in single hierarchy"/>
1325	<
1326	<
1327	<	<target name="extra166yclean"
1328	<	description="Removes all extra166y build products">
1329	<
1212	>	<target name="extra166yclean">
1213		<delete dir="${build.extra166y.dir}"/>
1331	–
1214		</target>
1215
1216	<
1335	<	<target name="extra166ydist-jar"
1336	<	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"
1341	<	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"
1351	<	depends="configure-compiler"
1352	<	description="Compiles jsr166e sources">
1353	<
1230	>	<target name="jsr166ecompile" depends="configure-compiler">
1231		<mkdir dir="${build.jsr166e.classes.dir}"/>
1232
1233		<javac srcdir="${topsrc.dir}"
#	Line 1371 | Line 1248
1248		<compilerarg value="-Xlint:all"/>
1249		<compilerarg value="-Werror"/>
1250		<compilerarg line="${build.args}"/>
1374	–
1251		</javac>
1252		</target>
1253
1378	–	<!-- jsr166e: find doclint errors -->
1254		<target name="jsr166edoclint">
1380	–
1255		<mkdir dir="${build.jsr166e.classes.dir}"/>
1256
1257		<javac srcdir="${topsrc.dir}"
#	Line 1399 | Line 1273
1273		<compilerarg value="-Xlint:all"/>
1274		<compilerarg value="-Werror"/>
1275		<compilerarg value="-Xdoclint:all/protected"/>
1402	–
1276		</javac>
1277		</target>
1278
1279	<
1407	<	<target name="jsr166ejar"
1408	<	depends="jsr166ecompile"
1409	<	description="Builds library jar from compiled sources">
1410	<
1279	>	<target name="jsr166ejar" depends="jsr166ecompile">
1280		<jar destfile="${jsr166e.jar}" index="true">
1281		<fileset dir="${build.jsr166e.classes.dir}"/>
1282		<manifest>
#	Line 1415 | Line 1284
1284		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1285		</manifest>
1286		</jar>
1418	–
1287		</target>
1288
1289	<
1422	<	<target name="jsr166edocs"
1423	<	description="Builds javadocs to build dir">
1424	<
1289	>	<target name="jsr166edocs">
1290		<delete dir="${jsr166edocs.dir}"/>
1291		<mkdir dir="${jsr166edocs.dir}"/>
1292
#	Line 1435 | Line 1300
1300		failonerror = "true">
1301		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1302		<arg value="-XDignore.symbol.file=true"/>
1438	–
1303		</javadoc>
1304		</target>
1305
1306	<
1443	<	<target name="jsr166e-tck-one-java-version"
1444	<	depends="jsr166ejar">
1445	<
1306	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1307		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1447	–
1308		<run-tck-tests
1309		tck.src.dir="${test.src.dir}/tck-jsr166e"
1310		target="${build.jsr166e.java.version}"
#	Line 1452 | Line 1312
1312		classes="${jsr166e.jar}"/>
1313		</target>
1314
1315	<	<target name="jsr166e-tck"
1456	<	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"> -->
#	Line 1474 | Line 1333
1333		</antcall>
1334		</target>
1335
1336	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1337
1338	<	<target name="jsr166e-test"
1479	<	depends="jsr166e-tck"
1480	<	description="Runs all tests for jsr166e">
1481	<	</target>
1338	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1339
1340	<	<target name="jsr166edist"
1484	<	depends="jsr166edist-jar, jsr166edist-docs"
1485	<	description="Puts all distributable products in single hierarchy"/>
1486	<
1487	<
1488	<	<target name="jsr166eclean"
1489	<	description="Removes all jsr166e build products">
1340	>	<target name="jsr166eclean">
1341		<delete dir="${build.jsr166e.dir}"/>
1342		</target>
1343
1493	–
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"
1500	<	depends="jsr166eclean, jsr166edocs">
1349	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1350		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1351		</target>
1352
#	Line 1524 | Line 1373
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"/>
#	Line 1554 | Line 1403
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"/>
#	Line 1587 | Line 1442
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>

Diff Legend

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