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.129 by jsr166, Wed Jan 23 07:17:13 2013 UTC vs.
Revision 1.161 by jsr166, Sat Jan 17 23:12:49 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="Display main targets by running 'ant -projecthelp'">
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>
#	Line 41 | 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 103 | 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 143 | 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 168 | Line 195
195
196		<macrodef name="run-tck-tests">
197		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
171	–	<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 182 | 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	+
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 212 | 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 223 | 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 241 | 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 263 | Line 337
337		</target>
338
339
266	–	<target name="test"
267	–	depends="configure-tests, report-tests"
268	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
269	–
270	–
340		<target name="docs"
341		description="Builds javadocs for src/main to dist dir">
342
#	Line 279 | 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 328 | 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
336	–	<!-- Internal targets -->
337	–
338	–
415		<target name="dist-jar"
416		depends="clean, jar">
417		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 347 | Line 423
423		</target>
424
425
426	<	<target name="compile-tests"
427	<	depends="jar">
428	<
353	<	<mkdir dir="${build.testcases.dir}"/>
354	<
355	<	<javac srcdir="${tck.src.dir}"
356	<	destdir="${build.testcases.dir}"
357	<	debug="${build.debug}"
358	<	debuglevel="${build.debuglevel}"
359	<	deprecation="${build.deprecation}"
360	<	source="6"
361	<	classpath="${junit.jar}"
362	<	bootclasspath="@{product.jar}:${bootclasspath6}"
363	<	includeAntRuntime="false"
364	<	includeJavaRuntime="false"
365	<	executable="${javac8}"
366	<	fork="true">
367	<
368	<	<include name="**/*.java"/>
369	<	<compilerarg value="-XDignore.symbol.file=true"/>
370	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
371	<	<compilerarg line="${build.args}"/>
372	<
373	<	</javac>
374	<
375	<	<javac srcdir="${test.src.dir}"
376	<	destdir="${build.testcases.dir}"
377	<	debug="${build.debug}"
378	<	debuglevel="${build.debuglevel}"
379	<	deprecation="${build.deprecation}"
380	<	source="6"
381	<	classpath=""
382	<	bootclasspath="@{product.jar}:${bootclasspath6}"
383	<	includeAntRuntime="false"
384	<	includeJavaRuntime="false"
385	<	executable="${javac8}"
386	<	fork="true">
387	<
388	<	<include name="jsr166/test/**/*.java"/>
389	<	<compilerarg value="-XDignore.symbol.file=true"/>
390	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
391	<	<compilerarg line="${build.args}"/>
392	<
393	<	</javac>
394	<
395	<	<!--
396	<	<javac srcdir="${jtreg.src.dir}"
397	<	destdir="${build.testcases.dir}"
398	<	debug="${build.debug}"
399	<	debuglevel="${build.debuglevel}"
400	<	deprecation="${build.deprecation}"
401	<	source="${build.sourcelevel}"
402	<	fork="true">
403	<
404	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
405	<	<compilerarg value="-XDignore.symbol.file=true"/>
406	<	<compilerarg line="${build.args}"/>
407	<
408	<	</javac>
409	<	-->
426	>	<target name="test-tck"
427	>	depends="jar"
428	>	description="Runs tck tests for main directly">
429
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="test-jtreg"
451	+	depends="jar"
452	+	description="Runs jtreg tests for main using the jtreg ant task">
453	+	<run-jtreg-tests
454	+	target="${build.main.java.version}"
455	+	workdir="${build.dir}"
456	+	classes="${product.jar}"/>
457		</target>
458
459	<
460	<	<target name="run-tests"
461	<	depends="compile-tests">
416	<
417	<	<!-- May be overridden by user.properties -->
418	<	<property name="testcase" value="*"/>
419	<
420	<	<mkdir dir="${build.reports.dir}"/>
421	<
422	<	<junit printsummary="true"
423	<	showoutput="true"
424	<	errorProperty="junit.failed"
425	<	failureProperty="junit.failed"
426	<	dir="${build.reports.dir}"
427	<	jvm="${java8}"
428	<	fork="true">
429	<
430	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
431	<	<jvmarg value="-server"/>
432	<	<jvmarg value="-showversion"/>
433	<
434	<	<classpath refid="test.classpath"/>
435	<
436	<	<formatter type="xml"/>
437	<
438	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
439	<	<fileset dir="${tck.src.dir}">
440	<	<include name="**/${testcase}Test.java"/>
441	<	</fileset>
442	<	</batchtest>
443	<
444	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
445	<	<fileset dir="${test.src.dir}">
446	<	<include name="jsr166/test/**/${testcase}Test.java"/>
447	<	</fileset>
448	<	</batchtest>
449	<
450	<	<!--
451	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
452	<	<fileset dir="${jtreg.src.dir}">
453	<	<include name="**/${testcase}Test.java"/>
454	<	</fileset>
455	<	</batchtest>
456	<	-->
457	<
458	<	</junit>
459	<
459	>	<target name="test"
460	>	depends="test-tck, test-tck-parallelism-1, test-jtreg"
461	>	description="Runs tck and jtreg tests for main">
462		</target>
463
464	+	<target name="test89"
465	+	description="Runs tck and jtreg tests for main for multiple java versions">
466
467	<	<target name="report-tests"
468	<	depends="run-tests">
469	<
470	<	<!-- Sets junit.report.format to frames if redirection is present,
471	<	otherwise sets it to noframes. -->
472	<	<available property="junit.report.format"
473	<	value="frames"
474	<	classname="org.apache.xalan.lib.Redirect"
475	<	/>
476	<	<property name="junit.report.format" value="noframes"/>
477	<
474	<	<junitreport todir="${build.reports.dir}">
475	<	<fileset dir="${build.reports.dir}">
476	<	<include name="TEST-*.xml"/>
477	<	</fileset>
478	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
479	<	/>
480	<	</junitreport>
481	<
482	<	<fail message="Test Cases Failed" if="junit.failed"/>
467	>	<antcall target="clean"/>
468	>	<antcall target="test">
469	>	<param name="build.main.java.version" value="8"/>
470	>	<param name="build.main.javac" value="${javac8}"/>
471	>	</antcall>
472	>
473	>	<antcall target="clean"/>
474	>	<antcall target="test">
475	>	<param name="build.main.java.version" value="9"/>
476	>	<param name="build.main.javac" value="${javac9}"/>
477	>	</antcall>
478
479		</target>
480
481
482	+
483		<target name="configure-compiler">
484
485		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 501 | Line 497
497		</target>
498
499
504	–	<target name="configure-tests"
505	–	depends="configure-compiler">
506	–
507	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
508	–	<available property="junit.available"
509	–	classname="junit.framework.Protectable"/>
510	–
511	–	<!-- Xalan -->
512	–	<available property="xalan.available"
513	–	classname="org.apache.xalan.Version"/>
514	–
515	–
516	–	<!-- Ant 1.6beta and later don't need or want this check -->
517	–	<!--
518	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
519	–	unless="junit.available"/>
520	–
521	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
522	–	unless="xalan.available"/>
523	–	-->
524	–
525	–	</target>
526	–
500
501		<!-- Various demos and test programs -->
502
#	Line 576 | Line 549
549		fork="true">
550
551		<include name="**/*.java"/>
552	+	<compilerarg value="-Xprefer:source"/>
553	+	<compilerarg value="-XDignore.symbol.file=true"/>
554	+	<compilerarg value="-Xlint:all"/>
555	+	<compilerarg line="${build.args}"/>
556	+
557	+	</javac>
558	+	</target>
559	+
560	+	<target name="4jdk7doclint"
561	+	depends="configure-compiler"
562	+	description="Finds doclint warnings">
563	+
564	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
565	+
566	+	<javac srcdir="${4jdk7src.dir}"
567	+	destdir="${build.4jdk7.classes.dir}"
568	+	debug="${build.debug}"
569	+	debuglevel="${build.debuglevel}"
570	+	deprecation="${build.deprecation}"
571	+	source="6"
572	+	classpath=""
573	+	bootclasspath="${bootclasspath7}"
574	+	includeAntRuntime="false"
575	+	includeJavaRuntime="false"
576	+	executable="${javac8}"
577	+	fork="true">
578	+
579	+	<include name="**/*.java"/>
580	+	<compilerarg value="-Xprefer:source"/>
581		<compilerarg value="-XDignore.symbol.file=true"/>
582		<compilerarg value="-Xlint:all"/>
583	+	<compilerarg value="-Xdoclint:all/protected"/>
584		<compilerarg line="${build.args}"/>
585
586		</javac>
#	Line 602 | Line 605
605		<run-tck-tests
606		target="7"
607		workdir="${build.4jdk7.dir}"
608	<	classes="${4jdk7product.jar}"/>
608	>	classes="${4jdk7product.jar}">
609	>	<javac-elements>
610	>	<!-- JDK8+ test classes -->
611	>	<exclude name="*8Test.java"/>
612	>	<exclude name="*9Test.java"/>
613	>	<exclude name="DoubleAccumulatorTest.java"/>
614	>	<exclude name="DoubleAdderTest.java"/>
615	>	<exclude name="LongAccumulatorTest.java"/>
616	>	<exclude name="LongAdderTest.java"/>
617	>	<exclude name="CompletableFutureTest.java"/>
618	>	<exclude name="SplittableRandomTest.java"/>
619	>	<exclude name="StampedLockTest.java"/>
620	>	</javac-elements>
621	>	</run-tck-tests>
622		</target>
623
624
#	Line 628 | Line 644
644
645		<formatter type="brief"/>
646
647	<	<test name="JSR166TestCase" haltonfailure="no">
647	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
648		</test>
649
650		</junit>
651		</target>
652
653		<target name="4jdk7-test-jtreg"
654	<	depends="4jdk7compile"
654	>	depends="4jdk7jar"
655		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
656	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
657	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
658	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
659	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
660	<	<jtreg dir="${jtreg.src.dir}"
645	<	jdk="${jdk7.home}"
646	<	workDir="${build.4jdk7.dir}/JTwork"
647	<	reportDir="${build.4jdk7.dir}/JTreport">
648	<
649	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
650	<	<arg value="-agentvm"/>
651	<	<arg value="-v:nopass,fail"/>
652	<	<arg value="-vmoptions:-esa -ea"/>
653	<	<arg value="-automatic"/>
654	<	<arg value="-k:!ignore"/>
655	<	</jtreg>
656	>	<run-jtreg-tests
657	>	target="7"
658	>	workdir="${build.4jdk7.dir}"
659	>	classes="${4jdk7product.jar}"
660	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
661		</target>
662
663
#	Line 670 | Line 675
675
676		<javadoc destdir="${4jdk7docs.dir}"
677		packagenames="none"
678	<	link="${jdkapi7docs.url}"
678	>	link="${java7.api.url}"
679		overview="${4jdk7src.dir}/intro.html"
680	+	access="${build.javadoc.access}"
681		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
682		classpath=""
683		executable="${javadoc7}">
684		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
685		<include name="**/*.java"/>
686		</fileset>
687	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
688		<arg value="-XDignore.symbol.file=true"/>
689		</javadoc>
690		</target>
#	Line 696 | Line 703
703		</target>
704
705
699	–	<target name="4jdk7dist-clean"
700	–	description="Removes all build and distribution products">
701	–
702	–	</target>
703	–
706		<target name="4jdk7dist-jar"
707		depends="4jdk7clean, 4jdk7jar">
708		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
#	Line 762 | Line 764
764
765		<javadoc destdir="${jsr166xdocs.dir}"
766		packagenames="jsr166x.*"
767	<	link="${jdkapidocs.url}"
767	>	link="${java.api.url}"
768	>	access="${build.javadoc.access}"
769		sourcepath="${topsrc.dir}:${jdk6src.dir}"
770		bootclasspath="${bootclasspath6}"
771		source="5"
772		executable="${javadoc7}">
773	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
774		<arg value="-XDignore.symbol.file=true"/>
775
776		</javadoc>
#	Line 786 | Line 790
790		</target>
791
792
789	–	<target name="jsr166xdist-clean"
790	–	description="Removes all build and distribution products">
791	–
792	–	</target>
793	–
794	–
793		<target name="jsr166xdist-jar"
794		depends="jsr166xclean, jsr166xjar">
795		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
#	Line 852 | Line 850
850
851		<javadoc destdir="${jsr166ydocs.dir}"
852		packagenames="jsr166y.*"
853	<	link="${jdkapidocs.url}"
853	>	link="${java.api.url}"
854	>	access="${build.javadoc.access}"
855		sourcepath="${topsrc.dir}:${jdk6src.dir}"
856		bootclasspath="${bootclasspath6}"
857		source="6"
858		executable="${javadoc7}">
859	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
860		<arg value="-XDignore.symbol.file=true"/>
861
862		</javadoc>
#	Line 876 | Line 876
876		</target>
877
878
879	–	<target name="jsr166ydist-clean"
880	–	description="Removes all build and distribution products">
881	–
882	–	</target>
883	–
879		<target name="jsr166ydist-jar"
880		depends="jsr166yclean, jsr166yjar">
881		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
#	Line 942 | Line 937
937
938		<javadoc destdir="${extra166ydocs.dir}"
939		packagenames="extra166y.*"
940	<	link="${jdkapidocs.url}"
940	>	link="${java.api.url}"
941	>	access="${build.javadoc.access}"
942		sourcepath="${topsrc.dir}:${jdk6src.dir}"
943		bootclasspath="${bootclasspath6}"
944		source="6"
945		executable="${javadoc7}">
946	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
947		<arg value="-XDignore.symbol.file=true"/>
948
949		</javadoc>
#	Line 966 | Line 963
963		</target>
964
965
969	–	<target name="extra166ydist-clean"
970	–	description="Removes all build and distribution products">
971	–
972	–	</target>
973	–
966		<target name="extra166ydist-jar"
967		depends="extra166yclean, extra166yjar">
968		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
#	Line 983 | Line 975
975
976		<!-- jsr166e -->
977
978	+	<property name="build.jsr166e.java.version" value="6"/>
979	+	<property name="build.jsr166e.javac" value="${javac6}"/>
980	+
981		<target name="jsr166ecompile"
982		depends="configure-compiler"
983		description="Compiles jsr166e sources">
#	Line 994 | Line 989
989		debug="${build.debug}"
990		debuglevel="${build.debuglevel}"
991		deprecation="${build.deprecation}"
992	<	source="7"
992	>	source="${build.jsr166e.java.version}"
993		classpath=""
994		includeAntRuntime="false"
995		includeJavaRuntime="false"
996	<	executable="${javac7}"
996	>	executable="${build.jsr166e.javac}"
997		fork="true">
998
999		<include name="jsr166e/**/*.java"/>
#	Line 1009 | Line 1004
1004		</javac>
1005		</target>
1006
1007	+	<!-- jsr166e: find doclint errors -->
1008	+	<target name="jsr166edoclint">
1009	+
1010	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
1011	+
1012	+	<javac srcdir="${topsrc.dir}"
1013	+	destdir="${build.jsr166e.classes.dir}"
1014	+	debug="${build.debug}"
1015	+	debuglevel="${build.debuglevel}"
1016	+	deprecation="${build.deprecation}"
1017	+	source="${build.jsr166e.java.version}"
1018	+	classpath=""
1019	+	bootclasspath="${bootclasspath7}"
1020	+	includeAntRuntime="false"
1021	+	includeJavaRuntime="false"
1022	+	executable="${javac8}"
1023	+	fork="true">
1024	+
1025	+	<include name="jsr166e/**/*.java"/>
1026	+	<compilerarg value="-XDignore.symbol.file=true"/>
1027	+	<compilerarg value="-Xlint:all"/>
1028	+	<compilerarg value="-Xdoclint:all/protected"/>
1029	+
1030	+	</javac>
1031	+	</target>
1032	+
1033
1034		<target name="jsr166ejar"
1035		depends="jsr166ecompile"
#	Line 1029 | Line 1050
1050
1051		<javadoc destdir="${jsr166edocs.dir}"
1052		packagenames="jsr166e.*"
1053	<	link="${jdkapidocs.url}"
1054	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1055	<	source="7"
1053	>	link="${java.api.url}"
1054	>	access="${build.javadoc.access}"
1055	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1056	>	source="${build.jsr166e.java.version}"
1057		executable="${javadoc7}">
1058	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1059		<arg value="-XDignore.symbol.file=true"/>
1060
1061		</javadoc>
1062		</target>
1063
1064
1065	<	<target name="jsr166e-test-tck"
1066	<	depends="jsr166ejar"
1067	<	description="Runs tck tests for jsr166e">
1065	>	<target name="jsr166e-test-tck-one-java-version"
1066	>	depends="jsr166ejar">
1067	>
1068	>	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1069
1070		<run-tck-tests
1071		tck.src.dir="${test.src.dir}/tck-jsr166e"
1072	<	source="7"
1049	<	target="8"
1072	>	target="${build.jsr166e.java.version}"
1073		workdir="${build.jsr166e.dir}"
1074		classes="${jsr166e.jar}"/>
1075		</target>
1076
1077	+	<target name="jsr166e-test-tck"
1078	+	description="Runs tck tests for jsr166e for multiple java versions">
1079	+
1080	+	<!--     <antcall target="clean"/> -->
1081	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1082	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1083	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1084	+	<!--     </antcall> -->
1085	+
1086	+	<antcall target="clean"/>
1087	+	<antcall target="jsr166e-test-tck-one-java-version">
1088	+	<param name="build.jsr166e.java.version" value="7"/>
1089	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1090	+	</antcall>
1091	+
1092	+	<antcall target="clean"/>
1093	+	<antcall target="jsr166e-test-tck-one-java-version">
1094	+	<param name="build.jsr166e.java.version" value="6"/>
1095	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1096	+	</antcall>
1097	+	</target>
1098	+
1099	+
1100	+	<target name="jsr166e-test"
1101	+	depends="jsr166e-test-tck"
1102	+	description="Runs all tests for jsr166e">
1103	+	</target>
1104
1105		<target name="jsr166edist"
1106		depends="jsr166edist-jar, jsr166edist-docs"
#	Line 1063 | Line 1113
1113		</target>
1114
1115
1066	–	<target name="jsr166edist-clean"
1067	–	description="Removes all build and distribution products">
1068	–
1069	–	</target>
1070	–
1116		<target name="jsr166edist-jar"
1117		depends="jsr166eclean, jsr166ejar">
1118		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
#	Line 1078 | Line 1123
1123		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1124		</target>
1125
1126	+
1127	+	<!-- Find buglets that can be detected by static build tools -->
1128	+
1129	+	<target name="lint">
1130	+	<antcall target="dists">
1131	+	<param name="build.javadoc.access" value="public"/>
1132	+	</antcall>
1133	+	</target>
1134	+
1135	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1136	+	<target name="lint-private">
1137	+	<antcall target="dist">
1138	+	<param name="build.javadoc.access" value="private"/>
1139	+	</antcall>
1140	+	</target>
1141	+
1142	+
1143		</project>

Diff Legend

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