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.260 by jsr166, Sun Dec 24 22:17:17 2017 UTC vs.
Revision 1.265 by jsr166, Sun Feb 4 20:00:47 2018 UTC

#	Line 396 | Line 396
396		<sequential>
397		<property name="build.main.java"    value="${java@{v}}"/>
398		<property name="build.main.javac"   value="${javac@{v}}"/>
399	<	<property name="build.main.javadoc" value="${javadoc@{v}}"/>
399	>	<!-- Force javadoc version to be at least 10,
400	>	so we can use override-methods=summary -->
401	>	<condition property="build.main.javadoc"
402	>	value="${javadoc10}"
403	>	else="${javadoc@{v}}">
404	>	<equals arg1="@{v}" arg2="9"/>
405	>	</condition>
406		</sequential>
407		</macrodef>
408		<define-build-main-properties v="${build.main.java.version}"/>
#	Line 490 | Line 496
496		<arg value="-XDignore.symbol.file=true"/>
497		<arg value="-html5"/>
498		<arg value="--patch-module=java.base=${src.dir}"/>
499	<	<arg value="-tag"/>
500	<	<arg value="${javadoc.jls.option}"/>
501	<	<!-- @apiNote currently unused -->
502	<	<!--       <arg value="-tag"/> -->
503	<	<!--       <arg value="apiNote:a:API Note:"/> -->
504	<	<arg value="-tag"/>
499	<	<arg value="implSpec:a:Implementation Requirements:"/>
500	<	<arg value="-tag"/>
501	<	<arg value="implNote:a:Implementation Note:"/>
499	>	<arg value="--override-methods=summary"/>
500	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
501	>	<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
502	>	<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
503	>	<!-- @apiNote tag currently unused -->
504	>	<!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
505		<!-- tags added in jdk9: currently unused -->
506	<	<!--       <arg value="-tag"/> -->
507	<	<!--       <arg value="revised:X"/> -->
505	<	<!--       <arg value="-tag"/> -->
506	<	<!--       <arg value="spec:X"/> -->
506	>	<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
507	>	<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
508		</javadoc>
509		</target>
510
#	Line 845 | Line 846
846		</fileset>
847		<arg line="-Xdocrootparent ${java8.docroot.url}"/>
848		<arg value="-XDignore.symbol.file=true"/>
849	<	<arg value="-tag"/>
850	<	<arg value="${javadoc.jls.option}"/>
851	<	<!-- @apiNote currently unused -->
852	<	<!--       <arg value="-tag"/> -->
853	<	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
853	<	<arg value="-tag"/>
854	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
855	<	<arg value="-tag"/>
856	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
849	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
850	>	<arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
851	>	<arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
852	>	<!-- @apiNote tag currently unused -->
853	>	<!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
854		</javadoc>
855		</target>
856
#	Line 1400 | Line 1397
1397		<!-- ==============================================================
1398		Experimental errorprone support - http://errorprone.info
1399		=================================================================== -->
1400	<	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.1.2.jar"/>
1400	>	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1401	>	<property name="errorprone.jsr166.flags"
1402	>	value="-Xep:HashtableContains:OFF
1403	>	-Xep:JdkObsolete:OFF
1404	>	-Xep:MissingOverride:OFF
1405	>	-Xep:MissingFail:OFF
1406	>	-Xep:MixedArrayDimensions:ERROR
1407	>	-Xep:RemoveUnusedImports:ERROR
1408	>	-Xep:EmptyIf:ERROR
1409	>	-Xep:MultipleTopLevelClasses:ERROR
1410	>	-Xep:ClassName:ERROR
1411	>	-Xep:LongLiteralLowerCaseSuffix:ERROR
1412	>	-Xep:RedundantThrows:ERROR
1413	>	-Xep:IdentityBinaryExpression:WARN
1414	>	-Xep:MethodCanBeStatic:WARN"/>
1415	>	<!-- -Xep:WildcardImport:ERROR -->
1416	>	<property name="errorprone.jsr166.test.flags"
1417	>	value="-Xep:StringSplitter:OFF
1418	>	-Xep:BoxedPrimitiveConstructor:OFF
1419	>	-Xep:ModifyingCollectionWithItself:OFF"/>
1420	>	<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1421		<target name="errorprone"
1422		depends="clean, configure-compiler"
1423		description="Run errorprone over jsr166 source code (experimental)">
#	Line 1422 | Line 1439
1439		fork="true">
1440
1441		<include name="**/*.java"/>
1442	+	<compilerarg value="-XDcompilePolicy=simple"/>
1443		<compilerarg line="-processorpath ${errorprone.jar}"/>
1444		<compilerarg value="-Xplugin:ErrorProne
1445	<	-Xep:IdentityBinaryExpression:WARN
1428	<	-Xep:MissingOverride:OFF
1429	<	-Xep:MixedArrayDimensions:ERROR
1430	<	-Xep:RemoveUnusedImports:ERROR
1431	<	-Xep:ClassName:ERROR
1432	<	-Xep:MultipleTopLevelClasses:ERROR
1433	<	-Xep:EmptyIf:ERROR
1434	<	-Xep:LongLiteralLowerCaseSuffix:ERROR
1435	<	-Xep:RedundantThrows:ERROR
1436	<	-Xep:MethodCanBeStatic:WARN"/>
1445	>	${errorprone.jsr166.flags}"/>
1446		<compilerarg value="--patch-module=java.base=${src.dir}"/>
1447		<compilerarg value="-Xprefer:source"/>
1448		<compilerarg value="-XDignore.symbol.file=true"/>
#	Line 1452 | Line 1461
1461		workdir="${build.dir}"
1462		classes="${product.jar}">
1463		<javac-elements>
1464	+	<compilerarg value="-XDcompilePolicy=simple"/>
1465		<compilerarg line="-processorpath ${errorprone.jar}"/>
1466		<compilerarg value="-Xplugin:ErrorProne
1467	<	-Xep:IdentityBinaryExpression:WARN
1468	<	-Xep:BoxedPrimitiveConstructor:OFF
1459	<	-Xep:HashtableContains:OFF
1460	<	-Xep:ModifyingCollectionWithItself:OFF
1461	<	-Xep:MissingOverride:OFF
1462	<	-Xep:MissingFail:OFF
1463	<	-Xep:JdkObsolete:OFF
1464	<	-Xep:MixedArrayDimensions:ERROR
1465	<	-Xep:RemoveUnusedImports:ERROR
1466	<	-Xep:ClassName:ERROR
1467	<	-Xep:MultipleTopLevelClasses:ERROR
1468	<	-Xep:EmptyIf:ERROR
1469	<	-Xep:LongLiteralLowerCaseSuffix:ERROR
1470	<	-Xep:RedundantThrows:ERROR
1471	<	-Xep:MethodCanBeStatic:WARN"/>
1467	>	${errorprone.jsr166.flags}
1468	>	${errorprone.jsr166.test.flags}"/>
1469		<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1470		</javac-elements>
1471		</run-tck-tests>
1472		</target>
1473
1474	<	<!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1474	>	<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1475	>	<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1476		<target name="errorprone-jtreg"
1477		depends="jar"
1478		description="Run errorprone over jtreg tests (experimental)">
#	Line 1485 | Line 1483
1483		classes="${product.jar}"
1484		verbose="all">
1485		<jtreg-elements>
1486	+	<arg value="-javacoption:-XDcompilePolicy=simple"/>
1487		<arg value="-javacoption:-processorpath"/>
1488		<arg value="-javacoption:${errorprone.jar}"/>
1489		<arg value="-javacoption:-Xplugin:ErrorProne
1490	<	-Xep:IdentityBinaryExpression:WARN
1491	<	-Xep:BoxedPrimitiveConstructor:OFF
1492	<	-Xep:HashtableContains:OFF
1494	<	-Xep:ModifyingCollectionWithItself:OFF
1495	<	-Xep:MissingOverride:OFF
1496	<	-Xep:JdkObsolete:OFF
1497	<	-Xep:NonAtomicVolatileUpdate:OFF
1498	<	-Xep:MixedArrayDimensions:ERROR
1499	<	-Xep:RemoveUnusedImports:ERROR
1500	<	-Xep:ClassName:ERROR
1501	<	-Xep:MultipleTopLevelClasses:ERROR
1502	<	-Xep:EmptyIf:ERROR
1503	<	-Xep:LongLiteralLowerCaseSuffix:ERROR
1504	<	-Xep:RedundantThrows:ERROR
1505	<	-Xep:MethodCanBeStatic:WARN"/>
1490	>	${errorprone.jsr166.flags}
1491	>	${errorprone.jsr166.test.flags}
1492	>	-Xep:NonAtomicVolatileUpdate:OFF"/>
1493		</jtreg-elements>
1494		</run-jtreg-tests>
1495		</target>

Diff Legend

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