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> |
306 |
|
</macrodef> |
307 |
|
|
308 |
|
<!-- Define jtreg test sets for different jdk versions --> |
309 |
< |
<fileset dir="${jtreg11.src.dir}"> |
310 |
< |
<patternset id="jdk11.jtreg.tests"> |
311 |
< |
<include name="**/*.java"/> |
312 |
< |
</patternset> |
313 |
< |
</fileset> |
314 |
< |
|
315 |
< |
<fileset dir="${jtreg10.src.dir}"> |
316 |
< |
<patternset id="jdk10.jtreg.tests"> |
317 |
< |
<include name="**/*.java"/> |
318 |
< |
</patternset> |
319 |
< |
</fileset> |
320 |
< |
|
321 |
< |
<fileset dir="${jtreg9.src.dir}"> |
321 |
< |
<patternset id="jdk9.jtreg.tests"> |
322 |
< |
<include name="**/*.java"/> |
323 |
< |
</patternset> |
324 |
< |
</fileset> |
325 |
< |
|
326 |
< |
<fileset dir="${jtreg8.src.dir}"> |
327 |
< |
<patternset id="jdk8.jtreg.tests"> |
328 |
< |
<include name="**/*.java"/> |
329 |
< |
</patternset> |
330 |
< |
</fileset> |
309 |
> |
<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" --> |
310 |
> |
<!-- ant -Djtreg.test.pattern="**/ToArray.java" --> |
311 |
> |
<property name="jtreg.test.pattern" value="**/*.java"/> |
312 |
> |
<macrodef name="defjtregtests"> |
313 |
> |
<attribute name="v"/> |
314 |
> |
<sequential> |
315 |
> |
<fileset dir="${jtreg@{v}.src.dir}"> |
316 |
> |
<patternset id="jdk@{v}.jtreg.tests"> |
317 |
> |
<include name="${jtreg.test.pattern}"/> |
318 |
> |
</patternset> |
319 |
> |
</fileset> |
320 |
> |
</sequential> |
321 |
> |
</macrodef> |
322 |
|
|
323 |
< |
<fileset dir="${jtreg7.src.dir}"> |
324 |
< |
<patternset id="jdk7.jtreg.tests"> |
325 |
< |
<include name="**/*.java"/> |
326 |
< |
</patternset> |
327 |
< |
</fileset> |
323 |
> |
<defjtregtests v="11"/> |
324 |
> |
<defjtregtests v="10"/> |
325 |
> |
<defjtregtests v="9"/> |
326 |
> |
<defjtregtests v="8"/> |
327 |
> |
<defjtregtests v="7"/> |
328 |
|
|
329 |
|
<!-- ant -Djtreg.flags=-timeoutFactor:4 --> |
330 |
|
<property name="jtreg.flags" value=""/> |
387 |
|
<sequential> |
388 |
|
<property name="build.main.java" value="${java@{v}}"/> |
389 |
|
<property name="build.main.javac" value="${javac@{v}}"/> |
390 |
< |
<property name="build.main.javadoc" value="${javadoc@{v}}"/> |
390 |
> |
<!-- Force javadoc version to be at least 10, |
391 |
> |
so we can use override-methods=summary --> |
392 |
> |
<condition property="build.main.javadoc" |
393 |
> |
value="${javadoc10}" |
394 |
> |
else="${javadoc@{v}}"> |
395 |
> |
<equals arg1="@{v}" arg2="9"/> |
396 |
> |
</condition> |
397 |
|
</sequential> |
398 |
|
</macrodef> |
399 |
|
<define-build-main-properties v="${build.main.java.version}"/> |
487 |
|
<arg value="-XDignore.symbol.file=true"/> |
488 |
|
<arg value="-html5"/> |
489 |
|
<arg value="--patch-module=java.base=${src.dir}"/> |
490 |
< |
<arg value="-tag"/> |
491 |
< |
<arg value="${javadoc.jls.option}"/> |
492 |
< |
<!-- @apiNote currently unused --> |
493 |
< |
<!-- <arg value="-tag"/> --> |
494 |
< |
<!-- <arg value="apiNote:a:API Note:"/> --> |
495 |
< |
<arg value="-tag"/> |
499 |
< |
<arg value="implSpec:a:Implementation Requirements:"/> |
500 |
< |
<arg value="-tag"/> |
501 |
< |
<arg value="implNote:a:Implementation Note:"/> |
490 |
> |
<arg value="--override-methods=summary"/> |
491 |
> |
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
492 |
> |
<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/> |
493 |
> |
<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/> |
494 |
> |
<!-- @apiNote tag currently unused --> |
495 |
> |
<!-- <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> --> |
496 |
|
<!-- tags added in jdk9: currently unused --> |
497 |
< |
<!-- <arg value="-tag"/> --> |
498 |
< |
<!-- <arg value="revised:X"/> --> |
505 |
< |
<!-- <arg value="-tag"/> --> |
506 |
< |
<!-- <arg value="spec:X"/> --> |
497 |
> |
<!-- <arg value="-tag"/> <arg value="revised:X"/> --> |
498 |
> |
<!-- <arg value="-tag"/> <arg value="spec:X"/> --> |
499 |
|
</javadoc> |
500 |
|
</target> |
501 |
|
|
837 |
|
</fileset> |
838 |
|
<arg line="-Xdocrootparent ${java8.docroot.url}"/> |
839 |
|
<arg value="-XDignore.symbol.file=true"/> |
840 |
< |
<arg value="-tag"/> |
841 |
< |
<arg value="${javadoc.jls.option}"/> |
842 |
< |
<!-- @apiNote currently unused --> |
843 |
< |
<!-- <arg value="-tag"/> --> |
844 |
< |
<!-- <arg value="apiNote:a:<em>API Note:</em>"/> --> |
853 |
< |
<arg value="-tag"/> |
854 |
< |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
855 |
< |
<arg value="-tag"/> |
856 |
< |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
840 |
> |
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
841 |
> |
<arg value="-tag"/> <arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
842 |
> |
<arg value="-tag"/> <arg value="implNote:a:<em>Implementation Note:</em>"/> |
843 |
> |
<!-- @apiNote tag currently unused --> |
844 |
> |
<!-- <arg value="-tag"/> <arg value="apiNote:a:<em>API Note:</em>"/> --> |
845 |
|
</javadoc> |
846 |
|
</target> |
847 |
|
|
1430 |
|
fork="true"> |
1431 |
|
|
1432 |
|
<include name="**/*.java"/> |
1433 |
+ |
<compilerarg value="-XDcompilePolicy=simple"/> |
1434 |
|
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1435 |
|
<compilerarg value="-Xplugin:ErrorProne |
1436 |
|
${errorprone.jsr166.flags}"/> |
1452 |
|
workdir="${build.dir}" |
1453 |
|
classes="${product.jar}"> |
1454 |
|
<javac-elements> |
1455 |
+ |
<compilerarg value="-XDcompilePolicy=simple"/> |
1456 |
|
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1457 |
|
<compilerarg value="-Xplugin:ErrorProne |
1458 |
|
${errorprone.jsr166.flags} |
1474 |
|
classes="${product.jar}" |
1475 |
|
verbose="all"> |
1476 |
|
<jtreg-elements> |
1477 |
< |
<arg value="-javacoption:-XDcompilePolicy=byfile"/> |
1477 |
> |
<arg value="-javacoption:-XDcompilePolicy=simple"/> |
1478 |
|
<arg value="-javacoption:-processorpath"/> |
1479 |
|
<arg value="-javacoption:${errorprone.jar}"/> |
1480 |
|
<arg value="-javacoption:-Xplugin:ErrorProne |