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.249 by jsr166, Mon Jul 3 20:36:55 2017 UTC vs.
Revision 1.263 by jsr166, Tue Jan 23 06:09:53 2018 UTC

#	Line 21 | Line 21
21		$HOME/jdk/jdk8
22		$HOME/jdk/jdk9
23		$HOME/jdk/jdk10
24	+	$HOME/jdk/jdk11
25		where each of the above is a JDK or a symlink to same, and
26		$HOME/jdk/src/jdk8
27		$HOME/jdk/src/jdk9
28		$HOME/jdk/src/jdk10
29	+	$HOME/jdk/src/jdk11
30		where each of the above is a complete JDK source tree
31		(e.g. mercurial forest) or a symlink to same.
32
#	Line 132 | Line 134
134		<defjdklocations v="8"/>
135		<defjdklocations v="9"/>
136		<defjdklocations v="10"/>
137	+	<defjdklocations v="11"/>
138
139		<!-- Source locations -->
140		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 142 | Line 145
145		<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
146		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
147		<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
148	+	<property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
149		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
150		<property name="lib.dir"              location="${basedir}/lib"/>
151		<property name="dist.dir"             location="${basedir}/dist"/>
#	Line 181 | Line 185
185		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
186
187		<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
188	<	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
189	<	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
190	<	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
191	<	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
192	<	<!-- The expected canonical location does not yet exist as of 2016-04 -->
193	<	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
194	<	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
188	>	<!-- Switched to https: in 2017-10 - JDK-8190312 -->
189	>	<property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
190	>	<property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
191	>	<property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
192	>	<property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
193	>	<property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
194	>	<!-- The location of jdk9 early access docs (RIP) -->
195	>	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
196		<!-- Default jdk doc location (latest stable release seems best) -->
197	<	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
197	>	<property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
198	>	<property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
199	>	<property name="java.docroot.url"   value="${java9.docroot.url}"/>
200
201		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
202		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 197 | Line 204
204		<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
205		<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
206		<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
207	+	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
208	+	<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
209		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
210
211		<!-- Define the "jtreg" task -->
#	Line 296 | Line 305
305		</macrodef>
306
307		<!-- Define jtreg test sets for different jdk versions -->
308	+	<fileset dir="${jtreg11.src.dir}">
309	+	<patternset id="jdk11.jtreg.tests">
310	+	<include name="**/*.java"/>
311	+	</patternset>
312	+	</fileset>
313	+
314		<fileset dir="${jtreg10.src.dir}">
315		<patternset id="jdk10.jtreg.tests">
316		<include name="**/*.java"/>
#	Line 328 | Line 343
343		<attribute name="target"/>
344		<attribute name="workdir"/>
345		<attribute name="classes"/>
346	+	<attribute name="verbose" default="${jtreg.verbose}"/>
347		<attribute name="jtregflags" default=""/>
348	+	<element name="jtreg-elements" optional="true"/>
349
350		<sequential>
351
#	Line 346 | Line 363
363		workDir="@{workdir}/JTwork">
364		<patternset refid="jdk@{target}.jtreg.tests"/>
365		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
366	<	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
367	<	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
366	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
367	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
368		<arg value="-agentvm"/>
369		<arg value="-noreport"/>
370	<	<arg value="-verbose:${jtreg.verbose}"/>
370	>	<arg value="-verbose:@{verbose}"/>
371		<arg value="-vmoptions:-esa -ea"/>
372		<arg value="-automatic"/>
373		<arg value="-k:!ignore"/>
374		<arg line="@{jtregflags}"/>
375		<arg line="${jtreg.flags}"/>
376	+	<jtreg-elements/>
377		</jtreg>
378		</sequential>
379		</macrodef>
#	Line 597 | Line 615
615
616		<!--   </target> -->
617
618	<	<target name="test910"
618	>	<target name="test91011"
619		description="Runs tck and jtreg tests for src/main for multiple java versions">
620
621		<antcall target="clean"/>
#	Line 610 | Line 628
628		<param name="build.main.java.version" value="10"/>
629		</antcall>
630
631	+	<antcall target="clean"/>
632	+	<antcall target="test">
633	+	<param name="build.main.java.version" value="11"/>
634	+	</antcall>
635	+
636	+	<!-- Clean up to avoid obscure wrong class file version bugs -->
637	+	<antcall target="clean"/>
638	+
639		</target>
640
641
#	Line 1374 | Line 1400
1400		<!-- ==============================================================
1401		Experimental errorprone support - http://errorprone.info
1402		=================================================================== -->
1403	+	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1404	+	<property name="errorprone.jsr166.flags"
1405	+	value="-Xep:HashtableContains:OFF
1406	+	-Xep:JdkObsolete:OFF
1407	+	-Xep:MissingOverride:OFF
1408	+	-Xep:MissingFail:OFF
1409	+	-Xep:MixedArrayDimensions:ERROR
1410	+	-Xep:RemoveUnusedImports:ERROR
1411	+	-Xep:EmptyIf:ERROR
1412	+	-Xep:MultipleTopLevelClasses:ERROR
1413	+	-Xep:ClassName:ERROR
1414	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1415	+	-Xep:RedundantThrows:ERROR
1416	+	-Xep:IdentityBinaryExpression:WARN
1417	+	-Xep:MethodCanBeStatic:WARN"/>
1418	+	<!-- -Xep:WildcardImport:ERROR -->
1419	+	<property name="errorprone.jsr166.test.flags"
1420	+	value="-Xep:StringSplitter:OFF
1421	+	-Xep:BoxedPrimitiveConstructor:OFF
1422	+	-Xep:ModifyingCollectionWithItself:OFF"/>
1423	+	<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1424		<target name="errorprone"
1425		depends="clean, configure-compiler"
1426		description="Run errorprone over jsr166 source code (experimental)">
#	Line 1395 | Line 1442
1442		fork="true">
1443
1444		<include name="**/*.java"/>
1445	<	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/>
1445	>	<compilerarg line="-processorpath ${errorprone.jar}"/>
1446		<compilerarg value="-Xplugin:ErrorProne
1447	<	-Xep:IdentityBinaryExpression:WARN
1401	<	-Xep:MissingOverride:OFF
1402	<	-Xep:MixedArrayDimensions:WARN
1403	<	-Xep:RemoveUnusedImports:ERROR
1404	<	-Xep:ClassName:ERROR
1405	<	-Xep:MultipleTopLevelClasses:ERROR
1406	<	-Xep:EmptyIf:ERROR
1407	<	-Xep:LongLiteralLowerCaseSuffix:ERROR
1408	<	-Xep:RedundantThrows:ERROR
1409	<	-Xep:MethodCanBeStatic:WARN"/>
1447	>	${errorprone.jsr166.flags}"/>
1448		<compilerarg value="--patch-module=java.base=${src.dir}"/>
1449		<compilerarg value="-Xprefer:source"/>
1450		<compilerarg value="-XDignore.symbol.file=true"/>
#	Line 1425 | Line 1463
1463		workdir="${build.dir}"
1464		classes="${product.jar}">
1465		<javac-elements>
1466	<	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/>
1466	>	<compilerarg line="-processorpath ${errorprone.jar}"/>
1467		<compilerarg value="-Xplugin:ErrorProne
1468	<	-Xep:IdentityBinaryExpression:WARN
1469	<	-Xep:BoxedPrimitiveConstructor:OFF
1432	<	-Xep:HashtableContains:OFF
1433	<	-Xep:ModifyingCollectionWithItself:OFF
1434	<	-Xep:MissingOverride:OFF
1435	<	-Xep:MixedArrayDimensions:WARN
1436	<	-Xep:RemoveUnusedImports:ERROR
1437	<	-Xep:ClassName:ERROR
1438	<	-Xep:MultipleTopLevelClasses:ERROR
1439	<	-Xep:EmptyIf:ERROR
1440	<	-Xep:LongLiteralLowerCaseSuffix:ERROR
1441	<	-Xep:RedundantThrows:ERROR
1442	<	-Xep:MethodCanBeStatic:WARN"/>
1468	>	${errorprone.jsr166.flags}
1469	>	${errorprone.jsr166.test.flags}"/>
1470		<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1471		</javac-elements>
1472		</run-tck-tests>
1473		</target>
1474
1475	+	<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1476	+	<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1477	+	<target name="errorprone-jtreg"
1478	+	depends="jar"
1479	+	description="Run errorprone over jtreg tests (experimental)">
1480	+
1481	+	<run-jtreg-tests
1482	+	target="${build.main.java.version}"
1483	+	workdir="${build.dir}"
1484	+	classes="${product.jar}"
1485	+	verbose="all">
1486	+	<jtreg-elements>
1487	+	<arg value="-javacoption:-XDcompilePolicy=byfile"/>
1488	+	<arg value="-javacoption:-processorpath"/>
1489	+	<arg value="-javacoption:${errorprone.jar}"/>
1490	+	<arg value="-javacoption:-Xplugin:ErrorProne
1491	+	${errorprone.jsr166.flags}
1492	+	${errorprone.jsr166.test.flags}
1493	+	-Xep:NonAtomicVolatileUpdate:OFF"/>
1494	+	</jtreg-elements>
1495	+	</run-jtreg-tests>
1496	+	</target>
1497	+
1498
1499		<!-- ==============================================================
1500		Running guava tests against jsr166 code
#	Line 1499 | Line 1549
1549		dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1550		<junit printsummary="true" showoutput="true" haltonfailure="true"
1551		jvm="${build.main.java}" fork="true">
1552	<	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1552	>	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1553		<formatter type="brief"/>
1554		<classpath>
1555		<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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