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/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/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 7 8 9 10 ... |
36 |
> |
for $N in 8 9 10 ... |
37 |
|
|
38 |
|
As of 2016-03, the sources in src/main are for jdk9+ only. |
39 |
|
------------------------------------------------------------------------------ |
104 |
|
<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes" |
105 |
|
unless:set="have.java.base"/> |
106 |
|
<local name="modules"/> |
107 |
< |
<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/> |
107 |
> |
<available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/> |
108 |
|
<local name="boot.jar.dir"/> |
109 |
|
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib" unless:set="modules"/> |
110 |
|
<path id="bootclasspath@{v}" unless:set="modules"> |
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"/> |
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 --> |
240 |
|
|
241 |
|
<local name="modules"/> |
242 |
|
<condition property="modules"> |
243 |
< |
<available file="${jdk@{compile-target}.home}/jmods" type="dir"/> |
243 |
> |
<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/> |
244 |
|
</condition> |
245 |
|
|
246 |
|
<local name="use-doclint"/> |
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 --> |
324 |
– |
<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 |
|
|
346 |
|
|
347 |
|
<local name="modules"/> |
348 |
|
<condition property="modules"> |
349 |
< |
<available file="${jdk@{target}.home}/jmods" type="dir"/> |
349 |
> |
<available file="${jdk@{target}.home}/lib/modules" type="file"/> |
350 |
|
</condition> |
351 |
|
|
352 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
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" |
410 |
|
depends="configure-compiler" |
411 |
|
description="Compiles src/main sources to build dir"> |
412 |
|
|
385 |
– |
<local name="modules"/> |
386 |
– |
<condition property="modules"> |
387 |
– |
<and> |
388 |
– |
<available file="${jdk9.home}/jmods" type="dir"/> |
389 |
– |
<equals arg1="9" arg2="${build.main.java.version}"/> |
390 |
– |
</and> |
391 |
– |
</condition> |
392 |
– |
|
413 |
|
<local name="destdir"/> |
414 |
< |
<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/> |
395 |
< |
<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="--patch-module=java.base=${src.dir}" 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 value="-Werror"/> |
435 |
> |
<compilerarg line="--doclint-format html5"/> |
436 |
|
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
437 |
+ |
<compilerarg value="-Werror"/> |
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="-html5"/> |
490 |
|
<arg value="--patch-module=java.base=${src.dir}"/> |
491 |
< |
<arg value="-tag"/> |
492 |
< |
<arg value="${javadoc.jls.option}"/> |
493 |
< |
<!-- @apiNote currently unused --> |
494 |
< |
<!-- <arg value="-tag"/> --> |
495 |
< |
<!-- <arg value="apiNote:a:API Note:"/> --> |
474 |
< |
<arg value="-tag"/> |
475 |
< |
<arg value="implSpec:a:Implementation Requirements:"/> |
476 |
< |
<arg value="-tag"/> |
477 |
< |
<arg value="implNote:a:Implementation Note:"/> |
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 |
> |
<arg value="-tag"/> <arg value="apiNote:a:API Note:"/> |
496 |
|
<!-- tags added in jdk9: currently unused --> |
497 |
< |
<!-- <arg value="-tag"/> --> |
498 |
< |
<!-- <arg value="revised:X"/> --> |
481 |
< |
<!-- <arg value="-tag"/> --> |
482 |
< |
<!-- <arg value="spec:X"/> --> |
497 |
> |
<!-- <arg value="-tag"/> <arg value="revised:X"/> --> |
498 |
> |
<!-- <arg value="-tag"/> <arg value="spec:X"/> --> |
499 |
|
</javadoc> |
500 |
|
</target> |
501 |
|
|
529 |
|
|
530 |
|
<target name="clean" |
531 |
|
description="Removes all build products"> |
516 |
– |
|
532 |
|
<delete dir="${build.dir}"/> |
518 |
– |
|
533 |
|
</target> |
534 |
|
|
535 |
|
|
536 |
|
<target name="dist-clean" |
537 |
|
description="Removes all build and distribution products"> |
524 |
– |
|
538 |
|
<delete dir="${build.dir}"/> |
539 |
|
<delete dir="${dist.dir}"/> |
527 |
– |
|
540 |
|
</target> |
541 |
|
|
542 |
|
|
596 |
|
|
597 |
|
<target name="test" |
598 |
|
depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg" |
599 |
< |
description="Runs tck and jtreg tests for src/main"> |
588 |
< |
</target> |
599 |
> |
description="Runs tck and jtreg tests for src/main"/> |
600 |
|
|
601 |
|
<!-- <target name="jtreg8" description="Runs jtreg tests with jdk8"> --> |
602 |
|
|
607 |
|
|
608 |
|
<!-- </target> --> |
609 |
|
|
610 |
< |
<!-- <target name="test89" --> |
611 |
< |
<!-- description="Runs tck and jtreg tests for src/main for multiple java versions"> --> |
610 |
> |
<target name="test91011" |
611 |
> |
description="Runs tck and jtreg tests for src/main for multiple java versions"> |
612 |
|
|
613 |
< |
<!-- <antcall target="clean"/> --> |
614 |
< |
<!-- <antcall target="test"> --> |
615 |
< |
<!-- <param name="build.main.java.version" value="8"/> --> |
616 |
< |
<!-- <param name="build.main.javac" value="${javac8}"/> --> |
606 |
< |
<!-- </antcall> --> |
613 |
> |
<antcall target="clean"/> |
614 |
> |
<antcall target="test"> |
615 |
> |
<param name="build.main.java.version" value="9"/> |
616 |
> |
</antcall> |
617 |
|
|
618 |
< |
<!-- <antcall target="clean"/> --> |
619 |
< |
<!-- <antcall target="test"> --> |
620 |
< |
<!-- <param name="build.main.java.version" value="9"/> --> |
621 |
< |
<!-- <param name="build.main.javac" value="${javac9}"/> --> |
612 |
< |
<!-- </antcall> --> |
618 |
> |
<antcall target="clean"/> |
619 |
> |
<antcall target="test"> |
620 |
> |
<param name="build.main.java.version" value="10"/> |
621 |
> |
</antcall> |
622 |
|
|
623 |
< |
<!-- </target> --> |
623 |
> |
<antcall target="clean"/> |
624 |
> |
<antcall target="test"> |
625 |
> |
<param name="build.main.java.version" value="11"/> |
626 |
> |
</antcall> |
627 |
> |
|
628 |
> |
<!-- Clean up to avoid obscure wrong class file version bugs --> |
629 |
> |
<antcall target="clean"/> |
630 |
> |
|
631 |
> |
</target> |
632 |
|
|
633 |
|
|
634 |
|
|
680 |
|
<java classname="ALoops" fork="true"> |
681 |
|
<classpath refid="loops.classpath"/> |
682 |
|
</java> |
666 |
– |
|
683 |
|
</target> |
684 |
|
|
685 |
|
|
686 |
|
<target name="compile-test-loops" depends="jar" |
687 |
< |
description="compile all the perf tests in src/test/loops"> |
687 |
> |
description="Compiles all the perf tests in src/test/loops"> |
688 |
|
|
689 |
|
<mkdir dir="${build.dir}/test/loops"/> |
690 |
|
|
696 |
|
includeAntRuntime="false" |
697 |
|
includeJavaRuntime="false" |
698 |
|
encoding="ASCII" |
699 |
< |
executable="${javac9}" |
699 |
> |
executable="${build.main.javac}" |
700 |
|
fork="true"> |
701 |
|
|
702 |
|
<include name="*.java"/> |
704 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
705 |
|
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
706 |
|
<compilerarg line="${build.args}"/> |
691 |
– |
|
707 |
|
</javac> |
693 |
– |
|
708 |
|
</target> |
709 |
|
|
710 |
|
|
730 |
|
encoding="ASCII" |
731 |
|
executable="${javac8}" |
732 |
|
fork="true"> |
719 |
– |
|
733 |
|
<include name="**/*.java"/> |
734 |
|
<compilerarg value="-Xprefer:source"/> |
735 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
736 |
|
<compilerarg value="-Xlint:all"/> |
737 |
|
<compilerarg value="-Werror"/> |
738 |
|
<compilerarg line="${build.args}"/> |
726 |
– |
|
739 |
|
</javac> |
740 |
|
</target> |
741 |
|
|
759 |
|
encoding="ASCII" |
760 |
|
executable="${javac8}" |
761 |
|
fork="true"> |
750 |
– |
|
762 |
|
<include name="**/*.java"/> |
763 |
|
<compilerarg value="-Xprefer:source"/> |
764 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
765 |
|
<compilerarg value="-Xlint:all"/> |
766 |
|
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
767 |
|
<compilerarg line="${build.args}"/> |
757 |
– |
|
768 |
|
</javac> |
769 |
|
</target> |
770 |
|
|
780 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
781 |
|
</manifest> |
782 |
|
</jar> |
773 |
– |
|
783 |
|
</target> |
784 |
|
|
785 |
|
|
813 |
|
|
814 |
|
<target name="4jdk8-test" |
815 |
|
depends="4jdk8-tck, 4jdk8-jtreg" |
816 |
< |
description="Runs tck and jtreg tests for jsr166-4jdk8"> |
808 |
< |
</target> |
816 |
> |
description="Runs tck and jtreg tests for jsr166-4jdk8"/> |
817 |
|
|
818 |
|
|
819 |
|
<target name="4jdk8docs" |
829 |
|
access="${build.javadoc.access}" |
830 |
|
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}" |
831 |
|
classpath="" |
832 |
+ |
source="8" |
833 |
|
executable="${javadoc8}" |
834 |
|
failonerror = "true"> |
835 |
|
<fileset dir="${4jdk8src.dir}" defaultexcludes="yes"> |
837 |
|
</fileset> |
838 |
|
<arg line="-Xdocrootparent ${java8.docroot.url}"/> |
839 |
|
<arg value="-XDignore.symbol.file=true"/> |
840 |
< |
<arg value="-tag"/> |
841 |
< |
<arg value="${javadoc.jls.option}"/> |
842 |
< |
<!-- @apiNote currently unused --> |
843 |
< |
<!-- <arg value="-tag"/> --> |
844 |
< |
<!-- <arg value="apiNote:a:<em>API Note:</em>"/> --> |
836 |
< |
<arg value="-tag"/> |
837 |
< |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
838 |
< |
<arg value="-tag"/> |
839 |
< |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
840 |
> |
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
841 |
> |
<arg value="-tag"/> <arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
842 |
> |
<arg value="-tag"/> <arg value="implNote:a:<em>Implementation Note:</em>"/> |
843 |
> |
<!-- @apiNote tag currently unused --> |
844 |
> |
<!-- <arg value="-tag"/> <arg value="apiNote:a:<em>API Note:</em>"/> --> |
845 |
|
</javadoc> |
846 |
|
</target> |
847 |
|
|
853 |
|
|
854 |
|
<target name="4jdk8clean" |
855 |
|
description="Removes all 4jdk8 build products"> |
851 |
– |
|
856 |
|
<delete dir="${build.4jdk8.dir}"/> |
853 |
– |
|
857 |
|
</target> |
858 |
|
|
859 |
|
|
869 |
|
</target> |
870 |
|
|
871 |
|
|
872 |
+ |
<!-- jsr166 4jdk7 (no longer maintained) --> |
873 |
|
|
874 |
< |
<!-- jsr166 4jdk7 --> |
871 |
< |
|
872 |
< |
<target name="4jdk7compile" |
873 |
< |
depends="configure-compiler" |
874 |
< |
description="Compiles src/jdk7 sources, targeting jdk7"> |
875 |
< |
|
874 |
> |
<target name="4jdk7compile" depends="configure-compiler"> |
875 |
|
<mkdir dir="${build.4jdk7.classes.dir}"/> |
876 |
|
|
877 |
|
<javac srcdir="${4jdk7src.dir}" |
895 |
|
<compilerarg value="-Xlint:all"/> |
896 |
|
<compilerarg value="-Werror"/> |
897 |
|
<compilerarg line="${build.args}"/> |
899 |
– |
|
898 |
|
</javac> |
899 |
|
</target> |
900 |
|
|
901 |
< |
<target name="4jdk7doclint" |
904 |
< |
depends="configure-compiler" |
905 |
< |
description="Finds doclint warnings"> |
906 |
< |
|
901 |
> |
<target name="4jdk7doclint" depends="configure-compiler"> |
902 |
|
<mkdir dir="${build.4jdk7.classes.dir}"/> |
903 |
|
|
904 |
|
<javac srcdir="${4jdk7src.dir}" |
922 |
|
<compilerarg value="-Xlint:all"/> |
923 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
924 |
|
<compilerarg line="${build.args}"/> |
930 |
– |
|
925 |
|
</javac> |
926 |
|
</target> |
927 |
|
|
928 |
< |
|
935 |
< |
<target name="4jdk7jar" |
936 |
< |
depends="4jdk7compile" |
937 |
< |
description="Builds library jar from compiled sources"> |
938 |
< |
|
928 |
> |
<target name="4jdk7jar" depends="4jdk7compile"> |
929 |
|
<jar destfile="${4jdk7product.jar}"> |
930 |
|
<fileset dir="${build.4jdk7.classes.dir}"/> |
931 |
|
<manifest> |
933 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
934 |
|
</manifest> |
935 |
|
</jar> |
946 |
– |
|
936 |
|
</target> |
937 |
|
|
938 |
< |
|
950 |
< |
<target name="4jdk7-tck" |
951 |
< |
depends="4jdk7jar" |
952 |
< |
description="Runs tck tests for jsr166-4jdk7 directly"> |
953 |
< |
|
938 |
> |
<target name="4jdk7-tck" depends="4jdk7jar"> |
939 |
|
<run-tck-tests |
940 |
|
target="7" |
941 |
|
workdir="${build.4jdk7.dir}" |
958 |
|
</run-tck-tests> |
959 |
|
</target> |
960 |
|
|
976 |
– |
|
961 |
|
<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) --> |
962 |
< |
<target name="4jdk7-tck-junit" |
979 |
< |
depends="4jdk7compile"> |
962 |
> |
<target name="4jdk7-tck-junit" depends="4jdk7compile"> |
963 |
|
|
964 |
|
<junit printsummary="true" |
965 |
|
showoutput="true" |
981 |
|
|
982 |
|
<test name="${jsr166.tckTestClass}" haltonfailure="no"> |
983 |
|
</test> |
1001 |
– |
|
984 |
|
</junit> |
985 |
|
</target> |
986 |
|
|
987 |
< |
<target name="4jdk7-jtreg" |
1006 |
< |
depends="4jdk7jar" |
1007 |
< |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
987 |
> |
<target name="4jdk7-jtreg" depends="4jdk7jar"> |
988 |
|
<run-jtreg-tests |
989 |
|
target="7" |
990 |
|
workdir="${build.4jdk7.dir}" |
991 |
|
classes="${4jdk7product.jar}"/> |
992 |
|
</target> |
993 |
|
|
994 |
+ |
<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/> |
995 |
|
|
996 |
< |
<target name="4jdk7-test" |
1016 |
< |
depends="4jdk7-tck, 4jdk7-jtreg" |
1017 |
< |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
1018 |
< |
</target> |
1019 |
< |
|
1020 |
< |
|
1021 |
< |
<target name="4jdk7docs" |
1022 |
< |
description="Builds javadocs for src/jdk7 to dist dir"> |
1023 |
< |
|
996 |
> |
<target name="4jdk7docs"> |
997 |
|
<delete dir="${4jdk7docs.dir}"/> |
998 |
|
<mkdir dir="${4jdk7docs.dir}"/> |
999 |
|
|
1014 |
|
</javadoc> |
1015 |
|
</target> |
1016 |
|
|
1017 |
+ |
<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/> |
1018 |
|
|
1019 |
< |
<target name="4jdk7dist" |
1046 |
< |
depends="4jdk7dist-jar, 4jdk7dist-docs" |
1047 |
< |
description="Puts all distributable products in single hierarchy"/> |
1048 |
< |
|
1049 |
< |
|
1050 |
< |
<target name="4jdk7clean" |
1051 |
< |
description="Removes all 4jdk7 build products"> |
1052 |
< |
|
1019 |
> |
<target name="4jdk7clean"> |
1020 |
|
<delete dir="${build.4jdk7.dir}"/> |
1054 |
– |
|
1021 |
|
</target> |
1022 |
|
|
1023 |
< |
|
1058 |
< |
<target name="4jdk7dist-jar" |
1059 |
< |
depends="4jdk7clean, 4jdk7jar"> |
1023 |
> |
<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar"> |
1024 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
1025 |
|
</target> |
1026 |
|
|
1027 |
< |
|
1064 |
< |
<target name="4jdk7dist-docs" |
1065 |
< |
depends="4jdk7clean, 4jdk7docs"> |
1027 |
> |
<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs"> |
1028 |
|
<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/> |
1029 |
|
</target> |
1030 |
|
|
1031 |
|
|
1032 |
< |
<!-- jsr166x --> |
1071 |
< |
|
1072 |
< |
<target name="jsr166xcompile" |
1073 |
< |
depends="configure-compiler" |
1074 |
< |
description="Compiles jsr166x sources to build dir"> |
1032 |
> |
<!-- jsr166x (no longer maintained) --> |
1033 |
|
|
1034 |
+ |
<target name="jsr166xcompile" depends="configure-compiler"> |
1035 |
|
<mkdir dir="${build.jsr166x.classes.dir}"/> |
1036 |
|
|
1037 |
|
<javac srcdir="${topsrc.dir}" |
1048 |
|
encoding="ASCII" |
1049 |
|
executable="${javac7}" |
1050 |
|
fork="true"> |
1092 |
– |
|
1051 |
|
<include name="jsr166x/**/*.java"/> |
1052 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1053 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
1054 |
|
<compilerarg value="-Werror"/> |
1055 |
|
<compilerarg line="${build.args}"/> |
1098 |
– |
|
1056 |
|
</javac> |
1057 |
|
</target> |
1058 |
|
|
1059 |
< |
|
1103 |
< |
<target name="jsr166xjar" |
1104 |
< |
depends="jsr166xcompile" |
1105 |
< |
description="Builds library jar from compiled sources"> |
1106 |
< |
|
1059 |
> |
<target name="jsr166xjar" depends="jsr166xcompile"> |
1060 |
|
<jar destfile="${jsr166x.jar}"> |
1061 |
|
<fileset dir="${build.jsr166x.classes.dir}"/> |
1062 |
|
<manifest> |
1064 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1065 |
|
</manifest> |
1066 |
|
</jar> |
1114 |
– |
|
1067 |
|
</target> |
1068 |
|
|
1069 |
< |
|
1118 |
< |
<target name="jsr166xdocs" |
1119 |
< |
description="Builds javadocs to dist dir"> |
1120 |
< |
|
1069 |
> |
<target name="jsr166xdocs"> |
1070 |
|
<delete dir="${jsr166xdocs.dir}"/> |
1071 |
|
<mkdir dir="${jsr166xdocs.dir}"/> |
1072 |
|
|
1081 |
|
failonerror = "true"> |
1082 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1083 |
|
<arg value="-XDignore.symbol.file=true"/> |
1135 |
– |
|
1084 |
|
</javadoc> |
1085 |
|
</target> |
1086 |
|
|
1087 |
+ |
<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/> |
1088 |
|
|
1089 |
< |
<target name="jsr166xdist" |
1141 |
< |
depends="jsr166xdist-jar, jsr166xdist-docs" |
1142 |
< |
description="Puts all distributable products in single hierarchy"/> |
1143 |
< |
|
1144 |
< |
|
1145 |
< |
<target name="jsr166xclean" |
1146 |
< |
description="Removes all jsr166x build products"> |
1147 |
< |
|
1089 |
> |
<target name="jsr166xclean"> |
1090 |
|
<delete dir="${build.jsr166x.dir}"/> |
1149 |
– |
|
1091 |
|
</target> |
1092 |
|
|
1093 |
< |
|
1153 |
< |
<target name="jsr166xdist-jar" |
1154 |
< |
depends="jsr166xclean, jsr166xjar"> |
1093 |
> |
<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar"> |
1094 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
1095 |
|
</target> |
1096 |
|
|
1097 |
< |
<target name="jsr166xdist-docs" |
1159 |
< |
depends="jsr166xclean, jsr166xdocs"> |
1097 |
> |
<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs"> |
1098 |
|
<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/> |
1099 |
|
</target> |
1100 |
|
|
1163 |
– |
<!-- jsr166y --> |
1101 |
|
|
1102 |
+ |
<!-- jsr166y (no longer maintained) --> |
1103 |
|
|
1104 |
< |
<target name="jsr166ycompile" |
1167 |
< |
depends="configure-compiler" |
1168 |
< |
description="Compiles jsr166y sources"> |
1169 |
< |
|
1104 |
> |
<target name="jsr166ycompile" depends="configure-compiler"> |
1105 |
|
<mkdir dir="${build.jsr166y.classes.dir}"/> |
1106 |
|
|
1107 |
|
<javac srcdir="${topsrc.dir}" |
1124 |
|
<compilerarg value="-Xlint:all"/> |
1125 |
|
<compilerarg value="-Werror"/> |
1126 |
|
<compilerarg line="${build.args}"/> |
1192 |
– |
|
1127 |
|
</javac> |
1128 |
|
</target> |
1129 |
|
|
1130 |
< |
|
1197 |
< |
<target name="jsr166yjar" |
1198 |
< |
depends="jsr166ycompile" |
1199 |
< |
description="Builds library jar from compiled sources"> |
1200 |
< |
|
1130 |
> |
<target name="jsr166yjar" depends="jsr166ycompile"> |
1131 |
|
<jar destfile="${jsr166y.jar}" index="true"> |
1132 |
|
<fileset dir="${build.jsr166y.classes.dir}"/> |
1133 |
|
<manifest> |
1135 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1136 |
|
</manifest> |
1137 |
|
</jar> |
1208 |
– |
|
1138 |
|
</target> |
1139 |
|
|
1140 |
< |
|
1212 |
< |
<target name="jsr166ydocs" |
1213 |
< |
description="Builds javadocs to dist dir"> |
1214 |
< |
|
1140 |
> |
<target name="jsr166ydocs"> |
1141 |
|
<delete dir="${jsr166ydocs.dir}"/> |
1142 |
|
<mkdir dir="${jsr166ydocs.dir}"/> |
1143 |
|
|
1152 |
|
failonerror = "true"> |
1153 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1154 |
|
<arg value="-XDignore.symbol.file=true"/> |
1229 |
– |
|
1155 |
|
</javadoc> |
1156 |
|
</target> |
1157 |
|
|
1158 |
+ |
<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/> |
1159 |
|
|
1160 |
< |
<target name="jsr166ydist" |
1235 |
< |
depends="jsr166ydist-jar, jsr166ydist-docs" |
1236 |
< |
description="Puts all distributable products in single hierarchy"/> |
1237 |
< |
|
1238 |
< |
|
1239 |
< |
<target name="jsr166yclean" |
1240 |
< |
description="Removes all jsr166y build products"> |
1241 |
< |
|
1160 |
> |
<target name="jsr166yclean"> |
1161 |
|
<delete dir="${build.jsr166y.dir}"/> |
1243 |
– |
|
1162 |
|
</target> |
1163 |
|
|
1164 |
< |
|
1247 |
< |
<target name="jsr166ydist-jar" |
1248 |
< |
depends="jsr166yclean, jsr166yjar"> |
1164 |
> |
<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar"> |
1165 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
1166 |
|
</target> |
1167 |
|
|
1168 |
< |
<target name="jsr166ydist-docs" |
1253 |
< |
depends="jsr166yclean, jsr166ydocs"> |
1168 |
> |
<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs"> |
1169 |
|
<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/> |
1170 |
|
</target> |
1171 |
|
|
1172 |
|
|
1173 |
< |
<!-- extra166y --> |
1259 |
< |
|
1260 |
< |
|
1261 |
< |
<target name="extra166ycompile" |
1262 |
< |
depends="configure-compiler, jsr166yjar" |
1263 |
< |
description="Compiles extra166y sources"> |
1173 |
> |
<!-- extra166y (no longer maintained) --> |
1174 |
|
|
1175 |
+ |
<target name="extra166ycompile" depends="configure-compiler, jsr166yjar"> |
1176 |
|
<mkdir dir="${build.extra166y.classes.dir}"/> |
1177 |
|
|
1178 |
|
<javac srcdir="${topsrc.dir}" |
1195 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
1196 |
|
<compilerarg value="-Werror"/> |
1197 |
|
<compilerarg line="${build.args}"/> |
1287 |
– |
|
1198 |
|
</javac> |
1199 |
|
</target> |
1200 |
|
|
1201 |
< |
|
1292 |
< |
<target name="extra166yjar" |
1293 |
< |
depends="extra166ycompile" |
1294 |
< |
description="Builds library jar from compiled sources"> |
1295 |
< |
|
1201 |
> |
<target name="extra166yjar" depends="extra166ycompile"> |
1202 |
|
<jar destfile="${extra166y.jar}" index="true"> |
1203 |
|
<fileset dir="${build.extra166y.classes.dir}"/> |
1204 |
|
<manifest> |
1206 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1207 |
|
</manifest> |
1208 |
|
</jar> |
1303 |
– |
|
1209 |
|
</target> |
1210 |
|
|
1211 |
< |
|
1307 |
< |
<target name="extra166ydocs" |
1308 |
< |
description="Builds javadocs to build dir"> |
1309 |
< |
|
1211 |
> |
<target name="extra166ydocs"> |
1212 |
|
<delete dir="${extra166ydocs.dir}"/> |
1213 |
|
<mkdir dir="${extra166ydocs.dir}"/> |
1214 |
|
|
1222 |
|
executable="${javadoc7}"> |
1223 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1224 |
|
<arg value="-XDignore.symbol.file=true"/> |
1323 |
– |
|
1225 |
|
</javadoc> |
1226 |
|
</target> |
1227 |
|
|
1228 |
+ |
<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/> |
1229 |
|
|
1230 |
< |
<target name="extra166ydist" |
1329 |
< |
depends="extra166ydist-jar, extra166ydist-docs" |
1330 |
< |
description="Puts all distributable products in single hierarchy"/> |
1331 |
< |
|
1332 |
< |
|
1333 |
< |
<target name="extra166yclean" |
1334 |
< |
description="Removes all extra166y build products"> |
1335 |
< |
|
1230 |
> |
<target name="extra166yclean"> |
1231 |
|
<delete dir="${build.extra166y.dir}"/> |
1337 |
– |
|
1232 |
|
</target> |
1233 |
|
|
1234 |
< |
|
1341 |
< |
<target name="extra166ydist-jar" |
1342 |
< |
depends="extra166yclean, extra166yjar"> |
1234 |
> |
<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar"> |
1235 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
1236 |
|
</target> |
1237 |
|
|
1238 |
< |
<target name="extra166ydist-docs" |
1347 |
< |
depends="extra166yclean, extra166ydocs"> |
1238 |
> |
<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs"> |
1239 |
|
<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/> |
1240 |
|
</target> |
1241 |
|
|
1242 |
< |
<!-- jsr166e --> |
1242 |
> |
|
1243 |
> |
<!-- jsr166e (no longer maintained) --> |
1244 |
|
|
1245 |
|
<property name="build.jsr166e.java.version" value="6"/> |
1246 |
|
<property name="build.jsr166e.javac" value="${javac6}"/> |
1247 |
|
|
1248 |
< |
<target name="jsr166ecompile" |
1357 |
< |
depends="configure-compiler" |
1358 |
< |
description="Compiles jsr166e sources"> |
1359 |
< |
|
1248 |
> |
<target name="jsr166ecompile" depends="configure-compiler"> |
1249 |
|
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1250 |
|
|
1251 |
|
<javac srcdir="${topsrc.dir}" |
1266 |
|
<compilerarg value="-Xlint:all"/> |
1267 |
|
<compilerarg value="-Werror"/> |
1268 |
|
<compilerarg line="${build.args}"/> |
1380 |
– |
|
1269 |
|
</javac> |
1270 |
|
</target> |
1271 |
|
|
1384 |
– |
<!-- jsr166e: find doclint errors --> |
1272 |
|
<target name="jsr166edoclint"> |
1386 |
– |
|
1273 |
|
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1274 |
|
|
1275 |
|
<javac srcdir="${topsrc.dir}" |
1291 |
|
<compilerarg value="-Xlint:all"/> |
1292 |
|
<compilerarg value="-Werror"/> |
1293 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
1408 |
– |
|
1294 |
|
</javac> |
1295 |
|
</target> |
1296 |
|
|
1297 |
< |
|
1413 |
< |
<target name="jsr166ejar" |
1414 |
< |
depends="jsr166ecompile" |
1415 |
< |
description="Builds library jar from compiled sources"> |
1416 |
< |
|
1297 |
> |
<target name="jsr166ejar" depends="jsr166ecompile"> |
1298 |
|
<jar destfile="${jsr166e.jar}" index="true"> |
1299 |
|
<fileset dir="${build.jsr166e.classes.dir}"/> |
1300 |
|
<manifest> |
1302 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1303 |
|
</manifest> |
1304 |
|
</jar> |
1424 |
– |
|
1305 |
|
</target> |
1306 |
|
|
1307 |
< |
|
1428 |
< |
<target name="jsr166edocs" |
1429 |
< |
description="Builds javadocs to build dir"> |
1430 |
< |
|
1307 |
> |
<target name="jsr166edocs"> |
1308 |
|
<delete dir="${jsr166edocs.dir}"/> |
1309 |
|
<mkdir dir="${jsr166edocs.dir}"/> |
1310 |
|
|
1318 |
|
failonerror = "true"> |
1319 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1320 |
|
<arg value="-XDignore.symbol.file=true"/> |
1444 |
– |
|
1321 |
|
</javadoc> |
1322 |
|
</target> |
1323 |
|
|
1324 |
< |
|
1449 |
< |
<target name="jsr166e-tck-one-java-version" |
1450 |
< |
depends="jsr166ejar"> |
1451 |
< |
|
1324 |
> |
<target name="jsr166e-tck-one-java-version" depends="jsr166ejar"> |
1325 |
|
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
1453 |
– |
|
1326 |
|
<run-tck-tests |
1327 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1328 |
|
target="${build.jsr166e.java.version}" |
1330 |
|
classes="${jsr166e.jar}"/> |
1331 |
|
</target> |
1332 |
|
|
1333 |
< |
<target name="jsr166e-tck" |
1462 |
< |
description="Runs tck tests for jsr166e for multiple java versions"> |
1333 |
> |
<target name="jsr166e-tck"> |
1334 |
|
|
1335 |
|
<!-- <antcall target="clean"/> --> |
1336 |
|
<!-- <antcall target="jsr166e-tck-one-java-version"> --> |
1351 |
|
</antcall> |
1352 |
|
</target> |
1353 |
|
|
1354 |
+ |
<target name="jsr166e-test" depends="jsr166e-tck"/> |
1355 |
|
|
1356 |
< |
<target name="jsr166e-test" |
1485 |
< |
depends="jsr166e-tck" |
1486 |
< |
description="Runs all tests for jsr166e"> |
1487 |
< |
</target> |
1488 |
< |
|
1489 |
< |
<target name="jsr166edist" |
1490 |
< |
depends="jsr166edist-jar, jsr166edist-docs" |
1491 |
< |
description="Puts all distributable products in single hierarchy"/> |
1356 |
> |
<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/> |
1357 |
|
|
1358 |
< |
|
1494 |
< |
<target name="jsr166eclean" |
1495 |
< |
description="Removes all jsr166e build products"> |
1358 |
> |
<target name="jsr166eclean"> |
1359 |
|
<delete dir="${build.jsr166e.dir}"/> |
1360 |
|
</target> |
1361 |
|
|
1499 |
– |
|
1362 |
|
<target name="jsr166edist-jar" |
1363 |
|
depends="jsr166eclean, jsr166ejar"> |
1364 |
|
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1365 |
|
</target> |
1366 |
|
|
1367 |
< |
<target name="jsr166edist-docs" |
1506 |
< |
depends="jsr166eclean, jsr166edocs"> |
1367 |
> |
<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs"> |
1368 |
|
<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/> |
1369 |
|
</target> |
1370 |
|
|
1371 |
|
|
1372 |
|
<!-- Find buglets that can be detected by static build tools --> |
1373 |
|
|
1374 |
< |
<target name="lint"> |
1375 |
< |
<antcall target="dists"> |
1376 |
< |
<param name="build.javadoc.access" value="public"/> |
1377 |
< |
</antcall> |
1378 |
< |
</target> |
1374 |
> |
<!-- <target name="lint"> --> |
1375 |
> |
<!-- <antcall target="dists"> --> |
1376 |
> |
<!-- <param name="build.javadoc.access" value="protected"/> --> |
1377 |
> |
<!-- </antcall> --> |
1378 |
> |
<!-- </target> --> |
1379 |
|
|
1380 |
|
<!-- Generates all doclint warnings, even for private methods (rarely useful) --> |
1381 |
< |
<target name="lint-private"> |
1381 |
> |
<target name="doclint-private"> |
1382 |
|
<antcall target="dist"> |
1383 |
|
<param name="build.javadoc.access" value="private"/> |
1384 |
|
</antcall> |
1387 |
|
|
1388 |
|
<!-- ============================================================== |
1389 |
|
Experimental errorprone support - http://errorprone.info |
1529 |
– |
You may need to bring your own errorprone jar. |
1390 |
|
=================================================================== --> |
1391 |
+ |
<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/> |
1392 |
+ |
<property name="errorprone.jsr166.user.flags" value=""/> |
1393 |
+ |
<property name="errorprone.jsr166.flags" |
1394 |
+ |
value="-Xep:HashtableContains:OFF |
1395 |
+ |
-Xep:JdkObsolete:OFF |
1396 |
+ |
-Xep:MissingOverride:OFF |
1397 |
+ |
-Xep:MissingFail:OFF |
1398 |
+ |
-Xep:MixedArrayDimensions:ERROR |
1399 |
+ |
-Xep:RemoveUnusedImports:ERROR |
1400 |
+ |
-Xep:EmptyIf:ERROR |
1401 |
+ |
-Xep:MultipleTopLevelClasses:ERROR |
1402 |
+ |
-Xep:ClassName:ERROR |
1403 |
+ |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1404 |
+ |
-Xep:RedundantThrows:ERROR |
1405 |
+ |
-Xep:IdentityBinaryExpression:WARN |
1406 |
+ |
-Xep:MethodCanBeStatic:WARN |
1407 |
+ |
${errorprone.jsr166.user.flags}"/> |
1408 |
+ |
<!-- -Xep:WildcardImport:ERROR --> |
1409 |
+ |
<property name="errorprone.jsr166.test.flags" |
1410 |
+ |
value="-Xep:StringSplitter:OFF |
1411 |
+ |
-Xep:BoxedPrimitiveConstructor:OFF |
1412 |
+ |
-Xep:ModifyingCollectionWithItself:OFF"/> |
1413 |
+ |
<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' --> |
1414 |
|
<target name="errorprone" |
1415 |
|
depends="clean, configure-compiler" |
1416 |
< |
description="Run errorprone over jsr166 source code"> |
1416 |
> |
description="Run errorprone over jsr166 source code (experimental)"> |
1417 |
|
|
1418 |
|
<local name="destdir"/> |
1419 |
|
<property name="destdir" value="${build.classes.dir}/java.base"/> |
1432 |
|
fork="true"> |
1433 |
|
|
1434 |
|
<include name="**/*.java"/> |
1435 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1436 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1437 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1438 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/> |
1556 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/> |
1557 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/> |
1558 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/> |
1559 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1560 |
< |
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1561 |
< |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/> |
1435 |
> |
<!-- Needed to silence -Xep:FutureReturnValueIgnored --> |
1436 |
> |
<compilerarg value="-J--illegal-access=permit"/> |
1437 |
> |
<compilerarg value="-XDcompilePolicy=simple"/> |
1438 |
> |
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1439 |
|
<compilerarg value="-Xplugin:ErrorProne |
1440 |
< |
-Xep:IdentityBinaryExpression:WARN |
1564 |
< |
-Xep:MissingOverride:OFF |
1565 |
< |
-Xep:MixedArrayDimensions:WARN |
1566 |
< |
-Xep:RemoveUnusedImports:ERROR |
1567 |
< |
-Xep:MethodCanBeStatic:WARN"/> |
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"/> |
1456 |
|
workdir="${build.dir}" |
1457 |
|
classes="${product.jar}"> |
1458 |
|
<javac-elements> |
1459 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1460 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1461 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1462 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/> |
1463 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/> |
1464 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/> |
1465 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/> |
1593 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1594 |
< |
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1595 |
< |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/> |
1596 |
< |
<compilerarg value="-Xplugin:ErrorProne |
1597 |
< |
-Xep:IdentityBinaryExpression:WARN |
1598 |
< |
-Xep:BoxedPrimitiveConstructor:OFF |
1599 |
< |
-Xep:HashtableContains:OFF |
1600 |
< |
-Xep:ModifyingCollectionWithItself:OFF |
1601 |
< |
-Xep:MissingOverride:OFF |
1602 |
< |
-Xep:MixedArrayDimensions:WARN |
1603 |
< |
-Xep:RemoveUnusedImports:ERROR |
1604 |
< |
-Xep:MethodCanBeStatic:WARN"/> |
1459 |
> |
<!-- Needed to silence -Xep:FutureReturnValueIgnored --> |
1460 |
> |
<compilerarg value="-J--illegal-access=permit"/> |
1461 |
> |
<compilerarg value="-XDcompilePolicy=simple"/> |
1462 |
> |
<compilerarg line="-processorpath ${errorprone.jar}"/> |
1463 |
> |
<compilerarg value="-Xplugin:ErrorProne |
1464 |
> |
${errorprone.jsr166.flags} |
1465 |
> |
${errorprone.jsr166.test.flags}"/> |
1466 |
|
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1467 |
|
</javac-elements> |
1468 |
|
</run-tck-tests> |
1469 |
|
</target> |
1470 |
|
|
1471 |
+ |
<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' --> |
1472 |
+ |
<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports --> |
1473 |
+ |
<target name="errorprone-jtreg" |
1474 |
+ |
depends="jar" |
1475 |
+ |
description="Run errorprone over jtreg tests (experimental)"> |
1476 |
+ |
|
1477 |
+ |
<run-jtreg-tests |
1478 |
+ |
target="${build.main.java.version}" |
1479 |
+ |
workdir="${build.dir}" |
1480 |
+ |
classes="${product.jar}" |
1481 |
+ |
verbose="all"> |
1482 |
+ |
<jtreg-elements> |
1483 |
+ |
<arg value="-javacoption:-XDcompilePolicy=simple"/> |
1484 |
+ |
<arg value="-javacoption:-processorpath"/> |
1485 |
+ |
<arg value="-javacoption:${errorprone.jar}"/> |
1486 |
+ |
<arg value="-javacoption:-Xplugin:ErrorProne |
1487 |
+ |
${errorprone.jsr166.flags} |
1488 |
+ |
${errorprone.jsr166.test.flags} |
1489 |
+ |
-Xep:MultipleTopLevelClasses:WARN |
1490 |
+ |
-Xep:NonAtomicVolatileUpdate:OFF"/> |
1491 |
+ |
</jtreg-elements> |
1492 |
+ |
</run-jtreg-tests> |
1493 |
+ |
</target> |
1494 |
+ |
|
1495 |
|
|
1496 |
|
<!-- ============================================================== |
1497 |
|
Running guava tests against jsr166 code |
1545 |
|
<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar" |
1546 |
|
dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/> |
1547 |
|
<junit printsummary="true" showoutput="true" haltonfailure="true" |
1548 |
< |
jvm="${java9}" fork="true"> |
1549 |
< |
<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/> |
1548 |
> |
jvm="${build.main.java}" fork="true"> |
1549 |
> |
<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/> |
1550 |
|
<formatter type="brief"/> |
1551 |
|
<classpath> |
1552 |
|
<pathelement location="${guava.dir}/guava-testlib-tests.jar"/> |