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 --> |
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/"/> |
297 |
|
</macrodef> |
298 |
|
|
299 |
|
<!-- Define jtreg test sets for different jdk versions --> |
300 |
+ |
<fileset dir="${jtreg10.src.dir}"> |
301 |
+ |
<patternset id="jdk10.jtreg.tests"> |
302 |
+ |
<include name="**/*.java"/> |
303 |
+ |
</patternset> |
304 |
+ |
</fileset> |
305 |
+ |
|
306 |
|
<fileset dir="${jtreg9.src.dir}"> |
307 |
|
<patternset id="jdk9.jtreg.tests"> |
308 |
|
<include name="**/*.java"/> |
326 |
|
|
327 |
|
<macrodef name="run-jtreg-tests"> |
328 |
|
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
322 |
– |
<attribute name="source" default="7"/> |
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 |
|
|
349 |
|
workDir="@{workdir}/JTwork"> |
350 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
351 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
352 |
< |
<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
353 |
< |
<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
352 |
> |
<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
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> |
376 |
|
<!-- Main targets --> |
377 |
|
|
378 |
|
<property name="build.main.java.version" value="9"/> |
379 |
< |
<property name="build.main.javac" value="${javac9}"/> |
379 |
> |
<!-- Workaround "no nested properties in ant" --> |
380 |
> |
<macrodef name="define-build-main-properties"> |
381 |
> |
<attribute name="v"/> |
382 |
> |
<sequential> |
383 |
> |
<property name="build.main.java" value="${java@{v}}"/> |
384 |
> |
<property name="build.main.javac" value="${javac@{v}}"/> |
385 |
> |
<property name="build.main.javadoc" value="${javadoc@{v}}"/> |
386 |
> |
</sequential> |
387 |
> |
</macrodef> |
388 |
> |
<define-build-main-properties v="${build.main.java.version}"/> |
389 |
|
|
390 |
|
<target name="dists" |
391 |
|
depends="dist, 4jdk8dist" |
398 |
|
depends="configure-compiler" |
399 |
|
description="Compiles src/main sources to build dir"> |
400 |
|
|
383 |
– |
<local name="modules"/> |
384 |
– |
<condition property="modules"> |
385 |
– |
<and> |
386 |
– |
<available file="${jdk9.home}/jmods" type="dir"/> |
387 |
– |
<equals arg1="9" arg2="${build.main.java.version}"/> |
388 |
– |
</and> |
389 |
– |
</condition> |
390 |
– |
|
401 |
|
<local name="destdir"/> |
402 |
< |
<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/> |
393 |
< |
<property name="destdir" value="${build.classes.dir}" unless:set="modules"/> |
402 |
> |
<property name="destdir" value="${build.classes.dir}/java.base"/> |
403 |
|
|
404 |
|
<mkdir dir="${destdir}"/> |
405 |
|
|
416 |
|
fork="true"> |
417 |
|
|
418 |
|
<include name="**/*.java"/> |
419 |
< |
<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/> |
419 |
> |
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
420 |
|
<compilerarg value="-Xprefer:source"/> |
421 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
422 |
|
<compilerarg value="-Xlint:all"/> |
423 |
< |
<compilerarg value="-Werror"/> |
423 |
> |
<compilerarg line="--doclint-format html5"/> |
424 |
|
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
425 |
+ |
<compilerarg value="-Werror"/> |
426 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
427 |
|
<compilerarg line="${build.args}"/> |
428 |
|
|
466 |
|
access="${build.javadoc.access}" |
467 |
|
sourcepath="${src.dir}" |
468 |
|
classpath="" |
469 |
< |
executable="${javadoc9}"> |
469 |
> |
source="9" |
470 |
> |
executable="${build.main.javadoc}"> |
471 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
472 |
|
<include name="**/*.java"/> |
473 |
|
</fileset> |
474 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
475 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
476 |
|
<arg value="-XDignore.symbol.file=true"/> |
477 |
+ |
<arg value="-html5"/> |
478 |
|
<arg value="--patch-module=java.base=${src.dir}"/> |
479 |
|
<arg value="-tag"/> |
480 |
|
<arg value="${javadoc.jls.option}"/> |
601 |
|
|
602 |
|
<!-- </target> --> |
603 |
|
|
604 |
< |
<!-- <target name="test89" --> |
605 |
< |
<!-- description="Runs tck and jtreg tests for src/main for multiple java versions"> --> |
604 |
> |
<target name="test910" |
605 |
> |
description="Runs tck and jtreg tests for src/main for multiple java versions"> |
606 |
|
|
607 |
< |
<!-- <antcall target="clean"/> --> |
608 |
< |
<!-- <antcall target="test"> --> |
609 |
< |
<!-- <param name="build.main.java.version" value="8"/> --> |
610 |
< |
<!-- <param name="build.main.javac" value="${javac8}"/> --> |
599 |
< |
<!-- </antcall> --> |
607 |
> |
<antcall target="clean"/> |
608 |
> |
<antcall target="test"> |
609 |
> |
<param name="build.main.java.version" value="9"/> |
610 |
> |
</antcall> |
611 |
|
|
612 |
< |
<!-- <antcall target="clean"/> --> |
613 |
< |
<!-- <antcall target="test"> --> |
614 |
< |
<!-- <param name="build.main.java.version" value="9"/> --> |
615 |
< |
<!-- <param name="build.main.javac" value="${javac9}"/> --> |
605 |
< |
<!-- </antcall> --> |
612 |
> |
<antcall target="clean"/> |
613 |
> |
<antcall target="test"> |
614 |
> |
<param name="build.main.java.version" value="10"/> |
615 |
> |
</antcall> |
616 |
|
|
617 |
< |
<!-- </target> --> |
617 |
> |
<!-- Clean up to avoid obscure wrong class file version bugs --> |
618 |
> |
<antcall target="clean"/> |
619 |
> |
|
620 |
> |
</target> |
621 |
|
|
622 |
|
|
623 |
|
|
685 |
|
includeAntRuntime="false" |
686 |
|
includeJavaRuntime="false" |
687 |
|
encoding="ASCII" |
688 |
< |
executable="${javac9}" |
688 |
> |
executable="${build.main.javac}" |
689 |
|
fork="true"> |
690 |
|
|
691 |
|
<include name="*.java"/> |
818 |
|
access="${build.javadoc.access}" |
819 |
|
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}" |
820 |
|
classpath="" |
821 |
+ |
source="8" |
822 |
|
executable="${javadoc8}" |
823 |
|
failonerror = "true"> |
824 |
|
<fileset dir="${4jdk8src.dir}" defaultexcludes="yes"> |
1380 |
|
|
1381 |
|
<!-- ============================================================== |
1382 |
|
Experimental errorprone support - http://errorprone.info |
1369 |
– |
You may need to bring your own errorprone jar. |
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 value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1393 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1394 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1395 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/> |
1396 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/> |
1397 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/> |
1398 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/> |
1399 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1400 |
< |
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1401 |
< |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.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 |
1414 |
|
-Xep:EmptyIf:ERROR |
1415 |
|
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1411 |
– |
-Xep:ArgumentParameterSwap:ERROR |
1416 |
|
-Xep:RedundantThrows:ERROR |
1417 |
|
-Xep:MethodCanBeStatic:WARN"/> |
1418 |
|
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
1433 |
|
workdir="${build.dir}" |
1434 |
|
classes="${product.jar}"> |
1435 |
|
<javac-elements> |
1436 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1433 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1434 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1435 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/> |
1436 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/> |
1437 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/> |
1438 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/> |
1439 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1440 |
< |
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1441 |
< |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.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 |
1449 |
|
-Xep:EmptyIf:ERROR |
1450 |
|
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1454 |
– |
-Xep:ArgumentParameterSwap:ERROR |
1451 |
|
-Xep:RedundantThrows:ERROR |
1452 |
|
-Xep:MethodCanBeStatic:WARN"/> |
1453 |
|
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
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 |
1541 |
|
<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar" |
1542 |
|
dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/> |
1543 |
|
<junit printsummary="true" showoutput="true" haltonfailure="true" |
1544 |
< |
jvm="${java9}" fork="true"> |
1545 |
< |
<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/> |
1544 |
> |
jvm="${build.main.java}" fork="true"> |
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"/> |