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 |
< |
<property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> |
193 |
< |
<!-- The location of jdk9 early access 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="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 --> |
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"/> |
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"/> |
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 |
|
|
1400 |
|
<!-- ============================================================== |
1401 |
|
Experimental errorprone support - http://errorprone.info |
1402 |
|
=================================================================== --> |
1403 |
< |
<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.0.21.jar"/> |
1403 |
> |
<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.1.2.jar"/> |
1404 |
|
<target name="errorprone" |
1405 |
|
depends="clean, configure-compiler" |
1406 |
|
description="Run errorprone over jsr166 source code (experimental)"> |
1426 |
|
<compilerarg value="-Xplugin:ErrorProne |
1427 |
|
-Xep:IdentityBinaryExpression:WARN |
1428 |
|
-Xep:MissingOverride:OFF |
1429 |
< |
-Xep:MixedArrayDimensions:WARN |
1429 |
> |
-Xep:MixedArrayDimensions:ERROR |
1430 |
|
-Xep:RemoveUnusedImports:ERROR |
1431 |
|
-Xep:ClassName:ERROR |
1432 |
|
-Xep:MultipleTopLevelClasses:ERROR |
1459 |
|
-Xep:HashtableContains:OFF |
1460 |
|
-Xep:ModifyingCollectionWithItself:OFF |
1461 |
|
-Xep:MissingOverride:OFF |
1462 |
< |
-Xep:MixedArrayDimensions:WARN |
1462 |
> |
-Xep:MissingFail:OFF |
1463 |
> |
-Xep:JdkObsolete:OFF |
1464 |
> |
-Xep:MixedArrayDimensions:ERROR |
1465 |
|
-Xep:RemoveUnusedImports:ERROR |
1466 |
|
-Xep:ClassName:ERROR |
1467 |
|
-Xep:MultipleTopLevelClasses:ERROR |
1493 |
|
-Xep:HashtableContains:OFF |
1494 |
|
-Xep:ModifyingCollectionWithItself:OFF |
1495 |
|
-Xep:MissingOverride:OFF |
1496 |
< |
-Xep:MixedArrayDimensions:WARN |
1496 |
> |
-Xep:JdkObsolete:OFF |
1497 |
> |
-Xep:NonAtomicVolatileUpdate:OFF |
1498 |
> |
-Xep:MixedArrayDimensions:ERROR |
1499 |
|
-Xep:RemoveUnusedImports:ERROR |
1500 |
|
-Xep:ClassName:ERROR |
1501 |
|
-Xep:MultipleTopLevelClasses:ERROR |