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.238 by jsr166, Fri Mar 24 16:33:02 2017 UTC vs.
Revision 1.276 by jsr166, Wed Sep 26 06:40:33 2018 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"
3	>	xmlns:unless="ant:unless"
4		xmlns:ivy="antlib:org.apache.ivy.ant">
5
6		<description>
#	Line 18 | Line 19
19		itself.  Because the JDK version matters and because different
20		targets require different JDKs, we assume that users have created a
21		hierarchy containing:
21	–	$HOME/jdk/jdk7
22		$HOME/jdk/jdk8
23		$HOME/jdk/jdk9
24		$HOME/jdk/jdk10
25	+	$HOME/jdk/jdk11
26	+	$HOME/jdk/jdk12
27		where each of the above is a JDK or a symlink to same, and
26	–	$HOME/jdk/src/jdk7
28		$HOME/jdk/src/jdk8
29		$HOME/jdk/src/jdk9
30		$HOME/jdk/src/jdk10
31	+	$HOME/jdk/src/jdk11
32	+	$HOME/jdk/src/jdk12
33		where each of the above is a complete JDK source tree
34		(e.g. mercurial forest) or a symlink to same.
35
36		Alternatively, define ant variables thus:
37		ant -Djdk$N.home=... -Djdk$N.src.home=...
38	<	for $N in 7 8 9 10 ...
38	>	for $N in 8 9 10 ...
39
40		As of 2016-03, the sources in src/main are for jdk9+ only.
41		------------------------------------------------------------------------------
#	Line 103 | Line 106
106		<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
107		unless:set="have.java.base"/>
108		<local name="modules"/>
109	<	<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
109	>	<available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
110		<local name="boot.jar.dir"/>
111		<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
112		<path id="bootclasspath@{v}" unless:set="modules">
#	Line 134 | Line 137
137		<defjdklocations v="8"/>
138		<defjdklocations v="9"/>
139		<defjdklocations v="10"/>
140	+	<defjdklocations v="11"/>
141	+	<defjdklocations v="12"/>
142
143		<!-- Source locations -->
144		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 144 | Line 149
149		<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
150		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
151		<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
152	+	<property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
153	+	<property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
154		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
155		<property name="lib.dir"              location="${basedir}/lib"/>
156		<property name="dist.dir"             location="${basedir}/dist"/>
#	Line 183 | Line 190
190		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
191
192		<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
193	<	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
194	<	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
195	<	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
196	<	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
197	<	<!-- The expected canonical location does not yet exist as of 2016-04 -->
198	<	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
199	<	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
193	>	<!-- Switched to https: in 2017-10 - JDK-8190312 -->
194	>	<property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
195	>	<property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
196	>	<property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
197	>	<property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
198	>	<property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
199	>	<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
200	>	<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
201	>	<!-- The location of jdk early access docs (RIP) -->
202	>	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
203	>	<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
204	>	<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
205	>	<property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
206		<!-- Default jdk doc location (latest stable release seems best) -->
207	<	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
207	>	<property name="java.docroot.url"   value="${java11.docroot.url}"/>
208
209		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
210		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 199 | Line 212
212		<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
213		<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
214		<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
215	+	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
216	+	<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
217	+	<property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
218		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
219
220		<!-- Define the "jtreg" task -->
#	Line 231 | Line 247
247
248		<local name="modules"/>
249		<condition property="modules">
250	<	<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
250	>	<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
251		</condition>
252
253		<local name="use-doclint"/>
#	Line 298 | Line 314
314		</macrodef>
315
316		<!-- Define jtreg test sets for different jdk versions -->
317	<	<fileset dir="${jtreg9.src.dir}">
318	<	<patternset id="jdk9.jtreg.tests">
319	<	<include name="**/*.java"/>
320	<	</patternset>
321	<	</fileset>
322	<
323	<	<fileset dir="${jtreg8.src.dir}">
324	<	<patternset id="jdk8.jtreg.tests">
325	<	<include name="**/*.java"/>
326	<	</patternset>
327	<	</fileset>
317	>	<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
318	>	<!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
319	>	<property name="jtreg.test.pattern" value="**/*.java"/>
320	>	<macrodef name="defjtregtests">
321	>	<attribute name="v"/>
322	>	<sequential>
323	>	<fileset dir="${jtreg@{v}.src.dir}">
324	>	<patternset id="jdk@{v}.jtreg.tests">
325	>	<include name="${jtreg.test.pattern}"/>
326	>	</patternset>
327	>	</fileset>
328	>	</sequential>
329	>	</macrodef>
330
331	<	<fileset dir="${jtreg7.src.dir}">
332	<	<patternset id="jdk7.jtreg.tests">
333	<	<include name="**/*.java"/>
334	<	</patternset>
335	<	</fileset>
331	>	<defjtregtests v="12"/>
332	>	<defjtregtests v="11"/>
333	>	<defjtregtests v="10"/>
334	>	<defjtregtests v="9"/>
335	>	<defjtregtests v="8"/>
336	>	<defjtregtests v="7"/>
337
338		<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
339		<property name="jtreg.flags" value=""/>
340
341		<macrodef name="run-jtreg-tests">
342		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
324	–	<attribute name="source" default="7"/>
343		<attribute name="target"/>
344		<attribute name="workdir"/>
345		<attribute name="classes"/>
346	+	<attribute name="verbose" default="${jtreg.verbose}"/>
347		<attribute name="jtregflags" default=""/>
348	+	<element name="jtreg-elements" optional="true"/>
349
350		<sequential>
351
#	Line 334 | Line 354
354
355		<local name="modules"/>
356		<condition property="modules">
357	<	<available file="${jdk@{target}.home}/jmods" type="dir"/>
357	>	<available file="${jdk@{target}.home}/lib/modules" type="file"/>
358		</condition>
359
360		<delete dir="@{workdir}/JTwork"   quiet="true"/>
#	Line 343 | Line 363
363		workDir="@{workdir}/JTwork">
364		<patternset refid="jdk@{target}.jtreg.tests"/>
365		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
366	<	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
367	<	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
366	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
367	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
368		<arg value="-agentvm"/>
369		<arg value="-noreport"/>
370	<	<arg value="-verbose:${jtreg.verbose}"/>
370	>	<arg value="-verbose:@{verbose}"/>
371		<arg value="-vmoptions:-esa -ea"/>
372		<arg value="-automatic"/>
373		<arg value="-k:!ignore"/>
374		<arg line="@{jtregflags}"/>
375		<arg line="${jtreg.flags}"/>
376	+	<jtreg-elements/>
377		</jtreg>
378		</sequential>
379		</macrodef>
#	Line 369 | Line 390
390		<!-- Main targets -->
391
392		<property name="build.main.java.version" value="9"/>
393	<	<property name="build.main.javac" value="${javac9}"/>
393	>	<!-- Workaround "no nested properties in ant" -->
394	>	<macrodef name="define-build-main-properties">
395	>	<attribute name="v"/>
396	>	<sequential>
397	>	<property name="build.main.java"    value="${java@{v}}"/>
398	>	<property name="build.main.javac"   value="${javac@{v}}"/>
399	>	<!-- Force javadoc version to be at least 10,
400	>	so we can use override-methods=summary -->
401	>	<condition property="build.main.javadoc"
402	>	value="${javadoc11}"
403	>	else="${javadoc@{v}}">
404	>	<equals arg1="@{v}" arg2="9"/>
405	>	</condition>
406	>	</sequential>
407	>	</macrodef>
408	>	<define-build-main-properties v="${build.main.java.version}"/>
409
410		<target name="dists"
411	<	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
411	>	depends="dist, 4jdk8dist"
412		description="Builds all public jars and docs"/>
413	+	<!--
414	+	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
415	+	-->
416
417		<target name="compile"
418		depends="configure-compiler"
419		description="Compiles src/main sources to build dir">
420
382	–	<local name="modules"/>
383	–	<condition property="modules">
384	–	<and>
385	–	<available file="${jdk9.home}/jmods" type="dir"/>
386	–	<equals arg1="9" arg2="${build.main.java.version}"/>
387	–	</and>
388	–	</condition>
389	–
421		<local name="destdir"/>
422	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
392	<	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
422	>	<property name="destdir" value="${build.classes.dir}/java.base"/>
423
424		<mkdir dir="${destdir}"/>
425
#	Line 406 | Line 436
436		fork="true">
437
438		<include name="**/*.java"/>
439	<	<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
439	>	<compilerarg value="--patch-module=java.base=${src.dir}"/>
440		<compilerarg value="-Xprefer:source"/>
441		<compilerarg value="-XDignore.symbol.file=true"/>
442		<compilerarg value="-Xlint:all"/>
443	<	<compilerarg value="-Werror"/>
443	>	<compilerarg line="--doclint-format html5"/>
444		<compilerarg value="-Xdoclint:all/protected,reference/private"/>
445	+	<compilerarg value="-Werror"/>
446		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
447		<compilerarg line="${build.args}"/>
448
#	Line 455 | Line 486
486		access="${build.javadoc.access}"
487		sourcepath="${src.dir}"
488		classpath=""
489	<	executable="${javadoc9}">
489	>	source="9"
490	>	executable="${build.main.javadoc}">
491		<fileset dir="${src.dir}" defaultexcludes="yes">
492		<include name="**/*.java"/>
493		</fileset>
494		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
495		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
496		<arg value="-XDignore.symbol.file=true"/>
497	+	<arg value="-html5"/>
498		<arg value="--patch-module=java.base=${src.dir}"/>
499	<	<arg value="-tag"/>
500	<	<arg value="${javadoc.jls.option}"/>
501	<	<!-- @apiNote currently unused -->
502	<	<!--       <arg value="-tag"/> -->
503	<	<!--       <arg value="apiNote:a:API Note:"/> -->
471	<	<arg value="-tag"/>
472	<	<arg value="implSpec:a:Implementation Requirements:"/>
473	<	<arg value="-tag"/>
474	<	<arg value="implNote:a:Implementation Note:"/>
499	>	<arg value="--override-methods=summary"/>
500	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
501	>	<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
502	>	<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
503	>	<arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
504		<!-- tags added in jdk9: currently unused -->
505	<	<!--       <arg value="-tag"/> -->
506	<	<!--       <arg value="revised:X"/> -->
478	<	<!--       <arg value="-tag"/> -->
479	<	<!--       <arg value="spec:X"/> -->
505	>	<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
506	>	<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
507		</javadoc>
508		</target>
509
#	Line 510 | Line 537
537
538		<target name="clean"
539		description="Removes all build products">
513	–
540		<delete dir="${build.dir}"/>
515	–
541		</target>
542
543
544		<target name="dist-clean"
545		description="Removes all build and distribution products">
521	–
546		<delete dir="${build.dir}"/>
547		<delete dir="${dist.dir}"/>
524	–
548		</target>
549
550
#	Line 581 | Line 604
604
605		<target name="test"
606		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
607	<	description="Runs tck and jtreg tests for src/main">
585	<	</target>
607	>	description="Runs tck and jtreg tests for src/main"/>
608
609		<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
610
#	Line 593 | Line 615
615
616		<!--   </target> -->
617
618	<	<!--   <target name="test89" -->
619	<	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
618	>	<target name="test9101112"
619	>	description="Runs tck and jtreg tests for src/main for multiple java versions">
620
621	<	<!--     <antcall target="clean"/> -->
622	<	<!--     <antcall target="test"> -->
623	<	<!--       <param name="build.main.java.version" value="8"/> -->
624	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
603	<	<!--     </antcall> -->
621	>	<antcall target="clean"/>
622	>	<antcall target="test">
623	>	<param name="build.main.java.version" value="9"/>
624	>	</antcall>
625
626	<	<!--     <antcall target="clean"/> -->
627	<	<!--     <antcall target="test"> -->
628	<	<!--       <param name="build.main.java.version" value="9"/> -->
629	<	<!--       <param name="build.main.javac" value="${javac9}"/> -->
609	<	<!--     </antcall> -->
626	>	<antcall target="clean"/>
627	>	<antcall target="test">
628	>	<param name="build.main.java.version" value="10"/>
629	>	</antcall>
630
631	<	<!--   </target> -->
631	>	<antcall target="clean"/>
632	>	<antcall target="test">
633	>	<param name="build.main.java.version" value="11"/>
634	>	</antcall>
635	>
636	>	<antcall target="clean"/>
637	>	<antcall target="test">
638	>	<param name="build.main.java.version" value="12"/>
639	>	</antcall>
640	>
641	>	<!-- Clean up to avoid obscure wrong class file version bugs -->
642	>	<antcall target="clean"/>
643	>
644	>	</target>
645
646
647
#	Line 660 | Line 693
693		<java classname="ALoops" fork="true">
694		<classpath refid="loops.classpath"/>
695		</java>
663	–
696		</target>
697
698
699		<target name="compile-test-loops" depends="jar"
700	<	description="compile all the perf tests in src/test/loops">
700	>	description="Compiles all the perf tests in src/test/loops">
701
702		<mkdir dir="${build.dir}/test/loops"/>
703
#	Line 677 | Line 709
709		includeAntRuntime="false"
710		includeJavaRuntime="false"
711		encoding="ASCII"
712	<	executable="${javac9}"
712	>	executable="${build.main.javac}"
713		fork="true">
714
715		<include name="*.java"/>
#	Line 685 | Line 717
717		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
718		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
719		<compilerarg line="${build.args}"/>
688	–
720		</javac>
690	–
721		</target>
722
723
#	Line 713 | Line 743
743		encoding="ASCII"
744		executable="${javac8}"
745		fork="true">
716	–
746		<include name="**/*.java"/>
747		<compilerarg value="-Xprefer:source"/>
748		<compilerarg value="-XDignore.symbol.file=true"/>
749		<compilerarg value="-Xlint:all"/>
750		<compilerarg value="-Werror"/>
751		<compilerarg line="${build.args}"/>
723	–
752		</javac>
753		</target>
754
#	Line 744 | Line 772
772		encoding="ASCII"
773		executable="${javac8}"
774		fork="true">
747	–
775		<include name="**/*.java"/>
776		<compilerarg value="-Xprefer:source"/>
777		<compilerarg value="-XDignore.symbol.file=true"/>
778		<compilerarg value="-Xlint:all"/>
779		<compilerarg value="-Xdoclint:all/protected,reference/private"/>
780		<compilerarg line="${build.args}"/>
754	–
781		</javac>
782		</target>
783
#	Line 767 | Line 793
793		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
794		</manifest>
795		</jar>
770	–
796		</target>
797
798
#	Line 801 | Line 826
826
827		<target name="4jdk8-test"
828		depends="4jdk8-tck, 4jdk8-jtreg"
829	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
805	<	</target>
829	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
830
831
832		<target name="4jdk8docs"
#	Line 818 | Line 842
842		access="${build.javadoc.access}"
843		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
844		classpath=""
845	+	source="8"
846		executable="${javadoc8}"
847		failonerror = "true">
848		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
#	Line 825 | Line 850
850		</fileset>
851		<arg line="-Xdocrootparent ${java8.docroot.url}"/>
852		<arg value="-XDignore.symbol.file=true"/>
853	<	<arg value="-tag"/>
854	<	<arg value="${javadoc.jls.option}"/>
855	<	<!-- @apiNote currently unused -->
856	<	<!--       <arg value="-tag"/> -->
857	<	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
833	<	<arg value="-tag"/>
834	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
835	<	<arg value="-tag"/>
836	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
853	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
854	>	<arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
855	>	<arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
856	>	<!-- @apiNote tag currently unused -->
857	>	<!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
858		</javadoc>
859		</target>
860
#	Line 845 | Line 866
866
867		<target name="4jdk8clean"
868		description="Removes all 4jdk8 build products">
848	–
869		<delete dir="${build.4jdk8.dir}"/>
850	–
870		</target>
871
872
#	Line 863 | Line 882
882		</target>
883
884
885	+	<!-- jsr166 4jdk7 (no longer maintained) -->
886
887	<	<!-- jsr166 4jdk7 -->
868	<
869	<	<target name="4jdk7compile"
870	<	depends="configure-compiler"
871	<	description="Compiles src/jdk7 sources, targeting jdk7">
872	<
887	>	<target name="4jdk7compile" depends="configure-compiler">
888		<mkdir dir="${build.4jdk7.classes.dir}"/>
889
890		<javac srcdir="${4jdk7src.dir}"
#	Line 893 | Line 908
908		<compilerarg value="-Xlint:all"/>
909		<compilerarg value="-Werror"/>
910		<compilerarg line="${build.args}"/>
896	–
911		</javac>
912		</target>
913
914	<	<target name="4jdk7doclint"
901	<	depends="configure-compiler"
902	<	description="Finds doclint warnings">
903	<
914	>	<target name="4jdk7doclint" depends="configure-compiler">
915		<mkdir dir="${build.4jdk7.classes.dir}"/>
916
917		<javac srcdir="${4jdk7src.dir}"
#	Line 924 | Line 935
935		<compilerarg value="-Xlint:all"/>
936		<compilerarg value="-Xdoclint:all/protected"/>
937		<compilerarg line="${build.args}"/>
927	–
938		</javac>
939		</target>
940
941	<
932	<	<target name="4jdk7jar"
933	<	depends="4jdk7compile"
934	<	description="Builds library jar from compiled sources">
935	<
941	>	<target name="4jdk7jar" depends="4jdk7compile">
942		<jar destfile="${4jdk7product.jar}">
943		<fileset dir="${build.4jdk7.classes.dir}"/>
944		<manifest>
#	Line 940 | Line 946
946		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
947		</manifest>
948		</jar>
943	–
949		</target>
950
951	<
947	<	<target name="4jdk7-tck"
948	<	depends="4jdk7jar"
949	<	description="Runs tck tests for jsr166-4jdk7 directly">
950	<
951	>	<target name="4jdk7-tck" depends="4jdk7jar">
952		<run-tck-tests
953		target="7"
954		workdir="${build.4jdk7.dir}"
#	Line 970 | Line 971
971		</run-tck-tests>
972		</target>
973
973	–
974		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
975	<	<target name="4jdk7-tck-junit"
976	<	depends="4jdk7compile">
975	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
976
977		<junit printsummary="true"
978		showoutput="true"
#	Line 995 | Line 994
994
995		<test name="${jsr166.tckTestClass}" haltonfailure="no">
996		</test>
998	–
997		</junit>
998		</target>
999
1000	<	<target name="4jdk7-jtreg"
1003	<	depends="4jdk7jar"
1004	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
1000	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
1001		<run-jtreg-tests
1002		target="7"
1003		workdir="${build.4jdk7.dir}"
1004		classes="${4jdk7product.jar}"/>
1005		</target>
1006
1007	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1008
1009	<	<target name="4jdk7-test"
1013	<	depends="4jdk7-tck, 4jdk7-jtreg"
1014	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
1015	<	</target>
1016	<
1017	<
1018	<	<target name="4jdk7docs"
1019	<	description="Builds javadocs for src/jdk7 to dist dir">
1020	<
1009	>	<target name="4jdk7docs">
1010		<delete dir="${4jdk7docs.dir}"/>
1011		<mkdir dir="${4jdk7docs.dir}"/>
1012
#	Line 1038 | Line 1027
1027		</javadoc>
1028		</target>
1029
1030	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1031
1032	<	<target name="4jdk7dist"
1043	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1044	<	description="Puts all distributable products in single hierarchy"/>
1045	<
1046	<
1047	<	<target name="4jdk7clean"
1048	<	description="Removes all 4jdk7 build products">
1049	<
1032	>	<target name="4jdk7clean">
1033		<delete dir="${build.4jdk7.dir}"/>
1051	–
1034		</target>
1035
1036	<
1055	<	<target name="4jdk7dist-jar"
1056	<	depends="4jdk7clean, 4jdk7jar">
1036	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1037		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1038		</target>
1039
1040	<
1061	<	<target name="4jdk7dist-docs"
1062	<	depends="4jdk7clean, 4jdk7docs">
1040	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1041		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1042		</target>
1043
1044
1045	<	<!-- jsr166x -->
1068	<
1069	<	<target name="jsr166xcompile"
1070	<	depends="configure-compiler"
1071	<	description="Compiles jsr166x sources to build dir">
1045	>	<!-- jsr166x (no longer maintained) -->
1046
1047	+	<target name="jsr166xcompile" depends="configure-compiler">
1048		<mkdir dir="${build.jsr166x.classes.dir}"/>
1049
1050		<javac srcdir="${topsrc.dir}"
#	Line 1086 | Line 1061
1061		encoding="ASCII"
1062		executable="${javac7}"
1063		fork="true">
1089	–
1064		<include name="jsr166x/**/*.java"/>
1065		<compilerarg value="-XDignore.symbol.file=true"/>
1066		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1067		<compilerarg value="-Werror"/>
1068		<compilerarg line="${build.args}"/>
1095	–
1069		</javac>
1070		</target>
1071
1072	<
1100	<	<target name="jsr166xjar"
1101	<	depends="jsr166xcompile"
1102	<	description="Builds library jar from compiled sources">
1103	<
1072	>	<target name="jsr166xjar" depends="jsr166xcompile">
1073		<jar destfile="${jsr166x.jar}">
1074		<fileset dir="${build.jsr166x.classes.dir}"/>
1075		<manifest>
#	Line 1108 | Line 1077
1077		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1078		</manifest>
1079		</jar>
1111	–
1080		</target>
1081
1082	<
1115	<	<target name="jsr166xdocs"
1116	<	description="Builds javadocs to dist dir">
1117	<
1082	>	<target name="jsr166xdocs">
1083		<delete dir="${jsr166xdocs.dir}"/>
1084		<mkdir dir="${jsr166xdocs.dir}"/>
1085
#	Line 1129 | Line 1094
1094		failonerror = "true">
1095		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1096		<arg value="-XDignore.symbol.file=true"/>
1132	–
1097		</javadoc>
1098		</target>
1099
1100	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1101
1102	<	<target name="jsr166xdist"
1138	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1139	<	description="Puts all distributable products in single hierarchy"/>
1140	<
1141	<
1142	<	<target name="jsr166xclean"
1143	<	description="Removes all jsr166x build products">
1144	<
1102	>	<target name="jsr166xclean">
1103		<delete dir="${build.jsr166x.dir}"/>
1146	–
1104		</target>
1105
1106	<
1150	<	<target name="jsr166xdist-jar"
1151	<	depends="jsr166xclean, jsr166xjar">
1106	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1107		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1108		</target>
1109
1110	<	<target name="jsr166xdist-docs"
1156	<	depends="jsr166xclean, jsr166xdocs">
1110	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1111		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1112		</target>
1113
1160	–	<!-- jsr166y -->
1114
1115	+	<!-- jsr166y (no longer maintained) -->
1116
1117	<	<target name="jsr166ycompile"
1164	<	depends="configure-compiler"
1165	<	description="Compiles jsr166y sources">
1166	<
1117	>	<target name="jsr166ycompile" depends="configure-compiler">
1118		<mkdir dir="${build.jsr166y.classes.dir}"/>
1119
1120		<javac srcdir="${topsrc.dir}"
#	Line 1186 | Line 1137
1137		<compilerarg value="-Xlint:all"/>
1138		<compilerarg value="-Werror"/>
1139		<compilerarg line="${build.args}"/>
1189	–
1140		</javac>
1141		</target>
1142
1143	<
1194	<	<target name="jsr166yjar"
1195	<	depends="jsr166ycompile"
1196	<	description="Builds library jar from compiled sources">
1197	<
1143	>	<target name="jsr166yjar" depends="jsr166ycompile">
1144		<jar destfile="${jsr166y.jar}" index="true">
1145		<fileset dir="${build.jsr166y.classes.dir}"/>
1146		<manifest>
#	Line 1202 | Line 1148
1148		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1149		</manifest>
1150		</jar>
1205	–
1151		</target>
1152
1153	<
1209	<	<target name="jsr166ydocs"
1210	<	description="Builds javadocs to dist dir">
1211	<
1153	>	<target name="jsr166ydocs">
1154		<delete dir="${jsr166ydocs.dir}"/>
1155		<mkdir dir="${jsr166ydocs.dir}"/>
1156
#	Line 1223 | Line 1165
1165		failonerror = "true">
1166		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1167		<arg value="-XDignore.symbol.file=true"/>
1226	–
1168		</javadoc>
1169		</target>
1170
1171	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1172
1173	<	<target name="jsr166ydist"
1232	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1233	<	description="Puts all distributable products in single hierarchy"/>
1234	<
1235	<
1236	<	<target name="jsr166yclean"
1237	<	description="Removes all jsr166y build products">
1238	<
1173	>	<target name="jsr166yclean">
1174		<delete dir="${build.jsr166y.dir}"/>
1240	–
1175		</target>
1176
1177	<
1244	<	<target name="jsr166ydist-jar"
1245	<	depends="jsr166yclean, jsr166yjar">
1177	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1178		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1179		</target>
1180
1181	<	<target name="jsr166ydist-docs"
1250	<	depends="jsr166yclean, jsr166ydocs">
1181	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1182		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1183		</target>
1184
1185
1186	<	<!-- extra166y -->
1256	<
1257	<
1258	<	<target name="extra166ycompile"
1259	<	depends="configure-compiler, jsr166yjar"
1260	<	description="Compiles extra166y sources">
1186	>	<!-- extra166y (no longer maintained) -->
1187
1188	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1189		<mkdir dir="${build.extra166y.classes.dir}"/>
1190
1191		<javac srcdir="${topsrc.dir}"
#	Line 1281 | Line 1208
1208		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1209		<compilerarg value="-Werror"/>
1210		<compilerarg line="${build.args}"/>
1284	–
1211		</javac>
1212		</target>
1213
1214	<
1289	<	<target name="extra166yjar"
1290	<	depends="extra166ycompile"
1291	<	description="Builds library jar from compiled sources">
1292	<
1214	>	<target name="extra166yjar" depends="extra166ycompile">
1215		<jar destfile="${extra166y.jar}" index="true">
1216		<fileset dir="${build.extra166y.classes.dir}"/>
1217		<manifest>
#	Line 1297 | Line 1219
1219		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1220		</manifest>
1221		</jar>
1300	–
1222		</target>
1223
1224	<
1304	<	<target name="extra166ydocs"
1305	<	description="Builds javadocs to build dir">
1306	<
1224	>	<target name="extra166ydocs">
1225		<delete dir="${extra166ydocs.dir}"/>
1226		<mkdir dir="${extra166ydocs.dir}"/>
1227
#	Line 1317 | Line 1235
1235		executable="${javadoc7}">
1236		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1237		<arg value="-XDignore.symbol.file=true"/>
1320	–
1238		</javadoc>
1239		</target>
1240
1241	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1242
1243	<	<target name="extra166ydist"
1326	<	depends="extra166ydist-jar, extra166ydist-docs"
1327	<	description="Puts all distributable products in single hierarchy"/>
1328	<
1329	<
1330	<	<target name="extra166yclean"
1331	<	description="Removes all extra166y build products">
1332	<
1243	>	<target name="extra166yclean">
1244		<delete dir="${build.extra166y.dir}"/>
1334	–
1245		</target>
1246
1247	<
1338	<	<target name="extra166ydist-jar"
1339	<	depends="extra166yclean, extra166yjar">
1247	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1248		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1249		</target>
1250
1251	<	<target name="extra166ydist-docs"
1344	<	depends="extra166yclean, extra166ydocs">
1251	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1252		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1253		</target>
1254
1255	<	<!-- jsr166e -->
1255	>
1256	>	<!-- jsr166e (no longer maintained) -->
1257
1258		<property name="build.jsr166e.java.version" value="6"/>
1259		<property name="build.jsr166e.javac" value="${javac6}"/>
1260
1261	<	<target name="jsr166ecompile"
1354	<	depends="configure-compiler"
1355	<	description="Compiles jsr166e sources">
1356	<
1261	>	<target name="jsr166ecompile" depends="configure-compiler">
1262		<mkdir dir="${build.jsr166e.classes.dir}"/>
1263
1264		<javac srcdir="${topsrc.dir}"
#	Line 1374 | Line 1279
1279		<compilerarg value="-Xlint:all"/>
1280		<compilerarg value="-Werror"/>
1281		<compilerarg line="${build.args}"/>
1377	–
1282		</javac>
1283		</target>
1284
1381	–	<!-- jsr166e: find doclint errors -->
1285		<target name="jsr166edoclint">
1383	–
1286		<mkdir dir="${build.jsr166e.classes.dir}"/>
1287
1288		<javac srcdir="${topsrc.dir}"
#	Line 1402 | Line 1304
1304		<compilerarg value="-Xlint:all"/>
1305		<compilerarg value="-Werror"/>
1306		<compilerarg value="-Xdoclint:all/protected"/>
1405	–
1307		</javac>
1308		</target>
1309
1310	<
1410	<	<target name="jsr166ejar"
1411	<	depends="jsr166ecompile"
1412	<	description="Builds library jar from compiled sources">
1413	<
1310	>	<target name="jsr166ejar" depends="jsr166ecompile">
1311		<jar destfile="${jsr166e.jar}" index="true">
1312		<fileset dir="${build.jsr166e.classes.dir}"/>
1313		<manifest>
#	Line 1418 | Line 1315
1315		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1316		</manifest>
1317		</jar>
1421	–
1318		</target>
1319
1320	<
1425	<	<target name="jsr166edocs"
1426	<	description="Builds javadocs to build dir">
1427	<
1320	>	<target name="jsr166edocs">
1321		<delete dir="${jsr166edocs.dir}"/>
1322		<mkdir dir="${jsr166edocs.dir}"/>
1323
#	Line 1438 | Line 1331
1331		failonerror = "true">
1332		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1333		<arg value="-XDignore.symbol.file=true"/>
1441	–
1334		</javadoc>
1335		</target>
1336
1337	<
1446	<	<target name="jsr166e-tck-one-java-version"
1447	<	depends="jsr166ejar">
1448	<
1337	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1338		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1450	–
1339		<run-tck-tests
1340		tck.src.dir="${test.src.dir}/tck-jsr166e"
1341		target="${build.jsr166e.java.version}"
#	Line 1455 | Line 1343
1343		classes="${jsr166e.jar}"/>
1344		</target>
1345
1346	<	<target name="jsr166e-tck"
1459	<	description="Runs tck tests for jsr166e for multiple java versions">
1346	>	<target name="jsr166e-tck">
1347
1348		<!--     <antcall target="clean"/> -->
1349		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1477 | Line 1364
1364		</antcall>
1365		</target>
1366
1367	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1368
1369	<	<target name="jsr166e-test"
1482	<	depends="jsr166e-tck"
1483	<	description="Runs all tests for jsr166e">
1484	<	</target>
1485	<
1486	<	<target name="jsr166edist"
1487	<	depends="jsr166edist-jar, jsr166edist-docs"
1488	<	description="Puts all distributable products in single hierarchy"/>
1369	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1370
1371	<
1491	<	<target name="jsr166eclean"
1492	<	description="Removes all jsr166e build products">
1371	>	<target name="jsr166eclean">
1372		<delete dir="${build.jsr166e.dir}"/>
1373		</target>
1374
1496	–
1375		<target name="jsr166edist-jar"
1376		depends="jsr166eclean, jsr166ejar">
1377		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1378		</target>
1379
1380	<	<target name="jsr166edist-docs"
1503	<	depends="jsr166eclean, jsr166edocs">
1380	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1381		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1382		</target>
1383
1384
1385		<!-- Find buglets that can be detected by static build tools -->
1386
1387	<	<target name="lint">
1388	<	<antcall target="dists">
1389	<	<param name="build.javadoc.access" value="public"/>
1390	<	</antcall>
1391	<	</target>
1387	>	<!--   <target name="lint"> -->
1388	>	<!--     <antcall target="dists"> -->
1389	>	<!--       <param name="build.javadoc.access" value="protected"/> -->
1390	>	<!--     </antcall> -->
1391	>	<!--   </target> -->
1392
1393		<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1394	<	<target name="lint-private">
1394	>	<target name="doclint-private">
1395		<antcall target="dist">
1396		<param name="build.javadoc.access" value="private"/>
1397		</antcall>
#	Line 1523 | Line 1400
1400
1401		<!-- ==============================================================
1402		Experimental errorprone support - http://errorprone.info
1526	–	You may need to bring your own errorprone jar.
1403		=================================================================== -->
1404	+	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1405	+	<property name="errorprone.jsr166.user.flags" value=""/>
1406	+	<property name="errorprone.jsr166.flags"
1407	+	value="-Xep:HashtableContains:OFF
1408	+	-Xep:JdkObsolete:OFF
1409	+	-Xep:MissingOverride:OFF
1410	+	-Xep:MissingFail:OFF
1411	+	-Xep:MixedArrayDimensions:ERROR
1412	+	-Xep:RemoveUnusedImports:ERROR
1413	+	-Xep:EmptyIf:ERROR
1414	+	-Xep:MultipleTopLevelClasses:ERROR
1415	+	-Xep:ClassName:ERROR
1416	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1417	+	-Xep:RedundantThrows:ERROR
1418	+	-Xep:IdentityBinaryExpression:WARN
1419	+	-Xep:MethodCanBeStatic:WARN
1420	+	${errorprone.jsr166.user.flags}"/>
1421	+	<!-- -Xep:WildcardImport:ERROR -->
1422	+	<property name="errorprone.jsr166.test.flags"
1423	+	value="-Xep:StringSplitter:OFF
1424	+	-Xep:BoxedPrimitiveConstructor:OFF
1425	+	-Xep:ModifyingCollectionWithItself:OFF"/>
1426	+	<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1427		<target name="errorprone"
1428		depends="clean, configure-compiler"
1429	<	description="Run errorprone over jsr166 source code">
1429	>	description="Run errorprone over jsr166 source code (experimental)">
1430
1431		<local name="destdir"/>
1432		<property name="destdir" value="${build.classes.dir}/java.base"/>
#	Line 1546 | Line 1445
1445		fork="true">
1446
1447		<include name="**/*.java"/>
1448	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1449	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1450	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1451	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1553	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1554	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1555	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1556	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1557	<	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1558	<	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1448	>	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1449	>	<compilerarg value="-J--illegal-access=permit"/>
1450	>	<compilerarg value="-XDcompilePolicy=simple"/>
1451	>	<compilerarg line="-processorpath ${errorprone.jar}"/>
1452		<compilerarg value="-Xplugin:ErrorProne
1453	<	-Xep:IdentityBinaryExpression:WARN
1561	<	-Xep:MissingOverride:OFF
1562	<	-Xep:MixedArrayDimensions:WARN
1563	<	-Xep:RemoveUnusedImports:ERROR
1564	<	-Xep:MethodCanBeStatic:WARN"/>
1453	>	${errorprone.jsr166.flags}"/>
1454		<compilerarg value="--patch-module=java.base=${src.dir}"/>
1455		<compilerarg value="-Xprefer:source"/>
1456		<compilerarg value="-XDignore.symbol.file=true"/>
#	Line 1580 | Line 1469
1469		workdir="${build.dir}"
1470		classes="${product.jar}">
1471		<javac-elements>
1472	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1473	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1474	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1475	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1476	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1477	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1478	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1590	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1591	<	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1592	<	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1593	<	<compilerarg value="-Xplugin:ErrorProne
1594	<	-Xep:IdentityBinaryExpression:WARN
1595	<	-Xep:BoxedPrimitiveConstructor:OFF
1596	<	-Xep:HashtableContains:OFF
1597	<	-Xep:ModifyingCollectionWithItself:OFF
1598	<	-Xep:MissingOverride:OFF
1599	<	-Xep:MixedArrayDimensions:WARN
1600	<	-Xep:RemoveUnusedImports:ERROR
1601	<	-Xep:MethodCanBeStatic:WARN"/>
1472	>	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1473	>	<compilerarg value="-J--illegal-access=permit"/>
1474	>	<compilerarg value="-XDcompilePolicy=simple"/>
1475	>	<compilerarg line="-processorpath ${errorprone.jar}"/>
1476	>	<compilerarg value="-Xplugin:ErrorProne
1477	>	${errorprone.jsr166.flags}
1478	>	${errorprone.jsr166.test.flags}"/>
1479		<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1480		</javac-elements>
1481		</run-tck-tests>
1482		</target>
1483
1484	+	<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1485	+	<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1486	+	<target name="errorprone-jtreg"
1487	+	depends="jar"
1488	+	description="Run errorprone over jtreg tests (experimental)">
1489	+
1490	+	<run-jtreg-tests
1491	+	target="${build.main.java.version}"
1492	+	workdir="${build.dir}"
1493	+	classes="${product.jar}"
1494	+	verbose="all">
1495	+	<jtreg-elements>
1496	+	<arg value="-javacoption:-XDcompilePolicy=simple"/>
1497	+	<arg value="-javacoption:-processorpath"/>
1498	+	<arg value="-javacoption:${errorprone.jar}"/>
1499	+	<arg value="-javacoption:-Xplugin:ErrorProne
1500	+	${errorprone.jsr166.flags}
1501	+	${errorprone.jsr166.test.flags}
1502	+	-Xep:MultipleTopLevelClasses:WARN
1503	+	-Xep:NonAtomicVolatileUpdate:OFF"/>
1504	+	</jtreg-elements>
1505	+	</run-jtreg-tests>
1506	+	</target>
1507	+
1508
1509		<!-- ==============================================================
1510		Running guava tests against jsr166 code
#	Line 1657 | Line 1558
1558		<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1559		dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1560		<junit printsummary="true" showoutput="true" haltonfailure="true"
1561	<	jvm="${java9}" fork="true">
1562	<	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1561	>	jvm="${build.main.java}" fork="true">
1562	>	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1563		<formatter type="brief"/>
1564		<classpath>
1565		<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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