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.131 by jsr166, Fri Feb 1 18:31:17 2013 UTC vs.
Revision 1.156 by jsr166, Wed Jun 25 08:29:01 2014 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.
25	–	As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
27		------------------------------------------------------------------------------
28		</description>
29
30	<	<target name="usage" description="Display main targets by running 'ant -projecthelp'">
30	>	<!-- Display main targets by running 'ant -projecthelp' -->
31	>	<target name="usage">
32		<java classname="org.apache.tools.ant.Main">
33		<arg value="-projecthelp" />
34		</java>
#	Line 44 | Line 46 | As of 2013-02, the very latest lambda 8
46		<property name="build.deprecation"    value="false"/>
47		<property name="build.javadoc.access" value="protected"/>
48
49	+	<!-- Tck options; see JSR166TestCase.java
50	+	Profiling a tck test class:
51	+	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
52	+	Stress test a tck test class:
53	+	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
54	+	-->
55	+	<property name="jsr166.profileTests"     value="false"/>
56	+	<property name="jsr166.profileThreshold" value="100"/>
57	+	<property name="jsr166.runsPerTest"      value="1"/>
58	+	<!-- Stress test an individual tck test class:
59	+	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
60	+	-->
61	+	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
62	+
63		<!-- Build locations -->
64		<property name="build.dir"                   location="build"/>
65		<property name="build.classes.dir"           location="${build.dir}/classes"/>
#	Line 105 | Line 121 | As of 2013-02, the very latest lambda 8
121		<defjdklocations v="6"/>
122		<defjdklocations v="7"/>
123		<defjdklocations v="8"/>
124	+	<defjdklocations v="9"/>
125
126		<!-- Source locations -->
127		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 145 | Line 162 | As of 2013-02, the very latest lambda 8
162		<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
163		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
164
165	<	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
166	<	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
167	<	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
168	<	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
169	<
170	<	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
171	<	<!-- The below does not yet exist as of 2013-01 -->
172	<	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
165	>	<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
166	>	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
167	>	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
168	>	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
169	>	<!-- The expected canonical location does not yet exist as of 2014-02 -->
170	>	<!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> -->
171	>	<property name="java8.docroot.url"      value="http://download.java.net/jdk8/docs"/>
172	>	<!-- No published jdk9 docs exist as of 2014-02 -->
173	>	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
174	>	<property name="java9.docroot.url"      value="${java8.docroot.url}"/>
175	>	<!-- Default jdk doc location (latest stable release seems best) -->
176	>	<property name="java.docroot.url"       value="${java7.docroot.url}"/>
177
178	<	<!-- Default jdk api doc location (latest stable release seems best) -->
179	<	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
178	>	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
179	>	<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
180	>	<property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
181	>	<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
182	>	<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
183	>	<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
184	>	<property name="java.api.url"       value="${java.docroot.url}/api/"/>
185
186		<!-- Define the "jtreg" task -->
187		<!-- See the docs in "jtreg -onlineHelp" -->
#	Line 170 | Line 196 | As of 2013-02, the very latest lambda 8
196
197		<macrodef name="run-tck-tests">
198		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
173	–	<attribute name="source" default="6"/>
199		<attribute name="target"/>
200	+	<attribute name="compile-target" default="@{target}"/>
201		<attribute name="workdir"/>
202		<attribute name="classes"/>
203	<	<attribute name="jvmflags" default=""/>
203	>	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
204	>	<element name="javac-elements" optional="true"/>
205		<sequential>
206
207		<mkdir dir="@{workdir}/tck-classes"/>
#	Line 184 | Line 211 | As of 2013-02, the very latest lambda 8
211		debug="${build.debug}"
212		debuglevel="${build.debuglevel}"
213		deprecation="${build.deprecation}"
214	<	source="@{source}"
214	>	source="@{compile-target}"
215	>	target="@{compile-target}"
216		classpath="${junit.jar}"
217	<	bootclasspath="@{classes}:${bootclasspath@{source}}"
217	>	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
218		includeAntRuntime="false"
219		includeJavaRuntime="false"
220	<	executable="${javac@{target}}"
220	>	executable="${javac@{compile-target}}"
221		fork="true">
222
223		<include name="*.java"/>
224		<compilerarg value="-XDignore.symbol.file=true"/>
225		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
226		<compilerarg line="${build.args}"/>
227	+	<javac-elements/>
228
229		</javac>
230
231	<	<java classname="JSR166TestCase"
231	>	<java classname="${jsr166.tckTestClass}"
232		failonerror="true"
233		jvm="${java@{target}}"
234		fork="true">
235		<jvmarg value="-Xbootclasspath/p:@{classes}"/>
236		<jvmarg line="@{jvmflags}"/>
237	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
238	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
239	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
240		<classpath>
241		<pathelement location="${junit.jar}"/>
242		<pathelement location="@{workdir}/tck-classes"/>
#	Line 214 | Line 246 | As of 2013-02, the very latest lambda 8
246		</sequential>
247		</macrodef>
248
249	+	<macrodef name="run-jtreg-tests">
250	+	<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
251	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
252	+	<attribute name="source" default="7"/>
253	+	<attribute name="target"/>
254	+	<attribute name="workdir"/>
255	+	<attribute name="classes"/>
256	+	<attribute name="jtregflags" default=""/>
257	+	<sequential>
258	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
259	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
260	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
261	+	<mkdir dir="@{workdir}/JTreport"/>
262	+	<jtreg dir="@{jtreg.src.dir}"
263	+	jdk="${jdk@{target}.home}"
264	+	workDir="@{workdir}/JTwork"
265	+	reportDir="@{workdir}/JTreport">
266	+
267	+	<arg value="-Xbootclasspath/p:@{classes}"/>
268	+	<arg value="-agentvm"/>
269	+	<arg value="-v:nopass,fail"/>
270	+	<arg value="-vmoptions:-esa -ea"/>
271	+	<arg value="-automatic"/>
272	+	<arg value="-k:!ignore"/>
273	+	<arg line="@{jtregflags}"/>
274	+	</jtreg>
275	+	</sequential>
276	+	</macrodef>
277	+
278		<!-- ALoops classpath -->
279		<path id="loops.classpath">
280		<pathelement location="${build.loops.dir}"/>
#	Line 225 | Line 286 | As of 2013-02, the very latest lambda 8
286
287		<!-- Main targets -->
288
289	+	<property name="build.main.java.version" value="9"/>
290	+	<property name="build.main.javac" value="${javac9}"/>
291	+
292		<target name="dists"
293		depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
294		description="Builds all public jars and docs"/>
#	Line 243 | Line 307 | As of 2013-02, the very latest lambda 8
307		classpath=""
308		includeAntRuntime="false"
309		includeJavaRuntime="false"
310	<	executable="${javac8}"
310	>	executable="${build.main.javac}"
311		fork="true">
312
313		<include name="**/*.java"/>
314	+	<compilerarg value="-Xprefer:source"/>
315		<compilerarg value="-XDignore.symbol.file=true"/>
316		<compilerarg value="-Xlint:all"/>
317	+	<compilerarg value="-Xdoclint:all/protected"/>
318	+	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
319		<compilerarg line="${build.args}"/>
320
321		</javac>
#	Line 265 | Line 332 | As of 2013-02, the very latest lambda 8
332		</target>
333
334
268	–	<target name="test"
269	–	depends="configure-tests, report-tests"
270	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
271	–
272	–
335		<target name="docs"
336		description="Builds javadocs for src/main to dist dir">
337
#	Line 281 | Line 343 | As of 2013-02, the very latest lambda 8
343
344		<javadoc destdir="${docs.dir}"
345		packagenames="none"
346	<	link="${jdkapi8docs.url}"
346	>	link="${java9.api.url}"
347		overview="${src.dir}/intro.html"
348		access="${build.javadoc.access}"
349	<	sourcepath="${src.dir}:${jdk8src.dir}"
349	>	sourcepath="${src.dir}:${jdk9src.dir}"
350		classpath=""
351	<	executable="${javadoc8}">
351	>	executable="${javadoc9}">
352		<fileset dir="${src.dir}" defaultexcludes="yes">
353		<include name="**/*.java"/>
354		</fileset>
355	+	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
356	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
357		<arg value="-XDignore.symbol.file=true"/>
358		<arg value="-tag"/>
359		<arg value="${javadoc.jls.option}"/>
360	+	<arg value="-tag"/>
361	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
362	+	<arg value="-tag"/>
363	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
364	+	<arg value="-tag"/>
365	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
366		</javadoc>
367		</target>
368
#	Line 331 | Line 401 | As of 2013-02, the very latest lambda 8
401		<target name="dist-clean"
402		description="Removes all build and distribution products">
403
404	+	<delete dir="${build.dir}"/>
405		<delete dir="${dist.dir}"/>
406
407		</target>
408
409
339	–	<!-- Internal targets -->
340	–
341	–
410		<target name="dist-jar"
411		depends="clean, jar">
412		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 350 | Line 418 | As of 2013-02, the very latest lambda 8
418		</target>
419
420
353	–	<target name="compile-tests"
354	–	depends="jar">
355	–
356	–	<mkdir dir="${build.testcases.dir}"/>
357	–
358	–	<javac srcdir="${tck.src.dir}"
359	–	destdir="${build.testcases.dir}"
360	–	debug="${build.debug}"
361	–	debuglevel="${build.debuglevel}"
362	–	deprecation="${build.deprecation}"
363	–	source="6"
364	–	classpath="${junit.jar}"
365	–	bootclasspath="@{product.jar}:${bootclasspath6}"
366	–	includeAntRuntime="false"
367	–	includeJavaRuntime="false"
368	–	executable="${javac8}"
369	–	fork="true">
370	–
371	–	<include name="**/*.java"/>
372	–	<compilerarg value="-XDignore.symbol.file=true"/>
373	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
374	–	<compilerarg line="${build.args}"/>
375	–
376	–	</javac>
377	–
378	–	<javac srcdir="${test.src.dir}"
379	–	destdir="${build.testcases.dir}"
380	–	debug="${build.debug}"
381	–	debuglevel="${build.debuglevel}"
382	–	deprecation="${build.deprecation}"
383	–	source="6"
384	–	classpath=""
385	–	bootclasspath="@{product.jar}:${bootclasspath6}"
386	–	includeAntRuntime="false"
387	–	includeJavaRuntime="false"
388	–	executable="${javac8}"
389	–	fork="true">
390	–
391	–	<include name="jsr166/test/**/*.java"/>
392	–	<compilerarg value="-XDignore.symbol.file=true"/>
393	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
394	–	<compilerarg line="${build.args}"/>
395	–
396	–	</javac>
397	–
398	–	<!--
399	–	<javac srcdir="${jtreg.src.dir}"
400	–	destdir="${build.testcases.dir}"
401	–	debug="${build.debug}"
402	–	debuglevel="${build.debuglevel}"
403	–	deprecation="${build.deprecation}"
404	–	source="${build.sourcelevel}"
405	–	fork="true">
406	–
407	–	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
408	–	<compilerarg value="-XDignore.symbol.file=true"/>
409	–	<compilerarg line="${build.args}"/>
410	–
411	–	</javac>
412	–	-->
413	–
414	–	</target>
415	–
421		<target name="test-tck"
422		depends="jar"
423		description="Runs tck tests for main directly">
424
425		<run-tck-tests
426	<	target="8"
426	>	target="${build.main.java.version}"
427		workdir="${build.dir}"
428		classes="${product.jar}"/>
429		</target>
430
431	<	<target name="run-tests"
432	<	depends="compile-tests">
433	<
434	<	<!-- May be overridden by user.properties -->
435	<	<property name="testcase" value="*"/>
436	<
437	<	<mkdir dir="${build.reports.dir}"/>
433	<
434	<	<junit printsummary="true"
435	<	showoutput="true"
436	<	errorProperty="junit.failed"
437	<	failureProperty="junit.failed"
438	<	dir="${build.reports.dir}"
439	<	jvm="${java8}"
440	<	fork="true">
441	<
442	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
443	<	<jvmarg value="-server"/>
444	<	<jvmarg value="-showversion"/>
445	<
446	<	<classpath refid="test.classpath"/>
447	<
448	<	<formatter type="xml"/>
449	<
450	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
451	<	<fileset dir="${tck.src.dir}">
452	<	<include name="**/${testcase}Test.java"/>
453	<	</fileset>
454	<	</batchtest>
455	<
456	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
457	<	<fileset dir="${test.src.dir}">
458	<	<include name="jsr166/test/**/${testcase}Test.java"/>
459	<	</fileset>
460	<	</batchtest>
461	<
462	<	<!--
463	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
464	<	<fileset dir="${jtreg.src.dir}">
465	<	<include name="**/${testcase}Test.java"/>
466	<	</fileset>
467	<	</batchtest>
468	<	-->
469	<
470	<	</junit>
471	<
431	>	<target name="test-jtreg"
432	>	depends="jar"
433	>	description="Runs jtreg tests for main using the jtreg ant task">
434	>	<run-jtreg-tests
435	>	target="${build.main.java.version}"
436	>	workdir="${build.dir}"
437	>	classes="${product.jar}"/>
438		</target>
439
440	+	<target name="test"
441	+	depends="test-tck, test-jtreg"
442	+	description="Runs tck and jtreg tests for main">
443	+	</target>
444
445	<	<target name="report-tests"
446	<	depends="run-tests">
445	>	<target name="test89"
446	>	description="Runs tck and jtreg tests for main for multiple java versions">
447
448	<	<!-- Sets junit.report.format to frames if redirection is present,
449	<	otherwise sets it to noframes. -->
450	<	<available property="junit.report.format"
451	<	value="frames"
452	<	classname="org.apache.xalan.lib.Redirect"
453	<	/>
454	<	<property name="junit.report.format" value="noframes"/>
455	<
456	<	<junitreport todir="${build.reports.dir}">
457	<	<fileset dir="${build.reports.dir}">
458	<	<include name="TEST-*.xml"/>
489	<	</fileset>
490	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
491	<	/>
492	<	</junitreport>
493	<
494	<	<fail message="Test Cases Failed" if="junit.failed"/>
448	>	<antcall target="clean"/>
449	>	<antcall target="test">
450	>	<param name="build.main.java.version" value="8"/>
451	>	<param name="build.main.javac" value="${javac8}"/>
452	>	</antcall>
453	>
454	>	<antcall target="clean"/>
455	>	<antcall target="test">
456	>	<param name="build.main.java.version" value="9"/>
457	>	<param name="build.main.javac" value="${javac9}"/>
458	>	</antcall>
459
460		</target>
461
462
463	+
464		<target name="configure-compiler">
465
466		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 513 | Line 478 | As of 2013-02, the very latest lambda 8
478		</target>
479
480
516	–	<target name="configure-tests"
517	–	depends="configure-compiler">
518	–
519	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
520	–	<available property="junit.available"
521	–	classname="junit.framework.Protectable"/>
522	–
523	–	<!-- Xalan -->
524	–	<available property="xalan.available"
525	–	classname="org.apache.xalan.Version"/>
526	–
527	–
528	–	<!-- Ant 1.6beta and later don't need or want this check -->
529	–	<!--
530	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
531	–	unless="junit.available"/>
532	–
533	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
534	–	unless="xalan.available"/>
535	–	-->
536	–
537	–	</target>
538	–
481
482		<!-- Various demos and test programs -->
483
#	Line 588 | Line 530 | As of 2013-02, the very latest lambda 8
530		fork="true">
531
532		<include name="**/*.java"/>
533	+	<compilerarg value="-Xprefer:source"/>
534	+	<compilerarg value="-XDignore.symbol.file=true"/>
535	+	<compilerarg value="-Xlint:all"/>
536	+	<compilerarg line="${build.args}"/>
537	+
538	+	</javac>
539	+	</target>
540	+
541	+	<target name="4jdk7doclint"
542	+	depends="configure-compiler"
543	+	description="Finds doclint warnings">
544	+
545	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
546	+
547	+	<javac srcdir="${4jdk7src.dir}"
548	+	destdir="${build.4jdk7.classes.dir}"
549	+	debug="${build.debug}"
550	+	debuglevel="${build.debuglevel}"
551	+	deprecation="${build.deprecation}"
552	+	source="6"
553	+	classpath=""
554	+	bootclasspath="${bootclasspath7}"
555	+	includeAntRuntime="false"
556	+	includeJavaRuntime="false"
557	+	executable="${javac8}"
558	+	fork="true">
559	+
560	+	<include name="**/*.java"/>
561	+	<compilerarg value="-Xprefer:source"/>
562		<compilerarg value="-XDignore.symbol.file=true"/>
563		<compilerarg value="-Xlint:all"/>
564	+	<compilerarg value="-Xdoclint:all/protected"/>
565		<compilerarg line="${build.args}"/>
566
567		</javac>
#	Line 614 | Line 586 | As of 2013-02, the very latest lambda 8
586		<run-tck-tests
587		target="7"
588		workdir="${build.4jdk7.dir}"
589	<	classes="${4jdk7product.jar}"/>
589	>	classes="${4jdk7product.jar}">
590	>	<javac-elements>
591	>	<!-- JDK8+ test classes -->
592	>	<exclude name="*8Test.java"/>
593	>	<exclude name="*9Test.java"/>
594	>	<exclude name="DoubleAccumulatorTest.java"/>
595	>	<exclude name="DoubleAdderTest.java"/>
596	>	<exclude name="LongAccumulatorTest.java"/>
597	>	<exclude name="LongAdderTest.java"/>
598	>	<exclude name="CompletableFutureTest.java"/>
599	>	<exclude name="SplittableRandomTest.java"/>
600	>	<exclude name="StampedLockTest.java"/>
601	>	</javac-elements>
602	>	</run-tck-tests>
603		</target>
604
605
#	Line 640 | Line 625 | As of 2013-02, the very latest lambda 8
625
626		<formatter type="brief"/>
627
628	<	<test name="JSR166TestCase" haltonfailure="no">
628	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
629		</test>
630
631		</junit>
632		</target>
633
634		<target name="4jdk7-test-jtreg"
635	<	depends="4jdk7compile"
635	>	depends="4jdk7jar"
636		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
637	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
638	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
639	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
640	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
641	<	<jtreg dir="${jtreg.src.dir}"
657	<	jdk="${jdk7.home}"
658	<	workDir="${build.4jdk7.dir}/JTwork"
659	<	reportDir="${build.4jdk7.dir}/JTreport">
660	<
661	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
662	<	<arg value="-agentvm"/>
663	<	<arg value="-v:nopass,fail"/>
664	<	<arg value="-vmoptions:-esa -ea"/>
665	<	<arg value="-automatic"/>
666	<	<arg value="-k:!ignore"/>
667	<	</jtreg>
637	>	<run-jtreg-tests
638	>	target="7"
639	>	workdir="${build.4jdk7.dir}"
640	>	classes="${4jdk7product.jar}"
641	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
642		</target>
643
644
#	Line 682 | Line 656 | As of 2013-02, the very latest lambda 8
656
657		<javadoc destdir="${4jdk7docs.dir}"
658		packagenames="none"
659	<	link="${jdkapi7docs.url}"
659	>	link="${java7.api.url}"
660		overview="${4jdk7src.dir}/intro.html"
661		access="${build.javadoc.access}"
662		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
#	Line 691 | Line 665 | As of 2013-02, the very latest lambda 8
665		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
666		<include name="**/*.java"/>
667		</fileset>
668	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
669		<arg value="-XDignore.symbol.file=true"/>
670		</javadoc>
671		</target>
#	Line 709 | Line 684 | As of 2013-02, the very latest lambda 8
684		</target>
685
686
712	–	<target name="4jdk7dist-clean"
713	–	description="Removes all build and distribution products">
714	–
715	–	</target>
716	–
687		<target name="4jdk7dist-jar"
688		depends="4jdk7clean, 4jdk7jar">
689		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
#	Line 775 | Line 745 | As of 2013-02, the very latest lambda 8
745
746		<javadoc destdir="${jsr166xdocs.dir}"
747		packagenames="jsr166x.*"
748	<	link="${jdkapidocs.url}"
748	>	link="${java.api.url}"
749		access="${build.javadoc.access}"
750		sourcepath="${topsrc.dir}:${jdk6src.dir}"
751		bootclasspath="${bootclasspath6}"
752		source="5"
753		executable="${javadoc7}">
754	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
755		<arg value="-XDignore.symbol.file=true"/>
756
757		</javadoc>
#	Line 800 | Line 771 | As of 2013-02, the very latest lambda 8
771		</target>
772
773
803	–	<target name="jsr166xdist-clean"
804	–	description="Removes all build and distribution products">
805	–
806	–	</target>
807	–
808	–
774		<target name="jsr166xdist-jar"
775		depends="jsr166xclean, jsr166xjar">
776		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
#	Line 866 | Line 831 | As of 2013-02, the very latest lambda 8
831
832		<javadoc destdir="${jsr166ydocs.dir}"
833		packagenames="jsr166y.*"
834	<	link="${jdkapidocs.url}"
834	>	link="${java.api.url}"
835		access="${build.javadoc.access}"
836		sourcepath="${topsrc.dir}:${jdk6src.dir}"
837		bootclasspath="${bootclasspath6}"
838		source="6"
839		executable="${javadoc7}">
840	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
841		<arg value="-XDignore.symbol.file=true"/>
842
843		</javadoc>
#	Line 891 | Line 857 | As of 2013-02, the very latest lambda 8
857		</target>
858
859
894	–	<target name="jsr166ydist-clean"
895	–	description="Removes all build and distribution products">
896	–
897	–	</target>
898	–
860		<target name="jsr166ydist-jar"
861		depends="jsr166yclean, jsr166yjar">
862		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
#	Line 957 | Line 918 | As of 2013-02, the very latest lambda 8
918
919		<javadoc destdir="${extra166ydocs.dir}"
920		packagenames="extra166y.*"
921	<	link="${jdkapidocs.url}"
921	>	link="${java.api.url}"
922		access="${build.javadoc.access}"
923		sourcepath="${topsrc.dir}:${jdk6src.dir}"
924		bootclasspath="${bootclasspath6}"
925		source="6"
926		executable="${javadoc7}">
927	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
928		<arg value="-XDignore.symbol.file=true"/>
929
930		</javadoc>
#	Line 982 | Line 944 | As of 2013-02, the very latest lambda 8
944		</target>
945
946
985	–	<target name="extra166ydist-clean"
986	–	description="Removes all build and distribution products">
987	–
988	–	</target>
989	–
947		<target name="extra166ydist-jar"
948		depends="extra166yclean, extra166yjar">
949		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
#	Line 999 | Line 956 | As of 2013-02, the very latest lambda 8
956
957		<!-- jsr166e -->
958
959	+	<property name="build.jsr166e.java.version" value="6"/>
960	+	<property name="build.jsr166e.javac" value="${javac6}"/>
961	+
962		<target name="jsr166ecompile"
963		depends="configure-compiler"
964		description="Compiles jsr166e sources">
#	Line 1010 | Line 970 | As of 2013-02, the very latest lambda 8
970		debug="${build.debug}"
971		debuglevel="${build.debuglevel}"
972		deprecation="${build.deprecation}"
973	<	source="7"
973	>	source="${build.jsr166e.java.version}"
974		classpath=""
975		includeAntRuntime="false"
976		includeJavaRuntime="false"
977	<	executable="${javac7}"
977	>	executable="${build.jsr166e.javac}"
978		fork="true">
979
980		<include name="jsr166e/**/*.java"/>
#	Line 1025 | Line 985 | As of 2013-02, the very latest lambda 8
985		</javac>
986		</target>
987
988	+	<!-- jsr166e: find doclint errors -->
989	+	<target name="jsr166edoclint">
990	+
991	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
992	+
993	+	<javac srcdir="${topsrc.dir}"
994	+	destdir="${build.jsr166e.classes.dir}"
995	+	debug="${build.debug}"
996	+	debuglevel="${build.debuglevel}"
997	+	deprecation="${build.deprecation}"
998	+	source="${build.jsr166e.java.version}"
999	+	classpath=""
1000	+	bootclasspath="${bootclasspath7}"
1001	+	includeAntRuntime="false"
1002	+	includeJavaRuntime="false"
1003	+	executable="${javac8}"
1004	+	fork="true">
1005	+
1006	+	<include name="jsr166e/**/*.java"/>
1007	+	<compilerarg value="-XDignore.symbol.file=true"/>
1008	+	<compilerarg value="-Xlint:all"/>
1009	+	<compilerarg value="-Xdoclint:all/protected"/>
1010	+
1011	+	</javac>
1012	+	</target>
1013	+
1014
1015		<target name="jsr166ejar"
1016		depends="jsr166ecompile"
#	Line 1045 | Line 1031 | As of 2013-02, the very latest lambda 8
1031
1032		<javadoc destdir="${jsr166edocs.dir}"
1033		packagenames="jsr166e.*"
1034	<	link="${jdkapidocs.url}"
1034	>	link="${java.api.url}"
1035		access="${build.javadoc.access}"
1036	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1037	<	source="7"
1036	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1037	>	source="${build.jsr166e.java.version}"
1038		executable="${javadoc7}">
1039	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1040		<arg value="-XDignore.symbol.file=true"/>
1041
1042		</javadoc>
1043		</target>
1044
1045
1046	<	<target name="jsr166e-test-tck"
1047	<	depends="jsr166ejar"
1048	<	description="Runs tck tests for jsr166e">
1046	>	<target name="jsr166e-test-tck-one-java-version"
1047	>	depends="jsr166ejar">
1048	>
1049	>	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1050
1051		<run-tck-tests
1052		tck.src.dir="${test.src.dir}/tck-jsr166e"
1053	<	source="7"
1066	<	target="8"
1053	>	target="${build.jsr166e.java.version}"
1054		workdir="${build.jsr166e.dir}"
1055		classes="${jsr166e.jar}"/>
1056		</target>
1057
1058	+	<target name="jsr166e-test-tck"
1059	+	description="Runs tck tests for jsr166e for multiple java versions">
1060	+
1061	+	<!--     <antcall target="clean"/> -->
1062	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1063	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1064	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1065	+	<!--     </antcall> -->
1066	+
1067	+	<antcall target="clean"/>
1068	+	<antcall target="jsr166e-test-tck-one-java-version">
1069	+	<param name="build.jsr166e.java.version" value="7"/>
1070	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1071	+	</antcall>
1072	+
1073	+	<antcall target="clean"/>
1074	+	<antcall target="jsr166e-test-tck-one-java-version">
1075	+	<param name="build.jsr166e.java.version" value="6"/>
1076	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1077	+	</antcall>
1078	+	</target>
1079	+
1080	+
1081	+	<target name="jsr166e-test"
1082	+	depends="jsr166e-test-tck"
1083	+	description="Runs all tests for jsr166e">
1084	+	</target>
1085
1086		<target name="jsr166edist"
1087		depends="jsr166edist-jar, jsr166edist-docs"
#	Line 1080 | Line 1094 | As of 2013-02, the very latest lambda 8
1094		</target>
1095
1096
1083	–	<target name="jsr166edist-clean"
1084	–	description="Removes all build and distribution products">
1085	–
1086	–	</target>
1087	–
1097		<target name="jsr166edist-jar"
1098		depends="jsr166eclean, jsr166ejar">
1099		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>

Diff Legend

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