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.124 by jsr166, Tue Jan 22 21:22:57 2013 UTC vs.
Revision 1.151 by jsr166, Sun Feb 16 14:25:46 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="Advises user to run with -projecthelp">
31	<	<echo>Run "ant -projecthelp" for full usage information.</echo>
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>
35		</target>
36
37
#	Line 39 | Line 44
44		<property name="build.debug"          value="true"/>
45		<property name="build.debuglevel"     value="source,lines,vars"/>
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"/>
#	Line 57 | Line 72
72		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
73		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
74
75	<	<property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
76	<	<property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
77	<	<property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
78	<	<property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
75	>	<property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
76	>	<property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
77	>	<property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
78	>	<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
79
80		<!-- JDK locations -->
81		<property name="jdks.home"  location="${user.home}/jdk"/>
#	Line 86 | Line 101
101		</sequential>
102		</macrodef>
103
104	+	<macrodef name="mirror-dir">
105	+	<attribute name="src"/>
106	+	<attribute name="dst"/>
107	+	<sequential>
108	+	<delete dir="@{dst}"/>
109	+	<mkdir dir="@{dst}"/>
110	+	<copy todir="@{dst}" preservelastmodified="true">
111	+	<fileset dir="@{src}"/>
112	+	</copy>
113	+	</sequential>
114	+	</macrodef>
115	+
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 105 | Line 133
133		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
134		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
135
136	<	<!-- Distribution locations -->
137	<	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166docs"/>
138	<	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
139	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
140	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
141	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
142	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
136	>	<!-- Javadoc locations -->
137	>	<property name="docs.dir"          location="${build.dir}/docs"/>
138	>	<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
139	>	<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
140	>	<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
141	>	<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
142	>	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
143	>
144	>	<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
145	>	<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
146	>	<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
147	>	<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
148	>	<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
149	>	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
150
151		<!-- Jar locations -->
152		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
#	Line 128 | Line 163
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 -->
166	>	<!-- The expected canonical location does not yet exist as of 2014-02 -->
167		<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
168
169	+	<property name="jdkapi9docs.url"      value="${jdkapi8docs.url}"/>
170	+	<!-- No published jdk9 docs exist as of 2014-02 -->
171	+	<!-- <property name="jdkapi9docs.url" value="http://docs.oracle.com/javase/9/docs/api/"/> -->
172	+
173		<!-- Default jdk api doc location (latest stable release seems best) -->
174		<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
175
#	Line 147 | Line 186
186
187		<macrodef name="run-tck-tests">
188		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
150	–	<attribute name="source" default="6"/>
189		<attribute name="target"/>
190	+	<attribute name="compile-target" default="@{target}"/>
191		<attribute name="workdir"/>
192		<attribute name="classes"/>
193		<attribute name="jvmflags" default=""/>
194	+	<element name="javac-elements" optional="true"/>
195		<sequential>
196
197		<mkdir dir="@{workdir}/tck-classes"/>
#	Line 161 | Line 201
201		debug="${build.debug}"
202		debuglevel="${build.debuglevel}"
203		deprecation="${build.deprecation}"
204	<	source="@{source}"
204	>	source="@{compile-target}"
205	>	target="@{compile-target}"
206		classpath="${junit.jar}"
207	<	bootclasspath="@{classes}:${bootclasspath@{source}}"
207	>	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
208		includeAntRuntime="false"
209		includeJavaRuntime="false"
210	<	executable="${javac@{target}}"
210	>	executable="${javac@{compile-target}}"
211		fork="true">
212
213		<include name="*.java"/>
214		<compilerarg value="-XDignore.symbol.file=true"/>
215		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
216		<compilerarg line="${build.args}"/>
217	+	<javac-elements/>
218
219		</javac>
220
221	<	<java classname="JSR166TestCase"
221	>	<java classname="${jsr166.tckTestClass}"
222		failonerror="true"
223		jvm="${java@{target}}"
224		fork="true">
225		<jvmarg value="-Xbootclasspath/p:@{classes}"/>
226		<jvmarg line="@{jvmflags}"/>
227	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
228	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
229	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
230		<classpath>
231		<pathelement location="${junit.jar}"/>
232		<pathelement location="@{workdir}/tck-classes"/>
#	Line 191 | Line 236
236		</sequential>
237		</macrodef>
238
239	+	<macrodef name="run-jtreg-tests">
240	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
241	+	<attribute name="source" default="7"/>
242	+	<attribute name="target"/>
243	+	<attribute name="workdir"/>
244	+	<attribute name="classes"/>
245	+	<attribute name="jtregflags" default=""/>
246	+	<sequential>
247	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
248	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
249	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
250	+	<mkdir dir="@{workdir}/JTreport"/>
251	+	<jtreg dir="@{jtreg.src.dir}"
252	+	jdk="${jdk@{target}.home}"
253	+	workDir="@{workdir}/JTwork"
254	+	reportDir="@{workdir}/JTreport">
255	+
256	+	<arg value="-Xbootclasspath/p:@{classes}"/>
257	+	<arg value="-agentvm"/>
258	+	<arg value="-v:nopass,fail"/>
259	+	<arg value="-vmoptions:-esa -ea"/>
260	+	<arg value="-automatic"/>
261	+	<arg value="-k:!ignore"/>
262	+	<arg line="@{jtregflags}"/>
263	+	</jtreg>
264	+	</sequential>
265	+	</macrodef>
266	+
267		<!-- ALoops classpath -->
268		<path id="loops.classpath">
269		<pathelement location="${build.loops.dir}"/>
#	Line 202 | Line 275
275
276		<!-- Main targets -->
277
278	+	<property name="build.main.java.version" value="9"/>
279	+	<property name="build.main.javac" value="${javac9}"/>
280	+
281		<target name="dists"
282		depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
283		description="Builds all public jars and docs"/>
#	Line 220 | Line 296
296		classpath=""
297		includeAntRuntime="false"
298		includeJavaRuntime="false"
299	<	executable="${javac8}"
299	>	executable="${build.main.javac}"
300		fork="true">
301
302		<include name="**/*.java"/>
303	+	<compilerarg value="-Xprefer:source"/>
304		<compilerarg value="-XDignore.symbol.file=true"/>
305		<compilerarg value="-Xlint:all"/>
306	+	<compilerarg value="-Xdoclint:all/protected"/>
307	+	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
308		<compilerarg line="${build.args}"/>
309
310		</javac>
#	Line 242 | Line 321
321		</target>
322
323
245	–	<target name="test"
246	–	depends="configure-tests, report-tests"
247	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
248	–
249	–
324		<target name="docs"
325		description="Builds javadocs for src/main to dist dir">
326
327	<	<delete dir="${dist.javadocs.dir}"/>
328	<	<mkdir dir="${dist.javadocs.dir}"/>
327	>	<delete dir="${docs.dir}"/>
328	>	<mkdir dir="${docs.dir}"/>
329
330		<!-- the packagenames="none" hack below prevents scanning the -->
331		<!-- sourcepath for packages -->
332
333	<	<javadoc destdir="${dist.javadocs.dir}"
333	>	<javadoc destdir="${docs.dir}"
334		packagenames="none"
335	<	link="${jdkapi8docs.url}"
335	>	link="${jdkapi9docs.url}"
336		overview="${src.dir}/intro.html"
337	<	sourcepath="${src.dir}:${jdk8src.dir}"
337	>	access="${build.javadoc.access}"
338	>	sourcepath="${src.dir}:${jdk9src.dir}"
339		classpath=""
340	<	executable="${javadoc8}">
340	>	executable="${javadoc9}">
341		<fileset dir="${src.dir}" defaultexcludes="yes">
342		<include name="**/*.java"/>
343		</fileset>
344	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
345		<arg value="-XDignore.symbol.file=true"/>
346		<arg value="-tag"/>
347		<arg value="${javadoc.jls.option}"/>
348	+	<arg value="-tag"/>
349	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
350	+	<arg value="-tag"/>
351	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
352	+	<arg value="-tag"/>
353	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
354		</javadoc>
355		</target>
356
357
358		<target name="dist"
359	<	depends="dist-clean, dist-jar, docs"
359	>	depends="dist-clean, dist-jar, dist-docs"
360		description="Puts all distributable products in single hierarchy"/>
361
362
#	Line 307 | Line 389
389		<target name="dist-clean"
390		description="Removes all build and distribution products">
391
392	+	<delete dir="${build.dir}"/>
393		<delete dir="${dist.dir}"/>
394
395		</target>
396
397
315	–	<!-- Internal targets -->
316	–
317	–
398		<target name="dist-jar"
399		depends="clean, jar">
320	–
400		<copy file="${product.jar}" todir="${dist.dir}"/>
322	–
401		</target>
402
403	<
404	<	<target name="compile-tests"
405	<	depends="jar">
328	<
329	<	<mkdir dir="${build.testcases.dir}"/>
330	<
331	<	<javac srcdir="${tck.src.dir}"
332	<	destdir="${build.testcases.dir}"
333	<	debug="${build.debug}"
334	<	debuglevel="${build.debuglevel}"
335	<	deprecation="${build.deprecation}"
336	<	source="6"
337	<	classpath="${junit.jar}"
338	<	bootclasspath="@{product.jar}:${bootclasspath6}"
339	<	includeAntRuntime="false"
340	<	includeJavaRuntime="false"
341	<	executable="${javac8}"
342	<	fork="true">
343	<
344	<	<include name="**/*.java"/>
345	<	<compilerarg value="-XDignore.symbol.file=true"/>
346	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
347	<	<compilerarg line="${build.args}"/>
348	<
349	<	</javac>
350	<
351	<	<javac srcdir="${test.src.dir}"
352	<	destdir="${build.testcases.dir}"
353	<	debug="${build.debug}"
354	<	debuglevel="${build.debuglevel}"
355	<	deprecation="${build.deprecation}"
356	<	source="6"
357	<	classpath=""
358	<	bootclasspath="@{product.jar}:${bootclasspath6}"
359	<	includeAntRuntime="false"
360	<	includeJavaRuntime="false"
361	<	executable="${javac8}"
362	<	fork="true">
363	<
364	<	<include name="jsr166/test/**/*.java"/>
365	<	<compilerarg value="-XDignore.symbol.file=true"/>
366	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
367	<	<compilerarg line="${build.args}"/>
368	<
369	<	</javac>
370	<
371	<	<!--
372	<	<javac srcdir="${jtreg.src.dir}"
373	<	destdir="${build.testcases.dir}"
374	<	debug="${build.debug}"
375	<	debuglevel="${build.debuglevel}"
376	<	deprecation="${build.deprecation}"
377	<	source="${build.sourcelevel}"
378	<	fork="true">
379	<
380	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
381	<	<compilerarg value="-XDignore.symbol.file=true"/>
382	<	<compilerarg line="${build.args}"/>
383	<
384	<	</javac>
385	<	-->
386	<
403	>	<target name="dist-docs"
404	>	depends="clean, docs">
405	>	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
406		</target>
407
408
409	<	<target name="run-tests"
410	<	depends="compile-tests">
411	<
393	<	<!-- May be overridden by user.properties -->
394	<	<property name="testcase" value="*"/>
395	<
396	<	<mkdir dir="${build.reports.dir}"/>
397	<
398	<	<junit printsummary="true"
399	<	showoutput="true"
400	<	errorProperty="junit.failed"
401	<	failureProperty="junit.failed"
402	<	dir="${build.reports.dir}"
403	<	jvm="${java8}"
404	<	fork="true">
405	<
406	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
407	<	<jvmarg value="-server"/>
408	<	<jvmarg value="-showversion"/>
409	<
410	<	<classpath refid="test.classpath"/>
411	<
412	<	<formatter type="xml"/>
413	<
414	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
415	<	<fileset dir="${tck.src.dir}">
416	<	<include name="**/${testcase}Test.java"/>
417	<	</fileset>
418	<	</batchtest>
419	<
420	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
421	<	<fileset dir="${test.src.dir}">
422	<	<include name="jsr166/test/**/${testcase}Test.java"/>
423	<	</fileset>
424	<	</batchtest>
425	<
426	<	<!--
427	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
428	<	<fileset dir="${jtreg.src.dir}">
429	<	<include name="**/${testcase}Test.java"/>
430	<	</fileset>
431	<	</batchtest>
432	<	-->
433	<
434	<	</junit>
409	>	<target name="test-tck"
410	>	depends="jar"
411	>	description="Runs tck tests for main directly">
412
413	+	<run-tck-tests
414	+	target="${build.main.java.version}"
415	+	workdir="${build.dir}"
416	+	classes="${product.jar}"/>
417		</target>
418
419	+	<target name="test-jtreg"
420	+	depends="jar"
421	+	description="Runs jtreg tests for main using the jtreg ant task">
422	+	<run-jtreg-tests
423	+	target="${build.main.java.version}"
424	+	workdir="${build.dir}"
425	+	classes="${product.jar}"/>
426	+	</target>
427
428	<	<target name="report-tests"
429	<	depends="run-tests">
428	>	<target name="test"
429	>	depends="test-tck, test-jtreg"
430	>	description="Runs tck and jtreg tests for main">
431	>	</target>
432
433	<	<!-- Sets junit.report.format to frames if redirection is present,
434	<	otherwise sets it to noframes. -->
444	<	<available property="junit.report.format"
445	<	value="frames"
446	<	classname="org.apache.xalan.lib.Redirect"
447	<	/>
448	<	<property name="junit.report.format" value="noframes"/>
449	<
450	<	<junitreport todir="${build.reports.dir}">
451	<	<fileset dir="${build.reports.dir}">
452	<	<include name="TEST-*.xml"/>
453	<	</fileset>
454	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
455	<	/>
456	<	</junitreport>
433	>	<target name="test89"
434	>	description="Runs tck and jtreg tests for main for multiple java versions">
435
436	<	<fail message="Test Cases Failed" if="junit.failed"/>
436	>	<antcall target="clean"/>
437	>	<antcall target="test">
438	>	<param name="build.main.java.version" value="8"/>
439	>	<param name="build.main.javac" value="${javac8}"/>
440	>	</antcall>
441	>
442	>	<antcall target="clean"/>
443	>	<antcall target="test">
444	>	<param name="build.main.java.version" value="9"/>
445	>	<param name="build.main.javac" value="${javac9}"/>
446	>	</antcall>
447
448		</target>
449
450
451	+
452		<target name="configure-compiler">
453
454		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 477 | Line 466
466		</target>
467
468
480	–	<target name="configure-tests"
481	–	depends="configure-compiler">
482	–
483	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
484	–	<available property="junit.available"
485	–	classname="junit.framework.Protectable"/>
486	–
487	–	<!-- Xalan -->
488	–	<available property="xalan.available"
489	–	classname="org.apache.xalan.Version"/>
490	–
491	–
492	–	<!-- Ant 1.6beta and later don't need or want this check -->
493	–	<!--
494	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
495	–	unless="junit.available"/>
496	–
497	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
498	–	unless="xalan.available"/>
499	–	-->
500	–
501	–	</target>
502	–
469
470		<!-- Various demos and test programs -->
471
#	Line 552 | Line 518
518		fork="true">
519
520		<include name="**/*.java"/>
521	+	<compilerarg value="-Xprefer:source"/>
522	+	<compilerarg value="-XDignore.symbol.file=true"/>
523	+	<compilerarg value="-Xlint:all"/>
524	+	<compilerarg line="${build.args}"/>
525	+
526	+	</javac>
527	+	</target>
528	+
529	+	<target name="4jdk7doclint"
530	+	depends="configure-compiler"
531	+	description="Finds doclint warnings">
532	+
533	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
534	+
535	+	<javac srcdir="${4jdk7src.dir}"
536	+	destdir="${build.4jdk7.classes.dir}"
537	+	debug="${build.debug}"
538	+	debuglevel="${build.debuglevel}"
539	+	deprecation="${build.deprecation}"
540	+	source="6"
541	+	classpath=""
542	+	bootclasspath="${bootclasspath7}"
543	+	includeAntRuntime="false"
544	+	includeJavaRuntime="false"
545	+	executable="${javac8}"
546	+	fork="true">
547	+
548	+	<include name="**/*.java"/>
549	+	<compilerarg value="-Xprefer:source"/>
550		<compilerarg value="-XDignore.symbol.file=true"/>
551		<compilerarg value="-Xlint:all"/>
552	+	<compilerarg value="-Xdoclint:all/protected"/>
553		<compilerarg line="${build.args}"/>
554
555		</javac>
556		</target>
557
558
559	<	<target name="4jdk7-jar"
559	>	<target name="4jdk7jar"
560		depends="4jdk7compile"
561		description="Builds library jar from compiled sources">
562
#	Line 572 | Line 568
568
569
570		<target name="4jdk7-test-tck"
571	<	depends="4jdk7-jar"
571	>	depends="4jdk7jar"
572		description="Runs tck tests for jsr166-4jdk7 directly">
573
574		<run-tck-tests
575		target="7"
576		workdir="${build.4jdk7.dir}"
577	<	classes="${4jdk7product.jar}"/>
577	>	classes="${4jdk7product.jar}">
578	>	<javac-elements>
579	>	<!-- JDK8+ test classes -->
580	>	<exclude name="*8Test.java"/>
581	>	<exclude name="*9Test.java"/>
582	>	<exclude name="DoubleAccumulatorTest.java"/>
583	>	<exclude name="DoubleAdderTest.java"/>
584	>	<exclude name="LongAccumulatorTest.java"/>
585	>	<exclude name="LongAdderTest.java"/>
586	>	<exclude name="CompletableFutureTest.java"/>
587	>	<exclude name="SplittableRandomTest.java"/>
588	>	<exclude name="StampedLockTest.java"/>
589	>	</javac-elements>
590	>	</run-tck-tests>
591		</target>
592
593
#	Line 604 | Line 613
613
614		<formatter type="brief"/>
615
616	<	<test name="JSR166TestCase" haltonfailure="no">
616	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
617		</test>
618
619		</junit>
620		</target>
621
622		<target name="4jdk7-test-jtreg"
623	<	depends="4jdk7compile"
623	>	depends="4jdk7jar"
624		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
625	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
626	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
627	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
628	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
629	<	<jtreg dir="${jtreg.src.dir}"
621	<	jdk="${jdk7.home}"
622	<	workDir="${build.4jdk7.dir}/JTwork"
623	<	reportDir="${build.4jdk7.dir}/JTreport">
624	<
625	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
626	<	<arg value="-agentvm"/>
627	<	<arg value="-v:nopass,fail"/>
628	<	<arg value="-vmoptions:-esa -ea"/>
629	<	<arg value="-automatic"/>
630	<	<arg value="-k:!ignore"/>
631	<	</jtreg>
625	>	<run-jtreg-tests
626	>	target="7"
627	>	workdir="${build.4jdk7.dir}"
628	>	classes="${4jdk7product.jar}"
629	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
630		</target>
631
632
#	Line 641 | Line 639
639		<target name="4jdk7docs"
640		description="Builds javadocs for src/jdk7 to dist dir">
641
642	<	<delete dir="${dist.4jdk7.docs.dir}"/>
643	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
642	>	<delete dir="${4jdk7docs.dir}"/>
643	>	<mkdir dir="${4jdk7docs.dir}"/>
644
645	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
645	>	<javadoc destdir="${4jdk7docs.dir}"
646		packagenames="none"
647		link="${jdkapi7docs.url}"
648		overview="${4jdk7src.dir}/intro.html"
649	+	access="${build.javadoc.access}"
650		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
651		classpath=""
652		executable="${javadoc7}">
#	Line 660 | Line 659
659
660
661		<target name="4jdk7dist"
662	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
662	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
663		description="Puts all distributable products in single hierarchy"/>
664
665
#	Line 672 | Line 671
671		</target>
672
673
675	–	<target name="4jdk7dist-clean"
676	–	description="Removes all build and distribution products">
677	–
678	–	</target>
679	–
674		<target name="4jdk7dist-jar"
675	<	depends="4jdk7clean, 4jdk7-jar">
682	<
675	>	depends="4jdk7clean, 4jdk7jar">
676		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
677	+	</target>
678	+
679
680	+	<target name="4jdk7dist-docs"
681	+	depends="4jdk7clean, 4jdk7docs">
682	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
683		</target>
684
685
#	Line 715 | Line 713
713		</target>
714
715
716	<	<target name="jsr166x-jar"
716	>	<target name="jsr166xjar"
717		depends="jsr166xcompile"
718		description="Builds library jar from compiled sources">
719
#	Line 729 | Line 727
727		<target name="jsr166xdocs"
728		description="Builds javadocs to dist dir">
729
730	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
731	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
730	>	<delete dir="${jsr166xdocs.dir}"/>
731	>	<mkdir dir="${jsr166xdocs.dir}"/>
732
733	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
733	>	<javadoc destdir="${jsr166xdocs.dir}"
734		packagenames="jsr166x.*"
735		link="${jdkapidocs.url}"
736	+	access="${build.javadoc.access}"
737		sourcepath="${topsrc.dir}:${jdk6src.dir}"
738		bootclasspath="${bootclasspath6}"
739		source="5"
#	Line 746 | Line 745
745
746
747		<target name="jsr166xdist"
748	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
748	>	depends="jsr166xdist-jar, jsr166xdist-docs"
749		description="Puts all distributable products in single hierarchy"/>
750
751
#	Line 758 | Line 757
757		</target>
758
759
761	–	<target name="jsr166xdist-clean"
762	–	description="Removes all build and distribution products">
763	–
764	–	</target>
765	–
766	–
760		<target name="jsr166xdist-jar"
761	<	depends="jsr166xclean, jsr166x-jar">
769	<
761	>	depends="jsr166xclean, jsr166xjar">
762		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
763	+	</target>
764
765	+	<target name="jsr166xdist-docs"
766	+	depends="jsr166xclean, jsr166xdocs">
767	+	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
768		</target>
769
770		<!-- jsr166y -->
#	Line 802 | Line 798
798		</target>
799
800
801	<	<target name="jsr166y-jar"
801	>	<target name="jsr166yjar"
802		depends="jsr166ycompile"
803		description="Builds library jar from compiled sources">
804
#	Line 816 | Line 812
812		<target name="jsr166ydocs"
813		description="Builds javadocs to dist dir">
814
815	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
816	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
815	>	<delete dir="${jsr166ydocs.dir}"/>
816	>	<mkdir dir="${jsr166ydocs.dir}"/>
817
818	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
818	>	<javadoc destdir="${jsr166ydocs.dir}"
819		packagenames="jsr166y.*"
820		link="${jdkapidocs.url}"
821	+	access="${build.javadoc.access}"
822		sourcepath="${topsrc.dir}:${jdk6src.dir}"
823		bootclasspath="${bootclasspath6}"
824		source="6"
#	Line 833 | Line 830
830
831
832		<target name="jsr166ydist"
833	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
833	>	depends="jsr166ydist-jar, jsr166ydist-docs"
834		description="Puts all distributable products in single hierarchy"/>
835
836
#	Line 845 | Line 842
842		</target>
843
844
848	–	<target name="jsr166ydist-clean"
849	–	description="Removes all build and distribution products">
850	–
851	–	</target>
852	–
845		<target name="jsr166ydist-jar"
846	<	depends="jsr166yclean, jsr166y-jar">
855	<
846	>	depends="jsr166yclean, jsr166yjar">
847		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
848	+	</target>
849
850	+	<target name="jsr166ydist-docs"
851	+	depends="jsr166yclean, jsr166ydocs">
852	+	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
853		</target>
854
855
#	Line 862 | Line 857
857
858
859		<target name="extra166ycompile"
860	<	depends="configure-compiler, jsr166y-jar"
860	>	depends="configure-compiler, jsr166yjar"
861		description="Compiles extra166y sources">
862
863		<mkdir dir="${build.extra166y.classes.dir}"/>
#	Line 889 | Line 884
884		</target>
885
886
887	<	<target name="extra166y-jar"
887	>	<target name="extra166yjar"
888		depends="extra166ycompile"
889		description="Builds library jar from compiled sources">
890
#	Line 903 | Line 898
898		<target name="extra166ydocs"
899		description="Builds javadocs to build dir">
900
901	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
902	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
901	>	<delete dir="${extra166ydocs.dir}"/>
902	>	<mkdir dir="${extra166ydocs.dir}"/>
903
904	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
904	>	<javadoc destdir="${extra166ydocs.dir}"
905		packagenames="extra166y.*"
906		link="${jdkapidocs.url}"
907	+	access="${build.javadoc.access}"
908		sourcepath="${topsrc.dir}:${jdk6src.dir}"
909		bootclasspath="${bootclasspath6}"
910		source="6"
#	Line 920 | Line 916
916
917
918		<target name="extra166ydist"
919	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
919	>	depends="extra166ydist-jar, extra166ydist-docs"
920		description="Puts all distributable products in single hierarchy"/>
921
922
#	Line 932 | Line 928
928		</target>
929
930
935	–	<target name="extra166ydist-clean"
936	–	description="Removes all build and distribution products">
937	–
938	–	</target>
939	–
931		<target name="extra166ydist-jar"
932	<	depends="extra166yclean, extra166y-jar">
942	<
932	>	depends="extra166yclean, extra166yjar">
933		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
934	+	</target>
935
936	+	<target name="extra166ydist-docs"
937	+	depends="extra166yclean, extra166ydocs">
938	+	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
939		</target>
940
941		<!-- jsr166e -->
942
943	+	<property name="build.jsr166e.java.version" value="6"/>
944	+	<property name="build.jsr166e.javac" value="${javac6}"/>
945	+
946		<target name="jsr166ecompile"
947		depends="configure-compiler"
948		description="Compiles jsr166e sources">
#	Line 957 | Line 954
954		debug="${build.debug}"
955		debuglevel="${build.debuglevel}"
956		deprecation="${build.deprecation}"
957	<	source="7"
957	>	source="${build.jsr166e.java.version}"
958		classpath=""
959		includeAntRuntime="false"
960		includeJavaRuntime="false"
961	<	executable="${javac7}"
961	>	executable="${build.jsr166e.javac}"
962		fork="true">
963
964		<include name="jsr166e/**/*.java"/>
#	Line 972 | Line 969
969		</javac>
970		</target>
971
972	+	<!-- jsr166e: find doclint errors -->
973	+	<target name="jsr166edoclint">
974	+
975	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
976	+
977	+	<javac srcdir="${topsrc.dir}"
978	+	destdir="${build.jsr166e.classes.dir}"
979	+	debug="${build.debug}"
980	+	debuglevel="${build.debuglevel}"
981	+	deprecation="${build.deprecation}"
982	+	source="${build.jsr166e.java.version}"
983	+	classpath=""
984	+	bootclasspath="${bootclasspath7}"
985	+	includeAntRuntime="false"
986	+	includeJavaRuntime="false"
987	+	executable="${javac8}"
988	+	fork="true">
989	+
990	+	<include name="jsr166e/**/*.java"/>
991	+	<compilerarg value="-XDignore.symbol.file=true"/>
992	+	<compilerarg value="-Xlint:all"/>
993	+	<compilerarg value="-Xdoclint:all/protected"/>
994	+
995	+	</javac>
996	+	</target>
997	+
998
999	<	<target name="jsr166e-jar"
999	>	<target name="jsr166ejar"
1000		depends="jsr166ecompile"
1001		description="Builds library jar from compiled sources">
1002
#	Line 987 | Line 1010
1010		<target name="jsr166edocs"
1011		description="Builds javadocs to build dir">
1012
1013	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1014	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1013	>	<delete dir="${jsr166edocs.dir}"/>
1014	>	<mkdir dir="${jsr166edocs.dir}"/>
1015
1016	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1016	>	<javadoc destdir="${jsr166edocs.dir}"
1017		packagenames="jsr166e.*"
1018		link="${jdkapidocs.url}"
1019	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1020	<	source="7"
1019	>	access="${build.javadoc.access}"
1020	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1021	>	source="${build.jsr166e.java.version}"
1022		executable="${javadoc7}">
1023		<arg value="-XDignore.symbol.file=true"/>
1024
#	Line 1002 | Line 1026
1026		</target>
1027
1028
1029	<	<target name="jsr166e-test-tck"
1030	<	depends="jsr166e-jar"
1031	<	description="Runs tck tests for jsr166e">
1029	>	<target name="jsr166e-test-tck-one-java-version"
1030	>	depends="jsr166ejar">
1031	>
1032	>	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1033
1034		<run-tck-tests
1035		tck.src.dir="${test.src.dir}/tck-jsr166e"
1036	<	source="7"
1012	<	target="8"
1036	>	target="${build.jsr166e.java.version}"
1037		workdir="${build.jsr166e.dir}"
1038		classes="${jsr166e.jar}"/>
1039		</target>
1040
1041	+	<target name="jsr166e-test-tck"
1042	+	description="Runs tck tests for jsr166e for multiple java versions">
1043	+
1044	+	<!--     <antcall target="clean"/> -->
1045	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1046	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1047	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1048	+	<!--     </antcall> -->
1049	+
1050	+	<antcall target="clean"/>
1051	+	<antcall target="jsr166e-test-tck-one-java-version">
1052	+	<param name="build.jsr166e.java.version" value="7"/>
1053	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1054	+	</antcall>
1055	+
1056	+	<antcall target="clean"/>
1057	+	<antcall target="jsr166e-test-tck-one-java-version">
1058	+	<param name="build.jsr166e.java.version" value="6"/>
1059	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1060	+	</antcall>
1061	+	</target>
1062	+
1063	+
1064	+	<target name="jsr166e-test"
1065	+	depends="jsr166e-test-tck"
1066	+	description="Runs all tests for jsr166e">
1067	+	</target>
1068
1069		<target name="jsr166edist"
1070	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1070	>	depends="jsr166edist-jar, jsr166edist-docs"
1071		description="Puts all distributable products in single hierarchy"/>
1072
1073
1074		<target name="jsr166eclean"
1075		description="Removes all jsr166e build products">
1025	–
1076		<delete dir="${build.jsr166e.dir}"/>
1027	–
1077		</target>
1078
1079
1080	<	<target name="jsr166edist-clean"
1081	<	description="Removes all build and distribution products">
1080	>	<target name="jsr166edist-jar"
1081	>	depends="jsr166eclean, jsr166ejar">
1082	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1083	>	</target>
1084
1085	+	<target name="jsr166edist-docs"
1086	+	depends="jsr166eclean, jsr166edocs">
1087	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1088		</target>
1089
1036	–	<target name="jsr166edist-jar"
1037	–	depends="jsr166eclean, jsr166e-jar">
1090
1091	<	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1091	>	<!-- Find buglets that can be detected by static build tools -->
1092
1093	+	<target name="lint">
1094	+	<antcall target="dists">
1095	+	<param name="build.javadoc.access" value="private"/>
1096	+	</antcall>
1097		</target>
1098
1099	+
1100		</project>

Diff Legend

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