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.140 by jsr166, Mon May 20 19:12:23 2013 UTC vs.
Revision 1.171 by jsr166, Wed Sep 2 04:46:40 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	<	<!-- 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 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"/>
52	–	<!-- Allow running an individual tck test class -->
53	–	<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
62		<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63
64		<!-- Build locations -->
#	Line 114 | 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 154 | 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 183 | 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 197 | Line 213 | As of 2013-02, the very latest lambda 8
213		source="@{compile-target}"
214		target="@{compile-target}"
215		classpath="${junit.jar}"
200	–	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
216		includeAntRuntime="false"
217		includeJavaRuntime="false"
218		executable="${javac@{compile-target}}"
#	Line 206 | 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
#	Line 217 | Line 233 | As of 2013-02, the very latest lambda 8
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}"/>
#	Line 229 | 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	+	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
266	+	<exclude name="util/WeakHashMap/GCDuringIteration.java"/>
267	+	</patternset>
268	+	</fileset>
269	+
270	+	<fileset dir="${jtreg.src.dir}">
271	+	<patternset id="jdk7.jtreg.tests">
272	+	<include name="**/*.java"/>
273	+	<exclude name="util/Collection/CollectionDefaults.java"/>
274	+	<exclude name="util/List/ListDefaults.java"/>
275	+	<exclude name="util/Spliterator/**/*.java"/>
276	+	<exclude name="**/CompletableFuture/**/*.java"/>
277	+	<exclude name="**/ConcurrentAssociateTest.java"/>
278	+	<exclude name="**/ConcurrentContainsKeyTest.java"/>
279	+	<exclude name="**/ConcurrentHashMap/ToArray.java"/>
280	+	<exclude name="**/ConcurrentRemoveIf.java"/>
281	+	<exclude name="**/COWSubList.java"/>
282	+	<exclude name="**/FutureTask/NegativeTimeout.java"/>
283	+	<exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
284	+	<exclude name="**/StampedLock/**/*.java"/>
285	+	<exclude name="**/AtomicReferenceTest.java"/>
286	+	<exclude name="util/concurrent/atomic/Serial.java"/>
287	+	</patternset>
288	+	</fileset>
289	+
290		<macrodef name="run-jtreg-tests">
291	+	<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
292		<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
293		<attribute name="source" default="7"/>
294		<attribute name="target"/>
#	Line 245 | Line 304 | As of 2013-02, the very latest lambda 8
304		jdk="${jdk@{target}.home}"
305		workDir="@{workdir}/JTwork"
306		reportDir="@{workdir}/JTreport">
307	<
307	>	<patternset refid="jdk@{target}.jtreg.tests"/>
308		<arg value="-Xbootclasspath/p:@{classes}"/>
309		<arg value="-agentvm"/>
310		<arg value="-v:nopass,fail"/>
#	Line 268 | Line 327 | As of 2013-02, the very latest lambda 8
327
328		<!-- Main targets -->
329
330	+	<property name="build.main.java.version" value="9"/>
331	+	<property name="build.main.javac" value="${javac9}"/>
332	+
333		<target name="dists"
334		depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
335		description="Builds all public jars and docs"/>
#	Line 286 | Line 348 | As of 2013-02, the very latest lambda 8
348		classpath=""
349		includeAntRuntime="false"
350		includeJavaRuntime="false"
351	<	executable="${javac8}"
351	>	executable="${build.main.javac}"
352		fork="true">
353
354		<include name="**/*.java"/>
355		<compilerarg value="-Xprefer:source"/>
356		<compilerarg value="-XDignore.symbol.file=true"/>
357		<compilerarg value="-Xlint:all"/>
358	+	<compilerarg value="-Werror"/>
359	+	<compilerarg value="-Xdoclint:all/protected"/>
360	+	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
361		<compilerarg line="${build.args}"/>
362
363		</javac>
#	Line 309 | Line 374 | As of 2013-02, the very latest lambda 8
374		</target>
375
376
312	–	<target name="test"
313	–	depends="configure-tests, report-tests"
314	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
315	–
316	–
377		<target name="docs"
378		description="Builds javadocs for src/main to dist dir">
379
#	Line 325 | Line 385 | As of 2013-02, the very latest lambda 8
385
386		<javadoc destdir="${docs.dir}"
387		packagenames="none"
388	<	link="${jdkapi8docs.url}"
388	>	link="${java9.api.url}"
389		overview="${src.dir}/intro.html"
390		access="${build.javadoc.access}"
391	<	sourcepath="${src.dir}:${jdk8src.dir}"
391	>	sourcepath="${src.dir}:${jdk9src.dir}"
392		classpath=""
393	<	executable="${javadoc8}">
393	>	executable="${javadoc9}">
394		<fileset dir="${src.dir}" defaultexcludes="yes">
395		<include name="**/*.java"/>
396		</fileset>
397	+	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
398	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
399		<arg value="-XDignore.symbol.file=true"/>
400		<arg value="-tag"/>
401		<arg value="${javadoc.jls.option}"/>
402	+	<arg value="-tag"/>
403	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
404	+	<arg value="-tag"/>
405	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
406	+	<arg value="-tag"/>
407	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
408		</javadoc>
409		</target>
410
#	Line 375 | Line 443 | As of 2013-02, the very latest lambda 8
443		<target name="dist-clean"
444		description="Removes all build and distribution products">
445
446	+	<delete dir="${build.dir}"/>
447		<delete dir="${dist.dir}"/>
448
449		</target>
450
451
383	–	<!-- Internal targets -->
384	–
385	–
452		<target name="dist-jar"
453		depends="clean, jar">
454		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 393 | Line 459 | As of 2013-02, the very latest lambda 8
459		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
460		</target>
461
462	<
397	<	<target name="compile-tests"
398	<	depends="jar">
399	<
400	<	<mkdir dir="${build.testcases.dir}"/>
401	<
402	<	<javac srcdir="${tck.src.dir}"
403	<	destdir="${build.testcases.dir}"
404	<	debug="${build.debug}"
405	<	debuglevel="${build.debuglevel}"
406	<	deprecation="${build.deprecation}"
407	<	source="6"
408	<	classpath="${junit.jar}"
409	<	bootclasspath="@{product.jar}:${bootclasspath6}"
410	<	includeAntRuntime="false"
411	<	includeJavaRuntime="false"
412	<	executable="${javac8}"
413	<	fork="true">
414	<
415	<	<include name="**/*.java"/>
416	<	<compilerarg value="-XDignore.symbol.file=true"/>
417	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
418	<	<compilerarg line="${build.args}"/>
419	<
420	<	</javac>
421	<
422	<	<javac srcdir="${test.src.dir}"
423	<	destdir="${build.testcases.dir}"
424	<	debug="${build.debug}"
425	<	debuglevel="${build.debuglevel}"
426	<	deprecation="${build.deprecation}"
427	<	source="6"
428	<	classpath=""
429	<	bootclasspath="@{product.jar}:${bootclasspath6}"
430	<	includeAntRuntime="false"
431	<	includeJavaRuntime="false"
432	<	executable="${javac8}"
433	<	fork="true">
434	<
435	<	<include name="jsr166/test/**/*.java"/>
436	<	<compilerarg value="-XDignore.symbol.file=true"/>
437	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
438	<	<compilerarg line="${build.args}"/>
439	<
440	<	</javac>
441	<
442	<	<!--
443	<	<javac srcdir="${jtreg.src.dir}"
444	<	destdir="${build.testcases.dir}"
445	<	debug="${build.debug}"
446	<	debuglevel="${build.debuglevel}"
447	<	deprecation="${build.deprecation}"
448	<	source="${build.sourcelevel}"
449	<	fork="true">
450	<
451	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
452	<	<compilerarg value="-XDignore.symbol.file=true"/>
453	<	<compilerarg line="${build.args}"/>
454	<
455	<	</javac>
456	<	-->
457	<
458	<	</target>
459	<
462	>	<target name="tck" depends="test-tck" description="alias for test-tck"/>
463		<target name="test-tck"
464		depends="jar"
465		description="Runs tck tests for main directly">
466
467		<run-tck-tests
468	<	target="8"
468	>	target="${build.main.java.version}"
469		workdir="${build.dir}"
470		classes="${product.jar}"/>
471		</target>
472
473	+	<target name="test-tck-parallelism-1"
474	+	description="Runs test-tck with given common pool parallelism">
475	+	<antcall target="test-tck">
476	+	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
477	+	</antcall>
478	+	</target>
479	+
480	+	<target name="test-tck-parallelism-0"
481	+	description="Runs test-tck with given common pool parallelism">
482	+	<antcall target="test-tck">
483	+	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
484	+	</antcall>
485	+	</target>
486	+
487	+	<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
488		<target name="test-jtreg"
489		depends="jar"
490		description="Runs jtreg tests for main using the jtreg ant task">
491		<run-jtreg-tests
492	<	target="8"
492	>	target="${build.main.java.version}"
493		workdir="${build.dir}"
494		classes="${product.jar}"/>
495		</target>
496
497	<	<target name="test-ng"
498	<	depends="test-tck, test-jtreg"
497	>	<target name="test"
498	>	depends="test-tck, test-tck-parallelism-1, test-jtreg"
499		description="Runs tck and jtreg tests for main">
500		</target>
501
502	<	<target name="run-tests"
485	<	depends="compile-tests">
486	<
487	<	<!-- May be overridden by user.properties -->
488	<	<property name="testcase" value="*"/>
489	<
490	<	<mkdir dir="${build.reports.dir}"/>
502	>	<target name="jtreg8" description="Runs jtreg tests with jdk8">
503
504	<	<junit printsummary="true"
505	<	showoutput="true"
506	<	errorProperty="junit.failed"
507	<	failureProperty="junit.failed"
496	<	dir="${build.reports.dir}"
497	<	jvm="${java8}"
498	<	fork="true">
499	<
500	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
501	<	<jvmarg value="-server"/>
502	<	<jvmarg value="-showversion"/>
503	<
504	<	<classpath refid="test.classpath"/>
505	<
506	<	<formatter type="xml"/>
507	<
508	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
509	<	<fileset dir="${tck.src.dir}">
510	<	<include name="**/${testcase}Test.java"/>
511	<	</fileset>
512	<	</batchtest>
513	<
514	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
515	<	<fileset dir="${test.src.dir}">
516	<	<include name="jsr166/test/**/${testcase}Test.java"/>
517	<	</fileset>
518	<	</batchtest>
519	<
520	<	<!--
521	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
522	<	<fileset dir="${jtreg.src.dir}">
523	<	<include name="**/${testcase}Test.java"/>
524	<	</fileset>
525	<	</batchtest>
526	<	-->
527	<
528	<	</junit>
504	>	<antcall target="jtreg">
505	>	<param name="build.main.java.version" value="8"/>
506	>	<param name="build.main.javac" value="${javac8}"/>
507	>	</antcall>
508
509		</target>
510
511	+	<target name="test89"
512	+	description="Runs tck and jtreg tests for main for multiple java versions">
513
514	<	<target name="report-tests"
515	<	depends="run-tests">
516	<
517	<	<!-- Sets junit.report.format to frames if redirection is present,
518	<	otherwise sets it to noframes. -->
538	<	<available property="junit.report.format"
539	<	value="frames"
540	<	classname="org.apache.xalan.lib.Redirect"
541	<	/>
542	<	<property name="junit.report.format" value="noframes"/>
543	<
544	<	<junitreport todir="${build.reports.dir}">
545	<	<fileset dir="${build.reports.dir}">
546	<	<include name="TEST-*.xml"/>
547	<	</fileset>
548	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
549	<	/>
550	<	</junitreport>
514	>	<antcall target="clean"/>
515	>	<antcall target="test">
516	>	<param name="build.main.java.version" value="8"/>
517	>	<param name="build.main.javac" value="${javac8}"/>
518	>	</antcall>
519
520	<	<fail message="Test Cases Failed" if="junit.failed"/>
520	>	<antcall target="clean"/>
521	>	<antcall target="test">
522	>	<param name="build.main.java.version" value="9"/>
523	>	<param name="build.main.javac" value="${javac9}"/>
524	>	</antcall>
525
526		</target>
527
528
529	+
530		<target name="configure-compiler">
531
532		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 571 | Line 544 | As of 2013-02, the very latest lambda 8
544		</target>
545
546
574	–	<target name="configure-tests"
575	–	depends="configure-compiler">
576	–
577	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
578	–	<available property="junit.available"
579	–	classname="junit.framework.Protectable"/>
580	–
581	–	<!-- Xalan -->
582	–	<available property="xalan.available"
583	–	classname="org.apache.xalan.Version"/>
584	–
585	–
586	–	<!-- Ant 1.6beta and later don't need or want this check -->
587	–	<!--
588	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
589	–	unless="junit.available"/>
590	–
591	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
592	–	unless="xalan.available"/>
593	–	-->
594	–
595	–	</target>
596	–
547
548		<!-- Various demos and test programs -->
549
#	Line 624 | Line 574 | As of 2013-02, the very latest lambda 8
574		</target>
575
576
577	+	<target name="compile-test-loops" depends="jar"
578	+	description="compile all the perf tests in src/test/loops">
579	+
580	+	<mkdir dir="${build.dir}/test/loops"/>
581	+
582	+	<javac srcdir="${basedir}/src/test/loops"
583	+	destdir="${build.dir}/test/loops"
584	+	debug="${build.debug}"
585	+	debuglevel="${build.debuglevel}"
586	+	deprecation="${build.deprecation}"
587	+	includeAntRuntime="false"
588	+	includeJavaRuntime="false"
589	+	executable="${javac9}"
590	+	fork="true">
591	+
592	+	<include name="*.java"/>
593	+	<compilerarg value="-XDignore.symbol.file=true"/>
594	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
595	+	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
596	+	<compilerarg line="${build.args}"/>
597	+
598	+	</javac>
599	+
600	+	</target>
601	+
602	+
603		<!-- jsr166 4jdk7 -->
604
605		<target name="4jdk7compile"
#	Line 649 | Line 625 | As of 2013-02, the very latest lambda 8
625		<compilerarg value="-Xprefer:source"/>
626		<compilerarg value="-XDignore.symbol.file=true"/>
627		<compilerarg value="-Xlint:all"/>
628	+	<compilerarg value="-Werror"/>
629	+	<compilerarg line="${build.args}"/>
630	+
631	+	</javac>
632	+	</target>
633	+
634	+	<target name="4jdk7doclint"
635	+	depends="configure-compiler"
636	+	description="Finds doclint warnings">
637	+
638	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
639	+
640	+	<javac srcdir="${4jdk7src.dir}"
641	+	destdir="${build.4jdk7.classes.dir}"
642	+	debug="${build.debug}"
643	+	debuglevel="${build.debuglevel}"
644	+	deprecation="${build.deprecation}"
645	+	source="6"
646	+	classpath=""
647	+	bootclasspath="${bootclasspath7}"
648	+	includeAntRuntime="false"
649	+	includeJavaRuntime="false"
650	+	executable="${javac8}"
651	+	fork="true">
652	+
653	+	<include name="**/*.java"/>
654	+	<compilerarg value="-Xprefer:source"/>
655	+	<compilerarg value="-XDignore.symbol.file=true"/>
656	+	<compilerarg value="-Xlint:all"/>
657	+	<compilerarg value="-Xdoclint:all/protected"/>
658		<compilerarg line="${build.args}"/>
659
660		</javac>
#	Line 677 | Line 683 | As of 2013-02, the very latest lambda 8
683		<javac-elements>
684		<!-- JDK8+ test classes -->
685		<exclude name="*8Test.java"/>
686	+	<exclude name="*9Test.java"/>
687		<exclude name="DoubleAccumulatorTest.java"/>
688		<exclude name="DoubleAdderTest.java"/>
689		<exclude name="LongAccumulatorTest.java"/>
690		<exclude name="LongAdderTest.java"/>
691		<exclude name="CompletableFutureTest.java"/>
692	+	<exclude name="SplittableRandomTest.java"/>
693		<exclude name="StampedLockTest.java"/>
694		</javac-elements>
695		</run-tck-tests>
#	Line 740 | Line 748 | As of 2013-02, the very latest lambda 8
748
749		<javadoc destdir="${4jdk7docs.dir}"
750		packagenames="none"
751	<	link="${jdkapi7docs.url}"
751	>	link="${java7.api.url}"
752		overview="${4jdk7src.dir}/intro.html"
753		access="${build.javadoc.access}"
754		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
#	Line 749 | Line 757 | As of 2013-02, the very latest lambda 8
757		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
758		<include name="**/*.java"/>
759		</fileset>
760	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
761		<arg value="-XDignore.symbol.file=true"/>
762		</javadoc>
763		</target>
#	Line 767 | Line 776 | As of 2013-02, the very latest lambda 8
776		</target>
777
778
770	–	<target name="4jdk7dist-clean"
771	–	description="Removes all build and distribution products">
772	–
773	–	</target>
774	–
779		<target name="4jdk7dist-jar"
780		depends="4jdk7clean, 4jdk7jar">
781		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
#	Line 808 | Line 812 | As of 2013-02, the very latest lambda 8
812		<include name="jsr166x/**/*.java"/>
813		<compilerarg value="-XDignore.symbol.file=true"/>
814		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
815	+	<compilerarg value="-Werror"/>
816		<compilerarg line="${build.args}"/>
817
818		</javac>
#	Line 833 | Line 838 | As of 2013-02, the very latest lambda 8
838
839		<javadoc destdir="${jsr166xdocs.dir}"
840		packagenames="jsr166x.*"
841	<	link="${jdkapidocs.url}"
841	>	link="${java.api.url}"
842		access="${build.javadoc.access}"
843		sourcepath="${topsrc.dir}:${jdk6src.dir}"
844		bootclasspath="${bootclasspath6}"
845		source="5"
846		executable="${javadoc7}">
847	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
848		<arg value="-XDignore.symbol.file=true"/>
849
850		</javadoc>
#	Line 858 | Line 864 | As of 2013-02, the very latest lambda 8
864		</target>
865
866
861	–	<target name="jsr166xdist-clean"
862	–	description="Removes all build and distribution products">
863	–
864	–	</target>
865	–
866	–
867		<target name="jsr166xdist-jar"
868		depends="jsr166xclean, jsr166xjar">
869		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
#	Line 899 | Line 899 | As of 2013-02, the very latest lambda 8
899		<include name="jsr166y/**/*.java"/>
900		<compilerarg value="-XDignore.symbol.file=true"/>
901		<compilerarg value="-Xlint:all"/>
902	+	<compilerarg value="-Werror"/>
903		<compilerarg line="${build.args}"/>
904
905		</javac>
#	Line 924 | Line 925 | As of 2013-02, the very latest lambda 8
925
926		<javadoc destdir="${jsr166ydocs.dir}"
927		packagenames="jsr166y.*"
928	<	link="${jdkapidocs.url}"
928	>	link="${java.api.url}"
929		access="${build.javadoc.access}"
930		sourcepath="${topsrc.dir}:${jdk6src.dir}"
931		bootclasspath="${bootclasspath6}"
932		source="6"
933		executable="${javadoc7}">
934	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
935		<arg value="-XDignore.symbol.file=true"/>
936
937		</javadoc>
#	Line 949 | Line 951 | As of 2013-02, the very latest lambda 8
951		</target>
952
953
952	–	<target name="jsr166ydist-clean"
953	–	description="Removes all build and distribution products">
954	–
955	–	</target>
956	–
954		<target name="jsr166ydist-jar"
955		depends="jsr166yclean, jsr166yjar">
956		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
#	Line 990 | Line 987 | As of 2013-02, the very latest lambda 8
987		<include name="extra166y/**/*.java"/>
988		<compilerarg value="-XDignore.symbol.file=true"/>
989		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
990	+	<compilerarg value="-Werror"/>
991		<compilerarg line="${build.args}"/>
992
993		</javac>
#	Line 1015 | Line 1013 | As of 2013-02, the very latest lambda 8
1013
1014		<javadoc destdir="${extra166ydocs.dir}"
1015		packagenames="extra166y.*"
1016	<	link="${jdkapidocs.url}"
1016	>	link="${java.api.url}"
1017		access="${build.javadoc.access}"
1018		sourcepath="${topsrc.dir}:${jdk6src.dir}"
1019		bootclasspath="${bootclasspath6}"
1020		source="6"
1021		executable="${javadoc7}">
1022	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1023		<arg value="-XDignore.symbol.file=true"/>
1024
1025		</javadoc>
#	Line 1040 | Line 1039 | As of 2013-02, the very latest lambda 8
1039		</target>
1040
1041
1043	–	<target name="extra166ydist-clean"
1044	–	description="Removes all build and distribution products">
1045	–
1046	–	</target>
1047	–
1042		<target name="extra166ydist-jar"
1043		depends="extra166yclean, extra166yjar">
1044		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
#	Line 1057 | Line 1051 | As of 2013-02, the very latest lambda 8
1051
1052		<!-- jsr166e -->
1053
1054	+	<property name="build.jsr166e.java.version" value="6"/>
1055	+	<property name="build.jsr166e.javac" value="${javac6}"/>
1056	+
1057		<target name="jsr166ecompile"
1058		depends="configure-compiler"
1059		description="Compiles jsr166e sources">
#	Line 1068 | Line 1065 | As of 2013-02, the very latest lambda 8
1065		debug="${build.debug}"
1066		debuglevel="${build.debuglevel}"
1067		deprecation="${build.deprecation}"
1068	<	source="7"
1068	>	source="${build.jsr166e.java.version}"
1069		classpath=""
1070		includeAntRuntime="false"
1071		includeJavaRuntime="false"
1072	<	executable="${javac7}"
1072	>	executable="${build.jsr166e.javac}"
1073		fork="true">
1074
1075		<include name="jsr166e/**/*.java"/>
1076		<compilerarg value="-XDignore.symbol.file=true"/>
1077		<compilerarg value="-Xlint:all"/>
1078	+	<compilerarg value="-Werror"/>
1079		<compilerarg line="${build.args}"/>
1080
1081		</javac>
1082		</target>
1083
1084	+	<!-- jsr166e: find doclint errors -->
1085	+	<target name="jsr166edoclint">
1086	+
1087	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
1088	+
1089	+	<javac srcdir="${topsrc.dir}"
1090	+	destdir="${build.jsr166e.classes.dir}"
1091	+	debug="${build.debug}"
1092	+	debuglevel="${build.debuglevel}"
1093	+	deprecation="${build.deprecation}"
1094	+	source="${build.jsr166e.java.version}"
1095	+	classpath=""
1096	+	bootclasspath="${bootclasspath7}"
1097	+	includeAntRuntime="false"
1098	+	includeJavaRuntime="false"
1099	+	executable="${javac8}"
1100	+	fork="true">
1101	+
1102	+	<include name="jsr166e/**/*.java"/>
1103	+	<compilerarg value="-XDignore.symbol.file=true"/>
1104	+	<compilerarg value="-Xlint:all"/>
1105	+	<compilerarg value="-Werror"/>
1106	+	<compilerarg value="-Xdoclint:all/protected"/>
1107	+
1108	+	</javac>
1109	+	</target>
1110	+
1111
1112		<target name="jsr166ejar"
1113		depends="jsr166ecompile"
#	Line 1103 | Line 1128 | As of 2013-02, the very latest lambda 8
1128
1129		<javadoc destdir="${jsr166edocs.dir}"
1130		packagenames="jsr166e.*"
1131	<	link="${jdkapidocs.url}"
1131	>	link="${java.api.url}"
1132		access="${build.javadoc.access}"
1133	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1134	<	source="7"
1133	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1134	>	source="${build.jsr166e.java.version}"
1135		executable="${javadoc7}">
1136	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1137		<arg value="-XDignore.symbol.file=true"/>
1138
1139		</javadoc>
1140		</target>
1141
1142
1143	<	<target name="jsr166e-test-tck"
1144	<	depends="jsr166ejar"
1145	<	description="Runs tck tests for jsr166e">
1143	>	<target name="jsr166e-test-tck-one-java-version"
1144	>	depends="jsr166ejar">
1145	>
1146	>	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1147
1148		<run-tck-tests
1149		tck.src.dir="${test.src.dir}/tck-jsr166e"
1150	<	target="7"
1150	>	target="${build.jsr166e.java.version}"
1151		workdir="${build.jsr166e.dir}"
1152		classes="${jsr166e.jar}"/>
1153		</target>
1154
1155	+	<target name="jsr166e-test-tck"
1156	+	description="Runs tck tests for jsr166e for multiple java versions">
1157	+
1158	+	<!--     <antcall target="clean"/> -->
1159	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1160	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1161	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1162	+	<!--     </antcall> -->
1163	+
1164	+	<antcall target="clean"/>
1165	+	<antcall target="jsr166e-test-tck-one-java-version">
1166	+	<param name="build.jsr166e.java.version" value="7"/>
1167	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1168	+	</antcall>
1169	+
1170	+	<antcall target="clean"/>
1171	+	<antcall target="jsr166e-test-tck-one-java-version">
1172	+	<param name="build.jsr166e.java.version" value="6"/>
1173	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1174	+	</antcall>
1175	+	</target>
1176	+
1177	+
1178	+	<target name="jsr166e-test"
1179	+	depends="jsr166e-test-tck"
1180	+	description="Runs all tests for jsr166e">
1181	+	</target>
1182
1183		<target name="jsr166edist"
1184		depends="jsr166edist-jar, jsr166edist-docs"
#	Line 1137 | Line 1191 | As of 2013-02, the very latest lambda 8
1191		</target>
1192
1193
1140	–	<target name="jsr166edist-clean"
1141	–	description="Removes all build and distribution products">
1142	–
1143	–	</target>
1144	–
1194		<target name="jsr166edist-jar"
1195		depends="jsr166eclean, jsr166ejar">
1196		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
#	Line 1157 | Line 1206 | As of 2013-02, the very latest lambda 8
1206
1207		<target name="lint">
1208		<antcall target="dists">
1209	+	<param name="build.javadoc.access" value="public"/>
1210	+	</antcall>
1211	+	</target>
1212	+
1213	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1214	+	<target name="lint-private">
1215	+	<antcall target="dist">
1216		<param name="build.javadoc.access" value="private"/>
1217		</antcall>
1218		</target>

Diff Legend

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