ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/build.xml

Comparing jsr166/build.xml (file contents):
Revision 1.132 by jsr166, Fri Feb 1 21:58:27 2013 UTC vs.
Revision 1.164 by jsr166, Wed May 20 06:13:09 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 170 | Line 195 | As of 2013-02, the very latest lambda 8
195
196		<macrodef name="run-tck-tests">
197		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
173	–	<attribute name="source" default="6"/>
198		<attribute name="target"/>
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 185 | Line 210 | As of 2013-02, the very latest lambda 8
210		debug="${build.debug}"
211		debuglevel="${build.debuglevel}"
212		deprecation="${build.deprecation}"
213	<	source="@{source}"
213	>	source="@{compile-target}"
214	>	target="@{compile-target}"
215		classpath="${junit.jar}"
190	–	bootclasspath="@{classes}:${bootclasspath@{source}}"
216		includeAntRuntime="false"
217		includeJavaRuntime="false"
218	<	executable="${javac@{target}}"
218	>	executable="${javac@{compile-target}}"
219		fork="true">
220
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 216 | Line 251 | As of 2013-02, the very latest lambda 8
251		</sequential>
252		</macrodef>
253
254	+	<macrodef name="run-jtreg-tests">
255	+	<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
256	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
257	+	<attribute name="source" default="7"/>
258	+	<attribute name="target"/>
259	+	<attribute name="workdir"/>
260	+	<attribute name="classes"/>
261	+	<attribute name="jtregflags" default=""/>
262	+	<sequential>
263	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
264	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
265	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
266	+	<mkdir dir="@{workdir}/JTreport"/>
267	+	<jtreg dir="@{jtreg.src.dir}"
268	+	jdk="${jdk@{target}.home}"
269	+	workDir="@{workdir}/JTwork"
270	+	reportDir="@{workdir}/JTreport">
271	+
272	+	<arg value="-Xbootclasspath/p:@{classes}"/>
273	+	<arg value="-agentvm"/>
274	+	<arg value="-v:nopass,fail"/>
275	+	<arg value="-vmoptions:-esa -ea"/>
276	+	<arg value="-automatic"/>
277	+	<arg value="-k:!ignore"/>
278	+	<arg line="@{jtregflags}"/>
279	+	</jtreg>
280	+	</sequential>
281	+	</macrodef>
282	+
283		<!-- ALoops classpath -->
284		<path id="loops.classpath">
285		<pathelement location="${build.loops.dir}"/>
#	Line 227 | Line 291 | As of 2013-02, the very latest lambda 8
291
292		<!-- Main targets -->
293
294	+	<property name="build.main.java.version" value="9"/>
295	+	<property name="build.main.javac" value="${javac9}"/>
296	+
297		<target name="dists"
298		depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
299		description="Builds all public jars and docs"/>
#	Line 245 | Line 312 | As of 2013-02, the very latest lambda 8
312		classpath=""
313		includeAntRuntime="false"
314		includeJavaRuntime="false"
315	<	executable="${javac8}"
315	>	executable="${build.main.javac}"
316		fork="true">
317
318		<include name="**/*.java"/>
319	+	<compilerarg value="-Xprefer:source"/>
320		<compilerarg value="-XDignore.symbol.file=true"/>
321		<compilerarg value="-Xlint:all"/>
322	+	<compilerarg value="-Werror"/>
323	+	<compilerarg value="-Xdoclint:all/protected"/>
324	+	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
325		<compilerarg line="${build.args}"/>
326
327		</javac>
#	Line 267 | Line 338 | As of 2013-02, the very latest lambda 8
338		</target>
339
340
270	–	<target name="test"
271	–	depends="configure-tests, report-tests"
272	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
273	–
274	–
341		<target name="docs"
342		description="Builds javadocs for src/main to dist dir">
343
#	Line 283 | Line 349 | As of 2013-02, the very latest lambda 8
349
350		<javadoc destdir="${docs.dir}"
351		packagenames="none"
352	<	link="${jdkapi8docs.url}"
352	>	link="${java9.api.url}"
353		overview="${src.dir}/intro.html"
354		access="${build.javadoc.access}"
355	<	sourcepath="${src.dir}:${jdk8src.dir}"
355	>	sourcepath="${src.dir}:${jdk9src.dir}"
356		classpath=""
357	<	executable="${javadoc8}">
357	>	executable="${javadoc9}">
358		<fileset dir="${src.dir}" defaultexcludes="yes">
359		<include name="**/*.java"/>
360		</fileset>
361	+	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
362	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
363		<arg value="-XDignore.symbol.file=true"/>
364		<arg value="-tag"/>
365		<arg value="${javadoc.jls.option}"/>
366	+	<arg value="-tag"/>
367	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
368	+	<arg value="-tag"/>
369	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
370	+	<arg value="-tag"/>
371	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
372		</javadoc>
373		</target>
374
#	Line 333 | Line 407 | As of 2013-02, the very latest lambda 8
407		<target name="dist-clean"
408		description="Removes all build and distribution products">
409
410	+	<delete dir="${build.dir}"/>
411		<delete dir="${dist.dir}"/>
412
413		</target>
414
415
341	–	<!-- Internal targets -->
342	–
343	–
416		<target name="dist-jar"
417		depends="clean, jar">
418		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 351 | Line 423 | As of 2013-02, the very latest lambda 8
423		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
424		</target>
425
426	<
355	<	<target name="compile-tests"
356	<	depends="jar">
357	<
358	<	<mkdir dir="${build.testcases.dir}"/>
359	<
360	<	<javac srcdir="${tck.src.dir}"
361	<	destdir="${build.testcases.dir}"
362	<	debug="${build.debug}"
363	<	debuglevel="${build.debuglevel}"
364	<	deprecation="${build.deprecation}"
365	<	source="6"
366	<	classpath="${junit.jar}"
367	<	bootclasspath="@{product.jar}:${bootclasspath6}"
368	<	includeAntRuntime="false"
369	<	includeJavaRuntime="false"
370	<	executable="${javac8}"
371	<	fork="true">
372	<
373	<	<include name="**/*.java"/>
374	<	<compilerarg value="-XDignore.symbol.file=true"/>
375	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
376	<	<compilerarg line="${build.args}"/>
377	<
378	<	</javac>
379	<
380	<	<javac srcdir="${test.src.dir}"
381	<	destdir="${build.testcases.dir}"
382	<	debug="${build.debug}"
383	<	debuglevel="${build.debuglevel}"
384	<	deprecation="${build.deprecation}"
385	<	source="6"
386	<	classpath=""
387	<	bootclasspath="@{product.jar}:${bootclasspath6}"
388	<	includeAntRuntime="false"
389	<	includeJavaRuntime="false"
390	<	executable="${javac8}"
391	<	fork="true">
392	<
393	<	<include name="jsr166/test/**/*.java"/>
394	<	<compilerarg value="-XDignore.symbol.file=true"/>
395	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
396	<	<compilerarg line="${build.args}"/>
397	<
398	<	</javac>
399	<
400	<	<!--
401	<	<javac srcdir="${jtreg.src.dir}"
402	<	destdir="${build.testcases.dir}"
403	<	debug="${build.debug}"
404	<	debuglevel="${build.debuglevel}"
405	<	deprecation="${build.deprecation}"
406	<	source="${build.sourcelevel}"
407	<	fork="true">
408	<
409	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
410	<	<compilerarg value="-XDignore.symbol.file=true"/>
411	<	<compilerarg line="${build.args}"/>
412	<
413	<	</javac>
414	<	-->
415	<
416	<	</target>
417	<
426	>	<target name="tck" depends="test-tck" description="alias for test-tck"/>
427		<target name="test-tck"
428		depends="jar"
429		description="Runs tck tests for main directly">
430
431		<run-tck-tests
432	<	target="8"
432	>	target="${build.main.java.version}"
433		workdir="${build.dir}"
434		classes="${product.jar}"/>
435		</target>
436
437	<	<target name="run-tests"
438	<	depends="compile-tests">
439	<
440	<	<!-- May be overridden by user.properties -->
441	<	<property name="testcase" value="*"/>
442	<
434	<	<mkdir dir="${build.reports.dir}"/>
435	<
436	<	<junit printsummary="true"
437	<	showoutput="true"
438	<	errorProperty="junit.failed"
439	<	failureProperty="junit.failed"
440	<	dir="${build.reports.dir}"
441	<	jvm="${java8}"
442	<	fork="true">
443	<
444	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
445	<	<jvmarg value="-server"/>
446	<	<jvmarg value="-showversion"/>
447	<
448	<	<classpath refid="test.classpath"/>
449	<
450	<	<formatter type="xml"/>
451	<
452	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
453	<	<fileset dir="${tck.src.dir}">
454	<	<include name="**/${testcase}Test.java"/>
455	<	</fileset>
456	<	</batchtest>
457	<
458	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
459	<	<fileset dir="${test.src.dir}">
460	<	<include name="jsr166/test/**/${testcase}Test.java"/>
461	<	</fileset>
462	<	</batchtest>
463	<
464	<	<!--
465	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
466	<	<fileset dir="${jtreg.src.dir}">
467	<	<include name="**/${testcase}Test.java"/>
468	<	</fileset>
469	<	</batchtest>
470	<	-->
437	>	<target name="test-tck-parallelism-1"
438	>	description="Runs test-tck with given common pool parallelism">
439	>	<antcall target="test-tck">
440	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
441	>	</antcall>
442	>	</target>
443
444	<	</junit>
444	>	<target name="test-tck-parallelism-0"
445	>	description="Runs test-tck with given common pool parallelism">
446	>	<antcall target="test-tck">
447	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
448	>	</antcall>
449	>	</target>
450
451	+	<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
452	+	<target name="test-jtreg"
453	+	depends="jar"
454	+	description="Runs jtreg tests for main using the jtreg ant task">
455	+	<run-jtreg-tests
456	+	target="${build.main.java.version}"
457	+	workdir="${build.dir}"
458	+	classes="${product.jar}"/>
459		</target>
460
461	+	<target name="test"
462	+	depends="test-tck, test-tck-parallelism-1, test-jtreg"
463	+	description="Runs tck and jtreg tests for main">
464	+	</target>
465
466	<	<target name="report-tests"
467	<	depends="run-tests">
466	>	<target name="test89"
467	>	description="Runs tck and jtreg tests for main for multiple java versions">
468
469	<	<!-- Sets junit.report.format to frames if redirection is present,
470	<	otherwise sets it to noframes. -->
471	<	<available property="junit.report.format"
472	<	value="frames"
473	<	classname="org.apache.xalan.lib.Redirect"
485	<	/>
486	<	<property name="junit.report.format" value="noframes"/>
487	<
488	<	<junitreport todir="${build.reports.dir}">
489	<	<fileset dir="${build.reports.dir}">
490	<	<include name="TEST-*.xml"/>
491	<	</fileset>
492	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
493	<	/>
494	<	</junitreport>
469	>	<antcall target="clean"/>
470	>	<antcall target="test">
471	>	<param name="build.main.java.version" value="8"/>
472	>	<param name="build.main.javac" value="${javac8}"/>
473	>	</antcall>
474
475	<	<fail message="Test Cases Failed" if="junit.failed"/>
475	>	<antcall target="clean"/>
476	>	<antcall target="test">
477	>	<param name="build.main.java.version" value="9"/>
478	>	<param name="build.main.javac" value="${javac9}"/>
479	>	</antcall>
480
481		</target>
482
483
484	+
485		<target name="configure-compiler">
486
487		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 515 | Line 499 | As of 2013-02, the very latest lambda 8
499		</target>
500
501
518	–	<target name="configure-tests"
519	–	depends="configure-compiler">
520	–
521	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
522	–	<available property="junit.available"
523	–	classname="junit.framework.Protectable"/>
524	–
525	–	<!-- Xalan -->
526	–	<available property="xalan.available"
527	–	classname="org.apache.xalan.Version"/>
528	–
529	–
530	–	<!-- Ant 1.6beta and later don't need or want this check -->
531	–	<!--
532	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
533	–	unless="junit.available"/>
534	–
535	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
536	–	unless="xalan.available"/>
537	–	-->
538	–
539	–	</target>
540	–
502
503		<!-- Various demos and test programs -->
504
#	Line 590 | Line 551 | As of 2013-02, the very latest lambda 8
551		fork="true">
552
553		<include name="**/*.java"/>
554	+	<compilerarg value="-Xprefer:source"/>
555		<compilerarg value="-XDignore.symbol.file=true"/>
556		<compilerarg value="-Xlint:all"/>
557	+	<compilerarg value="-Werror"/>
558	+	<compilerarg line="${build.args}"/>
559	+
560	+	</javac>
561	+	</target>
562	+
563	+	<target name="4jdk7doclint"
564	+	depends="configure-compiler"
565	+	description="Finds doclint warnings">
566	+
567	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
568	+
569	+	<javac srcdir="${4jdk7src.dir}"
570	+	destdir="${build.4jdk7.classes.dir}"
571	+	debug="${build.debug}"
572	+	debuglevel="${build.debuglevel}"
573	+	deprecation="${build.deprecation}"
574	+	source="6"
575	+	classpath=""
576	+	bootclasspath="${bootclasspath7}"
577	+	includeAntRuntime="false"
578	+	includeJavaRuntime="false"
579	+	executable="${javac8}"
580	+	fork="true">
581	+
582	+	<include name="**/*.java"/>
583	+	<compilerarg value="-Xprefer:source"/>
584	+	<compilerarg value="-XDignore.symbol.file=true"/>
585	+	<compilerarg value="-Xlint:all"/>
586	+	<compilerarg value="-Xdoclint:all/protected"/>
587		<compilerarg line="${build.args}"/>
588
589		</javac>
#	Line 618 | Line 610 | As of 2013-02, the very latest lambda 8
610		workdir="${build.4jdk7.dir}"
611		classes="${4jdk7product.jar}">
612		<javac-elements>
613	+	<!-- JDK8+ test classes -->
614	+	<exclude name="*8Test.java"/>
615	+	<exclude name="*9Test.java"/>
616	+	<exclude name="DoubleAccumulatorTest.java"/>
617	+	<exclude name="DoubleAdderTest.java"/>
618	+	<exclude name="LongAccumulatorTest.java"/>
619	+	<exclude name="LongAdderTest.java"/>
620	+	<exclude name="CompletableFutureTest.java"/>
621	+	<exclude name="SplittableRandomTest.java"/>
622		<exclude name="StampedLockTest.java"/>
623		</javac-elements>
624		</run-tck-tests>
#	Line 646 | Line 647 | As of 2013-02, the very latest lambda 8
647
648		<formatter type="brief"/>
649
650	<	<test name="JSR166TestCase" haltonfailure="no">
650	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
651		</test>
652
653		</junit>
654		</target>
655
656		<target name="4jdk7-test-jtreg"
657	<	depends="4jdk7compile"
657	>	depends="4jdk7jar"
658		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
659	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
660	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
661	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
662	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
663	<	<jtreg dir="${jtreg.src.dir}"
663	<	jdk="${jdk7.home}"
664	<	workDir="${build.4jdk7.dir}/JTwork"
665	<	reportDir="${build.4jdk7.dir}/JTreport">
666	<
667	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
668	<	<arg value="-agentvm"/>
669	<	<arg value="-v:nopass,fail"/>
670	<	<arg value="-vmoptions:-esa -ea"/>
671	<	<arg value="-automatic"/>
672	<	<arg value="-k:!ignore"/>
673	<	</jtreg>
659	>	<run-jtreg-tests
660	>	target="7"
661	>	workdir="${build.4jdk7.dir}"
662	>	classes="${4jdk7product.jar}"
663	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
664		</target>
665
666
#	Line 688 | Line 678 | As of 2013-02, the very latest lambda 8
678
679		<javadoc destdir="${4jdk7docs.dir}"
680		packagenames="none"
681	<	link="${jdkapi7docs.url}"
681	>	link="${java7.api.url}"
682		overview="${4jdk7src.dir}/intro.html"
683		access="${build.javadoc.access}"
684		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
#	Line 697 | Line 687 | As of 2013-02, the very latest lambda 8
687		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
688		<include name="**/*.java"/>
689		</fileset>
690	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
691		<arg value="-XDignore.symbol.file=true"/>
692		</javadoc>
693		</target>
#	Line 715 | Line 706 | As of 2013-02, the very latest lambda 8
706		</target>
707
708
718	–	<target name="4jdk7dist-clean"
719	–	description="Removes all build and distribution products">
720	–
721	–	</target>
722	–
709		<target name="4jdk7dist-jar"
710		depends="4jdk7clean, 4jdk7jar">
711		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
#	Line 756 | Line 742 | As of 2013-02, the very latest lambda 8
742		<include name="jsr166x/**/*.java"/>
743		<compilerarg value="-XDignore.symbol.file=true"/>
744		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
745	+	<compilerarg value="-Werror"/>
746		<compilerarg line="${build.args}"/>
747
748		</javac>
#	Line 781 | Line 768 | As of 2013-02, the very latest lambda 8
768
769		<javadoc destdir="${jsr166xdocs.dir}"
770		packagenames="jsr166x.*"
771	<	link="${jdkapidocs.url}"
771	>	link="${java.api.url}"
772		access="${build.javadoc.access}"
773		sourcepath="${topsrc.dir}:${jdk6src.dir}"
774		bootclasspath="${bootclasspath6}"
775		source="5"
776		executable="${javadoc7}">
777	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
778		<arg value="-XDignore.symbol.file=true"/>
779
780		</javadoc>
#	Line 806 | Line 794 | As of 2013-02, the very latest lambda 8
794		</target>
795
796
809	–	<target name="jsr166xdist-clean"
810	–	description="Removes all build and distribution products">
811	–
812	–	</target>
813	–
814	–
797		<target name="jsr166xdist-jar"
798		depends="jsr166xclean, jsr166xjar">
799		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
#	Line 847 | Line 829 | As of 2013-02, the very latest lambda 8
829		<include name="jsr166y/**/*.java"/>
830		<compilerarg value="-XDignore.symbol.file=true"/>
831		<compilerarg value="-Xlint:all"/>
832	+	<compilerarg value="-Werror"/>
833		<compilerarg line="${build.args}"/>
834
835		</javac>
#	Line 872 | Line 855 | As of 2013-02, the very latest lambda 8
855
856		<javadoc destdir="${jsr166ydocs.dir}"
857		packagenames="jsr166y.*"
858	<	link="${jdkapidocs.url}"
858	>	link="${java.api.url}"
859		access="${build.javadoc.access}"
860		sourcepath="${topsrc.dir}:${jdk6src.dir}"
861		bootclasspath="${bootclasspath6}"
862		source="6"
863		executable="${javadoc7}">
864	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
865		<arg value="-XDignore.symbol.file=true"/>
866
867		</javadoc>
#	Line 897 | Line 881 | As of 2013-02, the very latest lambda 8
881		</target>
882
883
900	–	<target name="jsr166ydist-clean"
901	–	description="Removes all build and distribution products">
902	–
903	–	</target>
904	–
884		<target name="jsr166ydist-jar"
885		depends="jsr166yclean, jsr166yjar">
886		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
#	Line 938 | Line 917 | As of 2013-02, the very latest lambda 8
917		<include name="extra166y/**/*.java"/>
918		<compilerarg value="-XDignore.symbol.file=true"/>
919		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
920	+	<compilerarg value="-Werror"/>
921		<compilerarg line="${build.args}"/>
922
923		</javac>
#	Line 963 | Line 943 | As of 2013-02, the very latest lambda 8
943
944		<javadoc destdir="${extra166ydocs.dir}"
945		packagenames="extra166y.*"
946	<	link="${jdkapidocs.url}"
946	>	link="${java.api.url}"
947		access="${build.javadoc.access}"
948		sourcepath="${topsrc.dir}:${jdk6src.dir}"
949		bootclasspath="${bootclasspath6}"
950		source="6"
951		executable="${javadoc7}">
952	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
953		<arg value="-XDignore.symbol.file=true"/>
954
955		</javadoc>
#	Line 988 | Line 969 | As of 2013-02, the very latest lambda 8
969		</target>
970
971
991	–	<target name="extra166ydist-clean"
992	–	description="Removes all build and distribution products">
993	–
994	–	</target>
995	–
972		<target name="extra166ydist-jar"
973		depends="extra166yclean, extra166yjar">
974		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
#	Line 1005 | Line 981 | As of 2013-02, the very latest lambda 8
981
982		<!-- jsr166e -->
983
984	+	<property name="build.jsr166e.java.version" value="6"/>
985	+	<property name="build.jsr166e.javac" value="${javac6}"/>
986	+
987		<target name="jsr166ecompile"
988		depends="configure-compiler"
989		description="Compiles jsr166e sources">
#	Line 1016 | Line 995 | As of 2013-02, the very latest lambda 8
995		debug="${build.debug}"
996		debuglevel="${build.debuglevel}"
997		deprecation="${build.deprecation}"
998	<	source="7"
998	>	source="${build.jsr166e.java.version}"
999		classpath=""
1000		includeAntRuntime="false"
1001		includeJavaRuntime="false"
1002	<	executable="${javac7}"
1002	>	executable="${build.jsr166e.javac}"
1003		fork="true">
1004
1005		<include name="jsr166e/**/*.java"/>
1006		<compilerarg value="-XDignore.symbol.file=true"/>
1007		<compilerarg value="-Xlint:all"/>
1008	+	<compilerarg value="-Werror"/>
1009		<compilerarg line="${build.args}"/>
1010
1011		</javac>
1012		</target>
1013
1014	+	<!-- jsr166e: find doclint errors -->
1015	+	<target name="jsr166edoclint">
1016	+
1017	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
1018	+
1019	+	<javac srcdir="${topsrc.dir}"
1020	+	destdir="${build.jsr166e.classes.dir}"
1021	+	debug="${build.debug}"
1022	+	debuglevel="${build.debuglevel}"
1023	+	deprecation="${build.deprecation}"
1024	+	source="${build.jsr166e.java.version}"
1025	+	classpath=""
1026	+	bootclasspath="${bootclasspath7}"
1027	+	includeAntRuntime="false"
1028	+	includeJavaRuntime="false"
1029	+	executable="${javac8}"
1030	+	fork="true">
1031	+
1032	+	<include name="jsr166e/**/*.java"/>
1033	+	<compilerarg value="-XDignore.symbol.file=true"/>
1034	+	<compilerarg value="-Xlint:all"/>
1035	+	<compilerarg value="-Werror"/>
1036	+	<compilerarg value="-Xdoclint:all/protected"/>
1037	+
1038	+	</javac>
1039	+	</target>
1040	+
1041
1042		<target name="jsr166ejar"
1043		depends="jsr166ecompile"
#	Line 1051 | Line 1058 | As of 2013-02, the very latest lambda 8
1058
1059		<javadoc destdir="${jsr166edocs.dir}"
1060		packagenames="jsr166e.*"
1061	<	link="${jdkapidocs.url}"
1061	>	link="${java.api.url}"
1062		access="${build.javadoc.access}"
1063	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1064	<	source="7"
1063	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1064	>	source="${build.jsr166e.java.version}"
1065		executable="${javadoc7}">
1066	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1067		<arg value="-XDignore.symbol.file=true"/>
1068
1069		</javadoc>
1070		</target>
1071
1072
1073	<	<target name="jsr166e-test-tck"
1074	<	depends="jsr166ejar"
1075	<	description="Runs tck tests for jsr166e">
1073	>	<target name="jsr166e-test-tck-one-java-version"
1074	>	depends="jsr166ejar">
1075	>
1076	>	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1077
1078		<run-tck-tests
1079		tck.src.dir="${test.src.dir}/tck-jsr166e"
1080	<	source="7"
1072	<	target="8"
1080	>	target="${build.jsr166e.java.version}"
1081		workdir="${build.jsr166e.dir}"
1082		classes="${jsr166e.jar}"/>
1083		</target>
1084
1085	+	<target name="jsr166e-test-tck"
1086	+	description="Runs tck tests for jsr166e for multiple java versions">
1087	+
1088	+	<!--     <antcall target="clean"/> -->
1089	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1090	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1091	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1092	+	<!--     </antcall> -->
1093	+
1094	+	<antcall target="clean"/>
1095	+	<antcall target="jsr166e-test-tck-one-java-version">
1096	+	<param name="build.jsr166e.java.version" value="7"/>
1097	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1098	+	</antcall>
1099	+
1100	+	<antcall target="clean"/>
1101	+	<antcall target="jsr166e-test-tck-one-java-version">
1102	+	<param name="build.jsr166e.java.version" value="6"/>
1103	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1104	+	</antcall>
1105	+	</target>
1106	+
1107	+
1108	+	<target name="jsr166e-test"
1109	+	depends="jsr166e-test-tck"
1110	+	description="Runs all tests for jsr166e">
1111	+	</target>
1112
1113		<target name="jsr166edist"
1114		depends="jsr166edist-jar, jsr166edist-docs"
#	Line 1086 | Line 1121 | As of 2013-02, the very latest lambda 8
1121		</target>
1122
1123
1089	–	<target name="jsr166edist-clean"
1090	–	description="Removes all build and distribution products">
1091	–
1092	–	</target>
1093	–
1124		<target name="jsr166edist-jar"
1125		depends="jsr166eclean, jsr166ejar">
1126		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
#	Line 1106 | Line 1136 | As of 2013-02, the very latest lambda 8
1136
1137		<target name="lint">
1138		<antcall target="dists">
1139	+	<param name="build.javadoc.access" value="public"/>
1140	+	</antcall>
1141	+	</target>
1142	+
1143	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1144	+	<target name="lint-private">
1145	+	<antcall target="dist">
1146		<param name="build.javadoc.access" value="private"/>
1147		</antcall>
1148		</target>

Diff Legend

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