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 |
+ |
$HOME/jdk/jdk13 |
28 |
|
where each of the above is a JDK or a symlink to same, and |
29 |
|
$HOME/jdk/src/jdk8 |
30 |
|
$HOME/jdk/src/jdk9 |
31 |
|
$HOME/jdk/src/jdk10 |
32 |
+ |
$HOME/jdk/src/jdk11 |
33 |
+ |
$HOME/jdk/src/jdk12 |
34 |
+ |
$HOME/jdk/src/jdk13 |
35 |
|
where each of the above is a complete JDK source tree |
36 |
|
(e.g. mercurial forest) or a symlink to same. |
37 |
|
|
38 |
|
Alternatively, define ant variables thus: |
39 |
|
ant -Djdk$N.home=... -Djdk$N.src.home=... |
40 |
< |
for $N in 8 9 10 ... |
40 |
> |
for $N in 8 .. 13 ... |
41 |
|
|
42 |
|
As of 2016-03, the sources in src/main are for jdk9+ only. |
43 |
|
------------------------------------------------------------------------------ |
57 |
|
|
58 |
|
|
59 |
|
<!-- Compilation options --> |
53 |
– |
<property name="build.sourcelevel" value="6"/> |
60 |
|
<property name="build.debug" value="true"/> |
61 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
62 |
|
<property name="build.deprecation" value="false"/> |
107 |
|
<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes" |
108 |
|
unless:set="have.java.base"/> |
109 |
|
<local name="modules"/> |
110 |
< |
<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/> |
110 |
> |
<available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/> |
111 |
|
<local name="boot.jar.dir"/> |
112 |
|
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib" unless:set="modules"/> |
113 |
|
<path id="bootclasspath@{v}" unless:set="modules"> |
138 |
|
<defjdklocations v="8"/> |
139 |
|
<defjdklocations v="9"/> |
140 |
|
<defjdklocations v="10"/> |
141 |
+ |
<defjdklocations v="11"/> |
142 |
+ |
<defjdklocations v="12"/> |
143 |
+ |
<defjdklocations v="13"/> |
144 |
|
|
145 |
|
<!-- Source locations --> |
146 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
151 |
|
<property name="jtreg8.src.dir" location="${test.src.dir}/jtreg-jdk8"/> |
152 |
|
<property name="jtreg9.src.dir" location="${test.src.dir}/jtreg"/> |
153 |
|
<property name="jtreg10.src.dir" location="${test.src.dir}/jtreg"/> |
154 |
+ |
<property name="jtreg11.src.dir" location="${test.src.dir}/jtreg"/> |
155 |
+ |
<property name="jtreg12.src.dir" location="${test.src.dir}/jtreg"/> |
156 |
+ |
<property name="jtreg13.src.dir" location="${test.src.dir}/jtreg"/> |
157 |
|
<property name="jtreg.src.dir" location="${jtreg9.src.dir}"/> |
158 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
159 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
193 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
194 |
|
|
195 |
|
<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag --> |
196 |
< |
<property name="java5.docroot.url" value="http://docs.oracle.com/javase/1.5.0/docs"/> |
197 |
< |
<property name="java6.docroot.url" value="http://docs.oracle.com/javase/6/docs"/> |
198 |
< |
<property name="java7.docroot.url" value="http://docs.oracle.com/javase/7/docs"/> |
199 |
< |
<property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> |
200 |
< |
<!-- The expected canonical location does not yet exist as of 2016-04 --> |
201 |
< |
<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> --> |
202 |
< |
<property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> |
203 |
< |
<!-- Default jdk doc location (latest stable release seems best) --> |
204 |
< |
<property name="java.docroot.url" value="${java8.docroot.url}"/> |
196 |
> |
<!-- Switched to https: in 2017-10 - JDK-8190312 --> |
197 |
> |
<property name="java5.docroot.url" value="https://docs.oracle.com/javase/1.5.0/docs"/> |
198 |
> |
<property name="java6.docroot.url" value="https://docs.oracle.com/javase/6/docs"/> |
199 |
> |
<property name="java7.docroot.url" value="https://docs.oracle.com/javase/7/docs"/> |
200 |
> |
<property name="java8.docroot.url" value="https://docs.oracle.com/javase/8/docs"/> |
201 |
> |
<property name="java9.docroot.url" value="https://docs.oracle.com/javase/9/docs"/> |
202 |
> |
<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/> |
203 |
> |
<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/> |
204 |
> |
<property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/> |
205 |
> |
<!-- The location of jdk early access docs (RIP) --> |
206 |
> |
<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> --> |
207 |
> |
<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> --> |
208 |
> |
<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> --> |
209 |
> |
<!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> --> |
210 |
> |
<property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> |
211 |
> |
<!-- Default jdk doc location (latest stable LTS release seems best) --> |
212 |
> |
<property name="java.docroot.url" value="${java11.docroot.url}"/> |
213 |
|
|
214 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
215 |
|
<property name="java5.api.url" value="${java5.docroot.url}/api/"/> |
217 |
|
<property name="java7.api.url" value="${java7.docroot.url}/api/"/> |
218 |
|
<property name="java8.api.url" value="${java8.docroot.url}/api/"/> |
219 |
|
<property name="java9.api.url" value="${java9.docroot.url}/api/"/> |
220 |
+ |
<property name="java10.api.url" value="${java10.docroot.url}/api/"/> |
221 |
+ |
<property name="java11.api.url" value="${java11.docroot.url}/api/"/> |
222 |
+ |
<property name="java12.api.url" value="${java12.docroot.url}/api/"/> |
223 |
+ |
<property name="java13.api.url" value="${java13.docroot.url}/api/"/> |
224 |
|
<property name="java.api.url" value="${java.docroot.url}/api/"/> |
225 |
|
|
226 |
|
<!-- Define the "jtreg" task --> |
253 |
|
|
254 |
|
<local name="modules"/> |
255 |
|
<condition property="modules"> |
256 |
< |
<available file="${jdk@{compile-target}.home}/jmods" type="dir"/> |
256 |
> |
<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/> |
257 |
|
</condition> |
258 |
|
|
259 |
|
<local name="use-doclint"/> |
320 |
|
</macrodef> |
321 |
|
|
322 |
|
<!-- Define jtreg test sets for different jdk versions --> |
323 |
< |
<fileset dir="${jtreg10.src.dir}"> |
324 |
< |
<patternset id="jdk10.jtreg.tests"> |
325 |
< |
<include name="**/*.java"/> |
326 |
< |
</patternset> |
327 |
< |
</fileset> |
328 |
< |
|
329 |
< |
<fileset dir="${jtreg9.src.dir}"> |
330 |
< |
<patternset id="jdk9.jtreg.tests"> |
331 |
< |
<include name="**/*.java"/> |
332 |
< |
</patternset> |
333 |
< |
</fileset> |
334 |
< |
|
335 |
< |
<fileset dir="${jtreg8.src.dir}"> |
312 |
< |
<patternset id="jdk8.jtreg.tests"> |
313 |
< |
<include name="**/*.java"/> |
314 |
< |
</patternset> |
315 |
< |
</fileset> |
323 |
> |
<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" --> |
324 |
> |
<!-- ant -Djtreg.test.pattern="**/ToArray.java" --> |
325 |
> |
<property name="jtreg.test.pattern" value="**/*.java"/> |
326 |
> |
<macrodef name="defjtregtests"> |
327 |
> |
<attribute name="v"/> |
328 |
> |
<sequential> |
329 |
> |
<fileset dir="${jtreg@{v}.src.dir}"> |
330 |
> |
<patternset id="jdk@{v}.jtreg.tests"> |
331 |
> |
<include name="${jtreg.test.pattern}"/> |
332 |
> |
</patternset> |
333 |
> |
</fileset> |
334 |
> |
</sequential> |
335 |
> |
</macrodef> |
336 |
|
|
337 |
< |
<fileset dir="${jtreg7.src.dir}"> |
338 |
< |
<patternset id="jdk7.jtreg.tests"> |
339 |
< |
<include name="**/*.java"/> |
340 |
< |
</patternset> |
341 |
< |
</fileset> |
337 |
> |
<defjtregtests v="13"/> |
338 |
> |
<defjtregtests v="12"/> |
339 |
> |
<defjtregtests v="11"/> |
340 |
> |
<defjtregtests v="10"/> |
341 |
> |
<defjtregtests v="9"/> |
342 |
> |
<defjtregtests v="8"/> |
343 |
> |
<defjtregtests v="7"/> |
344 |
|
|
345 |
|
<!-- ant -Djtreg.flags=-timeoutFactor:4 --> |
346 |
|
<property name="jtreg.flags" value=""/> |
347 |
|
|
348 |
|
<macrodef name="run-jtreg-tests"> |
349 |
< |
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
349 |
> |
<!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
350 |
|
<attribute name="target"/> |
351 |
|
<attribute name="workdir"/> |
352 |
|
<attribute name="classes"/> |
353 |
+ |
<attribute name="verbose" default="${jtreg.verbose}"/> |
354 |
|
<attribute name="jtregflags" default=""/> |
355 |
+ |
<element name="jtreg-elements" optional="true"/> |
356 |
|
|
357 |
|
<sequential> |
358 |
|
|
361 |
|
|
362 |
|
<local name="modules"/> |
363 |
|
<condition property="modules"> |
364 |
< |
<available file="${jdk@{target}.home}/jmods" type="dir"/> |
364 |
> |
<available file="${jdk@{target}.home}/lib/modules" type="file"/> |
365 |
|
</condition> |
366 |
|
|
367 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
370 |
|
workDir="@{workdir}/JTwork"> |
371 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
372 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
373 |
< |
<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
374 |
< |
<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
373 |
> |
<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
374 |
> |
<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
375 |
|
<arg value="-agentvm"/> |
376 |
|
<arg value="-noreport"/> |
377 |
< |
<arg value="-verbose:${jtreg.verbose}"/> |
377 |
> |
<arg value="-verbose:@{verbose}"/> |
378 |
|
<arg value="-vmoptions:-esa -ea"/> |
379 |
|
<arg value="-automatic"/> |
380 |
|
<arg value="-k:!ignore"/> |
381 |
|
<arg line="@{jtregflags}"/> |
382 |
|
<arg line="${jtreg.flags}"/> |
383 |
+ |
<jtreg-elements/> |
384 |
|
</jtreg> |
385 |
|
</sequential> |
386 |
|
</macrodef> |
396 |
|
|
397 |
|
<!-- Main targets --> |
398 |
|
|
399 |
< |
<property name="build.main.java.version" value="9"/> |
400 |
< |
<!-- Workaround "no nested properties in ant" --> |
401 |
< |
<macrodef name="define-build-main-properties"> |
402 |
< |
<attribute name="v"/> |
403 |
< |
<sequential> |
404 |
< |
<property name="build.main.java" value="${java@{v}}"/> |
405 |
< |
<property name="build.main.javac" value="${javac@{v}}"/> |
406 |
< |
<property name="build.main.javadoc" value="${javadoc@{v}}"/> |
407 |
< |
</sequential> |
408 |
< |
</macrodef> |
409 |
< |
<define-build-main-properties v="${build.main.java.version}"/> |
399 |
> |
<!-- Default values: may seem strange ... --> |
400 |
> |
<!-- At runtime, target latest LTS, i.e. jdk11 --> |
401 |
> |
<!-- But at build time, target jdk9, for maximal binary portability --> |
402 |
> |
<!-- Use javadoc12 (but -link to jdk11 api docs!), to get: |
403 |
> |
o override-methods=summary |
404 |
> |
o {@systemProperty ...} |
405 |
> |
o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation) |
406 |
> |
o 8202628: javadoc generates bad links in TestModules.java |
407 |
> |
--> |
408 |
> |
<property name="java.runtime.target" value="11"/> |
409 |
> |
<property name="build.main.java" value="${java11}"/> |
410 |
> |
<property name="build.main.javac" value="${javac9}"/> |
411 |
> |
<property name="build.main.javadoc" value="${javadoc12}"/> |
412 |
> |
<property name="build.main.javadoc.source" value="${java.runtime.target}"/> |
413 |
|
|
414 |
|
<target name="dists" |
415 |
|
depends="dist, 4jdk8dist" |
416 |
|
description="Builds all public jars and docs"/> |
417 |
< |
<!-- |
390 |
< |
depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
391 |
< |
--> |
417 |
> |
<!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist --> |
418 |
|
|
419 |
|
<target name="compile" |
420 |
|
depends="configure-compiler" |
441 |
|
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
442 |
|
<compilerarg value="-Xprefer:source"/> |
443 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
444 |
< |
<compilerarg value="-Xlint:all"/> |
444 |
> |
<compilerarg value="-Xlint:all,-removal"/> |
445 |
|
<compilerarg line="--doclint-format html5"/> |
446 |
|
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
447 |
+ |
<compilerarg value="-Xdoclint/package:java.util.*"/> |
448 |
|
<compilerarg value="-Werror"/> |
449 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
450 |
|
<compilerarg line="${build.args}"/> |
484 |
|
<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> --> |
485 |
|
<javadoc destdir="${docs.dir}" |
486 |
|
packagenames="none" |
487 |
< |
link="${java9.api.url}" |
487 |
> |
link="${java.api.url}" |
488 |
|
overview="${src.dir}/intro.html" |
489 |
|
access="${build.javadoc.access}" |
490 |
|
sourcepath="${src.dir}" |
491 |
|
classpath="" |
492 |
< |
source="9" |
492 |
> |
source="${build.main.javadoc.source}" |
493 |
|
executable="${build.main.javadoc}"> |
494 |
+ |
<!-- TODO: JDK-8214571 failonerror = "true" --> |
495 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
496 |
|
<include name="**/*.java"/> |
497 |
|
</fileset> |
498 |
< |
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
498 |
> |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
499 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
500 |
|
<arg value="-XDignore.symbol.file=true"/> |
501 |
|
<arg value="-html5"/> |
502 |
|
<arg value="--patch-module=java.base=${src.dir}"/> |
503 |
< |
<arg value="-tag"/> |
504 |
< |
<arg value="${javadoc.jls.option}"/> |
505 |
< |
<!-- @apiNote currently unused --> |
506 |
< |
<!-- <arg value="-tag"/> --> |
507 |
< |
<!-- <arg value="apiNote:a:API Note:"/> --> |
508 |
< |
<arg value="-tag"/> |
509 |
< |
<arg value="implSpec:a:Implementation Requirements:"/> |
510 |
< |
<arg value="-tag"/> |
483 |
< |
<arg value="implNote:a:Implementation Note:"/> |
503 |
> |
<!-- old school frames via docs/index.html?overview-summary.html --> |
504 |
> |
<!-- TODO: - -frames no longer a supported option in jdk13+ --> |
505 |
> |
<arg value="--frames"/> |
506 |
> |
<arg value="--override-methods=summary"/> |
507 |
> |
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
508 |
> |
<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/> |
509 |
> |
<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/> |
510 |
> |
<arg value="-tag"/> <arg value="apiNote:a:API Note:"/> |
511 |
|
<!-- tags added in jdk9: currently unused --> |
512 |
< |
<!-- <arg value="-tag"/> --> |
513 |
< |
<!-- <arg value="revised:X"/> --> |
487 |
< |
<!-- <arg value="-tag"/> --> |
488 |
< |
<!-- <arg value="spec:X"/> --> |
512 |
> |
<!-- <arg value="-tag"/> <arg value="revised:X"/> --> |
513 |
> |
<!-- <arg value="-tag"/> <arg value="spec:X"/> --> |
514 |
|
</javadoc> |
515 |
|
</target> |
516 |
|
|
520 |
|
description="Puts all distributable products in single hierarchy"/> |
521 |
|
|
522 |
|
|
498 |
– |
<target name="release" |
499 |
– |
depends="dist" |
500 |
– |
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
501 |
– |
|
502 |
– |
<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/> |
503 |
– |
|
504 |
– |
<jar basedir="${basedir}" destfile="${release.jar}"> |
505 |
– |
<!-- <exclude name="build/**"/> --> |
506 |
– |
<exclude name="${release.jar}"/> |
507 |
– |
<exclude name="user.properties"/> |
508 |
– |
<exclude name="etc/notes/**"/> |
509 |
– |
<exclude name="src/emulation/**"/> |
510 |
– |
<exclude name="**/SyntaxTest.java"/> |
511 |
– |
<exclude name="**/SuperfluousAbstract.java"/> |
512 |
– |
<manifest> |
513 |
– |
<attribute name="Built-By" value="${user.name}"/> |
514 |
– |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
515 |
– |
</manifest> |
516 |
– |
</jar> |
517 |
– |
</target> |
518 |
– |
|
519 |
– |
|
523 |
|
<target name="clean" |
524 |
|
description="Removes all build products"> |
525 |
|
<delete dir="${build.dir}"/> |
548 |
|
description="Runs tck tests for src/main directly"> |
549 |
|
|
550 |
|
<run-tck-tests |
551 |
< |
target="${build.main.java.version}" |
551 |
> |
target="${java.runtime.target}" |
552 |
|
workdir="${build.dir}" |
553 |
|
classes="${product.jar}"> |
554 |
|
<javac-elements> |
582 |
|
depends="jar" |
583 |
|
description="Runs jtreg tests for src/main using the jtreg ant task"> |
584 |
|
<run-jtreg-tests |
585 |
< |
target="${build.main.java.version}" |
585 |
> |
target="${java.runtime.target}" |
586 |
|
workdir="${build.dir}" |
587 |
|
classes="${product.jar}"/> |
588 |
|
</target> |
591 |
|
depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg" |
592 |
|
description="Runs tck and jtreg tests for src/main"/> |
593 |
|
|
594 |
< |
<!-- <target name="jtreg8" description="Runs jtreg tests with jdk8"> --> |
594 |
> |
<target name="test-version-permutations" |
595 |
> |
depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs"> |
596 |
> |
</target> |
597 |
|
|
598 |
< |
<!-- <antcall target="jtreg"> --> |
599 |
< |
<!-- <param name="build.main.java.version" value="8"/> --> |
600 |
< |
<!-- <param name="build.main.javac" value="${javac8}"/> --> |
601 |
< |
<!-- </antcall> --> |
598 |
> |
<target name="test9"> |
599 |
> |
<antcall target="clean"/> |
600 |
> |
<antcall> |
601 |
> |
<param name="java.runtime.target" value="9"/> |
602 |
> |
<param name="build.main.javac" value="${javac9}"/> |
603 |
> |
<param name="build.main.javadoc" value="${javadoc12}"/> |
604 |
> |
<param name="build.main.javadoc.source" value="9"/> |
605 |
> |
<target name="test"/> |
606 |
> |
<target name="docs"/> |
607 |
> |
</antcall> |
608 |
> |
</target> |
609 |
|
|
610 |
< |
<!-- </target> --> |
610 |
> |
<target name="test10"> |
611 |
> |
<antcall target="clean"/> |
612 |
> |
<antcall> |
613 |
> |
<param name="java.runtime.target" value="10"/> |
614 |
> |
<param name="build.main.javac" value="${javac10}"/> |
615 |
> |
<param name="build.main.javadoc" value="${javadoc12}"/> |
616 |
> |
<param name="build.main.javadoc.source" value="10"/> |
617 |
> |
<target name="test"/> |
618 |
> |
<target name="docs"/> |
619 |
> |
</antcall> |
620 |
> |
</target> |
621 |
|
|
622 |
< |
<!-- <target name="test89" --> |
623 |
< |
<!-- description="Runs tck and jtreg tests for src/main for multiple java versions"> --> |
622 |
> |
<target name="test11"> |
623 |
> |
<antcall target="clean"/> |
624 |
> |
<antcall> |
625 |
> |
<param name="java.runtime.target" value="11"/> |
626 |
> |
<param name="build.main.javac" value="${javac11}"/> |
627 |
> |
<param name="build.main.javadoc" value="${javadoc12}"/> |
628 |
> |
<param name="build.main.javadoc.source" value="11"/> |
629 |
> |
<target name="test"/> |
630 |
> |
<target name="docs"/> |
631 |
> |
</antcall> |
632 |
> |
</target> |
633 |
|
|
634 |
< |
<!-- <antcall target="clean"/> --> |
635 |
< |
<!-- <antcall target="test"> --> |
636 |
< |
<!-- <param name="build.main.java.version" value="8"/> --> |
637 |
< |
<!-- <param name="build.main.javac" value="${javac8}"/> --> |
638 |
< |
<!-- </antcall> --> |
634 |
> |
<target name="test12"> |
635 |
> |
<antcall target="clean"/> |
636 |
> |
<antcall> |
637 |
> |
<param name="java.runtime.target" value="12"/> |
638 |
> |
<param name="build.main.javac" value="${javac12}"/> |
639 |
> |
<param name="build.main.javadoc" value="${javadoc12}"/> |
640 |
> |
<param name="build.main.javadoc.source" value="12"/> |
641 |
> |
<target name="test"/> |
642 |
> |
<target name="docs"/> |
643 |
> |
</antcall> |
644 |
> |
</target> |
645 |
|
|
646 |
< |
<!-- <antcall target="clean"/> --> |
647 |
< |
<!-- <antcall target="test"> --> |
648 |
< |
<!-- <param name="build.main.java.version" value="9"/> --> |
649 |
< |
<!-- <param name="build.main.javac" value="${javac9}"/> --> |
650 |
< |
<!-- </antcall> --> |
646 |
> |
<target name="test13"> |
647 |
> |
<antcall target="clean"/> |
648 |
> |
<antcall> |
649 |
> |
<param name="java.runtime.target" value="13"/> |
650 |
> |
<param name="build.main.javac" value="${javac13}"/> |
651 |
> |
<param name="build.main.javadoc" value="${javadoc13}"/> |
652 |
> |
<param name="build.main.javadoc.source" value="13"/> |
653 |
> |
<target name="test"/> |
654 |
> |
<target name="docs"/> |
655 |
> |
</antcall> |
656 |
> |
</target> |
657 |
|
|
658 |
< |
<!-- </target> --> |
658 |
> |
<target name="test9-11"> |
659 |
> |
<antcall target="clean"/> |
660 |
> |
<antcall> |
661 |
> |
<param name="java.runtime.target" value="11"/> |
662 |
> |
<param name="build.main.javac" value="${javac9}"/> |
663 |
> |
<param name="build.main.javadoc" value="${javadoc12}"/> |
664 |
> |
<param name="build.main.javadoc.source" value="9"/> |
665 |
> |
<target name="test"/> |
666 |
> |
<target name="docs"/> |
667 |
> |
</antcall> |
668 |
> |
</target> |
669 |
|
|
670 |
+ |
<target name="test9-12"> |
671 |
+ |
<antcall target="clean"/> |
672 |
+ |
<antcall> |
673 |
+ |
<param name="java.runtime.target" value="12"/> |
674 |
+ |
<param name="build.main.javac" value="${javac9}"/> |
675 |
+ |
<param name="build.main.javadoc" value="${javadoc12}"/> |
676 |
+ |
<param name="build.main.javadoc.source" value="9"/> |
677 |
+ |
<target name="test"/> |
678 |
+ |
<target name="docs"/> |
679 |
+ |
</antcall> |
680 |
+ |
</target> |
681 |
+ |
|
682 |
+ |
<target name="test9-13"> |
683 |
+ |
<antcall target="clean"/> |
684 |
+ |
<antcall> |
685 |
+ |
<param name="java.runtime.target" value="13"/> |
686 |
+ |
<param name="build.main.javac" value="${javac9}"/> |
687 |
+ |
<param name="build.main.javadoc" value="${javadoc13}"/> |
688 |
+ |
<param name="build.main.javadoc.source" value="9"/> |
689 |
+ |
<target name="test"/> |
690 |
+ |
<target name="docs"/> |
691 |
+ |
</antcall> |
692 |
+ |
</target> |
693 |
|
|
694 |
|
|
695 |
|
<target name="configure-compiler"> |
712 |
|
</target> |
713 |
|
|
714 |
|
|
639 |
– |
|
640 |
– |
<!-- Various demos and test programs --> |
641 |
– |
|
642 |
– |
|
643 |
– |
<!-- description="Benchmark from Doug Lea's AQS paper" --> |
644 |
– |
<target name="loops" depends="configure-compiler"> |
645 |
– |
|
646 |
– |
<mkdir dir="${build.loops.dir}"/> |
647 |
– |
|
648 |
– |
<javac srcdir="${loops.src.dir}" |
649 |
– |
destdir="${build.loops.dir}" |
650 |
– |
debug="${build.debug}" |
651 |
– |
debuglevel="${build.debuglevel}" |
652 |
– |
deprecation="${build.deprecation}" |
653 |
– |
source="${build.sourcelevel}" |
654 |
– |
target="${build.sourcelevel}" |
655 |
– |
encoding="ASCII" |
656 |
– |
fork="true"> |
657 |
– |
|
658 |
– |
<compilerarg line="${build.args}"/> |
659 |
– |
<classpath refid="loops.classpath"/> |
660 |
– |
<compilerarg value="-XDignore.symbol.file=true"/> |
661 |
– |
|
662 |
– |
</javac> |
663 |
– |
|
664 |
– |
<java classname="ALoops" fork="true"> |
665 |
– |
<classpath refid="loops.classpath"/> |
666 |
– |
</java> |
667 |
– |
</target> |
668 |
– |
|
669 |
– |
|
715 |
|
<target name="compile-test-loops" depends="jar" |
716 |
|
description="Compiles all the perf tests in src/test/loops"> |
717 |
|
|
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 |
1419 |
< |
You may need to bring your own errorprone jar. |
1418 |
> |
Experimental errorprone support |
1419 |
> |
https://errorprone.info |
1420 |
> |
https://errorprone.info/docs/installation |
1421 |
> |
https://github.com/google/error-prone/issues/1143 |
1422 |
|
=================================================================== --> |
1423 |
+ |
<path id="errorprone.processorpath.path"> |
1424 |
+ |
<pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/> |
1425 |
+ |
<pathelement location="${lib.dir}/dataflow-2.5.7.jar"/> |
1426 |
+ |
<pathelement location="${lib.dir}/javacutil-2.5.7.jar"/> |
1427 |
+ |
<pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/> |
1428 |
+ |
</path> |
1429 |
+ |
<property name="errorprone.processorpath" refid="errorprone.processorpath.path" /> |
1430 |
+ |
<property name="errorprone.jsr166.user.flags" value=""/> |
1431 |
+ |
<property name="errorprone.jsr166.flags" |
1432 |
+ |
value="-Xep:HashtableContains:OFF |
1433 |
+ |
-Xep:JdkObsolete:OFF |
1434 |
+ |
-Xep:MissingOverride:OFF |
1435 |
+ |
-Xep:MissingFail:OFF |
1436 |
+ |
-Xep:ThreadPriorityCheck:OFF |
1437 |
+ |
-Xep:MixedArrayDimensions:ERROR |
1438 |
+ |
-Xep:RemoveUnusedImports:ERROR |
1439 |
+ |
-Xep:EmptyIf:ERROR |
1440 |
+ |
-Xep:MultipleTopLevelClasses:ERROR |
1441 |
+ |
-Xep:ClassName:ERROR |
1442 |
+ |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1443 |
+ |
-Xep:RedundantThrows:ERROR |
1444 |
+ |
-Xep:IdentityBinaryExpression:WARN |
1445 |
+ |
-Xep:ConstructorInvokesOverridable:WARN |
1446 |
+ |
-Xep:MethodCanBeStatic:WARN |
1447 |
+ |
${errorprone.jsr166.user.flags}"/> |
1448 |
+ |
<!-- -Xep:WildcardImport:ERROR --> |
1449 |
+ |
<property name="errorprone.jsr166.test.flags" |
1450 |
+ |
value="-Xep:StringSplitter:OFF |
1451 |
+ |
-Xep:BoxedPrimitiveConstructor:OFF |
1452 |
+ |
-Xep:ModifyingCollectionWithItself:OFF"/> |
1453 |
+ |
<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' --> |
1454 |
|
<target name="errorprone" |
1455 |
|
depends="clean, configure-compiler" |
1456 |
|
description="Run errorprone over jsr166 source code (experimental)"> |
1472 |
|
fork="true"> |
1473 |
|
|
1474 |
|
<include name="**/*.java"/> |
1475 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1476 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1477 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1478 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/> |
1479 |
< |
<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"/> |
1475 |
> |
<!-- Needed to silence -Xep:FutureReturnValueIgnored --> |
1476 |
> |
<compilerarg value="-J--illegal-access=permit"/> |
1477 |
> |
<compilerarg value="-XDcompilePolicy=simple"/> |
1478 |
> |
<compilerarg value="-processorpath"/> |
1479 |
> |
<compilerarg pathref="errorprone.processorpath.path"/> |
1480 |
|
<compilerarg value="-Xplugin:ErrorProne |
1481 |
< |
-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"/> |
1481 |
> |
${errorprone.jsr166.flags}"/> |
1482 |
|
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
1483 |
|
<compilerarg value="-Xprefer:source"/> |
1484 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1493 |
|
</jar> |
1494 |
|
|
1495 |
|
<run-tck-tests |
1496 |
< |
target="${build.main.java.version}" |
1496 |
> |
target="${java.runtime.target}" |
1497 |
|
workdir="${build.dir}" |
1498 |
|
classes="${product.jar}"> |
1499 |
|
<javac-elements> |
1500 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1501 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1502 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1503 |
< |
<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"/> |
1500 |
> |
<!-- Needed to silence -Xep:FutureReturnValueIgnored --> |
1501 |
> |
<compilerarg value="-J--illegal-access=permit"/> |
1502 |
> |
<compilerarg value="-XDcompilePolicy=simple"/> |
1503 |
> |
<compilerarg line="-processorpath ${errorprone.processorpath}"/> |
1504 |
|
<compilerarg value="-Xplugin:ErrorProne |
1505 |
< |
-Xep:IdentityBinaryExpression:WARN |
1506 |
< |
-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"/> |
1505 |
> |
${errorprone.jsr166.flags} |
1506 |
> |
${errorprone.jsr166.test.flags}"/> |
1507 |
|
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1508 |
|
</javac-elements> |
1509 |
|
</run-tck-tests> |
1510 |
|
</target> |
1511 |
|
|
1512 |
+ |
<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' --> |
1513 |
+ |
<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports --> |
1514 |
+ |
<target name="errorprone-jtreg" |
1515 |
+ |
depends="jar" |
1516 |
+ |
description="Run errorprone over jtreg tests (experimental)"> |
1517 |
+ |
|
1518 |
+ |
<run-jtreg-tests |
1519 |
+ |
target="${java.runtime.target}" |
1520 |
+ |
workdir="${build.dir}" |
1521 |
+ |
classes="${product.jar}" |
1522 |
+ |
verbose="all"> |
1523 |
+ |
<jtreg-elements> |
1524 |
+ |
<arg value="-javacoption:-XDcompilePolicy=simple"/> |
1525 |
+ |
<arg value="-javacoption:-processorpath"/> |
1526 |
+ |
<arg value="-javacoption:${errorprone.processorpath}"/> |
1527 |
+ |
<arg value="-javacoption:-Xplugin:ErrorProne |
1528 |
+ |
${errorprone.jsr166.flags} |
1529 |
+ |
${errorprone.jsr166.test.flags} |
1530 |
+ |
-Xep:MultipleTopLevelClasses:WARN |
1531 |
+ |
-Xep:NonAtomicVolatileUpdate:OFF"/> |
1532 |
+ |
</jtreg-elements> |
1533 |
+ |
</run-jtreg-tests> |
1534 |
+ |
</target> |
1535 |
+ |
|
1536 |
|
|
1537 |
|
<!-- ============================================================== |
1538 |
|
Running guava tests against jsr166 code |
1587 |
|
dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/> |
1588 |
|
<junit printsummary="true" showoutput="true" haltonfailure="true" |
1589 |
|
jvm="${build.main.java}" fork="true"> |
1590 |
< |
<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/> |
1590 |
> |
<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/> |
1591 |
|
<formatter type="brief"/> |
1592 |
|
<classpath> |
1593 |
|
<pathelement location="${guava.dir}/guava-testlib-tests.jar"/> |