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.201 by dl, Sat Mar 26 12:35:25 2016 UTC vs.
Revision 1.237 by jsr166, Fri Mar 24 15:57: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 7 | Line 8
8
9		Usage: ant [target]
10
11	+	See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
12	+	more details.
13	+
14		User-specific settings are read from user.properties.
15		See user.properties.sample for an explanation of some useful settings.
16
#	Line 14 | 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:
17	–	$HOME/jdk/jdk6
21		$HOME/jdk/jdk7
22		$HOME/jdk/jdk8
23		$HOME/jdk/jdk9
24	+	$HOME/jdk/jdk10
25		where each of the above is a JDK or a symlink to same, and
22	–	$HOME/jdk/src/jdk6
26		$HOME/jdk/src/jdk7
27		$HOME/jdk/src/jdk8
28		$HOME/jdk/src/jdk9
29	+	$HOME/jdk/src/jdk10
30		where each of the above is a complete JDK source tree
31		(e.g. mercurial forest) or a symlink to same.
32
33		Alternatively, define ant variables thus:
34		ant -Djdk$N.home=... -Djdk$N.src.home=...
35	<	for $N in 6 7 8 9 ...
35	>	for $N in 7 8 9 10 ...
36
37	<	As of 2015-09, there is incomplete hacky support for jigsaw
34	<	Build for jigsaw using something like:
35	<	ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist
36	<	"docs" target is still broken.
37	>	As of 2016-03, the sources in src/main are for jdk9+ only.
38		------------------------------------------------------------------------------
39		</description>
40
41	<	<!-- Display main targets by running 'ant -projecthelp' -->
41	>	<!-- Run 'ant -projecthelp' (default target) -->
42		<target name="usage">
43		<java classname="org.apache.tools.ant.Main">
44		<arg value="-projecthelp" />
#	Line 62 | Line 63
63		<property name="build.classes.dir"           location="${build.dir}/classes"/>
64		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
65		<property name="build.loops.dir"             location="${build.dir}/loops"/>
65	–	<property name="build.reports.dir"           location="${build.dir}/reports"/>
66
67		<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68		<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
#	Line 133 | Line 133
133		<defjdklocations v="7"/>
134		<defjdklocations v="8"/>
135		<defjdklocations v="9"/>
136	+	<defjdklocations v="10"/>
137
138		<!-- Source locations -->
139		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 142 | Line 143
143		<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
144		<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
145		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
146	+	<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
147		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
148		<property name="lib.dir"              location="${basedir}/lib"/>
149		<property name="dist.dir"             location="${basedir}/dist"/>
#	Line 185 | Line 187
187		<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
188		<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
189		<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
190	<	<!-- The expected canonical location does not yet exist as of 2016-03 -->
190	>	<!-- The expected canonical location does not yet exist as of 2016-04 -->
191		<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
192	<	<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
192	>	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
193		<!-- Default jdk doc location (latest stable release seems best) -->
194		<property name="java.docroot.url"       value="${java8.docroot.url}"/>
195
#	Line 244 | Line 246
246		classpath="${junit.jar}"
247		includeAntRuntime="false"
248		includeJavaRuntime="false"
249	+	encoding="ASCII"
250		executable="${javac@{compile-target}}"
251		fork="true">
252
253		<include name="*.java"/>
254		<compilerarg value="-XDignore.symbol.file=true"/>
255		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
256	+	<compilerarg value="-Xdoclint:reference/private"/>
257		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
258	<	<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
258	>	<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
259		<compilerarg line="${build.args}"/>
260		<javac-elements/>
261
#	Line 262 | Line 266
266		jvm="${java@{target}}"
267		fork="true">
268		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
269	<	<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
269	>	<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
270	>	<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
271	>	<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
272	>	<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
273	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
274	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
275		<jvmarg line="@{jvmflags}"/>
276	+	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
277	+	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
278
279	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
279	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
280		<syspropertyset id="system-properties-used-by-tck">
281		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
282		<propertyref prefix="jsr166."/>
#	Line 291 | Line 302
302		<fileset dir="${jtreg8.src.dir}">
303		<patternset id="jdk8.jtreg.tests">
304		<include name="**/*.java"/>
294	–	<exclude name="**/SpliteratorCharacteristics.java"/>
295	–	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
296	–	<exclude name="**/GCDuringIteration.java"/>
305		</patternset>
306		</fileset>
307
#	Line 325 | Line 333
333		</condition>
334
335		<delete dir="@{workdir}/JTwork"   quiet="true"/>
328	–	<delete dir="@{workdir}/JTreport" quiet="true"/>
329	–	<mkdir dir="@{workdir}/JTwork/scratch"/>
330	–	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
331	–	<mkdir dir="@{workdir}/JTreport/html"/>
332	–	<mkdir dir="@{workdir}/JTreport/text"/>
336		<jtreg dir="${jtreg@{target}.src.dir}"
337		jdk="${jdk@{target}.home}"
338	<	workDir="@{workdir}/JTwork"
336	<	reportDir="@{workdir}/JTreport">
338	>	workDir="@{workdir}/JTwork">
339		<patternset refid="jdk@{target}.jtreg.tests"/>
340		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
341	<	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
341	>	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
342	>	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
343		<arg value="-agentvm"/>
344	+	<arg value="-noreport"/>
345		<arg value="-verbose:${jtreg.verbose}"/>
346		<arg value="-vmoptions:-esa -ea"/>
347		<arg value="-automatic"/>
#	Line 392 | Line 396
396		classpath=""
397		includeAntRuntime="false"
398		includeJavaRuntime="false"
399	+	encoding="ASCII"
400		executable="${build.main.javac}"
401		fork="true">
402
403		<include name="**/*.java"/>
404	<	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
404	>	<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
405		<compilerarg value="-Xprefer:source"/>
406		<compilerarg value="-XDignore.symbol.file=true"/>
407		<compilerarg value="-Xlint:all"/>
408		<compilerarg value="-Werror"/>
409	<	<compilerarg value="-Xdoclint:all/protected"/>
409	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
410		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
411		<compilerarg line="${build.args}"/>
412
413		</javac>
409	–
410	–	<!-- We need jdk9's Contended annotation, but at compile time only -->
411	–	<!--
412	–	<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
413	–	-->
414		</target>
415
416
417		<target name="jar"
418		depends="compile"
419	<	description="Builds library jar from compiled sources">
420	<
419	>	description="Builds library jar for src/main from compiled sources">
420	>	<local name="subdir"/>
421	>	<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
422		<jar destfile="${product.jar}">
423	<	<fileset dir="${build.classes.dir}"/>
423	>	<fileset dir="${build.classes.dir}${subdir}"/>
424		<manifest>
425		<attribute name="Built-By" value="${user.name}"/>
426		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
#	Line 437 | Line 438
438		<!-- the packagenames="none" hack below prevents scanning the -->
439		<!-- sourcepath for packages -->
440
441	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
442	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
443	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
444	+	<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
445	+	<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
446		<javadoc destdir="${docs.dir}"
447		packagenames="none"
448		link="${java9.api.url}"
449		overview="${src.dir}/intro.html"
450		access="${build.javadoc.access}"
451	<	sourcepath="${src.dir}:${jdk9.src.dir}"
451	>	sourcepath="${src.dir}"
452		classpath=""
453		executable="${javadoc9}">
454		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 451 | Line 457
457		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
458		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
459		<arg value="-XDignore.symbol.file=true"/>
460	<	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
460	>	<arg value="--patch-module=java.base=${src.dir}"/>
461		<arg value="-tag"/>
462		<arg value="${javadoc.jls.option}"/>
463	+	<!-- @apiNote currently unused -->
464	+	<!--       <arg value="-tag"/> -->
465	+	<!--       <arg value="apiNote:a:API Note:"/> -->
466		<arg value="-tag"/>
467	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
459	<	<arg value="-tag"/>
460	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
461	<	<arg value="-tag"/>
462	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
463	<	<!-- tags added in jdk9 -->
464	<	<arg value="-tag"/>
465	<	<arg value="revised:X"/>
467	>	<arg value="implSpec:a:Implementation Requirements:"/>
468		<arg value="-tag"/>
469	<	<arg value="spec:X"/>
469	>	<arg value="implNote:a:Implementation Note:"/>
470	>	<!-- tags added in jdk9: currently unused -->
471	>	<!--       <arg value="-tag"/> -->
472	>	<!--       <arg value="revised:X"/> -->
473	>	<!--       <arg value="-tag"/> -->
474	>	<!--       <arg value="spec:X"/> -->
475		</javadoc>
476		</target>
477
#	Line 525 | Line 532
532
533		<target name="tck"
534		depends="jar"
535	<	description="Runs tck tests for main directly">
535	>	description="Runs tck tests for src/main directly">
536
537		<run-tck-tests
538		target="${build.main.java.version}"
539		workdir="${build.dir}"
540	<	classes="${product.jar}"/>
540	>	classes="${product.jar}">
541	>	<javac-elements>
542	>	<compilerarg value="-Werror"/>
543	>	</javac-elements>
544	>	</run-tck-tests>
545		</target>
546
547		<target name="tck-parallelism-1"
548	<	description="Runs tck with given common pool parallelism">
548	>	description="Runs tck with common pool parallelism 1">
549		<antcall target="tck">
550		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
551		</antcall>
552		</target>
553
554		<target name="tck-parallelism-0"
555	<	description="Runs tck with given common pool parallelism">
555	>	description="Runs tck with common pool parallelism 0">
556		<antcall target="tck">
557		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
558		</antcall>
559		</target>
560
561	+	<target name="tck-security-manager"
562	+	description="Runs tck with a security manager">
563	+	<antcall target="tck">
564	+	<param name="jsr166.useSecurityManager" value="true"/>
565	+	</antcall>
566	+	</target>
567	+
568		<target name="jtreg"
569		depends="jar"
570	<	description="Runs jtreg tests for main using the jtreg ant task">
570	>	description="Runs jtreg tests for src/main using the jtreg ant task">
571		<run-jtreg-tests
572		target="${build.main.java.version}"
573		workdir="${build.dir}"
#	Line 557 | Line 575
575		</target>
576
577		<target name="test"
578	<	depends="tck, tck-parallelism-1, jtreg"
579	<	description="Runs tck and jtreg tests for main">
578	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
579	>	description="Runs tck and jtreg tests for src/main">
580		</target>
581
582	<	<target name="jtreg8" description="Runs jtreg tests with jdk8">
582	>	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
583
584	<	<antcall target="jtreg">
585	<	<param name="build.main.java.version" value="8"/>
586	<	<param name="build.main.javac" value="${javac8}"/>
587	<	</antcall>
584	>	<!--     <antcall target="jtreg"> -->
585	>	<!--       <param name="build.main.java.version" value="8"/> -->
586	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
587	>	<!--     </antcall> -->
588
589	<	</target>
589	>	<!--   </target> -->
590
591	<	<target name="test89"
592	<	description="Runs tck and jtreg tests for main for multiple java versions">
591	>	<!--   <target name="test89" -->
592	>	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
593
594	<	<antcall target="clean"/>
595	<	<antcall target="test">
596	<	<param name="build.main.java.version" value="8"/>
597	<	<param name="build.main.javac" value="${javac8}"/>
598	<	</antcall>
594	>	<!--     <antcall target="clean"/> -->
595	>	<!--     <antcall target="test"> -->
596	>	<!--       <param name="build.main.java.version" value="8"/> -->
597	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
598	>	<!--     </antcall> -->
599
600	<	<antcall target="clean"/>
601	<	<antcall target="test">
602	<	<param name="build.main.java.version" value="9"/>
603	<	<param name="build.main.javac" value="${javac9}"/>
604	<	</antcall>
600	>	<!--     <antcall target="clean"/> -->
601	>	<!--     <antcall target="test"> -->
602	>	<!--       <param name="build.main.java.version" value="9"/> -->
603	>	<!--       <param name="build.main.javac" value="${javac9}"/> -->
604	>	<!--     </antcall> -->
605
606	<	</target>
606	>	<!--   </target> -->
607
608
609
610		<target name="configure-compiler">
611		<fail message="ant version too old">
612	<	<condition>
595	<	<not> <antversion atleast="1.9.1"/> </not>
596	<	</condition>
612	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
613		</fail>
614
615		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 615 | Line 631
631		<!-- Various demos and test programs -->
632
633
634	<	<target name="loops" depends="configure-compiler"
635	<	description="Benchmark from Doug Lea's AQS paper">
634	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
635	>	<target name="loops" depends="configure-compiler">
636
637		<mkdir dir="${build.loops.dir}"/>
638
#	Line 627 | Line 643
643		deprecation="${build.deprecation}"
644		source="${build.sourcelevel}"
645		target="${build.sourcelevel}"
646	+	encoding="ASCII"
647		fork="true">
648
649		<compilerarg line="${build.args}"/>
#	Line 654 | Line 671
671		deprecation="${build.deprecation}"
672		includeAntRuntime="false"
673		includeJavaRuntime="false"
674	+	encoding="ASCII"
675		executable="${javac9}"
676		fork="true">
677
#	Line 687 | Line 705
705		bootclasspath="${bootclasspath8}"
706		includeAntRuntime="false"
707		includeJavaRuntime="false"
708	+	encoding="ASCII"
709		executable="${javac8}"
710		fork="true">
711
#	Line 717 | Line 736
736		bootclasspath="${bootclasspath8}"
737		includeAntRuntime="false"
738		includeJavaRuntime="false"
739	+	encoding="ASCII"
740		executable="${javac8}"
741		fork="true">
742
#	Line 724 | Line 744
744		<compilerarg value="-Xprefer:source"/>
745		<compilerarg value="-XDignore.symbol.file=true"/>
746		<compilerarg value="-Xlint:all"/>
747	<	<compilerarg value="-Xdoclint:all/protected"/>
747	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
748		<compilerarg line="${build.args}"/>
749
750		</javac>
#	Line 758 | Line 778
778		<!-- JDK9+ test classes -->
779		<exclude name="*9Test.java"/>
780		<exclude name="*10Test.java"/>
781	+	<compilerarg value="-Werror"/>
782		</javac-elements>
783		</run-tck-tests>
784		</target>
#	Line 792 | Line 813
813		access="${build.javadoc.access}"
814		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
815		classpath=""
816	<	executable="${javadoc8}">
816	>	executable="${javadoc8}"
817	>	failonerror = "true">
818		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
819		<include name="**/*.java"/>
820		</fileset>
#	Line 800 | Line 822
822		<arg value="-XDignore.symbol.file=true"/>
823		<arg value="-tag"/>
824		<arg value="${javadoc.jls.option}"/>
825	<	<arg value="-tag"/>
826	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
825	>	<!-- @apiNote currently unused -->
826	>	<!--       <arg value="-tag"/> -->
827	>	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
828		<arg value="-tag"/>
829		<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
830		<arg value="-tag"/>
#	Line 855 | Line 878
878		bootclasspath="${bootclasspath6}"
879		includeAntRuntime="false"
880		includeJavaRuntime="false"
881	+	encoding="ASCII"
882		executable="${javac7}"
883		fork="true">
884
#	Line 885 | Line 909
909		bootclasspath="${bootclasspath6}"
910		includeAntRuntime="false"
911		includeJavaRuntime="false"
912	+	encoding="ASCII"
913		executable="${javac8}"
914		fork="true">
915
#	Line 935 | Line 960
960		<exclude name="SplittableRandomTest.java"/>
961		<exclude name="StampedLockTest.java"/>
962		<exclude name="SubmissionPublisherTest.java"/>
963	+	<compilerarg value="-Werror"/>
964		</javac-elements>
965		</run-tck-tests>
966		</target>
967
968
969	+	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
970		<target name="4jdk7-tck-junit"
971	<	depends="4jdk7compile"
945	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
971	>	depends="4jdk7compile">
972
973		<junit printsummary="true"
974		showoutput="true"
#	Line 997 | Line 1023
1023		access="${build.javadoc.access}"
1024		sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1025		classpath=""
1026	<	executable="${javadoc7}">
1026	>	executable="${javadoc7}"
1027	>	failonerror = "true">
1028		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1029		<include name="**/*.java"/>
1030		</fileset>
#	Line 1051 | Line 1078
1078		target="5"
1079		includeAntRuntime="false"
1080		includeJavaRuntime="false"
1081	+	encoding="ASCII"
1082		executable="${javac7}"
1083		fork="true">
1084
#	Line 1092 | Line 1120
1120		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1121		bootclasspath="${bootclasspath6}"
1122		source="5"
1123	<	executable="${javadoc7}">
1123	>	executable="${javadoc7}"
1124	>	failonerror = "true">
1125		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1126		<arg value="-XDignore.symbol.file=true"/>
1127
#	Line 1143 | Line 1172
1172		bootclasspath="${bootclasspath6}"
1173		includeAntRuntime="false"
1174		includeJavaRuntime="false"
1175	+	encoding="ASCII"
1176		executable="${javac7}"
1177		fork="true">
1178
#	Line 1184 | Line 1214
1214		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1215		bootclasspath="${bootclasspath6}"
1216		source="6"
1217	<	executable="${javadoc7}">
1217	>	executable="${javadoc7}"
1218	>	failonerror = "true">
1219		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1220		<arg value="-XDignore.symbol.file=true"/>
1221
#	Line 1236 | Line 1267
1267		target="6"
1268		includeAntRuntime="false"
1269		includeJavaRuntime="false"
1270	+	encoding="ASCII"
1271		executable="${javac7}"
1272		fork="true">
1273
#	Line 1397 | Line 1429
1429		access="${build.javadoc.access}"
1430		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1431		source="${build.jsr166e.java.version}"
1432	<	executable="${javadoc7}">
1432	>	executable="${javadoc7}"
1433	>	failonerror = "true">
1434		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1435		<arg value="-XDignore.symbol.file=true"/>
1436
#	Line 1483 | Line 1516
1516		</target>
1517
1518
1519	+	<!-- ==============================================================
1520	+	Experimental errorprone support - http://errorprone.info
1521	+	You may need to bring your own errorprone jar.
1522	+	=================================================================== -->
1523	+	<target name="errorprone"
1524	+	depends="clean, configure-compiler"
1525	+	description="Run errorprone over jsr166 source code">
1526	+
1527	+	<local name="destdir"/>
1528	+	<property name="destdir" value="${build.classes.dir}/java.base"/>
1529	+	<mkdir dir="${destdir}"/>
1530	+
1531	+	<javac srcdir="${src.dir}"
1532	+	destdir="${destdir}"
1533	+	debug="${build.debug}"
1534	+	debuglevel="${build.debuglevel}"
1535	+	deprecation="${build.deprecation}"
1536	+	classpath=""
1537	+	includeAntRuntime="false"
1538	+	includeJavaRuntime="false"
1539	+	encoding="ASCII"
1540	+	executable="${build.main.javac}"
1541	+	fork="true">
1542	+
1543	+	<include name="**/*.java"/>
1544	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1545	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1546	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1547	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1548	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1549	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1550	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1551	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1552	+	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1553	+	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1554	+	<compilerarg value="-Xplugin:ErrorProne
1555	+	-Xep:IdentityBinaryExpression:WARN
1556	+	-Xep:MissingOverride:OFF
1557	+	-Xep:MixedArrayDimensions:WARN
1558	+	-Xep:RemoveUnusedImports:ERROR
1559	+	-Xep:MethodCanBeStatic:WARN"/>
1560	+	<compilerarg value="--patch-module=java.base=${src.dir}"/>
1561	+	<compilerarg value="-Xprefer:source"/>
1562	+	<compilerarg value="-XDignore.symbol.file=true"/>
1563	+	<compilerarg value="-Xlint:all"/>
1564	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
1565	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1566	+	<compilerarg line="${build.args}"/>
1567	+	</javac>
1568	+
1569	+	<jar destfile="${product.jar}">
1570	+	<fileset dir="${destdir}"/>
1571	+	</jar>
1572	+
1573	+	<run-tck-tests
1574	+	target="${build.main.java.version}"
1575	+	workdir="${build.dir}"
1576	+	classes="${product.jar}">
1577	+	<javac-elements>
1578	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1579	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1580	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1581	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1582	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1583	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1584	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1585	+	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1586	+	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1587	+	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1588	+	<compilerarg value="-Xplugin:ErrorProne
1589	+	-Xep:IdentityBinaryExpression:WARN
1590	+	-Xep:BoxedPrimitiveConstructor:OFF
1591	+	-Xep:HashtableContains:OFF
1592	+	-Xep:ModifyingCollectionWithItself:OFF
1593	+	-Xep:MissingOverride:OFF
1594	+	-Xep:MixedArrayDimensions:WARN
1595	+	-Xep:RemoveUnusedImports:ERROR
1596	+	-Xep:MethodCanBeStatic:WARN"/>
1597	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1598	+	</javac-elements>
1599	+	</run-tck-tests>
1600	+	</target>
1601	+
1602	+
1603	+	<!-- ==============================================================
1604	+	Running guava tests against jsr166 code
1605	+	=================================================================== -->
1606	+
1607	+	<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1608	+	<!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1609	+	<!-- <property name="guava.version" value="21.0"/> -->
1610	+
1611	+	<!-- HOWTO debug print a path id -->
1612	+	<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1613	+	<!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1614	+
1615	+	<!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1616	+	<!--   organisation="com.google.guava" module="guava-tests"/> -->
1617	+	<!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1618	+	<!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1619	+	<!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1620	+	<!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1621	+
1622	+	<!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1623	+	<!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1624	+	<!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1625	+	<!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1626	+
1627	+	<!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1628	+	<!--   type="*" inline="true" conf="*(private),*(public)" -->
1629	+	<!--   pattern="${guava.dir}/[artifact].[ext]" -->
1630	+	<!--   organisation="com.google.guava" module="guava-testlib"/> -->
1631	+
1632	+	<!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1633	+	<!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1634	+	<!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1635	+
1636	+	<target name="init-ivy">
1637	+	<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1638	+	dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1639	+	<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1640	+	classpath="${build.dir}/ivy.jar"/>
1641	+	</target>
1642	+
1643	+	<target name="guava-tests" depends="jar, init-ivy"
1644	+	description="Guava tests run against jsr166 collections">
1645	+	<property name="guava.dir" value="${build.dir}/guava-testlib"/>
1646	+	<mkdir dir="${guava.dir}"/>
1647	+	<ivy:retrieve pathid="guava.testlib.classpath"
1648	+	type="jar,bundle" inline="true" conf="default,master"
1649	+	pattern="${guava.dir}/[artifact].[ext]"
1650	+	organisation="com.google.guava" module="guava-testlib"/>
1651	+	<property name="guava.version" value="21.0"/>
1652	+	<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1653	+	dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1654	+	<junit printsummary="true" showoutput="true" haltonfailure="true"
1655	+	jvm="${java9}" fork="true">
1656	+	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1657	+	<formatter type="brief"/>
1658	+	<classpath>
1659	+	<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1660	+	<path refid="guava.testlib.classpath"/>
1661	+	</classpath>
1662	+
1663	+	<!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1664	+	<test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1665	+	</junit>
1666	+	</target>
1667	+
1668		</project>

Diff Legend

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