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.223 by jsr166, Thu Nov 24 01:53:50 2016 UTC vs.
Revision 1.250 by jsr166, Thu Sep 14 14:23:02 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 286 | Line 296
296		</macrodef>
297
298		<!-- Define jtreg test sets for different jdk versions -->
299	+	<fileset dir="${jtreg10.src.dir}">
300	+	<patternset id="jdk10.jtreg.tests">
301	+	<include name="**/*.java"/>
302	+	</patternset>
303	+	</fileset>
304	+
305		<fileset dir="${jtreg9.src.dir}">
306		<patternset id="jdk9.jtreg.tests">
307		<include name="**/*.java"/>
#	Line 295 | Line 311
311		<fileset dir="${jtreg8.src.dir}">
312		<patternset id="jdk8.jtreg.tests">
313		<include name="**/*.java"/>
298	–	<exclude name="**/SpliteratorCharacteristics.java"/>
299	–	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
300	–	<exclude name="**/GCDuringIteration.java"/>
314		</patternset>
315		</fileset>
316
#	Line 312 | Line 325
325
326		<macrodef name="run-jtreg-tests">
327		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
315	–	<attribute name="source" default="7"/>
328		<attribute name="target"/>
329		<attribute name="workdir"/>
330		<attribute name="classes"/>
#	Line 334 | Line 346
346		workDir="@{workdir}/JTwork">
347		<patternset refid="jdk@{target}.jtreg.tests"/>
348		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
349	<	<arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
350	<	<arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
349	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
350	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
351		<arg value="-agentvm"/>
352		<arg value="-noreport"/>
353		<arg value="-verbose:${jtreg.verbose}"/>
#	Line 360 | Line 372
372		<!-- Main targets -->
373
374		<property name="build.main.java.version" value="9"/>
375	<	<property name="build.main.javac" value="${javac9}"/>
375	>	<!-- Workaround "no nested properties in ant" -->
376	>	<macrodef name="define-build-main-properties">
377	>	<attribute name="v"/>
378	>	<sequential>
379	>	<property name="build.main.java"    value="${java@{v}}"/>
380	>	<property name="build.main.javac"   value="${javac@{v}}"/>
381	>	<property name="build.main.javadoc" value="${javadoc@{v}}"/>
382	>	</sequential>
383	>	</macrodef>
384	>	<define-build-main-properties v="${build.main.java.version}"/>
385
386		<target name="dists"
387	<	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
387	>	depends="dist, 4jdk8dist"
388		description="Builds all public jars and docs"/>
389	+	<!--
390	+	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
391	+	-->
392
393		<target name="compile"
394		depends="configure-compiler"
395		description="Compiles src/main sources to build dir">
396
373	–	<local name="modules"/>
374	–	<condition property="modules">
375	–	<and>
376	–	<available file="${jdk9.home}/jmods" type="dir"/>
377	–	<equals arg1="9" arg2="${build.main.java.version}"/>
378	–	</and>
379	–	</condition>
380	–
397		<local name="destdir"/>
398	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
383	<	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
398	>	<property name="destdir" value="${build.classes.dir}/java.base"/>
399
400		<mkdir dir="${destdir}"/>
401
#	Line 397 | Line 412
412		fork="true">
413
414		<include name="**/*.java"/>
415	<	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
415	>	<compilerarg value="--patch-module=java.base=${src.dir}"/>
416		<compilerarg value="-Xprefer:source"/>
417		<compilerarg value="-XDignore.symbol.file=true"/>
418		<compilerarg value="-Xlint:all"/>
419	+	<compilerarg line="--doclint-format html5"/>
420	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
421		<compilerarg value="-Werror"/>
405	–	<compilerarg value="-Xdoclint:all/protected"/>
422		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
423		<compilerarg line="${build.args}"/>
424
#	Line 434 | Line 450
450		<!-- the packagenames="none" hack below prevents scanning the -->
451		<!-- sourcepath for packages -->
452
453	<	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
454	<	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
453	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
454	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
455	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
456	>	<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
457	>	<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
458		<javadoc destdir="${docs.dir}"
459		packagenames="none"
460		link="${java9.api.url}"
#	Line 443 | Line 462
462		access="${build.javadoc.access}"
463		sourcepath="${src.dir}"
464		classpath=""
465	<	executable="${javadoc9}">
465	>	source="9"
466	>	executable="${build.main.javadoc}">
467		<fileset dir="${src.dir}" defaultexcludes="yes">
468		<include name="**/*.java"/>
469		</fileset>
470		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
471		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
472		<arg value="-XDignore.symbol.file=true"/>
473	<	<arg value="-Xmodule:java.base"/>
473	>	<arg value="-html5"/>
474	>	<arg value="--patch-module=java.base=${src.dir}"/>
475		<arg value="-tag"/>
476		<arg value="${javadoc.jls.option}"/>
477		<!-- @apiNote currently unused -->
#	Line 498 | Line 519
519
520		<target name="clean"
521		description="Removes all build products">
501	–
522		<delete dir="${build.dir}"/>
503	–
523		</target>
524
525
526		<target name="dist-clean"
527		description="Removes all build and distribution products">
509	–
528		<delete dir="${build.dir}"/>
529		<delete dir="${dist.dir}"/>
512	–
530		</target>
531
532
#	Line 530 | Line 547
547		<run-tck-tests
548		target="${build.main.java.version}"
549		workdir="${build.dir}"
550	<	classes="${product.jar}"/>
550	>	classes="${product.jar}">
551	>	<javac-elements>
552	>	<compilerarg value="-Werror"/>
553	>	</javac-elements>
554	>	</run-tck-tests>
555		</target>
556
557		<target name="tck-parallelism-1"
#	Line 565 | Line 586
586
587		<target name="test"
588		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
589	<	description="Runs tck and jtreg tests for src/main">
569	<	</target>
589	>	description="Runs tck and jtreg tests for src/main"/>
590
591		<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
592
#	Line 577 | Line 597
597
598		<!--   </target> -->
599
600	<	<!--   <target name="test89" -->
601	<	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
600	>	<target name="test910"
601	>	description="Runs tck and jtreg tests for src/main for multiple java versions">
602
603	<	<!--     <antcall target="clean"/> -->
604	<	<!--     <antcall target="test"> -->
605	<	<!--       <param name="build.main.java.version" value="8"/> -->
606	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
587	<	<!--     </antcall> -->
603	>	<antcall target="clean"/>
604	>	<antcall target="test">
605	>	<param name="build.main.java.version" value="9"/>
606	>	</antcall>
607
608	<	<!--     <antcall target="clean"/> -->
609	<	<!--     <antcall target="test"> -->
610	<	<!--       <param name="build.main.java.version" value="9"/> -->
611	<	<!--       <param name="build.main.javac" value="${javac9}"/> -->
593	<	<!--     </antcall> -->
608	>	<antcall target="clean"/>
609	>	<antcall target="test">
610	>	<param name="build.main.java.version" value="10"/>
611	>	</antcall>
612
613	<	<!--   </target> -->
613	>	</target>
614
615
616
617		<target name="configure-compiler">
618		<fail message="ant version too old">
619	<	<condition>
602	<	<not> <antversion atleast="1.9.1"/> </not>
603	<	</condition>
619	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
620		</fail>
621
622		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 646 | Line 662
662		<java classname="ALoops" fork="true">
663		<classpath refid="loops.classpath"/>
664		</java>
649	–
665		</target>
666
667
668		<target name="compile-test-loops" depends="jar"
669	<	description="compile all the perf tests in src/test/loops">
669	>	description="Compiles all the perf tests in src/test/loops">
670
671		<mkdir dir="${build.dir}/test/loops"/>
672
#	Line 663 | Line 678
678		includeAntRuntime="false"
679		includeJavaRuntime="false"
680		encoding="ASCII"
681	<	executable="${javac9}"
681	>	executable="${build.main.javac}"
682		fork="true">
683
684		<include name="*.java"/>
#	Line 671 | Line 686
686		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
687		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
688		<compilerarg line="${build.args}"/>
674	–
689		</javac>
676	–
690		</target>
691
692
#	Line 699 | Line 712
712		encoding="ASCII"
713		executable="${javac8}"
714		fork="true">
702	–
715		<include name="**/*.java"/>
716		<compilerarg value="-Xprefer:source"/>
717		<compilerarg value="-XDignore.symbol.file=true"/>
718		<compilerarg value="-Xlint:all"/>
719		<compilerarg value="-Werror"/>
720		<compilerarg line="${build.args}"/>
709	–
721		</javac>
722		</target>
723
#	Line 730 | Line 741
741		encoding="ASCII"
742		executable="${javac8}"
743		fork="true">
733	–
744		<include name="**/*.java"/>
745		<compilerarg value="-Xprefer:source"/>
746		<compilerarg value="-XDignore.symbol.file=true"/>
747		<compilerarg value="-Xlint:all"/>
748	<	<compilerarg value="-Xdoclint:all/protected"/>
748	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
749		<compilerarg line="${build.args}"/>
740	–
750		</javac>
751		</target>
752
#	Line 753 | Line 762
762		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
763		</manifest>
764		</jar>
756	–
765		</target>
766
767
#	Line 769 | Line 777
777		<!-- JDK9+ test classes -->
778		<exclude name="*9Test.java"/>
779		<exclude name="*10Test.java"/>
780	+	<compilerarg value="-Werror"/>
781		</javac-elements>
782		</run-tck-tests>
783		</target>
#	Line 786 | Line 795
795
796		<target name="4jdk8-test"
797		depends="4jdk8-tck, 4jdk8-jtreg"
798	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
790	<	</target>
798	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
799
800
801		<target name="4jdk8docs"
#	Line 803 | Line 811
811		access="${build.javadoc.access}"
812		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
813		classpath=""
814	+	source="8"
815		executable="${javadoc8}"
816		failonerror = "true">
817		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
#	Line 830 | Line 839
839
840		<target name="4jdk8clean"
841		description="Removes all 4jdk8 build products">
833	–
842		<delete dir="${build.4jdk8.dir}"/>
835	–
843		</target>
844
845
#	Line 848 | Line 855
855		</target>
856
857
858	+	<!-- jsr166 4jdk7 (no longer maintained) -->
859
860	<	<!-- jsr166 4jdk7 -->
853	<
854	<	<target name="4jdk7compile"
855	<	depends="configure-compiler"
856	<	description="Compiles src/jdk7 sources, targeting jdk7">
857	<
860	>	<target name="4jdk7compile" depends="configure-compiler">
861		<mkdir dir="${build.4jdk7.classes.dir}"/>
862
863		<javac srcdir="${4jdk7src.dir}"
#	Line 878 | Line 881
881		<compilerarg value="-Xlint:all"/>
882		<compilerarg value="-Werror"/>
883		<compilerarg line="${build.args}"/>
881	–
884		</javac>
885		</target>
886
887	<	<target name="4jdk7doclint"
886	<	depends="configure-compiler"
887	<	description="Finds doclint warnings">
888	<
887	>	<target name="4jdk7doclint" depends="configure-compiler">
888		<mkdir dir="${build.4jdk7.classes.dir}"/>
889
890		<javac srcdir="${4jdk7src.dir}"
#	Line 909 | Line 908
908		<compilerarg value="-Xlint:all"/>
909		<compilerarg value="-Xdoclint:all/protected"/>
910		<compilerarg line="${build.args}"/>
912	–
911		</javac>
912		</target>
913
914	<
917	<	<target name="4jdk7jar"
918	<	depends="4jdk7compile"
919	<	description="Builds library jar from compiled sources">
920	<
914	>	<target name="4jdk7jar" depends="4jdk7compile">
915		<jar destfile="${4jdk7product.jar}">
916		<fileset dir="${build.4jdk7.classes.dir}"/>
917		<manifest>
#	Line 925 | Line 919
919		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
920		</manifest>
921		</jar>
928	–
922		</target>
923
924	<
932	<	<target name="4jdk7-tck"
933	<	depends="4jdk7jar"
934	<	description="Runs tck tests for jsr166-4jdk7 directly">
935	<
924	>	<target name="4jdk7-tck" depends="4jdk7jar">
925		<run-tck-tests
926		target="7"
927		workdir="${build.4jdk7.dir}"
#	Line 950 | Line 939
939		<exclude name="SplittableRandomTest.java"/>
940		<exclude name="StampedLockTest.java"/>
941		<exclude name="SubmissionPublisherTest.java"/>
942	+	<compilerarg value="-Werror"/>
943		</javac-elements>
944		</run-tck-tests>
945		</target>
946
957	–
947		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
948	<	<target name="4jdk7-tck-junit"
960	<	depends="4jdk7compile">
948	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
949
950		<junit printsummary="true"
951		showoutput="true"
#	Line 979 | Line 967
967
968		<test name="${jsr166.tckTestClass}" haltonfailure="no">
969		</test>
982	–
970		</junit>
971		</target>
972
973	<	<target name="4jdk7-jtreg"
987	<	depends="4jdk7jar"
988	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
973	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
974		<run-jtreg-tests
975		target="7"
976		workdir="${build.4jdk7.dir}"
977		classes="${4jdk7product.jar}"/>
978		</target>
979
980	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
981
982	<	<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	<
982	>	<target name="4jdk7docs">
983		<delete dir="${4jdk7docs.dir}"/>
984		<mkdir dir="${4jdk7docs.dir}"/>
985
#	Line 1022 | Line 1000
1000		</javadoc>
1001		</target>
1002
1003	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1004
1005	<	<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	<
1005	>	<target name="4jdk7clean">
1006		<delete dir="${build.4jdk7.dir}"/>
1035	–
1007		</target>
1008
1009	<
1039	<	<target name="4jdk7dist-jar"
1040	<	depends="4jdk7clean, 4jdk7jar">
1009	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1010		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1011		</target>
1012
1013	<
1045	<	<target name="4jdk7dist-docs"
1046	<	depends="4jdk7clean, 4jdk7docs">
1013	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1014		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1015		</target>
1016
1017
1018	<	<!-- jsr166x -->
1052	<
1053	<	<target name="jsr166xcompile"
1054	<	depends="configure-compiler"
1055	<	description="Compiles jsr166x sources to build dir">
1018	>	<!-- jsr166x (no longer maintained) -->
1019
1020	+	<target name="jsr166xcompile" depends="configure-compiler">
1021		<mkdir dir="${build.jsr166x.classes.dir}"/>
1022
1023		<javac srcdir="${topsrc.dir}"
#	Line 1070 | Line 1034
1034		encoding="ASCII"
1035		executable="${javac7}"
1036		fork="true">
1073	–
1037		<include name="jsr166x/**/*.java"/>
1038		<compilerarg value="-XDignore.symbol.file=true"/>
1039		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1040		<compilerarg value="-Werror"/>
1041		<compilerarg line="${build.args}"/>
1079	–
1042		</javac>
1043		</target>
1044
1045	<
1084	<	<target name="jsr166xjar"
1085	<	depends="jsr166xcompile"
1086	<	description="Builds library jar from compiled sources">
1087	<
1045	>	<target name="jsr166xjar" depends="jsr166xcompile">
1046		<jar destfile="${jsr166x.jar}">
1047		<fileset dir="${build.jsr166x.classes.dir}"/>
1048		<manifest>
#	Line 1092 | Line 1050
1050		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1051		</manifest>
1052		</jar>
1095	–
1053		</target>
1054
1055	<
1099	<	<target name="jsr166xdocs"
1100	<	description="Builds javadocs to dist dir">
1101	<
1055	>	<target name="jsr166xdocs">
1056		<delete dir="${jsr166xdocs.dir}"/>
1057		<mkdir dir="${jsr166xdocs.dir}"/>
1058
#	Line 1113 | Line 1067
1067		failonerror = "true">
1068		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1069		<arg value="-XDignore.symbol.file=true"/>
1116	–
1070		</javadoc>
1071		</target>
1072
1073	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1074
1075	<	<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	<
1075	>	<target name="jsr166xclean">
1076		<delete dir="${build.jsr166x.dir}"/>
1130	–
1077		</target>
1078
1079	<
1134	<	<target name="jsr166xdist-jar"
1135	<	depends="jsr166xclean, jsr166xjar">
1079	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1080		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1081		</target>
1082
1083	<	<target name="jsr166xdist-docs"
1140	<	depends="jsr166xclean, jsr166xdocs">
1083	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1084		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1085		</target>
1086
1144	–	<!-- jsr166y -->
1087
1088	+	<!-- jsr166y (no longer maintained) -->
1089
1090	<	<target name="jsr166ycompile"
1148	<	depends="configure-compiler"
1149	<	description="Compiles jsr166y sources">
1150	<
1090	>	<target name="jsr166ycompile" depends="configure-compiler">
1091		<mkdir dir="${build.jsr166y.classes.dir}"/>
1092
1093		<javac srcdir="${topsrc.dir}"
#	Line 1170 | Line 1110
1110		<compilerarg value="-Xlint:all"/>
1111		<compilerarg value="-Werror"/>
1112		<compilerarg line="${build.args}"/>
1173	–
1113		</javac>
1114		</target>
1115
1116	<
1178	<	<target name="jsr166yjar"
1179	<	depends="jsr166ycompile"
1180	<	description="Builds library jar from compiled sources">
1181	<
1116	>	<target name="jsr166yjar" depends="jsr166ycompile">
1117		<jar destfile="${jsr166y.jar}" index="true">
1118		<fileset dir="${build.jsr166y.classes.dir}"/>
1119		<manifest>
#	Line 1186 | Line 1121
1121		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1122		</manifest>
1123		</jar>
1189	–
1124		</target>
1125
1126	<
1193	<	<target name="jsr166ydocs"
1194	<	description="Builds javadocs to dist dir">
1195	<
1126	>	<target name="jsr166ydocs">
1127		<delete dir="${jsr166ydocs.dir}"/>
1128		<mkdir dir="${jsr166ydocs.dir}"/>
1129
#	Line 1207 | Line 1138
1138		failonerror = "true">
1139		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1140		<arg value="-XDignore.symbol.file=true"/>
1210	–
1141		</javadoc>
1142		</target>
1143
1144	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1145
1146	<	<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	<
1146	>	<target name="jsr166yclean">
1147		<delete dir="${build.jsr166y.dir}"/>
1224	–
1148		</target>
1149
1150	<
1228	<	<target name="jsr166ydist-jar"
1229	<	depends="jsr166yclean, jsr166yjar">
1150	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1151		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1152		</target>
1153
1154	<	<target name="jsr166ydist-docs"
1234	<	depends="jsr166yclean, jsr166ydocs">
1154	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1155		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1156		</target>
1157
1158
1159	<	<!-- extra166y -->
1240	<
1241	<
1242	<	<target name="extra166ycompile"
1243	<	depends="configure-compiler, jsr166yjar"
1244	<	description="Compiles extra166y sources">
1159	>	<!-- extra166y (no longer maintained) -->
1160
1161	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1162		<mkdir dir="${build.extra166y.classes.dir}"/>
1163
1164		<javac srcdir="${topsrc.dir}"
#	Line 1265 | Line 1181
1181		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1182		<compilerarg value="-Werror"/>
1183		<compilerarg line="${build.args}"/>
1268	–
1184		</javac>
1185		</target>
1186
1187	<
1273	<	<target name="extra166yjar"
1274	<	depends="extra166ycompile"
1275	<	description="Builds library jar from compiled sources">
1276	<
1187	>	<target name="extra166yjar" depends="extra166ycompile">
1188		<jar destfile="${extra166y.jar}" index="true">
1189		<fileset dir="${build.extra166y.classes.dir}"/>
1190		<manifest>
#	Line 1281 | Line 1192
1192		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1193		</manifest>
1194		</jar>
1284	–
1195		</target>
1196
1197	<
1288	<	<target name="extra166ydocs"
1289	<	description="Builds javadocs to build dir">
1290	<
1197	>	<target name="extra166ydocs">
1198		<delete dir="${extra166ydocs.dir}"/>
1199		<mkdir dir="${extra166ydocs.dir}"/>
1200
#	Line 1301 | Line 1208
1208		executable="${javadoc7}">
1209		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1210		<arg value="-XDignore.symbol.file=true"/>
1304	–
1211		</javadoc>
1212		</target>
1213
1214	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1215
1216	<	<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	<
1216	>	<target name="extra166yclean">
1217		<delete dir="${build.extra166y.dir}"/>
1318	–
1218		</target>
1219
1220	<
1322	<	<target name="extra166ydist-jar"
1323	<	depends="extra166yclean, extra166yjar">
1220	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1221		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1222		</target>
1223
1224	<	<target name="extra166ydist-docs"
1328	<	depends="extra166yclean, extra166ydocs">
1224	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1225		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1226		</target>
1227
1228	<	<!-- jsr166e -->
1228	>
1229	>	<!-- jsr166e (no longer maintained) -->
1230
1231		<property name="build.jsr166e.java.version" value="6"/>
1232		<property name="build.jsr166e.javac" value="${javac6}"/>
1233
1234	<	<target name="jsr166ecompile"
1338	<	depends="configure-compiler"
1339	<	description="Compiles jsr166e sources">
1340	<
1234	>	<target name="jsr166ecompile" depends="configure-compiler">
1235		<mkdir dir="${build.jsr166e.classes.dir}"/>
1236
1237		<javac srcdir="${topsrc.dir}"
#	Line 1358 | Line 1252
1252		<compilerarg value="-Xlint:all"/>
1253		<compilerarg value="-Werror"/>
1254		<compilerarg line="${build.args}"/>
1361	–
1255		</javac>
1256		</target>
1257
1365	–	<!-- jsr166e: find doclint errors -->
1258		<target name="jsr166edoclint">
1367	–
1259		<mkdir dir="${build.jsr166e.classes.dir}"/>
1260
1261		<javac srcdir="${topsrc.dir}"
#	Line 1386 | Line 1277
1277		<compilerarg value="-Xlint:all"/>
1278		<compilerarg value="-Werror"/>
1279		<compilerarg value="-Xdoclint:all/protected"/>
1389	–
1280		</javac>
1281		</target>
1282
1283	<
1394	<	<target name="jsr166ejar"
1395	<	depends="jsr166ecompile"
1396	<	description="Builds library jar from compiled sources">
1397	<
1283	>	<target name="jsr166ejar" depends="jsr166ecompile">
1284		<jar destfile="${jsr166e.jar}" index="true">
1285		<fileset dir="${build.jsr166e.classes.dir}"/>
1286		<manifest>
#	Line 1402 | Line 1288
1288		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1289		</manifest>
1290		</jar>
1405	–
1291		</target>
1292
1293	<
1409	<	<target name="jsr166edocs"
1410	<	description="Builds javadocs to build dir">
1411	<
1293	>	<target name="jsr166edocs">
1294		<delete dir="${jsr166edocs.dir}"/>
1295		<mkdir dir="${jsr166edocs.dir}"/>
1296
#	Line 1422 | Line 1304
1304		failonerror = "true">
1305		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1306		<arg value="-XDignore.symbol.file=true"/>
1425	–
1307		</javadoc>
1308		</target>
1309
1310	<
1430	<	<target name="jsr166e-tck-one-java-version"
1431	<	depends="jsr166ejar">
1432	<
1310	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1311		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1434	–
1312		<run-tck-tests
1313		tck.src.dir="${test.src.dir}/tck-jsr166e"
1314		target="${build.jsr166e.java.version}"
#	Line 1439 | Line 1316
1316		classes="${jsr166e.jar}"/>
1317		</target>
1318
1319	<	<target name="jsr166e-tck"
1443	<	description="Runs tck tests for jsr166e for multiple java versions">
1319	>	<target name="jsr166e-tck">
1320
1321		<!--     <antcall target="clean"/> -->
1322		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1461 | Line 1337
1337		</antcall>
1338		</target>
1339
1340	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1341
1342	<	<target name="jsr166e-test"
1466	<	depends="jsr166e-tck"
1467	<	description="Runs all tests for jsr166e">
1468	<	</target>
1342	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1343
1344	<	<target name="jsr166edist"
1471	<	depends="jsr166edist-jar, jsr166edist-docs"
1472	<	description="Puts all distributable products in single hierarchy"/>
1473	<
1474	<
1475	<	<target name="jsr166eclean"
1476	<	description="Removes all jsr166e build products">
1344	>	<target name="jsr166eclean">
1345		<delete dir="${build.jsr166e.dir}"/>
1346		</target>
1347
1480	–
1348		<target name="jsr166edist-jar"
1349		depends="jsr166eclean, jsr166ejar">
1350		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1351		</target>
1352
1353	<	<target name="jsr166edist-docs"
1487	<	depends="jsr166eclean, jsr166edocs">
1353	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1354		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1355		</target>
1356
#	Line 1505 | Line 1371
1371		</target>
1372
1373
1374	+	<!-- ==============================================================
1375	+	Experimental errorprone support - http://errorprone.info
1376	+	=================================================================== -->
1377	+	<target name="errorprone"
1378	+	depends="clean, configure-compiler"
1379	+	description="Run errorprone over jsr166 source code (experimental)">
1380	+
1381	+	<local name="destdir"/>
1382	+	<property name="destdir" value="${build.classes.dir}/java.base"/>
1383	+	<mkdir dir="${destdir}"/>
1384	+
1385	+	<javac srcdir="${src.dir}"
1386	+	destdir="${destdir}"
1387	+	debug="${build.debug}"
1388	+	debuglevel="${build.debuglevel}"
1389	+	deprecation="${build.deprecation}"
1390	+	classpath=""
1391	+	includeAntRuntime="false"
1392	+	includeJavaRuntime="false"
1393	+	encoding="ASCII"
1394	+	executable="${build.main.javac}"
1395	+	fork="true">
1396	+
1397	+	<include name="**/*.java"/>
1398	+	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/>
1399	+	<compilerarg value="-Xplugin:ErrorProne
1400	+	-Xep:IdentityBinaryExpression:WARN
1401	+	-Xep:MissingOverride:OFF
1402	+	-Xep:MixedArrayDimensions:WARN
1403	+	-Xep:RemoveUnusedImports:ERROR
1404	+	-Xep:ClassName:ERROR
1405	+	-Xep:MultipleTopLevelClasses:ERROR
1406	+	-Xep:EmptyIf:ERROR
1407	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1408	+	-Xep:RedundantThrows:ERROR
1409	+	-Xep:MethodCanBeStatic:WARN"/>
1410	+	<compilerarg value="--patch-module=java.base=${src.dir}"/>
1411	+	<compilerarg value="-Xprefer:source"/>
1412	+	<compilerarg value="-XDignore.symbol.file=true"/>
1413	+	<compilerarg value="-Xlint:all"/>
1414	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
1415	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1416	+	<compilerarg line="${build.args}"/>
1417	+	</javac>
1418	+
1419	+	<jar destfile="${product.jar}">
1420	+	<fileset dir="${destdir}"/>
1421	+	</jar>
1422	+
1423	+	<run-tck-tests
1424	+	target="${build.main.java.version}"
1425	+	workdir="${build.dir}"
1426	+	classes="${product.jar}">
1427	+	<javac-elements>
1428	+	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/>
1429	+	<compilerarg value="-Xplugin:ErrorProne
1430	+	-Xep:IdentityBinaryExpression:WARN
1431	+	-Xep:BoxedPrimitiveConstructor:OFF
1432	+	-Xep:HashtableContains:OFF
1433	+	-Xep:ModifyingCollectionWithItself:OFF
1434	+	-Xep:MissingOverride:OFF
1435	+	-Xep:MixedArrayDimensions:WARN
1436	+	-Xep:RemoveUnusedImports:ERROR
1437	+	-Xep:ClassName:ERROR
1438	+	-Xep:MultipleTopLevelClasses:ERROR
1439	+	-Xep:EmptyIf:ERROR
1440	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1441	+	-Xep:RedundantThrows:ERROR
1442	+	-Xep:MethodCanBeStatic:WARN"/>
1443	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1444	+	</javac-elements>
1445	+	</run-tck-tests>
1446	+	</target>
1447	+
1448	+
1449	+	<!-- ==============================================================
1450	+	Running guava tests against jsr166 code
1451	+	=================================================================== -->
1452	+
1453	+	<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1454	+	<!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1455	+	<!-- <property name="guava.version" value="21.0"/> -->
1456	+
1457	+	<!-- HOWTO debug print a path id -->
1458	+	<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1459	+	<!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1460	+
1461	+	<!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1462	+	<!--   organisation="com.google.guava" module="guava-tests"/> -->
1463	+	<!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1464	+	<!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1465	+	<!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1466	+	<!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1467	+
1468	+	<!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1469	+	<!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1470	+	<!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1471	+	<!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1472	+
1473	+	<!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1474	+	<!--   type="*" inline="true" conf="*(private),*(public)" -->
1475	+	<!--   pattern="${guava.dir}/[artifact].[ext]" -->
1476	+	<!--   organisation="com.google.guava" module="guava-testlib"/> -->
1477	+
1478	+	<!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1479	+	<!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1480	+	<!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1481	+
1482	+	<target name="init-ivy">
1483	+	<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1484	+	dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1485	+	<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1486	+	classpath="${build.dir}/ivy.jar"/>
1487	+	</target>
1488	+
1489	+	<target name="guava-tests" depends="jar, init-ivy"
1490	+	description="Guava tests run against jsr166 collections">
1491	+	<property name="guava.dir" value="${build.dir}/guava-testlib"/>
1492	+	<mkdir dir="${guava.dir}"/>
1493	+	<ivy:retrieve pathid="guava.testlib.classpath"
1494	+	type="jar,bundle" inline="true" conf="default,master"
1495	+	pattern="${guava.dir}/[artifact].[ext]"
1496	+	organisation="com.google.guava" module="guava-testlib"/>
1497	+	<property name="guava.version" value="21.0"/>
1498	+	<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1499	+	dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1500	+	<junit printsummary="true" showoutput="true" haltonfailure="true"
1501	+	jvm="${build.main.java}" fork="true">
1502	+	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1503	+	<formatter type="brief"/>
1504	+	<classpath>
1505	+	<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1506	+	<path refid="guava.testlib.classpath"/>
1507	+	</classpath>
1508	+
1509	+	<!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1510	+	<test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1511	+	</junit>
1512	+	</target>
1513	+
1514		</project>

Diff Legend

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