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.163 by jsr166, Fri Feb 20 22:33:13 2015 UTC

#	Line 16 | Line 16
16		$HOME/jdk/jdk6
17		$HOME/jdk/jdk7
18		$HOME/jdk/jdk8
19	+	$HOME/jdk/jdk9
20		where each of the above is a JDK or a symlink to same, and
21		$HOME/jdk/src/jdk6
22		$HOME/jdk/src/jdk7
23		$HOME/jdk/src/jdk8
24	+	$HOME/jdk/src/jdk9
25		where each of the above is a complete JDK source tree
26		(e.g. mercurial forest) or a symlink to same.
27	+
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}"
185	–	bootclasspath="@{classes}:${bootclasspath@{source}}"
216		includeAntRuntime="false"
217		includeJavaRuntime="false"
218	<	executable="${javac@{target}}"
218	>	executable="${javac@{compile-target}}"
219		fork="true">
220
221		<include name="*.java"/>
222		<compilerarg value="-XDignore.symbol.file=true"/>
223		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
224	+	<compilerarg value="-Xbootclasspath/p:@{classes}"/>
225		<compilerarg line="${build.args}"/>
226	+	<javac-elements/>
227
228		</javac>
229
230	<	<java classname="JSR166TestCase"
230	>	<java classname="${jsr166.tckTestClass}"
231		failonerror="true"
232		jvm="${java@{target}}"
233		fork="true">
234		<jvmarg value="-Xbootclasspath/p:@{classes}"/>
235		<jvmarg line="@{jvmflags}"/>
236	+
237	+	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
238	+	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
239	+	<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
240	+	</syspropertyset>
241	+
242	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
245		<classpath>
246		<pathelement location="${junit.jar}"/>
247		<pathelement location="@{workdir}/tck-classes"/>
#	Line 210 | Line 251
251		</sequential>
252		</macrodef>
253
254	+	<macrodef name="run-jtreg-tests">
255	+	<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
256	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
257	+	<attribute name="source" default="7"/>
258	+	<attribute name="target"/>
259	+	<attribute name="workdir"/>
260	+	<attribute name="classes"/>
261	+	<attribute name="jtregflags" default=""/>
262	+	<sequential>
263	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
264	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
265	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
266	+	<mkdir dir="@{workdir}/JTreport"/>
267	+	<jtreg dir="@{jtreg.src.dir}"
268	+	jdk="${jdk@{target}.home}"
269	+	workDir="@{workdir}/JTwork"
270	+	reportDir="@{workdir}/JTreport">
271	+
272	+	<arg value="-Xbootclasspath/p:@{classes}"/>
273	+	<arg value="-agentvm"/>
274	+	<arg value="-v:nopass,fail"/>
275	+	<arg value="-vmoptions:-esa -ea"/>
276	+	<arg value="-automatic"/>
277	+	<arg value="-k:!ignore"/>
278	+	<arg line="@{jtregflags}"/>
279	+	</jtreg>
280	+	</sequential>
281	+	</macrodef>
282	+
283		<!-- ALoops classpath -->
284		<path id="loops.classpath">
285		<pathelement location="${build.loops.dir}"/>
#	Line 221 | Line 291
291
292		<!-- Main targets -->
293
294	+	<property name="build.main.java.version" value="9"/>
295	+	<property name="build.main.javac" value="${javac9}"/>
296	+
297		<target name="dists"
298		depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
299		description="Builds all public jars and docs"/>
#	Line 239 | Line 312
312		classpath=""
313		includeAntRuntime="false"
314		includeJavaRuntime="false"
315	<	executable="${javac8}"
315	>	executable="${build.main.javac}"
316		fork="true">
317
318		<include name="**/*.java"/>
319	+	<compilerarg value="-Xprefer:source"/>
320		<compilerarg value="-XDignore.symbol.file=true"/>
321		<compilerarg value="-Xlint:all"/>
322	+	<compilerarg value="-Xdoclint:all/protected"/>
323	+	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
324		<compilerarg line="${build.args}"/>
325
326		</javac>
#	Line 261 | Line 337
337		</target>
338
339
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	–
340		<target name="docs"
341		description="Builds javadocs for src/main to dist dir">
342
#	Line 277 | Line 348
348
349		<javadoc destdir="${docs.dir}"
350		packagenames="none"
351	<	link="${jdkapi8docs.url}"
351	>	link="${java9.api.url}"
352		overview="${src.dir}/intro.html"
353	<	sourcepath="${src.dir}:${jdk8src.dir}"
353	>	access="${build.javadoc.access}"
354	>	sourcepath="${src.dir}:${jdk9src.dir}"
355		classpath=""
356	<	executable="${javadoc8}">
356	>	executable="${javadoc9}">
357		<fileset dir="${src.dir}" defaultexcludes="yes">
358		<include name="**/*.java"/>
359		</fileset>
360	+	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
361	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
362		<arg value="-XDignore.symbol.file=true"/>
363		<arg value="-tag"/>
364		<arg value="${javadoc.jls.option}"/>
365	+	<arg value="-tag"/>
366	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
367	+	<arg value="-tag"/>
368	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
369	+	<arg value="-tag"/>
370	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
371		</javadoc>
372		</target>
373
#	Line 326 | Line 406
406		<target name="dist-clean"
407		description="Removes all build and distribution products">
408
409	+	<delete dir="${build.dir}"/>
410		<delete dir="${dist.dir}"/>
411
412		</target>
413
414
334	–	<!-- Internal targets -->
335	–
336	–
415		<target name="dist-jar"
416		depends="clean, jar">
417		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 344 | Line 422
422		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
423		</target>
424
425	+	<target name="tck" depends="test-tck" description="alias for test-tck"/>
426	+	<target name="test-tck"
427	+	depends="jar"
428	+	description="Runs tck tests for main directly">
429
430	<	<target name="compile-tests"
431	<	depends="jar">
432	<
433	<	<mkdir dir="${build.testcases.dir}"/>
434	<
435	<	<javac srcdir="${tck.src.dir}"
436	<	destdir="${build.testcases.dir}"
437	<	debug="${build.debug}"
438	<	debuglevel="${build.debuglevel}"
439	<	deprecation="${build.deprecation}"
440	<	source="6"
441	<	classpath="${junit.jar}"
442	<	bootclasspath="@{product.jar}:${bootclasspath6}"
443	<	includeAntRuntime="false"
444	<	includeJavaRuntime="false"
445	<	executable="${javac8}"
446	<	fork="true">
447	<
448	<	<include name="**/*.java"/>
449	<	<compilerarg value="-XDignore.symbol.file=true"/>
450	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
451	<	<compilerarg line="${build.args}"/>
452	<
453	<	</javac>
454	<
455	<	<javac srcdir="${test.src.dir}"
456	<	destdir="${build.testcases.dir}"
457	<	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	<	-->
408	<
430	>	<run-tck-tests
431	>	target="${build.main.java.version}"
432	>	workdir="${build.dir}"
433	>	classes="${product.jar}"/>
434	>	</target>
435	>
436	>	<target name="test-tck-parallelism-1"
437	>	description="Runs test-tck with given common pool parallelism">
438	>	<antcall target="test-tck">
439	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
440	>	</antcall>
441	>	</target>
442	>
443	>	<target name="test-tck-parallelism-0"
444	>	description="Runs test-tck with given common pool parallelism">
445	>	<antcall target="test-tck">
446	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
447	>	</antcall>
448	>	</target>
449	>
450	>	<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
451	>	<target name="test-jtreg"
452	>	depends="jar"
453	>	description="Runs jtreg tests for main using the jtreg ant task">
454	>	<run-jtreg-tests
455	>	target="${build.main.java.version}"
456	>	workdir="${build.dir}"
457	>	classes="${product.jar}"/>
458		</target>
459
460	<
461	<	<target name="run-tests"
462	<	depends="compile-tests">
414	<
415	<	<!-- May be overridden by user.properties -->
416	<	<property name="testcase" value="*"/>
417	<
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	<
460	>	<target name="test"
461	>	depends="test-tck, test-tck-parallelism-1, test-jtreg"
462	>	description="Runs tck and jtreg tests for main">
463		</target>
464
465	+	<target name="test89"
466	+	description="Runs tck and jtreg tests for main for multiple java versions">
467
468	<	<target name="report-tests"
469	<	depends="run-tests">
470	<
471	<	<!-- Sets junit.report.format to frames if redirection is present,
472	<	otherwise sets it to noframes. -->
473	<	<available property="junit.report.format"
474	<	value="frames"
475	<	classname="org.apache.xalan.lib.Redirect"
476	<	/>
477	<	<property name="junit.report.format" value="noframes"/>
478	<
472	<	<junitreport todir="${build.reports.dir}">
473	<	<fileset dir="${build.reports.dir}">
474	<	<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"/>
468	>	<antcall target="clean"/>
469	>	<antcall target="test">
470	>	<param name="build.main.java.version" value="8"/>
471	>	<param name="build.main.javac" value="${javac8}"/>
472	>	</antcall>
473	>
474	>	<antcall target="clean"/>
475	>	<antcall target="test">
476	>	<param name="build.main.java.version" value="9"/>
477	>	<param name="build.main.javac" value="${javac9}"/>
478	>	</antcall>
479
480		</target>
481
482
483	+
484		<target name="configure-compiler">
485
486		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 499 | Line 498
498		</target>
499
500
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	–
501
502		<!-- Various demos and test programs -->
503
#	Line 574 | Line 550
550		fork="true">
551
552		<include name="**/*.java"/>
553	+	<compilerarg value="-Xprefer:source"/>
554	+	<compilerarg value="-XDignore.symbol.file=true"/>
555	+	<compilerarg value="-Xlint:all"/>
556	+	<compilerarg line="${build.args}"/>
557	+
558	+	</javac>
559	+	</target>
560	+
561	+	<target name="4jdk7doclint"
562	+	depends="configure-compiler"
563	+	description="Finds doclint warnings">
564	+
565	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
566	+
567	+	<javac srcdir="${4jdk7src.dir}"
568	+	destdir="${build.4jdk7.classes.dir}"
569	+	debug="${build.debug}"
570	+	debuglevel="${build.debuglevel}"
571	+	deprecation="${build.deprecation}"
572	+	source="6"
573	+	classpath=""
574	+	bootclasspath="${bootclasspath7}"
575	+	includeAntRuntime="false"
576	+	includeJavaRuntime="false"
577	+	executable="${javac8}"
578	+	fork="true">
579	+
580	+	<include name="**/*.java"/>
581	+	<compilerarg value="-Xprefer:source"/>
582		<compilerarg value="-XDignore.symbol.file=true"/>
583		<compilerarg value="-Xlint:all"/>
584	+	<compilerarg value="-Xdoclint:all/protected"/>
585		<compilerarg line="${build.args}"/>
586
587		</javac>
588		</target>
589
590
591	<	<target name="4jdk7-jar"
591	>	<target name="4jdk7jar"
592		depends="4jdk7compile"
593		description="Builds library jar from compiled sources">
594
#	Line 594 | Line 600
600
601
602		<target name="4jdk7-test-tck"
603	<	depends="4jdk7-jar"
603	>	depends="4jdk7jar"
604		description="Runs tck tests for jsr166-4jdk7 directly">
605
606		<run-tck-tests
607		target="7"
608		workdir="${build.4jdk7.dir}"
609	<	classes="${4jdk7product.jar}"/>
609	>	classes="${4jdk7product.jar}">
610	>	<javac-elements>
611	>	<!-- JDK8+ test classes -->
612	>	<exclude name="*8Test.java"/>
613	>	<exclude name="*9Test.java"/>
614	>	<exclude name="DoubleAccumulatorTest.java"/>
615	>	<exclude name="DoubleAdderTest.java"/>
616	>	<exclude name="LongAccumulatorTest.java"/>
617	>	<exclude name="LongAdderTest.java"/>
618	>	<exclude name="CompletableFutureTest.java"/>
619	>	<exclude name="SplittableRandomTest.java"/>
620	>	<exclude name="StampedLockTest.java"/>
621	>	</javac-elements>
622	>	</run-tck-tests>
623		</target>
624
625
#	Line 626 | Line 645
645
646		<formatter type="brief"/>
647
648	<	<test name="JSR166TestCase" haltonfailure="no">
648	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
649		</test>
650
651		</junit>
652		</target>
653
654		<target name="4jdk7-test-jtreg"
655	<	depends="4jdk7compile"
655	>	depends="4jdk7jar"
656		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
657	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
658	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
659	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
660	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
661	<	<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>
657	>	<run-jtreg-tests
658	>	target="7"
659	>	workdir="${build.4jdk7.dir}"
660	>	classes="${4jdk7product.jar}"
661	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
662		</target>
663
664
#	Line 668 | Line 676
676
677		<javadoc destdir="${4jdk7docs.dir}"
678		packagenames="none"
679	<	link="${jdkapi7docs.url}"
679	>	link="${java7.api.url}"
680		overview="${4jdk7src.dir}/intro.html"
681	+	access="${build.javadoc.access}"
682		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
683		classpath=""
684		executable="${javadoc7}">
685		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
686		<include name="**/*.java"/>
687		</fileset>
688	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
689		<arg value="-XDignore.symbol.file=true"/>
690		</javadoc>
691		</target>
#	Line 694 | Line 704
704		</target>
705
706
697	–	<target name="4jdk7dist-clean"
698	–	description="Removes all build and distribution products">
699	–
700	–	</target>
701	–
707		<target name="4jdk7dist-jar"
708	<	depends="4jdk7clean, 4jdk7-jar">
708	>	depends="4jdk7clean, 4jdk7jar">
709		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
710		</target>
711
#	Line 741 | Line 746
746		</target>
747
748
749	<	<target name="jsr166x-jar"
749	>	<target name="jsr166xjar"
750		depends="jsr166xcompile"
751		description="Builds library jar from compiled sources">
752
#	Line 760 | Line 765
765
766		<javadoc destdir="${jsr166xdocs.dir}"
767		packagenames="jsr166x.*"
768	<	link="${jdkapidocs.url}"
768	>	link="${java.api.url}"
769	>	access="${build.javadoc.access}"
770		sourcepath="${topsrc.dir}:${jdk6src.dir}"
771		bootclasspath="${bootclasspath6}"
772		source="5"
773		executable="${javadoc7}">
774	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
775		<arg value="-XDignore.symbol.file=true"/>
776
777		</javadoc>
#	Line 784 | Line 791
791		</target>
792
793
787	–	<target name="jsr166xdist-clean"
788	–	description="Removes all build and distribution products">
789	–
790	–	</target>
791	–
792	–
794		<target name="jsr166xdist-jar"
795	<	depends="jsr166xclean, jsr166x-jar">
795	>	depends="jsr166xclean, jsr166xjar">
796		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
797		</target>
798
#	Line 831 | Line 832
832		</target>
833
834
835	<	<target name="jsr166y-jar"
835	>	<target name="jsr166yjar"
836		depends="jsr166ycompile"
837		description="Builds library jar from compiled sources">
838
#	Line 850 | Line 851
851
852		<javadoc destdir="${jsr166ydocs.dir}"
853		packagenames="jsr166y.*"
854	<	link="${jdkapidocs.url}"
854	>	link="${java.api.url}"
855	>	access="${build.javadoc.access}"
856		sourcepath="${topsrc.dir}:${jdk6src.dir}"
857		bootclasspath="${bootclasspath6}"
858		source="6"
859		executable="${javadoc7}">
860	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
861		<arg value="-XDignore.symbol.file=true"/>
862
863		</javadoc>
#	Line 874 | Line 877
877		</target>
878
879
877	–	<target name="jsr166ydist-clean"
878	–	description="Removes all build and distribution products">
879	–
880	–	</target>
881	–
880		<target name="jsr166ydist-jar"
881	<	depends="jsr166yclean, jsr166y-jar">
881	>	depends="jsr166yclean, jsr166yjar">
882		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
883		</target>
884
#	Line 894 | Line 892
892
893
894		<target name="extra166ycompile"
895	<	depends="configure-compiler, jsr166y-jar"
895	>	depends="configure-compiler, jsr166yjar"
896		description="Compiles extra166y sources">
897
898		<mkdir dir="${build.extra166y.classes.dir}"/>
#	Line 921 | Line 919
919		</target>
920
921
922	<	<target name="extra166y-jar"
922	>	<target name="extra166yjar"
923		depends="extra166ycompile"
924		description="Builds library jar from compiled sources">
925
#	Line 940 | Line 938
938
939		<javadoc destdir="${extra166ydocs.dir}"
940		packagenames="extra166y.*"
941	<	link="${jdkapidocs.url}"
941	>	link="${java.api.url}"
942	>	access="${build.javadoc.access}"
943		sourcepath="${topsrc.dir}:${jdk6src.dir}"
944		bootclasspath="${bootclasspath6}"
945		source="6"
946		executable="${javadoc7}">
947	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
948		<arg value="-XDignore.symbol.file=true"/>
949
950		</javadoc>
#	Line 964 | Line 964
964		</target>
965
966
967	–	<target name="extra166ydist-clean"
968	–	description="Removes all build and distribution products">
969	–
970	–	</target>
971	–
967		<target name="extra166ydist-jar"
968	<	depends="extra166yclean, extra166y-jar">
968	>	depends="extra166yclean, extra166yjar">
969		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
970		</target>
971
#	Line 981 | Line 976
976
977		<!-- jsr166e -->
978
979	+	<property name="build.jsr166e.java.version" value="6"/>
980	+	<property name="build.jsr166e.javac" value="${javac6}"/>
981	+
982		<target name="jsr166ecompile"
983		depends="configure-compiler"
984		description="Compiles jsr166e sources">
#	Line 992 | Line 990
990		debug="${build.debug}"
991		debuglevel="${build.debuglevel}"
992		deprecation="${build.deprecation}"
993	<	source="7"
993	>	source="${build.jsr166e.java.version}"
994		classpath=""
995		includeAntRuntime="false"
996		includeJavaRuntime="false"
997	<	executable="${javac7}"
997	>	executable="${build.jsr166e.javac}"
998		fork="true">
999
1000		<include name="jsr166e/**/*.java"/>
#	Line 1007 | Line 1005
1005		</javac>
1006		</target>
1007
1008	+	<!-- jsr166e: find doclint errors -->
1009	+	<target name="jsr166edoclint">
1010	+
1011	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
1012	+
1013	+	<javac srcdir="${topsrc.dir}"
1014	+	destdir="${build.jsr166e.classes.dir}"
1015	+	debug="${build.debug}"
1016	+	debuglevel="${build.debuglevel}"
1017	+	deprecation="${build.deprecation}"
1018	+	source="${build.jsr166e.java.version}"
1019	+	classpath=""
1020	+	bootclasspath="${bootclasspath7}"
1021	+	includeAntRuntime="false"
1022	+	includeJavaRuntime="false"
1023	+	executable="${javac8}"
1024	+	fork="true">
1025	+
1026	+	<include name="jsr166e/**/*.java"/>
1027	+	<compilerarg value="-XDignore.symbol.file=true"/>
1028	+	<compilerarg value="-Xlint:all"/>
1029	+	<compilerarg value="-Xdoclint:all/protected"/>
1030
1031	<	<target name="jsr166e-jar"
1031	>	</javac>
1032	>	</target>
1033	>
1034	>
1035	>	<target name="jsr166ejar"
1036		depends="jsr166ecompile"
1037		description="Builds library jar from compiled sources">
1038
#	Line 1027 | Line 1051
1051
1052		<javadoc destdir="${jsr166edocs.dir}"
1053		packagenames="jsr166e.*"
1054	<	link="${jdkapidocs.url}"
1055	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1056	<	source="7"
1054	>	link="${java.api.url}"
1055	>	access="${build.javadoc.access}"
1056	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1057	>	source="${build.jsr166e.java.version}"
1058		executable="${javadoc7}">
1059	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1060		<arg value="-XDignore.symbol.file=true"/>
1061
1062		</javadoc>
1063		</target>
1064
1065
1066	<	<target name="jsr166e-test-tck"
1067	<	depends="jsr166e-jar"
1068	<	description="Runs tck tests for jsr166e">
1066	>	<target name="jsr166e-test-tck-one-java-version"
1067	>	depends="jsr166ejar">
1068	>
1069	>	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1070
1071		<run-tck-tests
1072		tck.src.dir="${test.src.dir}/tck-jsr166e"
1073	<	source="7"
1047	<	target="8"
1073	>	target="${build.jsr166e.java.version}"
1074		workdir="${build.jsr166e.dir}"
1075		classes="${jsr166e.jar}"/>
1076		</target>
1077
1078	+	<target name="jsr166e-test-tck"
1079	+	description="Runs tck tests for jsr166e for multiple java versions">
1080	+
1081	+	<!--     <antcall target="clean"/> -->
1082	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1083	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1084	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1085	+	<!--     </antcall> -->
1086	+
1087	+	<antcall target="clean"/>
1088	+	<antcall target="jsr166e-test-tck-one-java-version">
1089	+	<param name="build.jsr166e.java.version" value="7"/>
1090	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1091	+	</antcall>
1092	+
1093	+	<antcall target="clean"/>
1094	+	<antcall target="jsr166e-test-tck-one-java-version">
1095	+	<param name="build.jsr166e.java.version" value="6"/>
1096	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1097	+	</antcall>
1098	+	</target>
1099	+
1100	+
1101	+	<target name="jsr166e-test"
1102	+	depends="jsr166e-test-tck"
1103	+	description="Runs all tests for jsr166e">
1104	+	</target>
1105
1106		<target name="jsr166edist"
1107		depends="jsr166edist-jar, jsr166edist-docs"
#	Line 1061 | Line 1114
1114		</target>
1115
1116
1064	–	<target name="jsr166edist-clean"
1065	–	description="Removes all build and distribution products">
1066	–
1067	–	</target>
1068	–
1117		<target name="jsr166edist-jar"
1118	<	depends="jsr166eclean, jsr166e-jar">
1118	>	depends="jsr166eclean, jsr166ejar">
1119		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1120		</target>
1121
#	Line 1076 | Line 1124
1124		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1125		</target>
1126
1127	+
1128	+	<!-- Find buglets that can be detected by static build tools -->
1129	+
1130	+	<target name="lint">
1131	+	<antcall target="dists">
1132	+	<param name="build.javadoc.access" value="public"/>
1133	+	</antcall>
1134	+	</target>
1135	+
1136	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1137	+	<target name="lint-private">
1138	+	<antcall target="dist">
1139	+	<param name="build.javadoc.access" value="private"/>
1140	+	</antcall>
1141	+	</target>
1142	+
1143	+
1144		</project>

Diff Legend

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