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.152 by jsr166, Tue Feb 25 16:33:15 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	+	<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
51	+	<property name="jsr166.profileTests"     value="false"/>
52	+	<property name="jsr166.profileThreshold" value="100"/>
53	+	<property name="jsr166.runsPerTest"      value="1"/>
54	+	<!-- Allow running an individual tck test class -->
55	+	<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
56	+	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
57	+
58		<!-- Build locations -->
59		<property name="build.dir"                   location="build"/>
60		<property name="build.classes.dir"           location="${build.dir}/classes"/>
#	Line 105 | Line 116 | As of 2013-02, the very latest lambda 8
116		<defjdklocations v="6"/>
117		<defjdklocations v="7"/>
118		<defjdklocations v="8"/>
119	+	<defjdklocations v="9"/>
120
121		<!-- Source locations -->
122		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 145 | Line 157 | As of 2013-02, the very latest lambda 8
157		<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
158		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
159
160	<	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
161	<	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
162	<	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
163	<	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
164	<
165	<	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
166	<	<!-- The below does not yet exist as of 2013-01 -->
167	<	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
160	>	<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
161	>	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
162	>	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
163	>	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
164	>	<!-- The expected canonical location does not yet exist as of 2014-02 -->
165	>	<!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> -->
166	>	<property name="java8.docroot.url"      value="http://download.java.net/jdk8/docs"/>
167	>	<!-- No published jdk9 docs exist as of 2014-02 -->
168	>	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
169	>	<property name="java9.docroot.url"      value="${java8.docroot.url}"/>
170	>	<!-- Default jdk doc location (latest stable release seems best) -->
171	>	<property name="java.docroot.url"       value="${java7.docroot.url}"/>
172
173	<	<!-- Default jdk api doc location (latest stable release seems best) -->
174	<	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
173	>	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
174	>	<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
175	>	<property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
176	>	<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
177	>	<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
178	>	<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
179	>	<property name="java.api.url"       value="${java.docroot.url}/api/"/>
180
181		<!-- Define the "jtreg" task -->
182		<!-- See the docs in "jtreg -onlineHelp" -->
#	Line 170 | Line 191 | As of 2013-02, the very latest lambda 8
191
192		<macrodef name="run-tck-tests">
193		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
173	–	<attribute name="source" default="6"/>
194		<attribute name="target"/>
195	+	<attribute name="compile-target" default="@{target}"/>
196		<attribute name="workdir"/>
197		<attribute name="classes"/>
198		<attribute name="jvmflags" default=""/>
#	Line 185 | Line 206 | As of 2013-02, the very latest lambda 8
206		debug="${build.debug}"
207		debuglevel="${build.debuglevel}"
208		deprecation="${build.deprecation}"
209	<	source="@{source}"
209	>	source="@{compile-target}"
210	>	target="@{compile-target}"
211		classpath="${junit.jar}"
212	<	bootclasspath="@{classes}:${bootclasspath@{source}}"
212	>	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
213		includeAntRuntime="false"
214		includeJavaRuntime="false"
215	<	executable="${javac@{target}}"
215	>	executable="${javac@{compile-target}}"
216		fork="true">
217
218		<include name="*.java"/>
#	Line 201 | Line 223 | As of 2013-02, the very latest lambda 8
223
224		</javac>
225
226	<	<java classname="JSR166TestCase"
226	>	<java classname="${jsr166.tckTestClass}"
227		failonerror="true"
228		jvm="${java@{target}}"
229		fork="true">
230		<jvmarg value="-Xbootclasspath/p:@{classes}"/>
231		<jvmarg line="@{jvmflags}"/>
232	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
233	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
234	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
235		<classpath>
236		<pathelement location="${junit.jar}"/>
237		<pathelement location="@{workdir}/tck-classes"/>
#	Line 216 | Line 241 | As of 2013-02, the very latest lambda 8
241		</sequential>
242		</macrodef>
243
244	+	<macrodef name="run-jtreg-tests">
245	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
246	+	<attribute name="source" default="7"/>
247	+	<attribute name="target"/>
248	+	<attribute name="workdir"/>
249	+	<attribute name="classes"/>
250	+	<attribute name="jtregflags" default=""/>
251	+	<sequential>
252	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
253	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
254	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
255	+	<mkdir dir="@{workdir}/JTreport"/>
256	+	<jtreg dir="@{jtreg.src.dir}"
257	+	jdk="${jdk@{target}.home}"
258	+	workDir="@{workdir}/JTwork"
259	+	reportDir="@{workdir}/JTreport">
260	+
261	+	<arg value="-Xbootclasspath/p:@{classes}"/>
262	+	<arg value="-agentvm"/>
263	+	<arg value="-v:nopass,fail"/>
264	+	<arg value="-vmoptions:-esa -ea"/>
265	+	<arg value="-automatic"/>
266	+	<arg value="-k:!ignore"/>
267	+	<arg line="@{jtregflags}"/>
268	+	</jtreg>
269	+	</sequential>
270	+	</macrodef>
271	+
272		<!-- ALoops classpath -->
273		<path id="loops.classpath">
274		<pathelement location="${build.loops.dir}"/>
#	Line 227 | Line 280 | As of 2013-02, the very latest lambda 8
280
281		<!-- Main targets -->
282
283	+	<property name="build.main.java.version" value="9"/>
284	+	<property name="build.main.javac" value="${javac9}"/>
285	+
286		<target name="dists"
287		depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
288		description="Builds all public jars and docs"/>
#	Line 245 | Line 301 | As of 2013-02, the very latest lambda 8
301		classpath=""
302		includeAntRuntime="false"
303		includeJavaRuntime="false"
304	<	executable="${javac8}"
304	>	executable="${build.main.javac}"
305		fork="true">
306
307		<include name="**/*.java"/>
308	+	<compilerarg value="-Xprefer:source"/>
309		<compilerarg value="-XDignore.symbol.file=true"/>
310		<compilerarg value="-Xlint:all"/>
311	+	<compilerarg value="-Xdoclint:all/protected"/>
312	+	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
313		<compilerarg line="${build.args}"/>
314
315		</javac>
#	Line 267 | Line 326 | As of 2013-02, the very latest lambda 8
326		</target>
327
328
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	–
329		<target name="docs"
330		description="Builds javadocs for src/main to dist dir">
331
#	Line 283 | Line 337 | As of 2013-02, the very latest lambda 8
337
338		<javadoc destdir="${docs.dir}"
339		packagenames="none"
340	<	link="${jdkapi8docs.url}"
340	>	link="${java9.api.url}"
341		overview="${src.dir}/intro.html"
342		access="${build.javadoc.access}"
343	<	sourcepath="${src.dir}:${jdk8src.dir}"
343	>	sourcepath="${src.dir}:${jdk9src.dir}"
344		classpath=""
345	<	executable="${javadoc8}">
345	>	executable="${javadoc9}">
346		<fileset dir="${src.dir}" defaultexcludes="yes">
347		<include name="**/*.java"/>
348		</fileset>
349	+	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
350	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351		<arg value="-XDignore.symbol.file=true"/>
352		<arg value="-tag"/>
353		<arg value="${javadoc.jls.option}"/>
354	+	<arg value="-tag"/>
355	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
356	+	<arg value="-tag"/>
357	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
358	+	<arg value="-tag"/>
359	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
360		</javadoc>
361		</target>
362
#	Line 333 | Line 395 | As of 2013-02, the very latest lambda 8
395		<target name="dist-clean"
396		description="Removes all build and distribution products">
397
398	+	<delete dir="${build.dir}"/>
399		<delete dir="${dist.dir}"/>
400
401		</target>
402
403
341	–	<!-- Internal targets -->
342	–
343	–
404		<target name="dist-jar"
405		depends="clean, jar">
406		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 352 | Line 412 | As of 2013-02, the very latest lambda 8
412		</target>
413
414
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	–
415		<target name="test-tck"
416		depends="jar"
417		description="Runs tck tests for main directly">
418
419		<run-tck-tests
420	<	target="8"
420	>	target="${build.main.java.version}"
421		workdir="${build.dir}"
422		classes="${product.jar}"/>
423		</target>
424
425	<	<target name="run-tests"
426	<	depends="compile-tests">
427	<
428	<	<!-- May be overridden by user.properties -->
429	<	<property name="testcase" value="*"/>
430	<
431	<	<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	<	-->
471	<
472	<	</junit>
473	<
425	>	<target name="test-jtreg"
426	>	depends="jar"
427	>	description="Runs jtreg tests for main using the jtreg ant task">
428	>	<run-jtreg-tests
429	>	target="${build.main.java.version}"
430	>	workdir="${build.dir}"
431	>	classes="${product.jar}"/>
432		</target>
433
434	+	<target name="test"
435	+	depends="test-tck, test-jtreg"
436	+	description="Runs tck and jtreg tests for main">
437	+	</target>
438
439	<	<target name="report-tests"
440	<	depends="run-tests">
439	>	<target name="test89"
440	>	description="Runs tck and jtreg tests for main for multiple java versions">
441
442	<	<!-- Sets junit.report.format to frames if redirection is present,
443	<	otherwise sets it to noframes. -->
444	<	<available property="junit.report.format"
445	<	value="frames"
446	<	classname="org.apache.xalan.lib.Redirect"
447	<	/>
448	<	<property name="junit.report.format" value="noframes"/>
449	<
450	<	<junitreport todir="${build.reports.dir}">
451	<	<fileset dir="${build.reports.dir}">
452	<	<include name="TEST-*.xml"/>
491	<	</fileset>
492	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
493	<	/>
494	<	</junitreport>
495	<
496	<	<fail message="Test Cases Failed" if="junit.failed"/>
442	>	<antcall target="clean"/>
443	>	<antcall target="test">
444	>	<param name="build.main.java.version" value="8"/>
445	>	<param name="build.main.javac" value="${javac8}"/>
446	>	</antcall>
447	>
448	>	<antcall target="clean"/>
449	>	<antcall target="test">
450	>	<param name="build.main.java.version" value="9"/>
451	>	<param name="build.main.javac" value="${javac9}"/>
452	>	</antcall>
453
454		</target>
455
456
457	+
458		<target name="configure-compiler">
459
460		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 515 | Line 472 | As of 2013-02, the very latest lambda 8
472		</target>
473
474
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	–
475
476		<!-- Various demos and test programs -->
477
#	Line 590 | Line 524 | As of 2013-02, the very latest lambda 8
524		fork="true">
525
526		<include name="**/*.java"/>
527	+	<compilerarg value="-Xprefer:source"/>
528	+	<compilerarg value="-XDignore.symbol.file=true"/>
529	+	<compilerarg value="-Xlint:all"/>
530	+	<compilerarg line="${build.args}"/>
531	+
532	+	</javac>
533	+	</target>
534	+
535	+	<target name="4jdk7doclint"
536	+	depends="configure-compiler"
537	+	description="Finds doclint warnings">
538	+
539	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
540	+
541	+	<javac srcdir="${4jdk7src.dir}"
542	+	destdir="${build.4jdk7.classes.dir}"
543	+	debug="${build.debug}"
544	+	debuglevel="${build.debuglevel}"
545	+	deprecation="${build.deprecation}"
546	+	source="6"
547	+	classpath=""
548	+	bootclasspath="${bootclasspath7}"
549	+	includeAntRuntime="false"
550	+	includeJavaRuntime="false"
551	+	executable="${javac8}"
552	+	fork="true">
553	+
554	+	<include name="**/*.java"/>
555	+	<compilerarg value="-Xprefer:source"/>
556		<compilerarg value="-XDignore.symbol.file=true"/>
557		<compilerarg value="-Xlint:all"/>
558	+	<compilerarg value="-Xdoclint:all/protected"/>
559		<compilerarg line="${build.args}"/>
560
561		</javac>
#	Line 618 | Line 582 | As of 2013-02, the very latest lambda 8
582		workdir="${build.4jdk7.dir}"
583		classes="${4jdk7product.jar}">
584		<javac-elements>
585	+	<!-- JDK8+ test classes -->
586	+	<exclude name="*8Test.java"/>
587	+	<exclude name="*9Test.java"/>
588	+	<exclude name="DoubleAccumulatorTest.java"/>
589	+	<exclude name="DoubleAdderTest.java"/>
590	+	<exclude name="LongAccumulatorTest.java"/>
591	+	<exclude name="LongAdderTest.java"/>
592	+	<exclude name="CompletableFutureTest.java"/>
593	+	<exclude name="SplittableRandomTest.java"/>
594		<exclude name="StampedLockTest.java"/>
595		</javac-elements>
596		</run-tck-tests>
#	Line 646 | Line 619 | As of 2013-02, the very latest lambda 8
619
620		<formatter type="brief"/>
621
622	<	<test name="JSR166TestCase" haltonfailure="no">
622	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
623		</test>
624
625		</junit>
626		</target>
627
628		<target name="4jdk7-test-jtreg"
629	<	depends="4jdk7compile"
629	>	depends="4jdk7jar"
630		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
631	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
632	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
633	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
634	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
635	<	<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>
631	>	<run-jtreg-tests
632	>	target="7"
633	>	workdir="${build.4jdk7.dir}"
634	>	classes="${4jdk7product.jar}"
635	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
636		</target>
637
638
#	Line 688 | Line 650 | As of 2013-02, the very latest lambda 8
650
651		<javadoc destdir="${4jdk7docs.dir}"
652		packagenames="none"
653	<	link="${jdkapi7docs.url}"
653	>	link="${java7.api.url}"
654		overview="${4jdk7src.dir}/intro.html"
655		access="${build.javadoc.access}"
656		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
#	Line 697 | Line 659 | As of 2013-02, the very latest lambda 8
659		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
660		<include name="**/*.java"/>
661		</fileset>
662	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
663		<arg value="-XDignore.symbol.file=true"/>
664		</javadoc>
665		</target>
#	Line 715 | Line 678 | As of 2013-02, the very latest lambda 8
678		</target>
679
680
718	–	<target name="4jdk7dist-clean"
719	–	description="Removes all build and distribution products">
720	–
721	–	</target>
722	–
681		<target name="4jdk7dist-jar"
682		depends="4jdk7clean, 4jdk7jar">
683		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
#	Line 781 | Line 739 | As of 2013-02, the very latest lambda 8
739
740		<javadoc destdir="${jsr166xdocs.dir}"
741		packagenames="jsr166x.*"
742	<	link="${jdkapidocs.url}"
742	>	link="${java.api.url}"
743		access="${build.javadoc.access}"
744		sourcepath="${topsrc.dir}:${jdk6src.dir}"
745		bootclasspath="${bootclasspath6}"
746		source="5"
747		executable="${javadoc7}">
748	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
749		<arg value="-XDignore.symbol.file=true"/>
750
751		</javadoc>
#	Line 806 | Line 765 | As of 2013-02, the very latest lambda 8
765		</target>
766
767
809	–	<target name="jsr166xdist-clean"
810	–	description="Removes all build and distribution products">
811	–
812	–	</target>
813	–
814	–
768		<target name="jsr166xdist-jar"
769		depends="jsr166xclean, jsr166xjar">
770		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
#	Line 872 | Line 825 | As of 2013-02, the very latest lambda 8
825
826		<javadoc destdir="${jsr166ydocs.dir}"
827		packagenames="jsr166y.*"
828	<	link="${jdkapidocs.url}"
828	>	link="${java.api.url}"
829		access="${build.javadoc.access}"
830		sourcepath="${topsrc.dir}:${jdk6src.dir}"
831		bootclasspath="${bootclasspath6}"
832		source="6"
833		executable="${javadoc7}">
834	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
835		<arg value="-XDignore.symbol.file=true"/>
836
837		</javadoc>
#	Line 897 | Line 851 | As of 2013-02, the very latest lambda 8
851		</target>
852
853
900	–	<target name="jsr166ydist-clean"
901	–	description="Removes all build and distribution products">
902	–
903	–	</target>
904	–
854		<target name="jsr166ydist-jar"
855		depends="jsr166yclean, jsr166yjar">
856		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
#	Line 963 | Line 912 | As of 2013-02, the very latest lambda 8
912
913		<javadoc destdir="${extra166ydocs.dir}"
914		packagenames="extra166y.*"
915	<	link="${jdkapidocs.url}"
915	>	link="${java.api.url}"
916		access="${build.javadoc.access}"
917		sourcepath="${topsrc.dir}:${jdk6src.dir}"
918		bootclasspath="${bootclasspath6}"
919		source="6"
920		executable="${javadoc7}">
921	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
922		<arg value="-XDignore.symbol.file=true"/>
923
924		</javadoc>
#	Line 988 | Line 938 | As of 2013-02, the very latest lambda 8
938		</target>
939
940
991	–	<target name="extra166ydist-clean"
992	–	description="Removes all build and distribution products">
993	–
994	–	</target>
995	–
941		<target name="extra166ydist-jar"
942		depends="extra166yclean, extra166yjar">
943		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
#	Line 1005 | Line 950 | As of 2013-02, the very latest lambda 8
950
951		<!-- jsr166e -->
952
953	+	<property name="build.jsr166e.java.version" value="6"/>
954	+	<property name="build.jsr166e.javac" value="${javac6}"/>
955	+
956		<target name="jsr166ecompile"
957		depends="configure-compiler"
958		description="Compiles jsr166e sources">
#	Line 1016 | Line 964 | As of 2013-02, the very latest lambda 8
964		debug="${build.debug}"
965		debuglevel="${build.debuglevel}"
966		deprecation="${build.deprecation}"
967	<	source="7"
967	>	source="${build.jsr166e.java.version}"
968		classpath=""
969		includeAntRuntime="false"
970		includeJavaRuntime="false"
971	<	executable="${javac7}"
971	>	executable="${build.jsr166e.javac}"
972		fork="true">
973
974		<include name="jsr166e/**/*.java"/>
#	Line 1031 | Line 979 | As of 2013-02, the very latest lambda 8
979		</javac>
980		</target>
981
982	+	<!-- jsr166e: find doclint errors -->
983	+	<target name="jsr166edoclint">
984	+
985	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
986	+
987	+	<javac srcdir="${topsrc.dir}"
988	+	destdir="${build.jsr166e.classes.dir}"
989	+	debug="${build.debug}"
990	+	debuglevel="${build.debuglevel}"
991	+	deprecation="${build.deprecation}"
992	+	source="${build.jsr166e.java.version}"
993	+	classpath=""
994	+	bootclasspath="${bootclasspath7}"
995	+	includeAntRuntime="false"
996	+	includeJavaRuntime="false"
997	+	executable="${javac8}"
998	+	fork="true">
999	+
1000	+	<include name="jsr166e/**/*.java"/>
1001	+	<compilerarg value="-XDignore.symbol.file=true"/>
1002	+	<compilerarg value="-Xlint:all"/>
1003	+	<compilerarg value="-Xdoclint:all/protected"/>
1004	+
1005	+	</javac>
1006	+	</target>
1007	+
1008
1009		<target name="jsr166ejar"
1010		depends="jsr166ecompile"
#	Line 1051 | Line 1025 | As of 2013-02, the very latest lambda 8
1025
1026		<javadoc destdir="${jsr166edocs.dir}"
1027		packagenames="jsr166e.*"
1028	<	link="${jdkapidocs.url}"
1028	>	link="${java.api.url}"
1029		access="${build.javadoc.access}"
1030	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1031	<	source="7"
1030	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1031	>	source="${build.jsr166e.java.version}"
1032		executable="${javadoc7}">
1033	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1034		<arg value="-XDignore.symbol.file=true"/>
1035
1036		</javadoc>
1037		</target>
1038
1039
1040	<	<target name="jsr166e-test-tck"
1041	<	depends="jsr166ejar"
1042	<	description="Runs tck tests for jsr166e">
1040	>	<target name="jsr166e-test-tck-one-java-version"
1041	>	depends="jsr166ejar">
1042	>
1043	>	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1044
1045		<run-tck-tests
1046		tck.src.dir="${test.src.dir}/tck-jsr166e"
1047	<	source="7"
1072	<	target="8"
1047	>	target="${build.jsr166e.java.version}"
1048		workdir="${build.jsr166e.dir}"
1049		classes="${jsr166e.jar}"/>
1050		</target>
1051
1052	+	<target name="jsr166e-test-tck"
1053	+	description="Runs tck tests for jsr166e for multiple java versions">
1054	+
1055	+	<!--     <antcall target="clean"/> -->
1056	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1057	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1058	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1059	+	<!--     </antcall> -->
1060	+
1061	+	<antcall target="clean"/>
1062	+	<antcall target="jsr166e-test-tck-one-java-version">
1063	+	<param name="build.jsr166e.java.version" value="7"/>
1064	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1065	+	</antcall>
1066	+
1067	+	<antcall target="clean"/>
1068	+	<antcall target="jsr166e-test-tck-one-java-version">
1069	+	<param name="build.jsr166e.java.version" value="6"/>
1070	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1071	+	</antcall>
1072	+	</target>
1073	+
1074	+
1075	+	<target name="jsr166e-test"
1076	+	depends="jsr166e-test-tck"
1077	+	description="Runs all tests for jsr166e">
1078	+	</target>
1079
1080		<target name="jsr166edist"
1081		depends="jsr166edist-jar, jsr166edist-docs"
#	Line 1086 | Line 1088 | As of 2013-02, the very latest lambda 8
1088		</target>
1089
1090
1089	–	<target name="jsr166edist-clean"
1090	–	description="Removes all build and distribution products">
1091	–
1092	–	</target>
1093	–
1091		<target name="jsr166edist-jar"
1092		depends="jsr166eclean, jsr166ejar">
1093		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>

Diff Legend

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