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 |
|
|
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"/> |
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"/> |
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/"/> |
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 --> |
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"/> |
317 |
+ |
</patternset> |
318 |
+ |
</fileset> |
319 |
+ |
|
320 |
|
<fileset dir="${jtreg9.src.dir}"> |
321 |
|
<patternset id="jdk9.jtreg.tests"> |
322 |
|
<include name="**/*.java"/> |
340 |
|
|
341 |
|
<macrodef name="run-jtreg-tests"> |
342 |
|
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
322 |
– |
<attribute name="source" default="7"/> |
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 |
|
|
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> |
390 |
|
<!-- Main targets --> |
391 |
|
|
392 |
|
<property name="build.main.java.version" value="9"/> |
393 |
< |
<property name="build.main.javac" value="${javac9}"/> |
393 |
> |
<!-- Workaround "no nested properties in ant" --> |
394 |
> |
<macrodef name="define-build-main-properties"> |
395 |
> |
<attribute name="v"/> |
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}}"/> |
400 |
> |
</sequential> |
401 |
> |
</macrodef> |
402 |
> |
<define-build-main-properties v="${build.main.java.version}"/> |
403 |
|
|
404 |
|
<target name="dists" |
405 |
|
depends="dist, 4jdk8dist" |
412 |
|
depends="configure-compiler" |
413 |
|
description="Compiles src/main sources to build dir"> |
414 |
|
|
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 |
– |
|
415 |
|
<local name="destdir"/> |
416 |
< |
<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/> |
393 |
< |
<property name="destdir" value="${build.classes.dir}" unless:set="modules"/> |
416 |
> |
<property name="destdir" value="${build.classes.dir}/java.base"/> |
417 |
|
|
418 |
|
<mkdir dir="${destdir}"/> |
419 |
|
|
430 |
|
fork="true"> |
431 |
|
|
432 |
|
<include name="**/*.java"/> |
433 |
< |
<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/> |
433 |
> |
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
434 |
|
<compilerarg value="-Xprefer:source"/> |
435 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
436 |
|
<compilerarg value="-Xlint:all"/> |
480 |
|
access="${build.javadoc.access}" |
481 |
|
sourcepath="${src.dir}" |
482 |
|
classpath="" |
483 |
< |
executable="${javadoc9}"> |
483 |
> |
source="9" |
484 |
> |
executable="${build.main.javadoc}"> |
485 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
486 |
|
<include name="**/*.java"/> |
487 |
|
</fileset> |
615 |
|
|
616 |
|
<!-- </target> --> |
617 |
|
|
618 |
< |
<!-- <target name="test89" --> |
619 |
< |
<!-- description="Runs tck and jtreg tests for src/main for multiple java versions"> --> |
618 |
> |
<target name="test91011" |
619 |
> |
description="Runs tck and jtreg tests for src/main for multiple java versions"> |
620 |
|
|
621 |
< |
<!-- <antcall target="clean"/> --> |
622 |
< |
<!-- <antcall target="test"> --> |
623 |
< |
<!-- <param name="build.main.java.version" value="8"/> --> |
624 |
< |
<!-- <param name="build.main.javac" value="${javac8}"/> --> |
601 |
< |
<!-- </antcall> --> |
621 |
> |
<antcall target="clean"/> |
622 |
> |
<antcall target="test"> |
623 |
> |
<param name="build.main.java.version" value="9"/> |
624 |
> |
</antcall> |
625 |
|
|
626 |
< |
<!-- <antcall target="clean"/> --> |
627 |
< |
<!-- <antcall target="test"> --> |
628 |
< |
<!-- <param name="build.main.java.version" value="9"/> --> |
629 |
< |
<!-- <param name="build.main.javac" value="${javac9}"/> --> |
607 |
< |
<!-- </antcall> --> |
626 |
> |
<antcall target="clean"/> |
627 |
> |
<antcall target="test"> |
628 |
> |
<param name="build.main.java.version" value="10"/> |
629 |
> |
</antcall> |
630 |
|
|
631 |
< |
<!-- </target> --> |
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 |
|
|
642 |
|
|
704 |
|
includeAntRuntime="false" |
705 |
|
includeJavaRuntime="false" |
706 |
|
encoding="ASCII" |
707 |
< |
executable="${javac9}" |
707 |
> |
executable="${build.main.javac}" |
708 |
|
fork="true"> |
709 |
|
|
710 |
|
<include name="*.java"/> |
837 |
|
access="${build.javadoc.access}" |
838 |
|
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}" |
839 |
|
classpath="" |
840 |
+ |
source="8" |
841 |
|
executable="${javadoc8}" |
842 |
|
failonerror = "true"> |
843 |
|
<fileset dir="${4jdk8src.dir}" defaultexcludes="yes"> |
1399 |
|
|
1400 |
|
<!-- ============================================================== |
1401 |
|
Experimental errorprone support - http://errorprone.info |
1371 |
– |
You may need to bring your own errorprone jar. |
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)"> |
1442 |
|
fork="true"> |
1443 |
|
|
1444 |
|
<include name="**/*.java"/> |
1445 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1446 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1396 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1397 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/> |
1398 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/> |
1399 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/> |
1400 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/> |
1401 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1402 |
< |
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1403 |
< |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/> |
1445 |
> |
<compilerarg value="-XDcompilePolicy=simple"/> |
1446 |
> |
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1447 |
|
<compilerarg value="-Xplugin:ErrorProne |
1448 |
< |
-Xep:IdentityBinaryExpression:WARN |
1406 |
< |
-Xep:MissingOverride:OFF |
1407 |
< |
-Xep:MixedArrayDimensions:WARN |
1408 |
< |
-Xep:RemoveUnusedImports:ERROR |
1409 |
< |
-Xep:ClassName:ERROR |
1410 |
< |
-Xep:MultipleTopLevelClasses:ERROR |
1411 |
< |
-Xep:EmptyIf:ERROR |
1412 |
< |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1413 |
< |
-Xep:ArgumentParameterSwap:ERROR |
1414 |
< |
-Xep:RedundantThrows:ERROR |
1415 |
< |
-Xep:MethodCanBeStatic:WARN"/> |
1448 |
> |
${errorprone.jsr166.flags}"/> |
1449 |
|
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
1450 |
|
<compilerarg value="-Xprefer:source"/> |
1451 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1464 |
|
workdir="${build.dir}" |
1465 |
|
classes="${product.jar}"> |
1466 |
|
<javac-elements> |
1467 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1468 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1436 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1437 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/> |
1438 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/> |
1439 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/> |
1440 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/> |
1441 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1442 |
< |
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1443 |
< |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/> |
1467 |
> |
<compilerarg value="-XDcompilePolicy=simple"/> |
1468 |
> |
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1469 |
|
<compilerarg value="-Xplugin:ErrorProne |
1470 |
< |
-Xep:IdentityBinaryExpression:WARN |
1471 |
< |
-Xep:BoxedPrimitiveConstructor:OFF |
1447 |
< |
-Xep:HashtableContains:OFF |
1448 |
< |
-Xep:ModifyingCollectionWithItself:OFF |
1449 |
< |
-Xep:MissingOverride:OFF |
1450 |
< |
-Xep:MixedArrayDimensions:WARN |
1451 |
< |
-Xep:RemoveUnusedImports:ERROR |
1452 |
< |
-Xep:ClassName:ERROR |
1453 |
< |
-Xep:MultipleTopLevelClasses:ERROR |
1454 |
< |
-Xep:EmptyIf:ERROR |
1455 |
< |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1456 |
< |
-Xep:ArgumentParameterSwap:ERROR |
1457 |
< |
-Xep:RedundantThrows:ERROR |
1458 |
< |
-Xep:MethodCanBeStatic:WARN"/> |
1470 |
> |
${errorprone.jsr166.flags} |
1471 |
> |
${errorprone.jsr166.test.flags}"/> |
1472 |
|
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1473 |
|
</javac-elements> |
1474 |
|
</run-tck-tests> |
1475 |
|
</target> |
1476 |
|
|
1477 |
+ |
<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' --> |
1478 |
+ |
<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports --> |
1479 |
+ |
<target name="errorprone-jtreg" |
1480 |
+ |
depends="jar" |
1481 |
+ |
description="Run errorprone over jtreg tests (experimental)"> |
1482 |
+ |
|
1483 |
+ |
<run-jtreg-tests |
1484 |
+ |
target="${build.main.java.version}" |
1485 |
+ |
workdir="${build.dir}" |
1486 |
+ |
classes="${product.jar}" |
1487 |
+ |
verbose="all"> |
1488 |
+ |
<jtreg-elements> |
1489 |
+ |
<arg value="-javacoption:-XDcompilePolicy=simple"/> |
1490 |
+ |
<arg value="-javacoption:-processorpath"/> |
1491 |
+ |
<arg value="-javacoption:${errorprone.jar}"/> |
1492 |
+ |
<arg value="-javacoption:-Xplugin:ErrorProne |
1493 |
+ |
${errorprone.jsr166.flags} |
1494 |
+ |
${errorprone.jsr166.test.flags} |
1495 |
+ |
-Xep:NonAtomicVolatileUpdate:OFF"/> |
1496 |
+ |
</jtreg-elements> |
1497 |
+ |
</run-jtreg-tests> |
1498 |
+ |
</target> |
1499 |
+ |
|
1500 |
|
|
1501 |
|
<!-- ============================================================== |
1502 |
|
Running guava tests against jsr166 code |
1550 |
|
<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar" |
1551 |
|
dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/> |
1552 |
|
<junit printsummary="true" showoutput="true" haltonfailure="true" |
1553 |
< |
jvm="${java9}" fork="true"> |
1554 |
< |
<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/> |
1553 |
> |
jvm="${build.main.java}" fork="true"> |
1554 |
> |
<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/> |
1555 |
|
<formatter type="brief"/> |
1556 |
|
<classpath> |
1557 |
|
<pathelement location="${guava.dir}/guava-testlib-tests.jar"/> |