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.202 by jsr166, Sat Mar 26 15:10:14 2016 UTC vs.
Revision 1.280 by jsr166, Sun Oct 7 03:43:04 2018 UTC

#	Line 1 | Line 1
1		<project name="jsr166" default="usage"
2	<	xmlns:if="ant:if" xmlns:unless="ant:unless">
2	>	xmlns:if="ant:if"
3	>	xmlns:unless="ant:unless"
4	>	xmlns:ivy="antlib:org.apache.ivy.ant">
5
6		<description>
7		------------------------------------------------------------------------------
#	Line 17 | 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:
20	–	$HOME/jdk/jdk6
21	–	$HOME/jdk/jdk7
22		$HOME/jdk/jdk8
23		$HOME/jdk/jdk9
24	+	$HOME/jdk/jdk10
25	+	$HOME/jdk/jdk11
26	+	$HOME/jdk/jdk12
27		where each of the above is a JDK or a symlink to same, and
25	–	$HOME/jdk/src/jdk6
26	–	$HOME/jdk/src/jdk7
28		$HOME/jdk/src/jdk8
29		$HOME/jdk/src/jdk9
30	+	$HOME/jdk/src/jdk10
31	+	$HOME/jdk/src/jdk11
32	+	$HOME/jdk/src/jdk12
33		where each of the above is a complete JDK source tree
34		(e.g. mercurial forest) or a symlink to same.
35
36		Alternatively, define ant variables thus:
37		ant -Djdk$N.home=... -Djdk$N.src.home=...
38	<	for $N in 6 7 8 9 ...
38	>	for $N in 8 9 10 ...
39
40	<	As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37	<	target is currently broken.
40	>	As of 2016-03, the sources in src/main are for jdk9+ only.
41		------------------------------------------------------------------------------
42		</description>
43
44	<	<!-- Display main targets by running 'ant -projecthelp' -->
44	>	<!-- Run 'ant -projecthelp' (default target) -->
45		<target name="usage">
46		<java classname="org.apache.tools.ant.Main">
47		<arg value="-projecthelp" />
#	Line 63 | Line 66
66		<property name="build.classes.dir"           location="${build.dir}/classes"/>
67		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
68		<property name="build.loops.dir"             location="${build.dir}/loops"/>
66	–	<property name="build.reports.dir"           location="${build.dir}/reports"/>
69
70		<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
71		<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
#	Line 104 | Line 106
106		<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
107		unless:set="have.java.base"/>
108		<local name="modules"/>
109	<	<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
109	>	<available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
110		<local name="boot.jar.dir"/>
111		<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
112		<path id="bootclasspath@{v}" unless:set="modules">
#	Line 134 | Line 136
136		<defjdklocations v="7"/>
137		<defjdklocations v="8"/>
138		<defjdklocations v="9"/>
139	+	<defjdklocations v="10"/>
140	+	<defjdklocations v="11"/>
141	+	<defjdklocations v="12"/>
142
143		<!-- Source locations -->
144		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 143 | Line 148
148		<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
149		<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
150		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
151	+	<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
152	+	<property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
153	+	<property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
154		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
155		<property name="lib.dir"              location="${basedir}/lib"/>
156		<property name="dist.dir"             location="${basedir}/dist"/>
#	Line 182 | Line 190
190		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
191
192		<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
193	<	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
194	<	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
195	<	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
196	<	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
197	<	<!-- The expected canonical location does not yet exist as of 2016-03 -->
198	<	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
199	<	<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
193	>	<!-- Switched to https: in 2017-10 - JDK-8190312 -->
194	>	<property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
195	>	<property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
196	>	<property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
197	>	<property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
198	>	<property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
199	>	<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
200	>	<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
201	>	<!-- The location of jdk early access docs (RIP) -->
202	>	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
203	>	<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
204	>	<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
205	>	<property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
206		<!-- Default jdk doc location (latest stable release seems best) -->
207	<	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
207	>	<!-- But pin to jdk 10 until fix for -->
208	>	<!-- 8211194: javadoc -link doesn't take module path into consideration -->
209	>	<property name="java.docroot.url"   value="${java10.docroot.url}"/>
210
211		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
212		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 198 | Line 214
214		<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
215		<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
216		<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
217	+	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
218	+	<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
219	+	<property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
220		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
221
222		<!-- Define the "jtreg" task -->
#	Line 230 | Line 249
249
250		<local name="modules"/>
251		<condition property="modules">
252	<	<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
252	>	<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
253	>	</condition>
254	>
255	>	<local name="use-doclint"/>
256	>	<condition property="use-doclint">
257	>	<not> <equals arg1="@{target}" arg2="7"/> </not>
258		</condition>
259
260		<mkdir dir="@{workdir}/tck-classes"/>
#	Line 245 | Line 269
269		classpath="${junit.jar}"
270		includeAntRuntime="false"
271		includeJavaRuntime="false"
272	+	encoding="ASCII"
273		executable="${javac@{compile-target}}"
274		fork="true">
275
276		<include name="*.java"/>
277		<compilerarg value="-XDignore.symbol.file=true"/>
278		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
279	+	<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
280		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
281	<	<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
281	>	<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
282		<compilerarg line="${build.args}"/>
283		<javac-elements/>
284
#	Line 263 | Line 289
289		jvm="${java@{target}}"
290		fork="true">
291		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
292	<	<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
292	>	<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
293	>	<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
294	>	<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
295	>	<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
296	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
297	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
298		<jvmarg line="@{jvmflags}"/>
299	+	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
300	+	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
301
302	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
302	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
303		<syspropertyset id="system-properties-used-by-tck">
304		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
305		<propertyref prefix="jsr166."/>
#	Line 283 | Line 316
316		</macrodef>
317
318		<!-- Define jtreg test sets for different jdk versions -->
319	<	<fileset dir="${jtreg9.src.dir}">
320	<	<patternset id="jdk9.jtreg.tests">
321	<	<include name="**/*.java"/>
322	<	</patternset>
323	<	</fileset>
324	<
325	<	<fileset dir="${jtreg8.src.dir}">
326	<	<patternset id="jdk8.jtreg.tests">
327	<	<include name="**/*.java"/>
328	<	<exclude name="**/SpliteratorCharacteristics.java"/>
329	<	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
330	<	<exclude name="**/GCDuringIteration.java"/>
331	<	</patternset>
299	<	</fileset>
319	>	<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
320	>	<!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
321	>	<property name="jtreg.test.pattern" value="**/*.java"/>
322	>	<macrodef name="defjtregtests">
323	>	<attribute name="v"/>
324	>	<sequential>
325	>	<fileset dir="${jtreg@{v}.src.dir}">
326	>	<patternset id="jdk@{v}.jtreg.tests">
327	>	<include name="${jtreg.test.pattern}"/>
328	>	</patternset>
329	>	</fileset>
330	>	</sequential>
331	>	</macrodef>
332
333	<	<fileset dir="${jtreg7.src.dir}">
334	<	<patternset id="jdk7.jtreg.tests">
335	<	<include name="**/*.java"/>
336	<	</patternset>
337	<	</fileset>
333	>	<defjtregtests v="12"/>
334	>	<defjtregtests v="11"/>
335	>	<defjtregtests v="10"/>
336	>	<defjtregtests v="9"/>
337	>	<defjtregtests v="8"/>
338	>	<defjtregtests v="7"/>
339
340		<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
341		<property name="jtreg.flags" value=""/>
342
343		<macrodef name="run-jtreg-tests">
344		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
312	–	<attribute name="source" default="7"/>
345		<attribute name="target"/>
346		<attribute name="workdir"/>
347		<attribute name="classes"/>
348	+	<attribute name="verbose" default="${jtreg.verbose}"/>
349		<attribute name="jtregflags" default=""/>
350	+	<element name="jtreg-elements" optional="true"/>
351
352		<sequential>
353
#	Line 322 | Line 356
356
357		<local name="modules"/>
358		<condition property="modules">
359	<	<available file="${jdk@{target}.home}/jmods" type="dir"/>
359	>	<available file="${jdk@{target}.home}/lib/modules" type="file"/>
360		</condition>
361
362		<delete dir="@{workdir}/JTwork"   quiet="true"/>
329	–	<delete dir="@{workdir}/JTreport" quiet="true"/>
330	–	<mkdir dir="@{workdir}/JTwork/scratch"/>
331	–	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
332	–	<mkdir dir="@{workdir}/JTreport/html"/>
333	–	<mkdir dir="@{workdir}/JTreport/text"/>
363		<jtreg dir="${jtreg@{target}.src.dir}"
364		jdk="${jdk@{target}.home}"
365	<	workDir="@{workdir}/JTwork"
337	<	reportDir="@{workdir}/JTreport">
365	>	workDir="@{workdir}/JTwork">
366		<patternset refid="jdk@{target}.jtreg.tests"/>
367		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
368	<	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
368	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
369	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
370		<arg value="-agentvm"/>
371	<	<arg value="-verbose:${jtreg.verbose}"/>
371	>	<arg value="-noreport"/>
372	>	<arg value="-verbose:@{verbose}"/>
373		<arg value="-vmoptions:-esa -ea"/>
374		<arg value="-automatic"/>
375		<arg value="-k:!ignore"/>
376		<arg line="@{jtregflags}"/>
377		<arg line="${jtreg.flags}"/>
378	+	<jtreg-elements/>
379		</jtreg>
380		</sequential>
381		</macrodef>
#	Line 360 | Line 391
391
392		<!-- Main targets -->
393
394	<	<property name="build.main.java.version" value="9"/>
395	<	<property name="build.main.javac" value="${javac9}"/>
394	>	<property name="build.main.java.version" value="11"/>
395	>	<!-- Workaround "no nested properties in ant" -->
396	>	<macrodef name="define-build-main-properties">
397	>	<attribute name="v"/>
398	>	<sequential>
399	>	<property name="build.main.java"    value="${java@{v}}"/>
400	>	<property name="build.main.javac"   value="${javac@{v}}"/>
401	>	<!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->
402	>	<!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
403	>	<condition property="build.main.javadoc"
404	>	value="${javadoc12}"
405	>	else="${javadoc@{v}}">
406	>	<matches pattern="^(9|10|11)$" string="@{v}"/>
407	>	</condition>
408	>	<property name="build.main.javadoc"   value="${javadoc12}"/>
409	>	</sequential>
410	>	</macrodef>
411	>	<define-build-main-properties v="${build.main.java.version}"/>
412
413		<target name="dists"
414	<	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
414	>	depends="dist, 4jdk8dist"
415		description="Builds all public jars and docs"/>
416	+	<!--
417	+	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
418	+	-->
419
420		<target name="compile"
421		depends="configure-compiler"
422		description="Compiles src/main sources to build dir">
423
374	–	<local name="modules"/>
375	–	<condition property="modules">
376	–	<and>
377	–	<available file="${jdk9.home}/jmods" type="dir"/>
378	–	<equals arg1="9" arg2="${build.main.java.version}"/>
379	–	</and>
380	–	</condition>
381	–
424		<local name="destdir"/>
425	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
384	<	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
425	>	<property name="destdir" value="${build.classes.dir}/java.base"/>
426
427		<mkdir dir="${destdir}"/>
428
#	Line 393 | Line 434
434		classpath=""
435		includeAntRuntime="false"
436		includeJavaRuntime="false"
437	+	encoding="ASCII"
438		executable="${build.main.javac}"
439		fork="true">
440
441		<include name="**/*.java"/>
442	<	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
442	>	<compilerarg value="--patch-module=java.base=${src.dir}"/>
443		<compilerarg value="-Xprefer:source"/>
444		<compilerarg value="-XDignore.symbol.file=true"/>
445		<compilerarg value="-Xlint:all"/>
446	+	<compilerarg line="--doclint-format html5"/>
447	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
448		<compilerarg value="-Werror"/>
405	–	<compilerarg value="-Xdoclint:all/protected"/>
449		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
450		<compilerarg line="${build.args}"/>
451
452		</javac>
410	–
411	–	<!-- We need jdk9's Contended annotation, but at compile time only -->
412	–	<!--
413	–	<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
414	–	-->
453		</target>
454
455
456		<target name="jar"
457		depends="compile"
458	<	description="Builds library jar from compiled sources">
459	<
458	>	description="Builds library jar for src/main from compiled sources">
459	>	<local name="subdir"/>
460	>	<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
461		<jar destfile="${product.jar}">
462	<	<fileset dir="${build.classes.dir}"/>
462	>	<fileset dir="${build.classes.dir}${subdir}"/>
463		<manifest>
464		<attribute name="Built-By" value="${user.name}"/>
465		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
#	Line 438 | Line 477
477		<!-- the packagenames="none" hack below prevents scanning the -->
478		<!-- sourcepath for packages -->
479
480	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
481	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
482	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
483	+	<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
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="${java11.api.url}"
488		overview="${src.dir}/intro.html"
489		access="${build.javadoc.access}"
490	<	sourcepath="${src.dir}:${jdk9.src.dir}"
490	>	sourcepath="${src.dir}"
491		classpath=""
492	<	executable="${javadoc9}">
492	>	source="11"
493	>	executable="${build.main.javadoc}">
494		<fileset dir="${src.dir}" defaultexcludes="yes">
495		<include name="**/*.java"/>
496		</fileset>
497	<	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
497	>	<arg line="-Xdocrootparent ${java10.docroot.url}"/>
498		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
499		<arg value="-XDignore.symbol.file=true"/>
500	<	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
501	<	<arg value="-tag"/>
502	<	<arg value="${javadoc.jls.option}"/>
503	<	<arg value="-tag"/>
504	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
505	<	<arg value="-tag"/>
506	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
507	<	<arg value="-tag"/>
508	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
509	<	<!-- tags added in jdk9 -->
465	<	<arg value="-tag"/>
466	<	<arg value="revised:X"/>
467	<	<arg value="-tag"/>
468	<	<arg value="spec:X"/>
500	>	<arg value="-html5"/>
501	>	<arg value="--patch-module=java.base=${src.dir}"/>
502	>	<arg value="--override-methods=summary"/>
503	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
504	>	<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
505	>	<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
506	>	<arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
507	>	<!-- tags added in jdk9: currently unused -->
508	>	<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
509	>	<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
510		</javadoc>
511		</target>
512
#	Line 499 | Line 540
540
541		<target name="clean"
542		description="Removes all build products">
502	–
543		<delete dir="${build.dir}"/>
504	–
544		</target>
545
546
547		<target name="dist-clean"
548		description="Removes all build and distribution products">
510	–
549		<delete dir="${build.dir}"/>
550		<delete dir="${dist.dir}"/>
513	–
551		</target>
552
553
#	Line 526 | Line 563
563
564		<target name="tck"
565		depends="jar"
566	<	description="Runs tck tests for main directly">
566	>	description="Runs tck tests for src/main directly">
567
568		<run-tck-tests
569		target="${build.main.java.version}"
570		workdir="${build.dir}"
571	<	classes="${product.jar}"/>
571	>	classes="${product.jar}">
572	>	<javac-elements>
573	>	<compilerarg value="-Werror"/>
574	>	</javac-elements>
575	>	</run-tck-tests>
576		</target>
577
578		<target name="tck-parallelism-1"
579	<	description="Runs tck with given common pool parallelism">
579	>	description="Runs tck with common pool parallelism 1">
580		<antcall target="tck">
581		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
582		</antcall>
583		</target>
584
585		<target name="tck-parallelism-0"
586	<	description="Runs tck with given common pool parallelism">
586	>	description="Runs tck with common pool parallelism 0">
587		<antcall target="tck">
588		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
589		</antcall>
590		</target>
591
592	+	<target name="tck-security-manager"
593	+	description="Runs tck with a security manager">
594	+	<antcall target="tck">
595	+	<param name="jsr166.useSecurityManager" value="true"/>
596	+	</antcall>
597	+	</target>
598	+
599		<target name="jtreg"
600		depends="jar"
601	<	description="Runs jtreg tests for main using the jtreg ant task">
601	>	description="Runs jtreg tests for src/main using the jtreg ant task">
602		<run-jtreg-tests
603		target="${build.main.java.version}"
604		workdir="${build.dir}"
#	Line 558 | Line 606
606		</target>
607
608		<target name="test"
609	<	depends="tck, tck-parallelism-1, jtreg"
610	<	description="Runs tck and jtreg tests for main">
563	<	</target>
609	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
610	>	description="Runs tck and jtreg tests for src/main"/>
611
612	<	<target name="jtreg8" description="Runs jtreg tests with jdk8">
612	>	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
613
614	<	<antcall target="jtreg">
615	<	<param name="build.main.java.version" value="8"/>
616	<	<param name="build.main.javac" value="${javac8}"/>
617	<	</antcall>
614	>	<!--     <antcall target="jtreg"> -->
615	>	<!--       <param name="build.main.java.version" value="8"/> -->
616	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
617	>	<!--     </antcall> -->
618
619	<	</target>
619	>	<!--   </target> -->
620
621	<	<target name="test89"
622	<	description="Runs tck and jtreg tests for main for multiple java versions">
621	>	<target name="test9101112"
622	>	description="Runs tck and jtreg tests for src/main for multiple java versions">
623
624		<antcall target="clean"/>
625		<antcall target="test">
626	<	<param name="build.main.java.version" value="8"/>
627	<	<param name="build.main.javac" value="${javac8}"/>
626	>	<param name="build.main.java.version" value="9"/>
627	>	<param name="build.main.java" value="${java9}"/>
628	>	<param name="build.main.javac" value="${javac9}"/>
629		</antcall>
630
631		<antcall target="clean"/>
632		<antcall target="test">
633	<	<param name="build.main.java.version" value="9"/>
634	<	<param name="build.main.javac" value="${javac9}"/>
633	>	<param name="build.main.java.version" value="10"/>
634	>	<param name="build.main.java" value="${java10}"/>
635	>	<param name="build.main.javac" value="${javac10}"/>
636	>	</antcall>
637	>
638	>	<antcall target="clean"/>
639	>	<antcall target="test">
640	>	<param name="build.main.java.version" value="11"/>
641	>	<param name="build.main.java" value="${java11}"/>
642	>	<param name="build.main.javac" value="${javac11}"/>
643		</antcall>
644
645	+	<antcall target="clean"/>
646	+	<antcall target="test">
647	+	<param name="build.main.java.version" value="12"/>
648	+	<param name="build.main.java" value="${java12}"/>
649	+	<param name="build.main.javac" value="${javac12}"/>
650	+	</antcall>
651	+	<antcall target="docs">
652	+	<param name="build.main.java.version" value="12"/>
653	+	<param name="build.main.java" value="${java12}"/>
654	+	<param name="build.main.javac" value="${javac12}"/>
655	+	<param name="build.main.javadoc" value="${javadoc12}"/>
656	+	</antcall>
657	+
658	+	<!-- Clean up to avoid obscure wrong class file version bugs -->
659	+	<antcall target="clean"/>
660	+
661		</target>
662
663
664
665		<target name="configure-compiler">
666		<fail message="ant version too old">
667	<	<condition>
596	<	<not> <antversion atleast="1.9.1"/> </not>
597	<	</condition>
667	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
668		</fail>
669
670		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 616 | Line 686
686		<!-- Various demos and test programs -->
687
688
689	<	<target name="loops" depends="configure-compiler"
690	<	description="Benchmark from Doug Lea's AQS paper">
689	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
690	>	<target name="loops" depends="configure-compiler">
691
692		<mkdir dir="${build.loops.dir}"/>
693
#	Line 628 | Line 698
698		deprecation="${build.deprecation}"
699		source="${build.sourcelevel}"
700		target="${build.sourcelevel}"
701	+	encoding="ASCII"
702		fork="true">
703
704		<compilerarg line="${build.args}"/>
#	Line 639 | Line 710
710		<java classname="ALoops" fork="true">
711		<classpath refid="loops.classpath"/>
712		</java>
642	–
713		</target>
714
715
716		<target name="compile-test-loops" depends="jar"
717	<	description="compile all the perf tests in src/test/loops">
717	>	description="Compiles all the perf tests in src/test/loops">
718
719		<mkdir dir="${build.dir}/test/loops"/>
720
#	Line 655 | Line 725
725		deprecation="${build.deprecation}"
726		includeAntRuntime="false"
727		includeJavaRuntime="false"
728	<	executable="${javac9}"
728	>	encoding="ASCII"
729	>	executable="${build.main.javac}"
730		fork="true">
731
732		<include name="*.java"/>
#	Line 663 | Line 734
734		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
735		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
736		<compilerarg line="${build.args}"/>
666	–
737		</javac>
668	–
738		</target>
739
740
#	Line 688 | Line 757
757		bootclasspath="${bootclasspath8}"
758		includeAntRuntime="false"
759		includeJavaRuntime="false"
760	+	encoding="ASCII"
761		executable="${javac8}"
762		fork="true">
693	–
763		<include name="**/*.java"/>
764		<compilerarg value="-Xprefer:source"/>
765		<compilerarg value="-XDignore.symbol.file=true"/>
766		<compilerarg value="-Xlint:all"/>
767		<compilerarg value="-Werror"/>
768		<compilerarg line="${build.args}"/>
700	–
769		</javac>
770		</target>
771
#	Line 718 | Line 786
786		bootclasspath="${bootclasspath8}"
787		includeAntRuntime="false"
788		includeJavaRuntime="false"
789	+	encoding="ASCII"
790		executable="${javac8}"
791		fork="true">
723	–
792		<include name="**/*.java"/>
793		<compilerarg value="-Xprefer:source"/>
794		<compilerarg value="-XDignore.symbol.file=true"/>
795		<compilerarg value="-Xlint:all"/>
796	<	<compilerarg value="-Xdoclint:all/protected"/>
796	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
797		<compilerarg line="${build.args}"/>
730	–
798		</javac>
799		</target>
800
#	Line 743 | Line 810
810		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
811		</manifest>
812		</jar>
746	–
813		</target>
814
815
#	Line 759 | Line 825
825		<!-- JDK9+ test classes -->
826		<exclude name="*9Test.java"/>
827		<exclude name="*10Test.java"/>
828	+	<compilerarg value="-Werror"/>
829		</javac-elements>
830		</run-tck-tests>
831		</target>
#	Line 776 | Line 843
843
844		<target name="4jdk8-test"
845		depends="4jdk8-tck, 4jdk8-jtreg"
846	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
780	<	</target>
846	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
847
848
849		<target name="4jdk8docs"
#	Line 793 | Line 859
859		access="${build.javadoc.access}"
860		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
861		classpath=""
862	<	executable="${javadoc8}">
862	>	source="8"
863	>	executable="${javadoc8}"
864	>	failonerror = "true">
865		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
866		<include name="**/*.java"/>
867		</fileset>
868		<arg line="-Xdocrootparent ${java8.docroot.url}"/>
869		<arg value="-XDignore.symbol.file=true"/>
870	<	<arg value="-tag"/>
871	<	<arg value="${javadoc.jls.option}"/>
872	<	<arg value="-tag"/>
873	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
874	<	<arg value="-tag"/>
807	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
808	<	<arg value="-tag"/>
809	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
870	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
871	>	<arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
872	>	<arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
873	>	<!-- @apiNote tag currently unused -->
874	>	<!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
875		</javadoc>
876		</target>
877
#	Line 818 | Line 883
883
884		<target name="4jdk8clean"
885		description="Removes all 4jdk8 build products">
821	–
886		<delete dir="${build.4jdk8.dir}"/>
823	–
887		</target>
888
889
#	Line 836 | Line 899
899		</target>
900
901
902	+	<!-- jsr166 4jdk7 (no longer maintained) -->
903
904	<	<!-- jsr166 4jdk7 -->
841	<
842	<	<target name="4jdk7compile"
843	<	depends="configure-compiler"
844	<	description="Compiles src/jdk7 sources, targeting jdk7">
845	<
904	>	<target name="4jdk7compile" depends="configure-compiler">
905		<mkdir dir="${build.4jdk7.classes.dir}"/>
906
907		<javac srcdir="${4jdk7src.dir}"
#	Line 856 | Line 915
915		bootclasspath="${bootclasspath6}"
916		includeAntRuntime="false"
917		includeJavaRuntime="false"
918	+	encoding="ASCII"
919		executable="${javac7}"
920		fork="true">
921
#	Line 865 | Line 925
925		<compilerarg value="-Xlint:all"/>
926		<compilerarg value="-Werror"/>
927		<compilerarg line="${build.args}"/>
868	–
928		</javac>
929		</target>
930
931	<	<target name="4jdk7doclint"
873	<	depends="configure-compiler"
874	<	description="Finds doclint warnings">
875	<
931	>	<target name="4jdk7doclint" depends="configure-compiler">
932		<mkdir dir="${build.4jdk7.classes.dir}"/>
933
934		<javac srcdir="${4jdk7src.dir}"
#	Line 886 | Line 942
942		bootclasspath="${bootclasspath6}"
943		includeAntRuntime="false"
944		includeJavaRuntime="false"
945	+	encoding="ASCII"
946		executable="${javac8}"
947		fork="true">
948
#	Line 895 | Line 952
952		<compilerarg value="-Xlint:all"/>
953		<compilerarg value="-Xdoclint:all/protected"/>
954		<compilerarg line="${build.args}"/>
898	–
955		</javac>
956		</target>
957
958	<
903	<	<target name="4jdk7jar"
904	<	depends="4jdk7compile"
905	<	description="Builds library jar from compiled sources">
906	<
958	>	<target name="4jdk7jar" depends="4jdk7compile">
959		<jar destfile="${4jdk7product.jar}">
960		<fileset dir="${build.4jdk7.classes.dir}"/>
961		<manifest>
#	Line 911 | Line 963
963		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
964		</manifest>
965		</jar>
914	–
966		</target>
967
968	<
918	<	<target name="4jdk7-tck"
919	<	depends="4jdk7jar"
920	<	description="Runs tck tests for jsr166-4jdk7 directly">
921	<
968	>	<target name="4jdk7-tck" depends="4jdk7jar">
969		<run-tck-tests
970		target="7"
971		workdir="${build.4jdk7.dir}"
#	Line 936 | Line 983
983		<exclude name="SplittableRandomTest.java"/>
984		<exclude name="StampedLockTest.java"/>
985		<exclude name="SubmissionPublisherTest.java"/>
986	+	<compilerarg value="-Werror"/>
987		</javac-elements>
988		</run-tck-tests>
989		</target>
990
991	<
992	<	<target name="4jdk7-tck-junit"
945	<	depends="4jdk7compile"
946	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
991	>	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
992	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
993
994		<junit printsummary="true"
995		showoutput="true"
#	Line 965 | Line 1011
1011
1012		<test name="${jsr166.tckTestClass}" haltonfailure="no">
1013		</test>
968	–
1014		</junit>
1015		</target>
1016
1017	<	<target name="4jdk7-jtreg"
973	<	depends="4jdk7jar"
974	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
1017	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
1018		<run-jtreg-tests
1019		target="7"
1020		workdir="${build.4jdk7.dir}"
1021		classes="${4jdk7product.jar}"/>
1022		</target>
1023
1024	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1025
1026	<	<target name="4jdk7-test"
983	<	depends="4jdk7-tck, 4jdk7-jtreg"
984	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
985	<	</target>
986	<
987	<
988	<	<target name="4jdk7docs"
989	<	description="Builds javadocs for src/jdk7 to dist dir">
990	<
1026	>	<target name="4jdk7docs">
1027		<delete dir="${4jdk7docs.dir}"/>
1028		<mkdir dir="${4jdk7docs.dir}"/>
1029
#	Line 998 | Line 1034
1034		access="${build.javadoc.access}"
1035		sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1036		classpath=""
1037	<	executable="${javadoc7}">
1037	>	executable="${javadoc7}"
1038	>	failonerror = "true">
1039		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1040		<include name="**/*.java"/>
1041		</fileset>
#	Line 1007 | Line 1044
1044		</javadoc>
1045		</target>
1046
1047	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1048
1049	<	<target name="4jdk7dist"
1012	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1013	<	description="Puts all distributable products in single hierarchy"/>
1014	<
1015	<
1016	<	<target name="4jdk7clean"
1017	<	description="Removes all 4jdk7 build products">
1018	<
1049	>	<target name="4jdk7clean">
1050		<delete dir="${build.4jdk7.dir}"/>
1020	–
1051		</target>
1052
1053	<
1024	<	<target name="4jdk7dist-jar"
1025	<	depends="4jdk7clean, 4jdk7jar">
1053	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1054		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1055		</target>
1056
1057	<
1030	<	<target name="4jdk7dist-docs"
1031	<	depends="4jdk7clean, 4jdk7docs">
1057	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1058		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1059		</target>
1060
1061
1062	<	<!-- jsr166x -->
1037	<
1038	<	<target name="jsr166xcompile"
1039	<	depends="configure-compiler"
1040	<	description="Compiles jsr166x sources to build dir">
1062	>	<!-- jsr166x (no longer maintained) -->
1063
1064	+	<target name="jsr166xcompile" depends="configure-compiler">
1065		<mkdir dir="${build.jsr166x.classes.dir}"/>
1066
1067		<javac srcdir="${topsrc.dir}"
#	Line 1052 | Line 1075
1075		target="5"
1076		includeAntRuntime="false"
1077		includeJavaRuntime="false"
1078	+	encoding="ASCII"
1079		executable="${javac7}"
1080		fork="true">
1057	–
1081		<include name="jsr166x/**/*.java"/>
1082		<compilerarg value="-XDignore.symbol.file=true"/>
1083		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1084		<compilerarg value="-Werror"/>
1085		<compilerarg line="${build.args}"/>
1063	–
1086		</javac>
1087		</target>
1088
1089	<
1068	<	<target name="jsr166xjar"
1069	<	depends="jsr166xcompile"
1070	<	description="Builds library jar from compiled sources">
1071	<
1089	>	<target name="jsr166xjar" depends="jsr166xcompile">
1090		<jar destfile="${jsr166x.jar}">
1091		<fileset dir="${build.jsr166x.classes.dir}"/>
1092		<manifest>
#	Line 1076 | Line 1094
1094		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1095		</manifest>
1096		</jar>
1079	–
1097		</target>
1098
1099	<
1083	<	<target name="jsr166xdocs"
1084	<	description="Builds javadocs to dist dir">
1085	<
1099	>	<target name="jsr166xdocs">
1100		<delete dir="${jsr166xdocs.dir}"/>
1101		<mkdir dir="${jsr166xdocs.dir}"/>
1102
#	Line 1093 | Line 1107
1107		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1108		bootclasspath="${bootclasspath6}"
1109		source="5"
1110	<	executable="${javadoc7}">
1110	>	executable="${javadoc7}"
1111	>	failonerror = "true">
1112		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1113		<arg value="-XDignore.symbol.file=true"/>
1099	–
1114		</javadoc>
1115		</target>
1116
1117	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1118
1119	<	<target name="jsr166xdist"
1105	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1106	<	description="Puts all distributable products in single hierarchy"/>
1107	<
1108	<
1109	<	<target name="jsr166xclean"
1110	<	description="Removes all jsr166x build products">
1111	<
1119	>	<target name="jsr166xclean">
1120		<delete dir="${build.jsr166x.dir}"/>
1113	–
1121		</target>
1122
1123	<
1117	<	<target name="jsr166xdist-jar"
1118	<	depends="jsr166xclean, jsr166xjar">
1123	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1124		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1125		</target>
1126
1127	<	<target name="jsr166xdist-docs"
1123	<	depends="jsr166xclean, jsr166xdocs">
1127	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1128		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1129		</target>
1130
1127	–	<!-- jsr166y -->
1131
1132	+	<!-- jsr166y (no longer maintained) -->
1133
1134	<	<target name="jsr166ycompile"
1131	<	depends="configure-compiler"
1132	<	description="Compiles jsr166y sources">
1133	<
1134	>	<target name="jsr166ycompile" depends="configure-compiler">
1135		<mkdir dir="${build.jsr166y.classes.dir}"/>
1136
1137		<javac srcdir="${topsrc.dir}"
#	Line 1144 | Line 1145
1145		bootclasspath="${bootclasspath6}"
1146		includeAntRuntime="false"
1147		includeJavaRuntime="false"
1148	+	encoding="ASCII"
1149		executable="${javac7}"
1150		fork="true">
1151
#	Line 1152 | Line 1154
1154		<compilerarg value="-Xlint:all"/>
1155		<compilerarg value="-Werror"/>
1156		<compilerarg line="${build.args}"/>
1155	–
1157		</javac>
1158		</target>
1159
1160	<
1160	<	<target name="jsr166yjar"
1161	<	depends="jsr166ycompile"
1162	<	description="Builds library jar from compiled sources">
1163	<
1160	>	<target name="jsr166yjar" depends="jsr166ycompile">
1161		<jar destfile="${jsr166y.jar}" index="true">
1162		<fileset dir="${build.jsr166y.classes.dir}"/>
1163		<manifest>
#	Line 1168 | Line 1165
1165		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1166		</manifest>
1167		</jar>
1171	–
1168		</target>
1169
1170	<
1175	<	<target name="jsr166ydocs"
1176	<	description="Builds javadocs to dist dir">
1177	<
1170	>	<target name="jsr166ydocs">
1171		<delete dir="${jsr166ydocs.dir}"/>
1172		<mkdir dir="${jsr166ydocs.dir}"/>
1173
#	Line 1185 | Line 1178
1178		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1179		bootclasspath="${bootclasspath6}"
1180		source="6"
1181	<	executable="${javadoc7}">
1181	>	executable="${javadoc7}"
1182	>	failonerror = "true">
1183		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1184		<arg value="-XDignore.symbol.file=true"/>
1191	–
1185		</javadoc>
1186		</target>
1187
1188	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1189
1190	<	<target name="jsr166ydist"
1197	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1198	<	description="Puts all distributable products in single hierarchy"/>
1199	<
1200	<
1201	<	<target name="jsr166yclean"
1202	<	description="Removes all jsr166y build products">
1203	<
1190	>	<target name="jsr166yclean">
1191		<delete dir="${build.jsr166y.dir}"/>
1205	–
1192		</target>
1193
1194	<
1209	<	<target name="jsr166ydist-jar"
1210	<	depends="jsr166yclean, jsr166yjar">
1194	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1195		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1196		</target>
1197
1198	<	<target name="jsr166ydist-docs"
1215	<	depends="jsr166yclean, jsr166ydocs">
1198	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1199		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1200		</target>
1201
1202
1203	<	<!-- extra166y -->
1221	<
1222	<
1223	<	<target name="extra166ycompile"
1224	<	depends="configure-compiler, jsr166yjar"
1225	<	description="Compiles extra166y sources">
1203	>	<!-- extra166y (no longer maintained) -->
1204
1205	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1206		<mkdir dir="${build.extra166y.classes.dir}"/>
1207
1208		<javac srcdir="${topsrc.dir}"
#	Line 1237 | Line 1216
1216		target="6"
1217		includeAntRuntime="false"
1218		includeJavaRuntime="false"
1219	+	encoding="ASCII"
1220		executable="${javac7}"
1221		fork="true">
1222
#	Line 1245 | Line 1225
1225		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1226		<compilerarg value="-Werror"/>
1227		<compilerarg line="${build.args}"/>
1248	–
1228		</javac>
1229		</target>
1230
1231	<
1253	<	<target name="extra166yjar"
1254	<	depends="extra166ycompile"
1255	<	description="Builds library jar from compiled sources">
1256	<
1231	>	<target name="extra166yjar" depends="extra166ycompile">
1232		<jar destfile="${extra166y.jar}" index="true">
1233		<fileset dir="${build.extra166y.classes.dir}"/>
1234		<manifest>
#	Line 1261 | Line 1236
1236		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1237		</manifest>
1238		</jar>
1264	–
1239		</target>
1240
1241	<
1268	<	<target name="extra166ydocs"
1269	<	description="Builds javadocs to build dir">
1270	<
1241	>	<target name="extra166ydocs">
1242		<delete dir="${extra166ydocs.dir}"/>
1243		<mkdir dir="${extra166ydocs.dir}"/>
1244
#	Line 1281 | Line 1252
1252		executable="${javadoc7}">
1253		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1254		<arg value="-XDignore.symbol.file=true"/>
1284	–
1255		</javadoc>
1256		</target>
1257
1258	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1259
1260	<	<target name="extra166ydist"
1290	<	depends="extra166ydist-jar, extra166ydist-docs"
1291	<	description="Puts all distributable products in single hierarchy"/>
1292	<
1293	<
1294	<	<target name="extra166yclean"
1295	<	description="Removes all extra166y build products">
1296	<
1260	>	<target name="extra166yclean">
1261		<delete dir="${build.extra166y.dir}"/>
1298	–
1262		</target>
1263
1264	<
1302	<	<target name="extra166ydist-jar"
1303	<	depends="extra166yclean, extra166yjar">
1264	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1265		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1266		</target>
1267
1268	<	<target name="extra166ydist-docs"
1308	<	depends="extra166yclean, extra166ydocs">
1268	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1269		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1270		</target>
1271
1272	<	<!-- jsr166e -->
1272	>
1273	>	<!-- jsr166e (no longer maintained) -->
1274
1275		<property name="build.jsr166e.java.version" value="6"/>
1276		<property name="build.jsr166e.javac" value="${javac6}"/>
1277
1278	<	<target name="jsr166ecompile"
1318	<	depends="configure-compiler"
1319	<	description="Compiles jsr166e sources">
1320	<
1278	>	<target name="jsr166ecompile" depends="configure-compiler">
1279		<mkdir dir="${build.jsr166e.classes.dir}"/>
1280
1281		<javac srcdir="${topsrc.dir}"
#	Line 1338 | Line 1296
1296		<compilerarg value="-Xlint:all"/>
1297		<compilerarg value="-Werror"/>
1298		<compilerarg line="${build.args}"/>
1341	–
1299		</javac>
1300		</target>
1301
1345	–	<!-- jsr166e: find doclint errors -->
1302		<target name="jsr166edoclint">
1347	–
1303		<mkdir dir="${build.jsr166e.classes.dir}"/>
1304
1305		<javac srcdir="${topsrc.dir}"
#	Line 1366 | Line 1321
1321		<compilerarg value="-Xlint:all"/>
1322		<compilerarg value="-Werror"/>
1323		<compilerarg value="-Xdoclint:all/protected"/>
1369	–
1324		</javac>
1325		</target>
1326
1327	<
1374	<	<target name="jsr166ejar"
1375	<	depends="jsr166ecompile"
1376	<	description="Builds library jar from compiled sources">
1377	<
1327	>	<target name="jsr166ejar" depends="jsr166ecompile">
1328		<jar destfile="${jsr166e.jar}" index="true">
1329		<fileset dir="${build.jsr166e.classes.dir}"/>
1330		<manifest>
#	Line 1382 | Line 1332
1332		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1333		</manifest>
1334		</jar>
1385	–
1335		</target>
1336
1337	<
1389	<	<target name="jsr166edocs"
1390	<	description="Builds javadocs to build dir">
1391	<
1337	>	<target name="jsr166edocs">
1338		<delete dir="${jsr166edocs.dir}"/>
1339		<mkdir dir="${jsr166edocs.dir}"/>
1340
#	Line 1398 | Line 1344
1344		access="${build.javadoc.access}"
1345		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1346		source="${build.jsr166e.java.version}"
1347	<	executable="${javadoc7}">
1347	>	executable="${javadoc7}"
1348	>	failonerror = "true">
1349		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1350		<arg value="-XDignore.symbol.file=true"/>
1404	–
1351		</javadoc>
1352		</target>
1353
1354	<
1409	<	<target name="jsr166e-tck-one-java-version"
1410	<	depends="jsr166ejar">
1411	<
1354	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1355		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1413	–
1356		<run-tck-tests
1357		tck.src.dir="${test.src.dir}/tck-jsr166e"
1358		target="${build.jsr166e.java.version}"
#	Line 1418 | Line 1360
1360		classes="${jsr166e.jar}"/>
1361		</target>
1362
1363	<	<target name="jsr166e-tck"
1422	<	description="Runs tck tests for jsr166e for multiple java versions">
1363	>	<target name="jsr166e-tck">
1364
1365		<!--     <antcall target="clean"/> -->
1366		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1440 | Line 1381
1381		</antcall>
1382		</target>
1383
1384	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1385
1386	<	<target name="jsr166e-test"
1445	<	depends="jsr166e-tck"
1446	<	description="Runs all tests for jsr166e">
1447	<	</target>
1386	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1387
1388	<	<target name="jsr166edist"
1450	<	depends="jsr166edist-jar, jsr166edist-docs"
1451	<	description="Puts all distributable products in single hierarchy"/>
1452	<
1453	<
1454	<	<target name="jsr166eclean"
1455	<	description="Removes all jsr166e build products">
1388	>	<target name="jsr166eclean">
1389		<delete dir="${build.jsr166e.dir}"/>
1390		</target>
1391
1459	–
1392		<target name="jsr166edist-jar"
1393		depends="jsr166eclean, jsr166ejar">
1394		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1395		</target>
1396
1397	<	<target name="jsr166edist-docs"
1466	<	depends="jsr166eclean, jsr166edocs">
1397	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1398		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1399		</target>
1400
1401
1402		<!-- Find buglets that can be detected by static build tools -->
1403
1404	<	<target name="lint">
1405	<	<antcall target="dists">
1406	<	<param name="build.javadoc.access" value="public"/>
1407	<	</antcall>
1408	<	</target>
1404	>	<!--   <target name="lint"> -->
1405	>	<!--     <antcall target="dists"> -->
1406	>	<!--       <param name="build.javadoc.access" value="protected"/> -->
1407	>	<!--     </antcall> -->
1408	>	<!--   </target> -->
1409
1410		<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1411	<	<target name="lint-private">
1411	>	<target name="doclint-private">
1412		<antcall target="dist">
1413		<param name="build.javadoc.access" value="private"/>
1414		</antcall>
1415		</target>
1416
1417
1418	+	<!-- ==============================================================
1419	+	Experimental errorprone support - https://errorprone.info
1420	+	=================================================================== -->
1421	+	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1422	+	<property name="errorprone.jsr166.user.flags" value=""/>
1423	+	<property name="errorprone.jsr166.flags"
1424	+	value="-Xep:HashtableContains:OFF
1425	+	-Xep:JdkObsolete:OFF
1426	+	-Xep:MissingOverride:OFF
1427	+	-Xep:MissingFail:OFF
1428	+	-Xep:MixedArrayDimensions:ERROR
1429	+	-Xep:RemoveUnusedImports:ERROR
1430	+	-Xep:EmptyIf:ERROR
1431	+	-Xep:MultipleTopLevelClasses:ERROR
1432	+	-Xep:ClassName:ERROR
1433	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1434	+	-Xep:RedundantThrows:ERROR
1435	+	-Xep:IdentityBinaryExpression:WARN
1436	+	-Xep:MethodCanBeStatic:WARN
1437	+	${errorprone.jsr166.user.flags}"/>
1438	+	<!-- -Xep:WildcardImport:ERROR -->
1439	+	<property name="errorprone.jsr166.test.flags"
1440	+	value="-Xep:StringSplitter:OFF
1441	+	-Xep:BoxedPrimitiveConstructor:OFF
1442	+	-Xep:ModifyingCollectionWithItself:OFF"/>
1443	+	<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1444	+	<target name="errorprone"
1445	+	depends="clean, configure-compiler"
1446	+	description="Run errorprone over jsr166 source code (experimental)">
1447	+
1448	+	<local name="destdir"/>
1449	+	<property name="destdir" value="${build.classes.dir}/java.base"/>
1450	+	<mkdir dir="${destdir}"/>
1451	+
1452	+	<javac srcdir="${src.dir}"
1453	+	destdir="${destdir}"
1454	+	debug="${build.debug}"
1455	+	debuglevel="${build.debuglevel}"
1456	+	deprecation="${build.deprecation}"
1457	+	classpath=""
1458	+	includeAntRuntime="false"
1459	+	includeJavaRuntime="false"
1460	+	encoding="ASCII"
1461	+	executable="${build.main.javac}"
1462	+	fork="true">
1463	+
1464	+	<include name="**/*.java"/>
1465	+	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1466	+	<compilerarg value="-J--illegal-access=permit"/>
1467	+	<compilerarg value="-XDcompilePolicy=simple"/>
1468	+	<compilerarg line="-processorpath ${errorprone.jar}"/>
1469	+	<compilerarg value="-Xplugin:ErrorProne
1470	+	${errorprone.jsr166.flags}"/>
1471	+	<compilerarg value="--patch-module=java.base=${src.dir}"/>
1472	+	<compilerarg value="-Xprefer:source"/>
1473	+	<compilerarg value="-XDignore.symbol.file=true"/>
1474	+	<compilerarg value="-Xlint:all"/>
1475	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
1476	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1477	+	<compilerarg line="${build.args}"/>
1478	+	</javac>
1479	+
1480	+	<jar destfile="${product.jar}">
1481	+	<fileset dir="${destdir}"/>
1482	+	</jar>
1483	+
1484	+	<run-tck-tests
1485	+	target="${build.main.java.version}"
1486	+	workdir="${build.dir}"
1487	+	classes="${product.jar}">
1488	+	<javac-elements>
1489	+	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1490	+	<compilerarg value="-J--illegal-access=permit"/>
1491	+	<compilerarg value="-XDcompilePolicy=simple"/>
1492	+	<compilerarg line="-processorpath ${errorprone.jar}"/>
1493	+	<compilerarg value="-Xplugin:ErrorProne
1494	+	${errorprone.jsr166.flags}
1495	+	${errorprone.jsr166.test.flags}"/>
1496	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1497	+	</javac-elements>
1498	+	</run-tck-tests>
1499	+	</target>
1500	+
1501	+	<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1502	+	<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1503	+	<target name="errorprone-jtreg"
1504	+	depends="jar"
1505	+	description="Run errorprone over jtreg tests (experimental)">
1506	+
1507	+	<run-jtreg-tests
1508	+	target="${build.main.java.version}"
1509	+	workdir="${build.dir}"
1510	+	classes="${product.jar}"
1511	+	verbose="all">
1512	+	<jtreg-elements>
1513	+	<arg value="-javacoption:-XDcompilePolicy=simple"/>
1514	+	<arg value="-javacoption:-processorpath"/>
1515	+	<arg value="-javacoption:${errorprone.jar}"/>
1516	+	<arg value="-javacoption:-Xplugin:ErrorProne
1517	+	${errorprone.jsr166.flags}
1518	+	${errorprone.jsr166.test.flags}
1519	+	-Xep:MultipleTopLevelClasses:WARN
1520	+	-Xep:NonAtomicVolatileUpdate:OFF"/>
1521	+	</jtreg-elements>
1522	+	</run-jtreg-tests>
1523	+	</target>
1524	+
1525	+
1526	+	<!-- ==============================================================
1527	+	Running guava tests against jsr166 code
1528	+	=================================================================== -->
1529	+
1530	+	<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1531	+	<!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1532	+	<!-- <property name="guava.version" value="21.0"/> -->
1533	+
1534	+	<!-- HOWTO debug print a path id -->
1535	+	<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1536	+	<!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1537	+
1538	+	<!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1539	+	<!--   organisation="com.google.guava" module="guava-tests"/> -->
1540	+	<!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1541	+	<!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1542	+	<!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1543	+	<!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1544	+
1545	+	<!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1546	+	<!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1547	+	<!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1548	+	<!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1549	+
1550	+	<!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1551	+	<!--   type="*" inline="true" conf="*(private),*(public)" -->
1552	+	<!--   pattern="${guava.dir}/[artifact].[ext]" -->
1553	+	<!--   organisation="com.google.guava" module="guava-testlib"/> -->
1554	+
1555	+	<!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1556	+	<!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1557	+	<!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1558	+
1559	+	<target name="init-ivy">
1560	+	<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1561	+	dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1562	+	<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1563	+	classpath="${build.dir}/ivy.jar"/>
1564	+	</target>
1565	+
1566	+	<target name="guava-tests" depends="jar, init-ivy"
1567	+	description="Guava tests run against jsr166 collections">
1568	+	<property name="guava.dir" value="${build.dir}/guava-testlib"/>
1569	+	<mkdir dir="${guava.dir}"/>
1570	+	<ivy:retrieve pathid="guava.testlib.classpath"
1571	+	type="jar,bundle" inline="true" conf="default,master"
1572	+	pattern="${guava.dir}/[artifact].[ext]"
1573	+	organisation="com.google.guava" module="guava-testlib"/>
1574	+	<property name="guava.version" value="21.0"/>
1575	+	<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1576	+	dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1577	+	<junit printsummary="true" showoutput="true" haltonfailure="true"
1578	+	jvm="${build.main.java}" fork="true">
1579	+	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1580	+	<formatter type="brief"/>
1581	+	<classpath>
1582	+	<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1583	+	<path refid="guava.testlib.classpath"/>
1584	+	</classpath>
1585	+
1586	+	<!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1587	+	<test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1588	+	</junit>
1589	+	</target>
1590	+
1591		</project>

Diff Legend

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