ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/build.xml

Comparing jsr166/build.xml (file contents):
Revision 1.238 by jsr166, Fri Mar 24 16:33:02 2017 UTC vs.
Revision 1.298 by jsr166, Wed May 22 17:36:58 2019 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	+	$HOME/jdk/jdk13
28		where each of the above is a JDK or a symlink to same, and
26	–	$HOME/jdk/src/jdk7
29		$HOME/jdk/src/jdk8
30		$HOME/jdk/src/jdk9
31		$HOME/jdk/src/jdk10
32	+	$HOME/jdk/src/jdk11
33	+	$HOME/jdk/src/jdk12
34	+	$HOME/jdk/src/jdk13
35		where each of the above is a complete JDK source tree
36		(e.g. mercurial forest) or a symlink to same.
37
38		Alternatively, define ant variables thus:
39		ant -Djdk$N.home=... -Djdk$N.src.home=...
40	<	for $N in 7 8 9 10 ...
40	>	for $N in 8 .. 13 ...
41
42		As of 2016-03, the sources in src/main are for jdk9+ only.
43		------------------------------------------------------------------------------
#	Line 52 | Line 57
57
58
59		<!-- Compilation options -->
55	–	<property name="build.sourcelevel"    value="6"/>
60		<property name="build.debug"          value="true"/>
61		<property name="build.debuglevel"     value="source,lines,vars"/>
62		<property name="build.deprecation"    value="false"/>
#	Line 103 | Line 107
107		<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
108		unless:set="have.java.base"/>
109		<local name="modules"/>
110	<	<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
110	>	<available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
111		<local name="boot.jar.dir"/>
112		<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
113		<path id="bootclasspath@{v}" unless:set="modules">
#	Line 134 | Line 138
138		<defjdklocations v="8"/>
139		<defjdklocations v="9"/>
140		<defjdklocations v="10"/>
141	+	<defjdklocations v="11"/>
142	+	<defjdklocations v="12"/>
143	+	<defjdklocations v="13"/>
144
145		<!-- Source locations -->
146		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 144 | Line 151
151		<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
152		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
153		<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
154	+	<property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
155	+	<property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
156	+	<property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
157		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
158		<property name="lib.dir"              location="${basedir}/lib"/>
159		<property name="dist.dir"             location="${basedir}/dist"/>
#	Line 183 | Line 193
193		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
194
195		<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
196	<	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
197	<	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
198	<	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
199	<	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
200	<	<!-- The expected canonical location does not yet exist as of 2016-04 -->
201	<	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
202	<	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
203	<	<!-- Default jdk doc location (latest stable release seems best) -->
204	<	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
196	>	<!-- Switched to https: in 2017-10 - JDK-8190312 -->
197	>	<property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
198	>	<property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
199	>	<property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
200	>	<property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
201	>	<property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
202	>	<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
203	>	<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
204	>	<property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
205	>	<!-- The location of jdk early access docs (RIP) -->
206	>	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
207	>	<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
208	>	<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
209	>	<!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
210	>	<property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
211	>	<!-- Default jdk doc location (latest stable LTS release seems best) -->
212	>	<property name="java.docroot.url"   value="${java11.docroot.url}"/>
213
214		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
215		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 199 | Line 217
217		<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
218		<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
219		<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
220	+	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
221	+	<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
222	+	<property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
223	+	<property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
224		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
225
226		<!-- Define the "jtreg" task -->
#	Line 231 | Line 253
253
254		<local name="modules"/>
255		<condition property="modules">
256	<	<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
256	>	<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
257		</condition>
258
259		<local name="use-doclint"/>
#	Line 298 | Line 320
320		</macrodef>
321
322		<!-- Define jtreg test sets for different jdk versions -->
323	<	<fileset dir="${jtreg9.src.dir}">
324	<	<patternset id="jdk9.jtreg.tests">
325	<	<include name="**/*.java"/>
326	<	</patternset>
327	<	</fileset>
328	<
329	<	<fileset dir="${jtreg8.src.dir}">
330	<	<patternset id="jdk8.jtreg.tests">
331	<	<include name="**/*.java"/>
332	<	</patternset>
333	<	</fileset>
323	>	<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
324	>	<!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
325	>	<property name="jtreg.test.pattern" value="**/*.java"/>
326	>	<macrodef name="defjtregtests">
327	>	<attribute name="v"/>
328	>	<sequential>
329	>	<fileset dir="${jtreg@{v}.src.dir}">
330	>	<patternset id="jdk@{v}.jtreg.tests">
331	>	<include name="${jtreg.test.pattern}"/>
332	>	</patternset>
333	>	</fileset>
334	>	</sequential>
335	>	</macrodef>
336
337	<	<fileset dir="${jtreg7.src.dir}">
338	<	<patternset id="jdk7.jtreg.tests">
339	<	<include name="**/*.java"/>
340	<	</patternset>
341	<	</fileset>
337	>	<defjtregtests v="13"/>
338	>	<defjtregtests v="12"/>
339	>	<defjtregtests v="11"/>
340	>	<defjtregtests v="10"/>
341	>	<defjtregtests v="9"/>
342	>	<defjtregtests v="8"/>
343	>	<defjtregtests v="7"/>
344
345		<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
346		<property name="jtreg.flags" value=""/>
347
348		<macrodef name="run-jtreg-tests">
349	<	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
324	<	<attribute name="source" default="7"/>
349	>	<!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
350		<attribute name="target"/>
351		<attribute name="workdir"/>
352		<attribute name="classes"/>
353	+	<attribute name="verbose" default="${jtreg.verbose}"/>
354		<attribute name="jtregflags" default=""/>
355	+	<element name="jtreg-elements" optional="true"/>
356
357		<sequential>
358
#	Line 334 | Line 361
361
362		<local name="modules"/>
363		<condition property="modules">
364	<	<available file="${jdk@{target}.home}/jmods" type="dir"/>
364	>	<available file="${jdk@{target}.home}/lib/modules" type="file"/>
365		</condition>
366
367		<delete dir="@{workdir}/JTwork"   quiet="true"/>
#	Line 343 | Line 370
370		workDir="@{workdir}/JTwork">
371		<patternset refid="jdk@{target}.jtreg.tests"/>
372		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
373	<	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
374	<	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
373	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
374	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
375		<arg value="-agentvm"/>
376		<arg value="-noreport"/>
377	<	<arg value="-verbose:${jtreg.verbose}"/>
377	>	<arg value="-verbose:@{verbose}"/>
378		<arg value="-vmoptions:-esa -ea"/>
379		<arg value="-automatic"/>
380		<arg value="-k:!ignore"/>
381		<arg line="@{jtregflags}"/>
382		<arg line="${jtreg.flags}"/>
383	+	<jtreg-elements/>
384		</jtreg>
385		</sequential>
386		</macrodef>
#	Line 368 | Line 396
396
397		<!-- Main targets -->
398
399	<	<property name="build.main.java.version" value="9"/>
399	>	<!-- Default values: may seem strange ... -->
400	>	<!-- At runtime, target latest LTS, i.e. jdk11 -->
401	>	<!-- But at build time, target jdk9, for maximal binary portability -->
402	>	<!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
403	>	o override-methods=summary
404	>	o {@systemProperty ...}
405	>	o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
406	>	o 8202628: javadoc generates bad links in TestModules.java
407	>	-->
408	>	<property name="java.runtime.target" value="11"/>
409	>	<property name="build.main.java" value="${java11}"/>
410		<property name="build.main.javac" value="${javac9}"/>
411	+	<property name="build.main.javadoc" value="${javadoc12}"/>
412	+	<property name="build.main.javadoc.source" value="${java.runtime.target}"/>
413
414		<target name="dists"
415	<	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
415	>	depends="dist, 4jdk8dist"
416		description="Builds all public jars and docs"/>
417	+	<!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
418
419		<target name="compile"
420		depends="configure-compiler"
421		description="Compiles src/main sources to build dir">
422
382	–	<local name="modules"/>
383	–	<condition property="modules">
384	–	<and>
385	–	<available file="${jdk9.home}/jmods" type="dir"/>
386	–	<equals arg1="9" arg2="${build.main.java.version}"/>
387	–	</and>
388	–	</condition>
389	–
423		<local name="destdir"/>
424	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
392	<	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
424	>	<property name="destdir" value="${build.classes.dir}/java.base"/>
425
426		<mkdir dir="${destdir}"/>
427
#	Line 406 | Line 438
438		fork="true">
439
440		<include name="**/*.java"/>
441	<	<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
441	>	<compilerarg value="--patch-module=java.base=${src.dir}"/>
442		<compilerarg value="-Xprefer:source"/>
443		<compilerarg value="-XDignore.symbol.file=true"/>
444	<	<compilerarg value="-Xlint:all"/>
445	<	<compilerarg value="-Werror"/>
444	>	<compilerarg value="-Xlint:all,-removal"/>
445	>	<compilerarg line="--doclint-format html5"/>
446		<compilerarg value="-Xdoclint:all/protected,reference/private"/>
447	+	<compilerarg value="-Xdoclint/package:java.util.*"/>
448	+	<compilerarg value="-Werror"/>
449		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
450		<compilerarg line="${build.args}"/>
451
#	Line 450 | Line 484
484		<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
485		<javadoc destdir="${docs.dir}"
486		packagenames="none"
487	<	link="${java9.api.url}"
487	>	link="${java.api.url}"
488		overview="${src.dir}/intro.html"
489		access="${build.javadoc.access}"
490		sourcepath="${src.dir}"
491		classpath=""
492	<	executable="${javadoc9}">
492	>	source="${build.main.javadoc.source}"
493	>	executable="${build.main.javadoc}">
494	>	<!-- TODO: JDK-8214571 failonerror = "true" -->
495		<fileset dir="${src.dir}" defaultexcludes="yes">
496		<include name="**/*.java"/>
497		</fileset>
498	<	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
498	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
499		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
500		<arg value="-XDignore.symbol.file=true"/>
501	+	<arg value="-html5"/>
502		<arg value="--patch-module=java.base=${src.dir}"/>
503	<	<arg value="-tag"/>
504	<	<arg value="${javadoc.jls.option}"/>
505	<	<!-- @apiNote currently unused -->
506	<	<!--       <arg value="-tag"/> -->
507	<	<!--       <arg value="apiNote:a:API Note:"/> -->
508	<	<arg value="-tag"/>
509	<	<arg value="implSpec:a:Implementation Requirements:"/>
510	<	<arg value="-tag"/>
474	<	<arg value="implNote:a:Implementation Note:"/>
503	>	<!-- old school frames via docs/index.html?overview-summary.html -->
504	>	<!-- TODO: - -frames no longer a supported option in jdk13+ -->
505	>	<arg value="--frames"/>
506	>	<arg value="--override-methods=summary"/>
507	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
508	>	<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
509	>	<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
510	>	<arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
511		<!-- tags added in jdk9: currently unused -->
512	<	<!--       <arg value="-tag"/> -->
513	<	<!--       <arg value="revised:X"/> -->
478	<	<!--       <arg value="-tag"/> -->
479	<	<!--       <arg value="spec:X"/> -->
512	>	<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
513	>	<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
514		</javadoc>
515		</target>
516
#	Line 486 | Line 520
520		description="Puts all distributable products in single hierarchy"/>
521
522
489	–	<target name="release"
490	–	depends="dist"
491	–	description="Puts entire CVS tree, plus distribution productions, in a jar">
492	–
493	–	<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
494	–
495	–	<jar basedir="${basedir}" destfile="${release.jar}">
496	–	<!-- <exclude name="build/**"/> -->
497	–	<exclude name="${release.jar}"/>
498	–	<exclude name="user.properties"/>
499	–	<exclude name="etc/notes/**"/>
500	–	<exclude name="src/emulation/**"/>
501	–	<exclude name="**/SyntaxTest.java"/>
502	–	<exclude name="**/SuperfluousAbstract.java"/>
503	–	<manifest>
504	–	<attribute name="Built-By" value="${user.name}"/>
505	–	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
506	–	</manifest>
507	–	</jar>
508	–	</target>
509	–
510	–
523		<target name="clean"
524		description="Removes all build products">
513	–
525		<delete dir="${build.dir}"/>
515	–
526		</target>
527
528
529		<target name="dist-clean"
530		description="Removes all build and distribution products">
521	–
531		<delete dir="${build.dir}"/>
532		<delete dir="${dist.dir}"/>
524	–
533		</target>
534
535
#	Line 540 | Line 548
548		description="Runs tck tests for src/main directly">
549
550		<run-tck-tests
551	<	target="${build.main.java.version}"
551	>	target="${java.runtime.target}"
552		workdir="${build.dir}"
553		classes="${product.jar}">
554		<javac-elements>
#	Line 574 | Line 582
582		depends="jar"
583		description="Runs jtreg tests for src/main using the jtreg ant task">
584		<run-jtreg-tests
585	<	target="${build.main.java.version}"
585	>	target="${java.runtime.target}"
586		workdir="${build.dir}"
587		classes="${product.jar}"/>
588		</target>
589
590		<target name="test"
591		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
592	<	description="Runs tck and jtreg tests for src/main">
592	>	description="Runs tck and jtreg tests for src/main"/>
593	>
594	>	<target name="test-version-permutations"
595	>	depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
596		</target>
597
598	<	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
598	>	<target name="test9">
599	>	<antcall target="clean"/>
600	>	<antcall>
601	>	<param name="java.runtime.target" value="9"/>
602	>	<param name="build.main.javac" value="${javac9}"/>
603	>	<param name="build.main.javadoc" value="${javadoc12}"/>
604	>	<param name="build.main.javadoc.source" value="9"/>
605	>	<target name="test"/>
606	>	<target name="docs"/>
607	>	</antcall>
608	>	</target>
609
610	<	<!--     <antcall target="jtreg"> -->
611	<	<!--       <param name="build.main.java.version" value="8"/> -->
612	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
613	<	<!--     </antcall> -->
610	>	<target name="test10">
611	>	<antcall target="clean"/>
612	>	<antcall>
613	>	<param name="java.runtime.target" value="10"/>
614	>	<param name="build.main.javac" value="${javac10}"/>
615	>	<param name="build.main.javadoc" value="${javadoc12}"/>
616	>	<param name="build.main.javadoc.source" value="10"/>
617	>	<target name="test"/>
618	>	<target name="docs"/>
619	>	</antcall>
620	>	</target>
621
622	<	<!--   </target> -->
622	>	<target name="test11">
623	>	<antcall target="clean"/>
624	>	<antcall>
625	>	<param name="java.runtime.target" value="11"/>
626	>	<param name="build.main.javac" value="${javac11}"/>
627	>	<param name="build.main.javadoc" value="${javadoc12}"/>
628	>	<param name="build.main.javadoc.source" value="11"/>
629	>	<target name="test"/>
630	>	<target name="docs"/>
631	>	</antcall>
632	>	</target>
633
634	<	<!--   <target name="test89" -->
635	<	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
634	>	<target name="test12">
635	>	<antcall target="clean"/>
636	>	<antcall>
637	>	<param name="java.runtime.target" value="12"/>
638	>	<param name="build.main.javac" value="${javac12}"/>
639	>	<param name="build.main.javadoc" value="${javadoc12}"/>
640	>	<param name="build.main.javadoc.source" value="12"/>
641	>	<target name="test"/>
642	>	<target name="docs"/>
643	>	</antcall>
644	>	</target>
645
646	<	<!--     <antcall target="clean"/> -->
647	<	<!--     <antcall target="test"> -->
648	<	<!--       <param name="build.main.java.version" value="8"/> -->
649	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
650	<	<!--     </antcall> -->
646	>	<target name="test13">
647	>	<antcall target="clean"/>
648	>	<antcall>
649	>	<param name="java.runtime.target" value="13"/>
650	>	<param name="build.main.javac" value="${javac13}"/>
651	>	<param name="build.main.javadoc" value="${javadoc13}"/>
652	>	<param name="build.main.javadoc.source" value="13"/>
653	>	<target name="test"/>
654	>	<target name="docs"/>
655	>	</antcall>
656	>	</target>
657
658	<	<!--     <antcall target="clean"/> -->
659	<	<!--     <antcall target="test"> -->
660	<	<!--       <param name="build.main.java.version" value="9"/> -->
661	<	<!--       <param name="build.main.javac" value="${javac9}"/> -->
662	<	<!--     </antcall> -->
658	>	<target name="test9-11">
659	>	<antcall target="clean"/>
660	>	<antcall>
661	>	<param name="java.runtime.target" value="11"/>
662	>	<param name="build.main.javac" value="${javac9}"/>
663	>	<param name="build.main.javadoc" value="${javadoc12}"/>
664	>	<param name="build.main.javadoc.source" value="9"/>
665	>	<target name="test"/>
666	>	<target name="docs"/>
667	>	</antcall>
668	>	</target>
669
670	<	<!--   </target> -->
670	>	<target name="test9-12">
671	>	<antcall target="clean"/>
672	>	<antcall>
673	>	<param name="java.runtime.target" value="12"/>
674	>	<param name="build.main.javac" value="${javac9}"/>
675	>	<param name="build.main.javadoc" value="${javadoc12}"/>
676	>	<param name="build.main.javadoc.source" value="9"/>
677	>	<target name="test"/>
678	>	<target name="docs"/>
679	>	</antcall>
680	>	</target>
681
682	+	<target name="test9-13">
683	+	<antcall target="clean"/>
684	+	<antcall>
685	+	<param name="java.runtime.target" value="13"/>
686	+	<param name="build.main.javac" value="${javac9}"/>
687	+	<param name="build.main.javadoc" value="${javadoc13}"/>
688	+	<param name="build.main.javadoc.source" value="9"/>
689	+	<target name="test"/>
690	+	<target name="docs"/>
691	+	</antcall>
692	+	</target>
693
694
695		<target name="configure-compiler">
#	Line 632 | Line 712
712		</target>
713
714
635	–
636	–	<!-- Various demos and test programs -->
637	–
638	–
639	–	<!-- description="Benchmark from Doug Lea's AQS paper" -->
640	–	<target name="loops" depends="configure-compiler">
641	–
642	–	<mkdir dir="${build.loops.dir}"/>
643	–
644	–	<javac srcdir="${loops.src.dir}"
645	–	destdir="${build.loops.dir}"
646	–	debug="${build.debug}"
647	–	debuglevel="${build.debuglevel}"
648	–	deprecation="${build.deprecation}"
649	–	source="${build.sourcelevel}"
650	–	target="${build.sourcelevel}"
651	–	encoding="ASCII"
652	–	fork="true">
653	–
654	–	<compilerarg line="${build.args}"/>
655	–	<classpath refid="loops.classpath"/>
656	–	<compilerarg value="-XDignore.symbol.file=true"/>
657	–
658	–	</javac>
659	–
660	–	<java classname="ALoops" fork="true">
661	–	<classpath refid="loops.classpath"/>
662	–	</java>
663	–
664	–	</target>
665	–
666	–
715		<target name="compile-test-loops" depends="jar"
716	<	description="compile all the perf tests in src/test/loops">
716	>	description="Compiles all the perf tests in src/test/loops">
717
718		<mkdir dir="${build.dir}/test/loops"/>
719
#	Line 677 | Line 725
725		includeAntRuntime="false"
726		includeJavaRuntime="false"
727		encoding="ASCII"
728	<	executable="${javac9}"
728	>	executable="${build.main.javac}"
729		fork="true">
730
731		<include name="*.java"/>
#	Line 685 | Line 733
733		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
734		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
735		<compilerarg line="${build.args}"/>
688	–
736		</javac>
690	–
737		</target>
738
739
#	Line 713 | Line 759
759		encoding="ASCII"
760		executable="${javac8}"
761		fork="true">
716	–
762		<include name="**/*.java"/>
763		<compilerarg value="-Xprefer:source"/>
764		<compilerarg value="-XDignore.symbol.file=true"/>
765		<compilerarg value="-Xlint:all"/>
766		<compilerarg value="-Werror"/>
767		<compilerarg line="${build.args}"/>
723	–
768		</javac>
769		</target>
770
#	Line 744 | Line 788
788		encoding="ASCII"
789		executable="${javac8}"
790		fork="true">
747	–
791		<include name="**/*.java"/>
792		<compilerarg value="-Xprefer:source"/>
793		<compilerarg value="-XDignore.symbol.file=true"/>
794		<compilerarg value="-Xlint:all"/>
795		<compilerarg value="-Xdoclint:all/protected,reference/private"/>
796		<compilerarg line="${build.args}"/>
754	–
797		</javac>
798		</target>
799
#	Line 767 | Line 809
809		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
810		</manifest>
811		</jar>
770	–
812		</target>
813
814
#	Line 801 | Line 842
842
843		<target name="4jdk8-test"
844		depends="4jdk8-tck, 4jdk8-jtreg"
845	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
805	<	</target>
845	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
846
847
848		<target name="4jdk8docs"
#	Line 818 | Line 858
858		access="${build.javadoc.access}"
859		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
860		classpath=""
861	+	source="8"
862		executable="${javadoc8}"
863		failonerror = "true">
864		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
#	Line 825 | Line 866
866		</fileset>
867		<arg line="-Xdocrootparent ${java8.docroot.url}"/>
868		<arg value="-XDignore.symbol.file=true"/>
869	<	<arg value="-tag"/>
870	<	<arg value="${javadoc.jls.option}"/>
871	<	<!-- @apiNote currently unused -->
872	<	<!--       <arg value="-tag"/> -->
873	<	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
833	<	<arg value="-tag"/>
834	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
835	<	<arg value="-tag"/>
836	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
869	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
870	>	<arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
871	>	<arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
872	>	<!-- @apiNote tag currently unused -->
873	>	<!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
874		</javadoc>
875		</target>
876
#	Line 845 | Line 882
882
883		<target name="4jdk8clean"
884		description="Removes all 4jdk8 build products">
848	–
885		<delete dir="${build.4jdk8.dir}"/>
850	–
886		</target>
887
888
#	Line 863 | Line 898
898		</target>
899
900
901	+	<!-- jsr166 4jdk7 (no longer maintained) -->
902
903	<	<!-- jsr166 4jdk7 -->
868	<
869	<	<target name="4jdk7compile"
870	<	depends="configure-compiler"
871	<	description="Compiles src/jdk7 sources, targeting jdk7">
872	<
903	>	<target name="4jdk7compile" depends="configure-compiler">
904		<mkdir dir="${build.4jdk7.classes.dir}"/>
905
906		<javac srcdir="${4jdk7src.dir}"
#	Line 893 | Line 924
924		<compilerarg value="-Xlint:all"/>
925		<compilerarg value="-Werror"/>
926		<compilerarg line="${build.args}"/>
896	–
927		</javac>
928		</target>
929
930	<	<target name="4jdk7doclint"
901	<	depends="configure-compiler"
902	<	description="Finds doclint warnings">
903	<
930	>	<target name="4jdk7doclint" depends="configure-compiler">
931		<mkdir dir="${build.4jdk7.classes.dir}"/>
932
933		<javac srcdir="${4jdk7src.dir}"
#	Line 924 | Line 951
951		<compilerarg value="-Xlint:all"/>
952		<compilerarg value="-Xdoclint:all/protected"/>
953		<compilerarg line="${build.args}"/>
927	–
954		</javac>
955		</target>
956
957	<
932	<	<target name="4jdk7jar"
933	<	depends="4jdk7compile"
934	<	description="Builds library jar from compiled sources">
935	<
957	>	<target name="4jdk7jar" depends="4jdk7compile">
958		<jar destfile="${4jdk7product.jar}">
959		<fileset dir="${build.4jdk7.classes.dir}"/>
960		<manifest>
#	Line 940 | Line 962
962		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
963		</manifest>
964		</jar>
943	–
965		</target>
966
967	<
947	<	<target name="4jdk7-tck"
948	<	depends="4jdk7jar"
949	<	description="Runs tck tests for jsr166-4jdk7 directly">
950	<
967	>	<target name="4jdk7-tck" depends="4jdk7jar">
968		<run-tck-tests
969		target="7"
970		workdir="${build.4jdk7.dir}"
#	Line 970 | Line 987
987		</run-tck-tests>
988		</target>
989
973	–
990		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
991	<	<target name="4jdk7-tck-junit"
976	<	depends="4jdk7compile">
991	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
992
993		<junit printsummary="true"
994		showoutput="true"
#	Line 995 | Line 1010
1010
1011		<test name="${jsr166.tckTestClass}" haltonfailure="no">
1012		</test>
998	–
1013		</junit>
1014		</target>
1015
1016	<	<target name="4jdk7-jtreg"
1003	<	depends="4jdk7jar"
1004	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
1016	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
1017		<run-jtreg-tests
1018		target="7"
1019		workdir="${build.4jdk7.dir}"
1020		classes="${4jdk7product.jar}"/>
1021		</target>
1022
1023	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1024
1025	<	<target name="4jdk7-test"
1013	<	depends="4jdk7-tck, 4jdk7-jtreg"
1014	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
1015	<	</target>
1016	<
1017	<
1018	<	<target name="4jdk7docs"
1019	<	description="Builds javadocs for src/jdk7 to dist dir">
1020	<
1025	>	<target name="4jdk7docs">
1026		<delete dir="${4jdk7docs.dir}"/>
1027		<mkdir dir="${4jdk7docs.dir}"/>
1028
#	Line 1038 | Line 1043
1043		</javadoc>
1044		</target>
1045
1046	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1047
1048	<	<target name="4jdk7dist"
1043	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1044	<	description="Puts all distributable products in single hierarchy"/>
1045	<
1046	<
1047	<	<target name="4jdk7clean"
1048	<	description="Removes all 4jdk7 build products">
1049	<
1048	>	<target name="4jdk7clean">
1049		<delete dir="${build.4jdk7.dir}"/>
1051	–
1050		</target>
1051
1052	<
1055	<	<target name="4jdk7dist-jar"
1056	<	depends="4jdk7clean, 4jdk7jar">
1052	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1053		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1054		</target>
1055
1056	<
1061	<	<target name="4jdk7dist-docs"
1062	<	depends="4jdk7clean, 4jdk7docs">
1056	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1057		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1058		</target>
1059
1060
1061	<	<!-- jsr166x -->
1068	<
1069	<	<target name="jsr166xcompile"
1070	<	depends="configure-compiler"
1071	<	description="Compiles jsr166x sources to build dir">
1061	>	<!-- jsr166x (no longer maintained) -->
1062
1063	+	<target name="jsr166xcompile" depends="configure-compiler">
1064		<mkdir dir="${build.jsr166x.classes.dir}"/>
1065
1066		<javac srcdir="${topsrc.dir}"
#	Line 1086 | Line 1077
1077		encoding="ASCII"
1078		executable="${javac7}"
1079		fork="true">
1089	–
1080		<include name="jsr166x/**/*.java"/>
1081		<compilerarg value="-XDignore.symbol.file=true"/>
1082		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1083		<compilerarg value="-Werror"/>
1084		<compilerarg line="${build.args}"/>
1095	–
1085		</javac>
1086		</target>
1087
1088	<
1100	<	<target name="jsr166xjar"
1101	<	depends="jsr166xcompile"
1102	<	description="Builds library jar from compiled sources">
1103	<
1088	>	<target name="jsr166xjar" depends="jsr166xcompile">
1089		<jar destfile="${jsr166x.jar}">
1090		<fileset dir="${build.jsr166x.classes.dir}"/>
1091		<manifest>
#	Line 1108 | Line 1093
1093		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1094		</manifest>
1095		</jar>
1111	–
1096		</target>
1097
1098	<
1115	<	<target name="jsr166xdocs"
1116	<	description="Builds javadocs to dist dir">
1117	<
1098	>	<target name="jsr166xdocs">
1099		<delete dir="${jsr166xdocs.dir}"/>
1100		<mkdir dir="${jsr166xdocs.dir}"/>
1101
#	Line 1129 | Line 1110
1110		failonerror = "true">
1111		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1112		<arg value="-XDignore.symbol.file=true"/>
1132	–
1113		</javadoc>
1114		</target>
1115
1116	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1117
1118	<	<target name="jsr166xdist"
1138	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1139	<	description="Puts all distributable products in single hierarchy"/>
1140	<
1141	<
1142	<	<target name="jsr166xclean"
1143	<	description="Removes all jsr166x build products">
1144	<
1118	>	<target name="jsr166xclean">
1119		<delete dir="${build.jsr166x.dir}"/>
1146	–
1120		</target>
1121
1122	<
1150	<	<target name="jsr166xdist-jar"
1151	<	depends="jsr166xclean, jsr166xjar">
1122	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1123		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1124		</target>
1125
1126	<	<target name="jsr166xdist-docs"
1156	<	depends="jsr166xclean, jsr166xdocs">
1126	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1127		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1128		</target>
1129
1160	–	<!-- jsr166y -->
1161	–
1130
1131	<	<target name="jsr166ycompile"
1164	<	depends="configure-compiler"
1165	<	description="Compiles jsr166y sources">
1131	>	<!-- jsr166y (no longer maintained) -->
1132
1133	+	<target name="jsr166ycompile" depends="configure-compiler">
1134		<mkdir dir="${build.jsr166y.classes.dir}"/>
1135
1136		<javac srcdir="${topsrc.dir}"
#	Line 1186 | Line 1153
1153		<compilerarg value="-Xlint:all"/>
1154		<compilerarg value="-Werror"/>
1155		<compilerarg line="${build.args}"/>
1189	–
1156		</javac>
1157		</target>
1158
1159	<
1194	<	<target name="jsr166yjar"
1195	<	depends="jsr166ycompile"
1196	<	description="Builds library jar from compiled sources">
1197	<
1159	>	<target name="jsr166yjar" depends="jsr166ycompile">
1160		<jar destfile="${jsr166y.jar}" index="true">
1161		<fileset dir="${build.jsr166y.classes.dir}"/>
1162		<manifest>
#	Line 1202 | Line 1164
1164		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1165		</manifest>
1166		</jar>
1205	–
1167		</target>
1168
1169	<
1209	<	<target name="jsr166ydocs"
1210	<	description="Builds javadocs to dist dir">
1211	<
1169	>	<target name="jsr166ydocs">
1170		<delete dir="${jsr166ydocs.dir}"/>
1171		<mkdir dir="${jsr166ydocs.dir}"/>
1172
#	Line 1223 | Line 1181
1181		failonerror = "true">
1182		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1183		<arg value="-XDignore.symbol.file=true"/>
1226	–
1184		</javadoc>
1185		</target>
1186
1187	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1188
1189	<	<target name="jsr166ydist"
1232	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1233	<	description="Puts all distributable products in single hierarchy"/>
1234	<
1235	<
1236	<	<target name="jsr166yclean"
1237	<	description="Removes all jsr166y build products">
1238	<
1189	>	<target name="jsr166yclean">
1190		<delete dir="${build.jsr166y.dir}"/>
1240	–
1191		</target>
1192
1193	<
1244	<	<target name="jsr166ydist-jar"
1245	<	depends="jsr166yclean, jsr166yjar">
1193	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1194		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1195		</target>
1196
1197	<	<target name="jsr166ydist-docs"
1250	<	depends="jsr166yclean, jsr166ydocs">
1197	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1198		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1199		</target>
1200
1201
1202	<	<!-- extra166y -->
1256	<
1257	<
1258	<	<target name="extra166ycompile"
1259	<	depends="configure-compiler, jsr166yjar"
1260	<	description="Compiles extra166y sources">
1202	>	<!-- extra166y (no longer maintained) -->
1203
1204	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1205		<mkdir dir="${build.extra166y.classes.dir}"/>
1206
1207		<javac srcdir="${topsrc.dir}"
#	Line 1281 | Line 1224
1224		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1225		<compilerarg value="-Werror"/>
1226		<compilerarg line="${build.args}"/>
1284	–
1227		</javac>
1228		</target>
1229
1230	<
1289	<	<target name="extra166yjar"
1290	<	depends="extra166ycompile"
1291	<	description="Builds library jar from compiled sources">
1292	<
1230	>	<target name="extra166yjar" depends="extra166ycompile">
1231		<jar destfile="${extra166y.jar}" index="true">
1232		<fileset dir="${build.extra166y.classes.dir}"/>
1233		<manifest>
#	Line 1297 | Line 1235
1235		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1236		</manifest>
1237		</jar>
1300	–
1238		</target>
1239
1240	<
1304	<	<target name="extra166ydocs"
1305	<	description="Builds javadocs to build dir">
1306	<
1240	>	<target name="extra166ydocs">
1241		<delete dir="${extra166ydocs.dir}"/>
1242		<mkdir dir="${extra166ydocs.dir}"/>
1243
#	Line 1317 | Line 1251
1251		executable="${javadoc7}">
1252		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1253		<arg value="-XDignore.symbol.file=true"/>
1320	–
1254		</javadoc>
1255		</target>
1256
1257	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1258
1259	<	<target name="extra166ydist"
1326	<	depends="extra166ydist-jar, extra166ydist-docs"
1327	<	description="Puts all distributable products in single hierarchy"/>
1328	<
1329	<
1330	<	<target name="extra166yclean"
1331	<	description="Removes all extra166y build products">
1332	<
1259	>	<target name="extra166yclean">
1260		<delete dir="${build.extra166y.dir}"/>
1334	–
1261		</target>
1262
1263	<
1338	<	<target name="extra166ydist-jar"
1339	<	depends="extra166yclean, extra166yjar">
1263	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1264		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1265		</target>
1266
1267	<	<target name="extra166ydist-docs"
1344	<	depends="extra166yclean, extra166ydocs">
1267	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1268		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1269		</target>
1270
1271	<	<!-- jsr166e -->
1271	>
1272	>	<!-- jsr166e (no longer maintained) -->
1273
1274		<property name="build.jsr166e.java.version" value="6"/>
1275		<property name="build.jsr166e.javac" value="${javac6}"/>
1276
1277	<	<target name="jsr166ecompile"
1354	<	depends="configure-compiler"
1355	<	description="Compiles jsr166e sources">
1356	<
1277	>	<target name="jsr166ecompile" depends="configure-compiler">
1278		<mkdir dir="${build.jsr166e.classes.dir}"/>
1279
1280		<javac srcdir="${topsrc.dir}"
#	Line 1374 | Line 1295
1295		<compilerarg value="-Xlint:all"/>
1296		<compilerarg value="-Werror"/>
1297		<compilerarg line="${build.args}"/>
1377	–
1298		</javac>
1299		</target>
1300
1381	–	<!-- jsr166e: find doclint errors -->
1301		<target name="jsr166edoclint">
1383	–
1302		<mkdir dir="${build.jsr166e.classes.dir}"/>
1303
1304		<javac srcdir="${topsrc.dir}"
#	Line 1402 | Line 1320
1320		<compilerarg value="-Xlint:all"/>
1321		<compilerarg value="-Werror"/>
1322		<compilerarg value="-Xdoclint:all/protected"/>
1405	–
1323		</javac>
1324		</target>
1325
1326	<
1410	<	<target name="jsr166ejar"
1411	<	depends="jsr166ecompile"
1412	<	description="Builds library jar from compiled sources">
1413	<
1326	>	<target name="jsr166ejar" depends="jsr166ecompile">
1327		<jar destfile="${jsr166e.jar}" index="true">
1328		<fileset dir="${build.jsr166e.classes.dir}"/>
1329		<manifest>
#	Line 1418 | Line 1331
1331		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1332		</manifest>
1333		</jar>
1421	–
1334		</target>
1335
1336	<
1425	<	<target name="jsr166edocs"
1426	<	description="Builds javadocs to build dir">
1427	<
1336	>	<target name="jsr166edocs">
1337		<delete dir="${jsr166edocs.dir}"/>
1338		<mkdir dir="${jsr166edocs.dir}"/>
1339
#	Line 1438 | Line 1347
1347		failonerror = "true">
1348		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1349		<arg value="-XDignore.symbol.file=true"/>
1441	–
1350		</javadoc>
1351		</target>
1352
1353	<
1446	<	<target name="jsr166e-tck-one-java-version"
1447	<	depends="jsr166ejar">
1448	<
1353	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1354		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1450	–
1355		<run-tck-tests
1356		tck.src.dir="${test.src.dir}/tck-jsr166e"
1357		target="${build.jsr166e.java.version}"
#	Line 1455 | Line 1359
1359		classes="${jsr166e.jar}"/>
1360		</target>
1361
1362	<	<target name="jsr166e-tck"
1459	<	description="Runs tck tests for jsr166e for multiple java versions">
1362	>	<target name="jsr166e-tck">
1363
1364		<!--     <antcall target="clean"/> -->
1365		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1477 | Line 1380
1380		</antcall>
1381		</target>
1382
1383	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1384
1385	<	<target name="jsr166e-test"
1482	<	depends="jsr166e-tck"
1483	<	description="Runs all tests for jsr166e">
1484	<	</target>
1485	<
1486	<	<target name="jsr166edist"
1487	<	depends="jsr166edist-jar, jsr166edist-docs"
1488	<	description="Puts all distributable products in single hierarchy"/>
1489	<
1385	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1386
1387	<	<target name="jsr166eclean"
1492	<	description="Removes all jsr166e build products">
1387	>	<target name="jsr166eclean">
1388		<delete dir="${build.jsr166e.dir}"/>
1389		</target>
1390
1496	–
1391		<target name="jsr166edist-jar"
1392		depends="jsr166eclean, jsr166ejar">
1393		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1394		</target>
1395
1396	<	<target name="jsr166edist-docs"
1503	<	depends="jsr166eclean, jsr166edocs">
1396	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1397		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1398		</target>
1399
1400
1401		<!-- Find buglets that can be detected by static build tools -->
1402
1403	<	<target name="lint">
1404	<	<antcall target="dists">
1405	<	<param name="build.javadoc.access" value="public"/>
1406	<	</antcall>
1407	<	</target>
1403	>	<!--   <target name="lint"> -->
1404	>	<!--     <antcall target="dists"> -->
1405	>	<!--       <param name="build.javadoc.access" value="protected"/> -->
1406	>	<!--     </antcall> -->
1407	>	<!--   </target> -->
1408
1409		<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1410	<	<target name="lint-private">
1410	>	<target name="doclint-private">
1411		<antcall target="dist">
1412		<param name="build.javadoc.access" value="private"/>
1413		</antcall>
#	Line 1522 | Line 1415
1415
1416
1417		<!-- ==============================================================
1418	<	Experimental errorprone support - http://errorprone.info
1419	<	You may need to bring your own errorprone jar.
1418	>	Experimental errorprone support
1419	>	https://errorprone.info
1420	>	https://errorprone.info/docs/installation
1421	>	https://github.com/google/error-prone/issues/1143
1422		=================================================================== -->
1423	+	<path id="errorprone.processorpath.path">
1424	+	<pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1425	+	<pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1426	+	<pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1427	+	<pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1428	+	</path>
1429	+	<property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1430	+	<property name="errorprone.jsr166.user.flags" value=""/>
1431	+	<property name="errorprone.jsr166.flags"
1432	+	value="-Xep:HashtableContains:OFF
1433	+	-Xep:JdkObsolete:OFF
1434	+	-Xep:MissingOverride:OFF
1435	+	-Xep:MissingFail:OFF
1436	+	-Xep:ThreadPriorityCheck:OFF
1437	+	-Xep:MixedArrayDimensions:ERROR
1438	+	-Xep:RemoveUnusedImports:ERROR
1439	+	-Xep:EmptyIf:ERROR
1440	+	-Xep:MultipleTopLevelClasses:ERROR
1441	+	-Xep:ClassName:ERROR
1442	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1443	+	-Xep:RedundantThrows:ERROR
1444	+	-Xep:IdentityBinaryExpression:WARN
1445	+	-Xep:ConstructorInvokesOverridable:WARN
1446	+	-Xep:MethodCanBeStatic:WARN
1447	+	${errorprone.jsr166.user.flags}"/>
1448	+	<!-- -Xep:WildcardImport:ERROR -->
1449	+	<property name="errorprone.jsr166.test.flags"
1450	+	value="-Xep:StringSplitter:OFF
1451	+	-Xep:BoxedPrimitiveConstructor:OFF
1452	+	-Xep:ModifyingCollectionWithItself:OFF"/>
1453	+	<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1454		<target name="errorprone"
1455		depends="clean, configure-compiler"
1456	<	description="Run errorprone over jsr166 source code">
1456	>	description="Run errorprone over jsr166 source code (experimental)">
1457
1458		<local name="destdir"/>
1459		<property name="destdir" value="${build.classes.dir}/java.base"/>
#	Line 1546 | Line 1472
1472		fork="true">
1473
1474		<include name="**/*.java"/>
1475	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1476	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1477	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1478	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1479	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1554	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1555	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1556	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1557	<	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1558	<	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1475	>	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1476	>	<compilerarg value="-J--illegal-access=permit"/>
1477	>	<compilerarg value="-XDcompilePolicy=simple"/>
1478	>	<compilerarg value="-processorpath"/>
1479	>	<compilerarg pathref="errorprone.processorpath.path"/>
1480		<compilerarg value="-Xplugin:ErrorProne
1481	<	-Xep:IdentityBinaryExpression:WARN
1561	<	-Xep:MissingOverride:OFF
1562	<	-Xep:MixedArrayDimensions:WARN
1563	<	-Xep:RemoveUnusedImports:ERROR
1564	<	-Xep:MethodCanBeStatic:WARN"/>
1481	>	${errorprone.jsr166.flags}"/>
1482		<compilerarg value="--patch-module=java.base=${src.dir}"/>
1483		<compilerarg value="-Xprefer:source"/>
1484		<compilerarg value="-XDignore.symbol.file=true"/>
#	Line 1576 | Line 1493
1493		</jar>
1494
1495		<run-tck-tests
1496	<	target="${build.main.java.version}"
1496	>	target="${java.runtime.target}"
1497		workdir="${build.dir}"
1498		classes="${product.jar}">
1499		<javac-elements>
1500	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1501	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1502	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1503	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1504	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1505	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1506	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1590	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1591	<	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1592	<	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1593	<	<compilerarg value="-Xplugin:ErrorProne
1594	<	-Xep:IdentityBinaryExpression:WARN
1595	<	-Xep:BoxedPrimitiveConstructor:OFF
1596	<	-Xep:HashtableContains:OFF
1597	<	-Xep:ModifyingCollectionWithItself:OFF
1598	<	-Xep:MissingOverride:OFF
1599	<	-Xep:MixedArrayDimensions:WARN
1600	<	-Xep:RemoveUnusedImports:ERROR
1601	<	-Xep:MethodCanBeStatic:WARN"/>
1500	>	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1501	>	<compilerarg value="-J--illegal-access=permit"/>
1502	>	<compilerarg value="-XDcompilePolicy=simple"/>
1503	>	<compilerarg line="-processorpath ${errorprone.processorpath}"/>
1504	>	<compilerarg value="-Xplugin:ErrorProne
1505	>	${errorprone.jsr166.flags}
1506	>	${errorprone.jsr166.test.flags}"/>
1507		<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1508		</javac-elements>
1509		</run-tck-tests>
1510		</target>
1511
1512	+	<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1513	+	<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1514	+	<target name="errorprone-jtreg"
1515	+	depends="jar"
1516	+	description="Run errorprone over jtreg tests (experimental)">
1517	+
1518	+	<run-jtreg-tests
1519	+	target="${java.runtime.target}"
1520	+	workdir="${build.dir}"
1521	+	classes="${product.jar}"
1522	+	verbose="all">
1523	+	<jtreg-elements>
1524	+	<arg value="-javacoption:-XDcompilePolicy=simple"/>
1525	+	<arg value="-javacoption:-processorpath"/>
1526	+	<arg value="-javacoption:${errorprone.processorpath}"/>
1527	+	<arg value="-javacoption:-Xplugin:ErrorProne
1528	+	${errorprone.jsr166.flags}
1529	+	${errorprone.jsr166.test.flags}
1530	+	-Xep:MultipleTopLevelClasses:WARN
1531	+	-Xep:NonAtomicVolatileUpdate:OFF"/>
1532	+	</jtreg-elements>
1533	+	</run-jtreg-tests>
1534	+	</target>
1535	+
1536
1537		<!-- ==============================================================
1538		Running guava tests against jsr166 code
#	Line 1657 | Line 1586
1586		<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1587		dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1588		<junit printsummary="true" showoutput="true" haltonfailure="true"
1589	<	jvm="${java9}" fork="true">
1590	<	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1589	>	jvm="${build.main.java}" fork="true">
1590	>	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1591		<formatter type="brief"/>
1592		<classpath>
1593		<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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