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.165 by jsr166, Wed Jun 17 01:55:44 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">
492	>	<target name="test89"
493	>	description="Runs tck and jtreg tests for main for multiple java versions">
494
495	<	<!-- May be overridden by user.properties -->
496	<	<property name="testcase" value="*"/>
497	<
498	<	<mkdir dir="${build.reports.dir}"/>
499	<
500	<	<junit printsummary="true"
481	<	showoutput="true"
482	<	errorProperty="junit.failed"
483	<	failureProperty="junit.failed"
484	<	dir="${build.reports.dir}"
485	<	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 637 | Line 581 | As of 2013-02, the very latest lambda 8
581		<compilerarg value="-Xprefer:source"/>
582		<compilerarg value="-XDignore.symbol.file=true"/>
583		<compilerarg value="-Xlint:all"/>
584	+	<compilerarg value="-Werror"/>
585	+	<compilerarg line="${build.args}"/>
586	+
587	+	</javac>
588	+	</target>
589	+
590	+	<target name="4jdk7doclint"
591	+	depends="configure-compiler"
592	+	description="Finds doclint warnings">
593	+
594	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
595	+
596	+	<javac srcdir="${4jdk7src.dir}"
597	+	destdir="${build.4jdk7.classes.dir}"
598	+	debug="${build.debug}"
599	+	debuglevel="${build.debuglevel}"
600	+	deprecation="${build.deprecation}"
601	+	source="6"
602	+	classpath=""
603	+	bootclasspath="${bootclasspath7}"
604	+	includeAntRuntime="false"
605	+	includeJavaRuntime="false"
606	+	executable="${javac8}"
607	+	fork="true">
608	+
609	+	<include name="**/*.java"/>
610	+	<compilerarg value="-Xprefer:source"/>
611	+	<compilerarg value="-XDignore.symbol.file=true"/>
612	+	<compilerarg value="-Xlint:all"/>
613	+	<compilerarg value="-Xdoclint:all/protected"/>
614		<compilerarg line="${build.args}"/>
615
616		</javac>
#	Line 665 | Line 639 | As of 2013-02, the very latest lambda 8
639		<javac-elements>
640		<!-- JDK8+ test classes -->
641		<exclude name="*8Test.java"/>
642	+	<exclude name="*9Test.java"/>
643		<exclude name="DoubleAccumulatorTest.java"/>
644		<exclude name="DoubleAdderTest.java"/>
645		<exclude name="LongAccumulatorTest.java"/>
646		<exclude name="LongAdderTest.java"/>
647		<exclude name="CompletableFutureTest.java"/>
648	+	<exclude name="SplittableRandomTest.java"/>
649		<exclude name="StampedLockTest.java"/>
650		</javac-elements>
651		</run-tck-tests>
#	Line 698 | Line 674 | As of 2013-02, the very latest lambda 8
674
675		<formatter type="brief"/>
676
677	<	<test name="JSR166TestCase" haltonfailure="no">
677	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
678		</test>
679
680		</junit>
#	Line 728 | Line 704 | As of 2013-02, the very latest lambda 8
704
705		<javadoc destdir="${4jdk7docs.dir}"
706		packagenames="none"
707	<	link="${jdkapi7docs.url}"
707	>	link="${java7.api.url}"
708		overview="${4jdk7src.dir}/intro.html"
709		access="${build.javadoc.access}"
710		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
#	Line 737 | Line 713 | As of 2013-02, the very latest lambda 8
713		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
714		<include name="**/*.java"/>
715		</fileset>
716	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
717		<arg value="-XDignore.symbol.file=true"/>
718		</javadoc>
719		</target>
#	Line 755 | Line 732 | As of 2013-02, the very latest lambda 8
732		</target>
733
734
758	–	<target name="4jdk7dist-clean"
759	–	description="Removes all build and distribution products">
760	–
761	–	</target>
762	–
735		<target name="4jdk7dist-jar"
736		depends="4jdk7clean, 4jdk7jar">
737		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
#	Line 796 | Line 768 | As of 2013-02, the very latest lambda 8
768		<include name="jsr166x/**/*.java"/>
769		<compilerarg value="-XDignore.symbol.file=true"/>
770		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
771	+	<compilerarg value="-Werror"/>
772		<compilerarg line="${build.args}"/>
773
774		</javac>
#	Line 821 | Line 794 | As of 2013-02, the very latest lambda 8
794
795		<javadoc destdir="${jsr166xdocs.dir}"
796		packagenames="jsr166x.*"
797	<	link="${jdkapidocs.url}"
797	>	link="${java.api.url}"
798		access="${build.javadoc.access}"
799		sourcepath="${topsrc.dir}:${jdk6src.dir}"
800		bootclasspath="${bootclasspath6}"
801		source="5"
802		executable="${javadoc7}">
803	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
804		<arg value="-XDignore.symbol.file=true"/>
805
806		</javadoc>
#	Line 846 | Line 820 | As of 2013-02, the very latest lambda 8
820		</target>
821
822
849	–	<target name="jsr166xdist-clean"
850	–	description="Removes all build and distribution products">
851	–
852	–	</target>
853	–
854	–
823		<target name="jsr166xdist-jar"
824		depends="jsr166xclean, jsr166xjar">
825		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
#	Line 887 | Line 855 | As of 2013-02, the very latest lambda 8
855		<include name="jsr166y/**/*.java"/>
856		<compilerarg value="-XDignore.symbol.file=true"/>
857		<compilerarg value="-Xlint:all"/>
858	+	<compilerarg value="-Werror"/>
859		<compilerarg line="${build.args}"/>
860
861		</javac>
#	Line 912 | Line 881 | As of 2013-02, the very latest lambda 8
881
882		<javadoc destdir="${jsr166ydocs.dir}"
883		packagenames="jsr166y.*"
884	<	link="${jdkapidocs.url}"
884	>	link="${java.api.url}"
885		access="${build.javadoc.access}"
886		sourcepath="${topsrc.dir}:${jdk6src.dir}"
887		bootclasspath="${bootclasspath6}"
888		source="6"
889		executable="${javadoc7}">
890	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
891		<arg value="-XDignore.symbol.file=true"/>
892
893		</javadoc>
#	Line 937 | Line 907 | As of 2013-02, the very latest lambda 8
907		</target>
908
909
940	–	<target name="jsr166ydist-clean"
941	–	description="Removes all build and distribution products">
942	–
943	–	</target>
944	–
910		<target name="jsr166ydist-jar"
911		depends="jsr166yclean, jsr166yjar">
912		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
#	Line 978 | Line 943 | As of 2013-02, the very latest lambda 8
943		<include name="extra166y/**/*.java"/>
944		<compilerarg value="-XDignore.symbol.file=true"/>
945		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
946	+	<compilerarg value="-Werror"/>
947		<compilerarg line="${build.args}"/>
948
949		</javac>
#	Line 1003 | Line 969 | As of 2013-02, the very latest lambda 8
969
970		<javadoc destdir="${extra166ydocs.dir}"
971		packagenames="extra166y.*"
972	<	link="${jdkapidocs.url}"
972	>	link="${java.api.url}"
973		access="${build.javadoc.access}"
974		sourcepath="${topsrc.dir}:${jdk6src.dir}"
975		bootclasspath="${bootclasspath6}"
976		source="6"
977		executable="${javadoc7}">
978	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
979		<arg value="-XDignore.symbol.file=true"/>
980
981		</javadoc>
#	Line 1028 | Line 995 | As of 2013-02, the very latest lambda 8
995		</target>
996
997
1031	–	<target name="extra166ydist-clean"
1032	–	description="Removes all build and distribution products">
1033	–
1034	–	</target>
1035	–
998		<target name="extra166ydist-jar"
999		depends="extra166yclean, extra166yjar">
1000		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
#	Line 1045 | Line 1007 | As of 2013-02, the very latest lambda 8
1007
1008		<!-- jsr166e -->
1009
1010	+	<property name="build.jsr166e.java.version" value="6"/>
1011	+	<property name="build.jsr166e.javac" value="${javac6}"/>
1012	+
1013		<target name="jsr166ecompile"
1014		depends="configure-compiler"
1015		description="Compiles jsr166e sources">
#	Line 1056 | Line 1021 | As of 2013-02, the very latest lambda 8
1021		debug="${build.debug}"
1022		debuglevel="${build.debuglevel}"
1023		deprecation="${build.deprecation}"
1024	<	source="7"
1024	>	source="${build.jsr166e.java.version}"
1025		classpath=""
1026		includeAntRuntime="false"
1027		includeJavaRuntime="false"
1028	<	executable="${javac7}"
1028	>	executable="${build.jsr166e.javac}"
1029		fork="true">
1030
1031		<include name="jsr166e/**/*.java"/>
1032		<compilerarg value="-XDignore.symbol.file=true"/>
1033		<compilerarg value="-Xlint:all"/>
1034	+	<compilerarg value="-Werror"/>
1035		<compilerarg line="${build.args}"/>
1036
1037		</javac>
1038		</target>
1039
1040	+	<!-- jsr166e: find doclint errors -->
1041	+	<target name="jsr166edoclint">
1042	+
1043	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
1044	+
1045	+	<javac srcdir="${topsrc.dir}"
1046	+	destdir="${build.jsr166e.classes.dir}"
1047	+	debug="${build.debug}"
1048	+	debuglevel="${build.debuglevel}"
1049	+	deprecation="${build.deprecation}"
1050	+	source="${build.jsr166e.java.version}"
1051	+	classpath=""
1052	+	bootclasspath="${bootclasspath7}"
1053	+	includeAntRuntime="false"
1054	+	includeJavaRuntime="false"
1055	+	executable="${javac8}"
1056	+	fork="true">
1057	+
1058	+	<include name="jsr166e/**/*.java"/>
1059	+	<compilerarg value="-XDignore.symbol.file=true"/>
1060	+	<compilerarg value="-Xlint:all"/>
1061	+	<compilerarg value="-Werror"/>
1062	+	<compilerarg value="-Xdoclint:all/protected"/>
1063	+
1064	+	</javac>
1065	+	</target>
1066	+
1067
1068		<target name="jsr166ejar"
1069		depends="jsr166ecompile"
#	Line 1091 | Line 1084 | As of 2013-02, the very latest lambda 8
1084
1085		<javadoc destdir="${jsr166edocs.dir}"
1086		packagenames="jsr166e.*"
1087	<	link="${jdkapidocs.url}"
1087	>	link="${java.api.url}"
1088		access="${build.javadoc.access}"
1089	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1090	<	source="7"
1089	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1090	>	source="${build.jsr166e.java.version}"
1091		executable="${javadoc7}">
1092	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1093		<arg value="-XDignore.symbol.file=true"/>
1094
1095		</javadoc>
1096		</target>
1097
1098
1099	<	<target name="jsr166e-test-tck"
1100	<	depends="jsr166ejar"
1101	<	description="Runs tck tests for jsr166e">
1099	>	<target name="jsr166e-test-tck-one-java-version"
1100	>	depends="jsr166ejar">
1101	>
1102	>	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1103
1104		<run-tck-tests
1105		tck.src.dir="${test.src.dir}/tck-jsr166e"
1106	<	target="7"
1106	>	target="${build.jsr166e.java.version}"
1107		workdir="${build.jsr166e.dir}"
1108		classes="${jsr166e.jar}"/>
1109		</target>
1110
1111	+	<target name="jsr166e-test-tck"
1112	+	description="Runs tck tests for jsr166e for multiple java versions">
1113	+
1114	+	<!--     <antcall target="clean"/> -->
1115	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1116	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1117	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1118	+	<!--     </antcall> -->
1119	+
1120	+	<antcall target="clean"/>
1121	+	<antcall target="jsr166e-test-tck-one-java-version">
1122	+	<param name="build.jsr166e.java.version" value="7"/>
1123	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1124	+	</antcall>
1125	+
1126	+	<antcall target="clean"/>
1127	+	<antcall target="jsr166e-test-tck-one-java-version">
1128	+	<param name="build.jsr166e.java.version" value="6"/>
1129	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1130	+	</antcall>
1131	+	</target>
1132	+
1133	+
1134	+	<target name="jsr166e-test"
1135	+	depends="jsr166e-test-tck"
1136	+	description="Runs all tests for jsr166e">
1137	+	</target>
1138
1139		<target name="jsr166edist"
1140		depends="jsr166edist-jar, jsr166edist-docs"
#	Line 1125 | Line 1147 | As of 2013-02, the very latest lambda 8
1147		</target>
1148
1149
1128	–	<target name="jsr166edist-clean"
1129	–	description="Removes all build and distribution products">
1130	–
1131	–	</target>
1132	–
1150		<target name="jsr166edist-jar"
1151		depends="jsr166eclean, jsr166ejar">
1152		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
#	Line 1145 | Line 1162 | As of 2013-02, the very latest lambda 8
1162
1163		<target name="lint">
1164		<antcall target="dists">
1165	+	<param name="build.javadoc.access" value="public"/>
1166	+	</antcall>
1167	+	</target>
1168	+
1169	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1170	+	<target name="lint-private">
1171	+	<antcall target="dist">
1172		<param name="build.javadoc.access" value="private"/>
1173		</antcall>
1174		</target>

Diff Legend

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