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.191 by jsr166, Fri Nov 6 00:12:54 2015 UTC vs.
Revision 1.261 by jsr166, Sat Jan 20 01:54: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" xmlns:unless="ant:unless"
3	>	xmlns:ivy="antlib:org.apache.ivy.ant">
4
5		<description>
6		------------------------------------------------------------------------------
#	Line 7 | Line 8
8
9		Usage: ant [target]
10
11	+	See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
12	+	more details.
13	+
14		User-specific settings are read from user.properties.
15		See user.properties.sample for an explanation of some useful settings.
16
#	Line 14 | Line 18
18		itself.  Because the JDK version matters and because different
19		targets require different JDKs, we assume that users have created a
20		hierarchy containing:
17	–	$HOME/jdk/jdk6
18	–	$HOME/jdk/jdk7
21		$HOME/jdk/jdk8
22		$HOME/jdk/jdk9
23	+	$HOME/jdk/jdk10
24	+	$HOME/jdk/jdk11
25		where each of the above is a JDK or a symlink to same, and
22	–	$HOME/jdk/src/jdk6
23	–	$HOME/jdk/src/jdk7
26		$HOME/jdk/src/jdk8
27		$HOME/jdk/src/jdk9
28	+	$HOME/jdk/src/jdk10
29	+	$HOME/jdk/src/jdk11
30		where each of the above is a complete JDK source tree
31		(e.g. mercurial forest) or a symlink to same.
32
33		Alternatively, define ant variables thus:
34	<	ant -Djdk$N.home=...
35	<	for $N in 6 7 8 9 ...
34	>	ant -Djdk$N.home=... -Djdk$N.src.home=...
35	>	for $N in 8 9 10 ...
36
37	<	As of 2015-09, there is incomplete hacky support for jigsaw
34	<	Build for jigsaw using something like:
35	<	ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
36	<	"docs" target is still broken.
37	>	As of 2016-03, the sources in src/main are for jdk9+ only.
38		------------------------------------------------------------------------------
39		</description>
40
41	<	<!-- Display main targets by running 'ant -projecthelp' -->
41	>	<!-- Run 'ant -projecthelp' (default target) -->
42		<target name="usage">
43		<java classname="org.apache.tools.ant.Main">
44		<arg value="-projecthelp" />
#	Line 62 | Line 63
63		<property name="build.classes.dir"           location="${build.dir}/classes"/>
64		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
65		<property name="build.loops.dir"             location="${build.dir}/loops"/>
65	–	<property name="build.reports.dir"           location="${build.dir}/reports"/>
66
67		<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68		<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
69		<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70		<property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71
72	+	<property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
73	+	<property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
74	+	<property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
75	+	<property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
76	+
77		<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
78		<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
79		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
#	Line 85 | Line 90
90		<macrodef name="defjdklocations">
91		<attribute name="v"/>
92		<sequential>
93	<	<property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
94	<	<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
95	<	<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
96	<	<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
93	>	<property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
94	>	<property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
95	>	<property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
96	>	<property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
97	>	<property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
98		<local name="have.java.base"/>
99		<available property="have.java.base"
100	<	file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
101	<	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
100	>	file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
101	>	<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
102		if:set="have.java.base"/>
103	<	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
103	>	<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
104		unless:set="have.java.base"/>
105		<local name="modules"/>
106		<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
#	Line 127 | Line 133
133		<defjdklocations v="7"/>
134		<defjdklocations v="8"/>
135		<defjdklocations v="9"/>
136	+	<defjdklocations v="10"/>
137	+	<defjdklocations v="11"/>
138
139		<!-- Source locations -->
140		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 134 | Line 142
142		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
143		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
144		<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
145	<	<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
145	>	<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
146		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
147	+	<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
148	+	<property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
149		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
150		<property name="lib.dir"              location="${basedir}/lib"/>
151		<property name="dist.dir"             location="${basedir}/dist"/>
152		<property name="topsrc.dir"           location="${basedir}/src"/>
153		<property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
154	+	<property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
155		<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
156		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
157		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
#	Line 149 | Line 160
160		<!-- Javadoc locations -->
161		<property name="docs.dir"          location="${build.dir}/docs"/>
162		<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
163	+	<property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
164		<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
165		<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
166		<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
#	Line 156 | Line 168
168
169		<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
170		<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
171	+	<property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
172		<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
173		<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
174		<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
#	Line 164 | Line 177
177		<!-- Jar locations -->
178		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
179		<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
180	+	<property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
181		<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
182		<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
183		<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
#	Line 171 | Line 185
185		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
186
187		<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
188	<	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
189	<	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
190	<	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
191	<	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
192	<	<!-- The expected canonical location does not yet exist as of 2014-07 -->
193	<	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
194	<	<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
188	>	<!-- Switched to https: in 2017-10 - JDK-8190312 -->
189	>	<property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
190	>	<property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
191	>	<property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
192	>	<property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
193	>	<property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
194	>	<!-- The location of jdk9 early access docs (RIP) -->
195	>	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
196		<!-- Default jdk doc location (latest stable release seems best) -->
197	<	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
197	>	<property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
198	>	<property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
199	>	<property name="java.docroot.url"   value="${java9.docroot.url}"/>
200
201		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
202		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 187 | Line 204
204		<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
205		<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
206		<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
207	+	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
208	+	<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
209		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
210
211		<!-- Define the "jtreg" task -->
#	Line 209 | Line 228
228		<attribute name="compile-target" default="@{target}"/>
229		<attribute name="workdir"/>
230		<attribute name="classes"/>
231	<	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
231	>	<!--
232	>	<attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
233	>	-->
234	>	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
235		<element name="javac-elements" optional="true"/>
236
237		<sequential>
#	Line 219 | Line 241
241		<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
242		</condition>
243
244	+	<local name="use-doclint"/>
245	+	<condition property="use-doclint">
246	+	<not> <equals arg1="@{target}" arg2="7"/> </not>
247	+	</condition>
248	+
249		<mkdir dir="@{workdir}/tck-classes"/>
250
251		<javac srcdir="@{tck.src.dir}"
#	Line 231 | Line 258
258		classpath="${junit.jar}"
259		includeAntRuntime="false"
260		includeJavaRuntime="false"
261	+	encoding="ASCII"
262		executable="${javac@{compile-target}}"
263		fork="true">
264
265		<include name="*.java"/>
266		<compilerarg value="-XDignore.symbol.file=true"/>
267		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
268	+	<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
269		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
270	<	<compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
270	>	<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
271		<compilerarg line="${build.args}"/>
272		<javac-elements/>
273
#	Line 249 | Line 278
278		jvm="${java@{target}}"
279		fork="true">
280		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
281	<	<jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
281	>	<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
282	>	<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
283	>	<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
284	>	<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
285	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
286	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
287		<jvmarg line="@{jvmflags}"/>
288	+	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
289	+	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
290
291	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
291	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
292		<syspropertyset id="system-properties-used-by-tck">
293		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
294		<propertyref prefix="jsr166."/>
295	+	<propertyref name="test.timeout.factor"/>
296		</syspropertyset>
297
298		<classpath>
#	Line 268 | Line 305
305		</macrodef>
306
307		<!-- Define jtreg test sets for different jdk versions -->
308	+	<fileset dir="${jtreg11.src.dir}">
309	+	<patternset id="jdk11.jtreg.tests">
310	+	<include name="**/*.java"/>
311	+	</patternset>
312	+	</fileset>
313	+
314	+	<fileset dir="${jtreg10.src.dir}">
315	+	<patternset id="jdk10.jtreg.tests">
316	+	<include name="**/*.java"/>
317	+	</patternset>
318	+	</fileset>
319	+
320		<fileset dir="${jtreg9.src.dir}">
321		<patternset id="jdk9.jtreg.tests">
322		<include name="**/*.java"/>
#	Line 277 | Line 326
326		<fileset dir="${jtreg8.src.dir}">
327		<patternset id="jdk8.jtreg.tests">
328		<include name="**/*.java"/>
280	–	<exclude name="**/SpliteratorCharacteristics.java"/>
281	–	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
282	–	<exclude name="**/GCDuringIteration.java"/>
329		</patternset>
330		</fileset>
331
#	Line 289 | Line 335
335		</patternset>
336		</fileset>
337
338	+	<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
339	+	<property name="jtreg.flags" value=""/>
340	+
341		<macrodef name="run-jtreg-tests">
342		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
294	–	<attribute name="source" default="7"/>
343		<attribute name="target"/>
344		<attribute name="workdir"/>
345		<attribute name="classes"/>
346	+	<attribute name="verbose" default="${jtreg.verbose}"/>
347		<attribute name="jtregflags" default=""/>
348	+	<element name="jtreg-elements" optional="true"/>
349
350		<sequential>
351
#	Line 308 | Line 358
358		</condition>
359
360		<delete dir="@{workdir}/JTwork"   quiet="true"/>
311	–	<delete dir="@{workdir}/JTreport" quiet="true"/>
312	–	<mkdir dir="@{workdir}/JTwork/scratch"/>
313	–	<mkdir dir="@{workdir}/JTreport"/>
361		<jtreg dir="${jtreg@{target}.src.dir}"
362		jdk="${jdk@{target}.home}"
363	<	workDir="@{workdir}/JTwork"
317	<	reportDir="@{workdir}/JTreport">
363	>	workDir="@{workdir}/JTwork">
364		<patternset refid="jdk@{target}.jtreg.tests"/>
365		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
366	<	<arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
366	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
367	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
368		<arg value="-agentvm"/>
369	<	<arg value="-verbose:${jtreg.verbose}"/>
369	>	<arg value="-noreport"/>
370	>	<arg value="-verbose:@{verbose}"/>
371		<arg value="-vmoptions:-esa -ea"/>
372		<arg value="-automatic"/>
373		<arg value="-k:!ignore"/>
374		<arg line="@{jtregflags}"/>
375	+	<arg line="${jtreg.flags}"/>
376	+	<jtreg-elements/>
377		</jtreg>
378		</sequential>
379		</macrodef>
#	Line 340 | Line 390
390		<!-- Main targets -->
391
392		<property name="build.main.java.version" value="9"/>
393	<	<property name="build.main.javac" value="${javac9}"/>
393	>	<!-- Workaround "no nested properties in ant" -->
394	>	<macrodef name="define-build-main-properties">
395	>	<attribute name="v"/>
396	>	<sequential>
397	>	<property name="build.main.java"    value="${java@{v}}"/>
398	>	<property name="build.main.javac"   value="${javac@{v}}"/>
399	>	<property name="build.main.javadoc" value="${javadoc@{v}}"/>
400	>	</sequential>
401	>	</macrodef>
402	>	<define-build-main-properties v="${build.main.java.version}"/>
403
404		<target name="dists"
405	<	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
405	>	depends="dist, 4jdk8dist"
406		description="Builds all public jars and docs"/>
407	+	<!--
408	+	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
409	+	-->
410
411		<target name="compile"
412		depends="configure-compiler"
413		description="Compiles src/main sources to build dir">
414
353	–	<local name="modules"/>
354	–	<condition property="modules">
355	–	<and>
356	–	<available file="${jdk9.home}/jmods" type="dir"/>
357	–	<equals arg1="9" arg2="${build.main.java.version}"/>
358	–	</and>
359	–	</condition>
360	–
415		<local name="destdir"/>
416	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
363	<	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
416	>	<property name="destdir" value="${build.classes.dir}/java.base"/>
417
418		<mkdir dir="${destdir}"/>
419
#	Line 372 | Line 425
425		classpath=""
426		includeAntRuntime="false"
427		includeJavaRuntime="false"
428	+	encoding="ASCII"
429		executable="${build.main.javac}"
430		fork="true">
431
432		<include name="**/*.java"/>
433	<	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
433	>	<compilerarg value="--patch-module=java.base=${src.dir}"/>
434		<compilerarg value="-Xprefer:source"/>
435		<compilerarg value="-XDignore.symbol.file=true"/>
436		<compilerarg value="-Xlint:all"/>
437	+	<compilerarg line="--doclint-format html5"/>
438	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
439		<compilerarg value="-Werror"/>
384	–	<compilerarg value="-Xdoclint:all/protected"/>
440		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
441		<compilerarg line="${build.args}"/>
442
#	Line 391 | Line 446
446
447		<target name="jar"
448		depends="compile"
449	<	description="Builds library jar from compiled sources">
450	<
449	>	description="Builds library jar for src/main from compiled sources">
450	>	<local name="subdir"/>
451	>	<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
452		<jar destfile="${product.jar}">
453	<	<fileset dir="${build.classes.dir}"/>
453	>	<fileset dir="${build.classes.dir}${subdir}"/>
454		<manifest>
455		<attribute name="Built-By" value="${user.name}"/>
456		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
#	Line 412 | Line 468
468		<!-- the packagenames="none" hack below prevents scanning the -->
469		<!-- sourcepath for packages -->
470
471	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
472	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
473	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
474	+	<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
475	+	<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
476		<javadoc destdir="${docs.dir}"
477		packagenames="none"
478		link="${java9.api.url}"
479		overview="${src.dir}/intro.html"
480		access="${build.javadoc.access}"
481	<	sourcepath="${src.dir}:${jdk9src.dir}"
481	>	sourcepath="${src.dir}"
482		classpath=""
483	<	executable="${javadoc9}">
483	>	source="9"
484	>	executable="${build.main.javadoc}">
485		<fileset dir="${src.dir}" defaultexcludes="yes">
486		<include name="**/*.java"/>
487		</fileset>
488		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
489		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
490		<arg value="-XDignore.symbol.file=true"/>
491	<	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
491	>	<arg value="-html5"/>
492	>	<arg value="--patch-module=java.base=${src.dir}"/>
493		<arg value="-tag"/>
494		<arg value="${javadoc.jls.option}"/>
495	+	<!-- @apiNote currently unused -->
496	+	<!--       <arg value="-tag"/> -->
497	+	<!--       <arg value="apiNote:a:API Note:"/> -->
498		<arg value="-tag"/>
499	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
499	>	<arg value="implSpec:a:Implementation Requirements:"/>
500		<arg value="-tag"/>
501	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
502	<	<arg value="-tag"/>
503	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
501	>	<arg value="implNote:a:Implementation Note:"/>
502	>	<!-- tags added in jdk9: currently unused -->
503	>	<!--       <arg value="-tag"/> -->
504	>	<!--       <arg value="revised:X"/> -->
505	>	<!--       <arg value="-tag"/> -->
506	>	<!--       <arg value="spec:X"/> -->
507		</javadoc>
508		</target>
509
#	Line 468 | Line 537
537
538		<target name="clean"
539		description="Removes all build products">
471	–
540		<delete dir="${build.dir}"/>
473	–
541		</target>
542
543
544		<target name="dist-clean"
545		description="Removes all build and distribution products">
479	–
546		<delete dir="${build.dir}"/>
547		<delete dir="${dist.dir}"/>
482	–
548		</target>
549
550
#	Line 495 | Line 560
560
561		<target name="tck"
562		depends="jar"
563	<	description="Runs tck tests for main directly">
563	>	description="Runs tck tests for src/main directly">
564
565		<run-tck-tests
566		target="${build.main.java.version}"
567		workdir="${build.dir}"
568	<	classes="${product.jar}"/>
568	>	classes="${product.jar}">
569	>	<javac-elements>
570	>	<compilerarg value="-Werror"/>
571	>	</javac-elements>
572	>	</run-tck-tests>
573		</target>
574
575		<target name="tck-parallelism-1"
576	<	description="Runs tck with given common pool parallelism">
576	>	description="Runs tck with common pool parallelism 1">
577		<antcall target="tck">
578		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
579		</antcall>
580		</target>
581
582		<target name="tck-parallelism-0"
583	<	description="Runs tck with given common pool parallelism">
583	>	description="Runs tck with common pool parallelism 0">
584		<antcall target="tck">
585		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
586		</antcall>
587		</target>
588
589	+	<target name="tck-security-manager"
590	+	description="Runs tck with a security manager">
591	+	<antcall target="tck">
592	+	<param name="jsr166.useSecurityManager" value="true"/>
593	+	</antcall>
594	+	</target>
595	+
596		<target name="jtreg"
597		depends="jar"
598	<	description="Runs jtreg tests for main using the jtreg ant task">
598	>	description="Runs jtreg tests for src/main using the jtreg ant task">
599		<run-jtreg-tests
600		target="${build.main.java.version}"
601		workdir="${build.dir}"
#	Line 527 | Line 603
603		</target>
604
605		<target name="test"
606	<	depends="tck, tck-parallelism-1, jtreg"
607	<	description="Runs tck and jtreg tests for main">
532	<	</target>
606	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
607	>	description="Runs tck and jtreg tests for src/main"/>
608
609	<	<target name="jtreg8" description="Runs jtreg tests with jdk8">
609	>	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
610
611	<	<antcall target="jtreg">
612	<	<param name="build.main.java.version" value="8"/>
613	<	<param name="build.main.javac" value="${javac8}"/>
614	<	</antcall>
611	>	<!--     <antcall target="jtreg"> -->
612	>	<!--       <param name="build.main.java.version" value="8"/> -->
613	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
614	>	<!--     </antcall> -->
615
616	<	</target>
616	>	<!--   </target> -->
617
618	<	<target name="test89"
619	<	description="Runs tck and jtreg tests for main for multiple java versions">
618	>	<target name="test91011"
619	>	description="Runs tck and jtreg tests for src/main for multiple java versions">
620
621		<antcall target="clean"/>
622		<antcall target="test">
623	<	<param name="build.main.java.version" value="8"/>
549	<	<param name="build.main.javac" value="${javac8}"/>
623	>	<param name="build.main.java.version" value="9"/>
624		</antcall>
625
626		<antcall target="clean"/>
627		<antcall target="test">
628	<	<param name="build.main.java.version" value="9"/>
629	<	<param name="build.main.javac" value="${javac9}"/>
628	>	<param name="build.main.java.version" value="10"/>
629	>	</antcall>
630	>
631	>	<antcall target="clean"/>
632	>	<antcall target="test">
633	>	<param name="build.main.java.version" value="11"/>
634		</antcall>
635
636	+	<!-- Clean up to avoid obscure wrong class file version bugs -->
637	+	<antcall target="clean"/>
638	+
639		</target>
640
641
642
643		<target name="configure-compiler">
644		<fail message="ant version too old">
645	<	<condition>
565	<	<not> <antversion atleast="1.9.1"/> </not>
566	<	</condition>
645	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
646		</fail>
647
648		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 585 | Line 664
664		<!-- Various demos and test programs -->
665
666
667	<	<target name="loops" depends="configure-compiler"
668	<	description="Benchmark from Doug Lea's AQS paper">
667	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
668	>	<target name="loops" depends="configure-compiler">
669
670		<mkdir dir="${build.loops.dir}"/>
671
#	Line 597 | Line 676
676		deprecation="${build.deprecation}"
677		source="${build.sourcelevel}"
678		target="${build.sourcelevel}"
679	+	encoding="ASCII"
680		fork="true">
681
682		<compilerarg line="${build.args}"/>
#	Line 608 | Line 688
688		<java classname="ALoops" fork="true">
689		<classpath refid="loops.classpath"/>
690		</java>
611	–
691		</target>
692
693
694		<target name="compile-test-loops" depends="jar"
695	<	description="compile all the perf tests in src/test/loops">
695	>	description="Compiles all the perf tests in src/test/loops">
696
697		<mkdir dir="${build.dir}/test/loops"/>
698
#	Line 624 | Line 703
703		deprecation="${build.deprecation}"
704		includeAntRuntime="false"
705		includeJavaRuntime="false"
706	<	executable="${javac9}"
706	>	encoding="ASCII"
707	>	executable="${build.main.javac}"
708		fork="true">
709
710		<include name="*.java"/>
#	Line 632 | Line 712
712		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
713		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
714		<compilerarg line="${build.args}"/>
715	+	</javac>
716	+	</target>
717	+
718
719	+	<!-- jsr166 4jdk8 -->
720	+
721	+	<target name="4jdk8compile"
722	+	depends="configure-compiler"
723	+	description="Compiles src/jdk8 sources, targeting jdk8">
724	+
725	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
726	+
727	+	<javac srcdir="${4jdk8src.dir}"
728	+	destdir="${build.4jdk8.classes.dir}"
729	+	debug="${build.debug}"
730	+	debuglevel="${build.debuglevel}"
731	+	deprecation="${build.deprecation}"
732	+	source="8"
733	+	target="8"
734	+	classpath=""
735	+	bootclasspath="${bootclasspath8}"
736	+	includeAntRuntime="false"
737	+	includeJavaRuntime="false"
738	+	encoding="ASCII"
739	+	executable="${javac8}"
740	+	fork="true">
741	+	<include name="**/*.java"/>
742	+	<compilerarg value="-Xprefer:source"/>
743	+	<compilerarg value="-XDignore.symbol.file=true"/>
744	+	<compilerarg value="-Xlint:all"/>
745	+	<compilerarg value="-Werror"/>
746	+	<compilerarg line="${build.args}"/>
747		</javac>
748	+	</target>
749	+
750	+	<target name="4jdk8doclint"
751	+	depends="configure-compiler"
752	+	description="Finds doclint warnings">
753	+
754	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
755	+
756	+	<javac srcdir="${4jdk8src.dir}"
757	+	destdir="${build.4jdk8.classes.dir}"
758	+	debug="${build.debug}"
759	+	debuglevel="${build.debuglevel}"
760	+	deprecation="${build.deprecation}"
761	+	source="8"
762	+	target="8"
763	+	classpath=""
764	+	bootclasspath="${bootclasspath8}"
765	+	includeAntRuntime="false"
766	+	includeJavaRuntime="false"
767	+	encoding="ASCII"
768	+	executable="${javac8}"
769	+	fork="true">
770	+	<include name="**/*.java"/>
771	+	<compilerarg value="-Xprefer:source"/>
772	+	<compilerarg value="-XDignore.symbol.file=true"/>
773	+	<compilerarg value="-Xlint:all"/>
774	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
775	+	<compilerarg line="${build.args}"/>
776	+	</javac>
777	+	</target>
778
779	+
780	+	<target name="4jdk8jar"
781	+	depends="4jdk8compile"
782	+	description="Builds library jar from compiled sources">
783	+
784	+	<jar destfile="${4jdk8product.jar}">
785	+	<fileset dir="${build.4jdk8.classes.dir}"/>
786	+	<manifest>
787	+	<attribute name="Built-By" value="${user.name}"/>
788	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
789	+	</manifest>
790	+	</jar>
791		</target>
792
793
794	<	<!-- jsr166 4jdk7 -->
794	>	<target name="4jdk8-tck"
795	>	depends="4jdk8jar"
796	>	description="Runs tck tests for jsr166-4jdk8 directly">
797
798	<	<target name="4jdk7compile"
799	<	depends="configure-compiler"
800	<	description="Compiles src/jdk7 sources, targeting jdk7">
798	>	<run-tck-tests
799	>	target="8"
800	>	workdir="${build.4jdk8.dir}"
801	>	classes="${4jdk8product.jar}">
802	>	<javac-elements>
803	>	<!-- JDK9+ test classes -->
804	>	<exclude name="*9Test.java"/>
805	>	<exclude name="*10Test.java"/>
806	>	<compilerarg value="-Werror"/>
807	>	</javac-elements>
808	>	</run-tck-tests>
809	>	</target>
810	>
811	>
812	>	<target name="4jdk8-jtreg"
813	>	depends="4jdk8jar"
814	>	description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
815	>	<run-jtreg-tests
816	>	target="8"
817	>	workdir="${build.4jdk8.dir}"
818	>	classes="${4jdk8product.jar}"/>
819	>	</target>
820	>
821	>
822	>	<target name="4jdk8-test"
823	>	depends="4jdk8-tck, 4jdk8-jtreg"
824	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
825	>
826	>
827	>	<target name="4jdk8docs"
828	>	description="Builds javadocs for src/jdk8 to dist dir">
829	>
830	>	<delete dir="${4jdk8docs.dir}"/>
831	>	<mkdir dir="${4jdk8docs.dir}"/>
832	>
833	>	<javadoc destdir="${4jdk8docs.dir}"
834	>	packagenames="none"
835	>	link="${java8.api.url}"
836	>	overview="${4jdk8src.dir}/intro.html"
837	>	access="${build.javadoc.access}"
838	>	sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
839	>	classpath=""
840	>	source="8"
841	>	executable="${javadoc8}"
842	>	failonerror = "true">
843	>	<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
844	>	<include name="**/*.java"/>
845	>	</fileset>
846	>	<arg line="-Xdocrootparent ${java8.docroot.url}"/>
847	>	<arg value="-XDignore.symbol.file=true"/>
848	>	<arg value="-tag"/>
849	>	<arg value="${javadoc.jls.option}"/>
850	>	<!-- @apiNote currently unused -->
851	>	<!--       <arg value="-tag"/> -->
852	>	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
853	>	<arg value="-tag"/>
854	>	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
855	>	<arg value="-tag"/>
856	>	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
857	>	</javadoc>
858	>	</target>
859	>
860	>
861	>	<target name="4jdk8dist"
862	>	depends="4jdk8dist-jar, 4jdk8dist-docs"
863	>	description="Puts all distributable products in single hierarchy"/>
864	>
865	>
866	>	<target name="4jdk8clean"
867	>	description="Removes all 4jdk8 build products">
868	>	<delete dir="${build.4jdk8.dir}"/>
869	>	</target>
870	>
871	>
872	>	<target name="4jdk8dist-jar"
873	>	depends="4jdk8clean, 4jdk8jar">
874	>	<copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
875	>	</target>
876	>
877	>
878	>	<target name="4jdk8dist-docs"
879	>	depends="4jdk8clean, 4jdk8docs">
880	>	<mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
881	>	</target>
882	>
883	>
884	>	<!-- jsr166 4jdk7 (no longer maintained) -->
885
886	+	<target name="4jdk7compile" depends="configure-compiler">
887		<mkdir dir="${build.4jdk7.classes.dir}"/>
888
889		<javac srcdir="${4jdk7src.dir}"
#	Line 657 | Line 897
897		bootclasspath="${bootclasspath6}"
898		includeAntRuntime="false"
899		includeJavaRuntime="false"
900	+	encoding="ASCII"
901		executable="${javac7}"
902		fork="true">
903
#	Line 666 | Line 907
907		<compilerarg value="-Xlint:all"/>
908		<compilerarg value="-Werror"/>
909		<compilerarg line="${build.args}"/>
669	–
910		</javac>
911		</target>
912
913	<	<target name="4jdk7doclint"
674	<	depends="configure-compiler"
675	<	description="Finds doclint warnings">
676	<
913	>	<target name="4jdk7doclint" depends="configure-compiler">
914		<mkdir dir="${build.4jdk7.classes.dir}"/>
915
916		<javac srcdir="${4jdk7src.dir}"
#	Line 687 | Line 924
924		bootclasspath="${bootclasspath6}"
925		includeAntRuntime="false"
926		includeJavaRuntime="false"
927	+	encoding="ASCII"
928		executable="${javac8}"
929		fork="true">
930
#	Line 696 | Line 934
934		<compilerarg value="-Xlint:all"/>
935		<compilerarg value="-Xdoclint:all/protected"/>
936		<compilerarg line="${build.args}"/>
699	–
937		</javac>
938		</target>
939
940	<
704	<	<target name="4jdk7jar"
705	<	depends="4jdk7compile"
706	<	description="Builds library jar from compiled sources">
707	<
940	>	<target name="4jdk7jar" depends="4jdk7compile">
941		<jar destfile="${4jdk7product.jar}">
942		<fileset dir="${build.4jdk7.classes.dir}"/>
943		<manifest>
#	Line 712 | Line 945
945		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
946		</manifest>
947		</jar>
715	–
948		</target>
949
950	<
719	<	<target name="4jdk7-tck"
720	<	depends="4jdk7jar"
721	<	description="Runs tck tests for jsr166-4jdk7 directly">
722	<
950	>	<target name="4jdk7-tck" depends="4jdk7jar">
951		<run-tck-tests
952		target="7"
953		workdir="${build.4jdk7.dir}"
#	Line 737 | Line 965
965		<exclude name="SplittableRandomTest.java"/>
966		<exclude name="StampedLockTest.java"/>
967		<exclude name="SubmissionPublisherTest.java"/>
968	+	<compilerarg value="-Werror"/>
969		</javac-elements>
970		</run-tck-tests>
971		</target>
972
973	<
974	<	<target name="4jdk7-tck-junit"
746	<	depends="4jdk7compile"
747	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
973	>	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
974	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
975
976		<junit printsummary="true"
977		showoutput="true"
#	Line 766 | Line 993
993
994		<test name="${jsr166.tckTestClass}" haltonfailure="no">
995		</test>
769	–
996		</junit>
997		</target>
998
999	<	<target name="4jdk7-jtreg"
774	<	depends="4jdk7jar"
775	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
999	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
1000		<run-jtreg-tests
1001		target="7"
1002		workdir="${build.4jdk7.dir}"
1003		classes="${4jdk7product.jar}"/>
1004		</target>
1005
1006	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1007
1008	<	<target name="4jdk7-test"
784	<	depends="4jdk7-tck, 4jdk7-jtreg"
785	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
786	<	</target>
787	<
788	<
789	<	<target name="4jdk7docs"
790	<	description="Builds javadocs for src/jdk7 to dist dir">
791	<
1008	>	<target name="4jdk7docs">
1009		<delete dir="${4jdk7docs.dir}"/>
1010		<mkdir dir="${4jdk7docs.dir}"/>
1011
#	Line 797 | Line 1014
1014		link="${java7.api.url}"
1015		overview="${4jdk7src.dir}/intro.html"
1016		access="${build.javadoc.access}"
1017	<	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
1017	>	sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1018		classpath=""
1019	<	executable="${javadoc7}">
1019	>	executable="${javadoc7}"
1020	>	failonerror = "true">
1021		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1022		<include name="**/*.java"/>
1023		</fileset>
#	Line 808 | Line 1026
1026		</javadoc>
1027		</target>
1028
1029	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1030
1031	<	<target name="4jdk7dist"
813	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
814	<	description="Puts all distributable products in single hierarchy"/>
815	<
816	<
817	<	<target name="4jdk7clean"
818	<	description="Removes all 4jdk7 build products">
819	<
1031	>	<target name="4jdk7clean">
1032		<delete dir="${build.4jdk7.dir}"/>
821	–
1033		</target>
1034
1035	<
825	<	<target name="4jdk7dist-jar"
826	<	depends="4jdk7clean, 4jdk7jar">
1035	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1036		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1037		</target>
1038
1039	<
831	<	<target name="4jdk7dist-docs"
832	<	depends="4jdk7clean, 4jdk7docs">
1039	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1040		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1041		</target>
1042
1043
1044	<	<!-- jsr166x -->
838	<
839	<	<target name="jsr166xcompile"
840	<	depends="configure-compiler"
841	<	description="Compiles jsr166x sources to build dir">
1044	>	<!-- jsr166x (no longer maintained) -->
1045
1046	+	<target name="jsr166xcompile" depends="configure-compiler">
1047		<mkdir dir="${build.jsr166x.classes.dir}"/>
1048
1049		<javac srcdir="${topsrc.dir}"
#	Line 853 | Line 1057
1057		target="5"
1058		includeAntRuntime="false"
1059		includeJavaRuntime="false"
1060	+	encoding="ASCII"
1061		executable="${javac7}"
1062		fork="true">
858	–
1063		<include name="jsr166x/**/*.java"/>
1064		<compilerarg value="-XDignore.symbol.file=true"/>
1065		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1066		<compilerarg value="-Werror"/>
1067		<compilerarg line="${build.args}"/>
864	–
1068		</javac>
1069		</target>
1070
1071	<
869	<	<target name="jsr166xjar"
870	<	depends="jsr166xcompile"
871	<	description="Builds library jar from compiled sources">
872	<
1071	>	<target name="jsr166xjar" depends="jsr166xcompile">
1072		<jar destfile="${jsr166x.jar}">
1073		<fileset dir="${build.jsr166x.classes.dir}"/>
1074		<manifest>
#	Line 877 | Line 1076
1076		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1077		</manifest>
1078		</jar>
880	–
1079		</target>
1080
1081	<
884	<	<target name="jsr166xdocs"
885	<	description="Builds javadocs to dist dir">
886	<
1081	>	<target name="jsr166xdocs">
1082		<delete dir="${jsr166xdocs.dir}"/>
1083		<mkdir dir="${jsr166xdocs.dir}"/>
1084
#	Line 891 | Line 1086
1086		packagenames="jsr166x.*"
1087		link="${java.api.url}"
1088		access="${build.javadoc.access}"
1089	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1089	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1090		bootclasspath="${bootclasspath6}"
1091		source="5"
1092	<	executable="${javadoc7}">
1092	>	executable="${javadoc7}"
1093	>	failonerror = "true">
1094		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1095		<arg value="-XDignore.symbol.file=true"/>
900	–
1096		</javadoc>
1097		</target>
1098
1099	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1100
1101	<	<target name="jsr166xdist"
906	<	depends="jsr166xdist-jar, jsr166xdist-docs"
907	<	description="Puts all distributable products in single hierarchy"/>
908	<
909	<
910	<	<target name="jsr166xclean"
911	<	description="Removes all jsr166x build products">
912	<
1101	>	<target name="jsr166xclean">
1102		<delete dir="${build.jsr166x.dir}"/>
914	–
1103		</target>
1104
1105	<
918	<	<target name="jsr166xdist-jar"
919	<	depends="jsr166xclean, jsr166xjar">
1105	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1106		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1107		</target>
1108
1109	<	<target name="jsr166xdist-docs"
924	<	depends="jsr166xclean, jsr166xdocs">
1109	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1110		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1111		</target>
1112
928	–	<!-- jsr166y -->
1113
1114	+	<!-- jsr166y (no longer maintained) -->
1115
1116	<	<target name="jsr166ycompile"
932	<	depends="configure-compiler"
933	<	description="Compiles jsr166y sources">
934	<
1116	>	<target name="jsr166ycompile" depends="configure-compiler">
1117		<mkdir dir="${build.jsr166y.classes.dir}"/>
1118
1119		<javac srcdir="${topsrc.dir}"
#	Line 945 | Line 1127
1127		bootclasspath="${bootclasspath6}"
1128		includeAntRuntime="false"
1129		includeJavaRuntime="false"
1130	+	encoding="ASCII"
1131		executable="${javac7}"
1132		fork="true">
1133
#	Line 953 | Line 1136
1136		<compilerarg value="-Xlint:all"/>
1137		<compilerarg value="-Werror"/>
1138		<compilerarg line="${build.args}"/>
956	–
1139		</javac>
1140		</target>
1141
1142	<
961	<	<target name="jsr166yjar"
962	<	depends="jsr166ycompile"
963	<	description="Builds library jar from compiled sources">
964	<
1142	>	<target name="jsr166yjar" depends="jsr166ycompile">
1143		<jar destfile="${jsr166y.jar}" index="true">
1144		<fileset dir="${build.jsr166y.classes.dir}"/>
1145		<manifest>
#	Line 969 | Line 1147
1147		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1148		</manifest>
1149		</jar>
972	–
1150		</target>
1151
1152	<
976	<	<target name="jsr166ydocs"
977	<	description="Builds javadocs to dist dir">
978	<
1152	>	<target name="jsr166ydocs">
1153		<delete dir="${jsr166ydocs.dir}"/>
1154		<mkdir dir="${jsr166ydocs.dir}"/>
1155
#	Line 983 | Line 1157
1157		packagenames="jsr166y.*"
1158		link="${java.api.url}"
1159		access="${build.javadoc.access}"
1160	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1160	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1161		bootclasspath="${bootclasspath6}"
1162		source="6"
1163	<	executable="${javadoc7}">
1163	>	executable="${javadoc7}"
1164	>	failonerror = "true">
1165		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1166		<arg value="-XDignore.symbol.file=true"/>
992	–
1167		</javadoc>
1168		</target>
1169
1170	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1171
1172	<	<target name="jsr166ydist"
998	<	depends="jsr166ydist-jar, jsr166ydist-docs"
999	<	description="Puts all distributable products in single hierarchy"/>
1000	<
1001	<
1002	<	<target name="jsr166yclean"
1003	<	description="Removes all jsr166y build products">
1004	<
1172	>	<target name="jsr166yclean">
1173		<delete dir="${build.jsr166y.dir}"/>
1006	–
1174		</target>
1175
1176	<
1010	<	<target name="jsr166ydist-jar"
1011	<	depends="jsr166yclean, jsr166yjar">
1176	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1177		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1178		</target>
1179
1180	<	<target name="jsr166ydist-docs"
1016	<	depends="jsr166yclean, jsr166ydocs">
1180	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1181		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1182		</target>
1183
1184
1185	<	<!-- extra166y -->
1022	<
1023	<
1024	<	<target name="extra166ycompile"
1025	<	depends="configure-compiler, jsr166yjar"
1026	<	description="Compiles extra166y sources">
1185	>	<!-- extra166y (no longer maintained) -->
1186
1187	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1188		<mkdir dir="${build.extra166y.classes.dir}"/>
1189
1190		<javac srcdir="${topsrc.dir}"
#	Line 1038 | Line 1198
1198		target="6"
1199		includeAntRuntime="false"
1200		includeJavaRuntime="false"
1201	+	encoding="ASCII"
1202		executable="${javac7}"
1203		fork="true">
1204
#	Line 1046 | Line 1207
1207		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1208		<compilerarg value="-Werror"/>
1209		<compilerarg line="${build.args}"/>
1049	–
1210		</javac>
1211		</target>
1212
1213	<
1054	<	<target name="extra166yjar"
1055	<	depends="extra166ycompile"
1056	<	description="Builds library jar from compiled sources">
1057	<
1213	>	<target name="extra166yjar" depends="extra166ycompile">
1214		<jar destfile="${extra166y.jar}" index="true">
1215		<fileset dir="${build.extra166y.classes.dir}"/>
1216		<manifest>
#	Line 1062 | Line 1218
1218		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1219		</manifest>
1220		</jar>
1065	–
1221		</target>
1222
1223	<
1069	<	<target name="extra166ydocs"
1070	<	description="Builds javadocs to build dir">
1071	<
1223	>	<target name="extra166ydocs">
1224		<delete dir="${extra166ydocs.dir}"/>
1225		<mkdir dir="${extra166ydocs.dir}"/>
1226
#	Line 1076 | Line 1228
1228		packagenames="extra166y.*"
1229		link="${java.api.url}"
1230		access="${build.javadoc.access}"
1231	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1231	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1232		bootclasspath="${bootclasspath6}"
1233		source="6"
1234		executable="${javadoc7}">
1235		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1236		<arg value="-XDignore.symbol.file=true"/>
1085	–
1237		</javadoc>
1238		</target>
1239
1240	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1241
1242	<	<target name="extra166ydist"
1091	<	depends="extra166ydist-jar, extra166ydist-docs"
1092	<	description="Puts all distributable products in single hierarchy"/>
1093	<
1094	<
1095	<	<target name="extra166yclean"
1096	<	description="Removes all extra166y build products">
1097	<
1242	>	<target name="extra166yclean">
1243		<delete dir="${build.extra166y.dir}"/>
1099	–
1244		</target>
1245
1246	<
1103	<	<target name="extra166ydist-jar"
1104	<	depends="extra166yclean, extra166yjar">
1246	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1247		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1248		</target>
1249
1250	<	<target name="extra166ydist-docs"
1109	<	depends="extra166yclean, extra166ydocs">
1250	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1251		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1252		</target>
1253
1254	<	<!-- jsr166e -->
1254	>
1255	>	<!-- jsr166e (no longer maintained) -->
1256
1257		<property name="build.jsr166e.java.version" value="6"/>
1258		<property name="build.jsr166e.javac" value="${javac6}"/>
1259
1260	<	<target name="jsr166ecompile"
1119	<	depends="configure-compiler"
1120	<	description="Compiles jsr166e sources">
1121	<
1260	>	<target name="jsr166ecompile" depends="configure-compiler">
1261		<mkdir dir="${build.jsr166e.classes.dir}"/>
1262
1263		<javac srcdir="${topsrc.dir}"
#	Line 1139 | Line 1278
1278		<compilerarg value="-Xlint:all"/>
1279		<compilerarg value="-Werror"/>
1280		<compilerarg line="${build.args}"/>
1142	–
1281		</javac>
1282		</target>
1283
1146	–	<!-- jsr166e: find doclint errors -->
1284		<target name="jsr166edoclint">
1148	–
1285		<mkdir dir="${build.jsr166e.classes.dir}"/>
1286
1287		<javac srcdir="${topsrc.dir}"
#	Line 1167 | Line 1303
1303		<compilerarg value="-Xlint:all"/>
1304		<compilerarg value="-Werror"/>
1305		<compilerarg value="-Xdoclint:all/protected"/>
1170	–
1306		</javac>
1307		</target>
1308
1309	<
1175	<	<target name="jsr166ejar"
1176	<	depends="jsr166ecompile"
1177	<	description="Builds library jar from compiled sources">
1178	<
1309	>	<target name="jsr166ejar" depends="jsr166ecompile">
1310		<jar destfile="${jsr166e.jar}" index="true">
1311		<fileset dir="${build.jsr166e.classes.dir}"/>
1312		<manifest>
#	Line 1183 | Line 1314
1314		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1315		</manifest>
1316		</jar>
1186	–
1317		</target>
1318
1319	<
1190	<	<target name="jsr166edocs"
1191	<	description="Builds javadocs to build dir">
1192	<
1319	>	<target name="jsr166edocs">
1320		<delete dir="${jsr166edocs.dir}"/>
1321		<mkdir dir="${jsr166edocs.dir}"/>
1322
#	Line 1197 | Line 1324
1324		packagenames="jsr166e.*"
1325		link="${java.api.url}"
1326		access="${build.javadoc.access}"
1327	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1327	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1328		source="${build.jsr166e.java.version}"
1329	<	executable="${javadoc7}">
1329	>	executable="${javadoc7}"
1330	>	failonerror = "true">
1331		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1332		<arg value="-XDignore.symbol.file=true"/>
1205	–
1333		</javadoc>
1334		</target>
1335
1336	<
1210	<	<target name="jsr166e-tck-one-java-version"
1211	<	depends="jsr166ejar">
1212	<
1336	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1337		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1214	–
1338		<run-tck-tests
1339		tck.src.dir="${test.src.dir}/tck-jsr166e"
1340		target="${build.jsr166e.java.version}"
#	Line 1219 | Line 1342
1342		classes="${jsr166e.jar}"/>
1343		</target>
1344
1345	<	<target name="jsr166e-tck"
1223	<	description="Runs tck tests for jsr166e for multiple java versions">
1345	>	<target name="jsr166e-tck">
1346
1347		<!--     <antcall target="clean"/> -->
1348		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1241 | Line 1363
1363		</antcall>
1364		</target>
1365
1366	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1367
1368	<	<target name="jsr166e-test"
1246	<	depends="jsr166e-tck"
1247	<	description="Runs all tests for jsr166e">
1248	<	</target>
1249	<
1250	<	<target name="jsr166edist"
1251	<	depends="jsr166edist-jar, jsr166edist-docs"
1252	<	description="Puts all distributable products in single hierarchy"/>
1253	<
1368	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1369
1370	<	<target name="jsr166eclean"
1256	<	description="Removes all jsr166e build products">
1370	>	<target name="jsr166eclean">
1371		<delete dir="${build.jsr166e.dir}"/>
1372		</target>
1373
1260	–
1374		<target name="jsr166edist-jar"
1375		depends="jsr166eclean, jsr166ejar">
1376		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1377		</target>
1378
1379	<	<target name="jsr166edist-docs"
1267	<	depends="jsr166eclean, jsr166edocs">
1379	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1380		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1381		</target>
1382
#	Line 1285 | Line 1397
1397		</target>
1398
1399
1400	+	<!-- ==============================================================
1401	+	Experimental errorprone support - http://errorprone.info
1402	+	=================================================================== -->
1403	+	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1404	+	<property name="errorprone.jsr166.flags"
1405	+	value="-Xep:BoxedPrimitiveConstructor:OFF
1406	+	-Xep:HashtableContains:OFF
1407	+	-Xep:JdkObsolete:OFF
1408	+	-Xep:ModifyingCollectionWithItself:OFF
1409	+	-Xep:MissingOverride:OFF
1410	+	-Xep:MissingFail:OFF
1411	+	-Xep:IdentityBinaryExpression:WARN
1412	+	-Xep:MethodCanBeStatic:WARN"/>
1413	+	<!-- -Xep:WildcardImport:ERROR -->
1414	+	<property name="errorprone.jsr166.test.flags"
1415	+	value="-Xep:MissingOverride:OFF
1416	+	-Xep:StringSplitter:OFF
1417	+	-Xep:MixedArrayDimensions:ERROR
1418	+	-Xep:RemoveUnusedImports:ERROR
1419	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1420	+	-Xep:RedundantThrows:ERROR
1421	+	-Xep:EmptyIf:ERROR
1422	+	-Xep:MultipleTopLevelClasses:ERROR
1423	+	-Xep:ClassName:ERROR"/>
1424	+	<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1425	+	<target name="errorprone"
1426	+	depends="clean, configure-compiler"
1427	+	description="Run errorprone over jsr166 source code (experimental)">
1428	+
1429	+	<local name="destdir"/>
1430	+	<property name="destdir" value="${build.classes.dir}/java.base"/>
1431	+	<mkdir dir="${destdir}"/>
1432	+
1433	+	<javac srcdir="${src.dir}"
1434	+	destdir="${destdir}"
1435	+	debug="${build.debug}"
1436	+	debuglevel="${build.debuglevel}"
1437	+	deprecation="${build.deprecation}"
1438	+	classpath=""
1439	+	includeAntRuntime="false"
1440	+	includeJavaRuntime="false"
1441	+	encoding="ASCII"
1442	+	executable="${build.main.javac}"
1443	+	fork="true">
1444	+
1445	+	<include name="**/*.java"/>
1446	+	<compilerarg line="-processorpath ${errorprone.jar}"/>
1447	+	<compilerarg value="-Xplugin:ErrorProne
1448	+	${errorprone.jsr166.flags}"/>
1449	+	<compilerarg value="--patch-module=java.base=${src.dir}"/>
1450	+	<compilerarg value="-Xprefer:source"/>
1451	+	<compilerarg value="-XDignore.symbol.file=true"/>
1452	+	<compilerarg value="-Xlint:all"/>
1453	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
1454	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1455	+	<compilerarg line="${build.args}"/>
1456	+	</javac>
1457	+
1458	+	<jar destfile="${product.jar}">
1459	+	<fileset dir="${destdir}"/>
1460	+	</jar>
1461	+
1462	+	<run-tck-tests
1463	+	target="${build.main.java.version}"
1464	+	workdir="${build.dir}"
1465	+	classes="${product.jar}">
1466	+	<javac-elements>
1467	+	<compilerarg line="-processorpath ${errorprone.jar}"/>
1468	+	<compilerarg value="-Xplugin:ErrorProne
1469	+	${errorprone.jsr166.flags}
1470	+	${errorprone.jsr166.test.flags}"/>
1471	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1472	+	</javac-elements>
1473	+	</run-tck-tests>
1474	+	</target>
1475	+
1476	+	<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1477	+	<!-- -XDcompilePolicy=simple or by-file avoids confusing UnusedImports -->
1478	+	<target name="errorprone-jtreg"
1479	+	depends="jar"
1480	+	description="Run errorprone over jtreg tests (experimental)">
1481	+
1482	+	<run-jtreg-tests
1483	+	target="${build.main.java.version}"
1484	+	workdir="${build.dir}"
1485	+	classes="${product.jar}"
1486	+	verbose="all">
1487	+	<jtreg-elements>
1488	+	<arg value="-javacoption:-XDcompilePolicy=simple"/>
1489	+	<arg value="-javacoption:-processorpath"/>
1490	+	<arg value="-javacoption:${errorprone.jar}"/>
1491	+	<arg value="-javacoption:-Xplugin:ErrorProne
1492	+	${errorprone.jsr166.flags}
1493	+	${errorprone.jsr166.test.flags}
1494	+	-Xep:NonAtomicVolatileUpdate:OFF"/>
1495	+	</jtreg-elements>
1496	+	</run-jtreg-tests>
1497	+	</target>
1498	+
1499	+
1500	+	<!-- ==============================================================
1501	+	Running guava tests against jsr166 code
1502	+	=================================================================== -->
1503	+
1504	+	<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1505	+	<!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1506	+	<!-- <property name="guava.version" value="21.0"/> -->
1507	+
1508	+	<!-- HOWTO debug print a path id -->
1509	+	<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1510	+	<!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1511	+
1512	+	<!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1513	+	<!--   organisation="com.google.guava" module="guava-tests"/> -->
1514	+	<!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1515	+	<!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1516	+	<!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1517	+	<!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1518	+
1519	+	<!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1520	+	<!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1521	+	<!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1522	+	<!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1523	+
1524	+	<!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1525	+	<!--   type="*" inline="true" conf="*(private),*(public)" -->
1526	+	<!--   pattern="${guava.dir}/[artifact].[ext]" -->
1527	+	<!--   organisation="com.google.guava" module="guava-testlib"/> -->
1528	+
1529	+	<!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1530	+	<!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1531	+	<!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1532	+
1533	+	<target name="init-ivy">
1534	+	<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1535	+	dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1536	+	<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1537	+	classpath="${build.dir}/ivy.jar"/>
1538	+	</target>
1539	+
1540	+	<target name="guava-tests" depends="jar, init-ivy"
1541	+	description="Guava tests run against jsr166 collections">
1542	+	<property name="guava.dir" value="${build.dir}/guava-testlib"/>
1543	+	<mkdir dir="${guava.dir}"/>
1544	+	<ivy:retrieve pathid="guava.testlib.classpath"
1545	+	type="jar,bundle" inline="true" conf="default,master"
1546	+	pattern="${guava.dir}/[artifact].[ext]"
1547	+	organisation="com.google.guava" module="guava-testlib"/>
1548	+	<property name="guava.version" value="21.0"/>
1549	+	<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1550	+	dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1551	+	<junit printsummary="true" showoutput="true" haltonfailure="true"
1552	+	jvm="${build.main.java}" fork="true">
1553	+	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1554	+	<formatter type="brief"/>
1555	+	<classpath>
1556	+	<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1557	+	<path refid="guava.testlib.classpath"/>
1558	+	</classpath>
1559	+
1560	+	<!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1561	+	<test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1562	+	</junit>
1563	+	</target>
1564	+
1565		</project>

Diff Legend

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