1 |
|
<project name="jsr166" default="usage" |
2 |
< |
xmlns:if="ant:if" xmlns:unless="ant:unless" |
2 |
> |
xmlns:if="ant:if" |
3 |
> |
xmlns:unless="ant:unless" |
4 |
|
xmlns:ivy="antlib:org.apache.ivy.ant"> |
5 |
|
|
6 |
|
<description> |
22 |
|
$HOME/jdk/jdk8 |
23 |
|
$HOME/jdk/jdk9 |
24 |
|
$HOME/jdk/jdk10 |
25 |
+ |
$HOME/jdk/jdk11 |
26 |
+ |
$HOME/jdk/jdk12 |
27 |
|
where each of the above is a JDK or a symlink to same, and |
28 |
|
$HOME/jdk/src/jdk8 |
29 |
|
$HOME/jdk/src/jdk9 |
30 |
|
$HOME/jdk/src/jdk10 |
31 |
+ |
$HOME/jdk/src/jdk11 |
32 |
+ |
$HOME/jdk/src/jdk12 |
33 |
|
where each of the above is a complete JDK source tree |
34 |
|
(e.g. mercurial forest) or a symlink to same. |
35 |
|
|
106 |
|
<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes" |
107 |
|
unless:set="have.java.base"/> |
108 |
|
<local name="modules"/> |
109 |
< |
<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/> |
109 |
> |
<available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/> |
110 |
|
<local name="boot.jar.dir"/> |
111 |
|
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib" unless:set="modules"/> |
112 |
|
<path id="bootclasspath@{v}" unless:set="modules"> |
137 |
|
<defjdklocations v="8"/> |
138 |
|
<defjdklocations v="9"/> |
139 |
|
<defjdklocations v="10"/> |
140 |
+ |
<defjdklocations v="11"/> |
141 |
+ |
<defjdklocations v="12"/> |
142 |
|
|
143 |
|
<!-- Source locations --> |
144 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
149 |
|
<property name="jtreg8.src.dir" location="${test.src.dir}/jtreg-jdk8"/> |
150 |
|
<property name="jtreg9.src.dir" location="${test.src.dir}/jtreg"/> |
151 |
|
<property name="jtreg10.src.dir" location="${test.src.dir}/jtreg"/> |
152 |
+ |
<property name="jtreg11.src.dir" location="${test.src.dir}/jtreg"/> |
153 |
+ |
<property name="jtreg12.src.dir" location="${test.src.dir}/jtreg"/> |
154 |
|
<property name="jtreg.src.dir" location="${jtreg9.src.dir}"/> |
155 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
156 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
190 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
191 |
|
|
192 |
|
<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag --> |
193 |
< |
<property name="java5.docroot.url" value="http://docs.oracle.com/javase/1.5.0/docs"/> |
194 |
< |
<property name="java6.docroot.url" value="http://docs.oracle.com/javase/6/docs"/> |
195 |
< |
<property name="java7.docroot.url" value="http://docs.oracle.com/javase/7/docs"/> |
196 |
< |
<property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> |
197 |
< |
<!-- The expected canonical location does not yet exist as of 2016-04 --> |
198 |
< |
<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> --> |
199 |
< |
<property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> |
193 |
> |
<!-- Switched to https: in 2017-10 - JDK-8190312 --> |
194 |
> |
<property name="java5.docroot.url" value="https://docs.oracle.com/javase/1.5.0/docs"/> |
195 |
> |
<property name="java6.docroot.url" value="https://docs.oracle.com/javase/6/docs"/> |
196 |
> |
<property name="java7.docroot.url" value="https://docs.oracle.com/javase/7/docs"/> |
197 |
> |
<property name="java8.docroot.url" value="https://docs.oracle.com/javase/8/docs"/> |
198 |
> |
<property name="java9.docroot.url" value="https://docs.oracle.com/javase/9/docs"/> |
199 |
> |
<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/> |
200 |
> |
<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/> |
201 |
> |
<!-- The location of jdk early access docs (RIP) --> |
202 |
> |
<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> --> |
203 |
> |
<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> --> |
204 |
> |
<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> --> |
205 |
> |
<property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> |
206 |
|
<!-- Default jdk doc location (latest stable release seems best) --> |
207 |
< |
<property name="java.docroot.url" value="${java8.docroot.url}"/> |
207 |
> |
<!-- But pin to jdk 10 until fix for --> |
208 |
> |
<!-- 8211194: javadoc -link doesn't take module path into consideration --> |
209 |
> |
<property name="java.docroot.url" value="${java10.docroot.url}"/> |
210 |
|
|
211 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
212 |
|
<property name="java5.api.url" value="${java5.docroot.url}/api/"/> |
214 |
|
<property name="java7.api.url" value="${java7.docroot.url}/api/"/> |
215 |
|
<property name="java8.api.url" value="${java8.docroot.url}/api/"/> |
216 |
|
<property name="java9.api.url" value="${java9.docroot.url}/api/"/> |
217 |
+ |
<property name="java10.api.url" value="${java10.docroot.url}/api/"/> |
218 |
+ |
<property name="java11.api.url" value="${java11.docroot.url}/api/"/> |
219 |
+ |
<property name="java12.api.url" value="${java12.docroot.url}/api/"/> |
220 |
|
<property name="java.api.url" value="${java.docroot.url}/api/"/> |
221 |
|
|
222 |
|
<!-- Define the "jtreg" task --> |
249 |
|
|
250 |
|
<local name="modules"/> |
251 |
|
<condition property="modules"> |
252 |
< |
<available file="${jdk@{compile-target}.home}/jmods" type="dir"/> |
252 |
> |
<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/> |
253 |
|
</condition> |
254 |
|
|
255 |
|
<local name="use-doclint"/> |
316 |
|
</macrodef> |
317 |
|
|
318 |
|
<!-- Define jtreg test sets for different jdk versions --> |
319 |
< |
<fileset dir="${jtreg10.src.dir}"> |
320 |
< |
<patternset id="jdk10.jtreg.tests"> |
321 |
< |
<include name="**/*.java"/> |
322 |
< |
</patternset> |
323 |
< |
</fileset> |
324 |
< |
|
325 |
< |
<fileset dir="${jtreg9.src.dir}"> |
326 |
< |
<patternset id="jdk9.jtreg.tests"> |
327 |
< |
<include name="**/*.java"/> |
328 |
< |
</patternset> |
329 |
< |
</fileset> |
330 |
< |
|
331 |
< |
<fileset dir="${jtreg8.src.dir}"> |
312 |
< |
<patternset id="jdk8.jtreg.tests"> |
313 |
< |
<include name="**/*.java"/> |
314 |
< |
</patternset> |
315 |
< |
</fileset> |
319 |
> |
<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" --> |
320 |
> |
<!-- ant -Djtreg.test.pattern="**/ToArray.java" --> |
321 |
> |
<property name="jtreg.test.pattern" value="**/*.java"/> |
322 |
> |
<macrodef name="defjtregtests"> |
323 |
> |
<attribute name="v"/> |
324 |
> |
<sequential> |
325 |
> |
<fileset dir="${jtreg@{v}.src.dir}"> |
326 |
> |
<patternset id="jdk@{v}.jtreg.tests"> |
327 |
> |
<include name="${jtreg.test.pattern}"/> |
328 |
> |
</patternset> |
329 |
> |
</fileset> |
330 |
> |
</sequential> |
331 |
> |
</macrodef> |
332 |
|
|
333 |
< |
<fileset dir="${jtreg7.src.dir}"> |
334 |
< |
<patternset id="jdk7.jtreg.tests"> |
335 |
< |
<include name="**/*.java"/> |
336 |
< |
</patternset> |
337 |
< |
</fileset> |
333 |
> |
<defjtregtests v="12"/> |
334 |
> |
<defjtregtests v="11"/> |
335 |
> |
<defjtregtests v="10"/> |
336 |
> |
<defjtregtests v="9"/> |
337 |
> |
<defjtregtests v="8"/> |
338 |
> |
<defjtregtests v="7"/> |
339 |
|
|
340 |
|
<!-- ant -Djtreg.flags=-timeoutFactor:4 --> |
341 |
|
<property name="jtreg.flags" value=""/> |
345 |
|
<attribute name="target"/> |
346 |
|
<attribute name="workdir"/> |
347 |
|
<attribute name="classes"/> |
348 |
+ |
<attribute name="verbose" default="${jtreg.verbose}"/> |
349 |
|
<attribute name="jtregflags" default=""/> |
350 |
+ |
<element name="jtreg-elements" optional="true"/> |
351 |
|
|
352 |
|
<sequential> |
353 |
|
|
356 |
|
|
357 |
|
<local name="modules"/> |
358 |
|
<condition property="modules"> |
359 |
< |
<available file="${jdk@{target}.home}/jmods" type="dir"/> |
359 |
> |
<available file="${jdk@{target}.home}/lib/modules" type="file"/> |
360 |
|
</condition> |
361 |
|
|
362 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
365 |
|
workDir="@{workdir}/JTwork"> |
366 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
367 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
368 |
< |
<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
369 |
< |
<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
368 |
> |
<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
369 |
> |
<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
370 |
|
<arg value="-agentvm"/> |
371 |
|
<arg value="-noreport"/> |
372 |
< |
<arg value="-verbose:${jtreg.verbose}"/> |
372 |
> |
<arg value="-verbose:@{verbose}"/> |
373 |
|
<arg value="-vmoptions:-esa -ea"/> |
374 |
|
<arg value="-automatic"/> |
375 |
|
<arg value="-k:!ignore"/> |
376 |
|
<arg line="@{jtregflags}"/> |
377 |
|
<arg line="${jtreg.flags}"/> |
378 |
+ |
<jtreg-elements/> |
379 |
|
</jtreg> |
380 |
|
</sequential> |
381 |
|
</macrodef> |
391 |
|
|
392 |
|
<!-- Main targets --> |
393 |
|
|
394 |
< |
<property name="build.main.java.version" value="9"/> |
394 |
> |
<property name="build.main.java.version" value="11"/> |
395 |
|
<!-- Workaround "no nested properties in ant" --> |
396 |
|
<macrodef name="define-build-main-properties"> |
397 |
|
<attribute name="v"/> |
398 |
|
<sequential> |
399 |
|
<property name="build.main.java" value="${java@{v}}"/> |
400 |
|
<property name="build.main.javac" value="${javac@{v}}"/> |
401 |
< |
<property name="build.main.javadoc" value="${javadoc@{v}}"/> |
401 |
> |
<!-- Force javadoc version to be at least 10, |
402 |
> |
so we can use override-methods=summary --> |
403 |
> |
<condition property="build.main.javadoc" |
404 |
> |
value="${javadoc11}" |
405 |
> |
else="${javadoc@{v}}"> |
406 |
> |
<equals arg1="@{v}" arg2="9"/> |
407 |
> |
</condition> |
408 |
|
</sequential> |
409 |
|
</macrodef> |
410 |
|
<define-build-main-properties v="${build.main.java.version}"/> |
483 |
|
<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> --> |
484 |
|
<javadoc destdir="${docs.dir}" |
485 |
|
packagenames="none" |
486 |
< |
link="${java9.api.url}" |
486 |
> |
link="${java10.api.url}" |
487 |
|
overview="${src.dir}/intro.html" |
488 |
|
access="${build.javadoc.access}" |
489 |
|
sourcepath="${src.dir}" |
490 |
|
classpath="" |
491 |
< |
source="9" |
491 |
> |
source="11" |
492 |
|
executable="${build.main.javadoc}"> |
493 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
494 |
|
<include name="**/*.java"/> |
495 |
|
</fileset> |
496 |
< |
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
496 |
> |
<arg line="-Xdocrootparent ${java10.docroot.url}"/> |
497 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
498 |
|
<arg value="-XDignore.symbol.file=true"/> |
499 |
|
<arg value="-html5"/> |
500 |
|
<arg value="--patch-module=java.base=${src.dir}"/> |
501 |
< |
<arg value="-tag"/> |
502 |
< |
<arg value="${javadoc.jls.option}"/> |
503 |
< |
<!-- @apiNote currently unused --> |
504 |
< |
<!-- <arg value="-tag"/> --> |
505 |
< |
<!-- <arg value="apiNote:a:API Note:"/> --> |
480 |
< |
<arg value="-tag"/> |
481 |
< |
<arg value="implSpec:a:Implementation Requirements:"/> |
482 |
< |
<arg value="-tag"/> |
483 |
< |
<arg value="implNote:a:Implementation Note:"/> |
501 |
> |
<arg value="--override-methods=summary"/> |
502 |
> |
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
503 |
> |
<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/> |
504 |
> |
<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/> |
505 |
> |
<arg value="-tag"/> <arg value="apiNote:a:API Note:"/> |
506 |
|
<!-- tags added in jdk9: currently unused --> |
507 |
< |
<!-- <arg value="-tag"/> --> |
508 |
< |
<!-- <arg value="revised:X"/> --> |
487 |
< |
<!-- <arg value="-tag"/> --> |
488 |
< |
<!-- <arg value="spec:X"/> --> |
507 |
> |
<!-- <arg value="-tag"/> <arg value="revised:X"/> --> |
508 |
> |
<!-- <arg value="-tag"/> <arg value="spec:X"/> --> |
509 |
|
</javadoc> |
510 |
|
</target> |
511 |
|
|
617 |
|
|
618 |
|
<!-- </target> --> |
619 |
|
|
620 |
< |
<!-- <target name="test89" --> |
621 |
< |
<!-- description="Runs tck and jtreg tests for src/main for multiple java versions"> --> |
620 |
> |
<target name="test9101112" |
621 |
> |
description="Runs tck and jtreg tests for src/main for multiple java versions"> |
622 |
|
|
623 |
< |
<!-- <antcall target="clean"/> --> |
624 |
< |
<!-- <antcall target="test"> --> |
625 |
< |
<!-- <param name="build.main.java.version" value="8"/> --> |
626 |
< |
<!-- <param name="build.main.javac" value="${javac8}"/> --> |
627 |
< |
<!-- </antcall> --> |
623 |
> |
<antcall target="clean"/> |
624 |
> |
<antcall target="test"> |
625 |
> |
<param name="build.main.java.version" value="9"/> |
626 |
> |
<param name="build.main.java" value="${java9}"/> |
627 |
> |
<param name="build.main.javac" value="${javac9}"/> |
628 |
> |
</antcall> |
629 |
|
|
630 |
< |
<!-- <antcall target="clean"/> --> |
631 |
< |
<!-- <antcall target="test"> --> |
632 |
< |
<!-- <param name="build.main.java.version" value="9"/> --> |
633 |
< |
<!-- <param name="build.main.javac" value="${javac9}"/> --> |
634 |
< |
<!-- </antcall> --> |
630 |
> |
<antcall target="clean"/> |
631 |
> |
<antcall target="test"> |
632 |
> |
<param name="build.main.java.version" value="10"/> |
633 |
> |
<param name="build.main.java" value="${java10}"/> |
634 |
> |
<param name="build.main.javac" value="${javac10}"/> |
635 |
> |
</antcall> |
636 |
|
|
637 |
< |
<!-- </target> --> |
637 |
> |
<antcall target="clean"/> |
638 |
> |
<antcall target="test"> |
639 |
> |
<param name="build.main.java.version" value="11"/> |
640 |
> |
<param name="build.main.java" value="${java11}"/> |
641 |
> |
<param name="build.main.javac" value="${javac11}"/> |
642 |
> |
</antcall> |
643 |
> |
|
644 |
> |
<antcall target="clean"/> |
645 |
> |
<antcall target="test"> |
646 |
> |
<param name="build.main.java.version" value="12"/> |
647 |
> |
<param name="build.main.java" value="${java12}"/> |
648 |
> |
<param name="build.main.javac" value="${javac12}"/> |
649 |
> |
</antcall> |
650 |
> |
<antcall target="docs"> |
651 |
> |
<param name="build.main.java.version" value="12"/> |
652 |
> |
<param name="build.main.java" value="${java12}"/> |
653 |
> |
<param name="build.main.javac" value="${javac12}"/> |
654 |
> |
<param name="build.main.javadoc" value="${javadoc12}"/> |
655 |
> |
</antcall> |
656 |
> |
|
657 |
> |
<!-- Clean up to avoid obscure wrong class file version bugs --> |
658 |
> |
<antcall target="clean"/> |
659 |
> |
|
660 |
> |
</target> |
661 |
|
|
662 |
|
|
663 |
|
|
866 |
|
</fileset> |
867 |
|
<arg line="-Xdocrootparent ${java8.docroot.url}"/> |
868 |
|
<arg value="-XDignore.symbol.file=true"/> |
869 |
< |
<arg value="-tag"/> |
870 |
< |
<arg value="${javadoc.jls.option}"/> |
871 |
< |
<!-- @apiNote currently unused --> |
872 |
< |
<!-- <arg value="-tag"/> --> |
873 |
< |
<!-- <arg value="apiNote:a:<em>API Note:</em>"/> --> |
829 |
< |
<arg value="-tag"/> |
830 |
< |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
831 |
< |
<arg value="-tag"/> |
832 |
< |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
869 |
> |
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
870 |
> |
<arg value="-tag"/> <arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
871 |
> |
<arg value="-tag"/> <arg value="implNote:a:<em>Implementation Note:</em>"/> |
872 |
> |
<!-- @apiNote tag currently unused --> |
873 |
> |
<!-- <arg value="-tag"/> <arg value="apiNote:a:<em>API Note:</em>"/> --> |
874 |
|
</javadoc> |
875 |
|
</target> |
876 |
|
|
1400 |
|
|
1401 |
|
<!-- Find buglets that can be detected by static build tools --> |
1402 |
|
|
1403 |
< |
<target name="lint"> |
1404 |
< |
<antcall target="dists"> |
1405 |
< |
<param name="build.javadoc.access" value="public"/> |
1406 |
< |
</antcall> |
1407 |
< |
</target> |
1403 |
> |
<!-- <target name="lint"> --> |
1404 |
> |
<!-- <antcall target="dists"> --> |
1405 |
> |
<!-- <param name="build.javadoc.access" value="protected"/> --> |
1406 |
> |
<!-- </antcall> --> |
1407 |
> |
<!-- </target> --> |
1408 |
|
|
1409 |
|
<!-- Generates all doclint warnings, even for private methods (rarely useful) --> |
1410 |
< |
<target name="lint-private"> |
1410 |
> |
<target name="doclint-private"> |
1411 |
|
<antcall target="dist"> |
1412 |
|
<param name="build.javadoc.access" value="private"/> |
1413 |
|
</antcall> |
1415 |
|
|
1416 |
|
|
1417 |
|
<!-- ============================================================== |
1418 |
< |
Experimental errorprone support - http://errorprone.info |
1378 |
< |
You may need to bring your own errorprone jar. |
1418 |
> |
Experimental errorprone support - https://errorprone.info |
1419 |
|
=================================================================== --> |
1420 |
+ |
<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/> |
1421 |
+ |
<property name="errorprone.jsr166.user.flags" value=""/> |
1422 |
+ |
<property name="errorprone.jsr166.flags" |
1423 |
+ |
value="-Xep:HashtableContains:OFF |
1424 |
+ |
-Xep:JdkObsolete:OFF |
1425 |
+ |
-Xep:MissingOverride:OFF |
1426 |
+ |
-Xep:MissingFail:OFF |
1427 |
+ |
-Xep:MixedArrayDimensions:ERROR |
1428 |
+ |
-Xep:RemoveUnusedImports:ERROR |
1429 |
+ |
-Xep:EmptyIf:ERROR |
1430 |
+ |
-Xep:MultipleTopLevelClasses:ERROR |
1431 |
+ |
-Xep:ClassName:ERROR |
1432 |
+ |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1433 |
+ |
-Xep:RedundantThrows:ERROR |
1434 |
+ |
-Xep:IdentityBinaryExpression:WARN |
1435 |
+ |
-Xep:MethodCanBeStatic:WARN |
1436 |
+ |
${errorprone.jsr166.user.flags}"/> |
1437 |
+ |
<!-- -Xep:WildcardImport:ERROR --> |
1438 |
+ |
<property name="errorprone.jsr166.test.flags" |
1439 |
+ |
value="-Xep:StringSplitter:OFF |
1440 |
+ |
-Xep:BoxedPrimitiveConstructor:OFF |
1441 |
+ |
-Xep:ModifyingCollectionWithItself:OFF"/> |
1442 |
+ |
<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' --> |
1443 |
|
<target name="errorprone" |
1444 |
|
depends="clean, configure-compiler" |
1445 |
|
description="Run errorprone over jsr166 source code (experimental)"> |
1461 |
|
fork="true"> |
1462 |
|
|
1463 |
|
<include name="**/*.java"/> |
1464 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1465 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1466 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1467 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/> |
1405 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/> |
1406 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/> |
1407 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/> |
1408 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1409 |
< |
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1410 |
< |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/> |
1464 |
> |
<!-- Needed to silence -Xep:FutureReturnValueIgnored --> |
1465 |
> |
<compilerarg value="-J--illegal-access=permit"/> |
1466 |
> |
<compilerarg value="-XDcompilePolicy=simple"/> |
1467 |
> |
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1468 |
|
<compilerarg value="-Xplugin:ErrorProne |
1469 |
< |
-Xep:IdentityBinaryExpression:WARN |
1413 |
< |
-Xep:MissingOverride:OFF |
1414 |
< |
-Xep:MixedArrayDimensions:WARN |
1415 |
< |
-Xep:RemoveUnusedImports:ERROR |
1416 |
< |
-Xep:ClassName:ERROR |
1417 |
< |
-Xep:MultipleTopLevelClasses:ERROR |
1418 |
< |
-Xep:EmptyIf:ERROR |
1419 |
< |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1420 |
< |
-Xep:ArgumentParameterSwap:ERROR |
1421 |
< |
-Xep:RedundantThrows:ERROR |
1422 |
< |
-Xep:MethodCanBeStatic:WARN"/> |
1469 |
> |
${errorprone.jsr166.flags}"/> |
1470 |
|
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
1471 |
|
<compilerarg value="-Xprefer:source"/> |
1472 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1485 |
|
workdir="${build.dir}" |
1486 |
|
classes="${product.jar}"> |
1487 |
|
<javac-elements> |
1488 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1489 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1490 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1491 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/> |
1445 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/> |
1446 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/> |
1447 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/> |
1448 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1449 |
< |
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1450 |
< |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/> |
1488 |
> |
<!-- Needed to silence -Xep:FutureReturnValueIgnored --> |
1489 |
> |
<compilerarg value="-J--illegal-access=permit"/> |
1490 |
> |
<compilerarg value="-XDcompilePolicy=simple"/> |
1491 |
> |
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1492 |
|
<compilerarg value="-Xplugin:ErrorProne |
1493 |
< |
-Xep:IdentityBinaryExpression:WARN |
1494 |
< |
-Xep:BoxedPrimitiveConstructor:OFF |
1454 |
< |
-Xep:HashtableContains:OFF |
1455 |
< |
-Xep:ModifyingCollectionWithItself:OFF |
1456 |
< |
-Xep:MissingOverride:OFF |
1457 |
< |
-Xep:MixedArrayDimensions:WARN |
1458 |
< |
-Xep:RemoveUnusedImports:ERROR |
1459 |
< |
-Xep:ClassName:ERROR |
1460 |
< |
-Xep:MultipleTopLevelClasses:ERROR |
1461 |
< |
-Xep:EmptyIf:ERROR |
1462 |
< |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1463 |
< |
-Xep:ArgumentParameterSwap:ERROR |
1464 |
< |
-Xep:RedundantThrows:ERROR |
1465 |
< |
-Xep:MethodCanBeStatic:WARN"/> |
1493 |
> |
${errorprone.jsr166.flags} |
1494 |
> |
${errorprone.jsr166.test.flags}"/> |
1495 |
|
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1496 |
|
</javac-elements> |
1497 |
|
</run-tck-tests> |
1498 |
|
</target> |
1499 |
|
|
1500 |
+ |
<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' --> |
1501 |
+ |
<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports --> |
1502 |
+ |
<target name="errorprone-jtreg" |
1503 |
+ |
depends="jar" |
1504 |
+ |
description="Run errorprone over jtreg tests (experimental)"> |
1505 |
+ |
|
1506 |
+ |
<run-jtreg-tests |
1507 |
+ |
target="${build.main.java.version}" |
1508 |
+ |
workdir="${build.dir}" |
1509 |
+ |
classes="${product.jar}" |
1510 |
+ |
verbose="all"> |
1511 |
+ |
<jtreg-elements> |
1512 |
+ |
<arg value="-javacoption:-XDcompilePolicy=simple"/> |
1513 |
+ |
<arg value="-javacoption:-processorpath"/> |
1514 |
+ |
<arg value="-javacoption:${errorprone.jar}"/> |
1515 |
+ |
<arg value="-javacoption:-Xplugin:ErrorProne |
1516 |
+ |
${errorprone.jsr166.flags} |
1517 |
+ |
${errorprone.jsr166.test.flags} |
1518 |
+ |
-Xep:MultipleTopLevelClasses:WARN |
1519 |
+ |
-Xep:NonAtomicVolatileUpdate:OFF"/> |
1520 |
+ |
</jtreg-elements> |
1521 |
+ |
</run-jtreg-tests> |
1522 |
+ |
</target> |
1523 |
+ |
|
1524 |
|
|
1525 |
|
<!-- ============================================================== |
1526 |
|
Running guava tests against jsr166 code |
1575 |
|
dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/> |
1576 |
|
<junit printsummary="true" showoutput="true" haltonfailure="true" |
1577 |
|
jvm="${build.main.java}" fork="true"> |
1578 |
< |
<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/> |
1578 |
> |
<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/> |
1579 |
|
<formatter type="brief"/> |
1580 |
|
<classpath> |
1581 |
|
<pathelement location="${guava.dir}/guava-testlib-tests.jar"/> |