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.127 by jsr166, Wed Jan 23 06:57:08 2013 UTC vs.
Revision 1.159 by jsr166, Fri Oct 3 23:18:13 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	+	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="Advises user to run with -projecthelp">
35	<	<echo>Run "ant -projecthelp" for full usage information.</echo>
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>
39		</target>
40
41
#	Line 39 | Line 48
48		<property name="build.debug"          value="true"/>
49		<property name="build.debuglevel"     value="source,lines,vars"/>
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"/>
#	Line 101 | Line 122
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 141 | Line 163
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 166 | Line 195
195
196		<macrodef name="run-tck-tests">
197		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
169	–	<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
206		<mkdir dir="@{workdir}/tck-classes"/>
#	Line 180 | Line 210
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}"
216	<	bootclasspath="@{classes}:${bootclasspath@{source}}"
216	>	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
217		includeAntRuntime="false"
218		includeJavaRuntime="false"
219	<	executable="${javac@{target}}"
219	>	executable="${javac@{compile-target}}"
220		fork="true">
221
222		<include name="*.java"/>
223		<compilerarg value="-XDignore.symbol.file=true"/>
224		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
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	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
237	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
238	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
239		<classpath>
240		<pathelement location="${junit.jar}"/>
241		<pathelement location="@{workdir}/tck-classes"/>
#	Line 210 | Line 245
245		</sequential>
246		</macrodef>
247
248	+	<macrodef name="run-jtreg-tests">
249	+	<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
250	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
251	+	<attribute name="source" default="7"/>
252	+	<attribute name="target"/>
253	+	<attribute name="workdir"/>
254	+	<attribute name="classes"/>
255	+	<attribute name="jtregflags" default=""/>
256	+	<sequential>
257	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
258	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
259	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
260	+	<mkdir dir="@{workdir}/JTreport"/>
261	+	<jtreg dir="@{jtreg.src.dir}"
262	+	jdk="${jdk@{target}.home}"
263	+	workDir="@{workdir}/JTwork"
264	+	reportDir="@{workdir}/JTreport">
265	+
266	+	<arg value="-Xbootclasspath/p:@{classes}"/>
267	+	<arg value="-agentvm"/>
268	+	<arg value="-v:nopass,fail"/>
269	+	<arg value="-vmoptions:-esa -ea"/>
270	+	<arg value="-automatic"/>
271	+	<arg value="-k:!ignore"/>
272	+	<arg line="@{jtregflags}"/>
273	+	</jtreg>
274	+	</sequential>
275	+	</macrodef>
276	+
277		<!-- ALoops classpath -->
278		<path id="loops.classpath">
279		<pathelement location="${build.loops.dir}"/>
#	Line 221 | Line 285
285
286		<!-- Main targets -->
287
288	+	<property name="build.main.java.version" value="9"/>
289	+	<property name="build.main.javac" value="${javac9}"/>
290	+
291		<target name="dists"
292		depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
293		description="Builds all public jars and docs"/>
#	Line 239 | Line 306
306		classpath=""
307		includeAntRuntime="false"
308		includeJavaRuntime="false"
309	<	executable="${javac8}"
309	>	executable="${build.main.javac}"
310		fork="true">
311
312		<include name="**/*.java"/>
313	+	<compilerarg value="-Xprefer:source"/>
314		<compilerarg value="-XDignore.symbol.file=true"/>
315		<compilerarg value="-Xlint:all"/>
316	+	<compilerarg value="-Xdoclint:all/protected"/>
317	+	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
318		<compilerarg line="${build.args}"/>
319
320		</javac>
#	Line 261 | Line 331
331		</target>
332
333
264	–	<target name="test"
265	–	depends="configure-tests, report-tests"
266	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
267	–
268	–
334		<target name="docs"
335		description="Builds javadocs for src/main to dist dir">
336
#	Line 277 | Line 342
342
343		<javadoc destdir="${docs.dir}"
344		packagenames="none"
345	<	link="${jdkapi8docs.url}"
345	>	link="${java9.api.url}"
346		overview="${src.dir}/intro.html"
347	<	sourcepath="${src.dir}:${jdk8src.dir}"
347	>	access="${build.javadoc.access}"
348	>	sourcepath="${src.dir}:${jdk9src.dir}"
349		classpath=""
350	<	executable="${javadoc8}">
350	>	executable="${javadoc9}">
351		<fileset dir="${src.dir}" defaultexcludes="yes">
352		<include name="**/*.java"/>
353		</fileset>
354	+	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
355	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
356		<arg value="-XDignore.symbol.file=true"/>
357		<arg value="-tag"/>
358		<arg value="${javadoc.jls.option}"/>
359	+	<arg value="-tag"/>
360	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
361	+	<arg value="-tag"/>
362	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
363	+	<arg value="-tag"/>
364	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
365		</javadoc>
366		</target>
367
#	Line 326 | Line 400
400		<target name="dist-clean"
401		description="Removes all build and distribution products">
402
403	+	<delete dir="${build.dir}"/>
404		<delete dir="${dist.dir}"/>
405
406		</target>
407
408
334	–	<!-- Internal targets -->
335	–
336	–
409		<target name="dist-jar"
410		depends="clean, jar">
411		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 345 | Line 417
417		</target>
418
419
420	<	<target name="compile-tests"
421	<	depends="jar">
422	<
351	<	<mkdir dir="${build.testcases.dir}"/>
352	<
353	<	<javac srcdir="${tck.src.dir}"
354	<	destdir="${build.testcases.dir}"
355	<	debug="${build.debug}"
356	<	debuglevel="${build.debuglevel}"
357	<	deprecation="${build.deprecation}"
358	<	source="6"
359	<	classpath="${junit.jar}"
360	<	bootclasspath="@{product.jar}:${bootclasspath6}"
361	<	includeAntRuntime="false"
362	<	includeJavaRuntime="false"
363	<	executable="${javac8}"
364	<	fork="true">
365	<
366	<	<include name="**/*.java"/>
367	<	<compilerarg value="-XDignore.symbol.file=true"/>
368	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
369	<	<compilerarg line="${build.args}"/>
370	<
371	<	</javac>
372	<
373	<	<javac srcdir="${test.src.dir}"
374	<	destdir="${build.testcases.dir}"
375	<	debug="${build.debug}"
376	<	debuglevel="${build.debuglevel}"
377	<	deprecation="${build.deprecation}"
378	<	source="6"
379	<	classpath=""
380	<	bootclasspath="@{product.jar}:${bootclasspath6}"
381	<	includeAntRuntime="false"
382	<	includeJavaRuntime="false"
383	<	executable="${javac8}"
384	<	fork="true">
385	<
386	<	<include name="jsr166/test/**/*.java"/>
387	<	<compilerarg value="-XDignore.symbol.file=true"/>
388	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
389	<	<compilerarg line="${build.args}"/>
390	<
391	<	</javac>
392	<
393	<	<!--
394	<	<javac srcdir="${jtreg.src.dir}"
395	<	destdir="${build.testcases.dir}"
396	<	debug="${build.debug}"
397	<	debuglevel="${build.debuglevel}"
398	<	deprecation="${build.deprecation}"
399	<	source="${build.sourcelevel}"
400	<	fork="true">
401	<
402	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
403	<	<compilerarg value="-XDignore.symbol.file=true"/>
404	<	<compilerarg line="${build.args}"/>
405	<
406	<	</javac>
407	<	-->
420	>	<target name="test-tck"
421	>	depends="jar"
422	>	description="Runs tck tests for main directly">
423
424	+	<run-tck-tests
425	+	target="${build.main.java.version}"
426	+	workdir="${build.dir}"
427	+	classes="${product.jar}"/>
428		</target>
429
430	<
431	<	<target name="run-tests"
432	<	depends="compile-tests">
433	<
434	<	<!-- May be overridden by user.properties -->
435	<	<property name="testcase" value="*"/>
436	<
418	<	<mkdir dir="${build.reports.dir}"/>
419	<
420	<	<junit printsummary="true"
421	<	showoutput="true"
422	<	errorProperty="junit.failed"
423	<	failureProperty="junit.failed"
424	<	dir="${build.reports.dir}"
425	<	jvm="${java8}"
426	<	fork="true">
427	<
428	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
429	<	<jvmarg value="-server"/>
430	<	<jvmarg value="-showversion"/>
431	<
432	<	<classpath refid="test.classpath"/>
433	<
434	<	<formatter type="xml"/>
435	<
436	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
437	<	<fileset dir="${tck.src.dir}">
438	<	<include name="**/${testcase}Test.java"/>
439	<	</fileset>
440	<	</batchtest>
441	<
442	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
443	<	<fileset dir="${test.src.dir}">
444	<	<include name="jsr166/test/**/${testcase}Test.java"/>
445	<	</fileset>
446	<	</batchtest>
447	<
448	<	<!--
449	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
450	<	<fileset dir="${jtreg.src.dir}">
451	<	<include name="**/${testcase}Test.java"/>
452	<	</fileset>
453	<	</batchtest>
454	<	-->
455	<
456	<	</junit>
457	<
430	>	<target name="test-jtreg"
431	>	depends="jar"
432	>	description="Runs jtreg tests for main using the jtreg ant task">
433	>	<run-jtreg-tests
434	>	target="${build.main.java.version}"
435	>	workdir="${build.dir}"
436	>	classes="${product.jar}"/>
437		</target>
438
439	+	<target name="test"
440	+	depends="test-tck, test-jtreg"
441	+	description="Runs tck and jtreg tests for main">
442	+	</target>
443
444	<	<target name="report-tests"
445	<	depends="run-tests">
444	>	<target name="test89"
445	>	description="Runs tck and jtreg tests for main for multiple java versions">
446
447	<	<!-- Sets junit.report.format to frames if redirection is present,
448	<	otherwise sets it to noframes. -->
449	<	<available property="junit.report.format"
450	<	value="frames"
451	<	classname="org.apache.xalan.lib.Redirect"
452	<	/>
453	<	<property name="junit.report.format" value="noframes"/>
454	<
455	<	<junitreport todir="${build.reports.dir}">
456	<	<fileset dir="${build.reports.dir}">
457	<	<include name="TEST-*.xml"/>
475	<	</fileset>
476	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
477	<	/>
478	<	</junitreport>
479	<
480	<	<fail message="Test Cases Failed" if="junit.failed"/>
447	>	<antcall target="clean"/>
448	>	<antcall target="test">
449	>	<param name="build.main.java.version" value="8"/>
450	>	<param name="build.main.javac" value="${javac8}"/>
451	>	</antcall>
452	>
453	>	<antcall target="clean"/>
454	>	<antcall target="test">
455	>	<param name="build.main.java.version" value="9"/>
456	>	<param name="build.main.javac" value="${javac9}"/>
457	>	</antcall>
458
459		</target>
460
461
462	+
463		<target name="configure-compiler">
464
465		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 499 | Line 477
477		</target>
478
479
502	–	<target name="configure-tests"
503	–	depends="configure-compiler">
504	–
505	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
506	–	<available property="junit.available"
507	–	classname="junit.framework.Protectable"/>
508	–
509	–	<!-- Xalan -->
510	–	<available property="xalan.available"
511	–	classname="org.apache.xalan.Version"/>
512	–
513	–
514	–	<!-- Ant 1.6beta and later don't need or want this check -->
515	–	<!--
516	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
517	–	unless="junit.available"/>
518	–
519	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
520	–	unless="xalan.available"/>
521	–	-->
522	–
523	–	</target>
524	–
480
481		<!-- Various demos and test programs -->
482
#	Line 574 | Line 529
529		fork="true">
530
531		<include name="**/*.java"/>
532	+	<compilerarg value="-Xprefer:source"/>
533		<compilerarg value="-XDignore.symbol.file=true"/>
534		<compilerarg value="-Xlint:all"/>
535		<compilerarg line="${build.args}"/>
#	Line 581 | Line 537
537		</javac>
538		</target>
539
540	+	<target name="4jdk7doclint"
541	+	depends="configure-compiler"
542	+	description="Finds doclint warnings">
543	+
544	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
545	+
546	+	<javac srcdir="${4jdk7src.dir}"
547	+	destdir="${build.4jdk7.classes.dir}"
548	+	debug="${build.debug}"
549	+	debuglevel="${build.debuglevel}"
550	+	deprecation="${build.deprecation}"
551	+	source="6"
552	+	classpath=""
553	+	bootclasspath="${bootclasspath7}"
554	+	includeAntRuntime="false"
555	+	includeJavaRuntime="false"
556	+	executable="${javac8}"
557	+	fork="true">
558	+
559	+	<include name="**/*.java"/>
560	+	<compilerarg value="-Xprefer:source"/>
561	+	<compilerarg value="-XDignore.symbol.file=true"/>
562	+	<compilerarg value="-Xlint:all"/>
563	+	<compilerarg value="-Xdoclint:all/protected"/>
564	+	<compilerarg line="${build.args}"/>
565
566	<	<target name="4jdk7-jar"
566	>	</javac>
567	>	</target>
568	>
569	>
570	>	<target name="4jdk7jar"
571		depends="4jdk7compile"
572		description="Builds library jar from compiled sources">
573
#	Line 594 | Line 579
579
580
581		<target name="4jdk7-test-tck"
582	<	depends="4jdk7-jar"
582	>	depends="4jdk7jar"
583		description="Runs tck tests for jsr166-4jdk7 directly">
584
585		<run-tck-tests
586		target="7"
587		workdir="${build.4jdk7.dir}"
588	<	classes="${4jdk7product.jar}"/>
588	>	classes="${4jdk7product.jar}">
589	>	<javac-elements>
590	>	<!-- JDK8+ test classes -->
591	>	<exclude name="*8Test.java"/>
592	>	<exclude name="*9Test.java"/>
593	>	<exclude name="DoubleAccumulatorTest.java"/>
594	>	<exclude name="DoubleAdderTest.java"/>
595	>	<exclude name="LongAccumulatorTest.java"/>
596	>	<exclude name="LongAdderTest.java"/>
597	>	<exclude name="CompletableFutureTest.java"/>
598	>	<exclude name="SplittableRandomTest.java"/>
599	>	<exclude name="StampedLockTest.java"/>
600	>	</javac-elements>
601	>	</run-tck-tests>
602		</target>
603
604
#	Line 626 | Line 624
624
625		<formatter type="brief"/>
626
627	<	<test name="JSR166TestCase" haltonfailure="no">
627	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
628		</test>
629
630		</junit>
631		</target>
632
633		<target name="4jdk7-test-jtreg"
634	<	depends="4jdk7compile"
634	>	depends="4jdk7jar"
635		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
636	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
637	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
638	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
639	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
640	<	<jtreg dir="${jtreg.src.dir}"
643	<	jdk="${jdk7.home}"
644	<	workDir="${build.4jdk7.dir}/JTwork"
645	<	reportDir="${build.4jdk7.dir}/JTreport">
646	<
647	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
648	<	<arg value="-agentvm"/>
649	<	<arg value="-v:nopass,fail"/>
650	<	<arg value="-vmoptions:-esa -ea"/>
651	<	<arg value="-automatic"/>
652	<	<arg value="-k:!ignore"/>
653	<	</jtreg>
636	>	<run-jtreg-tests
637	>	target="7"
638	>	workdir="${build.4jdk7.dir}"
639	>	classes="${4jdk7product.jar}"
640	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
641		</target>
642
643
#	Line 668 | Line 655
655
656		<javadoc destdir="${4jdk7docs.dir}"
657		packagenames="none"
658	<	link="${jdkapi7docs.url}"
658	>	link="${java7.api.url}"
659		overview="${4jdk7src.dir}/intro.html"
660	+	access="${build.javadoc.access}"
661		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
662		classpath=""
663		executable="${javadoc7}">
664		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
665		<include name="**/*.java"/>
666		</fileset>
667	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
668		<arg value="-XDignore.symbol.file=true"/>
669		</javadoc>
670		</target>
#	Line 694 | Line 683
683		</target>
684
685
697	–	<target name="4jdk7dist-clean"
698	–	description="Removes all build and distribution products">
699	–
700	–	</target>
701	–
686		<target name="4jdk7dist-jar"
687	<	depends="4jdk7clean, 4jdk7-jar">
687	>	depends="4jdk7clean, 4jdk7jar">
688		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
689		</target>
690
#	Line 741 | Line 725
725		</target>
726
727
728	<	<target name="jsr166x-jar"
728	>	<target name="jsr166xjar"
729		depends="jsr166xcompile"
730		description="Builds library jar from compiled sources">
731
#	Line 760 | Line 744
744
745		<javadoc destdir="${jsr166xdocs.dir}"
746		packagenames="jsr166x.*"
747	<	link="${jdkapidocs.url}"
747	>	link="${java.api.url}"
748	>	access="${build.javadoc.access}"
749		sourcepath="${topsrc.dir}:${jdk6src.dir}"
750		bootclasspath="${bootclasspath6}"
751		source="5"
752		executable="${javadoc7}">
753	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
754		<arg value="-XDignore.symbol.file=true"/>
755
756		</javadoc>
#	Line 784 | Line 770
770		</target>
771
772
787	–	<target name="jsr166xdist-clean"
788	–	description="Removes all build and distribution products">
789	–
790	–	</target>
791	–
792	–
773		<target name="jsr166xdist-jar"
774	<	depends="jsr166xclean, jsr166x-jar">
774	>	depends="jsr166xclean, jsr166xjar">
775		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
776		</target>
777
#	Line 831 | Line 811
811		</target>
812
813
814	<	<target name="jsr166y-jar"
814	>	<target name="jsr166yjar"
815		depends="jsr166ycompile"
816		description="Builds library jar from compiled sources">
817
#	Line 850 | Line 830
830
831		<javadoc destdir="${jsr166ydocs.dir}"
832		packagenames="jsr166y.*"
833	<	link="${jdkapidocs.url}"
833	>	link="${java.api.url}"
834	>	access="${build.javadoc.access}"
835		sourcepath="${topsrc.dir}:${jdk6src.dir}"
836		bootclasspath="${bootclasspath6}"
837		source="6"
838		executable="${javadoc7}">
839	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
840		<arg value="-XDignore.symbol.file=true"/>
841
842		</javadoc>
#	Line 874 | Line 856
856		</target>
857
858
877	–	<target name="jsr166ydist-clean"
878	–	description="Removes all build and distribution products">
879	–
880	–	</target>
881	–
859		<target name="jsr166ydist-jar"
860	<	depends="jsr166yclean, jsr166y-jar">
860	>	depends="jsr166yclean, jsr166yjar">
861		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
862		</target>
863
#	Line 894 | Line 871
871
872
873		<target name="extra166ycompile"
874	<	depends="configure-compiler, jsr166y-jar"
874	>	depends="configure-compiler, jsr166yjar"
875		description="Compiles extra166y sources">
876
877		<mkdir dir="${build.extra166y.classes.dir}"/>
#	Line 921 | Line 898
898		</target>
899
900
901	<	<target name="extra166y-jar"
901	>	<target name="extra166yjar"
902		depends="extra166ycompile"
903		description="Builds library jar from compiled sources">
904
#	Line 940 | Line 917
917
918		<javadoc destdir="${extra166ydocs.dir}"
919		packagenames="extra166y.*"
920	<	link="${jdkapidocs.url}"
920	>	link="${java.api.url}"
921	>	access="${build.javadoc.access}"
922		sourcepath="${topsrc.dir}:${jdk6src.dir}"
923		bootclasspath="${bootclasspath6}"
924		source="6"
925		executable="${javadoc7}">
926	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
927		<arg value="-XDignore.symbol.file=true"/>
928
929		</javadoc>
#	Line 964 | Line 943
943		</target>
944
945
967	–	<target name="extra166ydist-clean"
968	–	description="Removes all build and distribution products">
969	–
970	–	</target>
971	–
946		<target name="extra166ydist-jar"
947	<	depends="extra166yclean, extra166y-jar">
947	>	depends="extra166yclean, extra166yjar">
948		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
949		</target>
950
#	Line 981 | Line 955
955
956		<!-- jsr166e -->
957
958	+	<property name="build.jsr166e.java.version" value="6"/>
959	+	<property name="build.jsr166e.javac" value="${javac6}"/>
960	+
961		<target name="jsr166ecompile"
962		depends="configure-compiler"
963		description="Compiles jsr166e sources">
#	Line 992 | Line 969
969		debug="${build.debug}"
970		debuglevel="${build.debuglevel}"
971		deprecation="${build.deprecation}"
972	<	source="7"
972	>	source="${build.jsr166e.java.version}"
973		classpath=""
974		includeAntRuntime="false"
975		includeJavaRuntime="false"
976	<	executable="${javac7}"
976	>	executable="${build.jsr166e.javac}"
977		fork="true">
978
979		<include name="jsr166e/**/*.java"/>
#	Line 1007 | Line 984
984		</javac>
985		</target>
986
987	+	<!-- jsr166e: find doclint errors -->
988	+	<target name="jsr166edoclint">
989	+
990	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
991	+
992	+	<javac srcdir="${topsrc.dir}"
993	+	destdir="${build.jsr166e.classes.dir}"
994	+	debug="${build.debug}"
995	+	debuglevel="${build.debuglevel}"
996	+	deprecation="${build.deprecation}"
997	+	source="${build.jsr166e.java.version}"
998	+	classpath=""
999	+	bootclasspath="${bootclasspath7}"
1000	+	includeAntRuntime="false"
1001	+	includeJavaRuntime="false"
1002	+	executable="${javac8}"
1003	+	fork="true">
1004	+
1005	+	<include name="jsr166e/**/*.java"/>
1006	+	<compilerarg value="-XDignore.symbol.file=true"/>
1007	+	<compilerarg value="-Xlint:all"/>
1008	+	<compilerarg value="-Xdoclint:all/protected"/>
1009	+
1010	+	</javac>
1011	+	</target>
1012	+
1013
1014	<	<target name="jsr166e-jar"
1014	>	<target name="jsr166ejar"
1015		depends="jsr166ecompile"
1016		description="Builds library jar from compiled sources">
1017
#	Line 1027 | Line 1030
1030
1031		<javadoc destdir="${jsr166edocs.dir}"
1032		packagenames="jsr166e.*"
1033	<	link="${jdkapidocs.url}"
1034	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1035	<	source="7"
1033	>	link="${java.api.url}"
1034	>	access="${build.javadoc.access}"
1035	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1036	>	source="${build.jsr166e.java.version}"
1037		executable="${javadoc7}">
1038	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1039		<arg value="-XDignore.symbol.file=true"/>
1040
1041		</javadoc>
1042		</target>
1043
1044
1045	<	<target name="jsr166e-test-tck"
1046	<	depends="jsr166e-jar"
1047	<	description="Runs tck tests for jsr166e">
1045	>	<target name="jsr166e-test-tck-one-java-version"
1046	>	depends="jsr166ejar">
1047	>
1048	>	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1049
1050		<run-tck-tests
1051		tck.src.dir="${test.src.dir}/tck-jsr166e"
1052	<	source="7"
1047	<	target="8"
1052	>	target="${build.jsr166e.java.version}"
1053		workdir="${build.jsr166e.dir}"
1054		classes="${jsr166e.jar}"/>
1055		</target>
1056
1057	+	<target name="jsr166e-test-tck"
1058	+	description="Runs tck tests for jsr166e for multiple java versions">
1059	+
1060	+	<!--     <antcall target="clean"/> -->
1061	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1062	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1063	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1064	+	<!--     </antcall> -->
1065	+
1066	+	<antcall target="clean"/>
1067	+	<antcall target="jsr166e-test-tck-one-java-version">
1068	+	<param name="build.jsr166e.java.version" value="7"/>
1069	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1070	+	</antcall>
1071	+
1072	+	<antcall target="clean"/>
1073	+	<antcall target="jsr166e-test-tck-one-java-version">
1074	+	<param name="build.jsr166e.java.version" value="6"/>
1075	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1076	+	</antcall>
1077	+	</target>
1078	+
1079	+
1080	+	<target name="jsr166e-test"
1081	+	depends="jsr166e-test-tck"
1082	+	description="Runs all tests for jsr166e">
1083	+	</target>
1084
1085		<target name="jsr166edist"
1086		depends="jsr166edist-jar, jsr166edist-docs"
#	Line 1061 | Line 1093
1093		</target>
1094
1095
1064	–	<target name="jsr166edist-clean"
1065	–	description="Removes all build and distribution products">
1066	–
1067	–	</target>
1068	–
1096		<target name="jsr166edist-jar"
1097	<	depends="jsr166eclean, jsr166e-jar">
1097	>	depends="jsr166eclean, jsr166ejar">
1098		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1099		</target>
1100
#	Line 1076 | Line 1103
1103		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1104		</target>
1105
1106	+
1107	+	<!-- Find buglets that can be detected by static build tools -->
1108	+
1109	+	<target name="lint">
1110	+	<antcall target="dists">
1111	+	<param name="build.javadoc.access" value="private"/>
1112	+	</antcall>
1113	+	</target>
1114	+
1115	+
1116		</project>

Diff Legend

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