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.130 by jsr166, Mon Jan 28 22:00:34 2013 UTC vs.
Revision 1.154 by jsr166, Mon Jun 16 15:55:54 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.
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 43 | Line 46
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 104 | Line 116
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 144 | Line 157
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 169 | Line 191
191
192		<macrodef name="run-tck-tests">
193		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
172	–	<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=""/>
198	>	<attribute name="jvmflags" default="-ea -esa"/>
199	>	<element name="javac-elements" optional="true"/>
200		<sequential>
201
202		<mkdir dir="@{workdir}/tck-classes"/>
#	Line 183 | Line 206
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"/>
219		<compilerarg value="-XDignore.symbol.file=true"/>
220		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
221		<compilerarg line="${build.args}"/>
222	+	<javac-elements/>
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 213 | Line 241
241		</sequential>
242		</macrodef>
243
244	+	<macrodef name="run-jtreg-tests">
245	+	<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
246	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
247	+	<attribute name="source" default="7"/>
248	+	<attribute name="target"/>
249	+	<attribute name="workdir"/>
250	+	<attribute name="classes"/>
251	+	<attribute name="jtregflags" default=""/>
252	+	<sequential>
253	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
254	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
255	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
256	+	<mkdir dir="@{workdir}/JTreport"/>
257	+	<jtreg dir="@{jtreg.src.dir}"
258	+	jdk="${jdk@{target}.home}"
259	+	workDir="@{workdir}/JTwork"
260	+	reportDir="@{workdir}/JTreport">
261	+
262	+	<arg value="-Xbootclasspath/p:@{classes}"/>
263	+	<arg value="-agentvm"/>
264	+	<arg value="-v:nopass,fail"/>
265	+	<arg value="-vmoptions:-esa -ea"/>
266	+	<arg value="-automatic"/>
267	+	<arg value="-k:!ignore"/>
268	+	<arg line="@{jtregflags}"/>
269	+	</jtreg>
270	+	</sequential>
271	+	</macrodef>
272	+
273		<!-- ALoops classpath -->
274		<path id="loops.classpath">
275		<pathelement location="${build.loops.dir}"/>
#	Line 224 | Line 281
281
282		<!-- Main targets -->
283
284	+	<property name="build.main.java.version" value="9"/>
285	+	<property name="build.main.javac" value="${javac9}"/>
286	+
287		<target name="dists"
288		depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
289		description="Builds all public jars and docs"/>
#	Line 242 | Line 302
302		classpath=""
303		includeAntRuntime="false"
304		includeJavaRuntime="false"
305	<	executable="${javac8}"
305	>	executable="${build.main.javac}"
306		fork="true">
307
308		<include name="**/*.java"/>
309	+	<compilerarg value="-Xprefer:source"/>
310		<compilerarg value="-XDignore.symbol.file=true"/>
311		<compilerarg value="-Xlint:all"/>
312	+	<compilerarg value="-Xdoclint:all/protected"/>
313	+	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
314		<compilerarg line="${build.args}"/>
315
316		</javac>
#	Line 264 | Line 327
327		</target>
328
329
267	–	<target name="test"
268	–	depends="configure-tests, report-tests"
269	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
270	–
271	–
330		<target name="docs"
331		description="Builds javadocs for src/main to dist dir">
332
#	Line 280 | Line 338
338
339		<javadoc destdir="${docs.dir}"
340		packagenames="none"
341	<	link="${jdkapi8docs.url}"
341	>	link="${java9.api.url}"
342		overview="${src.dir}/intro.html"
343		access="${build.javadoc.access}"
344	<	sourcepath="${src.dir}:${jdk8src.dir}"
344	>	sourcepath="${src.dir}:${jdk9src.dir}"
345		classpath=""
346	<	executable="${javadoc8}">
346	>	executable="${javadoc9}">
347		<fileset dir="${src.dir}" defaultexcludes="yes">
348		<include name="**/*.java"/>
349		</fileset>
350	+	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
351	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
352		<arg value="-XDignore.symbol.file=true"/>
353		<arg value="-tag"/>
354		<arg value="${javadoc.jls.option}"/>
355	+	<arg value="-tag"/>
356	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
357	+	<arg value="-tag"/>
358	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
359	+	<arg value="-tag"/>
360	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
361		</javadoc>
362		</target>
363
#	Line 330 | Line 396
396		<target name="dist-clean"
397		description="Removes all build and distribution products">
398
399	+	<delete dir="${build.dir}"/>
400		<delete dir="${dist.dir}"/>
401
402		</target>
403
404
338	–	<!-- Internal targets -->
339	–
340	–
405		<target name="dist-jar"
406		depends="clean, jar">
407		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 349 | Line 413
413		</target>
414
415
416	<	<target name="compile-tests"
417	<	depends="jar">
418	<
355	<	<mkdir dir="${build.testcases.dir}"/>
356	<
357	<	<javac srcdir="${tck.src.dir}"
358	<	destdir="${build.testcases.dir}"
359	<	debug="${build.debug}"
360	<	debuglevel="${build.debuglevel}"
361	<	deprecation="${build.deprecation}"
362	<	source="6"
363	<	classpath="${junit.jar}"
364	<	bootclasspath="@{product.jar}:${bootclasspath6}"
365	<	includeAntRuntime="false"
366	<	includeJavaRuntime="false"
367	<	executable="${javac8}"
368	<	fork="true">
369	<
370	<	<include name="**/*.java"/>
371	<	<compilerarg value="-XDignore.symbol.file=true"/>
372	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
373	<	<compilerarg line="${build.args}"/>
374	<
375	<	</javac>
376	<
377	<	<javac srcdir="${test.src.dir}"
378	<	destdir="${build.testcases.dir}"
379	<	debug="${build.debug}"
380	<	debuglevel="${build.debuglevel}"
381	<	deprecation="${build.deprecation}"
382	<	source="6"
383	<	classpath=""
384	<	bootclasspath="@{product.jar}:${bootclasspath6}"
385	<	includeAntRuntime="false"
386	<	includeJavaRuntime="false"
387	<	executable="${javac8}"
388	<	fork="true">
389	<
390	<	<include name="jsr166/test/**/*.java"/>
391	<	<compilerarg value="-XDignore.symbol.file=true"/>
392	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
393	<	<compilerarg line="${build.args}"/>
394	<
395	<	</javac>
396	<
397	<	<!--
398	<	<javac srcdir="${jtreg.src.dir}"
399	<	destdir="${build.testcases.dir}"
400	<	debug="${build.debug}"
401	<	debuglevel="${build.debuglevel}"
402	<	deprecation="${build.deprecation}"
403	<	source="${build.sourcelevel}"
404	<	fork="true">
405	<
406	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
407	<	<compilerarg value="-XDignore.symbol.file=true"/>
408	<	<compilerarg line="${build.args}"/>
409	<
410	<	</javac>
411	<	-->
416	>	<target name="test-tck"
417	>	depends="jar"
418	>	description="Runs tck tests for main directly">
419
420	+	<run-tck-tests
421	+	target="${build.main.java.version}"
422	+	workdir="${build.dir}"
423	+	classes="${product.jar}"/>
424		</target>
425
426	<
427	<	<target name="run-tests"
428	<	depends="compile-tests">
429	<
430	<	<!-- May be overridden by user.properties -->
431	<	<property name="testcase" value="*"/>
432	<
422	<	<mkdir dir="${build.reports.dir}"/>
423	<
424	<	<junit printsummary="true"
425	<	showoutput="true"
426	<	errorProperty="junit.failed"
427	<	failureProperty="junit.failed"
428	<	dir="${build.reports.dir}"
429	<	jvm="${java8}"
430	<	fork="true">
431	<
432	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
433	<	<jvmarg value="-server"/>
434	<	<jvmarg value="-showversion"/>
435	<
436	<	<classpath refid="test.classpath"/>
437	<
438	<	<formatter type="xml"/>
439	<
440	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
441	<	<fileset dir="${tck.src.dir}">
442	<	<include name="**/${testcase}Test.java"/>
443	<	</fileset>
444	<	</batchtest>
445	<
446	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
447	<	<fileset dir="${test.src.dir}">
448	<	<include name="jsr166/test/**/${testcase}Test.java"/>
449	<	</fileset>
450	<	</batchtest>
451	<
452	<	<!--
453	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
454	<	<fileset dir="${jtreg.src.dir}">
455	<	<include name="**/${testcase}Test.java"/>
456	<	</fileset>
457	<	</batchtest>
458	<	-->
459	<
460	<	</junit>
461	<
426	>	<target name="test-jtreg"
427	>	depends="jar"
428	>	description="Runs jtreg tests for main using the jtreg ant task">
429	>	<run-jtreg-tests
430	>	target="${build.main.java.version}"
431	>	workdir="${build.dir}"
432	>	classes="${product.jar}"/>
433		</target>
434
435	+	<target name="test"
436	+	depends="test-tck, test-jtreg"
437	+	description="Runs tck and jtreg tests for main">
438	+	</target>
439
440	<	<target name="report-tests"
441	<	depends="run-tests">
467	<
468	<	<!-- Sets junit.report.format to frames if redirection is present,
469	<	otherwise sets it to noframes. -->
470	<	<available property="junit.report.format"
471	<	value="frames"
472	<	classname="org.apache.xalan.lib.Redirect"
473	<	/>
474	<	<property name="junit.report.format" value="noframes"/>
475	<
476	<	<junitreport todir="${build.reports.dir}">
477	<	<fileset dir="${build.reports.dir}">
478	<	<include name="TEST-*.xml"/>
479	<	</fileset>
480	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
481	<	/>
482	<	</junitreport>
440	>	<target name="test89"
441	>	description="Runs tck and jtreg tests for main for multiple java versions">
442
443	<	<fail message="Test Cases Failed" if="junit.failed"/>
443	>	<antcall target="clean"/>
444	>	<antcall target="test">
445	>	<param name="build.main.java.version" value="8"/>
446	>	<param name="build.main.javac" value="${javac8}"/>
447	>	</antcall>
448	>
449	>	<antcall target="clean"/>
450	>	<antcall target="test">
451	>	<param name="build.main.java.version" value="9"/>
452	>	<param name="build.main.javac" value="${javac9}"/>
453	>	</antcall>
454
455		</target>
456
457
458	+
459		<target name="configure-compiler">
460
461		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 503 | Line 473
473		</target>
474
475
506	–	<target name="configure-tests"
507	–	depends="configure-compiler">
508	–
509	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
510	–	<available property="junit.available"
511	–	classname="junit.framework.Protectable"/>
512	–
513	–	<!-- Xalan -->
514	–	<available property="xalan.available"
515	–	classname="org.apache.xalan.Version"/>
516	–
517	–
518	–	<!-- Ant 1.6beta and later don't need or want this check -->
519	–	<!--
520	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
521	–	unless="junit.available"/>
522	–
523	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
524	–	unless="xalan.available"/>
525	–	-->
526	–
527	–	</target>
528	–
476
477		<!-- Various demos and test programs -->
478
#	Line 578 | Line 525
525		fork="true">
526
527		<include name="**/*.java"/>
528	+	<compilerarg value="-Xprefer:source"/>
529		<compilerarg value="-XDignore.symbol.file=true"/>
530		<compilerarg value="-Xlint:all"/>
531		<compilerarg line="${build.args}"/>
#	Line 585 | Line 533
533		</javac>
534		</target>
535
536	+	<target name="4jdk7doclint"
537	+	depends="configure-compiler"
538	+	description="Finds doclint warnings">
539	+
540	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
541	+
542	+	<javac srcdir="${4jdk7src.dir}"
543	+	destdir="${build.4jdk7.classes.dir}"
544	+	debug="${build.debug}"
545	+	debuglevel="${build.debuglevel}"
546	+	deprecation="${build.deprecation}"
547	+	source="6"
548	+	classpath=""
549	+	bootclasspath="${bootclasspath7}"
550	+	includeAntRuntime="false"
551	+	includeJavaRuntime="false"
552	+	executable="${javac8}"
553	+	fork="true">
554	+
555	+	<include name="**/*.java"/>
556	+	<compilerarg value="-Xprefer:source"/>
557	+	<compilerarg value="-XDignore.symbol.file=true"/>
558	+	<compilerarg value="-Xlint:all"/>
559	+	<compilerarg value="-Xdoclint:all/protected"/>
560	+	<compilerarg line="${build.args}"/>
561	+
562	+	</javac>
563	+	</target>
564	+
565
566		<target name="4jdk7jar"
567		depends="4jdk7compile"
#	Line 604 | Line 581
581		<run-tck-tests
582		target="7"
583		workdir="${build.4jdk7.dir}"
584	<	classes="${4jdk7product.jar}"/>
584	>	classes="${4jdk7product.jar}">
585	>	<javac-elements>
586	>	<!-- JDK8+ test classes -->
587	>	<exclude name="*8Test.java"/>
588	>	<exclude name="*9Test.java"/>
589	>	<exclude name="DoubleAccumulatorTest.java"/>
590	>	<exclude name="DoubleAdderTest.java"/>
591	>	<exclude name="LongAccumulatorTest.java"/>
592	>	<exclude name="LongAdderTest.java"/>
593	>	<exclude name="CompletableFutureTest.java"/>
594	>	<exclude name="SplittableRandomTest.java"/>
595	>	<exclude name="StampedLockTest.java"/>
596	>	</javac-elements>
597	>	</run-tck-tests>
598		</target>
599
600
#	Line 630 | Line 620
620
621		<formatter type="brief"/>
622
623	<	<test name="JSR166TestCase" haltonfailure="no">
623	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
624		</test>
625
626		</junit>
627		</target>
628
629		<target name="4jdk7-test-jtreg"
630	<	depends="4jdk7compile"
630	>	depends="4jdk7jar"
631		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
632	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
633	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
634	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
635	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
636	<	<jtreg dir="${jtreg.src.dir}"
647	<	jdk="${jdk7.home}"
648	<	workDir="${build.4jdk7.dir}/JTwork"
649	<	reportDir="${build.4jdk7.dir}/JTreport">
650	<
651	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
652	<	<arg value="-agentvm"/>
653	<	<arg value="-v:nopass,fail"/>
654	<	<arg value="-vmoptions:-esa -ea"/>
655	<	<arg value="-automatic"/>
656	<	<arg value="-k:!ignore"/>
657	<	</jtreg>
632	>	<run-jtreg-tests
633	>	target="7"
634	>	workdir="${build.4jdk7.dir}"
635	>	classes="${4jdk7product.jar}"
636	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
637		</target>
638
639
#	Line 672 | Line 651
651
652		<javadoc destdir="${4jdk7docs.dir}"
653		packagenames="none"
654	<	link="${jdkapi7docs.url}"
654	>	link="${java7.api.url}"
655		overview="${4jdk7src.dir}/intro.html"
656		access="${build.javadoc.access}"
657		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
#	Line 681 | Line 660
660		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
661		<include name="**/*.java"/>
662		</fileset>
663	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
664		<arg value="-XDignore.symbol.file=true"/>
665		</javadoc>
666		</target>
#	Line 699 | Line 679
679		</target>
680
681
702	–	<target name="4jdk7dist-clean"
703	–	description="Removes all build and distribution products">
704	–
705	–	</target>
706	–
682		<target name="4jdk7dist-jar"
683		depends="4jdk7clean, 4jdk7jar">
684		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
#	Line 765 | Line 740
740
741		<javadoc destdir="${jsr166xdocs.dir}"
742		packagenames="jsr166x.*"
743	<	link="${jdkapidocs.url}"
743	>	link="${java.api.url}"
744		access="${build.javadoc.access}"
745		sourcepath="${topsrc.dir}:${jdk6src.dir}"
746		bootclasspath="${bootclasspath6}"
747		source="5"
748		executable="${javadoc7}">
749	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
750		<arg value="-XDignore.symbol.file=true"/>
751
752		</javadoc>
#	Line 790 | Line 766
766		</target>
767
768
793	–	<target name="jsr166xdist-clean"
794	–	description="Removes all build and distribution products">
795	–
796	–	</target>
797	–
798	–
769		<target name="jsr166xdist-jar"
770		depends="jsr166xclean, jsr166xjar">
771		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
#	Line 856 | Line 826
826
827		<javadoc destdir="${jsr166ydocs.dir}"
828		packagenames="jsr166y.*"
829	<	link="${jdkapidocs.url}"
829	>	link="${java.api.url}"
830		access="${build.javadoc.access}"
831		sourcepath="${topsrc.dir}:${jdk6src.dir}"
832		bootclasspath="${bootclasspath6}"
833		source="6"
834		executable="${javadoc7}">
835	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
836		<arg value="-XDignore.symbol.file=true"/>
837
838		</javadoc>
#	Line 881 | Line 852
852		</target>
853
854
884	–	<target name="jsr166ydist-clean"
885	–	description="Removes all build and distribution products">
886	–
887	–	</target>
888	–
855		<target name="jsr166ydist-jar"
856		depends="jsr166yclean, jsr166yjar">
857		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
#	Line 947 | Line 913
913
914		<javadoc destdir="${extra166ydocs.dir}"
915		packagenames="extra166y.*"
916	<	link="${jdkapidocs.url}"
916	>	link="${java.api.url}"
917		access="${build.javadoc.access}"
918		sourcepath="${topsrc.dir}:${jdk6src.dir}"
919		bootclasspath="${bootclasspath6}"
920		source="6"
921		executable="${javadoc7}">
922	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
923		<arg value="-XDignore.symbol.file=true"/>
924
925		</javadoc>
#	Line 972 | Line 939
939		</target>
940
941
975	–	<target name="extra166ydist-clean"
976	–	description="Removes all build and distribution products">
977	–
978	–	</target>
979	–
942		<target name="extra166ydist-jar"
943		depends="extra166yclean, extra166yjar">
944		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
#	Line 989 | Line 951
951
952		<!-- jsr166e -->
953
954	+	<property name="build.jsr166e.java.version" value="6"/>
955	+	<property name="build.jsr166e.javac" value="${javac6}"/>
956	+
957		<target name="jsr166ecompile"
958		depends="configure-compiler"
959		description="Compiles jsr166e sources">
#	Line 1000 | Line 965
965		debug="${build.debug}"
966		debuglevel="${build.debuglevel}"
967		deprecation="${build.deprecation}"
968	<	source="7"
968	>	source="${build.jsr166e.java.version}"
969		classpath=""
970		includeAntRuntime="false"
971		includeJavaRuntime="false"
972	<	executable="${javac7}"
972	>	executable="${build.jsr166e.javac}"
973		fork="true">
974
975		<include name="jsr166e/**/*.java"/>
#	Line 1015 | Line 980
980		</javac>
981		</target>
982
983	+	<!-- jsr166e: find doclint errors -->
984	+	<target name="jsr166edoclint">
985	+
986	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
987	+
988	+	<javac srcdir="${topsrc.dir}"
989	+	destdir="${build.jsr166e.classes.dir}"
990	+	debug="${build.debug}"
991	+	debuglevel="${build.debuglevel}"
992	+	deprecation="${build.deprecation}"
993	+	source="${build.jsr166e.java.version}"
994	+	classpath=""
995	+	bootclasspath="${bootclasspath7}"
996	+	includeAntRuntime="false"
997	+	includeJavaRuntime="false"
998	+	executable="${javac8}"
999	+	fork="true">
1000	+
1001	+	<include name="jsr166e/**/*.java"/>
1002	+	<compilerarg value="-XDignore.symbol.file=true"/>
1003	+	<compilerarg value="-Xlint:all"/>
1004	+	<compilerarg value="-Xdoclint:all/protected"/>
1005	+
1006	+	</javac>
1007	+	</target>
1008	+
1009
1010		<target name="jsr166ejar"
1011		depends="jsr166ecompile"
#	Line 1035 | Line 1026
1026
1027		<javadoc destdir="${jsr166edocs.dir}"
1028		packagenames="jsr166e.*"
1029	<	link="${jdkapidocs.url}"
1029	>	link="${java.api.url}"
1030		access="${build.javadoc.access}"
1031	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1032	<	source="7"
1031	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1032	>	source="${build.jsr166e.java.version}"
1033		executable="${javadoc7}">
1034	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1035		<arg value="-XDignore.symbol.file=true"/>
1036
1037		</javadoc>
1038		</target>
1039
1040
1041	<	<target name="jsr166e-test-tck"
1042	<	depends="jsr166ejar"
1043	<	description="Runs tck tests for jsr166e">
1041	>	<target name="jsr166e-test-tck-one-java-version"
1042	>	depends="jsr166ejar">
1043	>
1044	>	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1045
1046		<run-tck-tests
1047		tck.src.dir="${test.src.dir}/tck-jsr166e"
1048	<	source="7"
1056	<	target="8"
1048	>	target="${build.jsr166e.java.version}"
1049		workdir="${build.jsr166e.dir}"
1050		classes="${jsr166e.jar}"/>
1051		</target>
1052
1053	+	<target name="jsr166e-test-tck"
1054	+	description="Runs tck tests for jsr166e for multiple java versions">
1055	+
1056	+	<!--     <antcall target="clean"/> -->
1057	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1058	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1059	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1060	+	<!--     </antcall> -->
1061	+
1062	+	<antcall target="clean"/>
1063	+	<antcall target="jsr166e-test-tck-one-java-version">
1064	+	<param name="build.jsr166e.java.version" value="7"/>
1065	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1066	+	</antcall>
1067	+
1068	+	<antcall target="clean"/>
1069	+	<antcall target="jsr166e-test-tck-one-java-version">
1070	+	<param name="build.jsr166e.java.version" value="6"/>
1071	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1072	+	</antcall>
1073	+	</target>
1074	+
1075	+
1076	+	<target name="jsr166e-test"
1077	+	depends="jsr166e-test-tck"
1078	+	description="Runs all tests for jsr166e">
1079	+	</target>
1080
1081		<target name="jsr166edist"
1082		depends="jsr166edist-jar, jsr166edist-docs"
#	Line 1070 | Line 1089
1089		</target>
1090
1091
1073	–	<target name="jsr166edist-clean"
1074	–	description="Removes all build and distribution products">
1075	–
1076	–	</target>
1077	–
1092		<target name="jsr166edist-jar"
1093		depends="jsr166eclean, jsr166ejar">
1094		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>

Diff Legend

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