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.170 by jsr166, Wed Sep 2 03:53:43 2015 UTC vs.
Revision 1.228 by jsr166, Sat Dec 17 22:28:20 2016 UTC

#	Line 1 | Line 1
1	<	<project name="jsr166" default="usage">
1	>	<project name="jsr166" default="usage"
2	>	xmlns:if="ant:if" xmlns:unless="ant:unless">
3
4		<description>
5		------------------------------------------------------------------------------
#	Line 6 | Line 7
7
8		Usage: ant [target]
9
10	+	See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
11	+	more details.
12	+
13		User-specific settings are read from user.properties.
14		See user.properties.sample for an explanation of some useful settings.
15
#	Line 26 | Line 30
30		(e.g. mercurial forest) or a symlink to same.
31
32		Alternatively, define ant variables thus:
33	<	ant -Djdk$N.home=...
33	>	ant -Djdk$N.home=... -Djdk$N.src.home=...
34		for $N in 6 7 8 9 ...
35	+
36	+	As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37	+	target is currently broken.
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" />
45		</java>
46		</target>
47
48	+	<!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
49
50		<!-- User-specific settings -->
51		<property file="user.properties"/>
#	Line 50 | Line 58
58		<property name="build.deprecation"    value="false"/>
59		<property name="build.javadoc.access" value="protected"/>
60
53	–	<!-- Tck options; see JSR166TestCase.java
54	–	To profile a single tck test class:
55	–	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
56	–	To stress test a single tck test class:
57	–	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
58	–	-->
59	–	<property name="jsr166.profileTests"     value="false"/>
60	–	<property name="jsr166.profileThreshold" value="100"/>
61	–	<property name="jsr166.runsPerTest"      value="1"/>
62	–	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63	–
61		<!-- Build locations -->
62		<property name="build.dir"                   location="build"/>
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"/>
69	–	<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 89 | 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"/>
97	<	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
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="${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="${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"/>
107		<local name="boot.jar.dir"/>
108	<	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
109	<	<path id="bootclasspath@{v}">
108	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
109	>	<path id="bootclasspath@{v}" unless:set="modules">
110		<pathelement path="${boot.jar.dir}/resources.jar"/>
111		<pathelement path="${boot.jar.dir}/rt.jar"/>
112		<pathelement path="${boot.jar.dir}/jsse.jar"/>
113		<pathelement path="${boot.jar.dir}/jce.jar"/>
114		<pathelement path="${boot.jar.dir}/charsets.jar"/>
115		</path>
116	<	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
116	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
117		</sequential>
118		</macrodef>
119
#	Line 129 | Line 139
139		<property name="test.src.dir"         location="${basedir}/src/test"/>
140		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
141		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
142	<	<property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
142	>	<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
143	>	<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
144	>	<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
145	>	<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
146		<property name="lib.dir"              location="${basedir}/lib"/>
147		<property name="dist.dir"             location="${basedir}/dist"/>
148		<property name="topsrc.dir"           location="${basedir}/src"/>
149		<property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150	+	<property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151		<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
#	Line 142 | Line 156
156		<!-- Javadoc locations -->
157		<property name="docs.dir"          location="${build.dir}/docs"/>
158		<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159	+	<property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160		<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161		<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162		<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
#	Line 149 | Line 164
164
165		<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166		<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167	+	<property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168		<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169		<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170		<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
#	Line 157 | Line 173
173		<!-- Jar locations -->
174		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175		<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176	+	<property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177		<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178		<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179		<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
#	Line 168 | Line 185
185		<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
186		<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
187		<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
188	<	<!-- The expected canonical location does not yet exist as of 2014-07 -->
188	>	<!-- The expected canonical location does not yet exist as of 2016-04 -->
189		<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
190	<	<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
190	>	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
191		<!-- Default jdk doc location (latest stable release seems best) -->
192		<property name="java.docroot.url"       value="${java8.docroot.url}"/>
193
#	Line 187 | Line 204
204		<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
205		classpath="${lib.dir}/jtreg.jar" />
206
207	<	<!-- Test classpath -->
208	<	<path id="test.classpath">
209	<	<pathelement location="${build.testcases.dir}"/>
210	<	<pathelement location="${junit.jar}"/>
211	<	</path>
212	<
207	>	<!-- Tck options; see JSR166TestCase.java
208	>	To profile a single tck test class:
209	>	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
210	>	To stress test a single tck test class:
211	>	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
212	>	To stress test a single tck test method:
213	>	ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
214	>	-->
215	>	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
216		<macrodef name="run-tck-tests">
217		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
218		<attribute name="target"/>
219		<attribute name="compile-target" default="@{target}"/>
220		<attribute name="workdir"/>
221		<attribute name="classes"/>
222	<	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
222	>	<!--
223	>	<attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
224	>	-->
225	>	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
226		<element name="javac-elements" optional="true"/>
227	+
228		<sequential>
229
230	+	<local name="modules"/>
231	+	<condition property="modules">
232	+	<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233	+	</condition>
234	+
235		<mkdir dir="@{workdir}/tck-classes"/>
236
237		<javac srcdir="@{tck.src.dir}"
#	Line 215 | Line 244
244		classpath="${junit.jar}"
245		includeAntRuntime="false"
246		includeJavaRuntime="false"
247	+	encoding="ASCII"
248		executable="${javac@{compile-target}}"
249		fork="true">
250
251		<include name="*.java"/>
252		<compilerarg value="-XDignore.symbol.file=true"/>
253	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
254	<	<compilerarg value="-Xbootclasspath/p:@{classes}"/>
253	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
254	>	<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
255	>	<compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
256		<compilerarg line="${build.args}"/>
257		<javac-elements/>
258
#	Line 231 | Line 262
262		failonerror="true"
263		jvm="${java@{target}}"
264		fork="true">
265	<	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
265	>	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266	>	<jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
267	>	<jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
268	>	<jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
269	>	<jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
270	>	<jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
271		<jvmarg line="@{jvmflags}"/>
272	+	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
273	+	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
274
275	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
276	<	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
275	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
276	>	<syspropertyset id="system-properties-used-by-tck">
277		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
278	+	<propertyref prefix="jsr166."/>
279	+	<propertyref name="test.timeout.factor"/>
280		</syspropertyset>
281
242	–	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243	–	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244	–	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
282		<classpath>
283		<pathelement location="${junit.jar}"/>
284		<pathelement location="@{workdir}/tck-classes"/>
#	Line 252 | Line 289
289		</macrodef>
290
291		<!-- Define jtreg test sets for different jdk versions -->
292	<	<fileset dir="${jtreg.src.dir}">
292	>	<fileset dir="${jtreg9.src.dir}">
293		<patternset id="jdk9.jtreg.tests">
294		<include name="**/*.java"/>
295		</patternset>
296		</fileset>
297
298	<	<fileset dir="${jtreg.src.dir}">
298	>	<fileset dir="${jtreg8.src.dir}">
299		<patternset id="jdk8.jtreg.tests">
300		<include name="**/*.java"/>
264	–	<exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
265	–	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
266	–	<exclude name="util/WeakHashMap/GCDuringIteration.java"/>
301		</patternset>
302		</fileset>
303
304	<	<fileset dir="${jtreg.src.dir}">
304	>	<fileset dir="${jtreg7.src.dir}">
305		<patternset id="jdk7.jtreg.tests">
306		<include name="**/*.java"/>
273	–	<exclude name="util/Collection/CollectionDefaults.java"/>
274	–	<exclude name="util/List/ListDefaults.java"/>
275	–	<exclude name="util/Spliterator/**/*.java"/>
276	–	<exclude name="**/CompletableFuture/**/*.java"/>
277	–	<exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
278	–	<exclude name="**/StampedLock/**/*.java"/>
279	–	<exclude name="**/AtomicReferenceTest.java"/>
280	–	<exclude name="util/concurrent/atomic/Serial.java"/>
307		</patternset>
308		</fileset>
309
310	+	<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
311	+	<property name="jtreg.flags" value=""/>
312	+
313		<macrodef name="run-jtreg-tests">
314	<	<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
286	<	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
314	>	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
315		<attribute name="source" default="7"/>
316		<attribute name="target"/>
317		<attribute name="workdir"/>
318		<attribute name="classes"/>
319		<attribute name="jtregflags" default=""/>
320	+
321		<sequential>
322	+
323	+	<!-- ant -Djtreg.verbose=time,fail,error jtreg -->
324	+	<property name="jtreg.verbose" value="nopass,fail,error"/>
325	+
326	+	<local name="modules"/>
327	+	<condition property="modules">
328	+	<available file="${jdk@{target}.home}/jmods" type="dir"/>
329	+	</condition>
330	+
331		<delete dir="@{workdir}/JTwork"   quiet="true"/>
332	<	<delete dir="@{workdir}/JTreport" quiet="true"/>
295	<	<mkdir dir="@{workdir}/JTwork/scratch"/>
296	<	<mkdir dir="@{workdir}/JTreport"/>
297	<	<jtreg dir="@{jtreg.src.dir}"
332	>	<jtreg dir="${jtreg@{target}.src.dir}"
333		jdk="${jdk@{target}.home}"
334	<	workDir="@{workdir}/JTwork"
300	<	reportDir="@{workdir}/JTreport">
334	>	workDir="@{workdir}/JTwork">
335		<patternset refid="jdk@{target}.jtreg.tests"/>
336	<	<arg value="-Xbootclasspath/p:@{classes}"/>
336	>	<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
337	>	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
338	>	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
339		<arg value="-agentvm"/>
340	<	<arg value="-v:nopass,fail"/>
340	>	<arg value="-noreport"/>
341	>	<arg value="-verbose:${jtreg.verbose}"/>
342		<arg value="-vmoptions:-esa -ea"/>
343		<arg value="-automatic"/>
344		<arg value="-k:!ignore"/>
345		<arg line="@{jtregflags}"/>
346	+	<arg line="${jtreg.flags}"/>
347		</jtreg>
348		</sequential>
349		</macrodef>
#	Line 325 | Line 363
363		<property name="build.main.javac" value="${javac9}"/>
364
365		<target name="dists"
366	<	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
366	>	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
367		description="Builds all public jars and docs"/>
368
369		<target name="compile"
370		depends="configure-compiler"
371		description="Compiles src/main sources to build dir">
372
373	<	<mkdir dir="${build.classes.dir}"/>
373	>	<local name="modules"/>
374	>	<condition property="modules">
375	>	<and>
376	>	<available file="${jdk9.home}/jmods" type="dir"/>
377	>	<equals arg1="9" arg2="${build.main.java.version}"/>
378	>	</and>
379	>	</condition>
380	>
381	>	<local name="destdir"/>
382	>	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
383	>	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
384	>
385	>	<mkdir dir="${destdir}"/>
386
387		<javac srcdir="${src.dir}"
388	<	destdir="${build.classes.dir}"
388	>	destdir="${destdir}"
389		debug="${build.debug}"
390		debuglevel="${build.debuglevel}"
391		deprecation="${build.deprecation}"
392		classpath=""
393		includeAntRuntime="false"
394		includeJavaRuntime="false"
395	+	encoding="ASCII"
396		executable="${build.main.javac}"
397		fork="true">
398
399		<include name="**/*.java"/>
400	+	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
401		<compilerarg value="-Xprefer:source"/>
402		<compilerarg value="-XDignore.symbol.file=true"/>
403		<compilerarg value="-Xlint:all"/>
#	Line 360 | Line 412
412
413		<target name="jar"
414		depends="compile"
415	<	description="Builds library jar from compiled sources">
416	<
415	>	description="Builds library jar for src/main from compiled sources">
416	>	<local name="subdir"/>
417	>	<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
418		<jar destfile="${product.jar}">
419	<	<fileset dir="${build.classes.dir}"/>
419	>	<fileset dir="${build.classes.dir}${subdir}"/>
420	>	<manifest>
421	>	<attribute name="Built-By" value="${user.name}"/>
422	>	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
423	>	</manifest>
424		</jar>
425		</target>
426
#	Line 377 | Line 434
434		<!-- the packagenames="none" hack below prevents scanning the -->
435		<!-- sourcepath for packages -->
436
437	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
438	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
439	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
440	+	<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
441	+	<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
442		<javadoc destdir="${docs.dir}"
443		packagenames="none"
444		link="${java9.api.url}"
445		overview="${src.dir}/intro.html"
446		access="${build.javadoc.access}"
447	<	sourcepath="${src.dir}:${jdk9src.dir}"
447	>	sourcepath="${src.dir}"
448		classpath=""
449		executable="${javadoc9}">
450		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 391 | Line 453
453		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
454		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
455		<arg value="-XDignore.symbol.file=true"/>
456	+	<arg value="-Xmodule:java.base"/>
457		<arg value="-tag"/>
458		<arg value="${javadoc.jls.option}"/>
459	+	<!-- @apiNote currently unused -->
460	+	<!--       <arg value="-tag"/> -->
461	+	<!--       <arg value="apiNote:a:API Note:"/> -->
462		<arg value="-tag"/>
463	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
463	>	<arg value="implSpec:a:Implementation Requirements:"/>
464		<arg value="-tag"/>
465	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
466	<	<arg value="-tag"/>
467	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
465	>	<arg value="implNote:a:Implementation Note:"/>
466	>	<!-- tags added in jdk9: currently unused -->
467	>	<!--       <arg value="-tag"/> -->
468	>	<!--       <arg value="revised:X"/> -->
469	>	<!--       <arg value="-tag"/> -->
470	>	<!--       <arg value="spec:X"/> -->
471		</javadoc>
472		</target>
473
#	Line 422 | Line 491
491		<exclude name="src/emulation/**"/>
492		<exclude name="**/SyntaxTest.java"/>
493		<exclude name="**/SuperfluousAbstract.java"/>
494	+	<manifest>
495	+	<attribute name="Built-By" value="${user.name}"/>
496	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
497	+	</manifest>
498		</jar>
499		</target>
500
#	Line 453 | Line 526
526		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
527		</target>
528
529	<	<target name="tck" depends="test-tck" description="alias for test-tck"/>
457	<	<target name="test-tck"
529	>	<target name="tck"
530		depends="jar"
531	<	description="Runs tck tests for main directly">
531	>	description="Runs tck tests for src/main directly">
532
533		<run-tck-tests
534		target="${build.main.java.version}"
#	Line 464 | Line 536
536		classes="${product.jar}"/>
537		</target>
538
539	<	<target name="test-tck-parallelism-1"
540	<	description="Runs test-tck with given common pool parallelism">
541	<	<antcall target="test-tck">
539	>	<target name="tck-parallelism-1"
540	>	description="Runs tck with common pool parallelism 1">
541	>	<antcall target="tck">
542		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
543		</antcall>
544		</target>
545
546	<	<target name="test-tck-parallelism-0"
547	<	description="Runs test-tck with given common pool parallelism">
548	<	<antcall target="test-tck">
546	>	<target name="tck-parallelism-0"
547	>	description="Runs tck with common pool parallelism 0">
548	>	<antcall target="tck">
549		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
550		</antcall>
551		</target>
552
553	<	<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
554	<	<target name="test-jtreg"
553	>	<target name="tck-security-manager"
554	>	description="Runs tck with a security manager">
555	>	<antcall target="tck">
556	>	<param name="jsr166.useSecurityManager" value="true"/>
557	>	</antcall>
558	>	</target>
559	>
560	>	<target name="jtreg"
561		depends="jar"
562	<	description="Runs jtreg tests for main using the jtreg ant task">
562	>	description="Runs jtreg tests for src/main using the jtreg ant task">
563		<run-jtreg-tests
564		target="${build.main.java.version}"
565		workdir="${build.dir}"
#	Line 489 | Line 567
567		</target>
568
569		<target name="test"
570	<	depends="test-tck, test-tck-parallelism-1, test-jtreg"
571	<	description="Runs tck and jtreg tests for main">
570	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
571	>	description="Runs tck and jtreg tests for src/main">
572		</target>
573
574	<	<target name="jtreg8" description="Runs jtreg tests with jdk8">
574	>	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
575
576	<	<antcall target="jtreg">
577	<	<param name="build.main.java.version" value="8"/>
578	<	<param name="build.main.javac" value="${javac8}"/>
579	<	</antcall>
576	>	<!--     <antcall target="jtreg"> -->
577	>	<!--       <param name="build.main.java.version" value="8"/> -->
578	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
579	>	<!--     </antcall> -->
580
581	<	</target>
581	>	<!--   </target> -->
582
583	<	<target name="test89"
584	<	description="Runs tck and jtreg tests for main for multiple java versions">
583	>	<!--   <target name="test89" -->
584	>	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
585
586	<	<antcall target="clean"/>
587	<	<antcall target="test">
588	<	<param name="build.main.java.version" value="8"/>
589	<	<param name="build.main.javac" value="${javac8}"/>
590	<	</antcall>
586	>	<!--     <antcall target="clean"/> -->
587	>	<!--     <antcall target="test"> -->
588	>	<!--       <param name="build.main.java.version" value="8"/> -->
589	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
590	>	<!--     </antcall> -->
591
592	<	<antcall target="clean"/>
593	<	<antcall target="test">
594	<	<param name="build.main.java.version" value="9"/>
595	<	<param name="build.main.javac" value="${javac9}"/>
596	<	</antcall>
592	>	<!--     <antcall target="clean"/> -->
593	>	<!--     <antcall target="test"> -->
594	>	<!--       <param name="build.main.java.version" value="9"/> -->
595	>	<!--       <param name="build.main.javac" value="${javac9}"/> -->
596	>	<!--     </antcall> -->
597
598	<	</target>
598	>	<!--   </target> -->
599
600
601
602		<target name="configure-compiler">
603	+	<fail message="ant version too old">
604	+	<condition>
605	+	<not> <antversion atleast="1.9.1"/> </not>
606	+	</condition>
607	+	</fail>
608
609		<property name="unchecked.option" value="-Xlint:unchecked"/>
610
#	Line 542 | Line 625
625		<!-- Various demos and test programs -->
626
627
628	<	<target name="loops" depends="configure-compiler"
629	<	description="Benchmark from Doug Lea's AQS paper">
628	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
629	>	<target name="loops" depends="configure-compiler">
630
631		<mkdir dir="${build.loops.dir}"/>
632
#	Line 553 | Line 636
636		debuglevel="${build.debuglevel}"
637		deprecation="${build.deprecation}"
638		source="${build.sourcelevel}"
639	+	target="${build.sourcelevel}"
640	+	encoding="ASCII"
641		fork="true">
642
643		<compilerarg line="${build.args}"/>
#	Line 580 | Line 665
665		deprecation="${build.deprecation}"
666		includeAntRuntime="false"
667		includeJavaRuntime="false"
668	+	encoding="ASCII"
669		executable="${javac9}"
670		fork="true">
671
#	Line 594 | Line 680
680		</target>
681
682
683	+	<!-- jsr166 4jdk8 -->
684	+
685	+	<target name="4jdk8compile"
686	+	depends="configure-compiler"
687	+	description="Compiles src/jdk8 sources, targeting jdk8">
688	+
689	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
690	+
691	+	<javac srcdir="${4jdk8src.dir}"
692	+	destdir="${build.4jdk8.classes.dir}"
693	+	debug="${build.debug}"
694	+	debuglevel="${build.debuglevel}"
695	+	deprecation="${build.deprecation}"
696	+	source="8"
697	+	target="8"
698	+	classpath=""
699	+	bootclasspath="${bootclasspath8}"
700	+	includeAntRuntime="false"
701	+	includeJavaRuntime="false"
702	+	encoding="ASCII"
703	+	executable="${javac8}"
704	+	fork="true">
705	+
706	+	<include name="**/*.java"/>
707	+	<compilerarg value="-Xprefer:source"/>
708	+	<compilerarg value="-XDignore.symbol.file=true"/>
709	+	<compilerarg value="-Xlint:all"/>
710	+	<compilerarg value="-Werror"/>
711	+	<compilerarg line="${build.args}"/>
712	+
713	+	</javac>
714	+	</target>
715	+
716	+	<target name="4jdk8doclint"
717	+	depends="configure-compiler"
718	+	description="Finds doclint warnings">
719	+
720	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
721	+
722	+	<javac srcdir="${4jdk8src.dir}"
723	+	destdir="${build.4jdk8.classes.dir}"
724	+	debug="${build.debug}"
725	+	debuglevel="${build.debuglevel}"
726	+	deprecation="${build.deprecation}"
727	+	source="8"
728	+	target="8"
729	+	classpath=""
730	+	bootclasspath="${bootclasspath8}"
731	+	includeAntRuntime="false"
732	+	includeJavaRuntime="false"
733	+	encoding="ASCII"
734	+	executable="${javac8}"
735	+	fork="true">
736	+
737	+	<include name="**/*.java"/>
738	+	<compilerarg value="-Xprefer:source"/>
739	+	<compilerarg value="-XDignore.symbol.file=true"/>
740	+	<compilerarg value="-Xlint:all"/>
741	+	<compilerarg value="-Xdoclint:all/protected"/>
742	+	<compilerarg line="${build.args}"/>
743	+
744	+	</javac>
745	+	</target>
746	+
747	+
748	+	<target name="4jdk8jar"
749	+	depends="4jdk8compile"
750	+	description="Builds library jar from compiled sources">
751	+
752	+	<jar destfile="${4jdk8product.jar}">
753	+	<fileset dir="${build.4jdk8.classes.dir}"/>
754	+	<manifest>
755	+	<attribute name="Built-By" value="${user.name}"/>
756	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
757	+	</manifest>
758	+	</jar>
759	+
760	+	</target>
761	+
762	+
763	+	<target name="4jdk8-tck"
764	+	depends="4jdk8jar"
765	+	description="Runs tck tests for jsr166-4jdk8 directly">
766	+
767	+	<run-tck-tests
768	+	target="8"
769	+	workdir="${build.4jdk8.dir}"
770	+	classes="${4jdk8product.jar}">
771	+	<javac-elements>
772	+	<!-- JDK9+ test classes -->
773	+	<exclude name="*9Test.java"/>
774	+	<exclude name="*10Test.java"/>
775	+	</javac-elements>
776	+	</run-tck-tests>
777	+	</target>
778	+
779	+
780	+	<target name="4jdk8-jtreg"
781	+	depends="4jdk8jar"
782	+	description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
783	+	<run-jtreg-tests
784	+	target="8"
785	+	workdir="${build.4jdk8.dir}"
786	+	classes="${4jdk8product.jar}"/>
787	+	</target>
788	+
789	+
790	+	<target name="4jdk8-test"
791	+	depends="4jdk8-tck, 4jdk8-jtreg"
792	+	description="Runs tck and jtreg tests for jsr166-4jdk8">
793	+	</target>
794	+
795	+
796	+	<target name="4jdk8docs"
797	+	description="Builds javadocs for src/jdk8 to dist dir">
798	+
799	+	<delete dir="${4jdk8docs.dir}"/>
800	+	<mkdir dir="${4jdk8docs.dir}"/>
801	+
802	+	<javadoc destdir="${4jdk8docs.dir}"
803	+	packagenames="none"
804	+	link="${java8.api.url}"
805	+	overview="${4jdk8src.dir}/intro.html"
806	+	access="${build.javadoc.access}"
807	+	sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
808	+	classpath=""
809	+	executable="${javadoc8}"
810	+	failonerror = "true">
811	+	<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
812	+	<include name="**/*.java"/>
813	+	</fileset>
814	+	<arg line="-Xdocrootparent ${java8.docroot.url}"/>
815	+	<arg value="-XDignore.symbol.file=true"/>
816	+	<arg value="-tag"/>
817	+	<arg value="${javadoc.jls.option}"/>
818	+	<!-- @apiNote currently unused -->
819	+	<!--       <arg value="-tag"/> -->
820	+	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
821	+	<arg value="-tag"/>
822	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
823	+	<arg value="-tag"/>
824	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
825	+	</javadoc>
826	+	</target>
827	+
828	+
829	+	<target name="4jdk8dist"
830	+	depends="4jdk8dist-jar, 4jdk8dist-docs"
831	+	description="Puts all distributable products in single hierarchy"/>
832	+
833	+
834	+	<target name="4jdk8clean"
835	+	description="Removes all 4jdk8 build products">
836	+
837	+	<delete dir="${build.4jdk8.dir}"/>
838	+
839	+	</target>
840	+
841	+
842	+	<target name="4jdk8dist-jar"
843	+	depends="4jdk8clean, 4jdk8jar">
844	+	<copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
845	+	</target>
846	+
847	+
848	+	<target name="4jdk8dist-docs"
849	+	depends="4jdk8clean, 4jdk8docs">
850	+	<mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
851	+	</target>
852	+
853	+
854	+
855		<!-- jsr166 4jdk7 -->
856
857		<target name="4jdk7compile"
#	Line 608 | Line 866
866		debuglevel="${build.debuglevel}"
867		deprecation="${build.deprecation}"
868		source="6"
869	+	target="6"
870		classpath=""
871		bootclasspath="${bootclasspath6}"
872		includeAntRuntime="false"
873		includeJavaRuntime="false"
874	+	encoding="ASCII"
875		executable="${javac7}"
876		fork="true">
877
#	Line 637 | Line 897
897		debuglevel="${build.debuglevel}"
898		deprecation="${build.deprecation}"
899		source="6"
900	+	target="6"
901		classpath=""
902	<	bootclasspath="${bootclasspath7}"
902	>	bootclasspath="${bootclasspath6}"
903		includeAntRuntime="false"
904		includeJavaRuntime="false"
905	+	encoding="ASCII"
906		executable="${javac8}"
907		fork="true">
908
#	Line 661 | Line 923
923
924		<jar destfile="${4jdk7product.jar}">
925		<fileset dir="${build.4jdk7.classes.dir}"/>
926	+	<manifest>
927	+	<attribute name="Built-By" value="${user.name}"/>
928	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
929	+	</manifest>
930		</jar>
931
932		</target>
933
934
935	<	<target name="4jdk7-test-tck"
935	>	<target name="4jdk7-tck"
936		depends="4jdk7jar"
937		description="Runs tck tests for jsr166-4jdk7 directly">
938
#	Line 678 | Line 944
944		<!-- JDK8+ test classes -->
945		<exclude name="*8Test.java"/>
946		<exclude name="*9Test.java"/>
947	+	<exclude name="*10Test.java"/>
948		<exclude name="DoubleAccumulatorTest.java"/>
949		<exclude name="DoubleAdderTest.java"/>
950		<exclude name="LongAccumulatorTest.java"/>
#	Line 685 | Line 952
952		<exclude name="CompletableFutureTest.java"/>
953		<exclude name="SplittableRandomTest.java"/>
954		<exclude name="StampedLockTest.java"/>
955	+	<exclude name="SubmissionPublisherTest.java"/>
956		</javac-elements>
957		</run-tck-tests>
958		</target>
959
960
961	<	<target name="4jdk7-test-tck-junit"
962	<	depends="4jdk7compile"
963	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
961	>	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
962	>	<target name="4jdk7-tck-junit"
963	>	depends="4jdk7compile">
964
965		<junit printsummary="true"
966		showoutput="true"
#	Line 718 | Line 986
986		</junit>
987		</target>
988
989	<	<target name="4jdk7-test-jtreg"
989	>	<target name="4jdk7-jtreg"
990		depends="4jdk7jar"
991		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
992		<run-jtreg-tests
#	Line 729 | Line 997
997
998
999		<target name="4jdk7-test"
1000	<	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
1000	>	depends="4jdk7-tck, 4jdk7-jtreg"
1001		description="Runs tck and jtreg tests for jsr166-4jdk7">
1002		</target>
1003
#	Line 745 | Line 1013
1013		link="${java7.api.url}"
1014		overview="${4jdk7src.dir}/intro.html"
1015		access="${build.javadoc.access}"
1016	<	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
1016	>	sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1017		classpath=""
1018	<	executable="${javadoc7}">
1018	>	executable="${javadoc7}"
1019	>	failonerror = "true">
1020		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1021		<include name="**/*.java"/>
1022		</fileset>
#	Line 798 | Line 1067
1067		classpath=""
1068		bootclasspath="${bootclasspath6}"
1069		source="5"
1070	+	target="5"
1071		includeAntRuntime="false"
1072		includeJavaRuntime="false"
1073	+	encoding="ASCII"
1074		executable="${javac7}"
1075		fork="true">
1076
#	Line 819 | Line 1090
1090
1091		<jar destfile="${jsr166x.jar}">
1092		<fileset dir="${build.jsr166x.classes.dir}"/>
1093	+	<manifest>
1094	+	<attribute name="Built-By" value="${user.name}"/>
1095	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1096	+	</manifest>
1097		</jar>
1098
1099		</target>
#	Line 834 | Line 1109
1109		packagenames="jsr166x.*"
1110		link="${java.api.url}"
1111		access="${build.javadoc.access}"
1112	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1112	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1113		bootclasspath="${bootclasspath6}"
1114		source="5"
1115	<	executable="${javadoc7}">
1115	>	executable="${javadoc7}"
1116	>	failonerror = "true">
1117		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1118		<arg value="-XDignore.symbol.file=true"/>
1119
#	Line 883 | Line 1159
1159		debuglevel="${build.debuglevel}"
1160		deprecation="${build.deprecation}"
1161		source="6"
1162	+	target="6"
1163		classpath=""
1164		bootclasspath="${bootclasspath6}"
1165		includeAntRuntime="false"
1166		includeJavaRuntime="false"
1167	+	encoding="ASCII"
1168		executable="${javac7}"
1169		fork="true">
1170
#	Line 906 | Line 1184
1184
1185		<jar destfile="${jsr166y.jar}" index="true">
1186		<fileset dir="${build.jsr166y.classes.dir}"/>
1187	+	<manifest>
1188	+	<attribute name="Built-By" value="${user.name}"/>
1189	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1190	+	</manifest>
1191		</jar>
1192
1193		</target>
#	Line 921 | Line 1203
1203		packagenames="jsr166y.*"
1204		link="${java.api.url}"
1205		access="${build.javadoc.access}"
1206	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1206	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1207		bootclasspath="${bootclasspath6}"
1208		source="6"
1209	<	executable="${javadoc7}">
1209	>	executable="${javadoc7}"
1210	>	failonerror = "true">
1211		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1212		<arg value="-XDignore.symbol.file=true"/>
1213
#	Line 973 | Line 1256
1256		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1257		classpath=""
1258		source="6"
1259	+	target="6"
1260		includeAntRuntime="false"
1261		includeJavaRuntime="false"
1262	+	encoding="ASCII"
1263		executable="${javac7}"
1264		fork="true">
1265
#	Line 994 | Line 1279
1279
1280		<jar destfile="${extra166y.jar}" index="true">
1281		<fileset dir="${build.extra166y.classes.dir}"/>
1282	+	<manifest>
1283	+	<attribute name="Built-By" value="${user.name}"/>
1284	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1285	+	</manifest>
1286		</jar>
1287
1288		</target>
#	Line 1009 | Line 1298
1298		packagenames="extra166y.*"
1299		link="${java.api.url}"
1300		access="${build.javadoc.access}"
1301	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1301	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1302		bootclasspath="${bootclasspath6}"
1303		source="6"
1304		executable="${javadoc7}">
#	Line 1060 | Line 1349
1349		debuglevel="${build.debuglevel}"
1350		deprecation="${build.deprecation}"
1351		source="${build.jsr166e.java.version}"
1352	+	target="${build.jsr166e.java.version}"
1353		classpath=""
1354		includeAntRuntime="false"
1355		includeJavaRuntime="false"
#	Line 1086 | Line 1376
1376		debuglevel="${build.debuglevel}"
1377		deprecation="${build.deprecation}"
1378		source="${build.jsr166e.java.version}"
1379	+	target="${build.jsr166e.java.version}"
1380		classpath=""
1381	<	bootclasspath="${bootclasspath7}"
1381	>	bootclasspath="${bootclasspath6}"
1382		includeAntRuntime="false"
1383		includeJavaRuntime="false"
1384		executable="${javac8}"
#	Line 1109 | Line 1400
1400
1401		<jar destfile="${jsr166e.jar}" index="true">
1402		<fileset dir="${build.jsr166e.classes.dir}"/>
1403	+	<manifest>
1404	+	<attribute name="Built-By" value="${user.name}"/>
1405	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1406	+	</manifest>
1407		</jar>
1408
1409		</target>
#	Line 1124 | Line 1419
1419		packagenames="jsr166e.*"
1420		link="${java.api.url}"
1421		access="${build.javadoc.access}"
1422	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1422	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1423		source="${build.jsr166e.java.version}"
1424	<	executable="${javadoc7}">
1424	>	executable="${javadoc7}"
1425	>	failonerror = "true">
1426		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1427		<arg value="-XDignore.symbol.file=true"/>
1428
#	Line 1134 | Line 1430
1430		</target>
1431
1432
1433	<	<target name="jsr166e-test-tck-one-java-version"
1433	>	<target name="jsr166e-tck-one-java-version"
1434		depends="jsr166ejar">
1435
1436		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
#	Line 1146 | Line 1442
1442		classes="${jsr166e.jar}"/>
1443		</target>
1444
1445	<	<target name="jsr166e-test-tck"
1445	>	<target name="jsr166e-tck"
1446		description="Runs tck tests for jsr166e for multiple java versions">
1447
1448		<!--     <antcall target="clean"/> -->
1449	<	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1449	>	<!--     <antcall target="jsr166e-tck-one-java-version"> -->
1450		<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1451		<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1452		<!--     </antcall> -->
1453
1454		<antcall target="clean"/>
1455	<	<antcall target="jsr166e-test-tck-one-java-version">
1455	>	<antcall target="jsr166e-tck-one-java-version">
1456		<param name="build.jsr166e.java.version" value="7"/>
1457		<param name="build.jsr166e.javac" value="${javac7}"/>
1458		</antcall>
1459
1460		<antcall target="clean"/>
1461	<	<antcall target="jsr166e-test-tck-one-java-version">
1461	>	<antcall target="jsr166e-tck-one-java-version">
1462		<param name="build.jsr166e.java.version" value="6"/>
1463		<param name="build.jsr166e.javac" value="${javac6}"/>
1464		</antcall>
#	Line 1170 | Line 1466
1466
1467
1468		<target name="jsr166e-test"
1469	<	depends="jsr166e-test-tck"
1469	>	depends="jsr166e-tck"
1470		description="Runs all tests for jsr166e">
1471		</target>
1472

Diff Legend

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