346 |
|
workDir="@{workdir}/JTwork"> |
347 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
348 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
349 |
< |
<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
350 |
< |
<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
349 |
> |
<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
350 |
> |
<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
351 |
|
<arg value="-agentvm"/> |
352 |
|
<arg value="-noreport"/> |
353 |
|
<arg value="-verbose:${jtreg.verbose}"/> |
372 |
|
<!-- Main targets --> |
373 |
|
|
374 |
|
<property name="build.main.java.version" value="9"/> |
375 |
< |
<property name="build.main.javac" value="${javac9}"/> |
375 |
> |
<!-- Workaround "no nested properties in ant" --> |
376 |
> |
<macrodef name="define-build-main-properties"> |
377 |
> |
<attribute name="v"/> |
378 |
> |
<sequential> |
379 |
> |
<property name="build.main.java" value="${java@{v}}"/> |
380 |
> |
<property name="build.main.javac" value="${javac@{v}}"/> |
381 |
> |
<property name="build.main.javadoc" value="${javadoc@{v}}"/> |
382 |
> |
</sequential> |
383 |
> |
</macrodef> |
384 |
> |
<define-build-main-properties v="${build.main.java.version}"/> |
385 |
|
|
386 |
|
<target name="dists" |
387 |
|
depends="dist, 4jdk8dist" |
394 |
|
depends="configure-compiler" |
395 |
|
description="Compiles src/main sources to build dir"> |
396 |
|
|
388 |
– |
<local name="modules"/> |
389 |
– |
<condition property="modules"> |
390 |
– |
<and> |
391 |
– |
<available file="${jdk9.home}/jmods" type="dir"/> |
392 |
– |
<equals arg1="9" arg2="${build.main.java.version}"/> |
393 |
– |
</and> |
394 |
– |
</condition> |
395 |
– |
|
397 |
|
<local name="destdir"/> |
398 |
< |
<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/> |
398 |
< |
<property name="destdir" value="${build.classes.dir}" unless:set="modules"/> |
398 |
> |
<property name="destdir" value="${build.classes.dir}/java.base"/> |
399 |
|
|
400 |
|
<mkdir dir="${destdir}"/> |
401 |
|
|
412 |
|
fork="true"> |
413 |
|
|
414 |
|
<include name="**/*.java"/> |
415 |
< |
<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/> |
415 |
> |
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
416 |
|
<compilerarg value="-Xprefer:source"/> |
417 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
418 |
|
<compilerarg value="-Xlint:all"/> |
463 |
|
sourcepath="${src.dir}" |
464 |
|
classpath="" |
465 |
|
source="9" |
466 |
< |
executable="${javadoc9}"> |
466 |
> |
executable="${build.main.javadoc}"> |
467 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
468 |
|
<include name="**/*.java"/> |
469 |
|
</fileset> |
597 |
|
|
598 |
|
<!-- </target> --> |
599 |
|
|
600 |
< |
<!-- <target name="test89" --> |
601 |
< |
<!-- description="Runs tck and jtreg tests for src/main for multiple java versions"> --> |
600 |
> |
<target name="test910" |
601 |
> |
description="Runs tck and jtreg tests for src/main for multiple java versions"> |
602 |
|
|
603 |
< |
<!-- <antcall target="clean"/> --> |
604 |
< |
<!-- <antcall target="test"> --> |
605 |
< |
<!-- <param name="build.main.java.version" value="8"/> --> |
606 |
< |
<!-- <param name="build.main.javac" value="${javac8}"/> --> |
607 |
< |
<!-- </antcall> --> |
603 |
> |
<antcall target="clean"/> |
604 |
> |
<antcall target="test"> |
605 |
> |
<param name="build.main.java.version" value="9"/> |
606 |
> |
</antcall> |
607 |
|
|
608 |
< |
<!-- <antcall target="clean"/> --> |
609 |
< |
<!-- <antcall target="test"> --> |
610 |
< |
<!-- <param name="build.main.java.version" value="9"/> --> |
611 |
< |
<!-- <param name="build.main.javac" value="${javac9}"/> --> |
613 |
< |
<!-- </antcall> --> |
608 |
> |
<antcall target="clean"/> |
609 |
> |
<antcall target="test"> |
610 |
> |
<param name="build.main.java.version" value="10"/> |
611 |
> |
</antcall> |
612 |
|
|
613 |
< |
<!-- </target> --> |
613 |
> |
<!-- Clean up to avoid obscure wrong class file version bugs --> |
614 |
> |
<antcall target="clean"/> |
615 |
> |
|
616 |
> |
</target> |
617 |
|
|
618 |
|
|
619 |
|
|
681 |
|
includeAntRuntime="false" |
682 |
|
includeJavaRuntime="false" |
683 |
|
encoding="ASCII" |
684 |
< |
executable="${javac9}" |
684 |
> |
executable="${build.main.javac}" |
685 |
|
fork="true"> |
686 |
|
|
687 |
|
<include name="*.java"/> |
1376 |
|
|
1377 |
|
<!-- ============================================================== |
1378 |
|
Experimental errorprone support - http://errorprone.info |
1378 |
– |
You may need to bring your own errorprone jar. |
1379 |
|
=================================================================== --> |
1380 |
|
<target name="errorprone" |
1381 |
|
depends="clean, configure-compiler" |
1398 |
|
fork="true"> |
1399 |
|
|
1400 |
|
<include name="**/*.java"/> |
1401 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1402 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1403 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1404 |
< |
<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"/> |
1401 |
> |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/> |
1402 |
|
<compilerarg value="-Xplugin:ErrorProne |
1403 |
|
-Xep:IdentityBinaryExpression:WARN |
1404 |
|
-Xep:MissingOverride:OFF |
1408 |
|
-Xep:MultipleTopLevelClasses:ERROR |
1409 |
|
-Xep:EmptyIf:ERROR |
1410 |
|
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1420 |
– |
-Xep:ArgumentParameterSwap:ERROR |
1411 |
|
-Xep:RedundantThrows:ERROR |
1412 |
|
-Xep:MethodCanBeStatic:WARN"/> |
1413 |
|
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
1428 |
|
workdir="${build.dir}" |
1429 |
|
classes="${product.jar}"> |
1430 |
|
<javac-elements> |
1431 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1442 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1443 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1444 |
< |
<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"/> |
1431 |
> |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/> |
1432 |
|
<compilerarg value="-Xplugin:ErrorProne |
1433 |
|
-Xep:IdentityBinaryExpression:WARN |
1434 |
|
-Xep:BoxedPrimitiveConstructor:OFF |
1441 |
|
-Xep:MultipleTopLevelClasses:ERROR |
1442 |
|
-Xep:EmptyIf:ERROR |
1443 |
|
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1463 |
– |
-Xep:ArgumentParameterSwap:ERROR |
1444 |
|
-Xep:RedundantThrows:ERROR |
1445 |
|
-Xep:MethodCanBeStatic:WARN"/> |
1446 |
|
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1501 |
|
<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar" |
1502 |
|
dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/> |
1503 |
|
<junit printsummary="true" showoutput="true" haltonfailure="true" |
1504 |
< |
jvm="${java9}" fork="true"> |
1505 |
< |
<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/> |
1504 |
> |
jvm="${build.main.java}" fork="true"> |
1505 |
> |
<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/> |
1506 |
|
<formatter type="brief"/> |
1507 |
|
<classpath> |
1508 |
|
<pathelement location="${guava.dir}/guava-testlib-tests.jar"/> |