181 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
182 |
|
|
183 |
|
<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag --> |
184 |
< |
<property name="java5.docroot.url" value="http://docs.oracle.com/javase/1.5.0/docs"/> |
185 |
< |
<property name="java6.docroot.url" value="http://docs.oracle.com/javase/6/docs"/> |
186 |
< |
<property name="java7.docroot.url" value="http://docs.oracle.com/javase/7/docs"/> |
187 |
< |
<property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> |
188 |
< |
<!-- The expected canonical location does not yet exist as of 2016-04 --> |
189 |
< |
<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> --> |
190 |
< |
<property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> |
184 |
> |
<!-- Switched to https: in 2017-10 - JDK-8190312 --> |
185 |
> |
<property name="java5.docroot.url" value="https://docs.oracle.com/javase/1.5.0/docs"/> |
186 |
> |
<property name="java6.docroot.url" value="https://docs.oracle.com/javase/6/docs"/> |
187 |
> |
<property name="java7.docroot.url" value="https://docs.oracle.com/javase/7/docs"/> |
188 |
> |
<property name="java8.docroot.url" value="https://docs.oracle.com/javase/8/docs"/> |
189 |
> |
<property name="java9.docroot.url" value="https://docs.oracle.com/javase/9/docs"/> |
190 |
> |
<!-- The location of jdk9 early access docs (RIP) --> |
191 |
> |
<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> --> |
192 |
|
<!-- Default jdk doc location (latest stable release seems best) --> |
193 |
< |
<property name="java.docroot.url" value="${java8.docroot.url}"/> |
193 |
> |
<property name="java.docroot.url" value="${java9.docroot.url}"/> |
194 |
|
|
195 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
196 |
|
<property name="java5.api.url" value="${java5.docroot.url}/api/"/> |
329 |
|
<attribute name="target"/> |
330 |
|
<attribute name="workdir"/> |
331 |
|
<attribute name="classes"/> |
332 |
+ |
<attribute name="verbose" default="${jtreg.verbose}"/> |
333 |
|
<attribute name="jtregflags" default=""/> |
334 |
+ |
<element name="jtreg-elements" optional="true"/> |
335 |
|
|
336 |
|
<sequential> |
337 |
|
|
353 |
|
<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
354 |
|
<arg value="-agentvm"/> |
355 |
|
<arg value="-noreport"/> |
356 |
< |
<arg value="-verbose:${jtreg.verbose}"/> |
356 |
> |
<arg value="-verbose:@{verbose}"/> |
357 |
|
<arg value="-vmoptions:-esa -ea"/> |
358 |
|
<arg value="-automatic"/> |
359 |
|
<arg value="-k:!ignore"/> |
360 |
|
<arg line="@{jtregflags}"/> |
361 |
|
<arg line="${jtreg.flags}"/> |
362 |
+ |
<jtreg-elements/> |
363 |
|
</jtreg> |
364 |
|
</sequential> |
365 |
|
</macrodef> |
614 |
|
<param name="build.main.java.version" value="10"/> |
615 |
|
</antcall> |
616 |
|
|
617 |
+ |
<!-- Clean up to avoid obscure wrong class file version bugs --> |
618 |
+ |
<antcall target="clean"/> |
619 |
+ |
|
620 |
|
</target> |
621 |
|
|
622 |
|
|
1381 |
|
<!-- ============================================================== |
1382 |
|
Experimental errorprone support - http://errorprone.info |
1383 |
|
=================================================================== --> |
1384 |
+ |
<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.1.2.jar"/> |
1385 |
|
<target name="errorprone" |
1386 |
|
depends="clean, configure-compiler" |
1387 |
|
description="Run errorprone over jsr166 source code (experimental)"> |
1403 |
|
fork="true"> |
1404 |
|
|
1405 |
|
<include name="**/*.java"/> |
1406 |
< |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/> |
1406 |
> |
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1407 |
|
<compilerarg value="-Xplugin:ErrorProne |
1408 |
|
-Xep:IdentityBinaryExpression:WARN |
1409 |
|
-Xep:MissingOverride:OFF |
1410 |
< |
-Xep:MixedArrayDimensions:WARN |
1410 |
> |
-Xep:MixedArrayDimensions:ERROR |
1411 |
|
-Xep:RemoveUnusedImports:ERROR |
1412 |
|
-Xep:ClassName:ERROR |
1413 |
|
-Xep:MultipleTopLevelClasses:ERROR |
1433 |
|
workdir="${build.dir}" |
1434 |
|
classes="${product.jar}"> |
1435 |
|
<javac-elements> |
1436 |
< |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/> |
1436 |
> |
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1437 |
|
<compilerarg value="-Xplugin:ErrorProne |
1438 |
|
-Xep:IdentityBinaryExpression:WARN |
1439 |
|
-Xep:BoxedPrimitiveConstructor:OFF |
1440 |
|
-Xep:HashtableContains:OFF |
1441 |
|
-Xep:ModifyingCollectionWithItself:OFF |
1442 |
|
-Xep:MissingOverride:OFF |
1443 |
< |
-Xep:MixedArrayDimensions:WARN |
1443 |
> |
-Xep:MissingFail:OFF |
1444 |
> |
-Xep:JdkObsolete:OFF |
1445 |
> |
-Xep:MixedArrayDimensions:ERROR |
1446 |
|
-Xep:RemoveUnusedImports:ERROR |
1447 |
|
-Xep:ClassName:ERROR |
1448 |
|
-Xep:MultipleTopLevelClasses:ERROR |
1455 |
|
</run-tck-tests> |
1456 |
|
</target> |
1457 |
|
|
1458 |
+ |
<!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' --> |
1459 |
+ |
<target name="errorprone-jtreg" |
1460 |
+ |
depends="jar" |
1461 |
+ |
description="Run errorprone over jtreg tests (experimental)"> |
1462 |
+ |
|
1463 |
+ |
<run-jtreg-tests |
1464 |
+ |
target="${build.main.java.version}" |
1465 |
+ |
workdir="${build.dir}" |
1466 |
+ |
classes="${product.jar}" |
1467 |
+ |
verbose="all"> |
1468 |
+ |
<jtreg-elements> |
1469 |
+ |
<arg value="-javacoption:-processorpath"/> |
1470 |
+ |
<arg value="-javacoption:${errorprone.jar}"/> |
1471 |
+ |
<arg value="-javacoption:-Xplugin:ErrorProne |
1472 |
+ |
-Xep:IdentityBinaryExpression:WARN |
1473 |
+ |
-Xep:BoxedPrimitiveConstructor:OFF |
1474 |
+ |
-Xep:HashtableContains:OFF |
1475 |
+ |
-Xep:ModifyingCollectionWithItself:OFF |
1476 |
+ |
-Xep:MissingOverride:OFF |
1477 |
+ |
-Xep:JdkObsolete:OFF |
1478 |
+ |
-Xep:NonAtomicVolatileUpdate:OFF |
1479 |
+ |
-Xep:MixedArrayDimensions:ERROR |
1480 |
+ |
-Xep:RemoveUnusedImports:ERROR |
1481 |
+ |
-Xep:ClassName:ERROR |
1482 |
+ |
-Xep:MultipleTopLevelClasses:ERROR |
1483 |
+ |
-Xep:EmptyIf:ERROR |
1484 |
+ |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1485 |
+ |
-Xep:RedundantThrows:ERROR |
1486 |
+ |
-Xep:MethodCanBeStatic:WARN"/> |
1487 |
+ |
</jtreg-elements> |
1488 |
+ |
</run-jtreg-tests> |
1489 |
+ |
</target> |
1490 |
+ |
|
1491 |
|
|
1492 |
|
<!-- ============================================================== |
1493 |
|
Running guava tests against jsr166 code |
1542 |
|
dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/> |
1543 |
|
<junit printsummary="true" showoutput="true" haltonfailure="true" |
1544 |
|
jvm="${build.main.java}" fork="true"> |
1545 |
< |
<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/> |
1545 |
> |
<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/> |
1546 |
|
<formatter type="brief"/> |
1547 |
|
<classpath> |
1548 |
|
<pathelement location="${guava.dir}/guava-testlib-tests.jar"/> |