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.132 by jsr166, Fri Feb 1 21:58:27 2013 UTC vs.
Revision 1.173 by jsr166, Thu Sep 3 01:24:31 2015 UTC

#	Line 16 | Line 16
16		$HOME/jdk/jdk6
17		$HOME/jdk/jdk7
18		$HOME/jdk/jdk8
19	+	$HOME/jdk/jdk9
20		where each of the above is a JDK or a symlink to same, and
21		$HOME/jdk/src/jdk6
22		$HOME/jdk/src/jdk7
23		$HOME/jdk/src/jdk8
24	+	$HOME/jdk/src/jdk9
25		where each of the above is a complete JDK source tree
26		(e.g. mercurial forest) or a symlink to same.
27	<	As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
27	>
28	>	Alternatively, define ant variables thus:
29	>	ant -Djdk$N.home=...
30	>	for $N in 6 7 8 9 ...
31		------------------------------------------------------------------------------
32		</description>
33
34	<	<target name="usage" description="Display main targets by running 'ant -projecthelp'">
34	>	<!-- Display main targets by running 'ant -projecthelp' -->
35	>	<target name="usage">
36		<java classname="org.apache.tools.ant.Main">
37		<arg value="-projecthelp" />
38		</java>
#	Line 44 | Line 50 | As of 2013-02, the very latest lambda 8
50		<property name="build.deprecation"    value="false"/>
51		<property name="build.javadoc.access" value="protected"/>
52
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	+
64		<!-- Build locations -->
65		<property name="build.dir"                   location="build"/>
66		<property name="build.classes.dir"           location="${build.dir}/classes"/>
#	Line 105 | Line 122 | As of 2013-02, the very latest lambda 8
122		<defjdklocations v="6"/>
123		<defjdklocations v="7"/>
124		<defjdklocations v="8"/>
125	+	<defjdklocations v="9"/>
126
127		<!-- Source locations -->
128		<property name="src.dir"              location="${basedir}/src/main"/>
129		<property name="test.src.dir"         location="${basedir}/src/test"/>
130		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
131		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
132	<	<property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
132	>	<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
133	>	<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
134	>	<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
135	>	<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
136		<property name="lib.dir"              location="${basedir}/lib"/>
137		<property name="dist.dir"             location="${basedir}/dist"/>
138		<property name="topsrc.dir"           location="${basedir}/src"/>
#	Line 145 | Line 166 | As of 2013-02, the very latest lambda 8
166		<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
167		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
168
169	<	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
170	<	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
171	<	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
172	<	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
173	<
174	<	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
175	<	<!-- The below does not yet exist as of 2013-01 -->
176	<	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
169	>	<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
170	>	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
171	>	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
172	>	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
173	>	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
174	>	<!-- The expected canonical location does not yet exist as of 2014-07 -->
175	>	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
176	>	<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
177	>	<!-- Default jdk doc location (latest stable release seems best) -->
178	>	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
179
180	<	<!-- Default jdk api doc location (latest stable release seems best) -->
181	<	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
180	>	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
181	>	<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
182	>	<property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
183	>	<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
184	>	<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
185	>	<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
186	>	<property name="java.api.url"       value="${java.docroot.url}/api/"/>
187
188		<!-- Define the "jtreg" task -->
189		<!-- See the docs in "jtreg -onlineHelp" -->
#	Line 170 | Line 198 | As of 2013-02, the very latest lambda 8
198
199		<macrodef name="run-tck-tests">
200		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
173	–	<attribute name="source" default="6"/>
201		<attribute name="target"/>
202	+	<attribute name="compile-target" default="@{target}"/>
203		<attribute name="workdir"/>
204		<attribute name="classes"/>
205	<	<attribute name="jvmflags" default=""/>
205	>	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
206		<element name="javac-elements" optional="true"/>
207		<sequential>
208
#	Line 185 | Line 213 | As of 2013-02, the very latest lambda 8
213		debug="${build.debug}"
214		debuglevel="${build.debuglevel}"
215		deprecation="${build.deprecation}"
216	<	source="@{source}"
216	>	source="@{compile-target}"
217	>	target="@{compile-target}"
218		classpath="${junit.jar}"
190	–	bootclasspath="@{classes}:${bootclasspath@{source}}"
219		includeAntRuntime="false"
220		includeJavaRuntime="false"
221	<	executable="${javac@{target}}"
221	>	executable="${javac@{compile-target}}"
222		fork="true">
223
224		<include name="*.java"/>
225		<compilerarg value="-XDignore.symbol.file=true"/>
226		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
227	+	<compilerarg value="-Xbootclasspath/p:@{classes}"/>
228		<compilerarg line="${build.args}"/>
229		<javac-elements/>
230
231		</javac>
232
233	<	<java classname="JSR166TestCase"
233	>	<java classname="${jsr166.tckTestClass}"
234		failonerror="true"
235		jvm="${java@{target}}"
236		fork="true">
237		<jvmarg value="-Xbootclasspath/p:@{classes}"/>
238		<jvmarg line="@{jvmflags}"/>
239	+
240	+	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
241	+	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
242	+	<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
243	+	</syspropertyset>
244	+
245	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
246	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
247	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
248		<classpath>
249		<pathelement location="${junit.jar}"/>
250		<pathelement location="@{workdir}/tck-classes"/>
#	Line 216 | Line 254 | As of 2013-02, the very latest lambda 8
254		</sequential>
255		</macrodef>
256
257	+	<!-- Define jtreg test sets for different jdk versions -->
258	+	<fileset dir="${jtreg9.src.dir}">
259	+	<patternset id="jdk9.jtreg.tests">
260	+	<include name="**/*.java"/>
261	+	</patternset>
262	+	</fileset>
263	+
264	+	<fileset dir="${jtreg8.src.dir}">
265	+	<patternset id="jdk8.jtreg.tests">
266	+	<include name="**/*.java"/>
267	+	<exclude name="**/SpliteratorCharacteristics.java"/>
268	+	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
269	+	<exclude name="**/GCDuringIteration.java"/>
270	+	</patternset>
271	+	</fileset>
272	+
273	+	<fileset dir="${jtreg7.src.dir}">
274	+	<patternset id="jdk7.jtreg.tests">
275	+	<include name="**/*.java"/>
276	+	</patternset>
277	+	</fileset>
278	+
279	+	<macrodef name="run-jtreg-tests">
280	+	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
281	+	<attribute name="source" default="7"/>
282	+	<attribute name="target"/>
283	+	<attribute name="workdir"/>
284	+	<attribute name="classes"/>
285	+	<attribute name="jtregflags" default=""/>
286	+	<sequential>
287	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
288	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
289	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
290	+	<mkdir dir="@{workdir}/JTreport"/>
291	+	<jtreg dir="${jtreg@{target}.src.dir}"
292	+	jdk="${jdk@{target}.home}"
293	+	workDir="@{workdir}/JTwork"
294	+	reportDir="@{workdir}/JTreport">
295	+	<patternset refid="jdk@{target}.jtreg.tests"/>
296	+	<arg value="-Xbootclasspath/p:@{classes}"/>
297	+	<arg value="-agentvm"/>
298	+	<arg value="-v:nopass,fail"/>
299	+	<arg value="-vmoptions:-esa -ea"/>
300	+	<arg value="-automatic"/>
301	+	<arg value="-k:!ignore"/>
302	+	<arg line="@{jtregflags}"/>
303	+	</jtreg>
304	+	</sequential>
305	+	</macrodef>
306	+
307		<!-- ALoops classpath -->
308		<path id="loops.classpath">
309		<pathelement location="${build.loops.dir}"/>
#	Line 227 | Line 315 | As of 2013-02, the very latest lambda 8
315
316		<!-- Main targets -->
317
318	+	<property name="build.main.java.version" value="9"/>
319	+	<property name="build.main.javac" value="${javac9}"/>
320	+
321		<target name="dists"
322		depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
323		description="Builds all public jars and docs"/>
#	Line 245 | Line 336 | As of 2013-02, the very latest lambda 8
336		classpath=""
337		includeAntRuntime="false"
338		includeJavaRuntime="false"
339	<	executable="${javac8}"
339	>	executable="${build.main.javac}"
340		fork="true">
341
342		<include name="**/*.java"/>
343	+	<compilerarg value="-Xprefer:source"/>
344		<compilerarg value="-XDignore.symbol.file=true"/>
345		<compilerarg value="-Xlint:all"/>
346	+	<compilerarg value="-Werror"/>
347	+	<compilerarg value="-Xdoclint:all/protected"/>
348	+	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
349		<compilerarg line="${build.args}"/>
350
351		</javac>
#	Line 267 | Line 362 | As of 2013-02, the very latest lambda 8
362		</target>
363
364
270	–	<target name="test"
271	–	depends="configure-tests, report-tests"
272	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
273	–
274	–
365		<target name="docs"
366		description="Builds javadocs for src/main to dist dir">
367
#	Line 283 | Line 373 | As of 2013-02, the very latest lambda 8
373
374		<javadoc destdir="${docs.dir}"
375		packagenames="none"
376	<	link="${jdkapi8docs.url}"
376	>	link="${java9.api.url}"
377		overview="${src.dir}/intro.html"
378		access="${build.javadoc.access}"
379	<	sourcepath="${src.dir}:${jdk8src.dir}"
379	>	sourcepath="${src.dir}:${jdk9src.dir}"
380		classpath=""
381	<	executable="${javadoc8}">
381	>	executable="${javadoc9}">
382		<fileset dir="${src.dir}" defaultexcludes="yes">
383		<include name="**/*.java"/>
384		</fileset>
385	+	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
386	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
387		<arg value="-XDignore.symbol.file=true"/>
388		<arg value="-tag"/>
389		<arg value="${javadoc.jls.option}"/>
390	+	<arg value="-tag"/>
391	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
392	+	<arg value="-tag"/>
393	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
394	+	<arg value="-tag"/>
395	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
396		</javadoc>
397		</target>
398
#	Line 333 | Line 431 | As of 2013-02, the very latest lambda 8
431		<target name="dist-clean"
432		description="Removes all build and distribution products">
433
434	+	<delete dir="${build.dir}"/>
435		<delete dir="${dist.dir}"/>
436
437		</target>
438
439
341	–	<!-- Internal targets -->
342	–
343	–
440		<target name="dist-jar"
441		depends="clean, jar">
442		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 351 | Line 447 | As of 2013-02, the very latest lambda 8
447		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
448		</target>
449
450	<
355	<	<target name="compile-tests"
356	<	depends="jar">
357	<
358	<	<mkdir dir="${build.testcases.dir}"/>
359	<
360	<	<javac srcdir="${tck.src.dir}"
361	<	destdir="${build.testcases.dir}"
362	<	debug="${build.debug}"
363	<	debuglevel="${build.debuglevel}"
364	<	deprecation="${build.deprecation}"
365	<	source="6"
366	<	classpath="${junit.jar}"
367	<	bootclasspath="@{product.jar}:${bootclasspath6}"
368	<	includeAntRuntime="false"
369	<	includeJavaRuntime="false"
370	<	executable="${javac8}"
371	<	fork="true">
372	<
373	<	<include name="**/*.java"/>
374	<	<compilerarg value="-XDignore.symbol.file=true"/>
375	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
376	<	<compilerarg line="${build.args}"/>
377	<
378	<	</javac>
379	<
380	<	<javac srcdir="${test.src.dir}"
381	<	destdir="${build.testcases.dir}"
382	<	debug="${build.debug}"
383	<	debuglevel="${build.debuglevel}"
384	<	deprecation="${build.deprecation}"
385	<	source="6"
386	<	classpath=""
387	<	bootclasspath="@{product.jar}:${bootclasspath6}"
388	<	includeAntRuntime="false"
389	<	includeJavaRuntime="false"
390	<	executable="${javac8}"
391	<	fork="true">
392	<
393	<	<include name="jsr166/test/**/*.java"/>
394	<	<compilerarg value="-XDignore.symbol.file=true"/>
395	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
396	<	<compilerarg line="${build.args}"/>
397	<
398	<	</javac>
399	<
400	<	<!--
401	<	<javac srcdir="${jtreg.src.dir}"
402	<	destdir="${build.testcases.dir}"
403	<	debug="${build.debug}"
404	<	debuglevel="${build.debuglevel}"
405	<	deprecation="${build.deprecation}"
406	<	source="${build.sourcelevel}"
407	<	fork="true">
408	<
409	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
410	<	<compilerarg value="-XDignore.symbol.file=true"/>
411	<	<compilerarg line="${build.args}"/>
412	<
413	<	</javac>
414	<	-->
415	<
416	<	</target>
417	<
450	>	<target name="tck" depends="test-tck" description="alias for test-tck"/>
451		<target name="test-tck"
452		depends="jar"
453		description="Runs tck tests for main directly">
454
455		<run-tck-tests
456	<	target="8"
456	>	target="${build.main.java.version}"
457		workdir="${build.dir}"
458		classes="${product.jar}"/>
459		</target>
460
461	<	<target name="run-tests"
462	<	depends="compile-tests">
463	<
464	<	<!-- May be overridden by user.properties -->
465	<	<property name="testcase" value="*"/>
466	<
434	<	<mkdir dir="${build.reports.dir}"/>
435	<
436	<	<junit printsummary="true"
437	<	showoutput="true"
438	<	errorProperty="junit.failed"
439	<	failureProperty="junit.failed"
440	<	dir="${build.reports.dir}"
441	<	jvm="${java8}"
442	<	fork="true">
461	>	<target name="test-tck-parallelism-1"
462	>	description="Runs test-tck with given common pool parallelism">
463	>	<antcall target="test-tck">
464	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
465	>	</antcall>
466	>	</target>
467
468	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
469	<	<jvmarg value="-server"/>
470	<	<jvmarg value="-showversion"/>
468	>	<target name="test-tck-parallelism-0"
469	>	description="Runs test-tck with given common pool parallelism">
470	>	<antcall target="test-tck">
471	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
472	>	</antcall>
473	>	</target>
474
475	<	<classpath refid="test.classpath"/>
475	>	<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
476	>	<target name="test-jtreg"
477	>	depends="jar"
478	>	description="Runs jtreg tests for main using the jtreg ant task">
479	>	<run-jtreg-tests
480	>	target="${build.main.java.version}"
481	>	workdir="${build.dir}"
482	>	classes="${product.jar}"/>
483	>	</target>
484
485	<	<formatter type="xml"/>
485	>	<target name="test"
486	>	depends="test-tck, test-tck-parallelism-1, test-jtreg"
487	>	description="Runs tck and jtreg tests for main">
488	>	</target>
489
490	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
453	<	<fileset dir="${tck.src.dir}">
454	<	<include name="**/${testcase}Test.java"/>
455	<	</fileset>
456	<	</batchtest>
457	<
458	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
459	<	<fileset dir="${test.src.dir}">
460	<	<include name="jsr166/test/**/${testcase}Test.java"/>
461	<	</fileset>
462	<	</batchtest>
463	<
464	<	<!--
465	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
466	<	<fileset dir="${jtreg.src.dir}">
467	<	<include name="**/${testcase}Test.java"/>
468	<	</fileset>
469	<	</batchtest>
470	<	-->
490	>	<target name="jtreg8" description="Runs jtreg tests with jdk8">
491
492	<	</junit>
492	>	<antcall target="jtreg">
493	>	<param name="build.main.java.version" value="8"/>
494	>	<param name="build.main.javac" value="${javac8}"/>
495	>	</antcall>
496
497		</target>
498
499	+	<target name="test89"
500	+	description="Runs tck and jtreg tests for main for multiple java versions">
501
502	<	<target name="report-tests"
503	<	depends="run-tests">
504	<
505	<	<!-- Sets junit.report.format to frames if redirection is present,
506	<	otherwise sets it to noframes. -->
482	<	<available property="junit.report.format"
483	<	value="frames"
484	<	classname="org.apache.xalan.lib.Redirect"
485	<	/>
486	<	<property name="junit.report.format" value="noframes"/>
487	<
488	<	<junitreport todir="${build.reports.dir}">
489	<	<fileset dir="${build.reports.dir}">
490	<	<include name="TEST-*.xml"/>
491	<	</fileset>
492	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
493	<	/>
494	<	</junitreport>
502	>	<antcall target="clean"/>
503	>	<antcall target="test">
504	>	<param name="build.main.java.version" value="8"/>
505	>	<param name="build.main.javac" value="${javac8}"/>
506	>	</antcall>
507
508	<	<fail message="Test Cases Failed" if="junit.failed"/>
508	>	<antcall target="clean"/>
509	>	<antcall target="test">
510	>	<param name="build.main.java.version" value="9"/>
511	>	<param name="build.main.javac" value="${javac9}"/>
512	>	</antcall>
513
514		</target>
515
516
517	+
518		<target name="configure-compiler">
519
520		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 515 | Line 532 | As of 2013-02, the very latest lambda 8
532		</target>
533
534
518	–	<target name="configure-tests"
519	–	depends="configure-compiler">
520	–
521	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
522	–	<available property="junit.available"
523	–	classname="junit.framework.Protectable"/>
524	–
525	–	<!-- Xalan -->
526	–	<available property="xalan.available"
527	–	classname="org.apache.xalan.Version"/>
528	–
529	–
530	–	<!-- Ant 1.6beta and later don't need or want this check -->
531	–	<!--
532	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
533	–	unless="junit.available"/>
534	–
535	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
536	–	unless="xalan.available"/>
537	–	-->
538	–
539	–	</target>
540	–
535
536		<!-- Various demos and test programs -->
537
#	Line 568 | Line 562 | As of 2013-02, the very latest lambda 8
562		</target>
563
564
565	+	<target name="compile-test-loops" depends="jar"
566	+	description="compile all the perf tests in src/test/loops">
567	+
568	+	<mkdir dir="${build.dir}/test/loops"/>
569	+
570	+	<javac srcdir="${basedir}/src/test/loops"
571	+	destdir="${build.dir}/test/loops"
572	+	debug="${build.debug}"
573	+	debuglevel="${build.debuglevel}"
574	+	deprecation="${build.deprecation}"
575	+	includeAntRuntime="false"
576	+	includeJavaRuntime="false"
577	+	executable="${javac9}"
578	+	fork="true">
579	+
580	+	<include name="*.java"/>
581	+	<compilerarg value="-XDignore.symbol.file=true"/>
582	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
583	+	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
584	+	<compilerarg line="${build.args}"/>
585	+
586	+	</javac>
587	+
588	+	</target>
589	+
590	+
591		<!-- jsr166 4jdk7 -->
592
593		<target name="4jdk7compile"
#	Line 590 | Line 610 | As of 2013-02, the very latest lambda 8
610		fork="true">
611
612		<include name="**/*.java"/>
613	+	<compilerarg value="-Xprefer:source"/>
614		<compilerarg value="-XDignore.symbol.file=true"/>
615		<compilerarg value="-Xlint:all"/>
616	+	<compilerarg value="-Werror"/>
617	+	<compilerarg line="${build.args}"/>
618	+
619	+	</javac>
620	+	</target>
621	+
622	+	<target name="4jdk7doclint"
623	+	depends="configure-compiler"
624	+	description="Finds doclint warnings">
625	+
626	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
627	+
628	+	<javac srcdir="${4jdk7src.dir}"
629	+	destdir="${build.4jdk7.classes.dir}"
630	+	debug="${build.debug}"
631	+	debuglevel="${build.debuglevel}"
632	+	deprecation="${build.deprecation}"
633	+	source="6"
634	+	classpath=""
635	+	bootclasspath="${bootclasspath7}"
636	+	includeAntRuntime="false"
637	+	includeJavaRuntime="false"
638	+	executable="${javac8}"
639	+	fork="true">
640	+
641	+	<include name="**/*.java"/>
642	+	<compilerarg value="-Xprefer:source"/>
643	+	<compilerarg value="-XDignore.symbol.file=true"/>
644	+	<compilerarg value="-Xlint:all"/>
645	+	<compilerarg value="-Xdoclint:all/protected"/>
646		<compilerarg line="${build.args}"/>
647
648		</javac>
#	Line 618 | Line 669 | As of 2013-02, the very latest lambda 8
669		workdir="${build.4jdk7.dir}"
670		classes="${4jdk7product.jar}">
671		<javac-elements>
672	+	<!-- JDK8+ test classes -->
673	+	<exclude name="*8Test.java"/>
674	+	<exclude name="*9Test.java"/>
675	+	<exclude name="DoubleAccumulatorTest.java"/>
676	+	<exclude name="DoubleAdderTest.java"/>
677	+	<exclude name="LongAccumulatorTest.java"/>
678	+	<exclude name="LongAdderTest.java"/>
679	+	<exclude name="CompletableFutureTest.java"/>
680	+	<exclude name="SplittableRandomTest.java"/>
681		<exclude name="StampedLockTest.java"/>
682		</javac-elements>
683		</run-tck-tests>
#	Line 646 | Line 706 | As of 2013-02, the very latest lambda 8
706
707		<formatter type="brief"/>
708
709	<	<test name="JSR166TestCase" haltonfailure="no">
709	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
710		</test>
711
712		</junit>
713		</target>
714
715		<target name="4jdk7-test-jtreg"
716	<	depends="4jdk7compile"
716	>	depends="4jdk7jar"
717		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
718	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
719	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
720	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
721	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
662	<	<jtreg dir="${jtreg.src.dir}"
663	<	jdk="${jdk7.home}"
664	<	workDir="${build.4jdk7.dir}/JTwork"
665	<	reportDir="${build.4jdk7.dir}/JTreport">
666	<
667	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
668	<	<arg value="-agentvm"/>
669	<	<arg value="-v:nopass,fail"/>
670	<	<arg value="-vmoptions:-esa -ea"/>
671	<	<arg value="-automatic"/>
672	<	<arg value="-k:!ignore"/>
673	<	</jtreg>
718	>	<run-jtreg-tests
719	>	target="7"
720	>	workdir="${build.4jdk7.dir}"
721	>	classes="${4jdk7product.jar}"/>
722		</target>
723
724
#	Line 688 | Line 736 | As of 2013-02, the very latest lambda 8
736
737		<javadoc destdir="${4jdk7docs.dir}"
738		packagenames="none"
739	<	link="${jdkapi7docs.url}"
739	>	link="${java7.api.url}"
740		overview="${4jdk7src.dir}/intro.html"
741		access="${build.javadoc.access}"
742		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
#	Line 697 | Line 745 | As of 2013-02, the very latest lambda 8
745		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
746		<include name="**/*.java"/>
747		</fileset>
748	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
749		<arg value="-XDignore.symbol.file=true"/>
750		</javadoc>
751		</target>
#	Line 715 | Line 764 | As of 2013-02, the very latest lambda 8
764		</target>
765
766
718	–	<target name="4jdk7dist-clean"
719	–	description="Removes all build and distribution products">
720	–
721	–	</target>
722	–
767		<target name="4jdk7dist-jar"
768		depends="4jdk7clean, 4jdk7jar">
769		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
#	Line 756 | Line 800 | As of 2013-02, the very latest lambda 8
800		<include name="jsr166x/**/*.java"/>
801		<compilerarg value="-XDignore.symbol.file=true"/>
802		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
803	+	<compilerarg value="-Werror"/>
804		<compilerarg line="${build.args}"/>
805
806		</javac>
#	Line 781 | Line 826 | As of 2013-02, the very latest lambda 8
826
827		<javadoc destdir="${jsr166xdocs.dir}"
828		packagenames="jsr166x.*"
829	<	link="${jdkapidocs.url}"
829	>	link="${java.api.url}"
830		access="${build.javadoc.access}"
831		sourcepath="${topsrc.dir}:${jdk6src.dir}"
832		bootclasspath="${bootclasspath6}"
833		source="5"
834		executable="${javadoc7}">
835	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
836		<arg value="-XDignore.symbol.file=true"/>
837
838		</javadoc>
#	Line 806 | Line 852 | As of 2013-02, the very latest lambda 8
852		</target>
853
854
809	–	<target name="jsr166xdist-clean"
810	–	description="Removes all build and distribution products">
811	–
812	–	</target>
813	–
814	–
855		<target name="jsr166xdist-jar"
856		depends="jsr166xclean, jsr166xjar">
857		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
#	Line 847 | Line 887 | As of 2013-02, the very latest lambda 8
887		<include name="jsr166y/**/*.java"/>
888		<compilerarg value="-XDignore.symbol.file=true"/>
889		<compilerarg value="-Xlint:all"/>
890	+	<compilerarg value="-Werror"/>
891		<compilerarg line="${build.args}"/>
892
893		</javac>
#	Line 872 | Line 913 | As of 2013-02, the very latest lambda 8
913
914		<javadoc destdir="${jsr166ydocs.dir}"
915		packagenames="jsr166y.*"
916	<	link="${jdkapidocs.url}"
916	>	link="${java.api.url}"
917		access="${build.javadoc.access}"
918		sourcepath="${topsrc.dir}:${jdk6src.dir}"
919		bootclasspath="${bootclasspath6}"
920		source="6"
921		executable="${javadoc7}">
922	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
923		<arg value="-XDignore.symbol.file=true"/>
924
925		</javadoc>
#	Line 897 | Line 939 | As of 2013-02, the very latest lambda 8
939		</target>
940
941
900	–	<target name="jsr166ydist-clean"
901	–	description="Removes all build and distribution products">
902	–
903	–	</target>
904	–
942		<target name="jsr166ydist-jar"
943		depends="jsr166yclean, jsr166yjar">
944		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
#	Line 938 | Line 975 | As of 2013-02, the very latest lambda 8
975		<include name="extra166y/**/*.java"/>
976		<compilerarg value="-XDignore.symbol.file=true"/>
977		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
978	+	<compilerarg value="-Werror"/>
979		<compilerarg line="${build.args}"/>
980
981		</javac>
#	Line 963 | Line 1001 | As of 2013-02, the very latest lambda 8
1001
1002		<javadoc destdir="${extra166ydocs.dir}"
1003		packagenames="extra166y.*"
1004	<	link="${jdkapidocs.url}"
1004	>	link="${java.api.url}"
1005		access="${build.javadoc.access}"
1006		sourcepath="${topsrc.dir}:${jdk6src.dir}"
1007		bootclasspath="${bootclasspath6}"
1008		source="6"
1009		executable="${javadoc7}">
1010	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1011		<arg value="-XDignore.symbol.file=true"/>
1012
1013		</javadoc>
#	Line 988 | Line 1027 | As of 2013-02, the very latest lambda 8
1027		</target>
1028
1029
991	–	<target name="extra166ydist-clean"
992	–	description="Removes all build and distribution products">
993	–
994	–	</target>
995	–
1030		<target name="extra166ydist-jar"
1031		depends="extra166yclean, extra166yjar">
1032		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
#	Line 1005 | Line 1039 | As of 2013-02, the very latest lambda 8
1039
1040		<!-- jsr166e -->
1041
1042	+	<property name="build.jsr166e.java.version" value="6"/>
1043	+	<property name="build.jsr166e.javac" value="${javac6}"/>
1044	+
1045		<target name="jsr166ecompile"
1046		depends="configure-compiler"
1047		description="Compiles jsr166e sources">
#	Line 1016 | Line 1053 | As of 2013-02, the very latest lambda 8
1053		debug="${build.debug}"
1054		debuglevel="${build.debuglevel}"
1055		deprecation="${build.deprecation}"
1056	<	source="7"
1056	>	source="${build.jsr166e.java.version}"
1057		classpath=""
1058		includeAntRuntime="false"
1059		includeJavaRuntime="false"
1060	<	executable="${javac7}"
1060	>	executable="${build.jsr166e.javac}"
1061		fork="true">
1062
1063		<include name="jsr166e/**/*.java"/>
1064		<compilerarg value="-XDignore.symbol.file=true"/>
1065		<compilerarg value="-Xlint:all"/>
1066	+	<compilerarg value="-Werror"/>
1067		<compilerarg line="${build.args}"/>
1068
1069		</javac>
1070		</target>
1071
1072	+	<!-- jsr166e: find doclint errors -->
1073	+	<target name="jsr166edoclint">
1074	+
1075	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
1076	+
1077	+	<javac srcdir="${topsrc.dir}"
1078	+	destdir="${build.jsr166e.classes.dir}"
1079	+	debug="${build.debug}"
1080	+	debuglevel="${build.debuglevel}"
1081	+	deprecation="${build.deprecation}"
1082	+	source="${build.jsr166e.java.version}"
1083	+	classpath=""
1084	+	bootclasspath="${bootclasspath7}"
1085	+	includeAntRuntime="false"
1086	+	includeJavaRuntime="false"
1087	+	executable="${javac8}"
1088	+	fork="true">
1089	+
1090	+	<include name="jsr166e/**/*.java"/>
1091	+	<compilerarg value="-XDignore.symbol.file=true"/>
1092	+	<compilerarg value="-Xlint:all"/>
1093	+	<compilerarg value="-Werror"/>
1094	+	<compilerarg value="-Xdoclint:all/protected"/>
1095	+
1096	+	</javac>
1097	+	</target>
1098	+
1099
1100		<target name="jsr166ejar"
1101		depends="jsr166ecompile"
#	Line 1051 | Line 1116 | As of 2013-02, the very latest lambda 8
1116
1117		<javadoc destdir="${jsr166edocs.dir}"
1118		packagenames="jsr166e.*"
1119	<	link="${jdkapidocs.url}"
1119	>	link="${java.api.url}"
1120		access="${build.javadoc.access}"
1121	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1122	<	source="7"
1121	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1122	>	source="${build.jsr166e.java.version}"
1123		executable="${javadoc7}">
1124	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1125		<arg value="-XDignore.symbol.file=true"/>
1126
1127		</javadoc>
1128		</target>
1129
1130
1131	<	<target name="jsr166e-test-tck"
1132	<	depends="jsr166ejar"
1133	<	description="Runs tck tests for jsr166e">
1131	>	<target name="jsr166e-test-tck-one-java-version"
1132	>	depends="jsr166ejar">
1133	>
1134	>	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1135
1136		<run-tck-tests
1137		tck.src.dir="${test.src.dir}/tck-jsr166e"
1138	<	source="7"
1072	<	target="8"
1138	>	target="${build.jsr166e.java.version}"
1139		workdir="${build.jsr166e.dir}"
1140		classes="${jsr166e.jar}"/>
1141		</target>
1142
1143	+	<target name="jsr166e-test-tck"
1144	+	description="Runs tck tests for jsr166e for multiple java versions">
1145	+
1146	+	<!--     <antcall target="clean"/> -->
1147	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1148	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1149	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1150	+	<!--     </antcall> -->
1151	+
1152	+	<antcall target="clean"/>
1153	+	<antcall target="jsr166e-test-tck-one-java-version">
1154	+	<param name="build.jsr166e.java.version" value="7"/>
1155	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1156	+	</antcall>
1157	+
1158	+	<antcall target="clean"/>
1159	+	<antcall target="jsr166e-test-tck-one-java-version">
1160	+	<param name="build.jsr166e.java.version" value="6"/>
1161	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1162	+	</antcall>
1163	+	</target>
1164	+
1165	+
1166	+	<target name="jsr166e-test"
1167	+	depends="jsr166e-test-tck"
1168	+	description="Runs all tests for jsr166e">
1169	+	</target>
1170
1171		<target name="jsr166edist"
1172		depends="jsr166edist-jar, jsr166edist-docs"
#	Line 1086 | Line 1179 | As of 2013-02, the very latest lambda 8
1179		</target>
1180
1181
1089	–	<target name="jsr166edist-clean"
1090	–	description="Removes all build and distribution products">
1091	–
1092	–	</target>
1093	–
1182		<target name="jsr166edist-jar"
1183		depends="jsr166eclean, jsr166ejar">
1184		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
#	Line 1106 | Line 1194 | As of 2013-02, the very latest lambda 8
1194
1195		<target name="lint">
1196		<antcall target="dists">
1197	+	<param name="build.javadoc.access" value="public"/>
1198	+	</antcall>
1199	+	</target>
1200	+
1201	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1202	+	<target name="lint-private">
1203	+	<antcall target="dist">
1204		<param name="build.javadoc.access" value="private"/>
1205		</antcall>
1206		</target>

Diff Legend

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