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.213 by jsr166, Sat Jun 4 23:49:29 2016 UTC vs.
Revision 1.234 by jsr166, Sat Feb 18 18:33:42 2017 UTC

#	Line 1 | Line 1
1		<project name="jsr166" default="usage"
2	<	xmlns:if="ant:if" xmlns:unless="ant:unless">
2	>	xmlns:if="ant:if" xmlns:unless="ant:unless"
3	>	xmlns:ivy="antlib:org.apache.ivy.ant">
4
5		<description>
6		------------------------------------------------------------------------------
#	Line 17 | Line 18
18		itself.  Because the JDK version matters and because different
19		targets require different JDKs, we assume that users have created a
20		hierarchy containing:
20	–	$HOME/jdk/jdk6
21		$HOME/jdk/jdk7
22		$HOME/jdk/jdk8
23		$HOME/jdk/jdk9
24	+	$HOME/jdk/jdk10
25		where each of the above is a JDK or a symlink to same, and
25	–	$HOME/jdk/src/jdk6
26		$HOME/jdk/src/jdk7
27		$HOME/jdk/src/jdk8
28		$HOME/jdk/src/jdk9
29	+	$HOME/jdk/src/jdk10
30		where each of the above is a complete JDK source tree
31		(e.g. mercurial forest) or a symlink to same.
32
33		Alternatively, define ant variables thus:
34		ant -Djdk$N.home=... -Djdk$N.src.home=...
35	<	for $N in 6 7 8 9 ...
35	>	for $N in 7 8 9 10 ...
36
37	<	As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37	<	target is currently broken.
37	>	As of 2016-03, the sources in src/main are for jdk9+ only.
38		------------------------------------------------------------------------------
39		</description>
40
#	Line 63 | Line 63
63		<property name="build.classes.dir"           location="${build.dir}/classes"/>
64		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
65		<property name="build.loops.dir"             location="${build.dir}/loops"/>
66	–	<property name="build.reports.dir"           location="${build.dir}/reports"/>
66
67		<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68		<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
#	Line 134 | Line 133
133		<defjdklocations v="7"/>
134		<defjdklocations v="8"/>
135		<defjdklocations v="9"/>
136	+	<defjdklocations v="10"/>
137
138		<!-- Source locations -->
139		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 143 | Line 143
143		<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
144		<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
145		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
146	+	<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
147		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
148		<property name="lib.dir"              location="${basedir}/lib"/>
149		<property name="dist.dir"             location="${basedir}/dist"/>
#	Line 188 | Line 189
189		<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
190		<!-- The expected canonical location does not yet exist as of 2016-04 -->
191		<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
192	<	<property name="java9.docroot.url"      value="http://http://download.java.net/java/jdk9/docs"/>
192	>	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
193		<!-- Default jdk doc location (latest stable release seems best) -->
194		<property name="java.docroot.url"       value="${java8.docroot.url}"/>
195
#	Line 245 | Line 246
246		classpath="${junit.jar}"
247		includeAntRuntime="false"
248		includeJavaRuntime="false"
249	+	encoding="ASCII"
250		executable="${javac@{compile-target}}"
251		fork="true">
252
#	Line 252 | Line 254
254		<compilerarg value="-XDignore.symbol.file=true"/>
255		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
256		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
257	<	<compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
257	>	<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
258		<compilerarg line="${build.args}"/>
259		<javac-elements/>
260
#	Line 263 | Line 265
265		jvm="${java@{target}}"
266		fork="true">
267		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
268	<	<jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
268	>	<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
269	>	<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
270	>	<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
271	>	<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
272	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
273	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
274		<jvmarg line="@{jvmflags}"/>
275	+	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
276	+	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
277
278	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
278	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
279		<syspropertyset id="system-properties-used-by-tck">
280		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
281		<propertyref prefix="jsr166."/>
#	Line 292 | Line 301
301		<fileset dir="${jtreg8.src.dir}">
302		<patternset id="jdk8.jtreg.tests">
303		<include name="**/*.java"/>
295	–	<exclude name="**/SpliteratorCharacteristics.java"/>
296	–	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
297	–	<exclude name="**/GCDuringIteration.java"/>
304		</patternset>
305		</fileset>
306
#	Line 326 | Line 332
332		</condition>
333
334		<delete dir="@{workdir}/JTwork"   quiet="true"/>
329	–	<delete dir="@{workdir}/JTreport" quiet="true"/>
335		<jtreg dir="${jtreg@{target}.src.dir}"
336		jdk="${jdk@{target}.home}"
337	<	workDir="@{workdir}/JTwork"
333	<	reportDir="@{workdir}/JTreport">
337	>	workDir="@{workdir}/JTwork">
338		<patternset refid="jdk@{target}.jtreg.tests"/>
339		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
340	<	<arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
340	>	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
341	>	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
342		<arg value="-agentvm"/>
343	+	<arg value="-noreport"/>
344		<arg value="-verbose:${jtreg.verbose}"/>
345		<arg value="-vmoptions:-esa -ea"/>
346		<arg value="-automatic"/>
#	Line 389 | Line 395
395		classpath=""
396		includeAntRuntime="false"
397		includeJavaRuntime="false"
398	+	encoding="ASCII"
399		executable="${build.main.javac}"
400		fork="true">
401
402		<include name="**/*.java"/>
403	<	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
403	>	<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
404		<compilerarg value="-Xprefer:source"/>
405		<compilerarg value="-XDignore.symbol.file=true"/>
406		<compilerarg value="-Xlint:all"/>
#	Line 430 | Line 437
437		<!-- the packagenames="none" hack below prevents scanning the -->
438		<!-- sourcepath for packages -->
439
440	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
441	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
442	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
443	+	<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
444	+	<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
445		<javadoc destdir="${docs.dir}"
446		packagenames="none"
447		link="${java9.api.url}"
448		overview="${src.dir}/intro.html"
449		access="${build.javadoc.access}"
450	<	sourcepath="${src.dir}:${jdk9.src.dir}"
450	>	sourcepath="${src.dir}"
451		classpath=""
452		executable="${javadoc9}">
453		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 444 | Line 456
456		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
457		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
458		<arg value="-XDignore.symbol.file=true"/>
459	<	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
459	>	<arg value="--patch-module=java.base=${src.dir}"/>
460		<arg value="-tag"/>
461		<arg value="${javadoc.jls.option}"/>
462	+	<!-- @apiNote currently unused -->
463	+	<!--       <arg value="-tag"/> -->
464	+	<!--       <arg value="apiNote:a:API Note:"/> -->
465		<arg value="-tag"/>
466	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
466	>	<arg value="implSpec:a:Implementation Requirements:"/>
467		<arg value="-tag"/>
468	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
469	<	<arg value="-tag"/>
470	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
471	<	<!-- tags added in jdk9 -->
472	<	<arg value="-tag"/>
473	<	<arg value="revised:X"/>
459	<	<arg value="-tag"/>
460	<	<arg value="spec:X"/>
468	>	<arg value="implNote:a:Implementation Note:"/>
469	>	<!-- tags added in jdk9: currently unused -->
470	>	<!--       <arg value="-tag"/> -->
471	>	<!--       <arg value="revised:X"/> -->
472	>	<!--       <arg value="-tag"/> -->
473	>	<!--       <arg value="spec:X"/> -->
474		</javadoc>
475		</target>
476
#	Line 627 | Line 640
640		deprecation="${build.deprecation}"
641		source="${build.sourcelevel}"
642		target="${build.sourcelevel}"
643	+	encoding="ASCII"
644		fork="true">
645
646		<compilerarg line="${build.args}"/>
#	Line 654 | Line 668
668		deprecation="${build.deprecation}"
669		includeAntRuntime="false"
670		includeJavaRuntime="false"
671	+	encoding="ASCII"
672		executable="${javac9}"
673		fork="true">
674
#	Line 687 | Line 702
702		bootclasspath="${bootclasspath8}"
703		includeAntRuntime="false"
704		includeJavaRuntime="false"
705	+	encoding="ASCII"
706		executable="${javac8}"
707		fork="true">
708
#	Line 717 | Line 733
733		bootclasspath="${bootclasspath8}"
734		includeAntRuntime="false"
735		includeJavaRuntime="false"
736	+	encoding="ASCII"
737		executable="${javac8}"
738		fork="true">
739
#	Line 801 | Line 818
818		<arg value="-XDignore.symbol.file=true"/>
819		<arg value="-tag"/>
820		<arg value="${javadoc.jls.option}"/>
821	<	<arg value="-tag"/>
822	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
821	>	<!-- @apiNote currently unused -->
822	>	<!--       <arg value="-tag"/> -->
823	>	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
824		<arg value="-tag"/>
825		<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
826		<arg value="-tag"/>
#	Line 856 | Line 874
874		bootclasspath="${bootclasspath6}"
875		includeAntRuntime="false"
876		includeJavaRuntime="false"
877	+	encoding="ASCII"
878		executable="${javac7}"
879		fork="true">
880
#	Line 886 | Line 905
905		bootclasspath="${bootclasspath6}"
906		includeAntRuntime="false"
907		includeJavaRuntime="false"
908	+	encoding="ASCII"
909		executable="${javac8}"
910		fork="true">
911
#	Line 1053 | Line 1073
1073		target="5"
1074		includeAntRuntime="false"
1075		includeJavaRuntime="false"
1076	+	encoding="ASCII"
1077		executable="${javac7}"
1078		fork="true">
1079
#	Line 1146 | Line 1167
1167		bootclasspath="${bootclasspath6}"
1168		includeAntRuntime="false"
1169		includeJavaRuntime="false"
1170	+	encoding="ASCII"
1171		executable="${javac7}"
1172		fork="true">
1173
#	Line 1240 | Line 1262
1262		target="6"
1263		includeAntRuntime="false"
1264		includeJavaRuntime="false"
1265	+	encoding="ASCII"
1266		executable="${javac7}"
1267		fork="true">
1268
#	Line 1487 | Line 1510
1510		</antcall>
1511		</target>
1512
1513	+	<!-- ==============================================================
1514	+	Running guava tests against jsr166 code
1515	+	=================================================================== -->
1516	+
1517	+	<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1518	+	<!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1519	+	<!-- <property name="guava.version" value="21.0"/> -->
1520	+
1521	+	<!-- HOWTO debug print a path id -->
1522	+	<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1523	+	<!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1524	+
1525	+	<!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1526	+	<!--   organisation="com.google.guava" module="guava-tests"/> -->
1527	+	<!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1528	+	<!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1529	+	<!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1530	+	<!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1531	+
1532	+	<!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1533	+	<!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1534	+	<!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1535	+	<!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1536	+
1537	+	<!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1538	+	<!--   type="*" inline="true" conf="*(private),*(public)" -->
1539	+	<!--   pattern="${guava.dir}/[artifact].[ext]" -->
1540	+	<!--   organisation="com.google.guava" module="guava-testlib"/> -->
1541	+
1542	+	<!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1543	+	<!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1544	+	<!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1545	+
1546	+	<target name="init-ivy">
1547	+	<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1548	+	dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1549	+	<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1550	+	classpath="${build.dir}/ivy.jar"/>
1551	+	</target>
1552	+
1553	+	<target name="guava-tests" depends="jar, init-ivy"
1554	+	description="Guava tests run against jsr166 collections">
1555	+	<property name="guava.dir" value="${build.dir}/guava-testlib"/>
1556	+	<mkdir dir="${guava.dir}"/>
1557	+	<ivy:retrieve pathid="guava.testlib.classpath"
1558	+	type="jar,bundle" inline="true" conf="default,master"
1559	+	pattern="${guava.dir}/[artifact].[ext]"
1560	+	organisation="com.google.guava" module="guava-testlib"/>
1561	+	<property name="guava.version" value="21.0"/>
1562	+	<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1563	+	dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1564	+	<junit printsummary="true" showoutput="true" haltonfailure="true"
1565	+	jvm="${java9}" fork="true">
1566	+	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1567	+	<formatter type="brief"/>
1568	+	<classpath>
1569	+	<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1570	+	<path refid="guava.testlib.classpath"/>
1571	+	</classpath>
1572	+
1573	+	<!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1574	+	<test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1575	+	</junit>
1576	+	</target>
1577
1578		</project>

Diff Legend

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