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.138 by jsr166, Fri Mar 22 18:04:56 2013 UTC vs.
Revision 1.177 by jsr166, Fri Sep 11 18:43:46 2015 UTC

#	Line 1 | Line 1
1	<	<project name="jsr166" default="usage">
1	>	<project name="jsr166" default="usage"
2	>	xmlns:if="ant:if" xmlns:unless="ant:unless">
3
4		<description>
5		------------------------------------------------------------------------------
#	Line 16 | Line 17
17		$HOME/jdk/jdk6
18		$HOME/jdk/jdk7
19		$HOME/jdk/jdk8
20	+	$HOME/jdk/jdk9
21		where each of the above is a JDK or a symlink to same, and
22		$HOME/jdk/src/jdk6
23		$HOME/jdk/src/jdk7
24		$HOME/jdk/src/jdk8
25	+	$HOME/jdk/src/jdk9
26		where each of the above is a complete JDK source tree
27		(e.g. mercurial forest) or a symlink to same.
28	<	As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
28	>
29	>	Alternatively, define ant variables thus:
30	>	ant -Djdk$N.home=...
31	>	for $N in 6 7 8 9 ...
32		------------------------------------------------------------------------------
33		</description>
34
35	<	<target name="usage" description="Display main targets by running 'ant -projecthelp'">
35	>	<!-- Display main targets by running 'ant -projecthelp' -->
36	>	<target name="usage">
37		<java classname="org.apache.tools.ant.Main">
38		<arg value="-projecthelp" />
39		</java>
40		</target>
41
42	+	<!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
43
44		<!-- User-specific settings -->
45		<property file="user.properties"/>
#	Line 44 | Line 52 | As of 2013-02, the very latest lambda 8
52		<property name="build.deprecation"    value="false"/>
53		<property name="build.javadoc.access" value="protected"/>
54
55	+	<!-- Tck options; see JSR166TestCase.java
56	+	To profile a single tck test class:
57	+	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
58	+	To stress test a single tck test class:
59	+	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
60	+	-->
61	+	<property name="jsr166.profileTests"     value="false"/>
62	+	<property name="jsr166.profileThreshold" value="100"/>
63	+	<property name="jsr166.runsPerTest"      value="1"/>
64	+	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
65	+
66		<!-- Build locations -->
67		<property name="build.dir"                   location="build"/>
68		<property name="build.classes.dir"           location="${build.dir}/classes"/>
#	Line 76 | Line 95 | As of 2013-02, the very latest lambda 8
95		<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96		<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97		<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
98	<	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
98	>	<available property="jdk@{v}.have.java.base"
99	>	file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
100	>	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
101	>	if:set="jdk@{v}.have.java.base"/>
102	>	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
103	>	unless:set="jdk@{v}.have.java.base"/>
104		<local name="boot.jar.dir"/>
105		<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
106		<path id="bootclasspath@{v}">
#	Line 105 | Line 129 | As of 2013-02, the very latest lambda 8
129		<defjdklocations v="6"/>
130		<defjdklocations v="7"/>
131		<defjdklocations v="8"/>
132	+	<defjdklocations v="9"/>
133
134		<!-- Source locations -->
135		<property name="src.dir"              location="${basedir}/src/main"/>
136		<property name="test.src.dir"         location="${basedir}/src/test"/>
137		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
138		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
139	<	<property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
139	>	<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
140	>	<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
141	>	<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
142	>	<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
143		<property name="lib.dir"              location="${basedir}/lib"/>
144		<property name="dist.dir"             location="${basedir}/dist"/>
145		<property name="topsrc.dir"           location="${basedir}/src"/>
#	Line 145 | Line 173 | As of 2013-02, the very latest lambda 8
173		<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
174		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
175
176	<	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
177	<	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
178	<	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
179	<	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
180	<
181	<	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
182	<	<!-- The below does not yet exist as of 2013-01 -->
183	<	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
176	>	<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
177	>	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
178	>	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
179	>	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
180	>	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
181	>	<!-- The expected canonical location does not yet exist as of 2014-07 -->
182	>	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
183	>	<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
184	>	<!-- Default jdk doc location (latest stable release seems best) -->
185	>	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
186
187	<	<!-- Default jdk api doc location (latest stable release seems best) -->
188	<	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
187	>	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
188	>	<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
189	>	<property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
190	>	<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
191	>	<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
192	>	<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
193	>	<property name="java.api.url"       value="${java.docroot.url}/api/"/>
194
195		<!-- Define the "jtreg" task -->
196		<!-- See the docs in "jtreg -onlineHelp" -->
#	Line 174 | Line 209 | As of 2013-02, the very latest lambda 8
209		<attribute name="compile-target" default="@{target}"/>
210		<attribute name="workdir"/>
211		<attribute name="classes"/>
212	<	<attribute name="jvmflags" default=""/>
212	>	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
213		<element name="javac-elements" optional="true"/>
214		<sequential>
215
#	Line 188 | Line 223 | As of 2013-02, the very latest lambda 8
223		source="@{compile-target}"
224		target="@{compile-target}"
225		classpath="${junit.jar}"
191	–	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
226		includeAntRuntime="false"
227		includeJavaRuntime="false"
228		executable="${javac@{compile-target}}"
#	Line 197 | Line 231 | As of 2013-02, the very latest lambda 8
231		<include name="*.java"/>
232		<compilerarg value="-XDignore.symbol.file=true"/>
233		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
234	+	<compilerarg value="-Xbootclasspath/p:@{classes}"/>
235		<compilerarg line="${build.args}"/>
236		<javac-elements/>
237
238		</javac>
239
240	<	<java classname="JSR166TestCase"
240	>	<java classname="${jsr166.tckTestClass}"
241		failonerror="true"
242		jvm="${java@{target}}"
243		fork="true">
244		<jvmarg value="-Xbootclasspath/p:@{classes}"/>
245		<jvmarg line="@{jvmflags}"/>
246	+
247	+	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
248	+	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
249	+	<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
250	+	</syspropertyset>
251	+
252	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
253	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
254	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
255		<classpath>
256		<pathelement location="${junit.jar}"/>
257		<pathelement location="@{workdir}/tck-classes"/>
#	Line 217 | Line 261 | As of 2013-02, the very latest lambda 8
261		</sequential>
262		</macrodef>
263
264	+	<!-- Define jtreg test sets for different jdk versions -->
265	+	<fileset dir="${jtreg9.src.dir}">
266	+	<patternset id="jdk9.jtreg.tests">
267	+	<include name="**/*.java"/>
268	+	</patternset>
269	+	</fileset>
270	+
271	+	<fileset dir="${jtreg8.src.dir}">
272	+	<patternset id="jdk8.jtreg.tests">
273	+	<include name="**/*.java"/>
274	+	<exclude name="**/SpliteratorCharacteristics.java"/>
275	+	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
276	+	<exclude name="**/GCDuringIteration.java"/>
277	+	</patternset>
278	+	</fileset>
279	+
280	+	<fileset dir="${jtreg7.src.dir}">
281	+	<patternset id="jdk7.jtreg.tests">
282	+	<include name="**/*.java"/>
283	+	</patternset>
284	+	</fileset>
285	+
286		<macrodef name="run-jtreg-tests">
287	<	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
287	>	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
288		<attribute name="source" default="7"/>
289		<attribute name="target"/>
290		<attribute name="workdir"/>
#	Line 229 | Line 295 | As of 2013-02, the very latest lambda 8
295		<delete dir="@{workdir}/JTreport" quiet="true"/>
296		<mkdir dir="@{workdir}/JTwork/scratch"/>
297		<mkdir dir="@{workdir}/JTreport"/>
298	<	<jtreg dir="@{jtreg.src.dir}"
298	>	<jtreg dir="${jtreg@{target}.src.dir}"
299		jdk="${jdk@{target}.home}"
300		workDir="@{workdir}/JTwork"
301		reportDir="@{workdir}/JTreport">
302	<
302	>	<patternset refid="jdk@{target}.jtreg.tests"/>
303		<arg value="-Xbootclasspath/p:@{classes}"/>
304		<arg value="-agentvm"/>
305		<arg value="-v:nopass,fail"/>
#	Line 256 | Line 322 | As of 2013-02, the very latest lambda 8
322
323		<!-- Main targets -->
324
325	+	<property name="build.main.java.version" value="9"/>
326	+	<property name="build.main.javac" value="${javac9}"/>
327	+
328		<target name="dists"
329		depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
330		description="Builds all public jars and docs"/>
#	Line 274 | Line 343 | As of 2013-02, the very latest lambda 8
343		classpath=""
344		includeAntRuntime="false"
345		includeJavaRuntime="false"
346	<	executable="${javac8}"
346	>	executable="${build.main.javac}"
347		fork="true">
348
349		<include name="**/*.java"/>
350		<compilerarg value="-Xprefer:source"/>
351		<compilerarg value="-XDignore.symbol.file=true"/>
352		<compilerarg value="-Xlint:all"/>
353	+	<compilerarg value="-Werror"/>
354	+	<compilerarg value="-Xdoclint:all/protected"/>
355	+	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
356		<compilerarg line="${build.args}"/>
357
358		</javac>
#	Line 297 | Line 369 | As of 2013-02, the very latest lambda 8
369		</target>
370
371
300	–	<target name="test"
301	–	depends="configure-tests, report-tests"
302	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
303	–
304	–
372		<target name="docs"
373		description="Builds javadocs for src/main to dist dir">
374
#	Line 313 | Line 380 | As of 2013-02, the very latest lambda 8
380
381		<javadoc destdir="${docs.dir}"
382		packagenames="none"
383	<	link="${jdkapi8docs.url}"
383	>	link="${java9.api.url}"
384		overview="${src.dir}/intro.html"
385		access="${build.javadoc.access}"
386	<	sourcepath="${src.dir}:${jdk8src.dir}"
386	>	sourcepath="${src.dir}:${jdk9src.dir}"
387		classpath=""
388	<	executable="${javadoc8}">
388	>	executable="${javadoc9}">
389		<fileset dir="${src.dir}" defaultexcludes="yes">
390		<include name="**/*.java"/>
391		</fileset>
392	+	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
393	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
394		<arg value="-XDignore.symbol.file=true"/>
395		<arg value="-tag"/>
396		<arg value="${javadoc.jls.option}"/>
397	+	<arg value="-tag"/>
398	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
399	+	<arg value="-tag"/>
400	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
401	+	<arg value="-tag"/>
402	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
403		</javadoc>
404		</target>
405
#	Line 363 | Line 438 | As of 2013-02, the very latest lambda 8
438		<target name="dist-clean"
439		description="Removes all build and distribution products">
440
441	+	<delete dir="${build.dir}"/>
442		<delete dir="${dist.dir}"/>
443
444		</target>
445
446
371	–	<!-- Internal targets -->
372	–
373	–
447		<target name="dist-jar"
448		depends="clean, jar">
449		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 381 | Line 454 | As of 2013-02, the very latest lambda 8
454		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
455		</target>
456
457	<
385	<	<target name="compile-tests"
386	<	depends="jar">
387	<
388	<	<mkdir dir="${build.testcases.dir}"/>
389	<
390	<	<javac srcdir="${tck.src.dir}"
391	<	destdir="${build.testcases.dir}"
392	<	debug="${build.debug}"
393	<	debuglevel="${build.debuglevel}"
394	<	deprecation="${build.deprecation}"
395	<	source="6"
396	<	classpath="${junit.jar}"
397	<	bootclasspath="@{product.jar}:${bootclasspath6}"
398	<	includeAntRuntime="false"
399	<	includeJavaRuntime="false"
400	<	executable="${javac8}"
401	<	fork="true">
402	<
403	<	<include name="**/*.java"/>
404	<	<compilerarg value="-XDignore.symbol.file=true"/>
405	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
406	<	<compilerarg line="${build.args}"/>
407	<
408	<	</javac>
409	<
410	<	<javac srcdir="${test.src.dir}"
411	<	destdir="${build.testcases.dir}"
412	<	debug="${build.debug}"
413	<	debuglevel="${build.debuglevel}"
414	<	deprecation="${build.deprecation}"
415	<	source="6"
416	<	classpath=""
417	<	bootclasspath="@{product.jar}:${bootclasspath6}"
418	<	includeAntRuntime="false"
419	<	includeJavaRuntime="false"
420	<	executable="${javac8}"
421	<	fork="true">
422	<
423	<	<include name="jsr166/test/**/*.java"/>
424	<	<compilerarg value="-XDignore.symbol.file=true"/>
425	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
426	<	<compilerarg line="${build.args}"/>
427	<
428	<	</javac>
429	<
430	<	<!--
431	<	<javac srcdir="${jtreg.src.dir}"
432	<	destdir="${build.testcases.dir}"
433	<	debug="${build.debug}"
434	<	debuglevel="${build.debuglevel}"
435	<	deprecation="${build.deprecation}"
436	<	source="${build.sourcelevel}"
437	<	fork="true">
438	<
439	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
440	<	<compilerarg value="-XDignore.symbol.file=true"/>
441	<	<compilerarg line="${build.args}"/>
442	<
443	<	</javac>
444	<	-->
445	<
446	<	</target>
447	<
448	<	<target name="test-tck"
457	>	<target name="tck"
458		depends="jar"
459		description="Runs tck tests for main directly">
460
461		<run-tck-tests
462	<	target="8"
462	>	target="${build.main.java.version}"
463		workdir="${build.dir}"
464		classes="${product.jar}"/>
465		</target>
466
467	<	<target name="test-jtreg"
467	>	<target name="tck-parallelism-1"
468	>	description="Runs tck with given common pool parallelism">
469	>	<antcall target="tck">
470	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
471	>	</antcall>
472	>	</target>
473	>
474	>	<target name="tck-parallelism-0"
475	>	description="Runs tck with given common pool parallelism">
476	>	<antcall target="tck">
477	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
478	>	</antcall>
479	>	</target>
480	>
481	>	<target name="jtreg"
482		depends="jar"
483		description="Runs jtreg tests for main using the jtreg ant task">
484		<run-jtreg-tests
485	<	target="8"
485	>	target="${build.main.java.version}"
486		workdir="${build.dir}"
487		classes="${product.jar}"/>
488		</target>
489
490	<	<target name="test-ng"
491	<	depends="test-tck, test-jtreg"
490	>	<target name="test"
491	>	depends="tck, tck-parallelism-1, jtreg"
492		description="Runs tck and jtreg tests for main">
493		</target>
494
495	<	<target name="run-tests"
473	<	depends="compile-tests">
474	<
475	<	<!-- May be overridden by user.properties -->
476	<	<property name="testcase" value="*"/>
477	<
478	<	<mkdir dir="${build.reports.dir}"/>
479	<
480	<	<junit printsummary="true"
481	<	showoutput="true"
482	<	errorProperty="junit.failed"
483	<	failureProperty="junit.failed"
484	<	dir="${build.reports.dir}"
485	<	jvm="${java8}"
486	<	fork="true">
495	>	<target name="jtreg8" description="Runs jtreg tests with jdk8">
496
497	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
498	<	<jvmarg value="-server"/>
499	<	<jvmarg value="-showversion"/>
500	<
492	<	<classpath refid="test.classpath"/>
493	<
494	<	<formatter type="xml"/>
495	<
496	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
497	<	<fileset dir="${tck.src.dir}">
498	<	<include name="**/${testcase}Test.java"/>
499	<	</fileset>
500	<	</batchtest>
501	<
502	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
503	<	<fileset dir="${test.src.dir}">
504	<	<include name="jsr166/test/**/${testcase}Test.java"/>
505	<	</fileset>
506	<	</batchtest>
507	<
508	<	<!--
509	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
510	<	<fileset dir="${jtreg.src.dir}">
511	<	<include name="**/${testcase}Test.java"/>
512	<	</fileset>
513	<	</batchtest>
514	<	-->
515	<
516	<	</junit>
497	>	<antcall target="jtreg">
498	>	<param name="build.main.java.version" value="8"/>
499	>	<param name="build.main.javac" value="${javac8}"/>
500	>	</antcall>
501
502		</target>
503
504	+	<target name="test89"
505	+	description="Runs tck and jtreg tests for main for multiple java versions">
506
507	<	<target name="report-tests"
508	<	depends="run-tests">
509	<
510	<	<!-- Sets junit.report.format to frames if redirection is present,
511	<	otherwise sets it to noframes. -->
526	<	<available property="junit.report.format"
527	<	value="frames"
528	<	classname="org.apache.xalan.lib.Redirect"
529	<	/>
530	<	<property name="junit.report.format" value="noframes"/>
531	<
532	<	<junitreport todir="${build.reports.dir}">
533	<	<fileset dir="${build.reports.dir}">
534	<	<include name="TEST-*.xml"/>
535	<	</fileset>
536	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
537	<	/>
538	<	</junitreport>
507	>	<antcall target="clean"/>
508	>	<antcall target="test">
509	>	<param name="build.main.java.version" value="8"/>
510	>	<param name="build.main.javac" value="${javac8}"/>
511	>	</antcall>
512
513	<	<fail message="Test Cases Failed" if="junit.failed"/>
513	>	<antcall target="clean"/>
514	>	<antcall target="test">
515	>	<param name="build.main.java.version" value="9"/>
516	>	<param name="build.main.javac" value="${javac9}"/>
517	>	</antcall>
518
519		</target>
520
521
522	+
523		<target name="configure-compiler">
524
525		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 559 | Line 537 | As of 2013-02, the very latest lambda 8
537		</target>
538
539
562	–	<target name="configure-tests"
563	–	depends="configure-compiler">
564	–
565	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
566	–	<available property="junit.available"
567	–	classname="junit.framework.Protectable"/>
568	–
569	–	<!-- Xalan -->
570	–	<available property="xalan.available"
571	–	classname="org.apache.xalan.Version"/>
572	–
573	–
574	–	<!-- Ant 1.6beta and later don't need or want this check -->
575	–	<!--
576	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
577	–	unless="junit.available"/>
578	–
579	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
580	–	unless="xalan.available"/>
581	–	-->
582	–
583	–	</target>
584	–
540
541		<!-- Various demos and test programs -->
542
#	Line 612 | Line 567 | As of 2013-02, the very latest lambda 8
567		</target>
568
569
570	+	<target name="compile-test-loops" depends="jar"
571	+	description="compile all the perf tests in src/test/loops">
572	+
573	+	<mkdir dir="${build.dir}/test/loops"/>
574	+
575	+	<javac srcdir="${basedir}/src/test/loops"
576	+	destdir="${build.dir}/test/loops"
577	+	debug="${build.debug}"
578	+	debuglevel="${build.debuglevel}"
579	+	deprecation="${build.deprecation}"
580	+	includeAntRuntime="false"
581	+	includeJavaRuntime="false"
582	+	executable="${javac9}"
583	+	fork="true">
584	+
585	+	<include name="*.java"/>
586	+	<compilerarg value="-XDignore.symbol.file=true"/>
587	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
588	+	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
589	+	<compilerarg line="${build.args}"/>
590	+
591	+	</javac>
592	+
593	+	</target>
594	+
595	+
596		<!-- jsr166 4jdk7 -->
597
598		<target name="4jdk7compile"
#	Line 637 | Line 618 | As of 2013-02, the very latest lambda 8
618		<compilerarg value="-Xprefer:source"/>
619		<compilerarg value="-XDignore.symbol.file=true"/>
620		<compilerarg value="-Xlint:all"/>
621	+	<compilerarg value="-Werror"/>
622	+	<compilerarg line="${build.args}"/>
623	+
624	+	</javac>
625	+	</target>
626	+
627	+	<target name="4jdk7doclint"
628	+	depends="configure-compiler"
629	+	description="Finds doclint warnings">
630	+
631	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
632	+
633	+	<javac srcdir="${4jdk7src.dir}"
634	+	destdir="${build.4jdk7.classes.dir}"
635	+	debug="${build.debug}"
636	+	debuglevel="${build.debuglevel}"
637	+	deprecation="${build.deprecation}"
638	+	source="6"
639	+	classpath=""
640	+	bootclasspath="${bootclasspath7}"
641	+	includeAntRuntime="false"
642	+	includeJavaRuntime="false"
643	+	executable="${javac8}"
644	+	fork="true">
645	+
646	+	<include name="**/*.java"/>
647	+	<compilerarg value="-Xprefer:source"/>
648	+	<compilerarg value="-XDignore.symbol.file=true"/>
649	+	<compilerarg value="-Xlint:all"/>
650	+	<compilerarg value="-Xdoclint:all/protected"/>
651		<compilerarg line="${build.args}"/>
652
653		</javac>
#	Line 654 | Line 665 | As of 2013-02, the very latest lambda 8
665		</target>
666
667
668	<	<target name="4jdk7-test-tck"
668	>	<target name="4jdk7-tck"
669		depends="4jdk7jar"
670		description="Runs tck tests for jsr166-4jdk7 directly">
671
#	Line 665 | Line 676 | As of 2013-02, the very latest lambda 8
676		<javac-elements>
677		<!-- JDK8+ test classes -->
678		<exclude name="*8Test.java"/>
679	+	<exclude name="*9Test.java"/>
680	+	<exclude name="*10Test.java"/>
681		<exclude name="DoubleAccumulatorTest.java"/>
682		<exclude name="DoubleAdderTest.java"/>
683		<exclude name="LongAccumulatorTest.java"/>
684		<exclude name="LongAdderTest.java"/>
685		<exclude name="CompletableFutureTest.java"/>
686	+	<exclude name="SplittableRandomTest.java"/>
687		<exclude name="StampedLockTest.java"/>
688	+	<exclude name="SubmissionPublisherTest.java"/>
689		</javac-elements>
690		</run-tck-tests>
691		</target>
692
693
694	<	<target name="4jdk7-test-tck-junit"
694	>	<target name="4jdk7-tck-junit"
695		depends="4jdk7compile"
696		description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
697
#	Line 698 | Line 713 | As of 2013-02, the very latest lambda 8
713
714		<formatter type="brief"/>
715
716	<	<test name="JSR166TestCase" haltonfailure="no">
716	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
717		</test>
718
719		</junit>
720		</target>
721
722	<	<target name="4jdk7-test-jtreg"
722	>	<target name="4jdk7-jtreg"
723		depends="4jdk7jar"
724		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
725		<run-jtreg-tests
#	Line 715 | Line 730 | As of 2013-02, the very latest lambda 8
730
731
732		<target name="4jdk7-test"
733	<	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
733	>	depends="4jdk7-tck, 4jdk7-jtreg"
734		description="Runs tck and jtreg tests for jsr166-4jdk7">
735		</target>
736
#	Line 728 | Line 743 | As of 2013-02, the very latest lambda 8
743
744		<javadoc destdir="${4jdk7docs.dir}"
745		packagenames="none"
746	<	link="${jdkapi7docs.url}"
746	>	link="${java7.api.url}"
747		overview="${4jdk7src.dir}/intro.html"
748		access="${build.javadoc.access}"
749		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
#	Line 737 | Line 752 | As of 2013-02, the very latest lambda 8
752		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
753		<include name="**/*.java"/>
754		</fileset>
755	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
756		<arg value="-XDignore.symbol.file=true"/>
757		</javadoc>
758		</target>
#	Line 755 | Line 771 | As of 2013-02, the very latest lambda 8
771		</target>
772
773
758	–	<target name="4jdk7dist-clean"
759	–	description="Removes all build and distribution products">
760	–
761	–	</target>
762	–
774		<target name="4jdk7dist-jar"
775		depends="4jdk7clean, 4jdk7jar">
776		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
#	Line 796 | Line 807 | As of 2013-02, the very latest lambda 8
807		<include name="jsr166x/**/*.java"/>
808		<compilerarg value="-XDignore.symbol.file=true"/>
809		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
810	+	<compilerarg value="-Werror"/>
811		<compilerarg line="${build.args}"/>
812
813		</javac>
#	Line 821 | Line 833 | As of 2013-02, the very latest lambda 8
833
834		<javadoc destdir="${jsr166xdocs.dir}"
835		packagenames="jsr166x.*"
836	<	link="${jdkapidocs.url}"
836	>	link="${java.api.url}"
837		access="${build.javadoc.access}"
838		sourcepath="${topsrc.dir}:${jdk6src.dir}"
839		bootclasspath="${bootclasspath6}"
840		source="5"
841		executable="${javadoc7}">
842	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
843		<arg value="-XDignore.symbol.file=true"/>
844
845		</javadoc>
#	Line 846 | Line 859 | As of 2013-02, the very latest lambda 8
859		</target>
860
861
849	–	<target name="jsr166xdist-clean"
850	–	description="Removes all build and distribution products">
851	–
852	–	</target>
853	–
854	–
862		<target name="jsr166xdist-jar"
863		depends="jsr166xclean, jsr166xjar">
864		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
#	Line 887 | Line 894 | As of 2013-02, the very latest lambda 8
894		<include name="jsr166y/**/*.java"/>
895		<compilerarg value="-XDignore.symbol.file=true"/>
896		<compilerarg value="-Xlint:all"/>
897	+	<compilerarg value="-Werror"/>
898		<compilerarg line="${build.args}"/>
899
900		</javac>
#	Line 912 | Line 920 | As of 2013-02, the very latest lambda 8
920
921		<javadoc destdir="${jsr166ydocs.dir}"
922		packagenames="jsr166y.*"
923	<	link="${jdkapidocs.url}"
923	>	link="${java.api.url}"
924		access="${build.javadoc.access}"
925		sourcepath="${topsrc.dir}:${jdk6src.dir}"
926		bootclasspath="${bootclasspath6}"
927		source="6"
928		executable="${javadoc7}">
929	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
930		<arg value="-XDignore.symbol.file=true"/>
931
932		</javadoc>
#	Line 937 | Line 946 | As of 2013-02, the very latest lambda 8
946		</target>
947
948
940	–	<target name="jsr166ydist-clean"
941	–	description="Removes all build and distribution products">
942	–
943	–	</target>
944	–
949		<target name="jsr166ydist-jar"
950		depends="jsr166yclean, jsr166yjar">
951		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
#	Line 978 | Line 982 | As of 2013-02, the very latest lambda 8
982		<include name="extra166y/**/*.java"/>
983		<compilerarg value="-XDignore.symbol.file=true"/>
984		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
985	+	<compilerarg value="-Werror"/>
986		<compilerarg line="${build.args}"/>
987
988		</javac>
#	Line 1003 | Line 1008 | As of 2013-02, the very latest lambda 8
1008
1009		<javadoc destdir="${extra166ydocs.dir}"
1010		packagenames="extra166y.*"
1011	<	link="${jdkapidocs.url}"
1011	>	link="${java.api.url}"
1012		access="${build.javadoc.access}"
1013		sourcepath="${topsrc.dir}:${jdk6src.dir}"
1014		bootclasspath="${bootclasspath6}"
1015		source="6"
1016		executable="${javadoc7}">
1017	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1018		<arg value="-XDignore.symbol.file=true"/>
1019
1020		</javadoc>
#	Line 1028 | Line 1034 | As of 2013-02, the very latest lambda 8
1034		</target>
1035
1036
1031	–	<target name="extra166ydist-clean"
1032	–	description="Removes all build and distribution products">
1033	–
1034	–	</target>
1035	–
1037		<target name="extra166ydist-jar"
1038		depends="extra166yclean, extra166yjar">
1039		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
#	Line 1045 | Line 1046 | As of 2013-02, the very latest lambda 8
1046
1047		<!-- jsr166e -->
1048
1049	+	<property name="build.jsr166e.java.version" value="6"/>
1050	+	<property name="build.jsr166e.javac" value="${javac6}"/>
1051	+
1052		<target name="jsr166ecompile"
1053		depends="configure-compiler"
1054		description="Compiles jsr166e sources">
#	Line 1056 | Line 1060 | As of 2013-02, the very latest lambda 8
1060		debug="${build.debug}"
1061		debuglevel="${build.debuglevel}"
1062		deprecation="${build.deprecation}"
1063	<	source="7"
1063	>	source="${build.jsr166e.java.version}"
1064		classpath=""
1065		includeAntRuntime="false"
1066		includeJavaRuntime="false"
1067	<	executable="${javac7}"
1067	>	executable="${build.jsr166e.javac}"
1068		fork="true">
1069
1070		<include name="jsr166e/**/*.java"/>
1071		<compilerarg value="-XDignore.symbol.file=true"/>
1072		<compilerarg value="-Xlint:all"/>
1073	+	<compilerarg value="-Werror"/>
1074		<compilerarg line="${build.args}"/>
1075
1076		</javac>
1077		</target>
1078
1079	+	<!-- jsr166e: find doclint errors -->
1080	+	<target name="jsr166edoclint">
1081	+
1082	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
1083	+
1084	+	<javac srcdir="${topsrc.dir}"
1085	+	destdir="${build.jsr166e.classes.dir}"
1086	+	debug="${build.debug}"
1087	+	debuglevel="${build.debuglevel}"
1088	+	deprecation="${build.deprecation}"
1089	+	source="${build.jsr166e.java.version}"
1090	+	classpath=""
1091	+	bootclasspath="${bootclasspath7}"
1092	+	includeAntRuntime="false"
1093	+	includeJavaRuntime="false"
1094	+	executable="${javac8}"
1095	+	fork="true">
1096	+
1097	+	<include name="jsr166e/**/*.java"/>
1098	+	<compilerarg value="-XDignore.symbol.file=true"/>
1099	+	<compilerarg value="-Xlint:all"/>
1100	+	<compilerarg value="-Werror"/>
1101	+	<compilerarg value="-Xdoclint:all/protected"/>
1102	+
1103	+	</javac>
1104	+	</target>
1105	+
1106
1107		<target name="jsr166ejar"
1108		depends="jsr166ecompile"
#	Line 1091 | Line 1123 | As of 2013-02, the very latest lambda 8
1123
1124		<javadoc destdir="${jsr166edocs.dir}"
1125		packagenames="jsr166e.*"
1126	<	link="${jdkapidocs.url}"
1126	>	link="${java.api.url}"
1127		access="${build.javadoc.access}"
1128	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1129	<	source="7"
1128	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1129	>	source="${build.jsr166e.java.version}"
1130		executable="${javadoc7}">
1131	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1132		<arg value="-XDignore.symbol.file=true"/>
1133
1134		</javadoc>
1135		</target>
1136
1137
1138	<	<target name="jsr166e-test-tck"
1139	<	depends="jsr166ejar"
1140	<	description="Runs tck tests for jsr166e">
1138	>	<target name="jsr166e-tck-one-java-version"
1139	>	depends="jsr166ejar">
1140	>
1141	>	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1142
1143		<run-tck-tests
1144		tck.src.dir="${test.src.dir}/tck-jsr166e"
1145	<	target="7"
1145	>	target="${build.jsr166e.java.version}"
1146		workdir="${build.jsr166e.dir}"
1147		classes="${jsr166e.jar}"/>
1148		</target>
1149
1150	+	<target name="jsr166e-tck"
1151	+	description="Runs tck tests for jsr166e for multiple java versions">
1152	+
1153	+	<!--     <antcall target="clean"/> -->
1154	+	<!--     <antcall target="jsr166e-tck-one-java-version"> -->
1155	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1156	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1157	+	<!--     </antcall> -->
1158	+
1159	+	<antcall target="clean"/>
1160	+	<antcall target="jsr166e-tck-one-java-version">
1161	+	<param name="build.jsr166e.java.version" value="7"/>
1162	+	<param name="build.jsr166e.javac" value="${javac7}"/>
1163	+	</antcall>
1164	+
1165	+	<antcall target="clean"/>
1166	+	<antcall target="jsr166e-tck-one-java-version">
1167	+	<param name="build.jsr166e.java.version" value="6"/>
1168	+	<param name="build.jsr166e.javac" value="${javac6}"/>
1169	+	</antcall>
1170	+	</target>
1171	+
1172	+
1173	+	<target name="jsr166e-test"
1174	+	depends="jsr166e-tck"
1175	+	description="Runs all tests for jsr166e">
1176	+	</target>
1177
1178		<target name="jsr166edist"
1179		depends="jsr166edist-jar, jsr166edist-docs"
#	Line 1125 | Line 1186 | As of 2013-02, the very latest lambda 8
1186		</target>
1187
1188
1128	–	<target name="jsr166edist-clean"
1129	–	description="Removes all build and distribution products">
1130	–
1131	–	</target>
1132	–
1189		<target name="jsr166edist-jar"
1190		depends="jsr166eclean, jsr166ejar">
1191		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
#	Line 1145 | Line 1201 | As of 2013-02, the very latest lambda 8
1201
1202		<target name="lint">
1203		<antcall target="dists">
1204	+	<param name="build.javadoc.access" value="public"/>
1205	+	</antcall>
1206	+	</target>
1207	+
1208	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1209	+	<target name="lint-private">
1210	+	<antcall target="dist">
1211		<param name="build.javadoc.access" value="private"/>
1212		</antcall>
1213		</target>

Diff Legend

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