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.220 by jsr166, Sun Sep 25 01:28:54 2016 UTC vs.
Revision 1.241 by jsr166, Mon Mar 27 02:11:26 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 63 | Line 61
61		<property name="build.classes.dir"           location="${build.dir}/classes"/>
62		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
63		<property name="build.loops.dir"             location="${build.dir}/loops"/>
66	–	<property name="build.reports.dir"           location="${build.dir}/reports"/>
64
65		<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
66		<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
#	Line 134 | 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 143 | 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 233 | 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 252 | 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 264 | 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 295 | Line 305
305		<fileset dir="${jtreg8.src.dir}">
306		<patternset id="jdk8.jtreg.tests">
307		<include name="**/*.java"/>
298	–	<exclude name="**/SpliteratorCharacteristics.java"/>
299	–	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
300	–	<exclude name="**/GCDuringIteration.java"/>
308		</patternset>
309		</fileset>
310
#	Line 329 | Line 336
336		</condition>
337
338		<delete dir="@{workdir}/JTwork"   quiet="true"/>
332	–	<delete dir="@{workdir}/JTreport" quiet="true"/>
339		<jtreg dir="${jtreg@{target}.src.dir}"
340		jdk="${jdk@{target}.home}"
341	<	workDir="@{workdir}/JTwork"
336	<	reportDir="@{workdir}/JTreport">
341	>	workDir="@{workdir}/JTwork">
342		<patternset refid="jdk@{target}.jtreg.tests"/>
343		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
344	<	<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}"/>
349		<arg value="-vmoptions:-esa -ea"/>
350		<arg value="-automatic"/>
#	Line 363 | 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 397 | 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 434 | Line 444
444		<!-- the packagenames="none" hack below prevents scanning the -->
445		<!-- sourcepath for packages -->
446
447	<	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
448	<	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
447	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
448	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
449	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
450	>	<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
451	>	<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
452		<javadoc destdir="${docs.dir}"
453		packagenames="none"
454		link="${java9.api.url}"
#	Line 450 | 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 -->
470		<!--       <arg value="-tag"/> -->
471	<	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
471	>	<!--       <arg value="apiNote:a:API Note:"/> -->
472		<arg value="-tag"/>
473	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
473	>	<arg value="implSpec:a:Implementation Requirements:"/>
474		<arg value="-tag"/>
475	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
475	>	<arg value="implNote:a:Implementation Note:"/>
476		<!-- tags added in jdk9: currently unused -->
477		<!--       <arg value="-tag"/> -->
478		<!--       <arg value="revised:X"/> -->
#	Line 498 | Line 511
511
512		<target name="clean"
513		description="Removes all build products">
501	–
514		<delete dir="${build.dir}"/>
503	–
515		</target>
516
517
518		<target name="dist-clean"
519		description="Removes all build and distribution products">
509	–
520		<delete dir="${build.dir}"/>
521		<delete dir="${dist.dir}"/>
512	–
522		</target>
523
524
#	Line 530 | 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 565 | 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">
569	<	</target>
581	>	description="Runs tck and jtreg tests for src/main"/>
582
583		<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
584
#	Line 598 | Line 610
610
611		<target name="configure-compiler">
612		<fail message="ant version too old">
613	<	<condition>
602	<	<not> <antversion atleast="1.9.1"/> </not>
603	<	</condition>
613	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
614		</fail>
615
616		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 646 | Line 656
656		<java classname="ALoops" fork="true">
657		<classpath refid="loops.classpath"/>
658		</java>
649	–
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 671 | Line 680
680		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
681		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
682		<compilerarg line="${build.args}"/>
674	–
683		</javac>
676	–
684		</target>
685
686
#	Line 699 | Line 706
706		encoding="ASCII"
707		executable="${javac8}"
708		fork="true">
702	–
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}"/>
709	–
715		</javac>
716		</target>
717
#	Line 730 | Line 735
735		encoding="ASCII"
736		executable="${javac8}"
737		fork="true">
733	–
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}"/>
740	–
744		</javac>
745		</target>
746
#	Line 753 | Line 756
756		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
757		</manifest>
758		</jar>
756	–
759		</target>
760
761
#	Line 769 | 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 786 | Line 789
789
790		<target name="4jdk8-test"
791		depends="4jdk8-tck, 4jdk8-jtreg"
792	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
790	<	</target>
792	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
793
794
795		<target name="4jdk8docs"
#	Line 830 | Line 832
832
833		<target name="4jdk8clean"
834		description="Removes all 4jdk8 build products">
833	–
835		<delete dir="${build.4jdk8.dir}"/>
835	–
836		</target>
837
838
#	Line 848 | Line 848
848		</target>
849
850
851	+	<!-- jsr166 4jdk7 (no longer maintained) -->
852
853	<	<!-- jsr166 4jdk7 -->
853	<
854	<	<target name="4jdk7compile"
855	<	depends="configure-compiler"
856	<	description="Compiles src/jdk7 sources, targeting jdk7">
857	<
853	>	<target name="4jdk7compile" depends="configure-compiler">
854		<mkdir dir="${build.4jdk7.classes.dir}"/>
855
856		<javac srcdir="${4jdk7src.dir}"
#	Line 878 | Line 874
874		<compilerarg value="-Xlint:all"/>
875		<compilerarg value="-Werror"/>
876		<compilerarg line="${build.args}"/>
881	–
877		</javac>
878		</target>
879
880	<	<target name="4jdk7doclint"
886	<	depends="configure-compiler"
887	<	description="Finds doclint warnings">
888	<
880	>	<target name="4jdk7doclint" depends="configure-compiler">
881		<mkdir dir="${build.4jdk7.classes.dir}"/>
882
883		<javac srcdir="${4jdk7src.dir}"
#	Line 909 | Line 901
901		<compilerarg value="-Xlint:all"/>
902		<compilerarg value="-Xdoclint:all/protected"/>
903		<compilerarg line="${build.args}"/>
912	–
904		</javac>
905		</target>
906
907	<
917	<	<target name="4jdk7jar"
918	<	depends="4jdk7compile"
919	<	description="Builds library jar from compiled sources">
920	<
907	>	<target name="4jdk7jar" depends="4jdk7compile">
908		<jar destfile="${4jdk7product.jar}">
909		<fileset dir="${build.4jdk7.classes.dir}"/>
910		<manifest>
#	Line 925 | Line 912
912		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
913		</manifest>
914		</jar>
928	–
915		</target>
916
917	<
932	<	<target name="4jdk7-tck"
933	<	depends="4jdk7jar"
934	<	description="Runs tck tests for jsr166-4jdk7 directly">
935	<
917	>	<target name="4jdk7-tck" depends="4jdk7jar">
918		<run-tck-tests
919		target="7"
920		workdir="${build.4jdk7.dir}"
#	Line 950 | 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
957	–
940		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
941	<	<target name="4jdk7-tck-junit"
960	<	depends="4jdk7compile">
941	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
942
943		<junit printsummary="true"
944		showoutput="true"
#	Line 979 | Line 960
960
961		<test name="${jsr166.tckTestClass}" haltonfailure="no">
962		</test>
982	–
963		</junit>
964		</target>
965
966	<	<target name="4jdk7-jtreg"
987	<	depends="4jdk7jar"
988	<	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"
997	<	depends="4jdk7-tck, 4jdk7-jtreg"
998	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
999	<	</target>
1000	<
1001	<
1002	<	<target name="4jdk7docs"
1003	<	description="Builds javadocs for src/jdk7 to dist dir">
1004	<
975	>	<target name="4jdk7docs">
976		<delete dir="${4jdk7docs.dir}"/>
977		<mkdir dir="${4jdk7docs.dir}"/>
978
#	Line 1022 | Line 993
993		</javadoc>
994		</target>
995
996	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
997
998	<	<target name="4jdk7dist"
1027	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1028	<	description="Puts all distributable products in single hierarchy"/>
1029	<
1030	<
1031	<	<target name="4jdk7clean"
1032	<	description="Removes all 4jdk7 build products">
1033	<
998	>	<target name="4jdk7clean">
999		<delete dir="${build.4jdk7.dir}"/>
1035	–
1000		</target>
1001
1002	<
1039	<	<target name="4jdk7dist-jar"
1040	<	depends="4jdk7clean, 4jdk7jar">
1002	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1003		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1004		</target>
1005
1006	<
1045	<	<target name="4jdk7dist-docs"
1046	<	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 -->
1052	<
1053	<	<target name="jsr166xcompile"
1054	<	depends="configure-compiler"
1055	<	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 1070 | Line 1027
1027		encoding="ASCII"
1028		executable="${javac7}"
1029		fork="true">
1073	–
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}"/>
1079	–
1035		</javac>
1036		</target>
1037
1038	<
1084	<	<target name="jsr166xjar"
1085	<	depends="jsr166xcompile"
1086	<	description="Builds library jar from compiled sources">
1087	<
1038	>	<target name="jsr166xjar" depends="jsr166xcompile">
1039		<jar destfile="${jsr166x.jar}">
1040		<fileset dir="${build.jsr166x.classes.dir}"/>
1041		<manifest>
#	Line 1092 | Line 1043
1043		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1044		</manifest>
1045		</jar>
1095	–
1046		</target>
1047
1048	<
1099	<	<target name="jsr166xdocs"
1100	<	description="Builds javadocs to dist dir">
1101	<
1048	>	<target name="jsr166xdocs">
1049		<delete dir="${jsr166xdocs.dir}"/>
1050		<mkdir dir="${jsr166xdocs.dir}"/>
1051
#	Line 1113 | Line 1060
1060		failonerror = "true">
1061		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1062		<arg value="-XDignore.symbol.file=true"/>
1116	–
1063		</javadoc>
1064		</target>
1065
1066	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1067
1068	<	<target name="jsr166xdist"
1122	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1123	<	description="Puts all distributable products in single hierarchy"/>
1124	<
1125	<
1126	<	<target name="jsr166xclean"
1127	<	description="Removes all jsr166x build products">
1128	<
1068	>	<target name="jsr166xclean">
1069		<delete dir="${build.jsr166x.dir}"/>
1130	–
1070		</target>
1071
1072	<
1134	<	<target name="jsr166xdist-jar"
1135	<	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"
1140	<	depends="jsr166xclean, jsr166xdocs">
1076	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1077		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1078		</target>
1079
1144	–	<!-- jsr166y -->
1080
1081	+	<!-- jsr166y (no longer maintained) -->
1082
1083	<	<target name="jsr166ycompile"
1148	<	depends="configure-compiler"
1149	<	description="Compiles jsr166y sources">
1150	<
1083	>	<target name="jsr166ycompile" depends="configure-compiler">
1084		<mkdir dir="${build.jsr166y.classes.dir}"/>
1085
1086		<javac srcdir="${topsrc.dir}"
#	Line 1170 | Line 1103
1103		<compilerarg value="-Xlint:all"/>
1104		<compilerarg value="-Werror"/>
1105		<compilerarg line="${build.args}"/>
1173	–
1106		</javac>
1107		</target>
1108
1109	<
1178	<	<target name="jsr166yjar"
1179	<	depends="jsr166ycompile"
1180	<	description="Builds library jar from compiled sources">
1181	<
1109	>	<target name="jsr166yjar" depends="jsr166ycompile">
1110		<jar destfile="${jsr166y.jar}" index="true">
1111		<fileset dir="${build.jsr166y.classes.dir}"/>
1112		<manifest>
#	Line 1186 | Line 1114
1114		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1115		</manifest>
1116		</jar>
1189	–
1117		</target>
1118
1119	<
1193	<	<target name="jsr166ydocs"
1194	<	description="Builds javadocs to dist dir">
1195	<
1119	>	<target name="jsr166ydocs">
1120		<delete dir="${jsr166ydocs.dir}"/>
1121		<mkdir dir="${jsr166ydocs.dir}"/>
1122
#	Line 1207 | Line 1131
1131		failonerror = "true">
1132		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1133		<arg value="-XDignore.symbol.file=true"/>
1210	–
1134		</javadoc>
1135		</target>
1136
1137	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1138
1139	<	<target name="jsr166ydist"
1216	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1217	<	description="Puts all distributable products in single hierarchy"/>
1218	<
1219	<
1220	<	<target name="jsr166yclean"
1221	<	description="Removes all jsr166y build products">
1222	<
1139	>	<target name="jsr166yclean">
1140		<delete dir="${build.jsr166y.dir}"/>
1224	–
1141		</target>
1142
1143	<
1228	<	<target name="jsr166ydist-jar"
1229	<	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"
1234	<	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 -->
1240	<
1241	<
1242	<	<target name="extra166ycompile"
1243	<	depends="configure-compiler, jsr166yjar"
1244	<	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 1265 | Line 1174
1174		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1175		<compilerarg value="-Werror"/>
1176		<compilerarg line="${build.args}"/>
1268	–
1177		</javac>
1178		</target>
1179
1180	<
1273	<	<target name="extra166yjar"
1274	<	depends="extra166ycompile"
1275	<	description="Builds library jar from compiled sources">
1276	<
1180	>	<target name="extra166yjar" depends="extra166ycompile">
1181		<jar destfile="${extra166y.jar}" index="true">
1182		<fileset dir="${build.extra166y.classes.dir}"/>
1183		<manifest>
#	Line 1281 | Line 1185
1185		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1186		</manifest>
1187		</jar>
1284	–
1188		</target>
1189
1190	<
1288	<	<target name="extra166ydocs"
1289	<	description="Builds javadocs to build dir">
1290	<
1190	>	<target name="extra166ydocs">
1191		<delete dir="${extra166ydocs.dir}"/>
1192		<mkdir dir="${extra166ydocs.dir}"/>
1193
#	Line 1301 | Line 1201
1201		executable="${javadoc7}">
1202		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1203		<arg value="-XDignore.symbol.file=true"/>
1304	–
1204		</javadoc>
1205		</target>
1206
1207	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1208
1209	<	<target name="extra166ydist"
1310	<	depends="extra166ydist-jar, extra166ydist-docs"
1311	<	description="Puts all distributable products in single hierarchy"/>
1312	<
1313	<
1314	<	<target name="extra166yclean"
1315	<	description="Removes all extra166y build products">
1316	<
1209	>	<target name="extra166yclean">
1210		<delete dir="${build.extra166y.dir}"/>
1318	–
1211		</target>
1212
1213	<
1322	<	<target name="extra166ydist-jar"
1323	<	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"
1328	<	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"
1338	<	depends="configure-compiler"
1339	<	description="Compiles jsr166e sources">
1340	<
1227	>	<target name="jsr166ecompile" depends="configure-compiler">
1228		<mkdir dir="${build.jsr166e.classes.dir}"/>
1229
1230		<javac srcdir="${topsrc.dir}"
#	Line 1358 | Line 1245
1245		<compilerarg value="-Xlint:all"/>
1246		<compilerarg value="-Werror"/>
1247		<compilerarg line="${build.args}"/>
1361	–
1248		</javac>
1249		</target>
1250
1365	–	<!-- jsr166e: find doclint errors -->
1251		<target name="jsr166edoclint">
1367	–
1252		<mkdir dir="${build.jsr166e.classes.dir}"/>
1253
1254		<javac srcdir="${topsrc.dir}"
#	Line 1386 | Line 1270
1270		<compilerarg value="-Xlint:all"/>
1271		<compilerarg value="-Werror"/>
1272		<compilerarg value="-Xdoclint:all/protected"/>
1389	–
1273		</javac>
1274		</target>
1275
1276	<
1394	<	<target name="jsr166ejar"
1395	<	depends="jsr166ecompile"
1396	<	description="Builds library jar from compiled sources">
1397	<
1276	>	<target name="jsr166ejar" depends="jsr166ecompile">
1277		<jar destfile="${jsr166e.jar}" index="true">
1278		<fileset dir="${build.jsr166e.classes.dir}"/>
1279		<manifest>
#	Line 1402 | Line 1281
1281		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1282		</manifest>
1283		</jar>
1405	–
1284		</target>
1285
1286	<
1409	<	<target name="jsr166edocs"
1410	<	description="Builds javadocs to build dir">
1411	<
1286	>	<target name="jsr166edocs">
1287		<delete dir="${jsr166edocs.dir}"/>
1288		<mkdir dir="${jsr166edocs.dir}"/>
1289
#	Line 1422 | Line 1297
1297		failonerror = "true">
1298		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1299		<arg value="-XDignore.symbol.file=true"/>
1425	–
1300		</javadoc>
1301		</target>
1302
1303	<
1430	<	<target name="jsr166e-tck-one-java-version"
1431	<	depends="jsr166ejar">
1432	<
1303	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1304		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1434	–
1305		<run-tck-tests
1306		tck.src.dir="${test.src.dir}/tck-jsr166e"
1307		target="${build.jsr166e.java.version}"
#	Line 1439 | Line 1309
1309		classes="${jsr166e.jar}"/>
1310		</target>
1311
1312	<	<target name="jsr166e-tck"
1443	<	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 1461 | Line 1330
1330		</antcall>
1331		</target>
1332
1333	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1334
1335	<	<target name="jsr166e-test"
1466	<	depends="jsr166e-tck"
1467	<	description="Runs all tests for jsr166e">
1468	<	</target>
1469	<
1470	<	<target name="jsr166edist"
1471	<	depends="jsr166edist-jar, jsr166edist-docs"
1472	<	description="Puts all distributable products in single hierarchy"/>
1473	<
1335	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1336
1337	<	<target name="jsr166eclean"
1476	<	description="Removes all jsr166e build products">
1337	>	<target name="jsr166eclean">
1338		<delete dir="${build.jsr166e.dir}"/>
1339		</target>
1340
1480	–
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"
1487	<	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 1505 | Line 1364
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	+	=================================================================== -->
1454	+
1455	+	<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1456	+	<!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1457	+	<!-- <property name="guava.version" value="21.0"/> -->
1458	+
1459	+	<!-- HOWTO debug print a path id -->
1460	+	<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1461	+	<!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1462	+
1463	+	<!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1464	+	<!--   organisation="com.google.guava" module="guava-tests"/> -->
1465	+	<!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1466	+	<!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1467	+	<!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1468	+	<!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1469	+
1470	+	<!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1471	+	<!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1472	+	<!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1473	+	<!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1474	+
1475	+	<!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1476	+	<!--   type="*" inline="true" conf="*(private),*(public)" -->
1477	+	<!--   pattern="${guava.dir}/[artifact].[ext]" -->
1478	+	<!--   organisation="com.google.guava" module="guava-testlib"/> -->
1479	+
1480	+	<!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1481	+	<!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1482	+	<!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1483	+
1484	+	<target name="init-ivy">
1485	+	<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1486	+	dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1487	+	<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1488	+	classpath="${build.dir}/ivy.jar"/>
1489	+	</target>
1490	+
1491	+	<target name="guava-tests" depends="jar, init-ivy"
1492	+	description="Guava tests run against jsr166 collections">
1493	+	<property name="guava.dir" value="${build.dir}/guava-testlib"/>
1494	+	<mkdir dir="${guava.dir}"/>
1495	+	<ivy:retrieve pathid="guava.testlib.classpath"
1496	+	type="jar,bundle" inline="true" conf="default,master"
1497	+	pattern="${guava.dir}/[artifact].[ext]"
1498	+	organisation="com.google.guava" module="guava-testlib"/>
1499	+	<property name="guava.version" value="21.0"/>
1500	+	<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1501	+	dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1502	+	<junit printsummary="true" showoutput="true" haltonfailure="true"
1503	+	jvm="${java9}" fork="true">
1504	+	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1505	+	<formatter type="brief"/>
1506	+	<classpath>
1507	+	<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1508	+	<path refid="guava.testlib.classpath"/>
1509	+	</classpath>
1510	+
1511	+	<!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1512	+	<test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1513	+	</junit>
1514	+	</target>
1515	+
1516		</project>

Diff Legend

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