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.149 by jsr166, Sat Jul 20 20:40:24 2013 UTC vs.
Revision 1.174 by jsr166, Thu Sep 3 01:38: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
#	Line 45 | 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	<	<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
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 tck
56	>	To stress test a single tck test class:
57	>	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
58	>	-->
59		<property name="jsr166.profileTests"     value="false"/>
60		<property name="jsr166.profileThreshold" value="100"/>
61		<property name="jsr166.runsPerTest"      value="1"/>
53	–	<!-- Allow running an individual tck test class -->
54	–	<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
62		<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63
64		<!-- Build locations -->
#	Line 115 | 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 155 | 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 184 | Line 202 | As of 2013-02, the very latest lambda 8
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 198 | Line 216 | As of 2013-02, the very latest lambda 8
216		source="@{compile-target}"
217		target="@{compile-target}"
218		classpath="${junit.jar}"
201	–	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
219		includeAntRuntime="false"
220		includeJavaRuntime="false"
221		executable="${javac@{compile-target}}"
#	Line 207 | Line 224 | As of 2013-02, the very latest lambda 8
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
#	Line 218 | Line 236 | As of 2013-02, the very latest lambda 8
236		fork="true">
237		<jvmarg value="-Xbootclasspath/p:@{classes}"/>
238		<jvmarg line="@{jvmflags}"/>
239	+
240	+	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 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}"/>
#	Line 230 | 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	<	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
280	>	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
281		<attribute name="source" default="7"/>
282		<attribute name="target"/>
283		<attribute name="workdir"/>
#	Line 242 | Line 288 | As of 2013-02, the very latest lambda 8
288		<delete dir="@{workdir}/JTreport" quiet="true"/>
289		<mkdir dir="@{workdir}/JTwork/scratch"/>
290		<mkdir dir="@{workdir}/JTreport"/>
291	<	<jtreg dir="@{jtreg.src.dir}"
291	>	<jtreg dir="${jtreg@{target}.src.dir}"
292		jdk="${jdk@{target}.home}"
293		workDir="@{workdir}/JTwork"
294		reportDir="@{workdir}/JTreport">
295	<
295	>	<patternset refid="jdk@{target}.jtreg.tests"/>
296		<arg value="-Xbootclasspath/p:@{classes}"/>
297		<arg value="-agentvm"/>
298		<arg value="-v:nopass,fail"/>
#	Line 269 | 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 287 | 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}"/>
#	Line 323 | 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"/>
#	Line 396 | 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	<
400	<	<target name="test-tck"
450	>	<target name="tck"
451		depends="jar"
452		description="Runs tck tests for main directly">
453
454		<run-tck-tests
455	<	target="8"
455	>	target="${build.main.java.version}"
456		workdir="${build.dir}"
457		classes="${product.jar}"/>
458		</target>
459
460	<	<target name="test-jtreg"
460	>	<target name="tck-parallelism-1"
461	>	description="Runs tck with given common pool parallelism">
462	>	<antcall target="tck">
463	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
464	>	</antcall>
465	>	</target>
466	>
467	>	<target name="tck-parallelism-0"
468	>	description="Runs tck with given common pool parallelism">
469	>	<antcall target="tck">
470	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
471	>	</antcall>
472	>	</target>
473	>
474	>	<target name="jtreg"
475		depends="jar"
476		description="Runs jtreg tests for main using the jtreg ant task">
477		<run-jtreg-tests
478	<	target="8"
478	>	target="${build.main.java.version}"
479		workdir="${build.dir}"
480		classes="${product.jar}"/>
481		</target>
482
483		<target name="test"
484	<	depends="test-tck, test-jtreg"
484	>	depends="tck, tck-parallelism-1, jtreg"
485		description="Runs tck and jtreg tests for main">
486		</target>
487
488	+	<target name="jtreg8" description="Runs jtreg tests with jdk8">
489	+
490	+	<antcall target="jtreg">
491	+	<param name="build.main.java.version" value="8"/>
492	+	<param name="build.main.javac" value="${javac8}"/>
493	+	</antcall>
494	+
495	+	</target>
496	+
497	+	<target name="test89"
498	+	description="Runs tck and jtreg tests for main for multiple java versions">
499	+
500	+	<antcall target="clean"/>
501	+	<antcall target="test">
502	+	<param name="build.main.java.version" value="8"/>
503	+	<param name="build.main.javac" value="${javac8}"/>
504	+	</antcall>
505	+
506	+	<antcall target="clean"/>
507	+	<antcall target="test">
508	+	<param name="build.main.java.version" value="9"/>
509	+	<param name="build.main.javac" value="${javac9}"/>
510	+	</antcall>
511	+
512	+	</target>
513	+
514
515
516		<target name="configure-compiler">
#	Line 470 | Line 560 | As of 2013-02, the very latest lambda 8
560		</target>
561
562
563	+	<target name="compile-test-loops" depends="jar"
564	+	description="compile all the perf tests in src/test/loops">
565	+
566	+	<mkdir dir="${build.dir}/test/loops"/>
567	+
568	+	<javac srcdir="${basedir}/src/test/loops"
569	+	destdir="${build.dir}/test/loops"
570	+	debug="${build.debug}"
571	+	debuglevel="${build.debuglevel}"
572	+	deprecation="${build.deprecation}"
573	+	includeAntRuntime="false"
574	+	includeJavaRuntime="false"
575	+	executable="${javac9}"
576	+	fork="true">
577	+
578	+	<include name="*.java"/>
579	+	<compilerarg value="-XDignore.symbol.file=true"/>
580	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
581	+	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
582	+	<compilerarg line="${build.args}"/>
583	+
584	+	</javac>
585	+
586	+	</target>
587	+
588	+
589		<!-- jsr166 4jdk7 -->
590
591		<target name="4jdk7compile"
#	Line 495 | Line 611 | As of 2013-02, the very latest lambda 8
611		<compilerarg value="-Xprefer:source"/>
612		<compilerarg value="-XDignore.symbol.file=true"/>
613		<compilerarg value="-Xlint:all"/>
614	+	<compilerarg value="-Werror"/>
615		<compilerarg line="${build.args}"/>
616
617		</javac>
#	Line 541 | Line 658 | As of 2013-02, the very latest lambda 8
658		</target>
659
660
661	<	<target name="4jdk7-test-tck"
661	>	<target name="4jdk7-tck"
662		depends="4jdk7jar"
663		description="Runs tck tests for jsr166-4jdk7 directly">
664
#	Line 552 | Line 669 | As of 2013-02, the very latest lambda 8
669		<javac-elements>
670		<!-- JDK8+ test classes -->
671		<exclude name="*8Test.java"/>
672	+	<exclude name="*9Test.java"/>
673		<exclude name="DoubleAccumulatorTest.java"/>
674		<exclude name="DoubleAdderTest.java"/>
675		<exclude name="LongAccumulatorTest.java"/>
#	Line 564 | Line 682 | As of 2013-02, the very latest lambda 8
682		</target>
683
684
685	<	<target name="4jdk7-test-tck-junit"
685	>	<target name="4jdk7-tck-junit"
686		depends="4jdk7compile"
687		description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
688
#	Line 592 | Line 710 | As of 2013-02, the very latest lambda 8
710		</junit>
711		</target>
712
713	<	<target name="4jdk7-test-jtreg"
713	>	<target name="4jdk7-jtreg"
714		depends="4jdk7jar"
715		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
716		<run-jtreg-tests
717		target="7"
718		workdir="${build.4jdk7.dir}"
719	<	classes="${4jdk7product.jar}"
602	<	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
719	>	classes="${4jdk7product.jar}"/>
720		</target>
721
722
723		<target name="4jdk7-test"
724	<	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
724	>	depends="4jdk7-tck, 4jdk7-jtreg"
725		description="Runs tck and jtreg tests for jsr166-4jdk7">
726		</target>
727
#	Line 617 | Line 734 | As of 2013-02, the very latest lambda 8
734
735		<javadoc destdir="${4jdk7docs.dir}"
736		packagenames="none"
737	<	link="${jdkapi7docs.url}"
737	>	link="${java7.api.url}"
738		overview="${4jdk7src.dir}/intro.html"
739		access="${build.javadoc.access}"
740		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
#	Line 626 | Line 743 | As of 2013-02, the very latest lambda 8
743		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
744		<include name="**/*.java"/>
745		</fileset>
746	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
747		<arg value="-XDignore.symbol.file=true"/>
748		</javadoc>
749		</target>
#	Line 680 | Line 798 | As of 2013-02, the very latest lambda 8
798		<include name="jsr166x/**/*.java"/>
799		<compilerarg value="-XDignore.symbol.file=true"/>
800		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
801	+	<compilerarg value="-Werror"/>
802		<compilerarg line="${build.args}"/>
803
804		</javac>
#	Line 705 | Line 824 | As of 2013-02, the very latest lambda 8
824
825		<javadoc destdir="${jsr166xdocs.dir}"
826		packagenames="jsr166x.*"
827	<	link="${jdkapidocs.url}"
827	>	link="${java.api.url}"
828		access="${build.javadoc.access}"
829		sourcepath="${topsrc.dir}:${jdk6src.dir}"
830		bootclasspath="${bootclasspath6}"
831		source="5"
832		executable="${javadoc7}">
833	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
834		<arg value="-XDignore.symbol.file=true"/>
835
836		</javadoc>
#	Line 765 | Line 885 | As of 2013-02, the very latest lambda 8
885		<include name="jsr166y/**/*.java"/>
886		<compilerarg value="-XDignore.symbol.file=true"/>
887		<compilerarg value="-Xlint:all"/>
888	+	<compilerarg value="-Werror"/>
889		<compilerarg line="${build.args}"/>
890
891		</javac>
#	Line 790 | Line 911 | As of 2013-02, the very latest lambda 8
911
912		<javadoc destdir="${jsr166ydocs.dir}"
913		packagenames="jsr166y.*"
914	<	link="${jdkapidocs.url}"
914	>	link="${java.api.url}"
915		access="${build.javadoc.access}"
916		sourcepath="${topsrc.dir}:${jdk6src.dir}"
917		bootclasspath="${bootclasspath6}"
918		source="6"
919		executable="${javadoc7}">
920	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
921		<arg value="-XDignore.symbol.file=true"/>
922
923		</javadoc>
#	Line 851 | Line 973 | As of 2013-02, the very latest lambda 8
973		<include name="extra166y/**/*.java"/>
974		<compilerarg value="-XDignore.symbol.file=true"/>
975		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
976	+	<compilerarg value="-Werror"/>
977		<compilerarg line="${build.args}"/>
978
979		</javac>
#	Line 876 | Line 999 | As of 2013-02, the very latest lambda 8
999
1000		<javadoc destdir="${extra166ydocs.dir}"
1001		packagenames="extra166y.*"
1002	<	link="${jdkapidocs.url}"
1002	>	link="${java.api.url}"
1003		access="${build.javadoc.access}"
1004		sourcepath="${topsrc.dir}:${jdk6src.dir}"
1005		bootclasspath="${bootclasspath6}"
1006		source="6"
1007		executable="${javadoc7}">
1008	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1009		<arg value="-XDignore.symbol.file=true"/>
1010
1011		</javadoc>
#	Line 937 | Line 1061 | As of 2013-02, the very latest lambda 8
1061		<include name="jsr166e/**/*.java"/>
1062		<compilerarg value="-XDignore.symbol.file=true"/>
1063		<compilerarg value="-Xlint:all"/>
1064	+	<compilerarg value="-Werror"/>
1065		<compilerarg line="${build.args}"/>
1066
1067		</javac>
1068		</target>
1069
1070	+	<!-- jsr166e: find doclint errors -->
1071	+	<target name="jsr166edoclint">
1072	+
1073	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
1074	+
1075	+	<javac srcdir="${topsrc.dir}"
1076	+	destdir="${build.jsr166e.classes.dir}"
1077	+	debug="${build.debug}"
1078	+	debuglevel="${build.debuglevel}"
1079	+	deprecation="${build.deprecation}"
1080	+	source="${build.jsr166e.java.version}"
1081	+	classpath=""
1082	+	bootclasspath="${bootclasspath7}"
1083	+	includeAntRuntime="false"
1084	+	includeJavaRuntime="false"
1085	+	executable="${javac8}"
1086	+	fork="true">
1087	+
1088	+	<include name="jsr166e/**/*.java"/>
1089	+	<compilerarg value="-XDignore.symbol.file=true"/>
1090	+	<compilerarg value="-Xlint:all"/>
1091	+	<compilerarg value="-Werror"/>
1092	+	<compilerarg value="-Xdoclint:all/protected"/>
1093	+
1094	+	</javac>
1095	+	</target>
1096	+
1097
1098		<target name="jsr166ejar"
1099		depends="jsr166ecompile"
#	Line 962 | Line 1114 | As of 2013-02, the very latest lambda 8
1114
1115		<javadoc destdir="${jsr166edocs.dir}"
1116		packagenames="jsr166e.*"
1117	<	link="${jdkapidocs.url}"
1117	>	link="${java.api.url}"
1118		access="${build.javadoc.access}"
1119		sourcepath="${topsrc.dir}:${jdk6src.dir}"
1120		source="${build.jsr166e.java.version}"
1121		executable="${javadoc7}">
1122	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1123		<arg value="-XDignore.symbol.file=true"/>
1124
1125		</javadoc>
1126		</target>
1127
1128
1129	<	<target name="jsr166e-test-tck-one-java-version"
1129	>	<target name="jsr166e-tck-one-java-version"
1130		depends="jsr166ejar">
1131
1132		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
#	Line 985 | Line 1138 | As of 2013-02, the very latest lambda 8
1138		classes="${jsr166e.jar}"/>
1139		</target>
1140
1141	<	<target name="jsr166e-test-tck"
1141	>	<target name="jsr166e-tck"
1142		description="Runs tck tests for jsr166e for multiple java versions">
1143
1144		<!--     <antcall target="clean"/> -->
1145	<	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1145	>	<!--     <antcall target="jsr166e-tck-one-java-version"> -->
1146		<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1147		<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1148		<!--     </antcall> -->
1149
1150		<antcall target="clean"/>
1151	<	<antcall target="jsr166e-test-tck-one-java-version">
1151	>	<antcall target="jsr166e-tck-one-java-version">
1152		<param name="build.jsr166e.java.version" value="7"/>
1153		<param name="build.jsr166e.javac" value="${javac7}"/>
1154		</antcall>
1155
1156		<antcall target="clean"/>
1157	<	<antcall target="jsr166e-test-tck-one-java-version">
1157	>	<antcall target="jsr166e-tck-one-java-version">
1158		<param name="build.jsr166e.java.version" value="6"/>
1159		<param name="build.jsr166e.javac" value="${javac6}"/>
1160		</antcall>
#	Line 1009 | Line 1162 | As of 2013-02, the very latest lambda 8
1162
1163
1164		<target name="jsr166e-test"
1165	<	depends="jsr166e-test-tck"
1165	>	depends="jsr166e-tck"
1166		description="Runs all tests for jsr166e">
1167		</target>
1168
#	Line 1039 | Line 1192 | As of 2013-02, the very latest lambda 8
1192
1193		<target name="lint">
1194		<antcall target="dists">
1195	+	<param name="build.javadoc.access" value="public"/>
1196	+	</antcall>
1197	+	</target>
1198	+
1199	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1200	+	<target name="lint-private">
1201	+	<antcall target="dist">
1202		<param name="build.javadoc.access" value="private"/>
1203		</antcall>
1204		</target>

Diff Legend

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