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.217 by jsr166, Tue Aug 30 02:41:07 2016 UTC vs.
Revision 1.229 by jsr166, Tue Dec 20 04:18:46 2016 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 63 | Line 64
64		<property name="build.classes.dir"           location="${build.dir}/classes"/>
65		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
66		<property name="build.loops.dir"             location="${build.dir}/loops"/>
66	–	<property name="build.reports.dir"           location="${build.dir}/reports"/>
67
68		<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
69		<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
#	Line 245 | Line 245
245		classpath="${junit.jar}"
246		includeAntRuntime="false"
247		includeJavaRuntime="false"
248	+	encoding="ASCII"
249		executable="${javac@{compile-target}}"
250		fork="true">
251
#	Line 252 | Line 253
253		<compilerarg value="-XDignore.symbol.file=true"/>
254		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
255		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
256	<	<compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
256	>	<compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
257		<compilerarg line="${build.args}"/>
258		<javac-elements/>
259
#	Line 263 | Line 264
264		jvm="${java@{target}}"
265		fork="true">
266		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
267	<	<jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
267	>	<jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
268	>	<jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
269	>	<jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
270	>	<jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
271	>	<jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
272		<jvmarg line="@{jvmflags}"/>
273		<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
274		<jvmarg line="${vmoptions}" if:set="vmoptions"/>
#	Line 294 | Line 299
299		<fileset dir="${jtreg8.src.dir}">
300		<patternset id="jdk8.jtreg.tests">
301		<include name="**/*.java"/>
297	–	<exclude name="**/SpliteratorCharacteristics.java"/>
298	–	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
299	–	<exclude name="**/GCDuringIteration.java"/>
302		</patternset>
303		</fileset>
304
#	Line 328 | Line 330
330		</condition>
331
332		<delete dir="@{workdir}/JTwork"   quiet="true"/>
331	–	<delete dir="@{workdir}/JTreport" quiet="true"/>
333		<jtreg dir="${jtreg@{target}.src.dir}"
334		jdk="${jdk@{target}.home}"
335	<	workDir="@{workdir}/JTwork"
335	<	reportDir="@{workdir}/JTreport">
335	>	workDir="@{workdir}/JTwork">
336		<patternset refid="jdk@{target}.jtreg.tests"/>
337		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
338	<	<arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
338	>	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
339	>	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
340		<arg value="-agentvm"/>
341	+	<arg value="-noreport"/>
342		<arg value="-verbose:${jtreg.verbose}"/>
343		<arg value="-vmoptions:-esa -ea"/>
344		<arg value="-automatic"/>
#	Line 391 | Line 393
393		classpath=""
394		includeAntRuntime="false"
395		includeJavaRuntime="false"
396	+	encoding="ASCII"
397		executable="${build.main.javac}"
398		fork="true">
399
#	Line 432 | Line 435
435		<!-- the packagenames="none" hack below prevents scanning the -->
436		<!-- sourcepath for packages -->
437
438	<	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
439	<	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
438	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
439	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
440	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
441	>	<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
442	>	<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
443		<javadoc destdir="${docs.dir}"
444		packagenames="none"
445		link="${java9.api.url}"
#	Line 451 | Line 457
457		<arg value="-Xmodule:java.base"/>
458		<arg value="-tag"/>
459		<arg value="${javadoc.jls.option}"/>
460	+	<!-- @apiNote currently unused -->
461	+	<!--       <arg value="-tag"/> -->
462	+	<!--       <arg value="apiNote:a:API Note:"/> -->
463		<arg value="-tag"/>
464	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
464	>	<arg value="implSpec:a:Implementation Requirements:"/>
465		<arg value="-tag"/>
466	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
467	<	<arg value="-tag"/>
468	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
469	<	<!-- tags added in jdk9 -->
470	<	<arg value="-tag"/>
471	<	<arg value="revised:X"/>
463	<	<arg value="-tag"/>
464	<	<arg value="spec:X"/>
466	>	<arg value="implNote:a:Implementation Note:"/>
467	>	<!-- tags added in jdk9: currently unused -->
468	>	<!--       <arg value="-tag"/> -->
469	>	<!--       <arg value="revised:X"/> -->
470	>	<!--       <arg value="-tag"/> -->
471	>	<!--       <arg value="spec:X"/> -->
472		</javadoc>
473		</target>
474
#	Line 631 | Line 638
638		deprecation="${build.deprecation}"
639		source="${build.sourcelevel}"
640		target="${build.sourcelevel}"
641	+	encoding="ASCII"
642		fork="true">
643
644		<compilerarg line="${build.args}"/>
#	Line 658 | Line 666
666		deprecation="${build.deprecation}"
667		includeAntRuntime="false"
668		includeJavaRuntime="false"
669	+	encoding="ASCII"
670		executable="${javac9}"
671		fork="true">
672
#	Line 691 | Line 700
700		bootclasspath="${bootclasspath8}"
701		includeAntRuntime="false"
702		includeJavaRuntime="false"
703	+	encoding="ASCII"
704		executable="${javac8}"
705		fork="true">
706
#	Line 721 | Line 731
731		bootclasspath="${bootclasspath8}"
732		includeAntRuntime="false"
733		includeJavaRuntime="false"
734	+	encoding="ASCII"
735		executable="${javac8}"
736		fork="true">
737
#	Line 805 | Line 816
816		<arg value="-XDignore.symbol.file=true"/>
817		<arg value="-tag"/>
818		<arg value="${javadoc.jls.option}"/>
819	<	<arg value="-tag"/>
820	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
819	>	<!-- @apiNote currently unused -->
820	>	<!--       <arg value="-tag"/> -->
821	>	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
822		<arg value="-tag"/>
823		<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
824		<arg value="-tag"/>
#	Line 860 | Line 872
872		bootclasspath="${bootclasspath6}"
873		includeAntRuntime="false"
874		includeJavaRuntime="false"
875	+	encoding="ASCII"
876		executable="${javac7}"
877		fork="true">
878
#	Line 890 | Line 903
903		bootclasspath="${bootclasspath6}"
904		includeAntRuntime="false"
905		includeJavaRuntime="false"
906	+	encoding="ASCII"
907		executable="${javac8}"
908		fork="true">
909
#	Line 1057 | Line 1071
1071		target="5"
1072		includeAntRuntime="false"
1073		includeJavaRuntime="false"
1074	+	encoding="ASCII"
1075		executable="${javac7}"
1076		fork="true">
1077
#	Line 1150 | Line 1165
1165		bootclasspath="${bootclasspath6}"
1166		includeAntRuntime="false"
1167		includeJavaRuntime="false"
1168	+	encoding="ASCII"
1169		executable="${javac7}"
1170		fork="true">
1171
#	Line 1244 | Line 1260
1260		target="6"
1261		includeAntRuntime="false"
1262		includeJavaRuntime="false"
1263	+	encoding="ASCII"
1264		executable="${javac7}"
1265		fork="true">
1266
#	Line 1491 | Line 1508
1508		</antcall>
1509		</target>
1510
1511	+	<!-- ==============================================================
1512	+	Running guava tests against jsr166 code
1513	+	=================================================================== -->
1514	+
1515	+	<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1516	+	<!--   organisation="com.google.guava" module="guava-testlib" revision="21.0-rc1"/> -->
1517	+	<!-- <property name="guava.version" value="20.0"/> -->
1518	+
1519	+	<!-- HOWTO debug print a path id -->
1520	+	<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1521	+	<!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1522	+
1523	+	<!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1524	+	<!--   organisation="com.google.guava" module="guava-tests"/> -->
1525	+	<!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1526	+	<!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1527	+	<!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1528	+	<!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1529	+
1530	+	<!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1531	+	<!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1532	+	<!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1533	+	<!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1534	+
1535	+	<!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1536	+	<!--   type="*" inline="true" conf="*(private),*(public)" -->
1537	+	<!--   pattern="${guava.dir}/[artifact].[ext]" -->
1538	+	<!--   organisation="com.google.guava" module="guava-testlib"/> -->
1539	+
1540	+	<!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1541	+	<!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1542	+	<!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1543	+
1544	+	<target name="init-ivy">
1545	+	<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1546	+	dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1547	+	<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1548	+	classpath="${build.dir}/ivy.jar"/>
1549	+	</target>
1550	+
1551	+	<target name="guava-tests" depends="jar, init-ivy"
1552	+	description="Guava tests run against jsr166 collections">
1553	+	<property name="guava.dir" value="${build.dir}/guava-testlib"/>
1554	+	<mkdir dir="${guava.dir}"/>
1555	+	<ivy:retrieve pathid="guava.testlib.classpath"
1556	+	type="jar,bundle" inline="true" conf="default,master"
1557	+	pattern="${guava.dir}/[artifact].[ext]"
1558	+	organisation="com.google.guava" module="guava-testlib"/>
1559	+	<property name="guava.version" value="21.0-rc1"/>
1560	+	<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1561	+	dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1562	+	<junit printsummary="true" showoutput="true" haltonfailure="true"
1563	+	jvm="${java9}" fork="true">
1564	+	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1565	+	<formatter type="brief"/>
1566	+	<classpath>
1567	+	<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1568	+	<path refid="guava.testlib.classpath"/>
1569	+	</classpath>
1570	+
1571	+	<!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1572	+	<test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1573	+	</junit>
1574	+	</target>
1575
1576		</project>

Diff Legend

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