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.232 by jsr166, Wed Feb 1 18:26:31 2017 UTC vs.
Revision 1.241 by jsr166, Mon Mar 27 02:11:26 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" 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
#	Line 265 | Line 269
269		jvm="${java@{target}}"
270		fork="true">
271		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
272	<	<jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
273	<	<jvmarg line="--add-opens java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
274	<	<jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
275	<	<jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
276	<	<jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
277	<	<jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
272	>	<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
273	>	<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
274	>	<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
275	>	<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
276	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
277	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
278		<jvmarg line="@{jvmflags}"/>
279		<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
280		<jvmarg line="${vmoptions}" if:set="vmoptions"/>
#	Line 366 | Line 370
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"
#	Line 400 | Line 407
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 value="-Werror"/>
415	<	<compilerarg value="-Xdoclint:all/protected"/>
415	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
416		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
417		<compilerarg line="${build.args}"/>
418
#	Line 456 | Line 463
463		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
464		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
465		<arg value="-XDignore.symbol.file=true"/>
466	<	<arg value="-Xmodule:java.base"/>
466	>	<arg value="--patch-module=java.base=${src.dir}"/>
467		<arg value="-tag"/>
468		<arg value="${javadoc.jls.option}"/>
469		<!-- @apiNote currently unused -->
#	Line 504 | Line 511
511
512		<target name="clean"
513		description="Removes all build products">
507	–
514		<delete dir="${build.dir}"/>
509	–
515		</target>
516
517
518		<target name="dist-clean"
519		description="Removes all build and distribution products">
515	–
520		<delete dir="${build.dir}"/>
521		<delete dir="${dist.dir}"/>
518	–
522		</target>
523
524
#	Line 536 | Line 539
539		<run-tck-tests
540		target="${build.main.java.version}"
541		workdir="${build.dir}"
542	<	classes="${product.jar}"/>
542	>	classes="${product.jar}">
543	>	<javac-elements>
544	>	<compilerarg value="-Werror"/>
545	>	</javac-elements>
546	>	</run-tck-tests>
547		</target>
548
549		<target name="tck-parallelism-1"
#	Line 571 | Line 578
578
579		<target name="test"
580		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
581	<	description="Runs tck and jtreg tests for src/main">
575	<	</target>
581	>	description="Runs tck and jtreg tests for src/main"/>
582
583		<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
584
#	Line 604 | Line 610
610
611		<target name="configure-compiler">
612		<fail message="ant version too old">
613	<	<condition>
608	<	<not> <antversion atleast="1.9.1"/> </not>
609	<	</condition>
613	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
614		</fail>
615
616		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 652 | Line 656
656		<java classname="ALoops" fork="true">
657		<classpath refid="loops.classpath"/>
658		</java>
655	–
659		</target>
660
661
662		<target name="compile-test-loops" depends="jar"
663	<	description="compile all the perf tests in src/test/loops">
663	>	description="Compiles all the perf tests in src/test/loops">
664
665		<mkdir dir="${build.dir}/test/loops"/>
666
#	Line 677 | Line 680
680		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
681		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
682		<compilerarg line="${build.args}"/>
680	–
683		</javac>
682	–
684		</target>
685
686
#	Line 705 | Line 706
706		encoding="ASCII"
707		executable="${javac8}"
708		fork="true">
708	–
709		<include name="**/*.java"/>
710		<compilerarg value="-Xprefer:source"/>
711		<compilerarg value="-XDignore.symbol.file=true"/>
712		<compilerarg value="-Xlint:all"/>
713		<compilerarg value="-Werror"/>
714		<compilerarg line="${build.args}"/>
715	–
715		</javac>
716		</target>
717
#	Line 736 | Line 735
735		encoding="ASCII"
736		executable="${javac8}"
737		fork="true">
739	–
738		<include name="**/*.java"/>
739		<compilerarg value="-Xprefer:source"/>
740		<compilerarg value="-XDignore.symbol.file=true"/>
741		<compilerarg value="-Xlint:all"/>
742	<	<compilerarg value="-Xdoclint:all/protected"/>
742	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
743		<compilerarg line="${build.args}"/>
746	–
744		</javac>
745		</target>
746
#	Line 759 | Line 756
756		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
757		</manifest>
758		</jar>
762	–
759		</target>
760
761
#	Line 775 | Line 771
771		<!-- JDK9+ test classes -->
772		<exclude name="*9Test.java"/>
773		<exclude name="*10Test.java"/>
774	+	<compilerarg value="-Werror"/>
775		</javac-elements>
776		</run-tck-tests>
777		</target>
#	Line 792 | Line 789
789
790		<target name="4jdk8-test"
791		depends="4jdk8-tck, 4jdk8-jtreg"
792	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
796	<	</target>
792	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
793
794
795		<target name="4jdk8docs"
#	Line 836 | Line 832
832
833		<target name="4jdk8clean"
834		description="Removes all 4jdk8 build products">
839	–
835		<delete dir="${build.4jdk8.dir}"/>
841	–
836		</target>
837
838
#	Line 854 | Line 848
848		</target>
849
850
851	+	<!-- jsr166 4jdk7 (no longer maintained) -->
852
853	<	<!-- jsr166 4jdk7 -->
859	<
860	<	<target name="4jdk7compile"
861	<	depends="configure-compiler"
862	<	description="Compiles src/jdk7 sources, targeting jdk7">
863	<
853	>	<target name="4jdk7compile" depends="configure-compiler">
854		<mkdir dir="${build.4jdk7.classes.dir}"/>
855
856		<javac srcdir="${4jdk7src.dir}"
#	Line 884 | Line 874
874		<compilerarg value="-Xlint:all"/>
875		<compilerarg value="-Werror"/>
876		<compilerarg line="${build.args}"/>
887	–
877		</javac>
878		</target>
879
880	<	<target name="4jdk7doclint"
892	<	depends="configure-compiler"
893	<	description="Finds doclint warnings">
894	<
880	>	<target name="4jdk7doclint" depends="configure-compiler">
881		<mkdir dir="${build.4jdk7.classes.dir}"/>
882
883		<javac srcdir="${4jdk7src.dir}"
#	Line 915 | Line 901
901		<compilerarg value="-Xlint:all"/>
902		<compilerarg value="-Xdoclint:all/protected"/>
903		<compilerarg line="${build.args}"/>
918	–
904		</javac>
905		</target>
906
907	<
923	<	<target name="4jdk7jar"
924	<	depends="4jdk7compile"
925	<	description="Builds library jar from compiled sources">
926	<
907	>	<target name="4jdk7jar" depends="4jdk7compile">
908		<jar destfile="${4jdk7product.jar}">
909		<fileset dir="${build.4jdk7.classes.dir}"/>
910		<manifest>
#	Line 931 | Line 912
912		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
913		</manifest>
914		</jar>
934	–
915		</target>
916
917	<
938	<	<target name="4jdk7-tck"
939	<	depends="4jdk7jar"
940	<	description="Runs tck tests for jsr166-4jdk7 directly">
941	<
917	>	<target name="4jdk7-tck" depends="4jdk7jar">
918		<run-tck-tests
919		target="7"
920		workdir="${build.4jdk7.dir}"
#	Line 956 | Line 932
932		<exclude name="SplittableRandomTest.java"/>
933		<exclude name="StampedLockTest.java"/>
934		<exclude name="SubmissionPublisherTest.java"/>
935	+	<compilerarg value="-Werror"/>
936		</javac-elements>
937		</run-tck-tests>
938		</target>
939
963	–
940		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
941	<	<target name="4jdk7-tck-junit"
966	<	depends="4jdk7compile">
941	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
942
943		<junit printsummary="true"
944		showoutput="true"
#	Line 985 | Line 960
960
961		<test name="${jsr166.tckTestClass}" haltonfailure="no">
962		</test>
988	–
963		</junit>
964		</target>
965
966	<	<target name="4jdk7-jtreg"
993	<	depends="4jdk7jar"
994	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
966	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
967		<run-jtreg-tests
968		target="7"
969		workdir="${build.4jdk7.dir}"
970		classes="${4jdk7product.jar}"/>
971		</target>
972
973	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
974
975	<	<target name="4jdk7-test"
1003	<	depends="4jdk7-tck, 4jdk7-jtreg"
1004	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
1005	<	</target>
1006	<
1007	<
1008	<	<target name="4jdk7docs"
1009	<	description="Builds javadocs for src/jdk7 to dist dir">
1010	<
975	>	<target name="4jdk7docs">
976		<delete dir="${4jdk7docs.dir}"/>
977		<mkdir dir="${4jdk7docs.dir}"/>
978
#	Line 1028 | Line 993
993		</javadoc>
994		</target>
995
996	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
997
998	<	<target name="4jdk7dist"
1033	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1034	<	description="Puts all distributable products in single hierarchy"/>
1035	<
1036	<
1037	<	<target name="4jdk7clean"
1038	<	description="Removes all 4jdk7 build products">
1039	<
998	>	<target name="4jdk7clean">
999		<delete dir="${build.4jdk7.dir}"/>
1041	–
1000		</target>
1001
1002	<
1045	<	<target name="4jdk7dist-jar"
1046	<	depends="4jdk7clean, 4jdk7jar">
1002	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1003		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1004		</target>
1005
1006	<
1051	<	<target name="4jdk7dist-docs"
1052	<	depends="4jdk7clean, 4jdk7docs">
1006	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1007		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1008		</target>
1009
1010
1011	<	<!-- jsr166x -->
1058	<
1059	<	<target name="jsr166xcompile"
1060	<	depends="configure-compiler"
1061	<	description="Compiles jsr166x sources to build dir">
1011	>	<!-- jsr166x (no longer maintained) -->
1012
1013	+	<target name="jsr166xcompile" depends="configure-compiler">
1014		<mkdir dir="${build.jsr166x.classes.dir}"/>
1015
1016		<javac srcdir="${topsrc.dir}"
#	Line 1076 | Line 1027
1027		encoding="ASCII"
1028		executable="${javac7}"
1029		fork="true">
1079	–
1030		<include name="jsr166x/**/*.java"/>
1031		<compilerarg value="-XDignore.symbol.file=true"/>
1032		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1033		<compilerarg value="-Werror"/>
1034		<compilerarg line="${build.args}"/>
1085	–
1035		</javac>
1036		</target>
1037
1038	<
1090	<	<target name="jsr166xjar"
1091	<	depends="jsr166xcompile"
1092	<	description="Builds library jar from compiled sources">
1093	<
1038	>	<target name="jsr166xjar" depends="jsr166xcompile">
1039		<jar destfile="${jsr166x.jar}">
1040		<fileset dir="${build.jsr166x.classes.dir}"/>
1041		<manifest>
#	Line 1098 | Line 1043
1043		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1044		</manifest>
1045		</jar>
1101	–
1046		</target>
1047
1048	<
1105	<	<target name="jsr166xdocs"
1106	<	description="Builds javadocs to dist dir">
1107	<
1048	>	<target name="jsr166xdocs">
1049		<delete dir="${jsr166xdocs.dir}"/>
1050		<mkdir dir="${jsr166xdocs.dir}"/>
1051
#	Line 1119 | Line 1060
1060		failonerror = "true">
1061		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1062		<arg value="-XDignore.symbol.file=true"/>
1122	–
1063		</javadoc>
1064		</target>
1065
1066	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1067
1068	<	<target name="jsr166xdist"
1128	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1129	<	description="Puts all distributable products in single hierarchy"/>
1130	<
1131	<
1132	<	<target name="jsr166xclean"
1133	<	description="Removes all jsr166x build products">
1134	<
1068	>	<target name="jsr166xclean">
1069		<delete dir="${build.jsr166x.dir}"/>
1136	–
1070		</target>
1071
1072	<
1140	<	<target name="jsr166xdist-jar"
1141	<	depends="jsr166xclean, jsr166xjar">
1072	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1073		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1074		</target>
1075
1076	<	<target name="jsr166xdist-docs"
1146	<	depends="jsr166xclean, jsr166xdocs">
1076	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1077		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1078		</target>
1079
1150	–	<!-- jsr166y -->
1080
1081	+	<!-- jsr166y (no longer maintained) -->
1082
1083	<	<target name="jsr166ycompile"
1154	<	depends="configure-compiler"
1155	<	description="Compiles jsr166y sources">
1156	<
1083	>	<target name="jsr166ycompile" depends="configure-compiler">
1084		<mkdir dir="${build.jsr166y.classes.dir}"/>
1085
1086		<javac srcdir="${topsrc.dir}"
#	Line 1176 | Line 1103
1103		<compilerarg value="-Xlint:all"/>
1104		<compilerarg value="-Werror"/>
1105		<compilerarg line="${build.args}"/>
1179	–
1106		</javac>
1107		</target>
1108
1109	<
1184	<	<target name="jsr166yjar"
1185	<	depends="jsr166ycompile"
1186	<	description="Builds library jar from compiled sources">
1187	<
1109	>	<target name="jsr166yjar" depends="jsr166ycompile">
1110		<jar destfile="${jsr166y.jar}" index="true">
1111		<fileset dir="${build.jsr166y.classes.dir}"/>
1112		<manifest>
#	Line 1192 | Line 1114
1114		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1115		</manifest>
1116		</jar>
1195	–
1117		</target>
1118
1119	<
1199	<	<target name="jsr166ydocs"
1200	<	description="Builds javadocs to dist dir">
1201	<
1119	>	<target name="jsr166ydocs">
1120		<delete dir="${jsr166ydocs.dir}"/>
1121		<mkdir dir="${jsr166ydocs.dir}"/>
1122
#	Line 1213 | Line 1131
1131		failonerror = "true">
1132		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1133		<arg value="-XDignore.symbol.file=true"/>
1216	–
1134		</javadoc>
1135		</target>
1136
1137	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1138
1139	<	<target name="jsr166ydist"
1222	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1223	<	description="Puts all distributable products in single hierarchy"/>
1224	<
1225	<
1226	<	<target name="jsr166yclean"
1227	<	description="Removes all jsr166y build products">
1228	<
1139	>	<target name="jsr166yclean">
1140		<delete dir="${build.jsr166y.dir}"/>
1230	–
1141		</target>
1142
1143	<
1234	<	<target name="jsr166ydist-jar"
1235	<	depends="jsr166yclean, jsr166yjar">
1143	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1144		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1145		</target>
1146
1147	<	<target name="jsr166ydist-docs"
1240	<	depends="jsr166yclean, jsr166ydocs">
1147	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1148		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1149		</target>
1150
1151
1152	<	<!-- extra166y -->
1246	<
1247	<
1248	<	<target name="extra166ycompile"
1249	<	depends="configure-compiler, jsr166yjar"
1250	<	description="Compiles extra166y sources">
1152	>	<!-- extra166y (no longer maintained) -->
1153
1154	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1155		<mkdir dir="${build.extra166y.classes.dir}"/>
1156
1157		<javac srcdir="${topsrc.dir}"
#	Line 1271 | Line 1174
1174		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1175		<compilerarg value="-Werror"/>
1176		<compilerarg line="${build.args}"/>
1274	–
1177		</javac>
1178		</target>
1179
1180	<
1279	<	<target name="extra166yjar"
1280	<	depends="extra166ycompile"
1281	<	description="Builds library jar from compiled sources">
1282	<
1180	>	<target name="extra166yjar" depends="extra166ycompile">
1181		<jar destfile="${extra166y.jar}" index="true">
1182		<fileset dir="${build.extra166y.classes.dir}"/>
1183		<manifest>
#	Line 1287 | Line 1185
1185		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1186		</manifest>
1187		</jar>
1290	–
1188		</target>
1189
1190	<
1294	<	<target name="extra166ydocs"
1295	<	description="Builds javadocs to build dir">
1296	<
1190	>	<target name="extra166ydocs">
1191		<delete dir="${extra166ydocs.dir}"/>
1192		<mkdir dir="${extra166ydocs.dir}"/>
1193
#	Line 1307 | Line 1201
1201		executable="${javadoc7}">
1202		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1203		<arg value="-XDignore.symbol.file=true"/>
1310	–
1204		</javadoc>
1205		</target>
1206
1207	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1208
1209	<	<target name="extra166ydist"
1316	<	depends="extra166ydist-jar, extra166ydist-docs"
1317	<	description="Puts all distributable products in single hierarchy"/>
1318	<
1319	<
1320	<	<target name="extra166yclean"
1321	<	description="Removes all extra166y build products">
1322	<
1209	>	<target name="extra166yclean">
1210		<delete dir="${build.extra166y.dir}"/>
1324	–
1211		</target>
1212
1213	<
1328	<	<target name="extra166ydist-jar"
1329	<	depends="extra166yclean, extra166yjar">
1213	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1214		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1215		</target>
1216
1217	<	<target name="extra166ydist-docs"
1334	<	depends="extra166yclean, extra166ydocs">
1217	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1218		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1219		</target>
1220
1221	<	<!-- jsr166e -->
1221	>
1222	>	<!-- jsr166e (no longer maintained) -->
1223
1224		<property name="build.jsr166e.java.version" value="6"/>
1225		<property name="build.jsr166e.javac" value="${javac6}"/>
1226
1227	<	<target name="jsr166ecompile"
1344	<	depends="configure-compiler"
1345	<	description="Compiles jsr166e sources">
1346	<
1227	>	<target name="jsr166ecompile" depends="configure-compiler">
1228		<mkdir dir="${build.jsr166e.classes.dir}"/>
1229
1230		<javac srcdir="${topsrc.dir}"
#	Line 1364 | Line 1245
1245		<compilerarg value="-Xlint:all"/>
1246		<compilerarg value="-Werror"/>
1247		<compilerarg line="${build.args}"/>
1367	–
1248		</javac>
1249		</target>
1250
1371	–	<!-- jsr166e: find doclint errors -->
1251		<target name="jsr166edoclint">
1373	–
1252		<mkdir dir="${build.jsr166e.classes.dir}"/>
1253
1254		<javac srcdir="${topsrc.dir}"
#	Line 1392 | Line 1270
1270		<compilerarg value="-Xlint:all"/>
1271		<compilerarg value="-Werror"/>
1272		<compilerarg value="-Xdoclint:all/protected"/>
1395	–
1273		</javac>
1274		</target>
1275
1276	<
1400	<	<target name="jsr166ejar"
1401	<	depends="jsr166ecompile"
1402	<	description="Builds library jar from compiled sources">
1403	<
1276	>	<target name="jsr166ejar" depends="jsr166ecompile">
1277		<jar destfile="${jsr166e.jar}" index="true">
1278		<fileset dir="${build.jsr166e.classes.dir}"/>
1279		<manifest>
#	Line 1408 | Line 1281
1281		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1282		</manifest>
1283		</jar>
1411	–
1284		</target>
1285
1286	<
1415	<	<target name="jsr166edocs"
1416	<	description="Builds javadocs to build dir">
1417	<
1286	>	<target name="jsr166edocs">
1287		<delete dir="${jsr166edocs.dir}"/>
1288		<mkdir dir="${jsr166edocs.dir}"/>
1289
#	Line 1428 | Line 1297
1297		failonerror = "true">
1298		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1299		<arg value="-XDignore.symbol.file=true"/>
1431	–
1300		</javadoc>
1301		</target>
1302
1303	<
1436	<	<target name="jsr166e-tck-one-java-version"
1437	<	depends="jsr166ejar">
1438	<
1303	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1304		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1440	–
1305		<run-tck-tests
1306		tck.src.dir="${test.src.dir}/tck-jsr166e"
1307		target="${build.jsr166e.java.version}"
#	Line 1445 | Line 1309
1309		classes="${jsr166e.jar}"/>
1310		</target>
1311
1312	<	<target name="jsr166e-tck"
1449	<	description="Runs tck tests for jsr166e for multiple java versions">
1312	>	<target name="jsr166e-tck">
1313
1314		<!--     <antcall target="clean"/> -->
1315		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1467 | Line 1330
1330		</antcall>
1331		</target>
1332
1333	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1334
1335	<	<target name="jsr166e-test"
1472	<	depends="jsr166e-tck"
1473	<	description="Runs all tests for jsr166e">
1474	<	</target>
1475	<
1476	<	<target name="jsr166edist"
1477	<	depends="jsr166edist-jar, jsr166edist-docs"
1478	<	description="Puts all distributable products in single hierarchy"/>
1479	<
1335	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1336
1337	<	<target name="jsr166eclean"
1482	<	description="Removes all jsr166e build products">
1337	>	<target name="jsr166eclean">
1338		<delete dir="${build.jsr166e.dir}"/>
1339		</target>
1340
1486	–
1341		<target name="jsr166edist-jar"
1342		depends="jsr166eclean, jsr166ejar">
1343		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1344		</target>
1345
1346	<	<target name="jsr166edist-docs"
1493	<	depends="jsr166eclean, jsr166edocs">
1346	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1347		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1348		</target>
1349
#	Line 1510 | Line 1363
1363		</antcall>
1364		</target>
1365
1366	+
1367	+	<!-- ==============================================================
1368	+	Experimental errorprone support - http://errorprone.info
1369	+	You may need to bring your own errorprone jar.
1370	+	=================================================================== -->
1371	+	<target name="errorprone"
1372	+	depends="clean, configure-compiler"
1373	+	description="Run errorprone over jsr166 source code (experimental)">
1374	+
1375	+	<local name="destdir"/>
1376	+	<property name="destdir" value="${build.classes.dir}/java.base"/>
1377	+	<mkdir dir="${destdir}"/>
1378	+
1379	+	<javac srcdir="${src.dir}"
1380	+	destdir="${destdir}"
1381	+	debug="${build.debug}"
1382	+	debuglevel="${build.debuglevel}"
1383	+	deprecation="${build.deprecation}"
1384	+	classpath=""
1385	+	includeAntRuntime="false"
1386	+	includeJavaRuntime="false"
1387	+	encoding="ASCII"
1388	+	executable="${build.main.javac}"
1389	+	fork="true">
1390	+
1391	+	<include name="**/*.java"/>
1392	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1393	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1394	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1395	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1396	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1397	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1398	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1399	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1400	+	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1401	+	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1402	+	<compilerarg value="-Xplugin:ErrorProne
1403	+	-Xep:IdentityBinaryExpression:WARN
1404	+	-Xep:MissingOverride:OFF
1405	+	-Xep:MixedArrayDimensions:WARN
1406	+	-Xep:RemoveUnusedImports:ERROR
1407	+	-Xep:MethodCanBeStatic:WARN"/>
1408	+	<compilerarg value="--patch-module=java.base=${src.dir}"/>
1409	+	<compilerarg value="-Xprefer:source"/>
1410	+	<compilerarg value="-XDignore.symbol.file=true"/>
1411	+	<compilerarg value="-Xlint:all"/>
1412	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
1413	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1414	+	<compilerarg line="${build.args}"/>
1415	+	</javac>
1416	+
1417	+	<jar destfile="${product.jar}">
1418	+	<fileset dir="${destdir}"/>
1419	+	</jar>
1420	+
1421	+	<run-tck-tests
1422	+	target="${build.main.java.version}"
1423	+	workdir="${build.dir}"
1424	+	classes="${product.jar}">
1425	+	<javac-elements>
1426	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1427	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1428	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1429	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1430	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1431	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1432	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1433	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1434	+	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1435	+	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1436	+	<compilerarg value="-Xplugin:ErrorProne
1437	+	-Xep:IdentityBinaryExpression:WARN
1438	+	-Xep:BoxedPrimitiveConstructor:OFF
1439	+	-Xep:HashtableContains:OFF
1440	+	-Xep:ModifyingCollectionWithItself:OFF
1441	+	-Xep:MissingOverride:OFF
1442	+	-Xep:MixedArrayDimensions:WARN
1443	+	-Xep:RemoveUnusedImports:ERROR
1444	+	-Xep:MethodCanBeStatic:WARN"/>
1445	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1446	+	</javac-elements>
1447	+	</run-tck-tests>
1448	+	</target>
1449	+
1450	+
1451		<!-- ==============================================================
1452		Running guava tests against jsr166 code
1453		=================================================================== -->

Diff Legend

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