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> |
19 |
|
itself. Because the JDK version matters and because different |
20 |
|
targets require different JDKs, we assume that users have created a |
21 |
|
hierarchy containing: |
21 |
– |
$HOME/jdk/jdk6 |
22 |
– |
$HOME/jdk/jdk7 |
22 |
|
$HOME/jdk/jdk8 |
23 |
|
$HOME/jdk/jdk9 |
24 |
+ |
$HOME/jdk/jdk10 |
25 |
+ |
$HOME/jdk/jdk11 |
26 |
|
where each of the above is a JDK or a symlink to same, and |
26 |
– |
$HOME/jdk/src/jdk6 |
27 |
– |
$HOME/jdk/src/jdk7 |
27 |
|
$HOME/jdk/src/jdk8 |
28 |
|
$HOME/jdk/src/jdk9 |
29 |
+ |
$HOME/jdk/src/jdk10 |
30 |
+ |
$HOME/jdk/src/jdk11 |
31 |
|
where each of the above is a complete JDK source tree |
32 |
|
(e.g. mercurial forest) or a symlink to same. |
33 |
|
|
34 |
|
Alternatively, define ant variables thus: |
35 |
|
ant -Djdk$N.home=... -Djdk$N.src.home=... |
36 |
< |
for $N in 6 7 8 9 ... |
36 |
> |
for $N in 8 9 10 ... |
37 |
|
|
38 |
< |
As of 2016-03, the sources in src/main are for jdk9+ only. The "docs" |
38 |
< |
target is currently broken. |
38 |
> |
As of 2016-03, the sources in src/main are for jdk9+ only. |
39 |
|
------------------------------------------------------------------------------ |
40 |
|
</description> |
41 |
|
|
134 |
|
<defjdklocations v="7"/> |
135 |
|
<defjdklocations v="8"/> |
136 |
|
<defjdklocations v="9"/> |
137 |
+ |
<defjdklocations v="10"/> |
138 |
+ |
<defjdklocations v="11"/> |
139 |
|
|
140 |
|
<!-- Source locations --> |
141 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
145 |
|
<property name="jtreg7.src.dir" location="${test.src.dir}/jtreg-jdk7"/> |
146 |
|
<property name="jtreg8.src.dir" location="${test.src.dir}/jtreg-jdk8"/> |
147 |
|
<property name="jtreg9.src.dir" location="${test.src.dir}/jtreg"/> |
148 |
+ |
<property name="jtreg10.src.dir" location="${test.src.dir}/jtreg"/> |
149 |
+ |
<property name="jtreg11.src.dir" location="${test.src.dir}/jtreg"/> |
150 |
|
<property name="jtreg.src.dir" location="${jtreg9.src.dir}"/> |
151 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
152 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
186 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
187 |
|
|
188 |
|
<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag --> |
189 |
< |
<property name="java5.docroot.url" value="http://docs.oracle.com/javase/1.5.0/docs"/> |
190 |
< |
<property name="java6.docroot.url" value="http://docs.oracle.com/javase/6/docs"/> |
191 |
< |
<property name="java7.docroot.url" value="http://docs.oracle.com/javase/7/docs"/> |
192 |
< |
<property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> |
193 |
< |
<!-- The expected canonical location does not yet exist as of 2016-04 --> |
194 |
< |
<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> --> |
195 |
< |
<property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> |
189 |
> |
<!-- Switched to https: in 2017-10 - JDK-8190312 --> |
190 |
> |
<property name="java5.docroot.url" value="https://docs.oracle.com/javase/1.5.0/docs"/> |
191 |
> |
<property name="java6.docroot.url" value="https://docs.oracle.com/javase/6/docs"/> |
192 |
> |
<property name="java7.docroot.url" value="https://docs.oracle.com/javase/7/docs"/> |
193 |
> |
<property name="java8.docroot.url" value="https://docs.oracle.com/javase/8/docs"/> |
194 |
> |
<property name="java9.docroot.url" value="https://docs.oracle.com/javase/9/docs"/> |
195 |
> |
<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/> |
196 |
> |
<!-- The location of jdk early access docs (RIP) --> |
197 |
> |
<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> --> |
198 |
> |
<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> --> |
199 |
> |
<property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> |
200 |
|
<!-- Default jdk doc location (latest stable release seems best) --> |
201 |
< |
<property name="java.docroot.url" value="${java8.docroot.url}"/> |
201 |
> |
<property name="java.docroot.url" value="${java10.docroot.url}"/> |
202 |
|
|
203 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
204 |
|
<property name="java5.api.url" value="${java5.docroot.url}/api/"/> |
206 |
|
<property name="java7.api.url" value="${java7.docroot.url}/api/"/> |
207 |
|
<property name="java8.api.url" value="${java8.docroot.url}/api/"/> |
208 |
|
<property name="java9.api.url" value="${java9.docroot.url}/api/"/> |
209 |
+ |
<property name="java10.api.url" value="${java10.docroot.url}/api/"/> |
210 |
+ |
<property name="java11.api.url" value="${java11.docroot.url}/api/"/> |
211 |
|
<property name="java.api.url" value="${java.docroot.url}/api/"/> |
212 |
|
|
213 |
|
<!-- Define the "jtreg" task --> |
243 |
|
<available file="${jdk@{compile-target}.home}/jmods" type="dir"/> |
244 |
|
</condition> |
245 |
|
|
246 |
+ |
<local name="use-doclint"/> |
247 |
+ |
<condition property="use-doclint"> |
248 |
+ |
<not> <equals arg1="@{target}" arg2="7"/> </not> |
249 |
+ |
</condition> |
250 |
+ |
|
251 |
|
<mkdir dir="@{workdir}/tck-classes"/> |
252 |
|
|
253 |
|
<javac srcdir="@{tck.src.dir}" |
267 |
|
<include name="*.java"/> |
268 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
269 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/> |
270 |
+ |
<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/> |
271 |
|
<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
272 |
< |
<compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/> |
272 |
> |
<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/> |
273 |
|
<compilerarg line="${build.args}"/> |
274 |
|
<javac-elements/> |
275 |
|
|
280 |
|
jvm="${java@{target}}" |
281 |
|
fork="true"> |
282 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
283 |
< |
<jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/> |
284 |
< |
<jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/> |
285 |
< |
<jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/> |
286 |
< |
<jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/> |
287 |
< |
<jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/> |
283 |
> |
<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/> |
284 |
> |
<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/> |
285 |
> |
<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/> |
286 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/> |
287 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/> |
288 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/> |
289 |
|
<jvmarg line="@{jvmflags}"/> |
290 |
|
<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck --> |
291 |
|
<jvmarg line="${vmoptions}" if:set="vmoptions"/> |
307 |
|
</macrodef> |
308 |
|
|
309 |
|
<!-- Define jtreg test sets for different jdk versions --> |
310 |
< |
<fileset dir="${jtreg9.src.dir}"> |
311 |
< |
<patternset id="jdk9.jtreg.tests"> |
312 |
< |
<include name="**/*.java"/> |
313 |
< |
</patternset> |
314 |
< |
</fileset> |
315 |
< |
|
316 |
< |
<fileset dir="${jtreg8.src.dir}"> |
317 |
< |
<patternset id="jdk8.jtreg.tests"> |
318 |
< |
<include name="**/*.java"/> |
319 |
< |
</patternset> |
320 |
< |
</fileset> |
310 |
> |
<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" --> |
311 |
> |
<!-- ant -Djtreg.test.pattern="**/ToArray.java" --> |
312 |
> |
<property name="jtreg.test.pattern" value="**/*.java"/> |
313 |
> |
<macrodef name="defjtregtests"> |
314 |
> |
<attribute name="v"/> |
315 |
> |
<sequential> |
316 |
> |
<fileset dir="${jtreg@{v}.src.dir}"> |
317 |
> |
<patternset id="jdk@{v}.jtreg.tests"> |
318 |
> |
<include name="${jtreg.test.pattern}"/> |
319 |
> |
</patternset> |
320 |
> |
</fileset> |
321 |
> |
</sequential> |
322 |
> |
</macrodef> |
323 |
|
|
324 |
< |
<fileset dir="${jtreg7.src.dir}"> |
325 |
< |
<patternset id="jdk7.jtreg.tests"> |
326 |
< |
<include name="**/*.java"/> |
327 |
< |
</patternset> |
328 |
< |
</fileset> |
324 |
> |
<defjtregtests v="11"/> |
325 |
> |
<defjtregtests v="10"/> |
326 |
> |
<defjtregtests v="9"/> |
327 |
> |
<defjtregtests v="8"/> |
328 |
> |
<defjtregtests v="7"/> |
329 |
|
|
330 |
|
<!-- ant -Djtreg.flags=-timeoutFactor:4 --> |
331 |
|
<property name="jtreg.flags" value=""/> |
332 |
|
|
333 |
|
<macrodef name="run-jtreg-tests"> |
334 |
|
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
316 |
– |
<attribute name="source" default="7"/> |
335 |
|
<attribute name="target"/> |
336 |
|
<attribute name="workdir"/> |
337 |
|
<attribute name="classes"/> |
338 |
+ |
<attribute name="verbose" default="${jtreg.verbose}"/> |
339 |
|
<attribute name="jtregflags" default=""/> |
340 |
+ |
<element name="jtreg-elements" optional="true"/> |
341 |
|
|
342 |
|
<sequential> |
343 |
|
|
355 |
|
workDir="@{workdir}/JTwork"> |
356 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
357 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
358 |
< |
<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
359 |
< |
<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
358 |
> |
<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
359 |
> |
<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
360 |
|
<arg value="-agentvm"/> |
361 |
|
<arg value="-noreport"/> |
362 |
< |
<arg value="-verbose:${jtreg.verbose}"/> |
362 |
> |
<arg value="-verbose:@{verbose}"/> |
363 |
|
<arg value="-vmoptions:-esa -ea"/> |
364 |
|
<arg value="-automatic"/> |
365 |
|
<arg value="-k:!ignore"/> |
366 |
|
<arg line="@{jtregflags}"/> |
367 |
|
<arg line="${jtreg.flags}"/> |
368 |
+ |
<jtreg-elements/> |
369 |
|
</jtreg> |
370 |
|
</sequential> |
371 |
|
</macrodef> |
382 |
|
<!-- Main targets --> |
383 |
|
|
384 |
|
<property name="build.main.java.version" value="9"/> |
385 |
< |
<property name="build.main.javac" value="${javac9}"/> |
385 |
> |
<!-- Workaround "no nested properties in ant" --> |
386 |
> |
<macrodef name="define-build-main-properties"> |
387 |
> |
<attribute name="v"/> |
388 |
> |
<sequential> |
389 |
> |
<property name="build.main.java" value="${java@{v}}"/> |
390 |
> |
<property name="build.main.javac" value="${javac@{v}}"/> |
391 |
> |
<!-- Force javadoc version to be at least 10, |
392 |
> |
so we can use override-methods=summary --> |
393 |
> |
<condition property="build.main.javadoc" |
394 |
> |
value="${javadoc11}" |
395 |
> |
else="${javadoc@{v}}"> |
396 |
> |
<equals arg1="@{v}" arg2="9"/> |
397 |
> |
</condition> |
398 |
> |
</sequential> |
399 |
> |
</macrodef> |
400 |
> |
<define-build-main-properties v="${build.main.java.version}"/> |
401 |
|
|
402 |
|
<target name="dists" |
403 |
< |
depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
403 |
> |
depends="dist, 4jdk8dist" |
404 |
|
description="Builds all public jars and docs"/> |
405 |
+ |
<!-- |
406 |
+ |
depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
407 |
+ |
--> |
408 |
|
|
409 |
|
<target name="compile" |
410 |
|
depends="configure-compiler" |
411 |
|
description="Compiles src/main sources to build dir"> |
412 |
|
|
374 |
– |
<local name="modules"/> |
375 |
– |
<condition property="modules"> |
376 |
– |
<and> |
377 |
– |
<available file="${jdk9.home}/jmods" type="dir"/> |
378 |
– |
<equals arg1="9" arg2="${build.main.java.version}"/> |
379 |
– |
</and> |
380 |
– |
</condition> |
381 |
– |
|
413 |
|
<local name="destdir"/> |
414 |
< |
<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/> |
384 |
< |
<property name="destdir" value="${build.classes.dir}" unless:set="modules"/> |
414 |
> |
<property name="destdir" value="${build.classes.dir}/java.base"/> |
415 |
|
|
416 |
|
<mkdir dir="${destdir}"/> |
417 |
|
|
428 |
|
fork="true"> |
429 |
|
|
430 |
|
<include name="**/*.java"/> |
431 |
< |
<compilerarg value="-Xmodule:java.base" if:set="modules"/> |
431 |
> |
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
432 |
|
<compilerarg value="-Xprefer:source"/> |
433 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
434 |
|
<compilerarg value="-Xlint:all"/> |
435 |
+ |
<compilerarg line="--doclint-format html5"/> |
436 |
+ |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
437 |
|
<compilerarg value="-Werror"/> |
406 |
– |
<compilerarg value="-Xdoclint:all/protected"/> |
438 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
439 |
|
<compilerarg line="${build.args}"/> |
440 |
|
|
478 |
|
access="${build.javadoc.access}" |
479 |
|
sourcepath="${src.dir}" |
480 |
|
classpath="" |
481 |
< |
executable="${javadoc9}"> |
481 |
> |
source="9" |
482 |
> |
executable="${build.main.javadoc}"> |
483 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
484 |
|
<include name="**/*.java"/> |
485 |
|
</fileset> |
486 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
487 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
488 |
|
<arg value="-XDignore.symbol.file=true"/> |
489 |
< |
<arg value="-Xmodule:java.base"/> |
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"/> |
496 |
< |
<arg value="implSpec:a:Implementation Requirements:"/> |
465 |
< |
<arg value="-tag"/> |
466 |
< |
<arg value="implNote:a:Implementation Note:"/> |
489 |
> |
<arg value="-html5"/> |
490 |
> |
<arg value="--patch-module=java.base=${src.dir}"/> |
491 |
> |
<arg value="--override-methods=summary"/> |
492 |
> |
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
493 |
> |
<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/> |
494 |
> |
<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/> |
495 |
> |
<!-- @apiNote tag currently unused --> |
496 |
> |
<!-- <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> --> |
497 |
|
<!-- tags added in jdk9: currently unused --> |
498 |
< |
<!-- <arg value="-tag"/> --> |
499 |
< |
<!-- <arg value="revised:X"/> --> |
470 |
< |
<!-- <arg value="-tag"/> --> |
471 |
< |
<!-- <arg value="spec:X"/> --> |
498 |
> |
<!-- <arg value="-tag"/> <arg value="revised:X"/> --> |
499 |
> |
<!-- <arg value="-tag"/> <arg value="spec:X"/> --> |
500 |
|
</javadoc> |
501 |
|
</target> |
502 |
|
|
530 |
|
|
531 |
|
<target name="clean" |
532 |
|
description="Removes all build products"> |
505 |
– |
|
533 |
|
<delete dir="${build.dir}"/> |
507 |
– |
|
534 |
|
</target> |
535 |
|
|
536 |
|
|
537 |
|
<target name="dist-clean" |
538 |
|
description="Removes all build and distribution products"> |
513 |
– |
|
539 |
|
<delete dir="${build.dir}"/> |
540 |
|
<delete dir="${dist.dir}"/> |
516 |
– |
|
541 |
|
</target> |
542 |
|
|
543 |
|
|
558 |
|
<run-tck-tests |
559 |
|
target="${build.main.java.version}" |
560 |
|
workdir="${build.dir}" |
561 |
< |
classes="${product.jar}"/> |
561 |
> |
classes="${product.jar}"> |
562 |
> |
<javac-elements> |
563 |
> |
<compilerarg value="-Werror"/> |
564 |
> |
</javac-elements> |
565 |
> |
</run-tck-tests> |
566 |
|
</target> |
567 |
|
|
568 |
|
<target name="tck-parallelism-1" |
597 |
|
|
598 |
|
<target name="test" |
599 |
|
depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg" |
600 |
< |
description="Runs tck and jtreg tests for src/main"> |
573 |
< |
</target> |
600 |
> |
description="Runs tck and jtreg tests for src/main"/> |
601 |
|
|
602 |
|
<!-- <target name="jtreg8" description="Runs jtreg tests with jdk8"> --> |
603 |
|
|
608 |
|
|
609 |
|
<!-- </target> --> |
610 |
|
|
611 |
< |
<!-- <target name="test89" --> |
612 |
< |
<!-- description="Runs tck and jtreg tests for src/main for multiple java versions"> --> |
611 |
> |
<target name="test91011" |
612 |
> |
description="Runs tck and jtreg tests for src/main for multiple java versions"> |
613 |
|
|
614 |
< |
<!-- <antcall target="clean"/> --> |
615 |
< |
<!-- <antcall target="test"> --> |
616 |
< |
<!-- <param name="build.main.java.version" value="8"/> --> |
617 |
< |
<!-- <param name="build.main.javac" value="${javac8}"/> --> |
591 |
< |
<!-- </antcall> --> |
614 |
> |
<antcall target="clean"/> |
615 |
> |
<antcall target="test"> |
616 |
> |
<param name="build.main.java.version" value="9"/> |
617 |
> |
</antcall> |
618 |
|
|
619 |
< |
<!-- <antcall target="clean"/> --> |
620 |
< |
<!-- <antcall target="test"> --> |
621 |
< |
<!-- <param name="build.main.java.version" value="9"/> --> |
622 |
< |
<!-- <param name="build.main.javac" value="${javac9}"/> --> |
597 |
< |
<!-- </antcall> --> |
619 |
> |
<antcall target="clean"/> |
620 |
> |
<antcall target="test"> |
621 |
> |
<param name="build.main.java.version" value="10"/> |
622 |
> |
</antcall> |
623 |
|
|
624 |
< |
<!-- </target> --> |
624 |
> |
<antcall target="clean"/> |
625 |
> |
<antcall target="test"> |
626 |
> |
<param name="build.main.java.version" value="11"/> |
627 |
> |
</antcall> |
628 |
> |
|
629 |
> |
<!-- Clean up to avoid obscure wrong class file version bugs --> |
630 |
> |
<antcall target="clean"/> |
631 |
> |
|
632 |
> |
</target> |
633 |
|
|
634 |
|
|
635 |
|
|
636 |
|
<target name="configure-compiler"> |
637 |
|
<fail message="ant version too old"> |
638 |
< |
<condition> |
606 |
< |
<not> <antversion atleast="1.9.1"/> </not> |
607 |
< |
</condition> |
638 |
> |
<condition> <not> <antversion atleast="1.9.1"/> </not> </condition> |
639 |
|
</fail> |
640 |
|
|
641 |
|
<property name="unchecked.option" value="-Xlint:unchecked"/> |
681 |
|
<java classname="ALoops" fork="true"> |
682 |
|
<classpath refid="loops.classpath"/> |
683 |
|
</java> |
653 |
– |
|
684 |
|
</target> |
685 |
|
|
686 |
|
|
687 |
|
<target name="compile-test-loops" depends="jar" |
688 |
< |
description="compile all the perf tests in src/test/loops"> |
688 |
> |
description="Compiles all the perf tests in src/test/loops"> |
689 |
|
|
690 |
|
<mkdir dir="${build.dir}/test/loops"/> |
691 |
|
|
697 |
|
includeAntRuntime="false" |
698 |
|
includeJavaRuntime="false" |
699 |
|
encoding="ASCII" |
700 |
< |
executable="${javac9}" |
700 |
> |
executable="${build.main.javac}" |
701 |
|
fork="true"> |
702 |
|
|
703 |
|
<include name="*.java"/> |
705 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
706 |
|
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
707 |
|
<compilerarg line="${build.args}"/> |
678 |
– |
|
708 |
|
</javac> |
680 |
– |
|
709 |
|
</target> |
710 |
|
|
711 |
|
|
731 |
|
encoding="ASCII" |
732 |
|
executable="${javac8}" |
733 |
|
fork="true"> |
706 |
– |
|
734 |
|
<include name="**/*.java"/> |
735 |
|
<compilerarg value="-Xprefer:source"/> |
736 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
737 |
|
<compilerarg value="-Xlint:all"/> |
738 |
|
<compilerarg value="-Werror"/> |
739 |
|
<compilerarg line="${build.args}"/> |
713 |
– |
|
740 |
|
</javac> |
741 |
|
</target> |
742 |
|
|
760 |
|
encoding="ASCII" |
761 |
|
executable="${javac8}" |
762 |
|
fork="true"> |
737 |
– |
|
763 |
|
<include name="**/*.java"/> |
764 |
|
<compilerarg value="-Xprefer:source"/> |
765 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
766 |
|
<compilerarg value="-Xlint:all"/> |
767 |
< |
<compilerarg value="-Xdoclint:all/protected"/> |
767 |
> |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
768 |
|
<compilerarg line="${build.args}"/> |
744 |
– |
|
769 |
|
</javac> |
770 |
|
</target> |
771 |
|
|
781 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
782 |
|
</manifest> |
783 |
|
</jar> |
760 |
– |
|
784 |
|
</target> |
785 |
|
|
786 |
|
|
796 |
|
<!-- JDK9+ test classes --> |
797 |
|
<exclude name="*9Test.java"/> |
798 |
|
<exclude name="*10Test.java"/> |
799 |
+ |
<compilerarg value="-Werror"/> |
800 |
|
</javac-elements> |
801 |
|
</run-tck-tests> |
802 |
|
</target> |
814 |
|
|
815 |
|
<target name="4jdk8-test" |
816 |
|
depends="4jdk8-tck, 4jdk8-jtreg" |
817 |
< |
description="Runs tck and jtreg tests for jsr166-4jdk8"> |
794 |
< |
</target> |
817 |
> |
description="Runs tck and jtreg tests for jsr166-4jdk8"/> |
818 |
|
|
819 |
|
|
820 |
|
<target name="4jdk8docs" |
830 |
|
access="${build.javadoc.access}" |
831 |
|
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}" |
832 |
|
classpath="" |
833 |
+ |
source="8" |
834 |
|
executable="${javadoc8}" |
835 |
|
failonerror = "true"> |
836 |
|
<fileset dir="${4jdk8src.dir}" defaultexcludes="yes"> |
838 |
|
</fileset> |
839 |
|
<arg line="-Xdocrootparent ${java8.docroot.url}"/> |
840 |
|
<arg value="-XDignore.symbol.file=true"/> |
841 |
< |
<arg value="-tag"/> |
842 |
< |
<arg value="${javadoc.jls.option}"/> |
843 |
< |
<!-- @apiNote currently unused --> |
844 |
< |
<!-- <arg value="-tag"/> --> |
845 |
< |
<!-- <arg value="apiNote:a:<em>API Note:</em>"/> --> |
822 |
< |
<arg value="-tag"/> |
823 |
< |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
824 |
< |
<arg value="-tag"/> |
825 |
< |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
841 |
> |
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
842 |
> |
<arg value="-tag"/> <arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
843 |
> |
<arg value="-tag"/> <arg value="implNote:a:<em>Implementation Note:</em>"/> |
844 |
> |
<!-- @apiNote tag currently unused --> |
845 |
> |
<!-- <arg value="-tag"/> <arg value="apiNote:a:<em>API Note:</em>"/> --> |
846 |
|
</javadoc> |
847 |
|
</target> |
848 |
|
|
854 |
|
|
855 |
|
<target name="4jdk8clean" |
856 |
|
description="Removes all 4jdk8 build products"> |
837 |
– |
|
857 |
|
<delete dir="${build.4jdk8.dir}"/> |
839 |
– |
|
858 |
|
</target> |
859 |
|
|
860 |
|
|
870 |
|
</target> |
871 |
|
|
872 |
|
|
873 |
+ |
<!-- jsr166 4jdk7 (no longer maintained) --> |
874 |
|
|
875 |
< |
<!-- jsr166 4jdk7 --> |
857 |
< |
|
858 |
< |
<target name="4jdk7compile" |
859 |
< |
depends="configure-compiler" |
860 |
< |
description="Compiles src/jdk7 sources, targeting jdk7"> |
861 |
< |
|
875 |
> |
<target name="4jdk7compile" depends="configure-compiler"> |
876 |
|
<mkdir dir="${build.4jdk7.classes.dir}"/> |
877 |
|
|
878 |
|
<javac srcdir="${4jdk7src.dir}" |
896 |
|
<compilerarg value="-Xlint:all"/> |
897 |
|
<compilerarg value="-Werror"/> |
898 |
|
<compilerarg line="${build.args}"/> |
885 |
– |
|
899 |
|
</javac> |
900 |
|
</target> |
901 |
|
|
902 |
< |
<target name="4jdk7doclint" |
890 |
< |
depends="configure-compiler" |
891 |
< |
description="Finds doclint warnings"> |
892 |
< |
|
902 |
> |
<target name="4jdk7doclint" depends="configure-compiler"> |
903 |
|
<mkdir dir="${build.4jdk7.classes.dir}"/> |
904 |
|
|
905 |
|
<javac srcdir="${4jdk7src.dir}" |
923 |
|
<compilerarg value="-Xlint:all"/> |
924 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
925 |
|
<compilerarg line="${build.args}"/> |
916 |
– |
|
926 |
|
</javac> |
927 |
|
</target> |
928 |
|
|
929 |
< |
|
921 |
< |
<target name="4jdk7jar" |
922 |
< |
depends="4jdk7compile" |
923 |
< |
description="Builds library jar from compiled sources"> |
924 |
< |
|
929 |
> |
<target name="4jdk7jar" depends="4jdk7compile"> |
930 |
|
<jar destfile="${4jdk7product.jar}"> |
931 |
|
<fileset dir="${build.4jdk7.classes.dir}"/> |
932 |
|
<manifest> |
934 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
935 |
|
</manifest> |
936 |
|
</jar> |
932 |
– |
|
937 |
|
</target> |
938 |
|
|
939 |
< |
|
936 |
< |
<target name="4jdk7-tck" |
937 |
< |
depends="4jdk7jar" |
938 |
< |
description="Runs tck tests for jsr166-4jdk7 directly"> |
939 |
< |
|
939 |
> |
<target name="4jdk7-tck" depends="4jdk7jar"> |
940 |
|
<run-tck-tests |
941 |
|
target="7" |
942 |
|
workdir="${build.4jdk7.dir}" |
954 |
|
<exclude name="SplittableRandomTest.java"/> |
955 |
|
<exclude name="StampedLockTest.java"/> |
956 |
|
<exclude name="SubmissionPublisherTest.java"/> |
957 |
+ |
<compilerarg value="-Werror"/> |
958 |
|
</javac-elements> |
959 |
|
</run-tck-tests> |
960 |
|
</target> |
961 |
|
|
961 |
– |
|
962 |
|
<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) --> |
963 |
< |
<target name="4jdk7-tck-junit" |
964 |
< |
depends="4jdk7compile"> |
963 |
> |
<target name="4jdk7-tck-junit" depends="4jdk7compile"> |
964 |
|
|
965 |
|
<junit printsummary="true" |
966 |
|
showoutput="true" |
982 |
|
|
983 |
|
<test name="${jsr166.tckTestClass}" haltonfailure="no"> |
984 |
|
</test> |
986 |
– |
|
985 |
|
</junit> |
986 |
|
</target> |
987 |
|
|
988 |
< |
<target name="4jdk7-jtreg" |
991 |
< |
depends="4jdk7jar" |
992 |
< |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
988 |
> |
<target name="4jdk7-jtreg" depends="4jdk7jar"> |
989 |
|
<run-jtreg-tests |
990 |
|
target="7" |
991 |
|
workdir="${build.4jdk7.dir}" |
992 |
|
classes="${4jdk7product.jar}"/> |
993 |
|
</target> |
994 |
|
|
995 |
+ |
<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/> |
996 |
|
|
997 |
< |
<target name="4jdk7-test" |
1001 |
< |
depends="4jdk7-tck, 4jdk7-jtreg" |
1002 |
< |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
1003 |
< |
</target> |
1004 |
< |
|
1005 |
< |
|
1006 |
< |
<target name="4jdk7docs" |
1007 |
< |
description="Builds javadocs for src/jdk7 to dist dir"> |
1008 |
< |
|
997 |
> |
<target name="4jdk7docs"> |
998 |
|
<delete dir="${4jdk7docs.dir}"/> |
999 |
|
<mkdir dir="${4jdk7docs.dir}"/> |
1000 |
|
|
1015 |
|
</javadoc> |
1016 |
|
</target> |
1017 |
|
|
1018 |
+ |
<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/> |
1019 |
|
|
1020 |
< |
<target name="4jdk7dist" |
1031 |
< |
depends="4jdk7dist-jar, 4jdk7dist-docs" |
1032 |
< |
description="Puts all distributable products in single hierarchy"/> |
1033 |
< |
|
1034 |
< |
|
1035 |
< |
<target name="4jdk7clean" |
1036 |
< |
description="Removes all 4jdk7 build products"> |
1037 |
< |
|
1020 |
> |
<target name="4jdk7clean"> |
1021 |
|
<delete dir="${build.4jdk7.dir}"/> |
1039 |
– |
|
1022 |
|
</target> |
1023 |
|
|
1024 |
< |
|
1043 |
< |
<target name="4jdk7dist-jar" |
1044 |
< |
depends="4jdk7clean, 4jdk7jar"> |
1024 |
> |
<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar"> |
1025 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
1026 |
|
</target> |
1027 |
|
|
1028 |
< |
|
1049 |
< |
<target name="4jdk7dist-docs" |
1050 |
< |
depends="4jdk7clean, 4jdk7docs"> |
1028 |
> |
<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs"> |
1029 |
|
<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/> |
1030 |
|
</target> |
1031 |
|
|
1032 |
|
|
1033 |
< |
<!-- jsr166x --> |
1056 |
< |
|
1057 |
< |
<target name="jsr166xcompile" |
1058 |
< |
depends="configure-compiler" |
1059 |
< |
description="Compiles jsr166x sources to build dir"> |
1033 |
> |
<!-- jsr166x (no longer maintained) --> |
1034 |
|
|
1035 |
+ |
<target name="jsr166xcompile" depends="configure-compiler"> |
1036 |
|
<mkdir dir="${build.jsr166x.classes.dir}"/> |
1037 |
|
|
1038 |
|
<javac srcdir="${topsrc.dir}" |
1049 |
|
encoding="ASCII" |
1050 |
|
executable="${javac7}" |
1051 |
|
fork="true"> |
1077 |
– |
|
1052 |
|
<include name="jsr166x/**/*.java"/> |
1053 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1054 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
1055 |
|
<compilerarg value="-Werror"/> |
1056 |
|
<compilerarg line="${build.args}"/> |
1083 |
– |
|
1057 |
|
</javac> |
1058 |
|
</target> |
1059 |
|
|
1060 |
< |
|
1088 |
< |
<target name="jsr166xjar" |
1089 |
< |
depends="jsr166xcompile" |
1090 |
< |
description="Builds library jar from compiled sources"> |
1091 |
< |
|
1060 |
> |
<target name="jsr166xjar" depends="jsr166xcompile"> |
1061 |
|
<jar destfile="${jsr166x.jar}"> |
1062 |
|
<fileset dir="${build.jsr166x.classes.dir}"/> |
1063 |
|
<manifest> |
1065 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1066 |
|
</manifest> |
1067 |
|
</jar> |
1099 |
– |
|
1068 |
|
</target> |
1069 |
|
|
1070 |
< |
|
1103 |
< |
<target name="jsr166xdocs" |
1104 |
< |
description="Builds javadocs to dist dir"> |
1105 |
< |
|
1070 |
> |
<target name="jsr166xdocs"> |
1071 |
|
<delete dir="${jsr166xdocs.dir}"/> |
1072 |
|
<mkdir dir="${jsr166xdocs.dir}"/> |
1073 |
|
|
1082 |
|
failonerror = "true"> |
1083 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1084 |
|
<arg value="-XDignore.symbol.file=true"/> |
1120 |
– |
|
1085 |
|
</javadoc> |
1086 |
|
</target> |
1087 |
|
|
1088 |
+ |
<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/> |
1089 |
|
|
1090 |
< |
<target name="jsr166xdist" |
1126 |
< |
depends="jsr166xdist-jar, jsr166xdist-docs" |
1127 |
< |
description="Puts all distributable products in single hierarchy"/> |
1128 |
< |
|
1129 |
< |
|
1130 |
< |
<target name="jsr166xclean" |
1131 |
< |
description="Removes all jsr166x build products"> |
1132 |
< |
|
1090 |
> |
<target name="jsr166xclean"> |
1091 |
|
<delete dir="${build.jsr166x.dir}"/> |
1134 |
– |
|
1092 |
|
</target> |
1093 |
|
|
1094 |
< |
|
1138 |
< |
<target name="jsr166xdist-jar" |
1139 |
< |
depends="jsr166xclean, jsr166xjar"> |
1094 |
> |
<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar"> |
1095 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
1096 |
|
</target> |
1097 |
|
|
1098 |
< |
<target name="jsr166xdist-docs" |
1144 |
< |
depends="jsr166xclean, jsr166xdocs"> |
1098 |
> |
<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs"> |
1099 |
|
<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/> |
1100 |
|
</target> |
1101 |
|
|
1148 |
– |
<!-- jsr166y --> |
1149 |
– |
|
1102 |
|
|
1103 |
< |
<target name="jsr166ycompile" |
1152 |
< |
depends="configure-compiler" |
1153 |
< |
description="Compiles jsr166y sources"> |
1103 |
> |
<!-- jsr166y (no longer maintained) --> |
1104 |
|
|
1105 |
+ |
<target name="jsr166ycompile" depends="configure-compiler"> |
1106 |
|
<mkdir dir="${build.jsr166y.classes.dir}"/> |
1107 |
|
|
1108 |
|
<javac srcdir="${topsrc.dir}" |
1125 |
|
<compilerarg value="-Xlint:all"/> |
1126 |
|
<compilerarg value="-Werror"/> |
1127 |
|
<compilerarg line="${build.args}"/> |
1177 |
– |
|
1128 |
|
</javac> |
1129 |
|
</target> |
1130 |
|
|
1131 |
< |
|
1182 |
< |
<target name="jsr166yjar" |
1183 |
< |
depends="jsr166ycompile" |
1184 |
< |
description="Builds library jar from compiled sources"> |
1185 |
< |
|
1131 |
> |
<target name="jsr166yjar" depends="jsr166ycompile"> |
1132 |
|
<jar destfile="${jsr166y.jar}" index="true"> |
1133 |
|
<fileset dir="${build.jsr166y.classes.dir}"/> |
1134 |
|
<manifest> |
1136 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1137 |
|
</manifest> |
1138 |
|
</jar> |
1193 |
– |
|
1139 |
|
</target> |
1140 |
|
|
1141 |
< |
|
1197 |
< |
<target name="jsr166ydocs" |
1198 |
< |
description="Builds javadocs to dist dir"> |
1199 |
< |
|
1141 |
> |
<target name="jsr166ydocs"> |
1142 |
|
<delete dir="${jsr166ydocs.dir}"/> |
1143 |
|
<mkdir dir="${jsr166ydocs.dir}"/> |
1144 |
|
|
1153 |
|
failonerror = "true"> |
1154 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1155 |
|
<arg value="-XDignore.symbol.file=true"/> |
1214 |
– |
|
1156 |
|
</javadoc> |
1157 |
|
</target> |
1158 |
|
|
1159 |
+ |
<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/> |
1160 |
|
|
1161 |
< |
<target name="jsr166ydist" |
1220 |
< |
depends="jsr166ydist-jar, jsr166ydist-docs" |
1221 |
< |
description="Puts all distributable products in single hierarchy"/> |
1222 |
< |
|
1223 |
< |
|
1224 |
< |
<target name="jsr166yclean" |
1225 |
< |
description="Removes all jsr166y build products"> |
1226 |
< |
|
1161 |
> |
<target name="jsr166yclean"> |
1162 |
|
<delete dir="${build.jsr166y.dir}"/> |
1228 |
– |
|
1163 |
|
</target> |
1164 |
|
|
1165 |
< |
|
1232 |
< |
<target name="jsr166ydist-jar" |
1233 |
< |
depends="jsr166yclean, jsr166yjar"> |
1165 |
> |
<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar"> |
1166 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
1167 |
|
</target> |
1168 |
|
|
1169 |
< |
<target name="jsr166ydist-docs" |
1238 |
< |
depends="jsr166yclean, jsr166ydocs"> |
1169 |
> |
<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs"> |
1170 |
|
<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/> |
1171 |
|
</target> |
1172 |
|
|
1173 |
|
|
1174 |
< |
<!-- extra166y --> |
1244 |
< |
|
1245 |
< |
|
1246 |
< |
<target name="extra166ycompile" |
1247 |
< |
depends="configure-compiler, jsr166yjar" |
1248 |
< |
description="Compiles extra166y sources"> |
1174 |
> |
<!-- extra166y (no longer maintained) --> |
1175 |
|
|
1176 |
+ |
<target name="extra166ycompile" depends="configure-compiler, jsr166yjar"> |
1177 |
|
<mkdir dir="${build.extra166y.classes.dir}"/> |
1178 |
|
|
1179 |
|
<javac srcdir="${topsrc.dir}" |
1196 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
1197 |
|
<compilerarg value="-Werror"/> |
1198 |
|
<compilerarg line="${build.args}"/> |
1272 |
– |
|
1199 |
|
</javac> |
1200 |
|
</target> |
1201 |
|
|
1202 |
< |
|
1277 |
< |
<target name="extra166yjar" |
1278 |
< |
depends="extra166ycompile" |
1279 |
< |
description="Builds library jar from compiled sources"> |
1280 |
< |
|
1202 |
> |
<target name="extra166yjar" depends="extra166ycompile"> |
1203 |
|
<jar destfile="${extra166y.jar}" index="true"> |
1204 |
|
<fileset dir="${build.extra166y.classes.dir}"/> |
1205 |
|
<manifest> |
1207 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1208 |
|
</manifest> |
1209 |
|
</jar> |
1288 |
– |
|
1210 |
|
</target> |
1211 |
|
|
1212 |
< |
|
1292 |
< |
<target name="extra166ydocs" |
1293 |
< |
description="Builds javadocs to build dir"> |
1294 |
< |
|
1212 |
> |
<target name="extra166ydocs"> |
1213 |
|
<delete dir="${extra166ydocs.dir}"/> |
1214 |
|
<mkdir dir="${extra166ydocs.dir}"/> |
1215 |
|
|
1223 |
|
executable="${javadoc7}"> |
1224 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1225 |
|
<arg value="-XDignore.symbol.file=true"/> |
1308 |
– |
|
1226 |
|
</javadoc> |
1227 |
|
</target> |
1228 |
|
|
1229 |
+ |
<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/> |
1230 |
|
|
1231 |
< |
<target name="extra166ydist" |
1314 |
< |
depends="extra166ydist-jar, extra166ydist-docs" |
1315 |
< |
description="Puts all distributable products in single hierarchy"/> |
1316 |
< |
|
1317 |
< |
|
1318 |
< |
<target name="extra166yclean" |
1319 |
< |
description="Removes all extra166y build products"> |
1320 |
< |
|
1231 |
> |
<target name="extra166yclean"> |
1232 |
|
<delete dir="${build.extra166y.dir}"/> |
1322 |
– |
|
1233 |
|
</target> |
1234 |
|
|
1235 |
< |
|
1326 |
< |
<target name="extra166ydist-jar" |
1327 |
< |
depends="extra166yclean, extra166yjar"> |
1235 |
> |
<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar"> |
1236 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
1237 |
|
</target> |
1238 |
|
|
1239 |
< |
<target name="extra166ydist-docs" |
1332 |
< |
depends="extra166yclean, extra166ydocs"> |
1239 |
> |
<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs"> |
1240 |
|
<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/> |
1241 |
|
</target> |
1242 |
|
|
1243 |
< |
<!-- jsr166e --> |
1243 |
> |
|
1244 |
> |
<!-- jsr166e (no longer maintained) --> |
1245 |
|
|
1246 |
|
<property name="build.jsr166e.java.version" value="6"/> |
1247 |
|
<property name="build.jsr166e.javac" value="${javac6}"/> |
1248 |
|
|
1249 |
< |
<target name="jsr166ecompile" |
1342 |
< |
depends="configure-compiler" |
1343 |
< |
description="Compiles jsr166e sources"> |
1344 |
< |
|
1249 |
> |
<target name="jsr166ecompile" depends="configure-compiler"> |
1250 |
|
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1251 |
|
|
1252 |
|
<javac srcdir="${topsrc.dir}" |
1267 |
|
<compilerarg value="-Xlint:all"/> |
1268 |
|
<compilerarg value="-Werror"/> |
1269 |
|
<compilerarg line="${build.args}"/> |
1365 |
– |
|
1270 |
|
</javac> |
1271 |
|
</target> |
1272 |
|
|
1369 |
– |
<!-- jsr166e: find doclint errors --> |
1273 |
|
<target name="jsr166edoclint"> |
1371 |
– |
|
1274 |
|
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1275 |
|
|
1276 |
|
<javac srcdir="${topsrc.dir}" |
1292 |
|
<compilerarg value="-Xlint:all"/> |
1293 |
|
<compilerarg value="-Werror"/> |
1294 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
1393 |
– |
|
1295 |
|
</javac> |
1296 |
|
</target> |
1297 |
|
|
1298 |
< |
|
1398 |
< |
<target name="jsr166ejar" |
1399 |
< |
depends="jsr166ecompile" |
1400 |
< |
description="Builds library jar from compiled sources"> |
1401 |
< |
|
1298 |
> |
<target name="jsr166ejar" depends="jsr166ecompile"> |
1299 |
|
<jar destfile="${jsr166e.jar}" index="true"> |
1300 |
|
<fileset dir="${build.jsr166e.classes.dir}"/> |
1301 |
|
<manifest> |
1303 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1304 |
|
</manifest> |
1305 |
|
</jar> |
1409 |
– |
|
1306 |
|
</target> |
1307 |
|
|
1308 |
< |
|
1413 |
< |
<target name="jsr166edocs" |
1414 |
< |
description="Builds javadocs to build dir"> |
1415 |
< |
|
1308 |
> |
<target name="jsr166edocs"> |
1309 |
|
<delete dir="${jsr166edocs.dir}"/> |
1310 |
|
<mkdir dir="${jsr166edocs.dir}"/> |
1311 |
|
|
1319 |
|
failonerror = "true"> |
1320 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1321 |
|
<arg value="-XDignore.symbol.file=true"/> |
1429 |
– |
|
1322 |
|
</javadoc> |
1323 |
|
</target> |
1324 |
|
|
1325 |
< |
|
1434 |
< |
<target name="jsr166e-tck-one-java-version" |
1435 |
< |
depends="jsr166ejar"> |
1436 |
< |
|
1325 |
> |
<target name="jsr166e-tck-one-java-version" depends="jsr166ejar"> |
1326 |
|
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
1438 |
– |
|
1327 |
|
<run-tck-tests |
1328 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1329 |
|
target="${build.jsr166e.java.version}" |
1331 |
|
classes="${jsr166e.jar}"/> |
1332 |
|
</target> |
1333 |
|
|
1334 |
< |
<target name="jsr166e-tck" |
1447 |
< |
description="Runs tck tests for jsr166e for multiple java versions"> |
1334 |
> |
<target name="jsr166e-tck"> |
1335 |
|
|
1336 |
|
<!-- <antcall target="clean"/> --> |
1337 |
|
<!-- <antcall target="jsr166e-tck-one-java-version"> --> |
1352 |
|
</antcall> |
1353 |
|
</target> |
1354 |
|
|
1355 |
+ |
<target name="jsr166e-test" depends="jsr166e-tck"/> |
1356 |
|
|
1357 |
< |
<target name="jsr166e-test" |
1470 |
< |
depends="jsr166e-tck" |
1471 |
< |
description="Runs all tests for jsr166e"> |
1472 |
< |
</target> |
1473 |
< |
|
1474 |
< |
<target name="jsr166edist" |
1475 |
< |
depends="jsr166edist-jar, jsr166edist-docs" |
1476 |
< |
description="Puts all distributable products in single hierarchy"/> |
1477 |
< |
|
1357 |
> |
<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/> |
1358 |
|
|
1359 |
< |
<target name="jsr166eclean" |
1480 |
< |
description="Removes all jsr166e build products"> |
1359 |
> |
<target name="jsr166eclean"> |
1360 |
|
<delete dir="${build.jsr166e.dir}"/> |
1361 |
|
</target> |
1362 |
|
|
1484 |
– |
|
1363 |
|
<target name="jsr166edist-jar" |
1364 |
|
depends="jsr166eclean, jsr166ejar"> |
1365 |
|
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1366 |
|
</target> |
1367 |
|
|
1368 |
< |
<target name="jsr166edist-docs" |
1491 |
< |
depends="jsr166eclean, jsr166edocs"> |
1368 |
> |
<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs"> |
1369 |
|
<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/> |
1370 |
|
</target> |
1371 |
|
|
1372 |
|
|
1373 |
|
<!-- Find buglets that can be detected by static build tools --> |
1374 |
|
|
1375 |
< |
<target name="lint"> |
1376 |
< |
<antcall target="dists"> |
1377 |
< |
<param name="build.javadoc.access" value="public"/> |
1378 |
< |
</antcall> |
1379 |
< |
</target> |
1375 |
> |
<!-- <target name="lint"> --> |
1376 |
> |
<!-- <antcall target="dists"> --> |
1377 |
> |
<!-- <param name="build.javadoc.access" value="protected"/> --> |
1378 |
> |
<!-- </antcall> --> |
1379 |
> |
<!-- </target> --> |
1380 |
|
|
1381 |
|
<!-- Generates all doclint warnings, even for private methods (rarely useful) --> |
1382 |
< |
<target name="lint-private"> |
1382 |
> |
<target name="doclint-private"> |
1383 |
|
<antcall target="dist"> |
1384 |
|
<param name="build.javadoc.access" value="private"/> |
1385 |
|
</antcall> |
1386 |
|
</target> |
1387 |
|
|
1388 |
+ |
|
1389 |
+ |
<!-- ============================================================== |
1390 |
+ |
Experimental errorprone support - http://errorprone.info |
1391 |
+ |
=================================================================== --> |
1392 |
+ |
<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/> |
1393 |
+ |
<property name="errorprone.jsr166.user.flags" value=""/> |
1394 |
+ |
<property name="errorprone.jsr166.flags" |
1395 |
+ |
value="-Xep:HashtableContains:OFF |
1396 |
+ |
-Xep:JdkObsolete:OFF |
1397 |
+ |
-Xep:MissingOverride:OFF |
1398 |
+ |
-Xep:MissingFail:OFF |
1399 |
+ |
-Xep:MixedArrayDimensions:ERROR |
1400 |
+ |
-Xep:RemoveUnusedImports:ERROR |
1401 |
+ |
-Xep:EmptyIf:ERROR |
1402 |
+ |
-Xep:MultipleTopLevelClasses:ERROR |
1403 |
+ |
-Xep:ClassName:ERROR |
1404 |
+ |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1405 |
+ |
-Xep:RedundantThrows:ERROR |
1406 |
+ |
-Xep:IdentityBinaryExpression:WARN |
1407 |
+ |
-Xep:MethodCanBeStatic:WARN |
1408 |
+ |
${errorprone.jsr166.user.flags}"/> |
1409 |
+ |
<!-- -Xep:WildcardImport:ERROR --> |
1410 |
+ |
<property name="errorprone.jsr166.test.flags" |
1411 |
+ |
value="-Xep:StringSplitter:OFF |
1412 |
+ |
-Xep:BoxedPrimitiveConstructor:OFF |
1413 |
+ |
-Xep:ModifyingCollectionWithItself:OFF"/> |
1414 |
+ |
<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' --> |
1415 |
+ |
<target name="errorprone" |
1416 |
+ |
depends="clean, configure-compiler" |
1417 |
+ |
description="Run errorprone over jsr166 source code (experimental)"> |
1418 |
+ |
|
1419 |
+ |
<local name="destdir"/> |
1420 |
+ |
<property name="destdir" value="${build.classes.dir}/java.base"/> |
1421 |
+ |
<mkdir dir="${destdir}"/> |
1422 |
+ |
|
1423 |
+ |
<javac srcdir="${src.dir}" |
1424 |
+ |
destdir="${destdir}" |
1425 |
+ |
debug="${build.debug}" |
1426 |
+ |
debuglevel="${build.debuglevel}" |
1427 |
+ |
deprecation="${build.deprecation}" |
1428 |
+ |
classpath="" |
1429 |
+ |
includeAntRuntime="false" |
1430 |
+ |
includeJavaRuntime="false" |
1431 |
+ |
encoding="ASCII" |
1432 |
+ |
executable="${build.main.javac}" |
1433 |
+ |
fork="true"> |
1434 |
+ |
|
1435 |
+ |
<include name="**/*.java"/> |
1436 |
+ |
<compilerarg value="-J--illegal-access=debug"/> |
1437 |
+ |
<compilerarg value="-XDcompilePolicy=simple"/> |
1438 |
+ |
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1439 |
+ |
<compilerarg value="-Xplugin:ErrorProne |
1440 |
+ |
${errorprone.jsr166.flags}"/> |
1441 |
+ |
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
1442 |
+ |
<compilerarg value="-Xprefer:source"/> |
1443 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
1444 |
+ |
<compilerarg value="-Xlint:all"/> |
1445 |
+ |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
1446 |
+ |
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1447 |
+ |
<compilerarg line="${build.args}"/> |
1448 |
+ |
</javac> |
1449 |
+ |
|
1450 |
+ |
<jar destfile="${product.jar}"> |
1451 |
+ |
<fileset dir="${destdir}"/> |
1452 |
+ |
</jar> |
1453 |
+ |
|
1454 |
+ |
<run-tck-tests |
1455 |
+ |
target="${build.main.java.version}" |
1456 |
+ |
workdir="${build.dir}" |
1457 |
+ |
classes="${product.jar}"> |
1458 |
+ |
<javac-elements> |
1459 |
+ |
<compilerarg value="-J--illegal-access=debug"/> |
1460 |
+ |
<compilerarg value="-XDcompilePolicy=simple"/> |
1461 |
+ |
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1462 |
+ |
<compilerarg value="-Xplugin:ErrorProne |
1463 |
+ |
${errorprone.jsr166.flags} |
1464 |
+ |
${errorprone.jsr166.test.flags}"/> |
1465 |
+ |
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1466 |
+ |
</javac-elements> |
1467 |
+ |
</run-tck-tests> |
1468 |
+ |
</target> |
1469 |
+ |
|
1470 |
+ |
<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' --> |
1471 |
+ |
<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports --> |
1472 |
+ |
<target name="errorprone-jtreg" |
1473 |
+ |
depends="jar" |
1474 |
+ |
description="Run errorprone over jtreg tests (experimental)"> |
1475 |
+ |
|
1476 |
+ |
<run-jtreg-tests |
1477 |
+ |
target="${build.main.java.version}" |
1478 |
+ |
workdir="${build.dir}" |
1479 |
+ |
classes="${product.jar}" |
1480 |
+ |
verbose="all"> |
1481 |
+ |
<jtreg-elements> |
1482 |
+ |
<arg value="-javacoption:-XDcompilePolicy=simple"/> |
1483 |
+ |
<arg value="-javacoption:-processorpath"/> |
1484 |
+ |
<arg value="-javacoption:${errorprone.jar}"/> |
1485 |
+ |
<arg value="-javacoption:-Xplugin:ErrorProne |
1486 |
+ |
${errorprone.jsr166.flags} |
1487 |
+ |
${errorprone.jsr166.test.flags} |
1488 |
+ |
-Xep:MultipleTopLevelClasses:WARN |
1489 |
+ |
-Xep:NonAtomicVolatileUpdate:OFF"/> |
1490 |
+ |
</jtreg-elements> |
1491 |
+ |
</run-jtreg-tests> |
1492 |
+ |
</target> |
1493 |
+ |
|
1494 |
+ |
|
1495 |
|
<!-- ============================================================== |
1496 |
|
Running guava tests against jsr166 code |
1497 |
|
=================================================================== --> |
1544 |
|
<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar" |
1545 |
|
dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/> |
1546 |
|
<junit printsummary="true" showoutput="true" haltonfailure="true" |
1547 |
< |
jvm="${java9}" fork="true"> |
1548 |
< |
<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/> |
1547 |
> |
jvm="${build.main.java}" fork="true"> |
1548 |
> |
<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/> |
1549 |
|
<formatter type="brief"/> |
1550 |
|
<classpath> |
1551 |
|
<pathelement location="${guava.dir}/guava-testlib-tests.jar"/> |