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"/> |
325 |
|
|
326 |
|
<macrodef name="run-jtreg-tests"> |
327 |
|
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
322 |
– |
<attribute name="source" default="7"/> |
328 |
|
<attribute name="target"/> |
329 |
|
<attribute name="workdir"/> |
330 |
|
<attribute name="classes"/> |
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 |
|
|
383 |
– |
<local name="modules"/> |
384 |
– |
<condition property="modules"> |
385 |
– |
<and> |
386 |
– |
<available file="${jdk9.home}/jmods" type="dir"/> |
387 |
– |
<equals arg1="9" arg2="${build.main.java.version}"/> |
388 |
– |
</and> |
389 |
– |
</condition> |
390 |
– |
|
397 |
|
<local name="destdir"/> |
398 |
< |
<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/> |
393 |
< |
<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"/> |
419 |
< |
<compilerarg value="-Werror"/> |
419 |
> |
<compilerarg line="--doclint-format html5"/> |
420 |
|
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
421 |
+ |
<compilerarg value="-Werror"/> |
422 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
423 |
|
<compilerarg line="${build.args}"/> |
424 |
|
|
462 |
|
access="${build.javadoc.access}" |
463 |
|
sourcepath="${src.dir}" |
464 |
|
classpath="" |
465 |
< |
executable="${javadoc9}"> |
465 |
> |
source="9" |
466 |
> |
executable="${build.main.javadoc}"> |
467 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
468 |
|
<include name="**/*.java"/> |
469 |
|
</fileset> |
470 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
471 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
472 |
|
<arg value="-XDignore.symbol.file=true"/> |
473 |
+ |
<arg value="-html5"/> |
474 |
|
<arg value="--patch-module=java.base=${src.dir}"/> |
475 |
|
<arg value="-tag"/> |
476 |
|
<arg value="${javadoc.jls.option}"/> |
680 |
|
includeAntRuntime="false" |
681 |
|
includeJavaRuntime="false" |
682 |
|
encoding="ASCII" |
683 |
< |
executable="${javac9}" |
683 |
> |
executable="${build.main.javac}" |
684 |
|
fork="true"> |
685 |
|
|
686 |
|
<include name="*.java"/> |
813 |
|
access="${build.javadoc.access}" |
814 |
|
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}" |
815 |
|
classpath="" |
816 |
+ |
source="8" |
817 |
|
executable="${javadoc8}" |
818 |
|
failonerror = "true"> |
819 |
|
<fileset dir="${4jdk8src.dir}" defaultexcludes="yes"> |
1521 |
|
<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar" |
1522 |
|
dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/> |
1523 |
|
<junit printsummary="true" showoutput="true" haltonfailure="true" |
1524 |
< |
jvm="${java9}" fork="true"> |
1524 |
> |
jvm="${build.main.java}" fork="true"> |
1525 |
|
<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/> |
1526 |
|
<formatter type="brief"/> |
1527 |
|
<classpath> |