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.237 by jsr166, Fri Mar 24 15:57:26 2017 UTC vs.
Revision 1.289 by jsr166, Sun Dec 2 22:40:03 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 52 | Line 55
55
56
57		<!-- Compilation options -->
55	–	<property name="build.sourcelevel"    value="6"/>
58		<property name="build.debug"          value="true"/>
59		<property name="build.debuglevel"     value="source,lines,vars"/>
60		<property name="build.deprecation"    value="false"/>
#	Line 103 | Line 105
105		<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
106		unless:set="have.java.base"/>
107		<local name="modules"/>
108	<	<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
108	>	<available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
109		<local name="boot.jar.dir"/>
110		<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
111		<path id="bootclasspath@{v}" unless:set="modules">
#	Line 134 | Line 136
136		<defjdklocations v="8"/>
137		<defjdklocations v="9"/>
138		<defjdklocations v="10"/>
139	+	<defjdklocations v="11"/>
140	+	<defjdklocations v="12"/>
141
142		<!-- Source locations -->
143		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 144 | Line 148
148		<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
149		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
150		<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
151	+	<property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
152	+	<property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
153		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
154		<property name="lib.dir"              location="${basedir}/lib"/>
155		<property name="dist.dir"             location="${basedir}/dist"/>
#	Line 183 | Line 189
189		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
190
191		<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
192	<	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
193	<	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
194	<	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
195	<	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
196	<	<!-- The expected canonical location does not yet exist as of 2016-04 -->
197	<	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
198	<	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
192	>	<!-- Switched to https: in 2017-10 - JDK-8190312 -->
193	>	<property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
194	>	<property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
195	>	<property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
196	>	<property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
197	>	<property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
198	>	<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
199	>	<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
200	>	<!-- The location of jdk early access docs (RIP) -->
201	>	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
202	>	<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
203	>	<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
204	>	<property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
205		<!-- Default jdk doc location (latest stable release seems best) -->
206	<	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
206	>	<!-- But pin to jdk 10 until fix for -->
207	>	<!-- 8211194: javadoc -link doesn't take module path into consideration -->
208	>	<property name="java.docroot.url"   value="${java10.docroot.url}"/>
209
210		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
211		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 199 | Line 213
213		<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
214		<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
215		<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
216	+	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
217	+	<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
218	+	<property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
219		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
220
221		<!-- Define the "jtreg" task -->
#	Line 231 | Line 248
248
249		<local name="modules"/>
250		<condition property="modules">
251	<	<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
251	>	<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
252	>	</condition>
253	>
254	>	<local name="use-doclint"/>
255	>	<condition property="use-doclint">
256	>	<not> <equals arg1="@{target}" arg2="7"/> </not>
257		</condition>
258
259		<mkdir dir="@{workdir}/tck-classes"/>
#	Line 253 | Line 275
275		<include name="*.java"/>
276		<compilerarg value="-XDignore.symbol.file=true"/>
277		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
278	<	<compilerarg value="-Xdoclint:reference/private"/>
278	>	<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
279		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
280		<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
281		<compilerarg line="${build.args}"/>
#	Line 293 | Line 315
315		</macrodef>
316
317		<!-- Define jtreg test sets for different jdk versions -->
318	<	<fileset dir="${jtreg9.src.dir}">
319	<	<patternset id="jdk9.jtreg.tests">
320	<	<include name="**/*.java"/>
321	<	</patternset>
322	<	</fileset>
323	<
324	<	<fileset dir="${jtreg8.src.dir}">
325	<	<patternset id="jdk8.jtreg.tests">
326	<	<include name="**/*.java"/>
327	<	</patternset>
328	<	</fileset>
318	>	<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
319	>	<!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
320	>	<property name="jtreg.test.pattern" value="**/*.java"/>
321	>	<macrodef name="defjtregtests">
322	>	<attribute name="v"/>
323	>	<sequential>
324	>	<fileset dir="${jtreg@{v}.src.dir}">
325	>	<patternset id="jdk@{v}.jtreg.tests">
326	>	<include name="${jtreg.test.pattern}"/>
327	>	</patternset>
328	>	</fileset>
329	>	</sequential>
330	>	</macrodef>
331
332	<	<fileset dir="${jtreg7.src.dir}">
333	<	<patternset id="jdk7.jtreg.tests">
334	<	<include name="**/*.java"/>
335	<	</patternset>
336	<	</fileset>
332	>	<defjtregtests v="12"/>
333	>	<defjtregtests v="11"/>
334	>	<defjtregtests v="10"/>
335	>	<defjtregtests v="9"/>
336	>	<defjtregtests v="8"/>
337	>	<defjtregtests v="7"/>
338
339		<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
340		<property name="jtreg.flags" value=""/>
341
342		<macrodef name="run-jtreg-tests">
343		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
319	–	<attribute name="source" default="7"/>
344		<attribute name="target"/>
345		<attribute name="workdir"/>
346		<attribute name="classes"/>
347	+	<attribute name="verbose" default="${jtreg.verbose}"/>
348		<attribute name="jtregflags" default=""/>
349	+	<element name="jtreg-elements" optional="true"/>
350
351		<sequential>
352
#	Line 329 | Line 355
355
356		<local name="modules"/>
357		<condition property="modules">
358	<	<available file="${jdk@{target}.home}/jmods" type="dir"/>
358	>	<available file="${jdk@{target}.home}/lib/modules" type="file"/>
359		</condition>
360
361		<delete dir="@{workdir}/JTwork"   quiet="true"/>
#	Line 338 | Line 364
364		workDir="@{workdir}/JTwork">
365		<patternset refid="jdk@{target}.jtreg.tests"/>
366		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
367	<	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
368	<	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
367	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
368	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
369		<arg value="-agentvm"/>
370		<arg value="-noreport"/>
371	<	<arg value="-verbose:${jtreg.verbose}"/>
371	>	<arg value="-verbose:@{verbose}"/>
372		<arg value="-vmoptions:-esa -ea"/>
373		<arg value="-automatic"/>
374		<arg value="-k:!ignore"/>
375		<arg line="@{jtregflags}"/>
376		<arg line="${jtreg.flags}"/>
377	+	<jtreg-elements/>
378		</jtreg>
379		</sequential>
380		</macrodef>
#	Line 363 | Line 390
390
391		<!-- Main targets -->
392
393	<	<property name="build.main.java.version" value="9"/>
393	>	<!-- Default values: may seem strange ... -->
394	>	<!-- At runtime, target latest LTS, i.e. jdk11 -->
395	>	<!-- But at build time, target jdk9, for maximal binary portability -->
396	>	<!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
397	>	<property name="build.main.java.version" value="11"/>
398	>	<property name="build.main.java" value="${java11}"/>
399		<property name="build.main.javac" value="${javac9}"/>
400	+	<property name="build.main.javadoc" value="${javadoc12}"/>
401
402		<target name="dists"
403	<	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
403	>	depends="dist, 4jdk8dist"
404		description="Builds all public jars and docs"/>
405	+	<!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
406
407		<target name="compile"
408		depends="configure-compiler"
409		description="Compiles src/main sources to build dir">
410
377	–	<local name="modules"/>
378	–	<condition property="modules">
379	–	<and>
380	–	<available file="${jdk9.home}/jmods" type="dir"/>
381	–	<equals arg1="9" arg2="${build.main.java.version}"/>
382	–	</and>
383	–	</condition>
384	–
411		<local name="destdir"/>
412	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
387	<	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
412	>	<property name="destdir" value="${build.classes.dir}/java.base"/>
413
414		<mkdir dir="${destdir}"/>
415
#	Line 401 | Line 426
426		fork="true">
427
428		<include name="**/*.java"/>
429	<	<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
429	>	<compilerarg value="--patch-module=java.base=${src.dir}"/>
430		<compilerarg value="-Xprefer:source"/>
431		<compilerarg value="-XDignore.symbol.file=true"/>
432	<	<compilerarg value="-Xlint:all"/>
433	<	<compilerarg value="-Werror"/>
432	>	<compilerarg value="-Xlint:all,-removal"/>
433	>	<compilerarg line="--doclint-format html5"/>
434		<compilerarg value="-Xdoclint:all/protected,reference/private"/>
435	+	<compilerarg value="-Werror"/>
436		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
437		<compilerarg line="${build.args}"/>
438
#	Line 445 | Line 471
471		<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
472		<javadoc destdir="${docs.dir}"
473		packagenames="none"
474	<	link="${java9.api.url}"
474	>	link="${java11.api.url}"
475		overview="${src.dir}/intro.html"
476		access="${build.javadoc.access}"
477		sourcepath="${src.dir}"
478		classpath=""
479	<	executable="${javadoc9}">
479	>	source="11"
480	>	executable="${build.main.javadoc}">
481		<fileset dir="${src.dir}" defaultexcludes="yes">
482		<include name="**/*.java"/>
483		</fileset>
484	<	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
484	>	<arg line="-Xdocrootparent ${java10.docroot.url}"/>
485		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
486		<arg value="-XDignore.symbol.file=true"/>
487	+	<arg value="-html5"/>
488		<arg value="--patch-module=java.base=${src.dir}"/>
489	<	<arg value="-tag"/>
490	<	<arg value="${javadoc.jls.option}"/>
491	<	<!-- @apiNote currently unused -->
492	<	<!--       <arg value="-tag"/> -->
493	<	<!--       <arg value="apiNote:a:API Note:"/> -->
494	<	<arg value="-tag"/>
495	<	<arg value="implSpec:a:Implementation Requirements:"/>
468	<	<arg value="-tag"/>
469	<	<arg value="implNote:a:Implementation Note:"/>
489	>	<!-- old school frames via docs/index.html?overview-summary.html -->
490	>	<arg value="--frames"/>
491	>	<arg value="--override-methods=summary"/>
492	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
493	>	<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
494	>	<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
495	>	<arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
496		<!-- tags added in jdk9: currently unused -->
497	<	<!--       <arg value="-tag"/> -->
498	<	<!--       <arg value="revised:X"/> -->
473	<	<!--       <arg value="-tag"/> -->
474	<	<!--       <arg value="spec:X"/> -->
497	>	<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
498	>	<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
499		</javadoc>
500		</target>
501
#	Line 481 | Line 505
505		description="Puts all distributable products in single hierarchy"/>
506
507
484	–	<target name="release"
485	–	depends="dist"
486	–	description="Puts entire CVS tree, plus distribution productions, in a jar">
487	–
488	–	<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
489	–
490	–	<jar basedir="${basedir}" destfile="${release.jar}">
491	–	<!-- <exclude name="build/**"/> -->
492	–	<exclude name="${release.jar}"/>
493	–	<exclude name="user.properties"/>
494	–	<exclude name="etc/notes/**"/>
495	–	<exclude name="src/emulation/**"/>
496	–	<exclude name="**/SyntaxTest.java"/>
497	–	<exclude name="**/SuperfluousAbstract.java"/>
498	–	<manifest>
499	–	<attribute name="Built-By" value="${user.name}"/>
500	–	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
501	–	</manifest>
502	–	</jar>
503	–	</target>
504	–
505	–
508		<target name="clean"
509		description="Removes all build products">
508	–
510		<delete dir="${build.dir}"/>
510	–
511		</target>
512
513
514		<target name="dist-clean"
515		description="Removes all build and distribution products">
516	–
516		<delete dir="${build.dir}"/>
517		<delete dir="${dist.dir}"/>
519	–
518		</target>
519
520
#	Line 576 | Line 574
574
575		<target name="test"
576		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
577	<	description="Runs tck and jtreg tests for src/main">
580	<	</target>
581	<
582	<	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
577	>	description="Runs tck and jtreg tests for src/main"/>
578
579	<	<!--     <antcall target="jtreg"> -->
580	<	<!--       <param name="build.main.java.version" value="8"/> -->
581	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
587	<	<!--     </antcall> -->
579	>	<target name="test-version-permutations"
580	>	depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
581	>	</target>
582
583	<	<!--   </target> -->
583	>	<target name="test9">
584	>	<antcall target="clean"/>
585	>	<antcall>
586	>	<param name="build.main.java.version" value="9"/>
587	>	<param name="build.main.java" value="${java9}"/>
588	>	<param name="build.main.javac" value="${javac9}"/>
589	>	<target name="test"/>
590	>	</antcall>
591	>	</target>
592
593	<	<!--   <target name="test89" -->
594	<	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
593	>	<target name="test10">
594	>	<antcall target="clean"/>
595	>	<antcall>
596	>	<param name="build.main.java.version" value="10"/>
597	>	<param name="build.main.java" value="${java10}"/>
598	>	<param name="build.main.javac" value="${javac10}"/>
599	>	<param name="build.main.javadoc" value="${javadoc10}"/>
600	>	<target name="test"/>
601	>	<target name="docs"/>
602	>	</antcall>
603	>	</target>
604
605	<	<!--     <antcall target="clean"/> -->
606	<	<!--     <antcall target="test"> -->
607	<	<!--       <param name="build.main.java.version" value="8"/> -->
608	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
609	<	<!--     </antcall> -->
605	>	<target name="test11">
606	>	<antcall target="clean"/>
607	>	<antcall>
608	>	<param name="build.main.java.version" value="11"/>
609	>	<param name="build.main.java" value="${java11}"/>
610	>	<param name="build.main.javac" value="${javac11}"/>
611	>	<param name="build.main.javadoc" value="${javadoc11}"/>
612	>	<target name="test"/>
613	>	<target name="docs"/>
614	>	</antcall>
615	>	</target>
616
617	<	<!--     <antcall target="clean"/> -->
618	<	<!--     <antcall target="test"> -->
619	<	<!--       <param name="build.main.java.version" value="9"/> -->
620	<	<!--       <param name="build.main.javac" value="${javac9}"/> -->
621	<	<!--     </antcall> -->
617	>	<target name="test12">
618	>	<antcall target="clean"/>
619	>	<antcall>
620	>	<param name="build.main.java.version" value="12"/>
621	>	<param name="build.main.java" value="${java12}"/>
622	>	<param name="build.main.javac" value="${javac12}"/>
623	>	<param name="build.main.javadoc" value="${javadoc12}"/>
624	>	<target name="test"/>
625	>	<target name="docs"/>
626	>	</antcall>
627	>	</target>
628
629	<	<!--   </target> -->
629	>	<target name="test9-11">
630	>	<antcall target="clean"/>
631	>	<antcall>
632	>	<param name="build.main.java.version" value="11"/>
633	>	<param name="build.main.java" value="${java11}"/>
634	>	<param name="build.main.javac" value="${javac9}"/>
635	>	<param name="build.main.javadoc" value="${javadoc11}"/>
636	>	<target name="test"/>
637	>	<target name="docs"/>
638	>	</antcall>
639	>	</target>
640
641	+	<target name="test9-12">
642	+	<antcall target="clean"/>
643	+	<antcall>
644	+	<param name="build.main.java.version" value="12"/>
645	+	<param name="build.main.java" value="${java12}"/>
646	+	<param name="build.main.javac" value="${javac9}"/>
647	+	<param name="build.main.javadoc" value="${javadoc12}"/>
648	+	<target name="test"/>
649	+	<target name="docs"/>
650	+	</antcall>
651	+	</target>
652
653
654		<target name="configure-compiler">
#	Line 627 | Line 671
671		</target>
672
673
630	–
631	–	<!-- Various demos and test programs -->
632	–
633	–
634	–	<!-- description="Benchmark from Doug Lea's AQS paper" -->
635	–	<target name="loops" depends="configure-compiler">
636	–
637	–	<mkdir dir="${build.loops.dir}"/>
638	–
639	–	<javac srcdir="${loops.src.dir}"
640	–	destdir="${build.loops.dir}"
641	–	debug="${build.debug}"
642	–	debuglevel="${build.debuglevel}"
643	–	deprecation="${build.deprecation}"
644	–	source="${build.sourcelevel}"
645	–	target="${build.sourcelevel}"
646	–	encoding="ASCII"
647	–	fork="true">
648	–
649	–	<compilerarg line="${build.args}"/>
650	–	<classpath refid="loops.classpath"/>
651	–	<compilerarg value="-XDignore.symbol.file=true"/>
652	–
653	–	</javac>
654	–
655	–	<java classname="ALoops" fork="true">
656	–	<classpath refid="loops.classpath"/>
657	–	</java>
658	–
659	–	</target>
660	–
661	–
674		<target name="compile-test-loops" depends="jar"
675	<	description="compile all the perf tests in src/test/loops">
675	>	description="Compiles all the perf tests in src/test/loops">
676
677		<mkdir dir="${build.dir}/test/loops"/>
678
#	Line 672 | Line 684
684		includeAntRuntime="false"
685		includeJavaRuntime="false"
686		encoding="ASCII"
687	<	executable="${javac9}"
687	>	executable="${build.main.javac}"
688		fork="true">
689
690		<include name="*.java"/>
#	Line 680 | Line 692
692		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
693		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
694		<compilerarg line="${build.args}"/>
683	–
695		</javac>
685	–
696		</target>
697
698
#	Line 708 | Line 718
718		encoding="ASCII"
719		executable="${javac8}"
720		fork="true">
711	–
721		<include name="**/*.java"/>
722		<compilerarg value="-Xprefer:source"/>
723		<compilerarg value="-XDignore.symbol.file=true"/>
724		<compilerarg value="-Xlint:all"/>
725		<compilerarg value="-Werror"/>
726		<compilerarg line="${build.args}"/>
718	–
727		</javac>
728		</target>
729
#	Line 739 | Line 747
747		encoding="ASCII"
748		executable="${javac8}"
749		fork="true">
742	–
750		<include name="**/*.java"/>
751		<compilerarg value="-Xprefer:source"/>
752		<compilerarg value="-XDignore.symbol.file=true"/>
753		<compilerarg value="-Xlint:all"/>
754		<compilerarg value="-Xdoclint:all/protected,reference/private"/>
755		<compilerarg line="${build.args}"/>
749	–
756		</javac>
757		</target>
758
#	Line 762 | Line 768
768		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
769		</manifest>
770		</jar>
765	–
771		</target>
772
773
#	Line 796 | Line 801
801
802		<target name="4jdk8-test"
803		depends="4jdk8-tck, 4jdk8-jtreg"
804	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
800	<	</target>
804	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
805
806
807		<target name="4jdk8docs"
#	Line 813 | Line 817
817		access="${build.javadoc.access}"
818		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
819		classpath=""
820	+	source="8"
821		executable="${javadoc8}"
822		failonerror = "true">
823		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
#	Line 820 | Line 825
825		</fileset>
826		<arg line="-Xdocrootparent ${java8.docroot.url}"/>
827		<arg value="-XDignore.symbol.file=true"/>
828	<	<arg value="-tag"/>
829	<	<arg value="${javadoc.jls.option}"/>
830	<	<!-- @apiNote currently unused -->
831	<	<!--       <arg value="-tag"/> -->
832	<	<!--       <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"/>
831	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
828	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
829	>	<arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
830	>	<arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
831	>	<!-- @apiNote tag currently unused -->
832	>	<!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
833		</javadoc>
834		</target>
835
#	Line 840 | Line 841
841
842		<target name="4jdk8clean"
843		description="Removes all 4jdk8 build products">
843	–
844		<delete dir="${build.4jdk8.dir}"/>
845	–
845		</target>
846
847
#	Line 858 | Line 857
857		</target>
858
859
860	+	<!-- jsr166 4jdk7 (no longer maintained) -->
861
862	<	<!-- jsr166 4jdk7 -->
863	<
864	<	<target name="4jdk7compile"
865	<	depends="configure-compiler"
866	<	description="Compiles src/jdk7 sources, targeting jdk7">
867	<
862	>	<target name="4jdk7compile" depends="configure-compiler">
863		<mkdir dir="${build.4jdk7.classes.dir}"/>
864
865		<javac srcdir="${4jdk7src.dir}"
#	Line 888 | Line 883
883		<compilerarg value="-Xlint:all"/>
884		<compilerarg value="-Werror"/>
885		<compilerarg line="${build.args}"/>
891	–
886		</javac>
887		</target>
888
889	<	<target name="4jdk7doclint"
896	<	depends="configure-compiler"
897	<	description="Finds doclint warnings">
898	<
889	>	<target name="4jdk7doclint" depends="configure-compiler">
890		<mkdir dir="${build.4jdk7.classes.dir}"/>
891
892		<javac srcdir="${4jdk7src.dir}"
#	Line 919 | Line 910
910		<compilerarg value="-Xlint:all"/>
911		<compilerarg value="-Xdoclint:all/protected"/>
912		<compilerarg line="${build.args}"/>
922	–
913		</javac>
914		</target>
915
916	<
927	<	<target name="4jdk7jar"
928	<	depends="4jdk7compile"
929	<	description="Builds library jar from compiled sources">
930	<
916	>	<target name="4jdk7jar" depends="4jdk7compile">
917		<jar destfile="${4jdk7product.jar}">
918		<fileset dir="${build.4jdk7.classes.dir}"/>
919		<manifest>
#	Line 935 | Line 921
921		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
922		</manifest>
923		</jar>
938	–
924		</target>
925
926	<
942	<	<target name="4jdk7-tck"
943	<	depends="4jdk7jar"
944	<	description="Runs tck tests for jsr166-4jdk7 directly">
945	<
926	>	<target name="4jdk7-tck" depends="4jdk7jar">
927		<run-tck-tests
928		target="7"
929		workdir="${build.4jdk7.dir}"
#	Line 965 | Line 946
946		</run-tck-tests>
947		</target>
948
968	–
949		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
950	<	<target name="4jdk7-tck-junit"
971	<	depends="4jdk7compile">
950	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
951
952		<junit printsummary="true"
953		showoutput="true"
#	Line 990 | Line 969
969
970		<test name="${jsr166.tckTestClass}" haltonfailure="no">
971		</test>
993	–
972		</junit>
973		</target>
974
975	<	<target name="4jdk7-jtreg"
998	<	depends="4jdk7jar"
999	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
975	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
976		<run-jtreg-tests
977		target="7"
978		workdir="${build.4jdk7.dir}"
979		classes="${4jdk7product.jar}"/>
980		</target>
981
982	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
983
984	<	<target name="4jdk7-test"
1008	<	depends="4jdk7-tck, 4jdk7-jtreg"
1009	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
1010	<	</target>
1011	<
1012	<
1013	<	<target name="4jdk7docs"
1014	<	description="Builds javadocs for src/jdk7 to dist dir">
1015	<
984	>	<target name="4jdk7docs">
985		<delete dir="${4jdk7docs.dir}"/>
986		<mkdir dir="${4jdk7docs.dir}"/>
987
#	Line 1033 | Line 1002
1002		</javadoc>
1003		</target>
1004
1005	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1006
1007	<	<target name="4jdk7dist"
1038	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1039	<	description="Puts all distributable products in single hierarchy"/>
1040	<
1041	<
1042	<	<target name="4jdk7clean"
1043	<	description="Removes all 4jdk7 build products">
1044	<
1007	>	<target name="4jdk7clean">
1008		<delete dir="${build.4jdk7.dir}"/>
1046	–
1009		</target>
1010
1011	<
1050	<	<target name="4jdk7dist-jar"
1051	<	depends="4jdk7clean, 4jdk7jar">
1011	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1012		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1013		</target>
1014
1015	<
1056	<	<target name="4jdk7dist-docs"
1057	<	depends="4jdk7clean, 4jdk7docs">
1015	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1016		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1017		</target>
1018
1019
1020	<	<!-- jsr166x -->
1063	<
1064	<	<target name="jsr166xcompile"
1065	<	depends="configure-compiler"
1066	<	description="Compiles jsr166x sources to build dir">
1020	>	<!-- jsr166x (no longer maintained) -->
1021
1022	+	<target name="jsr166xcompile" depends="configure-compiler">
1023		<mkdir dir="${build.jsr166x.classes.dir}"/>
1024
1025		<javac srcdir="${topsrc.dir}"
#	Line 1081 | Line 1036
1036		encoding="ASCII"
1037		executable="${javac7}"
1038		fork="true">
1084	–
1039		<include name="jsr166x/**/*.java"/>
1040		<compilerarg value="-XDignore.symbol.file=true"/>
1041		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1042		<compilerarg value="-Werror"/>
1043		<compilerarg line="${build.args}"/>
1090	–
1044		</javac>
1045		</target>
1046
1047	<
1095	<	<target name="jsr166xjar"
1096	<	depends="jsr166xcompile"
1097	<	description="Builds library jar from compiled sources">
1098	<
1047	>	<target name="jsr166xjar" depends="jsr166xcompile">
1048		<jar destfile="${jsr166x.jar}">
1049		<fileset dir="${build.jsr166x.classes.dir}"/>
1050		<manifest>
#	Line 1103 | Line 1052
1052		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1053		</manifest>
1054		</jar>
1106	–
1055		</target>
1056
1057	<
1110	<	<target name="jsr166xdocs"
1111	<	description="Builds javadocs to dist dir">
1112	<
1057	>	<target name="jsr166xdocs">
1058		<delete dir="${jsr166xdocs.dir}"/>
1059		<mkdir dir="${jsr166xdocs.dir}"/>
1060
#	Line 1124 | Line 1069
1069		failonerror = "true">
1070		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1071		<arg value="-XDignore.symbol.file=true"/>
1127	–
1072		</javadoc>
1073		</target>
1074
1075	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1076
1077	<	<target name="jsr166xdist"
1133	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1134	<	description="Puts all distributable products in single hierarchy"/>
1135	<
1136	<
1137	<	<target name="jsr166xclean"
1138	<	description="Removes all jsr166x build products">
1139	<
1077	>	<target name="jsr166xclean">
1078		<delete dir="${build.jsr166x.dir}"/>
1141	–
1079		</target>
1080
1081	<
1145	<	<target name="jsr166xdist-jar"
1146	<	depends="jsr166xclean, jsr166xjar">
1081	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1082		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1083		</target>
1084
1085	<	<target name="jsr166xdist-docs"
1151	<	depends="jsr166xclean, jsr166xdocs">
1085	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1086		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1087		</target>
1088
1155	–	<!-- jsr166y -->
1156	–
1089
1090	<	<target name="jsr166ycompile"
1159	<	depends="configure-compiler"
1160	<	description="Compiles jsr166y sources">
1090	>	<!-- jsr166y (no longer maintained) -->
1091
1092	+	<target name="jsr166ycompile" depends="configure-compiler">
1093		<mkdir dir="${build.jsr166y.classes.dir}"/>
1094
1095		<javac srcdir="${topsrc.dir}"
#	Line 1181 | Line 1112
1112		<compilerarg value="-Xlint:all"/>
1113		<compilerarg value="-Werror"/>
1114		<compilerarg line="${build.args}"/>
1184	–
1115		</javac>
1116		</target>
1117
1118	<
1189	<	<target name="jsr166yjar"
1190	<	depends="jsr166ycompile"
1191	<	description="Builds library jar from compiled sources">
1192	<
1118	>	<target name="jsr166yjar" depends="jsr166ycompile">
1119		<jar destfile="${jsr166y.jar}" index="true">
1120		<fileset dir="${build.jsr166y.classes.dir}"/>
1121		<manifest>
#	Line 1197 | Line 1123
1123		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1124		</manifest>
1125		</jar>
1200	–
1126		</target>
1127
1128	<
1204	<	<target name="jsr166ydocs"
1205	<	description="Builds javadocs to dist dir">
1206	<
1128	>	<target name="jsr166ydocs">
1129		<delete dir="${jsr166ydocs.dir}"/>
1130		<mkdir dir="${jsr166ydocs.dir}"/>
1131
#	Line 1218 | Line 1140
1140		failonerror = "true">
1141		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1142		<arg value="-XDignore.symbol.file=true"/>
1221	–
1143		</javadoc>
1144		</target>
1145
1146	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1147
1148	<	<target name="jsr166ydist"
1227	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1228	<	description="Puts all distributable products in single hierarchy"/>
1229	<
1230	<
1231	<	<target name="jsr166yclean"
1232	<	description="Removes all jsr166y build products">
1233	<
1148	>	<target name="jsr166yclean">
1149		<delete dir="${build.jsr166y.dir}"/>
1235	–
1150		</target>
1151
1152	<
1239	<	<target name="jsr166ydist-jar"
1240	<	depends="jsr166yclean, jsr166yjar">
1152	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1153		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1154		</target>
1155
1156	<	<target name="jsr166ydist-docs"
1245	<	depends="jsr166yclean, jsr166ydocs">
1156	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1157		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1158		</target>
1159
1160
1161	<	<!-- extra166y -->
1251	<
1252	<
1253	<	<target name="extra166ycompile"
1254	<	depends="configure-compiler, jsr166yjar"
1255	<	description="Compiles extra166y sources">
1161	>	<!-- extra166y (no longer maintained) -->
1162
1163	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1164		<mkdir dir="${build.extra166y.classes.dir}"/>
1165
1166		<javac srcdir="${topsrc.dir}"
#	Line 1276 | Line 1183
1183		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1184		<compilerarg value="-Werror"/>
1185		<compilerarg line="${build.args}"/>
1279	–
1186		</javac>
1187		</target>
1188
1189	<
1284	<	<target name="extra166yjar"
1285	<	depends="extra166ycompile"
1286	<	description="Builds library jar from compiled sources">
1287	<
1189	>	<target name="extra166yjar" depends="extra166ycompile">
1190		<jar destfile="${extra166y.jar}" index="true">
1191		<fileset dir="${build.extra166y.classes.dir}"/>
1192		<manifest>
#	Line 1292 | Line 1194
1194		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1195		</manifest>
1196		</jar>
1295	–
1197		</target>
1198
1199	<
1299	<	<target name="extra166ydocs"
1300	<	description="Builds javadocs to build dir">
1301	<
1199	>	<target name="extra166ydocs">
1200		<delete dir="${extra166ydocs.dir}"/>
1201		<mkdir dir="${extra166ydocs.dir}"/>
1202
#	Line 1312 | Line 1210
1210		executable="${javadoc7}">
1211		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1212		<arg value="-XDignore.symbol.file=true"/>
1315	–
1213		</javadoc>
1214		</target>
1215
1216	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1217
1218	<	<target name="extra166ydist"
1321	<	depends="extra166ydist-jar, extra166ydist-docs"
1322	<	description="Puts all distributable products in single hierarchy"/>
1323	<
1324	<
1325	<	<target name="extra166yclean"
1326	<	description="Removes all extra166y build products">
1327	<
1218	>	<target name="extra166yclean">
1219		<delete dir="${build.extra166y.dir}"/>
1329	–
1220		</target>
1221
1222	<
1333	<	<target name="extra166ydist-jar"
1334	<	depends="extra166yclean, extra166yjar">
1222	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1223		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1224		</target>
1225
1226	<	<target name="extra166ydist-docs"
1339	<	depends="extra166yclean, extra166ydocs">
1226	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1227		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1228		</target>
1229
1230	<	<!-- jsr166e -->
1230	>
1231	>	<!-- jsr166e (no longer maintained) -->
1232
1233		<property name="build.jsr166e.java.version" value="6"/>
1234		<property name="build.jsr166e.javac" value="${javac6}"/>
1235
1236	<	<target name="jsr166ecompile"
1349	<	depends="configure-compiler"
1350	<	description="Compiles jsr166e sources">
1351	<
1236	>	<target name="jsr166ecompile" depends="configure-compiler">
1237		<mkdir dir="${build.jsr166e.classes.dir}"/>
1238
1239		<javac srcdir="${topsrc.dir}"
#	Line 1369 | Line 1254
1254		<compilerarg value="-Xlint:all"/>
1255		<compilerarg value="-Werror"/>
1256		<compilerarg line="${build.args}"/>
1372	–
1257		</javac>
1258		</target>
1259
1376	–	<!-- jsr166e: find doclint errors -->
1260		<target name="jsr166edoclint">
1378	–
1261		<mkdir dir="${build.jsr166e.classes.dir}"/>
1262
1263		<javac srcdir="${topsrc.dir}"
#	Line 1397 | Line 1279
1279		<compilerarg value="-Xlint:all"/>
1280		<compilerarg value="-Werror"/>
1281		<compilerarg value="-Xdoclint:all/protected"/>
1400	–
1282		</javac>
1283		</target>
1284
1285	<
1405	<	<target name="jsr166ejar"
1406	<	depends="jsr166ecompile"
1407	<	description="Builds library jar from compiled sources">
1408	<
1285	>	<target name="jsr166ejar" depends="jsr166ecompile">
1286		<jar destfile="${jsr166e.jar}" index="true">
1287		<fileset dir="${build.jsr166e.classes.dir}"/>
1288		<manifest>
#	Line 1413 | Line 1290
1290		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1291		</manifest>
1292		</jar>
1416	–
1293		</target>
1294
1295	<
1420	<	<target name="jsr166edocs"
1421	<	description="Builds javadocs to build dir">
1422	<
1295	>	<target name="jsr166edocs">
1296		<delete dir="${jsr166edocs.dir}"/>
1297		<mkdir dir="${jsr166edocs.dir}"/>
1298
#	Line 1433 | Line 1306
1306		failonerror = "true">
1307		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1308		<arg value="-XDignore.symbol.file=true"/>
1436	–
1309		</javadoc>
1310		</target>
1311
1312	<
1441	<	<target name="jsr166e-tck-one-java-version"
1442	<	depends="jsr166ejar">
1443	<
1312	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1313		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1445	–
1314		<run-tck-tests
1315		tck.src.dir="${test.src.dir}/tck-jsr166e"
1316		target="${build.jsr166e.java.version}"
#	Line 1450 | Line 1318
1318		classes="${jsr166e.jar}"/>
1319		</target>
1320
1321	<	<target name="jsr166e-tck"
1454	<	description="Runs tck tests for jsr166e for multiple java versions">
1321	>	<target name="jsr166e-tck">
1322
1323		<!--     <antcall target="clean"/> -->
1324		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1472 | Line 1339
1339		</antcall>
1340		</target>
1341
1342	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1343
1344	<	<target name="jsr166e-test"
1477	<	depends="jsr166e-tck"
1478	<	description="Runs all tests for jsr166e">
1479	<	</target>
1480	<
1481	<	<target name="jsr166edist"
1482	<	depends="jsr166edist-jar, jsr166edist-docs"
1483	<	description="Puts all distributable products in single hierarchy"/>
1484	<
1344	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1345
1346	<	<target name="jsr166eclean"
1487	<	description="Removes all jsr166e build products">
1346	>	<target name="jsr166eclean">
1347		<delete dir="${build.jsr166e.dir}"/>
1348		</target>
1349
1491	–
1350		<target name="jsr166edist-jar"
1351		depends="jsr166eclean, jsr166ejar">
1352		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1353		</target>
1354
1355	<	<target name="jsr166edist-docs"
1498	<	depends="jsr166eclean, jsr166edocs">
1355	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1356		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1357		</target>
1358
1359
1360		<!-- Find buglets that can be detected by static build tools -->
1361
1362	<	<target name="lint">
1363	<	<antcall target="dists">
1364	<	<param name="build.javadoc.access" value="public"/>
1365	<	</antcall>
1366	<	</target>
1362	>	<!--   <target name="lint"> -->
1363	>	<!--     <antcall target="dists"> -->
1364	>	<!--       <param name="build.javadoc.access" value="protected"/> -->
1365	>	<!--     </antcall> -->
1366	>	<!--   </target> -->
1367
1368		<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1369	<	<target name="lint-private">
1369	>	<target name="doclint-private">
1370		<antcall target="dist">
1371		<param name="build.javadoc.access" value="private"/>
1372		</antcall>
#	Line 1517 | Line 1374
1374
1375
1376		<!-- ==============================================================
1377	<	Experimental errorprone support - http://errorprone.info
1378	<	You may need to bring your own errorprone jar.
1377	>	Experimental errorprone support
1378	>	https://errorprone.info
1379	>	https://errorprone.info/docs/installation
1380	>	https://github.com/google/error-prone/issues/1143
1381		=================================================================== -->
1382	+	<path id="errorprone.processorpath.path">
1383	+	<pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1384	+	<pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1385	+	<pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1386	+	<pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1387	+	</path>
1388	+	<property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1389	+	<property name="errorprone.jsr166.user.flags" value=""/>
1390	+	<property name="errorprone.jsr166.flags"
1391	+	value="-Xep:HashtableContains:OFF
1392	+	-Xep:JdkObsolete:OFF
1393	+	-Xep:MissingOverride:OFF
1394	+	-Xep:MissingFail:OFF
1395	+	-Xep:ThreadPriorityCheck:OFF
1396	+	-Xep:MixedArrayDimensions:ERROR
1397	+	-Xep:RemoveUnusedImports:ERROR
1398	+	-Xep:EmptyIf:ERROR
1399	+	-Xep:MultipleTopLevelClasses:ERROR
1400	+	-Xep:ClassName:ERROR
1401	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1402	+	-Xep:RedundantThrows:ERROR
1403	+	-Xep:IdentityBinaryExpression:WARN
1404	+	-Xep:ConstructorInvokesOverridable:WARN
1405	+	-Xep:MethodCanBeStatic:WARN
1406	+	${errorprone.jsr166.user.flags}"/>
1407	+	<!-- -Xep:WildcardImport:ERROR -->
1408	+	<property name="errorprone.jsr166.test.flags"
1409	+	value="-Xep:StringSplitter:OFF
1410	+	-Xep:BoxedPrimitiveConstructor:OFF
1411	+	-Xep:ModifyingCollectionWithItself:OFF"/>
1412	+	<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1413		<target name="errorprone"
1414		depends="clean, configure-compiler"
1415	<	description="Run errorprone over jsr166 source code">
1415	>	description="Run errorprone over jsr166 source code (experimental)">
1416
1417		<local name="destdir"/>
1418		<property name="destdir" value="${build.classes.dir}/java.base"/>
#	Line 1541 | Line 1431
1431		fork="true">
1432
1433		<include name="**/*.java"/>
1434	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1435	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1436	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1437	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1438	<	<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"/>
1434	>	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1435	>	<compilerarg value="-J--illegal-access=permit"/>
1436	>	<compilerarg value="-XDcompilePolicy=simple"/>
1437	>	<compilerarg value="-processorpath"/>
1438	>	<compilerarg pathref="errorprone.processorpath.path"/>
1439		<compilerarg value="-Xplugin:ErrorProne
1440	<	-Xep:IdentityBinaryExpression:WARN
1556	<	-Xep:MissingOverride:OFF
1557	<	-Xep:MixedArrayDimensions:WARN
1558	<	-Xep:RemoveUnusedImports:ERROR
1559	<	-Xep:MethodCanBeStatic:WARN"/>
1440	>	${errorprone.jsr166.flags}"/>
1441		<compilerarg value="--patch-module=java.base=${src.dir}"/>
1442		<compilerarg value="-Xprefer:source"/>
1443		<compilerarg value="-XDignore.symbol.file=true"/>
#	Line 1575 | Line 1456
1456		workdir="${build.dir}"
1457		classes="${product.jar}">
1458		<javac-elements>
1459	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1460	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1461	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1462	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1463	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1464	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1465	<	<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"/>
1459	>	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1460	>	<compilerarg value="-J--illegal-access=permit"/>
1461	>	<compilerarg value="-XDcompilePolicy=simple"/>
1462	>	<compilerarg line="-processorpath ${errorprone.processorpath}"/>
1463	>	<compilerarg value="-Xplugin:ErrorProne
1464	>	${errorprone.jsr166.flags}
1465	>	${errorprone.jsr166.test.flags}"/>
1466		<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1467		</javac-elements>
1468		</run-tck-tests>
1469		</target>
1470
1471	+	<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1472	+	<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1473	+	<target name="errorprone-jtreg"
1474	+	depends="jar"
1475	+	description="Run errorprone over jtreg tests (experimental)">
1476	+
1477	+	<run-jtreg-tests
1478	+	target="${build.main.java.version}"
1479	+	workdir="${build.dir}"
1480	+	classes="${product.jar}"
1481	+	verbose="all">
1482	+	<jtreg-elements>
1483	+	<arg value="-javacoption:-XDcompilePolicy=simple"/>
1484	+	<arg value="-javacoption:-processorpath"/>
1485	+	<arg value="-javacoption:${errorprone.processorpath}"/>
1486	+	<arg value="-javacoption:-Xplugin:ErrorProne
1487	+	${errorprone.jsr166.flags}
1488	+	${errorprone.jsr166.test.flags}
1489	+	-Xep:MultipleTopLevelClasses:WARN
1490	+	-Xep:NonAtomicVolatileUpdate:OFF"/>
1491	+	</jtreg-elements>
1492	+	</run-jtreg-tests>
1493	+	</target>
1494	+
1495
1496		<!-- ==============================================================
1497		Running guava tests against jsr166 code
#	Line 1652 | Line 1545
1545		<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1546		dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1547		<junit printsummary="true" showoutput="true" haltonfailure="true"
1548	<	jvm="${java9}" fork="true">
1549	<	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1548	>	jvm="${build.main.java}" fork="true">
1549	>	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1550		<formatter type="brief"/>
1551		<classpath>
1552		<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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