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.232 by jsr166, Wed Feb 1 18:26:31 2017 UTC vs.
Revision 1.283 by jsr166, Wed Oct 24 22:31:14 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	>	<!-- But pin to jdk 10 until fix for -->
208	>	<!-- 8211194: javadoc -link doesn't take module path into consideration -->
209	>	<property name="java.docroot.url"   value="${java10.docroot.url}"/>
210
211		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
212		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 199 | Line 214
214		<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
215		<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
216		<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
217	+	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
218	+	<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
219	+	<property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
220		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
221
222		<!-- Define the "jtreg" task -->
#	Line 231 | Line 249
249
250		<local name="modules"/>
251		<condition property="modules">
252	<	<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
252	>	<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
253	>	</condition>
254	>
255	>	<local name="use-doclint"/>
256	>	<condition property="use-doclint">
257	>	<not> <equals arg1="@{target}" arg2="7"/> </not>
258		</condition>
259
260		<mkdir dir="@{workdir}/tck-classes"/>
#	Line 253 | Line 276
276		<include name="*.java"/>
277		<compilerarg value="-XDignore.symbol.file=true"/>
278		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
279	+	<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
280		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
281	<	<compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
281	>	<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
282		<compilerarg line="${build.args}"/>
283		<javac-elements/>
284
#	Line 265 | Line 289
289		jvm="${java@{target}}"
290		fork="true">
291		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
292	<	<jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
293	<	<jvmarg line="--add-opens java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
294	<	<jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
295	<	<jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
296	<	<jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
297	<	<jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
292	>	<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
293	>	<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
294	>	<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
295	>	<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
296	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
297	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
298		<jvmarg line="@{jvmflags}"/>
299		<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
300		<jvmarg line="${vmoptions}" if:set="vmoptions"/>
#	Line 292 | Line 316
316		</macrodef>
317
318		<!-- Define jtreg test sets for different jdk versions -->
319	<	<fileset dir="${jtreg9.src.dir}">
320	<	<patternset id="jdk9.jtreg.tests">
321	<	<include name="**/*.java"/>
322	<	</patternset>
323	<	</fileset>
324	<
325	<	<fileset dir="${jtreg8.src.dir}">
326	<	<patternset id="jdk8.jtreg.tests">
327	<	<include name="**/*.java"/>
328	<	</patternset>
329	<	</fileset>
319	>	<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
320	>	<!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
321	>	<property name="jtreg.test.pattern" value="**/*.java"/>
322	>	<macrodef name="defjtregtests">
323	>	<attribute name="v"/>
324	>	<sequential>
325	>	<fileset dir="${jtreg@{v}.src.dir}">
326	>	<patternset id="jdk@{v}.jtreg.tests">
327	>	<include name="${jtreg.test.pattern}"/>
328	>	</patternset>
329	>	</fileset>
330	>	</sequential>
331	>	</macrodef>
332
333	<	<fileset dir="${jtreg7.src.dir}">
334	<	<patternset id="jdk7.jtreg.tests">
335	<	<include name="**/*.java"/>
336	<	</patternset>
337	<	</fileset>
333	>	<defjtregtests v="12"/>
334	>	<defjtregtests v="11"/>
335	>	<defjtregtests v="10"/>
336	>	<defjtregtests v="9"/>
337	>	<defjtregtests v="8"/>
338	>	<defjtregtests v="7"/>
339
340		<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
341		<property name="jtreg.flags" value=""/>
342
343		<macrodef name="run-jtreg-tests">
344		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
318	–	<attribute name="source" default="7"/>
345		<attribute name="target"/>
346		<attribute name="workdir"/>
347		<attribute name="classes"/>
348	+	<attribute name="verbose" default="${jtreg.verbose}"/>
349		<attribute name="jtregflags" default=""/>
350	+	<element name="jtreg-elements" optional="true"/>
351
352		<sequential>
353
#	Line 328 | Line 356
356
357		<local name="modules"/>
358		<condition property="modules">
359	<	<available file="${jdk@{target}.home}/jmods" type="dir"/>
359	>	<available file="${jdk@{target}.home}/lib/modules" type="file"/>
360		</condition>
361
362		<delete dir="@{workdir}/JTwork"   quiet="true"/>
#	Line 337 | Line 365
365		workDir="@{workdir}/JTwork">
366		<patternset refid="jdk@{target}.jtreg.tests"/>
367		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
368	<	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
369	<	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
368	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
369	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
370		<arg value="-agentvm"/>
371		<arg value="-noreport"/>
372	<	<arg value="-verbose:${jtreg.verbose}"/>
372	>	<arg value="-verbose:@{verbose}"/>
373		<arg value="-vmoptions:-esa -ea"/>
374		<arg value="-automatic"/>
375		<arg value="-k:!ignore"/>
376		<arg line="@{jtregflags}"/>
377		<arg line="${jtreg.flags}"/>
378	+	<jtreg-elements/>
379		</jtreg>
380		</sequential>
381		</macrodef>
#	Line 362 | Line 391
391
392		<!-- Main targets -->
393
394	<	<property name="build.main.java.version" value="9"/>
395	<	<property name="build.main.javac" value="${javac9}"/>
394	>	<property name="build.main.java.version" value="11"/>
395	>	<!-- Workaround "no nested properties in ant" -->
396	>	<macrodef name="define-build-main-properties">
397	>	<attribute name="v"/>
398	>	<sequential>
399	>	<property name="build.main.java"    value="${java@{v}}"/>
400	>	<property name="build.main.javac"   value="${javac@{v}}"/>
401	>	<!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->
402	>	<!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
403	>	<condition property="build.main.javadoc"
404	>	value="${javadoc12}"
405	>	else="${javadoc@{v}}">
406	>	<matches pattern="^(9|10|11)$" string="@{v}"/>
407	>	</condition>
408	>	</sequential>
409	>	</macrodef>
410	>	<define-build-main-properties v="${build.main.java.version}"/>
411
412		<target name="dists"
413	<	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
413	>	depends="dist, 4jdk8dist"
414		description="Builds all public jars and docs"/>
415	+	<!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
416
417		<target name="compile"
418		depends="configure-compiler"
419		description="Compiles src/main sources to build dir">
420
376	–	<local name="modules"/>
377	–	<condition property="modules">
378	–	<and>
379	–	<available file="${jdk9.home}/jmods" type="dir"/>
380	–	<equals arg1="9" arg2="${build.main.java.version}"/>
381	–	</and>
382	–	</condition>
383	–
421		<local name="destdir"/>
422	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
386	<	<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 400 | Line 436
436		fork="true">
437
438		<include name="**/*.java"/>
439	<	<compilerarg value="-Xmodule:java.base" 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 line="--doclint-format html5"/>
444	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
445		<compilerarg value="-Werror"/>
408	–	<compilerarg value="-Xdoclint:all/protected"/>
446		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
447		<compilerarg line="${build.args}"/>
448
#	Line 444 | Line 481
481		<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
482		<javadoc destdir="${docs.dir}"
483		packagenames="none"
484	<	link="${java9.api.url}"
484	>	link="${java11.api.url}"
485		overview="${src.dir}/intro.html"
486		access="${build.javadoc.access}"
487		sourcepath="${src.dir}"
488		classpath=""
489	<	executable="${javadoc9}">
489	>	source="11"
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}"/>
494	>	<arg line="-Xdocrootparent ${java10.docroot.url}"/>
495		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
496		<arg value="-XDignore.symbol.file=true"/>
497	<	<arg value="-Xmodule:java.base"/>
498	<	<arg value="-tag"/>
499	<	<arg value="${javadoc.jls.option}"/>
500	<	<!-- @apiNote currently unused -->
501	<	<!--       <arg value="-tag"/> -->
502	<	<!--       <arg value="apiNote:a:API Note:"/> -->
503	<	<arg value="-tag"/>
504	<	<arg value="implSpec:a:Implementation Requirements:"/>
467	<	<arg value="-tag"/>
468	<	<arg value="implNote:a:Implementation Note:"/>
497	>	<arg value="-html5"/>
498	>	<arg value="--patch-module=java.base=${src.dir}"/>
499	>	<arg value="--frames"/>
500	>	<arg value="--override-methods=summary"/>
501	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
502	>	<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
503	>	<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
504	>	<arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
505		<!-- tags added in jdk9: currently unused -->
506	<	<!--       <arg value="-tag"/> -->
507	<	<!--       <arg value="revised:X"/> -->
472	<	<!--       <arg value="-tag"/> -->
473	<	<!--       <arg value="spec:X"/> -->
506	>	<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
507	>	<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
508		</javadoc>
509		</target>
510
#	Line 480 | Line 514
514		description="Puts all distributable products in single hierarchy"/>
515
516
483	–	<target name="release"
484	–	depends="dist"
485	–	description="Puts entire CVS tree, plus distribution productions, in a jar">
486	–
487	–	<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
488	–
489	–	<jar basedir="${basedir}" destfile="${release.jar}">
490	–	<!-- <exclude name="build/**"/> -->
491	–	<exclude name="${release.jar}"/>
492	–	<exclude name="user.properties"/>
493	–	<exclude name="etc/notes/**"/>
494	–	<exclude name="src/emulation/**"/>
495	–	<exclude name="**/SyntaxTest.java"/>
496	–	<exclude name="**/SuperfluousAbstract.java"/>
497	–	<manifest>
498	–	<attribute name="Built-By" value="${user.name}"/>
499	–	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
500	–	</manifest>
501	–	</jar>
502	–	</target>
503	–
504	–
517		<target name="clean"
518		description="Removes all build products">
507	–
519		<delete dir="${build.dir}"/>
509	–
520		</target>
521
522
523		<target name="dist-clean"
524		description="Removes all build and distribution products">
515	–
525		<delete dir="${build.dir}"/>
526		<delete dir="${dist.dir}"/>
518	–
527		</target>
528
529
#	Line 536 | Line 544
544		<run-tck-tests
545		target="${build.main.java.version}"
546		workdir="${build.dir}"
547	<	classes="${product.jar}"/>
547	>	classes="${product.jar}">
548	>	<javac-elements>
549	>	<compilerarg value="-Werror"/>
550	>	</javac-elements>
551	>	</run-tck-tests>
552		</target>
553
554		<target name="tck-parallelism-1"
#	Line 571 | Line 583
583
584		<target name="test"
585		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
586	<	description="Runs tck and jtreg tests for src/main">
575	<	</target>
586	>	description="Runs tck and jtreg tests for src/main"/>
587
588		<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
589
#	Line 583 | Line 594
594
595		<!--   </target> -->
596
597	<	<!--   <target name="test89" -->
598	<	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
597	>	<target name="test9101112"
598	>	description="Runs tck and jtreg tests for src/main for multiple java versions">
599
600	<	<!--     <antcall target="clean"/> -->
601	<	<!--     <antcall target="test"> -->
602	<	<!--       <param name="build.main.java.version" value="8"/> -->
603	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
604	<	<!--     </antcall> -->
600	>	<antcall target="clean"/>
601	>	<antcall target="test">
602	>	<param name="build.main.java.version" value="9"/>
603	>	<param name="build.main.java" value="${java9}"/>
604	>	<param name="build.main.javac" value="${javac9}"/>
605	>	</antcall>
606
607	<	<!--     <antcall target="clean"/> -->
608	<	<!--     <antcall target="test"> -->
609	<	<!--       <param name="build.main.java.version" value="9"/> -->
610	<	<!--       <param name="build.main.javac" value="${javac9}"/> -->
611	<	<!--     </antcall> -->
607	>	<antcall target="clean"/>
608	>	<antcall target="test">
609	>	<param name="build.main.java.version" value="10"/>
610	>	<param name="build.main.java" value="${java10}"/>
611	>	<param name="build.main.javac" value="${javac10}"/>
612	>	</antcall>
613
614	<	<!--   </target> -->
614	>	<antcall target="clean"/>
615	>	<antcall target="test">
616	>	<param name="build.main.java.version" value="11"/>
617	>	<param name="build.main.java" value="${java11}"/>
618	>	<param name="build.main.javac" value="${javac11}"/>
619	>	</antcall>
620	>
621	>	<antcall target="clean"/>
622	>	<antcall target="test">
623	>	<param name="build.main.java.version" value="12"/>
624	>	<param name="build.main.java" value="${java12}"/>
625	>	<param name="build.main.javac" value="${javac12}"/>
626	>	</antcall>
627	>	<antcall target="docs">
628	>	<param name="build.main.java.version" value="12"/>
629	>	<param name="build.main.java" value="${java12}"/>
630	>	<param name="build.main.javac" value="${javac12}"/>
631	>	<param name="build.main.javadoc" value="${javadoc12}"/>
632	>	</antcall>
633	>
634	>	<!-- Clean up to avoid obscure wrong class file version bugs -->
635	>	<antcall target="clean"/>
636	>
637	>	</target>
638
639
640
641		<target name="configure-compiler">
642		<fail message="ant version too old">
643	<	<condition>
608	<	<not> <antversion atleast="1.9.1"/> </not>
609	<	</condition>
643	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
644		</fail>
645
646		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 652 | Line 686
686		<java classname="ALoops" fork="true">
687		<classpath refid="loops.classpath"/>
688		</java>
655	–
689		</target>
690
691
692		<target name="compile-test-loops" depends="jar"
693	<	description="compile all the perf tests in src/test/loops">
693	>	description="Compiles all the perf tests in src/test/loops">
694
695		<mkdir dir="${build.dir}/test/loops"/>
696
#	Line 669 | Line 702
702		includeAntRuntime="false"
703		includeJavaRuntime="false"
704		encoding="ASCII"
705	<	executable="${javac9}"
705	>	executable="${build.main.javac}"
706		fork="true">
707
708		<include name="*.java"/>
#	Line 677 | Line 710
710		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
711		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
712		<compilerarg line="${build.args}"/>
680	–
713		</javac>
682	–
714		</target>
715
716
#	Line 705 | Line 736
736		encoding="ASCII"
737		executable="${javac8}"
738		fork="true">
708	–
739		<include name="**/*.java"/>
740		<compilerarg value="-Xprefer:source"/>
741		<compilerarg value="-XDignore.symbol.file=true"/>
742		<compilerarg value="-Xlint:all"/>
743		<compilerarg value="-Werror"/>
744		<compilerarg line="${build.args}"/>
715	–
745		</javac>
746		</target>
747
#	Line 736 | Line 765
765		encoding="ASCII"
766		executable="${javac8}"
767		fork="true">
739	–
768		<include name="**/*.java"/>
769		<compilerarg value="-Xprefer:source"/>
770		<compilerarg value="-XDignore.symbol.file=true"/>
771		<compilerarg value="-Xlint:all"/>
772	<	<compilerarg value="-Xdoclint:all/protected"/>
772	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
773		<compilerarg line="${build.args}"/>
746	–
774		</javac>
775		</target>
776
#	Line 759 | Line 786
786		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
787		</manifest>
788		</jar>
762	–
789		</target>
790
791
#	Line 775 | Line 801
801		<!-- JDK9+ test classes -->
802		<exclude name="*9Test.java"/>
803		<exclude name="*10Test.java"/>
804	+	<compilerarg value="-Werror"/>
805		</javac-elements>
806		</run-tck-tests>
807		</target>
#	Line 792 | Line 819
819
820		<target name="4jdk8-test"
821		depends="4jdk8-tck, 4jdk8-jtreg"
822	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
796	<	</target>
822	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
823
824
825		<target name="4jdk8docs"
#	Line 809 | Line 835
835		access="${build.javadoc.access}"
836		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
837		classpath=""
838	+	source="8"
839		executable="${javadoc8}"
840		failonerror = "true">
841		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
#	Line 816 | Line 843
843		</fileset>
844		<arg line="-Xdocrootparent ${java8.docroot.url}"/>
845		<arg value="-XDignore.symbol.file=true"/>
846	<	<arg value="-tag"/>
847	<	<arg value="${javadoc.jls.option}"/>
848	<	<!-- @apiNote currently unused -->
849	<	<!--       <arg value="-tag"/> -->
850	<	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
824	<	<arg value="-tag"/>
825	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
826	<	<arg value="-tag"/>
827	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
846	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
847	>	<arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
848	>	<arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
849	>	<!-- @apiNote tag currently unused -->
850	>	<!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
851		</javadoc>
852		</target>
853
#	Line 836 | Line 859
859
860		<target name="4jdk8clean"
861		description="Removes all 4jdk8 build products">
839	–
862		<delete dir="${build.4jdk8.dir}"/>
841	–
863		</target>
864
865
#	Line 854 | Line 875
875		</target>
876
877
878	+	<!-- jsr166 4jdk7 (no longer maintained) -->
879
880	<	<!-- jsr166 4jdk7 -->
859	<
860	<	<target name="4jdk7compile"
861	<	depends="configure-compiler"
862	<	description="Compiles src/jdk7 sources, targeting jdk7">
863	<
880	>	<target name="4jdk7compile" depends="configure-compiler">
881		<mkdir dir="${build.4jdk7.classes.dir}"/>
882
883		<javac srcdir="${4jdk7src.dir}"
#	Line 884 | Line 901
901		<compilerarg value="-Xlint:all"/>
902		<compilerarg value="-Werror"/>
903		<compilerarg line="${build.args}"/>
887	–
904		</javac>
905		</target>
906
907	<	<target name="4jdk7doclint"
892	<	depends="configure-compiler"
893	<	description="Finds doclint warnings">
894	<
907	>	<target name="4jdk7doclint" depends="configure-compiler">
908		<mkdir dir="${build.4jdk7.classes.dir}"/>
909
910		<javac srcdir="${4jdk7src.dir}"
#	Line 915 | Line 928
928		<compilerarg value="-Xlint:all"/>
929		<compilerarg value="-Xdoclint:all/protected"/>
930		<compilerarg line="${build.args}"/>
918	–
931		</javac>
932		</target>
933
934	<
923	<	<target name="4jdk7jar"
924	<	depends="4jdk7compile"
925	<	description="Builds library jar from compiled sources">
926	<
934	>	<target name="4jdk7jar" depends="4jdk7compile">
935		<jar destfile="${4jdk7product.jar}">
936		<fileset dir="${build.4jdk7.classes.dir}"/>
937		<manifest>
#	Line 931 | Line 939
939		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
940		</manifest>
941		</jar>
934	–
942		</target>
943
944	<
938	<	<target name="4jdk7-tck"
939	<	depends="4jdk7jar"
940	<	description="Runs tck tests for jsr166-4jdk7 directly">
941	<
944	>	<target name="4jdk7-tck" depends="4jdk7jar">
945		<run-tck-tests
946		target="7"
947		workdir="${build.4jdk7.dir}"
#	Line 956 | Line 959
959		<exclude name="SplittableRandomTest.java"/>
960		<exclude name="StampedLockTest.java"/>
961		<exclude name="SubmissionPublisherTest.java"/>
962	+	<compilerarg value="-Werror"/>
963		</javac-elements>
964		</run-tck-tests>
965		</target>
966
963	–
967		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
968	<	<target name="4jdk7-tck-junit"
966	<	depends="4jdk7compile">
968	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
969
970		<junit printsummary="true"
971		showoutput="true"
#	Line 985 | Line 987
987
988		<test name="${jsr166.tckTestClass}" haltonfailure="no">
989		</test>
988	–
990		</junit>
991		</target>
992
993	<	<target name="4jdk7-jtreg"
993	<	depends="4jdk7jar"
994	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
993	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
994		<run-jtreg-tests
995		target="7"
996		workdir="${build.4jdk7.dir}"
997		classes="${4jdk7product.jar}"/>
998		</target>
999
1000	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1001
1002	<	<target name="4jdk7-test"
1003	<	depends="4jdk7-tck, 4jdk7-jtreg"
1004	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
1005	<	</target>
1006	<
1007	<
1008	<	<target name="4jdk7docs"
1009	<	description="Builds javadocs for src/jdk7 to dist dir">
1010	<
1002	>	<target name="4jdk7docs">
1003		<delete dir="${4jdk7docs.dir}"/>
1004		<mkdir dir="${4jdk7docs.dir}"/>
1005
#	Line 1028 | Line 1020
1020		</javadoc>
1021		</target>
1022
1023	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1024
1025	<	<target name="4jdk7dist"
1033	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1034	<	description="Puts all distributable products in single hierarchy"/>
1035	<
1036	<
1037	<	<target name="4jdk7clean"
1038	<	description="Removes all 4jdk7 build products">
1039	<
1025	>	<target name="4jdk7clean">
1026		<delete dir="${build.4jdk7.dir}"/>
1041	–
1027		</target>
1028
1029	<
1045	<	<target name="4jdk7dist-jar"
1046	<	depends="4jdk7clean, 4jdk7jar">
1029	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1030		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1031		</target>
1032
1033	<
1051	<	<target name="4jdk7dist-docs"
1052	<	depends="4jdk7clean, 4jdk7docs">
1033	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1034		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1035		</target>
1036
1037
1038	<	<!-- jsr166x -->
1058	<
1059	<	<target name="jsr166xcompile"
1060	<	depends="configure-compiler"
1061	<	description="Compiles jsr166x sources to build dir">
1038	>	<!-- jsr166x (no longer maintained) -->
1039
1040	+	<target name="jsr166xcompile" depends="configure-compiler">
1041		<mkdir dir="${build.jsr166x.classes.dir}"/>
1042
1043		<javac srcdir="${topsrc.dir}"
#	Line 1076 | Line 1054
1054		encoding="ASCII"
1055		executable="${javac7}"
1056		fork="true">
1079	–
1057		<include name="jsr166x/**/*.java"/>
1058		<compilerarg value="-XDignore.symbol.file=true"/>
1059		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1060		<compilerarg value="-Werror"/>
1061		<compilerarg line="${build.args}"/>
1085	–
1062		</javac>
1063		</target>
1064
1065	<
1090	<	<target name="jsr166xjar"
1091	<	depends="jsr166xcompile"
1092	<	description="Builds library jar from compiled sources">
1093	<
1065	>	<target name="jsr166xjar" depends="jsr166xcompile">
1066		<jar destfile="${jsr166x.jar}">
1067		<fileset dir="${build.jsr166x.classes.dir}"/>
1068		<manifest>
#	Line 1098 | Line 1070
1070		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1071		</manifest>
1072		</jar>
1101	–
1073		</target>
1074
1075	<
1105	<	<target name="jsr166xdocs"
1106	<	description="Builds javadocs to dist dir">
1107	<
1075	>	<target name="jsr166xdocs">
1076		<delete dir="${jsr166xdocs.dir}"/>
1077		<mkdir dir="${jsr166xdocs.dir}"/>
1078
#	Line 1119 | Line 1087
1087		failonerror = "true">
1088		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1089		<arg value="-XDignore.symbol.file=true"/>
1122	–
1090		</javadoc>
1091		</target>
1092
1093	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1094
1095	<	<target name="jsr166xdist"
1128	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1129	<	description="Puts all distributable products in single hierarchy"/>
1130	<
1131	<
1132	<	<target name="jsr166xclean"
1133	<	description="Removes all jsr166x build products">
1134	<
1095	>	<target name="jsr166xclean">
1096		<delete dir="${build.jsr166x.dir}"/>
1136	–
1097		</target>
1098
1099	<
1140	<	<target name="jsr166xdist-jar"
1141	<	depends="jsr166xclean, jsr166xjar">
1099	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1100		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1101		</target>
1102
1103	<	<target name="jsr166xdist-docs"
1146	<	depends="jsr166xclean, jsr166xdocs">
1103	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1104		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1105		</target>
1106
1150	–	<!-- jsr166y -->
1107
1108	+	<!-- jsr166y (no longer maintained) -->
1109
1110	<	<target name="jsr166ycompile"
1154	<	depends="configure-compiler"
1155	<	description="Compiles jsr166y sources">
1156	<
1110	>	<target name="jsr166ycompile" depends="configure-compiler">
1111		<mkdir dir="${build.jsr166y.classes.dir}"/>
1112
1113		<javac srcdir="${topsrc.dir}"
#	Line 1176 | Line 1130
1130		<compilerarg value="-Xlint:all"/>
1131		<compilerarg value="-Werror"/>
1132		<compilerarg line="${build.args}"/>
1179	–
1133		</javac>
1134		</target>
1135
1136	<
1184	<	<target name="jsr166yjar"
1185	<	depends="jsr166ycompile"
1186	<	description="Builds library jar from compiled sources">
1187	<
1136	>	<target name="jsr166yjar" depends="jsr166ycompile">
1137		<jar destfile="${jsr166y.jar}" index="true">
1138		<fileset dir="${build.jsr166y.classes.dir}"/>
1139		<manifest>
#	Line 1192 | Line 1141
1141		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1142		</manifest>
1143		</jar>
1195	–
1144		</target>
1145
1146	<
1199	<	<target name="jsr166ydocs"
1200	<	description="Builds javadocs to dist dir">
1201	<
1146	>	<target name="jsr166ydocs">
1147		<delete dir="${jsr166ydocs.dir}"/>
1148		<mkdir dir="${jsr166ydocs.dir}"/>
1149
#	Line 1213 | Line 1158
1158		failonerror = "true">
1159		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1160		<arg value="-XDignore.symbol.file=true"/>
1216	–
1161		</javadoc>
1162		</target>
1163
1164	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1165
1166	<	<target name="jsr166ydist"
1222	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1223	<	description="Puts all distributable products in single hierarchy"/>
1224	<
1225	<
1226	<	<target name="jsr166yclean"
1227	<	description="Removes all jsr166y build products">
1228	<
1166	>	<target name="jsr166yclean">
1167		<delete dir="${build.jsr166y.dir}"/>
1230	–
1168		</target>
1169
1170	<
1234	<	<target name="jsr166ydist-jar"
1235	<	depends="jsr166yclean, jsr166yjar">
1170	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1171		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1172		</target>
1173
1174	<	<target name="jsr166ydist-docs"
1240	<	depends="jsr166yclean, jsr166ydocs">
1174	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1175		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1176		</target>
1177
1178
1179	<	<!-- extra166y -->
1246	<
1247	<
1248	<	<target name="extra166ycompile"
1249	<	depends="configure-compiler, jsr166yjar"
1250	<	description="Compiles extra166y sources">
1179	>	<!-- extra166y (no longer maintained) -->
1180
1181	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1182		<mkdir dir="${build.extra166y.classes.dir}"/>
1183
1184		<javac srcdir="${topsrc.dir}"
#	Line 1271 | Line 1201
1201		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1202		<compilerarg value="-Werror"/>
1203		<compilerarg line="${build.args}"/>
1274	–
1204		</javac>
1205		</target>
1206
1207	<
1279	<	<target name="extra166yjar"
1280	<	depends="extra166ycompile"
1281	<	description="Builds library jar from compiled sources">
1282	<
1207	>	<target name="extra166yjar" depends="extra166ycompile">
1208		<jar destfile="${extra166y.jar}" index="true">
1209		<fileset dir="${build.extra166y.classes.dir}"/>
1210		<manifest>
#	Line 1287 | Line 1212
1212		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1213		</manifest>
1214		</jar>
1290	–
1215		</target>
1216
1217	<
1294	<	<target name="extra166ydocs"
1295	<	description="Builds javadocs to build dir">
1296	<
1217	>	<target name="extra166ydocs">
1218		<delete dir="${extra166ydocs.dir}"/>
1219		<mkdir dir="${extra166ydocs.dir}"/>
1220
#	Line 1307 | Line 1228
1228		executable="${javadoc7}">
1229		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1230		<arg value="-XDignore.symbol.file=true"/>
1310	–
1231		</javadoc>
1232		</target>
1233
1234	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1235
1236	<	<target name="extra166ydist"
1316	<	depends="extra166ydist-jar, extra166ydist-docs"
1317	<	description="Puts all distributable products in single hierarchy"/>
1318	<
1319	<
1320	<	<target name="extra166yclean"
1321	<	description="Removes all extra166y build products">
1322	<
1236	>	<target name="extra166yclean">
1237		<delete dir="${build.extra166y.dir}"/>
1324	–
1238		</target>
1239
1240	<
1328	<	<target name="extra166ydist-jar"
1329	<	depends="extra166yclean, extra166yjar">
1240	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1241		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1242		</target>
1243
1244	<	<target name="extra166ydist-docs"
1334	<	depends="extra166yclean, extra166ydocs">
1244	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1245		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1246		</target>
1247
1248	<	<!-- jsr166e -->
1248	>
1249	>	<!-- jsr166e (no longer maintained) -->
1250
1251		<property name="build.jsr166e.java.version" value="6"/>
1252		<property name="build.jsr166e.javac" value="${javac6}"/>
1253
1254	<	<target name="jsr166ecompile"
1344	<	depends="configure-compiler"
1345	<	description="Compiles jsr166e sources">
1346	<
1254	>	<target name="jsr166ecompile" depends="configure-compiler">
1255		<mkdir dir="${build.jsr166e.classes.dir}"/>
1256
1257		<javac srcdir="${topsrc.dir}"
#	Line 1364 | Line 1272
1272		<compilerarg value="-Xlint:all"/>
1273		<compilerarg value="-Werror"/>
1274		<compilerarg line="${build.args}"/>
1367	–
1275		</javac>
1276		</target>
1277
1371	–	<!-- jsr166e: find doclint errors -->
1278		<target name="jsr166edoclint">
1373	–
1279		<mkdir dir="${build.jsr166e.classes.dir}"/>
1280
1281		<javac srcdir="${topsrc.dir}"
#	Line 1392 | Line 1297
1297		<compilerarg value="-Xlint:all"/>
1298		<compilerarg value="-Werror"/>
1299		<compilerarg value="-Xdoclint:all/protected"/>
1395	–
1300		</javac>
1301		</target>
1302
1303	<
1400	<	<target name="jsr166ejar"
1401	<	depends="jsr166ecompile"
1402	<	description="Builds library jar from compiled sources">
1403	<
1303	>	<target name="jsr166ejar" depends="jsr166ecompile">
1304		<jar destfile="${jsr166e.jar}" index="true">
1305		<fileset dir="${build.jsr166e.classes.dir}"/>
1306		<manifest>
#	Line 1408 | Line 1308
1308		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1309		</manifest>
1310		</jar>
1411	–
1311		</target>
1312
1313	<
1415	<	<target name="jsr166edocs"
1416	<	description="Builds javadocs to build dir">
1417	<
1313	>	<target name="jsr166edocs">
1314		<delete dir="${jsr166edocs.dir}"/>
1315		<mkdir dir="${jsr166edocs.dir}"/>
1316
#	Line 1428 | Line 1324
1324		failonerror = "true">
1325		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1326		<arg value="-XDignore.symbol.file=true"/>
1431	–
1327		</javadoc>
1328		</target>
1329
1330	<
1436	<	<target name="jsr166e-tck-one-java-version"
1437	<	depends="jsr166ejar">
1438	<
1330	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1331		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1440	–
1332		<run-tck-tests
1333		tck.src.dir="${test.src.dir}/tck-jsr166e"
1334		target="${build.jsr166e.java.version}"
#	Line 1445 | Line 1336
1336		classes="${jsr166e.jar}"/>
1337		</target>
1338
1339	<	<target name="jsr166e-tck"
1449	<	description="Runs tck tests for jsr166e for multiple java versions">
1339	>	<target name="jsr166e-tck">
1340
1341		<!--     <antcall target="clean"/> -->
1342		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1467 | Line 1357
1357		</antcall>
1358		</target>
1359
1360	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1361
1362	<	<target name="jsr166e-test"
1472	<	depends="jsr166e-tck"
1473	<	description="Runs all tests for jsr166e">
1474	<	</target>
1475	<
1476	<	<target name="jsr166edist"
1477	<	depends="jsr166edist-jar, jsr166edist-docs"
1478	<	description="Puts all distributable products in single hierarchy"/>
1362	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1363
1364	<
1481	<	<target name="jsr166eclean"
1482	<	description="Removes all jsr166e build products">
1364	>	<target name="jsr166eclean">
1365		<delete dir="${build.jsr166e.dir}"/>
1366		</target>
1367
1486	–
1368		<target name="jsr166edist-jar"
1369		depends="jsr166eclean, jsr166ejar">
1370		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1371		</target>
1372
1373	<	<target name="jsr166edist-docs"
1493	<	depends="jsr166eclean, jsr166edocs">
1373	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1374		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1375		</target>
1376
1377
1378		<!-- Find buglets that can be detected by static build tools -->
1379
1380	<	<target name="lint">
1381	<	<antcall target="dists">
1382	<	<param name="build.javadoc.access" value="public"/>
1383	<	</antcall>
1384	<	</target>
1380	>	<!--   <target name="lint"> -->
1381	>	<!--     <antcall target="dists"> -->
1382	>	<!--       <param name="build.javadoc.access" value="protected"/> -->
1383	>	<!--     </antcall> -->
1384	>	<!--   </target> -->
1385
1386		<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1387	<	<target name="lint-private">
1387	>	<target name="doclint-private">
1388		<antcall target="dist">
1389		<param name="build.javadoc.access" value="private"/>
1390		</antcall>
1391		</target>
1392
1393	+
1394	+	<!-- ==============================================================
1395	+	Experimental errorprone support - https://errorprone.info
1396	+	=================================================================== -->
1397	+	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1398	+	<property name="errorprone.jsr166.user.flags" value=""/>
1399	+	<property name="errorprone.jsr166.flags"
1400	+	value="-Xep:HashtableContains:OFF
1401	+	-Xep:JdkObsolete:OFF
1402	+	-Xep:MissingOverride:OFF
1403	+	-Xep:MissingFail:OFF
1404	+	-Xep:MixedArrayDimensions:ERROR
1405	+	-Xep:RemoveUnusedImports:ERROR
1406	+	-Xep:EmptyIf:ERROR
1407	+	-Xep:MultipleTopLevelClasses:ERROR
1408	+	-Xep:ClassName:ERROR
1409	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1410	+	-Xep:RedundantThrows:ERROR
1411	+	-Xep:IdentityBinaryExpression:WARN
1412	+	-Xep:MethodCanBeStatic:WARN
1413	+	${errorprone.jsr166.user.flags}"/>
1414	+	<!-- -Xep:WildcardImport:ERROR -->
1415	+	<property name="errorprone.jsr166.test.flags"
1416	+	value="-Xep:StringSplitter:OFF
1417	+	-Xep:BoxedPrimitiveConstructor:OFF
1418	+	-Xep:ModifyingCollectionWithItself:OFF"/>
1419	+	<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1420	+	<target name="errorprone"
1421	+	depends="clean, configure-compiler"
1422	+	description="Run errorprone over jsr166 source code (experimental)">
1423	+
1424	+	<local name="destdir"/>
1425	+	<property name="destdir" value="${build.classes.dir}/java.base"/>
1426	+	<mkdir dir="${destdir}"/>
1427	+
1428	+	<javac srcdir="${src.dir}"
1429	+	destdir="${destdir}"
1430	+	debug="${build.debug}"
1431	+	debuglevel="${build.debuglevel}"
1432	+	deprecation="${build.deprecation}"
1433	+	classpath=""
1434	+	includeAntRuntime="false"
1435	+	includeJavaRuntime="false"
1436	+	encoding="ASCII"
1437	+	executable="${build.main.javac}"
1438	+	fork="true">
1439	+
1440	+	<include name="**/*.java"/>
1441	+	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1442	+	<compilerarg value="-J--illegal-access=permit"/>
1443	+	<compilerarg value="-XDcompilePolicy=simple"/>
1444	+	<compilerarg line="-processorpath ${errorprone.jar}"/>
1445	+	<compilerarg value="-Xplugin:ErrorProne
1446	+	${errorprone.jsr166.flags}"/>
1447	+	<compilerarg value="--patch-module=java.base=${src.dir}"/>
1448	+	<compilerarg value="-Xprefer:source"/>
1449	+	<compilerarg value="-XDignore.symbol.file=true"/>
1450	+	<compilerarg value="-Xlint:all"/>
1451	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
1452	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1453	+	<compilerarg line="${build.args}"/>
1454	+	</javac>
1455	+
1456	+	<jar destfile="${product.jar}">
1457	+	<fileset dir="${destdir}"/>
1458	+	</jar>
1459	+
1460	+	<run-tck-tests
1461	+	target="${build.main.java.version}"
1462	+	workdir="${build.dir}"
1463	+	classes="${product.jar}">
1464	+	<javac-elements>
1465	+	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1466	+	<compilerarg value="-J--illegal-access=permit"/>
1467	+	<compilerarg value="-XDcompilePolicy=simple"/>
1468	+	<compilerarg line="-processorpath ${errorprone.jar}"/>
1469	+	<compilerarg value="-Xplugin:ErrorProne
1470	+	${errorprone.jsr166.flags}
1471	+	${errorprone.jsr166.test.flags}"/>
1472	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1473	+	</javac-elements>
1474	+	</run-tck-tests>
1475	+	</target>
1476	+
1477	+	<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1478	+	<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1479	+	<target name="errorprone-jtreg"
1480	+	depends="jar"
1481	+	description="Run errorprone over jtreg tests (experimental)">
1482	+
1483	+	<run-jtreg-tests
1484	+	target="${build.main.java.version}"
1485	+	workdir="${build.dir}"
1486	+	classes="${product.jar}"
1487	+	verbose="all">
1488	+	<jtreg-elements>
1489	+	<arg value="-javacoption:-XDcompilePolicy=simple"/>
1490	+	<arg value="-javacoption:-processorpath"/>
1491	+	<arg value="-javacoption:${errorprone.jar}"/>
1492	+	<arg value="-javacoption:-Xplugin:ErrorProne
1493	+	${errorprone.jsr166.flags}
1494	+	${errorprone.jsr166.test.flags}
1495	+	-Xep:MultipleTopLevelClasses:WARN
1496	+	-Xep:NonAtomicVolatileUpdate:OFF"/>
1497	+	</jtreg-elements>
1498	+	</run-jtreg-tests>
1499	+	</target>
1500	+
1501	+
1502		<!-- ==============================================================
1503		Running guava tests against jsr166 code
1504		=================================================================== -->
#	Line 1562 | Line 1551
1551		<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1552		dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1553		<junit printsummary="true" showoutput="true" haltonfailure="true"
1554	<	jvm="${java9}" fork="true">
1555	<	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1554	>	jvm="${build.main.java}" fork="true">
1555	>	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1556		<formatter type="brief"/>
1557		<classpath>
1558		<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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