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.160 by jsr166, Sat Nov 1 14:50:26 2014 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 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 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="test-jtreg"
451		depends="jar"
452		description="Runs jtreg tests for main using the jtreg ant task">
#	Line 426 | Line 457
457		</target>
458
459		<target name="test"
460	<	depends="test-tck, test-jtreg"
460	>	depends="test-tck, test-tck-parallelism-1, test-jtreg"
461		description="Runs tck and jtreg tests for main">
462		</target>
463
#	Line 644 | 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}"
#	Line 653 | Line 684
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 732 | 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 817 | 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 903 | 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 1015 | Line 1050
1050
1051		<javadoc destdir="${jsr166edocs.dir}"
1052		packagenames="jsr166e.*"
1053	<	link="${jdkapidocs.url}"
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>

Diff Legend

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