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.151 by jsr166, Sun Feb 16 14:25:46 2014 UTC vs.
Revision 1.163 by jsr166, Fri Feb 20 22:33:13 2015 UTC

#	Line 24 | Line 24
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
#	Line 46 | Line 50
50		<property name="build.deprecation"    value="false"/>
51		<property name="build.javadoc.access" value="protected"/>
52
53	<	<!-- Tck options; see JSR166TestCase.java -->
54	<	<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
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"/>
54	–	<!-- Allow running an individual tck test class -->
55	–	<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
62		<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63
64		<!-- Build locations -->
#	Line 157 | 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 expected canonical location does not yet exist as of 2014-02 -->
173	<	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
174	<
175	<	<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/"/> -->
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 190 | Line 199
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
#	Line 204 | Line 213
213		source="@{compile-target}"
214		target="@{compile-target}"
215		classpath="${junit.jar}"
207	–	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
216		includeAntRuntime="false"
217		includeJavaRuntime="false"
218		executable="${javac@{compile-target}}"
#	Line 213 | Line 221
221		<include name="*.java"/>
222		<compilerarg value="-XDignore.symbol.file=true"/>
223		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
224	+	<compilerarg value="-Xbootclasspath/p:@{classes}"/>
225		<compilerarg line="${build.args}"/>
226		<javac-elements/>
227
#	Line 224 | Line 233
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}"/>
#	Line 237 | Line 252
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"/>
#	Line 332 | Line 348
348
349		<javadoc destdir="${docs.dir}"
350		packagenames="none"
351	<	link="${jdkapi9docs.url}"
351	>	link="${java9.api.url}"
352		overview="${src.dir}/intro.html"
353		access="${build.javadoc.access}"
354		sourcepath="${src.dir}:${jdk9src.dir}"
#	Line 341 | Line 357
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"/>
#	Line 405 | Line 422
422		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
423		</target>
424
425	<
425	>	<target name="tck" depends="test-tck" description="alias for test-tck"/>
426		<target name="test-tck"
427		depends="jar"
428		description="Runs tck tests for main directly">
#	Line 416 | Line 433
433		classes="${product.jar}"/>
434		</target>
435
436	+	<target name="test-tck-parallelism-1"
437	+	description="Runs test-tck with given common pool parallelism">
438	+	<antcall target="test-tck">
439	+	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
440	+	</antcall>
441	+	</target>
442	+
443	+	<target name="test-tck-parallelism-0"
444	+	description="Runs test-tck with given common pool parallelism">
445	+	<antcall target="test-tck">
446	+	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
447	+	</antcall>
448	+	</target>
449	+
450	+	<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
451		<target name="test-jtreg"
452		depends="jar"
453		description="Runs jtreg tests for main using the jtreg ant task">
#	Line 426 | Line 458
458		</target>
459
460		<target name="test"
461	<	depends="test-tck, test-jtreg"
461	>	depends="test-tck, test-tck-parallelism-1, test-jtreg"
462		description="Runs tck and jtreg tests for main">
463		</target>
464
#	Line 644 | Line 676
676
677		<javadoc destdir="${4jdk7docs.dir}"
678		packagenames="none"
679	<	link="${jdkapi7docs.url}"
679	>	link="${java7.api.url}"
680		overview="${4jdk7src.dir}/intro.html"
681		access="${build.javadoc.access}"
682		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
#	Line 653 | Line 685
685		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
686		<include name="**/*.java"/>
687		</fileset>
688	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
689		<arg value="-XDignore.symbol.file=true"/>
690		</javadoc>
691		</target>
#	Line 732 | Line 765
765
766		<javadoc destdir="${jsr166xdocs.dir}"
767		packagenames="jsr166x.*"
768	<	link="${jdkapidocs.url}"
768	>	link="${java.api.url}"
769		access="${build.javadoc.access}"
770		sourcepath="${topsrc.dir}:${jdk6src.dir}"
771		bootclasspath="${bootclasspath6}"
772		source="5"
773		executable="${javadoc7}">
774	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
775		<arg value="-XDignore.symbol.file=true"/>
776
777		</javadoc>
#	Line 817 | Line 851
851
852		<javadoc destdir="${jsr166ydocs.dir}"
853		packagenames="jsr166y.*"
854	<	link="${jdkapidocs.url}"
854	>	link="${java.api.url}"
855		access="${build.javadoc.access}"
856		sourcepath="${topsrc.dir}:${jdk6src.dir}"
857		bootclasspath="${bootclasspath6}"
858		source="6"
859		executable="${javadoc7}">
860	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
861		<arg value="-XDignore.symbol.file=true"/>
862
863		</javadoc>
#	Line 903 | Line 938
938
939		<javadoc destdir="${extra166ydocs.dir}"
940		packagenames="extra166y.*"
941	<	link="${jdkapidocs.url}"
941	>	link="${java.api.url}"
942		access="${build.javadoc.access}"
943		sourcepath="${topsrc.dir}:${jdk6src.dir}"
944		bootclasspath="${bootclasspath6}"
945		source="6"
946		executable="${javadoc7}">
947	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
948		<arg value="-XDignore.symbol.file=true"/>
949
950		</javadoc>
#	Line 1015 | Line 1051
1051
1052		<javadoc destdir="${jsr166edocs.dir}"
1053		packagenames="jsr166e.*"
1054	<	link="${jdkapidocs.url}"
1054	>	link="${java.api.url}"
1055		access="${build.javadoc.access}"
1056		sourcepath="${topsrc.dir}:${jdk6src.dir}"
1057		source="${build.jsr166e.java.version}"
1058		executable="${javadoc7}">
1059	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1060		<arg value="-XDignore.symbol.file=true"/>
1061
1062		</javadoc>
#	Line 1092 | Line 1129
1129
1130		<target name="lint">
1131		<antcall target="dists">
1132	+	<param name="build.javadoc.access" value="public"/>
1133	+	</antcall>
1134	+	</target>
1135	+
1136	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1137	+	<target name="lint-private">
1138	+	<antcall target="dist">
1139		<param name="build.javadoc.access" value="private"/>
1140		</antcall>
1141		</target>

Diff Legend

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