| 296 |
|
</macrodef> |
| 297 |
|
|
| 298 |
|
<!-- Define jtreg test sets for different jdk versions --> |
| 299 |
+ |
<fileset dir="${jtreg10.src.dir}"> |
| 300 |
+ |
<patternset id="jdk10.jtreg.tests"> |
| 301 |
+ |
<include name="**/*.java"/> |
| 302 |
+ |
</patternset> |
| 303 |
+ |
</fileset> |
| 304 |
+ |
|
| 305 |
|
<fileset dir="${jtreg9.src.dir}"> |
| 306 |
|
<patternset id="jdk9.jtreg.tests"> |
| 307 |
|
<include name="**/*.java"/> |
| 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 |
|
|
| 382 |
– |
<local name="modules"/> |
| 383 |
– |
<condition property="modules"> |
| 384 |
– |
<and> |
| 385 |
– |
<available file="${jdk9.home}/jmods" type="dir"/> |
| 386 |
– |
<equals arg1="9" arg2="${build.main.java.version}"/> |
| 387 |
– |
</and> |
| 388 |
– |
</condition> |
| 389 |
– |
|
| 397 |
|
<local name="destdir"/> |
| 398 |
< |
<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/> |
| 392 |
< |
<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}"/> --> |
| 601 |
< |
<!-- </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}"/> --> |
| 607 |
< |
<!-- </antcall> --> |
| 608 |
> |
<antcall target="clean"/> |
| 609 |
> |
<antcall target="test"> |
| 610 |
> |
<param name="build.main.java.version" value="10"/> |
| 611 |
> |
</antcall> |
| 612 |
|
|
| 613 |
< |
<!-- </target> --> |
| 613 |
> |
</target> |
| 614 |
|
|
| 615 |
|
|
| 616 |
|
|
| 678 |
|
includeAntRuntime="false" |
| 679 |
|
includeJavaRuntime="false" |
| 680 |
|
encoding="ASCII" |
| 681 |
< |
executable="${javac9}" |
| 681 |
> |
executable="${build.main.javac}" |
| 682 |
|
fork="true"> |
| 683 |
|
|
| 684 |
|
<include name="*.java"/> |
| 1519 |
|
<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar" |
| 1520 |
|
dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/> |
| 1521 |
|
<junit printsummary="true" showoutput="true" haltonfailure="true" |
| 1522 |
< |
jvm="${java9}" fork="true"> |
| 1522 |
> |
jvm="${build.main.java}" fork="true"> |
| 1523 |
|
<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/> |
| 1524 |
|
<formatter type="brief"/> |
| 1525 |
|
<classpath> |
