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.224 by jsr166, Thu Nov 24 01:58:04 2016 UTC vs.
Revision 1.244 by jsr166, Wed May 17 00:17:49 2017 UTC

#	Line 1 | Line 1
1		<project name="jsr166" default="usage"
2	<	xmlns:if="ant:if" xmlns:unless="ant:unless">
2	>	xmlns:if="ant:if" xmlns:unless="ant:unless"
3	>	xmlns:ivy="antlib:org.apache.ivy.ant">
4
5		<description>
6		------------------------------------------------------------------------------
#	Line 17 | 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:
20	–	$HOME/jdk/jdk6
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
25	–	$HOME/jdk/src/jdk6
26	–	$HOME/jdk/src/jdk7
25		$HOME/jdk/src/jdk8
26		$HOME/jdk/src/jdk9
27	+	$HOME/jdk/src/jdk10
28		where each of the above is a complete JDK source tree
29		(e.g. mercurial forest) or a symlink to same.
30
31		Alternatively, define ant variables thus:
32		ant -Djdk$N.home=... -Djdk$N.src.home=...
33	<	for $N in 6 7 8 9 ...
33	>	for $N in 8 9 10 ...
34
35	<	As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37	<	target is currently broken.
35	>	As of 2016-03, the sources in src/main are for jdk9+ only.
36		------------------------------------------------------------------------------
37		</description>
38
#	Line 133 | Line 131
131		<defjdklocations v="7"/>
132		<defjdklocations v="8"/>
133		<defjdklocations v="9"/>
134	+	<defjdklocations v="10"/>
135
136		<!-- Source locations -->
137		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 142 | Line 141
141		<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
142		<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
143		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
144	+	<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
145		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
146		<property name="lib.dir"              location="${basedir}/lib"/>
147		<property name="dist.dir"             location="${basedir}/dist"/>
#	Line 232 | 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 251 | 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=${build.classes.dir}/java.base" if:set="modules"/>
261	>	<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
262		<compilerarg line="${build.args}"/>
263		<javac-elements/>
264
#	Line 263 | 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=${build.classes.dir}/java.base" 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 294 | Line 305
305		<fileset dir="${jtreg8.src.dir}">
306		<patternset id="jdk8.jtreg.tests">
307		<include name="**/*.java"/>
297	–	<exclude name="**/SpliteratorCharacteristics.java"/>
298	–	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
299	–	<exclude name="**/GCDuringIteration.java"/>
308		</patternset>
309		</fileset>
310
#	Line 333 | Line 341
341		workDir="@{workdir}/JTwork">
342		<patternset refid="jdk@{target}.jtreg.tests"/>
343		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
344	<	<arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
345	<	<arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
344	>	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
345	>	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
346		<arg value="-agentvm"/>
347		<arg value="-noreport"/>
348		<arg value="-verbose:${jtreg.verbose}"/>
#	Line 362 | 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 396 | 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 line="--doclint-format html5"/>
415	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
416		<compilerarg value="-Werror"/>
404	–	<compilerarg value="-Xdoclint:all/protected"/>
417		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
418		<compilerarg line="${build.args}"/>
419
#	Line 433 | Line 445
445		<!-- the packagenames="none" hack below prevents scanning the -->
446		<!-- sourcepath for packages -->
447
448	<	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
449	<	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
448	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
449	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
450	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
451	>	<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
452	>	<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
453		<javadoc destdir="${docs.dir}"
454		packagenames="none"
455		link="${java9.api.url}"
#	Line 442 | Line 457
457		access="${build.javadoc.access}"
458		sourcepath="${src.dir}"
459		classpath=""
460	+	source="9"
461		executable="${javadoc9}">
462		<fileset dir="${src.dir}" defaultexcludes="yes">
463		<include name="**/*.java"/>
#	Line 449 | Line 465
465		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
466		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
467		<arg value="-XDignore.symbol.file=true"/>
468	<	<arg value="-Xmodule:java.base"/>
468	>	<arg value="-html5"/>
469	>	<arg value="--patch-module=java.base=${src.dir}"/>
470		<arg value="-tag"/>
471		<arg value="${javadoc.jls.option}"/>
472		<!-- @apiNote currently unused -->
#	Line 497 | Line 514
514
515		<target name="clean"
516		description="Removes all build products">
500	–
517		<delete dir="${build.dir}"/>
502	–
518		</target>
519
520
521		<target name="dist-clean"
522		description="Removes all build and distribution products">
508	–
523		<delete dir="${build.dir}"/>
524		<delete dir="${dist.dir}"/>
511	–
525		</target>
526
527
#	Line 529 | Line 542
542		<run-tck-tests
543		target="${build.main.java.version}"
544		workdir="${build.dir}"
545	<	classes="${product.jar}"/>
545	>	classes="${product.jar}">
546	>	<javac-elements>
547	>	<compilerarg value="-Werror"/>
548	>	</javac-elements>
549	>	</run-tck-tests>
550		</target>
551
552		<target name="tck-parallelism-1"
#	Line 564 | Line 581
581
582		<target name="test"
583		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
584	<	description="Runs tck and jtreg tests for src/main">
568	<	</target>
584	>	description="Runs tck and jtreg tests for src/main"/>
585
586		<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
587
#	Line 597 | Line 613
613
614		<target name="configure-compiler">
615		<fail message="ant version too old">
616	<	<condition>
601	<	<not> <antversion atleast="1.9.1"/> </not>
602	<	</condition>
616	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
617		</fail>
618
619		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 645 | Line 659
659		<java classname="ALoops" fork="true">
660		<classpath refid="loops.classpath"/>
661		</java>
648	–
662		</target>
663
664
665		<target name="compile-test-loops" depends="jar"
666	<	description="compile all the perf tests in src/test/loops">
666	>	description="Compiles all the perf tests in src/test/loops">
667
668		<mkdir dir="${build.dir}/test/loops"/>
669
#	Line 670 | Line 683
683		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
684		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
685		<compilerarg line="${build.args}"/>
673	–
686		</javac>
675	–
687		</target>
688
689
#	Line 698 | Line 709
709		encoding="ASCII"
710		executable="${javac8}"
711		fork="true">
701	–
712		<include name="**/*.java"/>
713		<compilerarg value="-Xprefer:source"/>
714		<compilerarg value="-XDignore.symbol.file=true"/>
715		<compilerarg value="-Xlint:all"/>
716		<compilerarg value="-Werror"/>
717		<compilerarg line="${build.args}"/>
708	–
718		</javac>
719		</target>
720
#	Line 729 | Line 738
738		encoding="ASCII"
739		executable="${javac8}"
740		fork="true">
732	–
741		<include name="**/*.java"/>
742		<compilerarg value="-Xprefer:source"/>
743		<compilerarg value="-XDignore.symbol.file=true"/>
744		<compilerarg value="-Xlint:all"/>
745	<	<compilerarg value="-Xdoclint:all/protected"/>
745	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
746		<compilerarg line="${build.args}"/>
739	–
747		</javac>
748		</target>
749
#	Line 752 | Line 759
759		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
760		</manifest>
761		</jar>
755	–
762		</target>
763
764
#	Line 768 | Line 774
774		<!-- JDK9+ test classes -->
775		<exclude name="*9Test.java"/>
776		<exclude name="*10Test.java"/>
777	+	<compilerarg value="-Werror"/>
778		</javac-elements>
779		</run-tck-tests>
780		</target>
#	Line 785 | Line 792
792
793		<target name="4jdk8-test"
794		depends="4jdk8-tck, 4jdk8-jtreg"
795	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
789	<	</target>
795	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
796
797
798		<target name="4jdk8docs"
#	Line 802 | Line 808
808		access="${build.javadoc.access}"
809		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
810		classpath=""
811	+	source="8"
812		executable="${javadoc8}"
813		failonerror = "true">
814		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
#	Line 829 | Line 836
836
837		<target name="4jdk8clean"
838		description="Removes all 4jdk8 build products">
832	–
839		<delete dir="${build.4jdk8.dir}"/>
834	–
840		</target>
841
842
#	Line 847 | Line 852
852		</target>
853
854
855	+	<!-- jsr166 4jdk7 (no longer maintained) -->
856
857	<	<!-- jsr166 4jdk7 -->
852	<
853	<	<target name="4jdk7compile"
854	<	depends="configure-compiler"
855	<	description="Compiles src/jdk7 sources, targeting jdk7">
856	<
857	>	<target name="4jdk7compile" depends="configure-compiler">
858		<mkdir dir="${build.4jdk7.classes.dir}"/>
859
860		<javac srcdir="${4jdk7src.dir}"
#	Line 877 | Line 878
878		<compilerarg value="-Xlint:all"/>
879		<compilerarg value="-Werror"/>
880		<compilerarg line="${build.args}"/>
880	–
881		</javac>
882		</target>
883
884	<	<target name="4jdk7doclint"
885	<	depends="configure-compiler"
886	<	description="Finds doclint warnings">
887	<
884	>	<target name="4jdk7doclint" depends="configure-compiler">
885		<mkdir dir="${build.4jdk7.classes.dir}"/>
886
887		<javac srcdir="${4jdk7src.dir}"
#	Line 908 | Line 905
905		<compilerarg value="-Xlint:all"/>
906		<compilerarg value="-Xdoclint:all/protected"/>
907		<compilerarg line="${build.args}"/>
911	–
908		</javac>
909		</target>
910
911	<
916	<	<target name="4jdk7jar"
917	<	depends="4jdk7compile"
918	<	description="Builds library jar from compiled sources">
919	<
911	>	<target name="4jdk7jar" depends="4jdk7compile">
912		<jar destfile="${4jdk7product.jar}">
913		<fileset dir="${build.4jdk7.classes.dir}"/>
914		<manifest>
#	Line 924 | Line 916
916		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
917		</manifest>
918		</jar>
927	–
919		</target>
920
921	<
931	<	<target name="4jdk7-tck"
932	<	depends="4jdk7jar"
933	<	description="Runs tck tests for jsr166-4jdk7 directly">
934	<
921	>	<target name="4jdk7-tck" depends="4jdk7jar">
922		<run-tck-tests
923		target="7"
924		workdir="${build.4jdk7.dir}"
#	Line 949 | Line 936
936		<exclude name="SplittableRandomTest.java"/>
937		<exclude name="StampedLockTest.java"/>
938		<exclude name="SubmissionPublisherTest.java"/>
939	+	<compilerarg value="-Werror"/>
940		</javac-elements>
941		</run-tck-tests>
942		</target>
943
956	–
944		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
945	<	<target name="4jdk7-tck-junit"
959	<	depends="4jdk7compile">
945	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
946
947		<junit printsummary="true"
948		showoutput="true"
#	Line 978 | Line 964
964
965		<test name="${jsr166.tckTestClass}" haltonfailure="no">
966		</test>
981	–
967		</junit>
968		</target>
969
970	<	<target name="4jdk7-jtreg"
986	<	depends="4jdk7jar"
987	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
970	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
971		<run-jtreg-tests
972		target="7"
973		workdir="${build.4jdk7.dir}"
974		classes="${4jdk7product.jar}"/>
975		</target>
976
977	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
978
979	<	<target name="4jdk7-test"
996	<	depends="4jdk7-tck, 4jdk7-jtreg"
997	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
998	<	</target>
999	<
1000	<
1001	<	<target name="4jdk7docs"
1002	<	description="Builds javadocs for src/jdk7 to dist dir">
1003	<
979	>	<target name="4jdk7docs">
980		<delete dir="${4jdk7docs.dir}"/>
981		<mkdir dir="${4jdk7docs.dir}"/>
982
#	Line 1021 | Line 997
997		</javadoc>
998		</target>
999
1000	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1001
1002	<	<target name="4jdk7dist"
1026	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1027	<	description="Puts all distributable products in single hierarchy"/>
1028	<
1029	<
1030	<	<target name="4jdk7clean"
1031	<	description="Removes all 4jdk7 build products">
1032	<
1002	>	<target name="4jdk7clean">
1003		<delete dir="${build.4jdk7.dir}"/>
1034	–
1004		</target>
1005
1006	<
1038	<	<target name="4jdk7dist-jar"
1039	<	depends="4jdk7clean, 4jdk7jar">
1006	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1007		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1008		</target>
1009
1010	<
1044	<	<target name="4jdk7dist-docs"
1045	<	depends="4jdk7clean, 4jdk7docs">
1010	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1011		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1012		</target>
1013
1014
1015	<	<!-- jsr166x -->
1051	<
1052	<	<target name="jsr166xcompile"
1053	<	depends="configure-compiler"
1054	<	description="Compiles jsr166x sources to build dir">
1015	>	<!-- jsr166x (no longer maintained) -->
1016
1017	+	<target name="jsr166xcompile" depends="configure-compiler">
1018		<mkdir dir="${build.jsr166x.classes.dir}"/>
1019
1020		<javac srcdir="${topsrc.dir}"
#	Line 1069 | Line 1031
1031		encoding="ASCII"
1032		executable="${javac7}"
1033		fork="true">
1072	–
1034		<include name="jsr166x/**/*.java"/>
1035		<compilerarg value="-XDignore.symbol.file=true"/>
1036		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1037		<compilerarg value="-Werror"/>
1038		<compilerarg line="${build.args}"/>
1078	–
1039		</javac>
1040		</target>
1041
1042	<
1083	<	<target name="jsr166xjar"
1084	<	depends="jsr166xcompile"
1085	<	description="Builds library jar from compiled sources">
1086	<
1042	>	<target name="jsr166xjar" depends="jsr166xcompile">
1043		<jar destfile="${jsr166x.jar}">
1044		<fileset dir="${build.jsr166x.classes.dir}"/>
1045		<manifest>
#	Line 1091 | Line 1047
1047		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1048		</manifest>
1049		</jar>
1094	–
1050		</target>
1051
1052	<
1098	<	<target name="jsr166xdocs"
1099	<	description="Builds javadocs to dist dir">
1100	<
1052	>	<target name="jsr166xdocs">
1053		<delete dir="${jsr166xdocs.dir}"/>
1054		<mkdir dir="${jsr166xdocs.dir}"/>
1055
#	Line 1112 | Line 1064
1064		failonerror = "true">
1065		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1066		<arg value="-XDignore.symbol.file=true"/>
1115	–
1067		</javadoc>
1068		</target>
1069
1070	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1071
1072	<	<target name="jsr166xdist"
1121	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1122	<	description="Puts all distributable products in single hierarchy"/>
1123	<
1124	<
1125	<	<target name="jsr166xclean"
1126	<	description="Removes all jsr166x build products">
1127	<
1072	>	<target name="jsr166xclean">
1073		<delete dir="${build.jsr166x.dir}"/>
1129	–
1074		</target>
1075
1076	<
1133	<	<target name="jsr166xdist-jar"
1134	<	depends="jsr166xclean, jsr166xjar">
1076	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1077		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1078		</target>
1079
1080	<	<target name="jsr166xdist-docs"
1139	<	depends="jsr166xclean, jsr166xdocs">
1080	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1081		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1082		</target>
1083
1143	–	<!-- jsr166y -->
1144	–
1084
1085	<	<target name="jsr166ycompile"
1147	<	depends="configure-compiler"
1148	<	description="Compiles jsr166y sources">
1085	>	<!-- jsr166y (no longer maintained) -->
1086
1087	+	<target name="jsr166ycompile" depends="configure-compiler">
1088		<mkdir dir="${build.jsr166y.classes.dir}"/>
1089
1090		<javac srcdir="${topsrc.dir}"
#	Line 1169 | Line 1107
1107		<compilerarg value="-Xlint:all"/>
1108		<compilerarg value="-Werror"/>
1109		<compilerarg line="${build.args}"/>
1172	–
1110		</javac>
1111		</target>
1112
1113	<
1177	<	<target name="jsr166yjar"
1178	<	depends="jsr166ycompile"
1179	<	description="Builds library jar from compiled sources">
1180	<
1113	>	<target name="jsr166yjar" depends="jsr166ycompile">
1114		<jar destfile="${jsr166y.jar}" index="true">
1115		<fileset dir="${build.jsr166y.classes.dir}"/>
1116		<manifest>
#	Line 1185 | Line 1118
1118		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1119		</manifest>
1120		</jar>
1188	–
1121		</target>
1122
1123	<
1192	<	<target name="jsr166ydocs"
1193	<	description="Builds javadocs to dist dir">
1194	<
1123	>	<target name="jsr166ydocs">
1124		<delete dir="${jsr166ydocs.dir}"/>
1125		<mkdir dir="${jsr166ydocs.dir}"/>
1126
#	Line 1206 | Line 1135
1135		failonerror = "true">
1136		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1137		<arg value="-XDignore.symbol.file=true"/>
1209	–
1138		</javadoc>
1139		</target>
1140
1141	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1142
1143	<	<target name="jsr166ydist"
1215	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1216	<	description="Puts all distributable products in single hierarchy"/>
1217	<
1218	<
1219	<	<target name="jsr166yclean"
1220	<	description="Removes all jsr166y build products">
1221	<
1143	>	<target name="jsr166yclean">
1144		<delete dir="${build.jsr166y.dir}"/>
1223	–
1145		</target>
1146
1147	<
1227	<	<target name="jsr166ydist-jar"
1228	<	depends="jsr166yclean, jsr166yjar">
1147	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1148		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1149		</target>
1150
1151	<	<target name="jsr166ydist-docs"
1233	<	depends="jsr166yclean, jsr166ydocs">
1151	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1152		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1153		</target>
1154
1155
1156	<	<!-- extra166y -->
1239	<
1240	<
1241	<	<target name="extra166ycompile"
1242	<	depends="configure-compiler, jsr166yjar"
1243	<	description="Compiles extra166y sources">
1156	>	<!-- extra166y (no longer maintained) -->
1157
1158	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1159		<mkdir dir="${build.extra166y.classes.dir}"/>
1160
1161		<javac srcdir="${topsrc.dir}"
#	Line 1264 | Line 1178
1178		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1179		<compilerarg value="-Werror"/>
1180		<compilerarg line="${build.args}"/>
1267	–
1181		</javac>
1182		</target>
1183
1184	<
1272	<	<target name="extra166yjar"
1273	<	depends="extra166ycompile"
1274	<	description="Builds library jar from compiled sources">
1275	<
1184	>	<target name="extra166yjar" depends="extra166ycompile">
1185		<jar destfile="${extra166y.jar}" index="true">
1186		<fileset dir="${build.extra166y.classes.dir}"/>
1187		<manifest>
#	Line 1280 | Line 1189
1189		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1190		</manifest>
1191		</jar>
1283	–
1192		</target>
1193
1194	<
1287	<	<target name="extra166ydocs"
1288	<	description="Builds javadocs to build dir">
1289	<
1194	>	<target name="extra166ydocs">
1195		<delete dir="${extra166ydocs.dir}"/>
1196		<mkdir dir="${extra166ydocs.dir}"/>
1197
#	Line 1300 | Line 1205
1205		executable="${javadoc7}">
1206		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1207		<arg value="-XDignore.symbol.file=true"/>
1303	–
1208		</javadoc>
1209		</target>
1210
1211	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1212
1213	<	<target name="extra166ydist"
1309	<	depends="extra166ydist-jar, extra166ydist-docs"
1310	<	description="Puts all distributable products in single hierarchy"/>
1311	<
1312	<
1313	<	<target name="extra166yclean"
1314	<	description="Removes all extra166y build products">
1315	<
1213	>	<target name="extra166yclean">
1214		<delete dir="${build.extra166y.dir}"/>
1317	–
1215		</target>
1216
1217	<
1321	<	<target name="extra166ydist-jar"
1322	<	depends="extra166yclean, extra166yjar">
1217	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1218		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1219		</target>
1220
1221	<	<target name="extra166ydist-docs"
1327	<	depends="extra166yclean, extra166ydocs">
1221	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1222		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1223		</target>
1224
1225	<	<!-- jsr166e -->
1225	>
1226	>	<!-- jsr166e (no longer maintained) -->
1227
1228		<property name="build.jsr166e.java.version" value="6"/>
1229		<property name="build.jsr166e.javac" value="${javac6}"/>
1230
1231	<	<target name="jsr166ecompile"
1337	<	depends="configure-compiler"
1338	<	description="Compiles jsr166e sources">
1339	<
1231	>	<target name="jsr166ecompile" depends="configure-compiler">
1232		<mkdir dir="${build.jsr166e.classes.dir}"/>
1233
1234		<javac srcdir="${topsrc.dir}"
#	Line 1357 | Line 1249
1249		<compilerarg value="-Xlint:all"/>
1250		<compilerarg value="-Werror"/>
1251		<compilerarg line="${build.args}"/>
1360	–
1252		</javac>
1253		</target>
1254
1364	–	<!-- jsr166e: find doclint errors -->
1255		<target name="jsr166edoclint">
1366	–
1256		<mkdir dir="${build.jsr166e.classes.dir}"/>
1257
1258		<javac srcdir="${topsrc.dir}"
#	Line 1385 | Line 1274
1274		<compilerarg value="-Xlint:all"/>
1275		<compilerarg value="-Werror"/>
1276		<compilerarg value="-Xdoclint:all/protected"/>
1388	–
1277		</javac>
1278		</target>
1279
1280	<
1393	<	<target name="jsr166ejar"
1394	<	depends="jsr166ecompile"
1395	<	description="Builds library jar from compiled sources">
1396	<
1280	>	<target name="jsr166ejar" depends="jsr166ecompile">
1281		<jar destfile="${jsr166e.jar}" index="true">
1282		<fileset dir="${build.jsr166e.classes.dir}"/>
1283		<manifest>
#	Line 1401 | Line 1285
1285		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1286		</manifest>
1287		</jar>
1404	–
1288		</target>
1289
1290	<
1408	<	<target name="jsr166edocs"
1409	<	description="Builds javadocs to build dir">
1410	<
1290	>	<target name="jsr166edocs">
1291		<delete dir="${jsr166edocs.dir}"/>
1292		<mkdir dir="${jsr166edocs.dir}"/>
1293
#	Line 1421 | Line 1301
1301		failonerror = "true">
1302		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1303		<arg value="-XDignore.symbol.file=true"/>
1424	–
1304		</javadoc>
1305		</target>
1306
1307	<
1429	<	<target name="jsr166e-tck-one-java-version"
1430	<	depends="jsr166ejar">
1431	<
1307	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1308		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1433	–
1309		<run-tck-tests
1310		tck.src.dir="${test.src.dir}/tck-jsr166e"
1311		target="${build.jsr166e.java.version}"
#	Line 1438 | Line 1313
1313		classes="${jsr166e.jar}"/>
1314		</target>
1315
1316	<	<target name="jsr166e-tck"
1442	<	description="Runs tck tests for jsr166e for multiple java versions">
1316	>	<target name="jsr166e-tck">
1317
1318		<!--     <antcall target="clean"/> -->
1319		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1460 | Line 1334
1334		</antcall>
1335		</target>
1336
1337	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1338
1339	<	<target name="jsr166e-test"
1465	<	depends="jsr166e-tck"
1466	<	description="Runs all tests for jsr166e">
1467	<	</target>
1468	<
1469	<	<target name="jsr166edist"
1470	<	depends="jsr166edist-jar, jsr166edist-docs"
1471	<	description="Puts all distributable products in single hierarchy"/>
1472	<
1339	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1340
1341	<	<target name="jsr166eclean"
1475	<	description="Removes all jsr166e build products">
1341	>	<target name="jsr166eclean">
1342		<delete dir="${build.jsr166e.dir}"/>
1343		</target>
1344
1479	–
1345		<target name="jsr166edist-jar"
1346		depends="jsr166eclean, jsr166ejar">
1347		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1348		</target>
1349
1350	<	<target name="jsr166edist-docs"
1486	<	depends="jsr166eclean, jsr166edocs">
1350	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1351		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1352		</target>
1353
#	Line 1504 | Line 1368
1368		</target>
1369
1370
1371	+	<!-- ==============================================================
1372	+	Experimental errorprone support - http://errorprone.info
1373	+	You may need to bring your own errorprone jar.
1374	+	=================================================================== -->
1375	+	<target name="errorprone"
1376	+	depends="clean, configure-compiler"
1377	+	description="Run errorprone over jsr166 source code (experimental)">
1378	+
1379	+	<local name="destdir"/>
1380	+	<property name="destdir" value="${build.classes.dir}/java.base"/>
1381	+	<mkdir dir="${destdir}"/>
1382	+
1383	+	<javac srcdir="${src.dir}"
1384	+	destdir="${destdir}"
1385	+	debug="${build.debug}"
1386	+	debuglevel="${build.debuglevel}"
1387	+	deprecation="${build.deprecation}"
1388	+	classpath=""
1389	+	includeAntRuntime="false"
1390	+	includeJavaRuntime="false"
1391	+	encoding="ASCII"
1392	+	executable="${build.main.javac}"
1393	+	fork="true">
1394	+
1395	+	<include name="**/*.java"/>
1396	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1397	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1398	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1399	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1400	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1401	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1402	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1403	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1404	+	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1405	+	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1406	+	<compilerarg value="-Xplugin:ErrorProne
1407	+	-Xep:IdentityBinaryExpression:WARN
1408	+	-Xep:MissingOverride:OFF
1409	+	-Xep:MixedArrayDimensions:WARN
1410	+	-Xep:RemoveUnusedImports:ERROR
1411	+	-Xep:ClassName:ERROR
1412	+	-Xep:MultipleTopLevelClasses:ERROR
1413	+	-Xep:EmptyIf:ERROR
1414	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1415	+	-Xep:ArgumentParameterSwap:ERROR
1416	+	-Xep:RedundantThrows:ERROR
1417	+	-Xep:MethodCanBeStatic:WARN"/>
1418	+	<compilerarg value="--patch-module=java.base=${src.dir}"/>
1419	+	<compilerarg value="-Xprefer:source"/>
1420	+	<compilerarg value="-XDignore.symbol.file=true"/>
1421	+	<compilerarg value="-Xlint:all"/>
1422	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
1423	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1424	+	<compilerarg line="${build.args}"/>
1425	+	</javac>
1426	+
1427	+	<jar destfile="${product.jar}">
1428	+	<fileset dir="${destdir}"/>
1429	+	</jar>
1430	+
1431	+	<run-tck-tests
1432	+	target="${build.main.java.version}"
1433	+	workdir="${build.dir}"
1434	+	classes="${product.jar}">
1435	+	<javac-elements>
1436	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1437	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1438	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1439	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1440	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1441	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1442	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1443	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1444	+	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1445	+	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1446	+	<compilerarg value="-Xplugin:ErrorProne
1447	+	-Xep:IdentityBinaryExpression:WARN
1448	+	-Xep:BoxedPrimitiveConstructor:OFF
1449	+	-Xep:HashtableContains:OFF
1450	+	-Xep:ModifyingCollectionWithItself:OFF
1451	+	-Xep:MissingOverride:OFF
1452	+	-Xep:MixedArrayDimensions:WARN
1453	+	-Xep:RemoveUnusedImports:ERROR
1454	+	-Xep:ClassName:ERROR
1455	+	-Xep:MultipleTopLevelClasses:ERROR
1456	+	-Xep:EmptyIf:ERROR
1457	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1458	+	-Xep:ArgumentParameterSwap:ERROR
1459	+	-Xep:RedundantThrows:ERROR
1460	+	-Xep:MethodCanBeStatic:WARN"/>
1461	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1462	+	</javac-elements>
1463	+	</run-tck-tests>
1464	+	</target>
1465	+
1466	+
1467	+	<!-- ==============================================================
1468	+	Running guava tests against jsr166 code
1469	+	=================================================================== -->
1470	+
1471	+	<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1472	+	<!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1473	+	<!-- <property name="guava.version" value="21.0"/> -->
1474	+
1475	+	<!-- HOWTO debug print a path id -->
1476	+	<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1477	+	<!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1478	+
1479	+	<!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1480	+	<!--   organisation="com.google.guava" module="guava-tests"/> -->
1481	+	<!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1482	+	<!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1483	+	<!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1484	+	<!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1485	+
1486	+	<!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1487	+	<!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1488	+	<!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1489	+	<!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1490	+
1491	+	<!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1492	+	<!--   type="*" inline="true" conf="*(private),*(public)" -->
1493	+	<!--   pattern="${guava.dir}/[artifact].[ext]" -->
1494	+	<!--   organisation="com.google.guava" module="guava-testlib"/> -->
1495	+
1496	+	<!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1497	+	<!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1498	+	<!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1499	+
1500	+	<target name="init-ivy">
1501	+	<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1502	+	dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1503	+	<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1504	+	classpath="${build.dir}/ivy.jar"/>
1505	+	</target>
1506	+
1507	+	<target name="guava-tests" depends="jar, init-ivy"
1508	+	description="Guava tests run against jsr166 collections">
1509	+	<property name="guava.dir" value="${build.dir}/guava-testlib"/>
1510	+	<mkdir dir="${guava.dir}"/>
1511	+	<ivy:retrieve pathid="guava.testlib.classpath"
1512	+	type="jar,bundle" inline="true" conf="default,master"
1513	+	pattern="${guava.dir}/[artifact].[ext]"
1514	+	organisation="com.google.guava" module="guava-testlib"/>
1515	+	<property name="guava.version" value="21.0"/>
1516	+	<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1517	+	dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1518	+	<junit printsummary="true" showoutput="true" haltonfailure="true"
1519	+	jvm="${java9}" fork="true">
1520	+	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1521	+	<formatter type="brief"/>
1522	+	<classpath>
1523	+	<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1524	+	<path refid="guava.testlib.classpath"/>
1525	+	</classpath>
1526	+
1527	+	<!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1528	+	<test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1529	+	</junit>
1530	+	</target>
1531	+
1532		</project>

Diff Legend

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