ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.200 by jsr166, Sat Mar 26 06:22:49 2016 UTC vs.
Revision 1.245 by jsr166, Fri Jun 16 20:50:16 2017 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless">
2 >  xmlns:if="ant:if" xmlns:unless="ant:unless"
3 >  xmlns:ivy="antlib:org.apache.ivy.ant">
4  
5    <description>
6   ------------------------------------------------------------------------------
# Line 7 | Line 8
8  
9    Usage: ant [target]
10  
11 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
12 +  more details.
13 +
14    User-specific settings are read from user.properties.
15    See user.properties.sample for an explanation of some useful settings.
16  
# Line 14 | Line 18
18    itself.  Because the JDK version matters and because different
19    targets require different JDKs, we assume that users have created a
20    hierarchy containing:
17  $HOME/jdk/jdk6
18  $HOME/jdk/jdk7
21    $HOME/jdk/jdk8
22    $HOME/jdk/jdk9
23 +  $HOME/jdk/jdk10
24    where each of the above is a JDK or a symlink to same, and
22  $HOME/jdk/src/jdk6
23  $HOME/jdk/src/jdk7
25    $HOME/jdk/src/jdk8
26    $HOME/jdk/src/jdk9
27 +  $HOME/jdk/src/jdk10
28    where each of the above is a complete JDK source tree
29    (e.g. mercurial forest) or a symlink to same.
30  
31    Alternatively, define ant variables thus:
32    ant -Djdk$N.home=... -Djdk$N.src.home=...
33 <  for $N in 6 7 8 9 ...
33 >  for $N in 8 9 10 ...
34  
35 <  As of 2015-09, there is incomplete hacky support for jigsaw
34 <  Build for jigsaw using something like:
35 <  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist
36 <  "docs" target is still broken.
35 >  As of 2016-03, the sources in src/main are for jdk9+ only.
36   ------------------------------------------------------------------------------
37    </description>
38  
39 <  <!-- Display main targets by running 'ant -projecthelp' -->
39 >  <!-- Run 'ant -projecthelp' (default target) -->
40    <target name="usage">
41      <java classname="org.apache.tools.ant.Main">
42        <arg value="-projecthelp" />
# Line 62 | Line 61
61    <property name="build.classes.dir"           location="${build.dir}/classes"/>
62    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
63    <property name="build.loops.dir"             location="${build.dir}/loops"/>
65  <property name="build.reports.dir"           location="${build.dir}/reports"/>
64  
65    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
66    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
# Line 133 | Line 131
131    <defjdklocations v="7"/>
132    <defjdklocations v="8"/>
133    <defjdklocations v="9"/>
134 +  <defjdklocations v="10"/>
135  
136    <!-- Source locations -->
137    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 142 | Line 141
141    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
142    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
143    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
144 +  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
145    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
146    <property name="lib.dir"              location="${basedir}/lib"/>
147    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 185 | Line 185
185    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
186    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
187    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
188 <  <!-- The expected canonical location does not yet exist as of 2016-03 -->
188 >  <!-- The expected canonical location does not yet exist as of 2016-04 -->
189    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
190 <  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
190 >  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
191    <!-- Default jdk doc location (latest stable release seems best) -->
192    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
193  
# Line 219 | Line 219
219      <attribute name="compile-target" default="@{target}"/>
220      <attribute name="workdir"/>
221      <attribute name="classes"/>
222 <    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
222 >    <!--
223 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
224 >    -->
225 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
226      <element name="javac-elements" optional="true"/>
227  
228      <sequential>
# Line 229 | Line 232
232        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233      </condition>
234  
235 +    <local name="use-doclint"/>
236 +    <condition property="use-doclint">
237 +      <not> <equals arg1="@{target}" arg2="7"/> </not>
238 +    </condition>
239 +
240      <mkdir dir="@{workdir}/tck-classes"/>
241  
242      <javac srcdir="@{tck.src.dir}"
# Line 241 | Line 249
249             classpath="${junit.jar}"
250             includeAntRuntime="false"
251             includeJavaRuntime="false"
252 +           encoding="ASCII"
253             executable="${javac@{compile-target}}"
254             fork="true">
255  
256        <include name="*.java"/>
257        <compilerarg value="-XDignore.symbol.file=true"/>
258        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
259 +      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
260        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
261 <      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
261 >      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
262        <compilerarg line="${build.args}"/>
263        <javac-elements/>
264  
# Line 259 | Line 269
269            jvm="${java@{target}}"
270            fork="true">
271          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
272 <        <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
272 >        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
273 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
274 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
275 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
276 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
277 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
278          <jvmarg line="@{jvmflags}"/>
279 +        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
280 +        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
281  
282 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
282 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
283          <syspropertyset id="system-properties-used-by-tck">
284            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
285            <propertyref prefix="jsr166."/>
# Line 288 | Line 305
305    <fileset dir="${jtreg8.src.dir}">
306      <patternset id="jdk8.jtreg.tests">
307        <include name="**/*.java"/>
291      <exclude name="**/SpliteratorCharacteristics.java"/>
292      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
293      <exclude name="**/GCDuringIteration.java"/>
308      </patternset>
309    </fileset>
310  
# Line 305 | Line 319
319  
320    <macrodef name="run-jtreg-tests">
321      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
308    <attribute name="source" default="7"/>
322      <attribute name="target"/>
323      <attribute name="workdir"/>
324      <attribute name="classes"/>
# Line 322 | Line 335
335      </condition>
336  
337      <delete dir="@{workdir}/JTwork"   quiet="true"/>
325    <delete dir="@{workdir}/JTreport" quiet="true"/>
326    <mkdir dir="@{workdir}/JTwork/scratch"/>
327    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
328    <mkdir dir="@{workdir}/JTreport/html"/>
329    <mkdir dir="@{workdir}/JTreport/text"/>
338      <jtreg dir="${jtreg@{target}.src.dir}"
339             jdk="${jdk@{target}.home}"
340 <           workDir="@{workdir}/JTwork"
333 <           reportDir="@{workdir}/JTreport">
340 >           workDir="@{workdir}/JTwork">
341        <patternset refid="jdk@{target}.jtreg.tests"/>
342        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
343 <      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
343 >      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
344 >      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
345        <arg value="-agentvm"/>
346 +      <arg value="-noreport"/>
347        <arg value="-verbose:${jtreg.verbose}"/>
348        <arg value="-vmoptions:-esa -ea"/>
349        <arg value="-automatic"/>
# Line 360 | Line 369
369    <property name="build.main.javac" value="${javac9}"/>
370  
371    <target name="dists"
372 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
372 >          depends="dist, 4jdk8dist"
373            description="Builds all public jars and docs"/>
374 +          <!--
375 +              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
376 +          -->
377  
378    <target name="compile"
379            depends="configure-compiler"
# Line 389 | Line 401
401             classpath=""
402             includeAntRuntime="false"
403             includeJavaRuntime="false"
404 +           encoding="ASCII"
405             executable="${build.main.javac}"
406             fork="true">
407  
408        <include name="**/*.java"/>
409 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
409 >      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
410        <compilerarg value="-Xprefer:source"/>
411        <compilerarg value="-XDignore.symbol.file=true"/>
412        <compilerarg value="-Xlint:all"/>
413 +      <compilerarg line="--doclint-format html5"/>
414 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
415        <compilerarg value="-Werror"/>
401      <compilerarg value="-Xdoclint:all/protected"/>
416        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
417        <compilerarg line="${build.args}"/>
418  
419      </javac>
406
407    <!-- We need jdk9's Contended annotation, but at compile time only -->
408    <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
420    </target>
421  
422  
423    <target name="jar"
424            depends="compile"
425 <          description="Builds library jar from compiled sources">
426 <
425 >          description="Builds library jar for src/main from compiled sources">
426 >    <local name="subdir"/>
427 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
428      <jar destfile="${product.jar}">
429 <      <fileset dir="${build.classes.dir}"/>
429 >      <fileset dir="${build.classes.dir}${subdir}"/>
430        <manifest>
431          <attribute name="Built-By" value="${user.name}"/>
432          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 432 | Line 444
444      <!-- the packagenames="none" hack below prevents scanning the -->
445      <!-- sourcepath for packages -->
446  
447 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
448 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
449 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
450 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
451 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
452      <javadoc destdir="${docs.dir}"
453               packagenames="none"
454               link="${java9.api.url}"
455               overview="${src.dir}/intro.html"
456               access="${build.javadoc.access}"
457 <             sourcepath="${src.dir}:${jdk9.src.dir}"
457 >             sourcepath="${src.dir}"
458               classpath=""
459 +             source="9"
460               executable="${javadoc9}">
461        <fileset dir="${src.dir}" defaultexcludes="yes">
462          <include name="**/*.java"/>
# Line 446 | Line 464
464        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
465        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
466        <arg value="-XDignore.symbol.file=true"/>
467 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
467 >      <arg value="-html5"/>
468 >      <arg value="--patch-module=java.base=${src.dir}"/>
469        <arg value="-tag"/>
470        <arg value="${javadoc.jls.option}"/>
471 + <!-- @apiNote currently unused -->
472 + <!--       <arg value="-tag"/> -->
473 + <!--       <arg value="apiNote:a:API Note:"/> -->
474        <arg value="-tag"/>
475 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
454 <      <arg value="-tag"/>
455 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
456 <      <arg value="-tag"/>
457 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
458 < <!-- tags added in jdk9 -->
459 <      <arg value="-tag"/>
460 <      <arg value="revised:X"/>
475 >      <arg value="implSpec:a:Implementation Requirements:"/>
476        <arg value="-tag"/>
477 <      <arg value="spec:X"/>
477 >      <arg value="implNote:a:Implementation Note:"/>
478 > <!-- tags added in jdk9: currently unused -->
479 > <!--       <arg value="-tag"/> -->
480 > <!--       <arg value="revised:X"/> -->
481 > <!--       <arg value="-tag"/> -->
482 > <!--       <arg value="spec:X"/> -->
483      </javadoc>
484    </target>
485  
# Line 493 | Line 513
513  
514    <target name="clean"
515            description="Removes all build products">
496
516      <delete dir="${build.dir}"/>
498
517    </target>
518  
519  
520    <target name="dist-clean"
521            description="Removes all build and distribution products">
504
522      <delete dir="${build.dir}"/>
523      <delete dir="${dist.dir}"/>
507
524    </target>
525  
526  
# Line 520 | Line 536
536  
537    <target name="tck"
538            depends="jar"
539 <          description="Runs tck tests for main directly">
539 >          description="Runs tck tests for src/main directly">
540  
541      <run-tck-tests
542        target="${build.main.java.version}"
543        workdir="${build.dir}"
544 <      classes="${product.jar}"/>
544 >      classes="${product.jar}">
545 >      <javac-elements>
546 >        <compilerarg value="-Werror"/>
547 >      </javac-elements>
548 >    </run-tck-tests>
549    </target>
550  
551    <target name="tck-parallelism-1"
552 <          description="Runs tck with given common pool parallelism">
552 >          description="Runs tck with common pool parallelism 1">
553      <antcall target="tck">
554        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
555      </antcall>
556    </target>
557  
558    <target name="tck-parallelism-0"
559 <          description="Runs tck with given common pool parallelism">
559 >          description="Runs tck with common pool parallelism 0">
560      <antcall target="tck">
561        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
562      </antcall>
563    </target>
564  
565 +  <target name="tck-security-manager"
566 +          description="Runs tck with a security manager">
567 +    <antcall target="tck">
568 +      <param name="jsr166.useSecurityManager" value="true"/>
569 +    </antcall>
570 +  </target>
571 +
572    <target name="jtreg"
573            depends="jar"
574 <          description="Runs jtreg tests for main using the jtreg ant task">
574 >          description="Runs jtreg tests for src/main using the jtreg ant task">
575      <run-jtreg-tests
576         target="${build.main.java.version}"
577         workdir="${build.dir}"
# Line 552 | Line 579
579    </target>
580  
581    <target name="test"
582 <          depends="tck, tck-parallelism-1, jtreg"
583 <          description="Runs tck and jtreg tests for main">
557 <  </target>
582 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
583 >          description="Runs tck and jtreg tests for src/main"/>
584  
585 <  <target name="jtreg8" description="Runs jtreg tests with jdk8">
585 > <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
586  
587 <    <antcall target="jtreg">
588 <      <param name="build.main.java.version" value="8"/>
589 <      <param name="build.main.javac" value="${javac8}"/>
590 <    </antcall>
587 > <!--     <antcall target="jtreg"> -->
588 > <!--       <param name="build.main.java.version" value="8"/> -->
589 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
590 > <!--     </antcall> -->
591  
592 <  </target>
592 > <!--   </target> -->
593  
594 <  <target name="test89"
595 <          description="Runs tck and jtreg tests for main for multiple java versions">
594 > <!--   <target name="test89" -->
595 > <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
596  
597 <    <antcall target="clean"/>
598 <    <antcall target="test">
599 <      <param name="build.main.java.version" value="8"/>
600 <      <param name="build.main.javac" value="${javac8}"/>
601 <    </antcall>
597 > <!--     <antcall target="clean"/> -->
598 > <!--     <antcall target="test"> -->
599 > <!--       <param name="build.main.java.version" value="8"/> -->
600 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
601 > <!--     </antcall> -->
602  
603 <    <antcall target="clean"/>
604 <    <antcall target="test">
605 <      <param name="build.main.java.version" value="9"/>
606 <      <param name="build.main.javac" value="${javac9}"/>
607 <    </antcall>
603 > <!--     <antcall target="clean"/> -->
604 > <!--     <antcall target="test"> -->
605 > <!--       <param name="build.main.java.version" value="9"/> -->
606 > <!--       <param name="build.main.javac" value="${javac9}"/> -->
607 > <!--     </antcall> -->
608  
609 <  </target>
609 > <!--   </target> -->
610  
611  
612  
613    <target name="configure-compiler">
614      <fail message="ant version too old">
615 <      <condition>
590 <        <not> <antversion atleast="1.9.1"/> </not>
591 <      </condition>
615 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
616      </fail>
617  
618      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 610 | Line 634
634    <!-- Various demos and test programs -->
635  
636  
637 <  <target name="loops" depends="configure-compiler"
638 <          description="Benchmark from Doug Lea's AQS paper">
637 >  <!-- description="Benchmark from Doug Lea's AQS paper" -->
638 >  <target name="loops" depends="configure-compiler">
639  
640      <mkdir dir="${build.loops.dir}"/>
641  
# Line 622 | Line 646
646        deprecation="${build.deprecation}"
647             source="${build.sourcelevel}"
648             target="${build.sourcelevel}"
649 +         encoding="ASCII"
650               fork="true">
651  
652        <compilerarg line="${build.args}"/>
# Line 633 | Line 658
658      <java classname="ALoops" fork="true">
659        <classpath refid="loops.classpath"/>
660      </java>
636
661    </target>
662  
663  
664    <target name="compile-test-loops" depends="jar"
665 <          description="compile all the perf tests in src/test/loops">
665 >          description="Compiles all the perf tests in src/test/loops">
666  
667      <mkdir dir="${build.dir}/test/loops"/>
668  
# Line 649 | Line 673
673             deprecation="${build.deprecation}"
674             includeAntRuntime="false"
675             includeJavaRuntime="false"
676 +           encoding="ASCII"
677             executable="${javac9}"
678             fork="true">
679  
# Line 657 | Line 682
682        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
683        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
684        <compilerarg line="${build.args}"/>
660
685      </javac>
662
686    </target>
687  
688  
# Line 682 | Line 705
705             bootclasspath="${bootclasspath8}"
706             includeAntRuntime="false"
707             includeJavaRuntime="false"
708 +           encoding="ASCII"
709             executable="${javac8}"
710             fork="true">
687
711        <include name="**/*.java"/>
712        <compilerarg value="-Xprefer:source"/>
713        <compilerarg value="-XDignore.symbol.file=true"/>
714        <compilerarg value="-Xlint:all"/>
715        <compilerarg value="-Werror"/>
716        <compilerarg line="${build.args}"/>
694
717      </javac>
718    </target>
719  
# Line 712 | Line 734
734             bootclasspath="${bootclasspath8}"
735             includeAntRuntime="false"
736             includeJavaRuntime="false"
737 +           encoding="ASCII"
738             executable="${javac8}"
739             fork="true">
717
740        <include name="**/*.java"/>
741        <compilerarg value="-Xprefer:source"/>
742        <compilerarg value="-XDignore.symbol.file=true"/>
743        <compilerarg value="-Xlint:all"/>
744 <      <compilerarg value="-Xdoclint:all/protected"/>
744 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
745        <compilerarg line="${build.args}"/>
724
746      </javac>
747    </target>
748  
# Line 737 | Line 758
758          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
759        </manifest>
760      </jar>
740
761    </target>
762  
763  
# Line 753 | Line 773
773          <!-- JDK9+ test classes -->
774          <exclude name="*9Test.java"/>
775          <exclude name="*10Test.java"/>
776 +        <compilerarg value="-Werror"/>
777        </javac-elements>
778      </run-tck-tests>
779    </target>
# Line 770 | Line 791
791  
792    <target name="4jdk8-test"
793            depends="4jdk8-tck, 4jdk8-jtreg"
794 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
774 <  </target>
794 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
795  
796  
797    <target name="4jdk8docs"
# Line 787 | Line 807
807               access="${build.javadoc.access}"
808               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
809               classpath=""
810 <             executable="${javadoc8}">
810 >             source="8"
811 >             executable="${javadoc8}"
812 >             failonerror = "true">
813        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
814          <include name="**/*.java"/>
815        </fileset>
# Line 795 | Line 817
817        <arg value="-XDignore.symbol.file=true"/>
818        <arg value="-tag"/>
819        <arg value="${javadoc.jls.option}"/>
820 <      <arg value="-tag"/>
821 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
820 > <!-- @apiNote currently unused -->
821 > <!--       <arg value="-tag"/> -->
822 > <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
823        <arg value="-tag"/>
824        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
825        <arg value="-tag"/>
# Line 812 | Line 835
835  
836    <target name="4jdk8clean"
837            description="Removes all 4jdk8 build products">
815
838      <delete dir="${build.4jdk8.dir}"/>
817
839    </target>
840  
841  
# Line 830 | Line 851
851    </target>
852  
853  
854 +  <!-- jsr166 4jdk7 (no longer maintained) -->
855  
856 <  <!-- jsr166 4jdk7 -->
835 <
836 <  <target name="4jdk7compile"
837 <          depends="configure-compiler"
838 <          description="Compiles src/jdk7 sources, targeting jdk7">
839 <
856 >  <target name="4jdk7compile" depends="configure-compiler">
857      <mkdir dir="${build.4jdk7.classes.dir}"/>
858  
859      <javac srcdir="${4jdk7src.dir}"
# Line 850 | Line 867
867             bootclasspath="${bootclasspath6}"
868             includeAntRuntime="false"
869             includeJavaRuntime="false"
870 +           encoding="ASCII"
871             executable="${javac7}"
872             fork="true">
873  
# Line 859 | Line 877
877        <compilerarg value="-Xlint:all"/>
878        <compilerarg value="-Werror"/>
879        <compilerarg line="${build.args}"/>
862
880      </javac>
881    </target>
882  
883 <  <target name="4jdk7doclint"
867 <          depends="configure-compiler"
868 <          description="Finds doclint warnings">
869 <
883 >  <target name="4jdk7doclint" depends="configure-compiler">
884      <mkdir dir="${build.4jdk7.classes.dir}"/>
885  
886      <javac srcdir="${4jdk7src.dir}"
# Line 880 | Line 894
894             bootclasspath="${bootclasspath6}"
895             includeAntRuntime="false"
896             includeJavaRuntime="false"
897 +           encoding="ASCII"
898             executable="${javac8}"
899             fork="true">
900  
# Line 889 | Line 904
904        <compilerarg value="-Xlint:all"/>
905        <compilerarg value="-Xdoclint:all/protected"/>
906        <compilerarg line="${build.args}"/>
892
907      </javac>
908    </target>
909  
910 <
897 <  <target name="4jdk7jar"
898 <          depends="4jdk7compile"
899 <          description="Builds library jar from compiled sources">
900 <
910 >  <target name="4jdk7jar" depends="4jdk7compile">
911      <jar destfile="${4jdk7product.jar}">
912        <fileset dir="${build.4jdk7.classes.dir}"/>
913        <manifest>
# Line 905 | Line 915
915          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
916        </manifest>
917      </jar>
908
918    </target>
919  
920 <
912 <  <target name="4jdk7-tck"
913 <          depends="4jdk7jar"
914 <          description="Runs tck tests for jsr166-4jdk7 directly">
915 <
920 >  <target name="4jdk7-tck" depends="4jdk7jar">
921      <run-tck-tests
922        target="7"
923        workdir="${build.4jdk7.dir}"
# Line 930 | Line 935
935          <exclude name="SplittableRandomTest.java"/>
936          <exclude name="StampedLockTest.java"/>
937          <exclude name="SubmissionPublisherTest.java"/>
938 +        <compilerarg value="-Werror"/>
939        </javac-elements>
940      </run-tck-tests>
941    </target>
942  
943 <
944 <  <target name="4jdk7-tck-junit"
939 <          depends="4jdk7compile"
940 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
943 >  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
944 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
945  
946      <junit printsummary="true"
947             showoutput="true"
# Line 959 | Line 963
963  
964        <test name="${jsr166.tckTestClass}" haltonfailure="no">
965        </test>
962
966      </junit>
967    </target>
968  
969 <  <target name="4jdk7-jtreg"
967 <          depends="4jdk7jar"
968 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
969 >  <target name="4jdk7-jtreg" depends="4jdk7jar">
970      <run-jtreg-tests
971         target="7"
972         workdir="${build.4jdk7.dir}"
973         classes="${4jdk7product.jar}"/>
974    </target>
975  
976 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
977  
978 <  <target name="4jdk7-test"
977 <          depends="4jdk7-tck, 4jdk7-jtreg"
978 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
979 <  </target>
980 <
981 <
982 <  <target name="4jdk7docs"
983 <          description="Builds javadocs for src/jdk7 to dist dir">
984 <
978 >  <target name="4jdk7docs">
979      <delete dir="${4jdk7docs.dir}"/>
980      <mkdir dir="${4jdk7docs.dir}"/>
981  
# Line 992 | Line 986
986               access="${build.javadoc.access}"
987               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
988               classpath=""
989 <             executable="${javadoc7}">
989 >             executable="${javadoc7}"
990 >             failonerror = "true">
991        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
992          <include name="**/*.java"/>
993        </fileset>
# Line 1001 | Line 996
996      </javadoc>
997    </target>
998  
999 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1000  
1001 <  <target name="4jdk7dist"
1006 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1007 <          description="Puts all distributable products in single hierarchy"/>
1008 <
1009 <
1010 <  <target name="4jdk7clean"
1011 <          description="Removes all 4jdk7 build products">
1012 <
1001 >  <target name="4jdk7clean">
1002      <delete dir="${build.4jdk7.dir}"/>
1014
1003    </target>
1004  
1005 <
1018 <  <target name="4jdk7dist-jar"
1019 <          depends="4jdk7clean, 4jdk7jar">
1005 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1006      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1007    </target>
1008  
1009 <
1024 <  <target name="4jdk7dist-docs"
1025 <          depends="4jdk7clean, 4jdk7docs">
1009 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1010      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1011    </target>
1012  
1013  
1014 <  <!-- jsr166x -->
1031 <
1032 <  <target name="jsr166xcompile"
1033 <          depends="configure-compiler"
1034 <          description="Compiles jsr166x sources to build dir">
1014 >  <!-- jsr166x (no longer maintained) -->
1015  
1016 +  <target name="jsr166xcompile" depends="configure-compiler">
1017      <mkdir dir="${build.jsr166x.classes.dir}"/>
1018  
1019      <javac srcdir="${topsrc.dir}"
# Line 1046 | Line 1027
1027             target="5"
1028             includeAntRuntime="false"
1029             includeJavaRuntime="false"
1030 +           encoding="ASCII"
1031             executable="${javac7}"
1032             fork="true">
1051
1033        <include name="jsr166x/**/*.java"/>
1034        <compilerarg value="-XDignore.symbol.file=true"/>
1035        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1036        <compilerarg value="-Werror"/>
1037        <compilerarg line="${build.args}"/>
1057
1038      </javac>
1039    </target>
1040  
1041 <
1062 <  <target name="jsr166xjar"
1063 <          depends="jsr166xcompile"
1064 <          description="Builds library jar from compiled sources">
1065 <
1041 >  <target name="jsr166xjar" depends="jsr166xcompile">
1042      <jar destfile="${jsr166x.jar}">
1043        <fileset dir="${build.jsr166x.classes.dir}"/>
1044        <manifest>
# Line 1070 | Line 1046
1046          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1047        </manifest>
1048      </jar>
1073
1049    </target>
1050  
1051 <
1077 <  <target name="jsr166xdocs"
1078 <          description="Builds javadocs to dist dir">
1079 <
1051 >  <target name="jsr166xdocs">
1052      <delete dir="${jsr166xdocs.dir}"/>
1053      <mkdir dir="${jsr166xdocs.dir}"/>
1054  
# Line 1087 | Line 1059
1059               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1060               bootclasspath="${bootclasspath6}"
1061               source="5"
1062 <             executable="${javadoc7}">
1062 >             executable="${javadoc7}"
1063 >             failonerror = "true">
1064        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1065        <arg value="-XDignore.symbol.file=true"/>
1093
1066      </javadoc>
1067    </target>
1068  
1069 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1070  
1071 <  <target name="jsr166xdist"
1099 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1100 <          description="Puts all distributable products in single hierarchy"/>
1101 <
1102 <
1103 <  <target name="jsr166xclean"
1104 <          description="Removes all jsr166x build products">
1105 <
1071 >  <target name="jsr166xclean">
1072      <delete dir="${build.jsr166x.dir}"/>
1107
1073    </target>
1074  
1075 <
1111 <  <target name="jsr166xdist-jar"
1112 <          depends="jsr166xclean, jsr166xjar">
1075 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1076      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1077    </target>
1078  
1079 <  <target name="jsr166xdist-docs"
1117 <          depends="jsr166xclean, jsr166xdocs">
1079 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1080      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1081    </target>
1082  
1121  <!-- jsr166y -->
1083  
1084 +  <!-- jsr166y (no longer maintained) -->
1085  
1086 <  <target name="jsr166ycompile"
1125 <          depends="configure-compiler"
1126 <          description="Compiles jsr166y sources">
1127 <
1086 >  <target name="jsr166ycompile" depends="configure-compiler">
1087      <mkdir dir="${build.jsr166y.classes.dir}"/>
1088  
1089      <javac srcdir="${topsrc.dir}"
# Line 1138 | Line 1097
1097             bootclasspath="${bootclasspath6}"
1098             includeAntRuntime="false"
1099             includeJavaRuntime="false"
1100 +           encoding="ASCII"
1101             executable="${javac7}"
1102             fork="true">
1103  
# Line 1146 | Line 1106
1106        <compilerarg value="-Xlint:all"/>
1107        <compilerarg value="-Werror"/>
1108        <compilerarg line="${build.args}"/>
1149
1109      </javac>
1110    </target>
1111  
1112 <
1154 <  <target name="jsr166yjar"
1155 <          depends="jsr166ycompile"
1156 <          description="Builds library jar from compiled sources">
1157 <
1112 >  <target name="jsr166yjar" depends="jsr166ycompile">
1113      <jar destfile="${jsr166y.jar}" index="true">
1114        <fileset dir="${build.jsr166y.classes.dir}"/>
1115        <manifest>
# Line 1162 | Line 1117
1117          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1118        </manifest>
1119      </jar>
1165
1120    </target>
1121  
1122 <
1169 <  <target name="jsr166ydocs"
1170 <          description="Builds javadocs to dist dir">
1171 <
1122 >  <target name="jsr166ydocs">
1123      <delete dir="${jsr166ydocs.dir}"/>
1124      <mkdir dir="${jsr166ydocs.dir}"/>
1125  
# Line 1179 | Line 1130
1130               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1131               bootclasspath="${bootclasspath6}"
1132               source="6"
1133 <             executable="${javadoc7}">
1133 >             executable="${javadoc7}"
1134 >             failonerror = "true">
1135        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1136        <arg value="-XDignore.symbol.file=true"/>
1185
1137      </javadoc>
1138    </target>
1139  
1140 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1141  
1142 <  <target name="jsr166ydist"
1191 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1192 <          description="Puts all distributable products in single hierarchy"/>
1193 <
1194 <
1195 <  <target name="jsr166yclean"
1196 <          description="Removes all jsr166y build products">
1197 <
1142 >  <target name="jsr166yclean">
1143      <delete dir="${build.jsr166y.dir}"/>
1199
1144    </target>
1145  
1146 <
1203 <  <target name="jsr166ydist-jar"
1204 <          depends="jsr166yclean, jsr166yjar">
1146 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1147      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1148    </target>
1149  
1150 <  <target name="jsr166ydist-docs"
1209 <          depends="jsr166yclean, jsr166ydocs">
1150 >  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1151      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1152    </target>
1153  
1154  
1155 <  <!-- extra166y -->
1215 <
1216 <
1217 <  <target name="extra166ycompile"
1218 <          depends="configure-compiler, jsr166yjar"
1219 <          description="Compiles extra166y sources">
1155 >  <!-- extra166y (no longer maintained) -->
1156  
1157 +  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1158      <mkdir dir="${build.extra166y.classes.dir}"/>
1159  
1160      <javac srcdir="${topsrc.dir}"
# Line 1231 | Line 1168
1168             target="6"
1169             includeAntRuntime="false"
1170             includeJavaRuntime="false"
1171 +           encoding="ASCII"
1172             executable="${javac7}"
1173             fork="true">
1174  
# Line 1239 | Line 1177
1177        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1178        <compilerarg value="-Werror"/>
1179        <compilerarg line="${build.args}"/>
1242
1180      </javac>
1181    </target>
1182  
1183 <
1247 <  <target name="extra166yjar"
1248 <          depends="extra166ycompile"
1249 <          description="Builds library jar from compiled sources">
1250 <
1183 >  <target name="extra166yjar" depends="extra166ycompile">
1184      <jar destfile="${extra166y.jar}" index="true">
1185        <fileset dir="${build.extra166y.classes.dir}"/>
1186        <manifest>
# Line 1255 | Line 1188
1188          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1189        </manifest>
1190      </jar>
1258
1191    </target>
1192  
1193 <
1262 <  <target name="extra166ydocs"
1263 <          description="Builds javadocs to build dir">
1264 <
1193 >  <target name="extra166ydocs">
1194      <delete dir="${extra166ydocs.dir}"/>
1195      <mkdir dir="${extra166ydocs.dir}"/>
1196  
# Line 1275 | Line 1204
1204               executable="${javadoc7}">
1205        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1206        <arg value="-XDignore.symbol.file=true"/>
1278
1207      </javadoc>
1208    </target>
1209  
1210 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1211  
1212 <  <target name="extra166ydist"
1284 <          depends="extra166ydist-jar, extra166ydist-docs"
1285 <          description="Puts all distributable products in single hierarchy"/>
1286 <
1287 <
1288 <  <target name="extra166yclean"
1289 <          description="Removes all extra166y build products">
1290 <
1212 >  <target name="extra166yclean">
1213      <delete dir="${build.extra166y.dir}"/>
1292
1214    </target>
1215  
1216 <
1296 <  <target name="extra166ydist-jar"
1297 <          depends="extra166yclean, extra166yjar">
1216 >  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1217      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1218    </target>
1219  
1220 <  <target name="extra166ydist-docs"
1302 <          depends="extra166yclean, extra166ydocs">
1220 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1221      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1222    </target>
1223  
1224 <  <!-- jsr166e -->
1224 >
1225 >  <!-- jsr166e (no longer maintained) -->
1226  
1227    <property name="build.jsr166e.java.version" value="6"/>
1228    <property name="build.jsr166e.javac" value="${javac6}"/>
1229  
1230 <  <target name="jsr166ecompile"
1312 <          depends="configure-compiler"
1313 <          description="Compiles jsr166e sources">
1314 <
1230 >  <target name="jsr166ecompile" depends="configure-compiler">
1231      <mkdir dir="${build.jsr166e.classes.dir}"/>
1232  
1233      <javac srcdir="${topsrc.dir}"
# Line 1332 | Line 1248
1248        <compilerarg value="-Xlint:all"/>
1249        <compilerarg value="-Werror"/>
1250        <compilerarg line="${build.args}"/>
1335
1251      </javac>
1252    </target>
1253  
1339  <!-- jsr166e: find doclint errors -->
1254    <target name="jsr166edoclint">
1341
1255      <mkdir dir="${build.jsr166e.classes.dir}"/>
1256  
1257      <javac srcdir="${topsrc.dir}"
# Line 1360 | Line 1273
1273        <compilerarg value="-Xlint:all"/>
1274        <compilerarg value="-Werror"/>
1275        <compilerarg value="-Xdoclint:all/protected"/>
1363
1276      </javac>
1277    </target>
1278  
1279 <
1368 <  <target name="jsr166ejar"
1369 <          depends="jsr166ecompile"
1370 <          description="Builds library jar from compiled sources">
1371 <
1279 >  <target name="jsr166ejar" depends="jsr166ecompile">
1280      <jar destfile="${jsr166e.jar}" index="true">
1281        <fileset dir="${build.jsr166e.classes.dir}"/>
1282        <manifest>
# Line 1376 | Line 1284
1284          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1285        </manifest>
1286      </jar>
1379
1287    </target>
1288  
1289 <
1383 <  <target name="jsr166edocs"
1384 <          description="Builds javadocs to build dir">
1385 <
1289 >  <target name="jsr166edocs">
1290      <delete dir="${jsr166edocs.dir}"/>
1291      <mkdir dir="${jsr166edocs.dir}"/>
1292  
# Line 1392 | Line 1296
1296               access="${build.javadoc.access}"
1297               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1298               source="${build.jsr166e.java.version}"
1299 <             executable="${javadoc7}">
1299 >             executable="${javadoc7}"
1300 >             failonerror = "true">
1301        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1302        <arg value="-XDignore.symbol.file=true"/>
1398
1303      </javadoc>
1304    </target>
1305  
1306 <
1403 <  <target name="jsr166e-tck-one-java-version"
1404 <          depends="jsr166ejar">
1405 <
1306 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1307      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1407
1308      <run-tck-tests
1309        tck.src.dir="${test.src.dir}/tck-jsr166e"
1310        target="${build.jsr166e.java.version}"
# Line 1412 | Line 1312
1312        classes="${jsr166e.jar}"/>
1313    </target>
1314  
1315 <  <target name="jsr166e-tck"
1416 <          description="Runs tck tests for jsr166e for multiple java versions">
1315 >  <target name="jsr166e-tck">
1316  
1317   <!--     <antcall target="clean"/> -->
1318   <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1434 | Line 1333
1333      </antcall>
1334    </target>
1335  
1336 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1337  
1338 <  <target name="jsr166e-test"
1439 <          depends="jsr166e-tck"
1440 <          description="Runs all tests for jsr166e">
1441 <  </target>
1442 <
1443 <  <target name="jsr166edist"
1444 <          depends="jsr166edist-jar, jsr166edist-docs"
1445 <          description="Puts all distributable products in single hierarchy"/>
1446 <
1338 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1339  
1340 <  <target name="jsr166eclean"
1449 <          description="Removes all jsr166e build products">
1340 >  <target name="jsr166eclean">
1341      <delete dir="${build.jsr166e.dir}"/>
1342    </target>
1343  
1453
1344    <target name="jsr166edist-jar"
1345            depends="jsr166eclean, jsr166ejar">
1346      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1347    </target>
1348  
1349 <  <target name="jsr166edist-docs"
1460 <          depends="jsr166eclean, jsr166edocs">
1349 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1350      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1351    </target>
1352  
# Line 1478 | Line 1367
1367    </target>
1368  
1369  
1370 + <!-- ==============================================================
1371 +  Experimental errorprone support - http://errorprone.info
1372 +  You may need to bring your own errorprone jar.
1373 + =================================================================== -->
1374 +  <target name="errorprone"
1375 +          depends="clean, configure-compiler"
1376 +          description="Run errorprone over jsr166 source code (experimental)">
1377 +
1378 +    <local name="destdir"/>
1379 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1380 +    <mkdir dir="${destdir}"/>
1381 +
1382 +    <javac srcdir="${src.dir}"
1383 +           destdir="${destdir}"
1384 +           debug="${build.debug}"
1385 +           debuglevel="${build.debuglevel}"
1386 +           deprecation="${build.deprecation}"
1387 +           classpath=""
1388 +           includeAntRuntime="false"
1389 +           includeJavaRuntime="false"
1390 +           encoding="ASCII"
1391 +           executable="${build.main.javac}"
1392 +           fork="true">
1393 +
1394 +      <include name="**/*.java"/>
1395 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1396 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1397 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1398 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1399 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1400 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1401 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1402 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1403 +      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1404 +      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1405 +      <compilerarg value="-Xplugin:ErrorProne
1406 +                          -Xep:IdentityBinaryExpression:WARN
1407 +                          -Xep:MissingOverride:OFF
1408 +                          -Xep:MixedArrayDimensions:WARN
1409 +                          -Xep:RemoveUnusedImports:ERROR
1410 +                          -Xep:ClassName:ERROR
1411 +                          -Xep:MultipleTopLevelClasses:ERROR
1412 +                          -Xep:EmptyIf:ERROR
1413 +                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1414 +                          -Xep:ArgumentParameterSwap:ERROR
1415 +                          -Xep:RedundantThrows:ERROR
1416 +                          -Xep:MethodCanBeStatic:WARN"/>
1417 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1418 +      <compilerarg value="-Xprefer:source"/>
1419 +      <compilerarg value="-XDignore.symbol.file=true"/>
1420 +      <compilerarg value="-Xlint:all"/>
1421 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1422 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1423 +      <compilerarg line="${build.args}"/>
1424 +    </javac>
1425 +
1426 +    <jar destfile="${product.jar}">
1427 +      <fileset dir="${destdir}"/>
1428 +    </jar>
1429 +
1430 +    <run-tck-tests
1431 +      target="${build.main.java.version}"
1432 +      workdir="${build.dir}"
1433 +      classes="${product.jar}">
1434 +      <javac-elements>
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"/>
1439 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1440 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1441 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1442 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1443 +        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1444 +        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1445 +        <compilerarg value="-Xplugin:ErrorProne
1446 +                            -Xep:IdentityBinaryExpression:WARN
1447 +                            -Xep:BoxedPrimitiveConstructor:OFF
1448 +                            -Xep:HashtableContains:OFF
1449 +                            -Xep:ModifyingCollectionWithItself:OFF
1450 +                            -Xep:MissingOverride:OFF
1451 +                            -Xep:MixedArrayDimensions:WARN
1452 +                            -Xep:RemoveUnusedImports:ERROR
1453 +                            -Xep:ClassName:ERROR
1454 +                            -Xep:MultipleTopLevelClasses:ERROR
1455 +                            -Xep:EmptyIf:ERROR
1456 +                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1457 +                            -Xep:ArgumentParameterSwap:ERROR
1458 +                            -Xep:RedundantThrows:ERROR
1459 +                            -Xep:MethodCanBeStatic:WARN"/>
1460 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1461 +      </javac-elements>
1462 +    </run-tck-tests>
1463 +  </target>
1464 +
1465 +
1466 + <!-- ==============================================================
1467 +  Running guava tests against jsr166 code
1468 + =================================================================== -->
1469 +
1470 + <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1471 + <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1472 + <!-- <property name="guava.version" value="21.0"/> -->
1473 +
1474 + <!-- HOWTO debug print a path id -->
1475 + <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1476 + <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1477 +
1478 + <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1479 + <!--   organisation="com.google.guava" module="guava-tests"/> -->
1480 + <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1481 + <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1482 + <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1483 + <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1484 +
1485 + <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1486 + <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1487 + <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1488 + <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1489 +
1490 + <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1491 + <!--   type="*" inline="true" conf="*(private),*(public)" -->
1492 + <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1493 + <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1494 +
1495 + <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1496 + <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1497 + <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1498 +
1499 +  <target name="init-ivy">
1500 +    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1501 +         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1502 +    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1503 +             classpath="${build.dir}/ivy.jar"/>
1504 +  </target>
1505 +
1506 +  <target name="guava-tests" depends="jar, init-ivy"
1507 +          description="Guava tests run against jsr166 collections">
1508 +    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1509 +    <mkdir dir="${guava.dir}"/>
1510 +    <ivy:retrieve pathid="guava.testlib.classpath"
1511 +      type="jar,bundle" inline="true" conf="default,master"
1512 +      pattern="${guava.dir}/[artifact].[ext]"
1513 +      organisation="com.google.guava" module="guava-testlib"/>
1514 +    <property name="guava.version" value="21.0"/>
1515 +    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1516 +         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1517 +    <junit printsummary="true" showoutput="true" haltonfailure="true"
1518 +           jvm="${java9}" fork="true">
1519 +      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1520 +      <formatter type="brief"/>
1521 +      <classpath>
1522 +        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1523 +        <path refid="guava.testlib.classpath"/>
1524 +      </classpath>
1525 +
1526 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1527 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1528 +    </junit>
1529 +  </target>
1530 +
1531   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines