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.138 by jsr166, Fri Mar 22 18:04:56 2013 UTC vs.
Revision 1.167 by jsr166, Sun Aug 16 20:11:47 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"/>
#	Line 145 | Line 163 | As of 2013-02, the very latest lambda 8
163		<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
164		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
165
166	<	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
167	<	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
168	<	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
169	<	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
170	<
171	<	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
172	<	<!-- The below does not yet exist as of 2013-01 -->
173	<	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
166	>	<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
167	>	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
168	>	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
169	>	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
170	>	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
171	>	<!-- The expected canonical location does not yet exist as of 2014-07 -->
172	>	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
173	>	<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
174	>	<!-- Default jdk doc location (latest stable release seems best) -->
175	>	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
176
177	<	<!-- Default jdk api doc location (latest stable release seems best) -->
178	<	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
177	>	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
178	>	<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
179	>	<property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
180	>	<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
181	>	<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
182	>	<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
183	>	<property name="java.api.url"       value="${java.docroot.url}/api/"/>
184
185		<!-- Define the "jtreg" task -->
186		<!-- See the docs in "jtreg -onlineHelp" -->
#	Line 174 | Line 199 | As of 2013-02, the very latest lambda 8
199		<attribute name="compile-target" default="@{target}"/>
200		<attribute name="workdir"/>
201		<attribute name="classes"/>
202	<	<attribute name="jvmflags" default=""/>
202	>	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
203		<element name="javac-elements" optional="true"/>
204		<sequential>
205
#	Line 188 | Line 213 | As of 2013-02, the very latest lambda 8
213		source="@{compile-target}"
214		target="@{compile-target}"
215		classpath="${junit.jar}"
191	–	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
216		includeAntRuntime="false"
217		includeJavaRuntime="false"
218		executable="${javac@{compile-target}}"
#	Line 197 | Line 221 | As of 2013-02, the very latest lambda 8
221		<include name="*.java"/>
222		<compilerarg value="-XDignore.symbol.file=true"/>
223		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
224	+	<compilerarg value="-Xbootclasspath/p:@{classes}"/>
225		<compilerarg line="${build.args}"/>
226		<javac-elements/>
227
228		</javac>
229
230	<	<java classname="JSR166TestCase"
230	>	<java classname="${jsr166.tckTestClass}"
231		failonerror="true"
232		jvm="${java@{target}}"
233		fork="true">
234		<jvmarg value="-Xbootclasspath/p:@{classes}"/>
235		<jvmarg line="@{jvmflags}"/>
236	+
237	+	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
238	+	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
239	+	<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
240	+	</syspropertyset>
241	+
242	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
245		<classpath>
246		<pathelement location="${junit.jar}"/>
247		<pathelement location="@{workdir}/tck-classes"/>
#	Line 217 | Line 251 | As of 2013-02, the very latest lambda 8
251		</sequential>
252		</macrodef>
253
254	+	<!-- Define jtreg test sets for different jdk versions -->
255	+	<fileset dir="${jtreg.src.dir}">
256	+	<patternset id="jdk9.jtreg.tests">
257	+	<include name="**/*.java"/>
258	+	</patternset>
259	+	</fileset>
260	+
261	+	<fileset dir="${jtreg.src.dir}">
262	+	<patternset id="jdk8.jtreg.tests">
263	+	<include name="**/*.java"/>
264	+	<exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
265	+	</patternset>
266	+	</fileset>
267	+
268	+	<fileset dir="${jtreg.src.dir}">
269	+	<patternset id="jdk7.jtreg.tests">
270	+	<include name="**/*.java"/>
271	+	<exclude name="util/Collection/CollectionDefaults.java"/>
272	+	<exclude name="util/List/ListDefaults.java"/>
273	+	<exclude name="util/Spliterator/**/*.java"/>
274	+	<exclude name="util/concurrent/CompletableFuture/**/*.java"/>
275	+	<exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
276	+	<exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
277	+	</patternset>
278	+	</fileset>
279	+
280		<macrodef name="run-jtreg-tests">
281	+	<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
282		<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
283		<attribute name="source" default="7"/>
284		<attribute name="target"/>
#	Line 233 | Line 294 | As of 2013-02, the very latest lambda 8
294		jdk="${jdk@{target}.home}"
295		workDir="@{workdir}/JTwork"
296		reportDir="@{workdir}/JTreport">
297	<
297	>	<patternset refid="jdk@{target}.jtreg.tests"/>
298		<arg value="-Xbootclasspath/p:@{classes}"/>
299		<arg value="-agentvm"/>
300		<arg value="-v:nopass,fail"/>
#	Line 256 | Line 317 | As of 2013-02, the very latest lambda 8
317
318		<!-- Main targets -->
319
320	+	<property name="build.main.java.version" value="9"/>
321	+	<property name="build.main.javac" value="${javac9}"/>
322	+
323		<target name="dists"
324		depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
325		description="Builds all public jars and docs"/>
#	Line 274 | Line 338 | As of 2013-02, the very latest lambda 8
338		classpath=""
339		includeAntRuntime="false"
340		includeJavaRuntime="false"
341	<	executable="${javac8}"
341	>	executable="${build.main.javac}"
342		fork="true">
343
344		<include name="**/*.java"/>
345		<compilerarg value="-Xprefer:source"/>
346		<compilerarg value="-XDignore.symbol.file=true"/>
347		<compilerarg value="-Xlint:all"/>
348	+	<compilerarg value="-Werror"/>
349	+	<compilerarg value="-Xdoclint:all/protected"/>
350	+	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351		<compilerarg line="${build.args}"/>
352
353		</javac>
#	Line 297 | Line 364 | As of 2013-02, the very latest lambda 8
364		</target>
365
366
300	–	<target name="test"
301	–	depends="configure-tests, report-tests"
302	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
303	–
304	–
367		<target name="docs"
368		description="Builds javadocs for src/main to dist dir">
369
#	Line 313 | Line 375 | As of 2013-02, the very latest lambda 8
375
376		<javadoc destdir="${docs.dir}"
377		packagenames="none"
378	<	link="${jdkapi8docs.url}"
378	>	link="${java9.api.url}"
379		overview="${src.dir}/intro.html"
380		access="${build.javadoc.access}"
381	<	sourcepath="${src.dir}:${jdk8src.dir}"
381	>	sourcepath="${src.dir}:${jdk9src.dir}"
382		classpath=""
383	<	executable="${javadoc8}">
383	>	executable="${javadoc9}">
384		<fileset dir="${src.dir}" defaultexcludes="yes">
385		<include name="**/*.java"/>
386		</fileset>
387	+	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
388	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
389		<arg value="-XDignore.symbol.file=true"/>
390		<arg value="-tag"/>
391		<arg value="${javadoc.jls.option}"/>
392	+	<arg value="-tag"/>
393	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
394	+	<arg value="-tag"/>
395	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
396	+	<arg value="-tag"/>
397	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
398		</javadoc>
399		</target>
400
#	Line 363 | Line 433 | As of 2013-02, the very latest lambda 8
433		<target name="dist-clean"
434		description="Removes all build and distribution products">
435
436	+	<delete dir="${build.dir}"/>
437		<delete dir="${dist.dir}"/>
438
439		</target>
440
441
371	–	<!-- Internal targets -->
372	–
373	–
442		<target name="dist-jar"
443		depends="clean, jar">
444		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 381 | Line 449 | As of 2013-02, the very latest lambda 8
449		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
450		</target>
451
452	<
385	<	<target name="compile-tests"
386	<	depends="jar">
387	<
388	<	<mkdir dir="${build.testcases.dir}"/>
389	<
390	<	<javac srcdir="${tck.src.dir}"
391	<	destdir="${build.testcases.dir}"
392	<	debug="${build.debug}"
393	<	debuglevel="${build.debuglevel}"
394	<	deprecation="${build.deprecation}"
395	<	source="6"
396	<	classpath="${junit.jar}"
397	<	bootclasspath="@{product.jar}:${bootclasspath6}"
398	<	includeAntRuntime="false"
399	<	includeJavaRuntime="false"
400	<	executable="${javac8}"
401	<	fork="true">
402	<
403	<	<include name="**/*.java"/>
404	<	<compilerarg value="-XDignore.symbol.file=true"/>
405	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
406	<	<compilerarg line="${build.args}"/>
407	<
408	<	</javac>
409	<
410	<	<javac srcdir="${test.src.dir}"
411	<	destdir="${build.testcases.dir}"
412	<	debug="${build.debug}"
413	<	debuglevel="${build.debuglevel}"
414	<	deprecation="${build.deprecation}"
415	<	source="6"
416	<	classpath=""
417	<	bootclasspath="@{product.jar}:${bootclasspath6}"
418	<	includeAntRuntime="false"
419	<	includeJavaRuntime="false"
420	<	executable="${javac8}"
421	<	fork="true">
422	<
423	<	<include name="jsr166/test/**/*.java"/>
424	<	<compilerarg value="-XDignore.symbol.file=true"/>
425	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
426	<	<compilerarg line="${build.args}"/>
427	<
428	<	</javac>
429	<
430	<	<!--
431	<	<javac srcdir="${jtreg.src.dir}"
432	<	destdir="${build.testcases.dir}"
433	<	debug="${build.debug}"
434	<	debuglevel="${build.debuglevel}"
435	<	deprecation="${build.deprecation}"
436	<	source="${build.sourcelevel}"
437	<	fork="true">
438	<
439	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
440	<	<compilerarg value="-XDignore.symbol.file=true"/>
441	<	<compilerarg line="${build.args}"/>
442	<
443	<	</javac>
444	<	-->
445	<
446	<	</target>
447	<
452	>	<target name="tck" depends="test-tck" description="alias for test-tck"/>
453		<target name="test-tck"
454		depends="jar"
455		description="Runs tck tests for main directly">
456
457		<run-tck-tests
458	<	target="8"
458	>	target="${build.main.java.version}"
459		workdir="${build.dir}"
460		classes="${product.jar}"/>
461		</target>
462
463	+	<target name="test-tck-parallelism-1"
464	+	description="Runs test-tck with given common pool parallelism">
465	+	<antcall target="test-tck">
466	+	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
467	+	</antcall>
468	+	</target>
469	+
470	+	<target name="test-tck-parallelism-0"
471	+	description="Runs test-tck with given common pool parallelism">
472	+	<antcall target="test-tck">
473	+	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
474	+	</antcall>
475	+	</target>
476	+
477	+	<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
478		<target name="test-jtreg"
479		depends="jar"
480		description="Runs jtreg tests for main using the jtreg ant task">
481		<run-jtreg-tests
482	<	target="8"
482	>	target="${build.main.java.version}"
483		workdir="${build.dir}"
484		classes="${product.jar}"/>
485		</target>
486
487	<	<target name="test-ng"
488	<	depends="test-tck, test-jtreg"
487	>	<target name="test"
488	>	depends="test-tck, test-tck-parallelism-1, test-jtreg"
489		description="Runs tck and jtreg tests for main">
490		</target>
491
492	<	<target name="run-tests"
493	<	depends="compile-tests">
474	<
475	<	<!-- May be overridden by user.properties -->
476	<	<property name="testcase" value="*"/>
477	<
478	<	<mkdir dir="${build.reports.dir}"/>
492	>	<target name="test89"
493	>	description="Runs tck and jtreg tests for main for multiple java versions">
494
495	<	<junit printsummary="true"
496	<	showoutput="true"
497	<	errorProperty="junit.failed"
498	<	failureProperty="junit.failed"
499	<	dir="${build.reports.dir}"
500	<	jvm="${java8}"
486	<	fork="true">
487	<
488	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
489	<	<jvmarg value="-server"/>
490	<	<jvmarg value="-showversion"/>
491	<
492	<	<classpath refid="test.classpath"/>
493	<
494	<	<formatter type="xml"/>
495	<
496	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
497	<	<fileset dir="${tck.src.dir}">
498	<	<include name="**/${testcase}Test.java"/>
499	<	</fileset>
500	<	</batchtest>
501	<
502	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
503	<	<fileset dir="${test.src.dir}">
504	<	<include name="jsr166/test/**/${testcase}Test.java"/>
505	<	</fileset>
506	<	</batchtest>
507	<
508	<	<!--
509	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
510	<	<fileset dir="${jtreg.src.dir}">
511	<	<include name="**/${testcase}Test.java"/>
512	<	</fileset>
513	<	</batchtest>
514	<	-->
495	>	<antcall target="clean"/>
496	>	<antcall target="test">
497	>	<param name="build.main.java.version" value="8"/>
498	>	<param name="build.main.javac" value="${javac8}"/>
499	>	<param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>
500	>	</antcall>
501
502	<	</junit>
502	>	<antcall target="clean"/>
503	>	<antcall target="test">
504	>	<param name="build.main.java.version" value="9"/>
505	>	<param name="build.main.javac" value="${javac9}"/>
506	>	</antcall>
507
508		</target>
509
510
521	–	<target name="report-tests"
522	–	depends="run-tests">
523	–
524	–	<!-- Sets junit.report.format to frames if redirection is present,
525	–	otherwise sets it to noframes. -->
526	–	<available property="junit.report.format"
527	–	value="frames"
528	–	classname="org.apache.xalan.lib.Redirect"
529	–	/>
530	–	<property name="junit.report.format" value="noframes"/>
531	–
532	–	<junitreport todir="${build.reports.dir}">
533	–	<fileset dir="${build.reports.dir}">
534	–	<include name="TEST-*.xml"/>
535	–	</fileset>
536	–	<report format="${junit.report.format}" todir="${build.reports.dir}"
537	–	/>
538	–	</junitreport>
539	–
540	–	<fail message="Test Cases Failed" if="junit.failed"/>
541	–
542	–	</target>
543	–
511
512		<target name="configure-compiler">
513
#	Line 559 | Line 526 | As of 2013-02, the very latest lambda 8
526		</target>
527
528
562	–	<target name="configure-tests"
563	–	depends="configure-compiler">
564	–
565	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
566	–	<available property="junit.available"
567	–	classname="junit.framework.Protectable"/>
568	–
569	–	<!-- Xalan -->
570	–	<available property="xalan.available"
571	–	classname="org.apache.xalan.Version"/>
572	–
573	–
574	–	<!-- Ant 1.6beta and later don't need or want this check -->
575	–	<!--
576	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
577	–	unless="junit.available"/>
578	–
579	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
580	–	unless="xalan.available"/>
581	–	-->
582	–
583	–	</target>
584	–
529
530		<!-- Various demos and test programs -->
531
#	Line 612 | Line 556 | As of 2013-02, the very latest lambda 8
556		</target>
557
558
559	+	<target name="compile-test-loops" depends="jar"
560	+	description="compile all the perf tests in src/test/loops">
561	+
562	+	<mkdir dir="${build.dir}/test/loops"/>
563	+
564	+	<javac srcdir="${basedir}/src/test/loops"
565	+	destdir="${build.dir}/test/loops"
566	+	debug="${build.debug}"
567	+	debuglevel="${build.debuglevel}"
568	+	deprecation="${build.deprecation}"
569	+	includeAntRuntime="false"
570	+	includeJavaRuntime="false"
571	+	executable="${javac9}"
572	+	fork="true">
573	+
574	+	<include name="*.java"/>
575	+	<compilerarg value="-XDignore.symbol.file=true"/>
576	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
577	+	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
578	+	<compilerarg line="${build.args}"/>
579	+
580	+	</javac>
581	+
582	+	</target>
583	+
584	+
585		<!-- jsr166 4jdk7 -->
586
587		<target name="4jdk7compile"
#	Line 637 | Line 607 | As of 2013-02, the very latest lambda 8
607		<compilerarg value="-Xprefer:source"/>
608		<compilerarg value="-XDignore.symbol.file=true"/>
609		<compilerarg value="-Xlint:all"/>
610	+	<compilerarg value="-Werror"/>
611	+	<compilerarg line="${build.args}"/>
612	+
613	+	</javac>
614	+	</target>
615	+
616	+	<target name="4jdk7doclint"
617	+	depends="configure-compiler"
618	+	description="Finds doclint warnings">
619	+
620	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
621	+
622	+	<javac srcdir="${4jdk7src.dir}"
623	+	destdir="${build.4jdk7.classes.dir}"
624	+	debug="${build.debug}"
625	+	debuglevel="${build.debuglevel}"
626	+	deprecation="${build.deprecation}"
627	+	source="6"
628	+	classpath=""
629	+	bootclasspath="${bootclasspath7}"
630	+	includeAntRuntime="false"
631	+	includeJavaRuntime="false"
632	+	executable="${javac8}"
633	+	fork="true">
634	+
635	+	<include name="**/*.java"/>
636	+	<compilerarg value="-Xprefer:source"/>
637	+	<compilerarg value="-XDignore.symbol.file=true"/>
638	+	<compilerarg value="-Xlint:all"/>
639	+	<compilerarg value="-Xdoclint:all/protected"/>
640		<compilerarg line="${build.args}"/>
641
642		</javac>
#	Line 665 | Line 665 | As of 2013-02, the very latest lambda 8
665		<javac-elements>
666		<!-- JDK8+ test classes -->
667		<exclude name="*8Test.java"/>
668	+	<exclude name="*9Test.java"/>
669		<exclude name="DoubleAccumulatorTest.java"/>
670		<exclude name="DoubleAdderTest.java"/>
671		<exclude name="LongAccumulatorTest.java"/>
672		<exclude name="LongAdderTest.java"/>
673		<exclude name="CompletableFutureTest.java"/>
674	+	<exclude name="SplittableRandomTest.java"/>
675		<exclude name="StampedLockTest.java"/>
676		</javac-elements>
677		</run-tck-tests>
#	Line 698 | Line 700 | As of 2013-02, the very latest lambda 8
700
701		<formatter type="brief"/>
702
703	<	<test name="JSR166TestCase" haltonfailure="no">
703	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
704		</test>
705
706		</junit>
#	Line 728 | Line 730 | As of 2013-02, the very latest lambda 8
730
731		<javadoc destdir="${4jdk7docs.dir}"
732		packagenames="none"
733	<	link="${jdkapi7docs.url}"
733	>	link="${java7.api.url}"
734		overview="${4jdk7src.dir}/intro.html"
735		access="${build.javadoc.access}"
736		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
#	Line 737 | Line 739 | As of 2013-02, the very latest lambda 8
739		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
740		<include name="**/*.java"/>
741		</fileset>
742	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
743		<arg value="-XDignore.symbol.file=true"/>
744		</javadoc>
745		</target>
#	Line 755 | Line 758 | As of 2013-02, the very latest lambda 8
758		</target>
759
760
758	–	<target name="4jdk7dist-clean"
759	–	description="Removes all build and distribution products">
760	–
761	–	</target>
762	–
761		<target name="4jdk7dist-jar"
762		depends="4jdk7clean, 4jdk7jar">
763		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
#	Line 796 | Line 794 | As of 2013-02, the very latest lambda 8
794		<include name="jsr166x/**/*.java"/>
795		<compilerarg value="-XDignore.symbol.file=true"/>
796		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
797	+	<compilerarg value="-Werror"/>
798		<compilerarg line="${build.args}"/>
799
800		</javac>
#	Line 821 | Line 820 | As of 2013-02, the very latest lambda 8
820
821		<javadoc destdir="${jsr166xdocs.dir}"
822		packagenames="jsr166x.*"
823	<	link="${jdkapidocs.url}"
823	>	link="${java.api.url}"
824		access="${build.javadoc.access}"
825		sourcepath="${topsrc.dir}:${jdk6src.dir}"
826		bootclasspath="${bootclasspath6}"
827		source="5"
828		executable="${javadoc7}">
829	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
830		<arg value="-XDignore.symbol.file=true"/>
831
832		</javadoc>
#	Line 846 | Line 846 | As of 2013-02, the very latest lambda 8
846		</target>
847
848
849	–	<target name="jsr166xdist-clean"
850	–	description="Removes all build and distribution products">
851	–
852	–	</target>
853	–
854	–
849		<target name="jsr166xdist-jar"
850		depends="jsr166xclean, jsr166xjar">
851		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
#	Line 887 | Line 881 | As of 2013-02, the very latest lambda 8
881		<include name="jsr166y/**/*.java"/>
882		<compilerarg value="-XDignore.symbol.file=true"/>
883		<compilerarg value="-Xlint:all"/>
884	+	<compilerarg value="-Werror"/>
885		<compilerarg line="${build.args}"/>
886
887		</javac>
#	Line 912 | Line 907 | As of 2013-02, the very latest lambda 8
907
908		<javadoc destdir="${jsr166ydocs.dir}"
909		packagenames="jsr166y.*"
910	<	link="${jdkapidocs.url}"
910	>	link="${java.api.url}"
911		access="${build.javadoc.access}"
912		sourcepath="${topsrc.dir}:${jdk6src.dir}"
913		bootclasspath="${bootclasspath6}"
914		source="6"
915		executable="${javadoc7}">
916	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
917		<arg value="-XDignore.symbol.file=true"/>
918
919		</javadoc>
#	Line 937 | Line 933 | As of 2013-02, the very latest lambda 8
933		</target>
934
935
940	–	<target name="jsr166ydist-clean"
941	–	description="Removes all build and distribution products">
942	–
943	–	</target>
944	–
936		<target name="jsr166ydist-jar"
937		depends="jsr166yclean, jsr166yjar">
938		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
#	Line 978 | Line 969 | As of 2013-02, the very latest lambda 8
969		<include name="extra166y/**/*.java"/>
970		<compilerarg value="-XDignore.symbol.file=true"/>
971		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
972	+	<compilerarg value="-Werror"/>
973		<compilerarg line="${build.args}"/>
974
975		</javac>
#	Line 1003 | Line 995 | As of 2013-02, the very latest lambda 8
995
996		<javadoc destdir="${extra166ydocs.dir}"
997		packagenames="extra166y.*"
998	<	link="${jdkapidocs.url}"
998	>	link="${java.api.url}"
999		access="${build.javadoc.access}"
1000		sourcepath="${topsrc.dir}:${jdk6src.dir}"
1001		bootclasspath="${bootclasspath6}"
1002		source="6"
1003		executable="${javadoc7}">
1004	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1005		<arg value="-XDignore.symbol.file=true"/>
1006
1007		</javadoc>
#	Line 1028 | Line 1021 | As of 2013-02, the very latest lambda 8
1021		</target>
1022
1023
1031	–	<target name="extra166ydist-clean"
1032	–	description="Removes all build and distribution products">
1033	–
1034	–	</target>
1035	–
1024		<target name="extra166ydist-jar"
1025		depends="extra166yclean, extra166yjar">
1026		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
#	Line 1045 | Line 1033 | As of 2013-02, the very latest lambda 8
1033
1034		<!-- jsr166e -->
1035
1036	+	<property name="build.jsr166e.java.version" value="6"/>
1037	+	<property name="build.jsr166e.javac" value="${javac6}"/>
1038	+
1039		<target name="jsr166ecompile"
1040		depends="configure-compiler"
1041		description="Compiles jsr166e sources">
#	Line 1056 | Line 1047 | As of 2013-02, the very latest lambda 8
1047		debug="${build.debug}"
1048		debuglevel="${build.debuglevel}"
1049		deprecation="${build.deprecation}"
1050	<	source="7"
1050	>	source="${build.jsr166e.java.version}"
1051		classpath=""
1052		includeAntRuntime="false"
1053		includeJavaRuntime="false"
1054	<	executable="${javac7}"
1054	>	executable="${build.jsr166e.javac}"
1055		fork="true">
1056
1057		<include name="jsr166e/**/*.java"/>
1058		<compilerarg value="-XDignore.symbol.file=true"/>
1059		<compilerarg value="-Xlint:all"/>
1060	+	<compilerarg value="-Werror"/>
1061		<compilerarg line="${build.args}"/>
1062
1063		</javac>
1064		</target>
1065
1066	+	<!-- jsr166e: find doclint errors -->
1067	+	<target name="jsr166edoclint">
1068	+
1069	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
1070	+
1071	+	<javac srcdir="${topsrc.dir}"
1072	+	destdir="${build.jsr166e.classes.dir}"
1073	+	debug="${build.debug}"
1074	+	debuglevel="${build.debuglevel}"
1075	+	deprecation="${build.deprecation}"
1076	+	source="${build.jsr166e.java.version}"
1077	+	classpath=""
1078	+	bootclasspath="${bootclasspath7}"
1079	+	includeAntRuntime="false"
1080	+	includeJavaRuntime="false"
1081	+	executable="${javac8}"
1082	+	fork="true">
1083	+
1084	+	<include name="jsr166e/**/*.java"/>
1085	+	<compilerarg value="-XDignore.symbol.file=true"/>
1086	+	<compilerarg value="-Xlint:all"/>
1087	+	<compilerarg value="-Werror"/>
1088	+	<compilerarg value="-Xdoclint:all/protected"/>
1089	+
1090	+	</javac>
1091	+	</target>
1092	+
1093
1094		<target name="jsr166ejar"
1095		depends="jsr166ecompile"
#	Line 1091 | Line 1110 | As of 2013-02, the very latest lambda 8
1110
1111		<javadoc destdir="${jsr166edocs.dir}"
1112		packagenames="jsr166e.*"
1113	<	link="${jdkapidocs.url}"
1113	>	link="${java.api.url}"
1114		access="${build.javadoc.access}"
1115	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1116	<	source="7"
1115	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1116	>	source="${build.jsr166e.java.version}"
1117		executable="${javadoc7}">
1118	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1119		<arg value="-XDignore.symbol.file=true"/>
1120
1121		</javadoc>
1122		</target>
1123
1124
1125	<	<target name="jsr166e-test-tck"
1126	<	depends="jsr166ejar"
1127	<	description="Runs tck tests for jsr166e">
1125	>	<target name="jsr166e-test-tck-one-java-version"
1126	>	depends="jsr166ejar">
1127	>
1128	>	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1129
1130		<run-tck-tests
1131		tck.src.dir="${test.src.dir}/tck-jsr166e"
1132	<	target="7"
1132	>	target="${build.jsr166e.java.version}"
1133		workdir="${build.jsr166e.dir}"
1134		classes="${jsr166e.jar}"/>
1135		</target>
1136
1137	+	<target name="jsr166e-test-tck"
1138	+	description="Runs tck tests for jsr166e for multiple java versions">
1139	+
1140	+	<!--     <antcall target="clean"/> -->
1141	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1142	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1143	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1144	+	<!--     </antcall> -->
1145	+
1146	+	<antcall target="clean"/>
1147	+	<antcall target="jsr166e-test-tck-one-java-version">
1148	+	<param name="build.jsr166e.java.version" value="7"/>
1149	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1150	+	</antcall>
1151	+
1152	+	<antcall target="clean"/>
1153	+	<antcall target="jsr166e-test-tck-one-java-version">
1154	+	<param name="build.jsr166e.java.version" value="6"/>
1155	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1156	+	</antcall>
1157	+	</target>
1158	+
1159	+
1160	+	<target name="jsr166e-test"
1161	+	depends="jsr166e-test-tck"
1162	+	description="Runs all tests for jsr166e">
1163	+	</target>
1164
1165		<target name="jsr166edist"
1166		depends="jsr166edist-jar, jsr166edist-docs"
#	Line 1125 | Line 1173 | As of 2013-02, the very latest lambda 8
1173		</target>
1174
1175
1128	–	<target name="jsr166edist-clean"
1129	–	description="Removes all build and distribution products">
1130	–
1131	–	</target>
1132	–
1176		<target name="jsr166edist-jar"
1177		depends="jsr166eclean, jsr166ejar">
1178		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
#	Line 1145 | Line 1188 | As of 2013-02, the very latest lambda 8
1188
1189		<target name="lint">
1190		<antcall target="dists">
1191	+	<param name="build.javadoc.access" value="public"/>
1192	+	</antcall>
1193	+	</target>
1194	+
1195	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1196	+	<target name="lint-private">
1197	+	<antcall target="dist">
1198		<param name="build.javadoc.access" value="private"/>
1199		</antcall>
1200		</target>

Diff Legend

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