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.201 by dl, Sat Mar 26 12:35:25 2016 UTC vs.
Revision 1.242 by jsr166, Sat Apr 1 21:47:32 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 232 | 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 244 | 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 262 | 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 291 | Line 305
305    <fileset dir="${jtreg8.src.dir}">
306      <patternset id="jdk8.jtreg.tests">
307        <include name="**/*.java"/>
294      <exclude name="**/SpliteratorCharacteristics.java"/>
295      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
296      <exclude name="**/GCDuringIteration.java"/>
308      </patternset>
309    </fileset>
310  
# Line 325 | Line 336
336      </condition>
337  
338      <delete dir="@{workdir}/JTwork"   quiet="true"/>
328    <delete dir="@{workdir}/JTreport" quiet="true"/>
329    <mkdir dir="@{workdir}/JTwork/scratch"/>
330    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
331    <mkdir dir="@{workdir}/JTreport/html"/>
332    <mkdir dir="@{workdir}/JTreport/text"/>
339      <jtreg dir="${jtreg@{target}.src.dir}"
340             jdk="${jdk@{target}.home}"
341 <           workDir="@{workdir}/JTwork"
336 <           reportDir="@{workdir}/JTreport">
341 >           workDir="@{workdir}/JTwork">
342        <patternset refid="jdk@{target}.jtreg.tests"/>
343        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
344 <      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
344 >      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
345 >      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
346        <arg value="-agentvm"/>
347 +      <arg value="-noreport"/>
348        <arg value="-verbose:${jtreg.verbose}"/>
349        <arg value="-vmoptions:-esa -ea"/>
350        <arg value="-automatic"/>
# Line 363 | Line 370
370    <property name="build.main.javac" value="${javac9}"/>
371  
372    <target name="dists"
373 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
373 >          depends="dist, 4jdk8dist"
374            description="Builds all public jars and docs"/>
375 +          <!--
376 +              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
377 +          -->
378  
379    <target name="compile"
380            depends="configure-compiler"
# Line 392 | Line 402
402             classpath=""
403             includeAntRuntime="false"
404             includeJavaRuntime="false"
405 +           encoding="ASCII"
406             executable="${build.main.javac}"
407             fork="true">
408  
409        <include name="**/*.java"/>
410 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
410 >      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
411        <compilerarg value="-Xprefer:source"/>
412        <compilerarg value="-XDignore.symbol.file=true"/>
413        <compilerarg value="-Xlint:all"/>
414        <compilerarg value="-Werror"/>
415 <      <compilerarg value="-Xdoclint:all/protected"/>
415 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
416        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
417        <compilerarg line="${build.args}"/>
418  
419      </javac>
409
410    <!-- We need jdk9's Contended annotation, but at compile time only -->
411    <!--
412        <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
413    -->
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 437 | 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               executable="${javadoc9}">
460        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 451 | Line 463
463        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
464        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
465        <arg value="-XDignore.symbol.file=true"/>
466 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
466 >      <arg value="--patch-module=java.base=${src.dir}"/>
467        <arg value="-tag"/>
468        <arg value="${javadoc.jls.option}"/>
469 + <!-- @apiNote currently unused -->
470 + <!--       <arg value="-tag"/> -->
471 + <!--       <arg value="apiNote:a:API Note:"/> -->
472        <arg value="-tag"/>
473 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
459 <      <arg value="-tag"/>
460 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
461 <      <arg value="-tag"/>
462 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
463 < <!-- tags added in jdk9 -->
473 >      <arg value="implSpec:a:Implementation Requirements:"/>
474        <arg value="-tag"/>
475 <      <arg value="revised:X"/>
476 <      <arg value="-tag"/>
477 <      <arg value="spec:X"/>
475 >      <arg value="implNote:a:Implementation Note:"/>
476 > <!-- tags added in jdk9: currently unused -->
477 > <!--       <arg value="-tag"/> -->
478 > <!--       <arg value="revised:X"/> -->
479 > <!--       <arg value="-tag"/> -->
480 > <!--       <arg value="spec:X"/> -->
481      </javadoc>
482    </target>
483  
# Line 498 | Line 511
511  
512    <target name="clean"
513            description="Removes all build products">
501
514      <delete dir="${build.dir}"/>
503
515    </target>
516  
517  
518    <target name="dist-clean"
519            description="Removes all build and distribution products">
509
520      <delete dir="${build.dir}"/>
521      <delete dir="${dist.dir}"/>
512
522    </target>
523  
524  
# Line 525 | Line 534
534  
535    <target name="tck"
536            depends="jar"
537 <          description="Runs tck tests for main directly">
537 >          description="Runs tck tests for src/main directly">
538  
539      <run-tck-tests
540        target="${build.main.java.version}"
541        workdir="${build.dir}"
542 <      classes="${product.jar}"/>
542 >      classes="${product.jar}">
543 >      <javac-elements>
544 >        <compilerarg value="-Werror"/>
545 >      </javac-elements>
546 >    </run-tck-tests>
547    </target>
548  
549    <target name="tck-parallelism-1"
550 <          description="Runs tck with given common pool parallelism">
550 >          description="Runs tck with common pool parallelism 1">
551      <antcall target="tck">
552        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
553      </antcall>
554    </target>
555  
556    <target name="tck-parallelism-0"
557 <          description="Runs tck with given common pool parallelism">
557 >          description="Runs tck with common pool parallelism 0">
558      <antcall target="tck">
559        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
560      </antcall>
561    </target>
562  
563 +  <target name="tck-security-manager"
564 +          description="Runs tck with a security manager">
565 +    <antcall target="tck">
566 +      <param name="jsr166.useSecurityManager" value="true"/>
567 +    </antcall>
568 +  </target>
569 +
570    <target name="jtreg"
571            depends="jar"
572 <          description="Runs jtreg tests for main using the jtreg ant task">
572 >          description="Runs jtreg tests for src/main using the jtreg ant task">
573      <run-jtreg-tests
574         target="${build.main.java.version}"
575         workdir="${build.dir}"
# Line 557 | Line 577
577    </target>
578  
579    <target name="test"
580 <          depends="tck, tck-parallelism-1, jtreg"
581 <          description="Runs tck and jtreg tests for main">
562 <  </target>
580 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
581 >          description="Runs tck and jtreg tests for src/main"/>
582  
583 <  <target name="jtreg8" description="Runs jtreg tests with jdk8">
583 > <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
584  
585 <    <antcall target="jtreg">
586 <      <param name="build.main.java.version" value="8"/>
587 <      <param name="build.main.javac" value="${javac8}"/>
588 <    </antcall>
585 > <!--     <antcall target="jtreg"> -->
586 > <!--       <param name="build.main.java.version" value="8"/> -->
587 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
588 > <!--     </antcall> -->
589  
590 <  </target>
590 > <!--   </target> -->
591  
592 <  <target name="test89"
593 <          description="Runs tck and jtreg tests for main for multiple java versions">
592 > <!--   <target name="test89" -->
593 > <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
594  
595 <    <antcall target="clean"/>
596 <    <antcall target="test">
597 <      <param name="build.main.java.version" value="8"/>
598 <      <param name="build.main.javac" value="${javac8}"/>
599 <    </antcall>
595 > <!--     <antcall target="clean"/> -->
596 > <!--     <antcall target="test"> -->
597 > <!--       <param name="build.main.java.version" value="8"/> -->
598 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
599 > <!--     </antcall> -->
600  
601 <    <antcall target="clean"/>
602 <    <antcall target="test">
603 <      <param name="build.main.java.version" value="9"/>
604 <      <param name="build.main.javac" value="${javac9}"/>
605 <    </antcall>
601 > <!--     <antcall target="clean"/> -->
602 > <!--     <antcall target="test"> -->
603 > <!--       <param name="build.main.java.version" value="9"/> -->
604 > <!--       <param name="build.main.javac" value="${javac9}"/> -->
605 > <!--     </antcall> -->
606  
607 <  </target>
607 > <!--   </target> -->
608  
609  
610  
611    <target name="configure-compiler">
612      <fail message="ant version too old">
613 <      <condition>
595 <        <not> <antversion atleast="1.9.1"/> </not>
596 <      </condition>
613 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
614      </fail>
615  
616      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 615 | Line 632
632    <!-- Various demos and test programs -->
633  
634  
635 <  <target name="loops" depends="configure-compiler"
636 <          description="Benchmark from Doug Lea's AQS paper">
635 >  <!-- description="Benchmark from Doug Lea's AQS paper" -->
636 >  <target name="loops" depends="configure-compiler">
637  
638      <mkdir dir="${build.loops.dir}"/>
639  
# Line 627 | Line 644
644        deprecation="${build.deprecation}"
645             source="${build.sourcelevel}"
646             target="${build.sourcelevel}"
647 +         encoding="ASCII"
648               fork="true">
649  
650        <compilerarg line="${build.args}"/>
# Line 638 | Line 656
656      <java classname="ALoops" fork="true">
657        <classpath refid="loops.classpath"/>
658      </java>
641
659    </target>
660  
661  
662    <target name="compile-test-loops" depends="jar"
663 <          description="compile all the perf tests in src/test/loops">
663 >          description="Compiles all the perf tests in src/test/loops">
664  
665      <mkdir dir="${build.dir}/test/loops"/>
666  
# Line 654 | Line 671
671             deprecation="${build.deprecation}"
672             includeAntRuntime="false"
673             includeJavaRuntime="false"
674 +           encoding="ASCII"
675             executable="${javac9}"
676             fork="true">
677  
# Line 662 | Line 680
680        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
681        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
682        <compilerarg line="${build.args}"/>
665
683      </javac>
667
684    </target>
685  
686  
# Line 687 | Line 703
703             bootclasspath="${bootclasspath8}"
704             includeAntRuntime="false"
705             includeJavaRuntime="false"
706 +           encoding="ASCII"
707             executable="${javac8}"
708             fork="true">
692
709        <include name="**/*.java"/>
710        <compilerarg value="-Xprefer:source"/>
711        <compilerarg value="-XDignore.symbol.file=true"/>
712        <compilerarg value="-Xlint:all"/>
713        <compilerarg value="-Werror"/>
714        <compilerarg line="${build.args}"/>
699
715      </javac>
716    </target>
717  
# Line 717 | Line 732
732             bootclasspath="${bootclasspath8}"
733             includeAntRuntime="false"
734             includeJavaRuntime="false"
735 +           encoding="ASCII"
736             executable="${javac8}"
737             fork="true">
722
738        <include name="**/*.java"/>
739        <compilerarg value="-Xprefer:source"/>
740        <compilerarg value="-XDignore.symbol.file=true"/>
741        <compilerarg value="-Xlint:all"/>
742 <      <compilerarg value="-Xdoclint:all/protected"/>
742 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
743        <compilerarg line="${build.args}"/>
729
744      </javac>
745    </target>
746  
# Line 742 | Line 756
756          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
757        </manifest>
758      </jar>
745
759    </target>
760  
761  
# Line 758 | Line 771
771          <!-- JDK9+ test classes -->
772          <exclude name="*9Test.java"/>
773          <exclude name="*10Test.java"/>
774 +        <compilerarg value="-Werror"/>
775        </javac-elements>
776      </run-tck-tests>
777    </target>
# Line 775 | Line 789
789  
790    <target name="4jdk8-test"
791            depends="4jdk8-tck, 4jdk8-jtreg"
792 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
779 <  </target>
792 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
793  
794  
795    <target name="4jdk8docs"
# Line 792 | Line 805
805               access="${build.javadoc.access}"
806               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
807               classpath=""
808 <             executable="${javadoc8}">
808 >             executable="${javadoc8}"
809 >             failonerror = "true">
810        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
811          <include name="**/*.java"/>
812        </fileset>
# Line 800 | Line 814
814        <arg value="-XDignore.symbol.file=true"/>
815        <arg value="-tag"/>
816        <arg value="${javadoc.jls.option}"/>
817 <      <arg value="-tag"/>
818 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
817 > <!-- @apiNote currently unused -->
818 > <!--       <arg value="-tag"/> -->
819 > <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
820        <arg value="-tag"/>
821        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
822        <arg value="-tag"/>
# Line 817 | Line 832
832  
833    <target name="4jdk8clean"
834            description="Removes all 4jdk8 build products">
820
835      <delete dir="${build.4jdk8.dir}"/>
822
836    </target>
837  
838  
# Line 835 | Line 848
848    </target>
849  
850  
851 +  <!-- jsr166 4jdk7 (no longer maintained) -->
852  
853 <  <!-- jsr166 4jdk7 -->
840 <
841 <  <target name="4jdk7compile"
842 <          depends="configure-compiler"
843 <          description="Compiles src/jdk7 sources, targeting jdk7">
844 <
853 >  <target name="4jdk7compile" depends="configure-compiler">
854      <mkdir dir="${build.4jdk7.classes.dir}"/>
855  
856      <javac srcdir="${4jdk7src.dir}"
# Line 855 | Line 864
864             bootclasspath="${bootclasspath6}"
865             includeAntRuntime="false"
866             includeJavaRuntime="false"
867 +           encoding="ASCII"
868             executable="${javac7}"
869             fork="true">
870  
# Line 864 | Line 874
874        <compilerarg value="-Xlint:all"/>
875        <compilerarg value="-Werror"/>
876        <compilerarg line="${build.args}"/>
867
877      </javac>
878    </target>
879  
880 <  <target name="4jdk7doclint"
872 <          depends="configure-compiler"
873 <          description="Finds doclint warnings">
874 <
880 >  <target name="4jdk7doclint" depends="configure-compiler">
881      <mkdir dir="${build.4jdk7.classes.dir}"/>
882  
883      <javac srcdir="${4jdk7src.dir}"
# Line 885 | Line 891
891             bootclasspath="${bootclasspath6}"
892             includeAntRuntime="false"
893             includeJavaRuntime="false"
894 +           encoding="ASCII"
895             executable="${javac8}"
896             fork="true">
897  
# Line 894 | Line 901
901        <compilerarg value="-Xlint:all"/>
902        <compilerarg value="-Xdoclint:all/protected"/>
903        <compilerarg line="${build.args}"/>
897
904      </javac>
905    </target>
906  
907 <
902 <  <target name="4jdk7jar"
903 <          depends="4jdk7compile"
904 <          description="Builds library jar from compiled sources">
905 <
907 >  <target name="4jdk7jar" depends="4jdk7compile">
908      <jar destfile="${4jdk7product.jar}">
909        <fileset dir="${build.4jdk7.classes.dir}"/>
910        <manifest>
# Line 910 | Line 912
912          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
913        </manifest>
914      </jar>
913
915    </target>
916  
917 <
917 <  <target name="4jdk7-tck"
918 <          depends="4jdk7jar"
919 <          description="Runs tck tests for jsr166-4jdk7 directly">
920 <
917 >  <target name="4jdk7-tck" depends="4jdk7jar">
918      <run-tck-tests
919        target="7"
920        workdir="${build.4jdk7.dir}"
# Line 935 | Line 932
932          <exclude name="SplittableRandomTest.java"/>
933          <exclude name="StampedLockTest.java"/>
934          <exclude name="SubmissionPublisherTest.java"/>
935 +        <compilerarg value="-Werror"/>
936        </javac-elements>
937      </run-tck-tests>
938    </target>
939  
940 <
941 <  <target name="4jdk7-tck-junit"
944 <          depends="4jdk7compile"
945 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
940 >  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
941 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
942  
943      <junit printsummary="true"
944             showoutput="true"
# Line 964 | Line 960
960  
961        <test name="${jsr166.tckTestClass}" haltonfailure="no">
962        </test>
967
963      </junit>
964    </target>
965  
966 <  <target name="4jdk7-jtreg"
972 <          depends="4jdk7jar"
973 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
966 >  <target name="4jdk7-jtreg" depends="4jdk7jar">
967      <run-jtreg-tests
968         target="7"
969         workdir="${build.4jdk7.dir}"
970         classes="${4jdk7product.jar}"/>
971    </target>
972  
973 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
974  
975 <  <target name="4jdk7-test"
982 <          depends="4jdk7-tck, 4jdk7-jtreg"
983 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
984 <  </target>
985 <
986 <
987 <  <target name="4jdk7docs"
988 <          description="Builds javadocs for src/jdk7 to dist dir">
989 <
975 >  <target name="4jdk7docs">
976      <delete dir="${4jdk7docs.dir}"/>
977      <mkdir dir="${4jdk7docs.dir}"/>
978  
# Line 997 | Line 983
983               access="${build.javadoc.access}"
984               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
985               classpath=""
986 <             executable="${javadoc7}">
986 >             executable="${javadoc7}"
987 >             failonerror = "true">
988        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
989          <include name="**/*.java"/>
990        </fileset>
# Line 1006 | Line 993
993      </javadoc>
994    </target>
995  
996 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
997  
998 <  <target name="4jdk7dist"
1011 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1012 <          description="Puts all distributable products in single hierarchy"/>
1013 <
1014 <
1015 <  <target name="4jdk7clean"
1016 <          description="Removes all 4jdk7 build products">
1017 <
998 >  <target name="4jdk7clean">
999      <delete dir="${build.4jdk7.dir}"/>
1019
1000    </target>
1001  
1002 <
1023 <  <target name="4jdk7dist-jar"
1024 <          depends="4jdk7clean, 4jdk7jar">
1002 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1003      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1004    </target>
1005  
1006 <
1029 <  <target name="4jdk7dist-docs"
1030 <          depends="4jdk7clean, 4jdk7docs">
1006 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1007      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1008    </target>
1009  
1010  
1011 <  <!-- jsr166x -->
1036 <
1037 <  <target name="jsr166xcompile"
1038 <          depends="configure-compiler"
1039 <          description="Compiles jsr166x sources to build dir">
1011 >  <!-- jsr166x (no longer maintained) -->
1012  
1013 +  <target name="jsr166xcompile" depends="configure-compiler">
1014      <mkdir dir="${build.jsr166x.classes.dir}"/>
1015  
1016      <javac srcdir="${topsrc.dir}"
# Line 1051 | Line 1024
1024             target="5"
1025             includeAntRuntime="false"
1026             includeJavaRuntime="false"
1027 +           encoding="ASCII"
1028             executable="${javac7}"
1029             fork="true">
1056
1030        <include name="jsr166x/**/*.java"/>
1031        <compilerarg value="-XDignore.symbol.file=true"/>
1032        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1033        <compilerarg value="-Werror"/>
1034        <compilerarg line="${build.args}"/>
1062
1035      </javac>
1036    </target>
1037  
1038 <
1067 <  <target name="jsr166xjar"
1068 <          depends="jsr166xcompile"
1069 <          description="Builds library jar from compiled sources">
1070 <
1038 >  <target name="jsr166xjar" depends="jsr166xcompile">
1039      <jar destfile="${jsr166x.jar}">
1040        <fileset dir="${build.jsr166x.classes.dir}"/>
1041        <manifest>
# Line 1075 | Line 1043
1043          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1044        </manifest>
1045      </jar>
1078
1046    </target>
1047  
1048 <
1082 <  <target name="jsr166xdocs"
1083 <          description="Builds javadocs to dist dir">
1084 <
1048 >  <target name="jsr166xdocs">
1049      <delete dir="${jsr166xdocs.dir}"/>
1050      <mkdir dir="${jsr166xdocs.dir}"/>
1051  
# Line 1092 | Line 1056
1056               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1057               bootclasspath="${bootclasspath6}"
1058               source="5"
1059 <             executable="${javadoc7}">
1059 >             executable="${javadoc7}"
1060 >             failonerror = "true">
1061        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1062        <arg value="-XDignore.symbol.file=true"/>
1098
1063      </javadoc>
1064    </target>
1065  
1066 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1067  
1068 <  <target name="jsr166xdist"
1104 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1105 <          description="Puts all distributable products in single hierarchy"/>
1106 <
1107 <
1108 <  <target name="jsr166xclean"
1109 <          description="Removes all jsr166x build products">
1110 <
1068 >  <target name="jsr166xclean">
1069      <delete dir="${build.jsr166x.dir}"/>
1112
1070    </target>
1071  
1072 <
1116 <  <target name="jsr166xdist-jar"
1117 <          depends="jsr166xclean, jsr166xjar">
1072 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1073      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1074    </target>
1075  
1076 <  <target name="jsr166xdist-docs"
1122 <          depends="jsr166xclean, jsr166xdocs">
1076 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1077      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1078    </target>
1079  
1126  <!-- jsr166y -->
1080  
1081 +  <!-- jsr166y (no longer maintained) -->
1082  
1083 <  <target name="jsr166ycompile"
1130 <          depends="configure-compiler"
1131 <          description="Compiles jsr166y sources">
1132 <
1083 >  <target name="jsr166ycompile" depends="configure-compiler">
1084      <mkdir dir="${build.jsr166y.classes.dir}"/>
1085  
1086      <javac srcdir="${topsrc.dir}"
# Line 1143 | Line 1094
1094             bootclasspath="${bootclasspath6}"
1095             includeAntRuntime="false"
1096             includeJavaRuntime="false"
1097 +           encoding="ASCII"
1098             executable="${javac7}"
1099             fork="true">
1100  
# Line 1151 | Line 1103
1103        <compilerarg value="-Xlint:all"/>
1104        <compilerarg value="-Werror"/>
1105        <compilerarg line="${build.args}"/>
1154
1106      </javac>
1107    </target>
1108  
1109 <
1159 <  <target name="jsr166yjar"
1160 <          depends="jsr166ycompile"
1161 <          description="Builds library jar from compiled sources">
1162 <
1109 >  <target name="jsr166yjar" depends="jsr166ycompile">
1110      <jar destfile="${jsr166y.jar}" index="true">
1111        <fileset dir="${build.jsr166y.classes.dir}"/>
1112        <manifest>
# Line 1167 | Line 1114
1114          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1115        </manifest>
1116      </jar>
1170
1117    </target>
1118  
1119 <
1174 <  <target name="jsr166ydocs"
1175 <          description="Builds javadocs to dist dir">
1176 <
1119 >  <target name="jsr166ydocs">
1120      <delete dir="${jsr166ydocs.dir}"/>
1121      <mkdir dir="${jsr166ydocs.dir}"/>
1122  
# Line 1184 | Line 1127
1127               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1128               bootclasspath="${bootclasspath6}"
1129               source="6"
1130 <             executable="${javadoc7}">
1130 >             executable="${javadoc7}"
1131 >             failonerror = "true">
1132        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1133        <arg value="-XDignore.symbol.file=true"/>
1190
1134      </javadoc>
1135    </target>
1136  
1137 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1138  
1139 <  <target name="jsr166ydist"
1196 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1197 <          description="Puts all distributable products in single hierarchy"/>
1198 <
1199 <
1200 <  <target name="jsr166yclean"
1201 <          description="Removes all jsr166y build products">
1202 <
1139 >  <target name="jsr166yclean">
1140      <delete dir="${build.jsr166y.dir}"/>
1204
1141    </target>
1142  
1143 <
1208 <  <target name="jsr166ydist-jar"
1209 <          depends="jsr166yclean, jsr166yjar">
1143 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1144      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1145    </target>
1146  
1147 <  <target name="jsr166ydist-docs"
1214 <          depends="jsr166yclean, jsr166ydocs">
1147 >  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1148      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1149    </target>
1150  
1151  
1152 <  <!-- extra166y -->
1220 <
1221 <
1222 <  <target name="extra166ycompile"
1223 <          depends="configure-compiler, jsr166yjar"
1224 <          description="Compiles extra166y sources">
1152 >  <!-- extra166y (no longer maintained) -->
1153  
1154 +  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1155      <mkdir dir="${build.extra166y.classes.dir}"/>
1156  
1157      <javac srcdir="${topsrc.dir}"
# Line 1236 | Line 1165
1165             target="6"
1166             includeAntRuntime="false"
1167             includeJavaRuntime="false"
1168 +           encoding="ASCII"
1169             executable="${javac7}"
1170             fork="true">
1171  
# Line 1244 | Line 1174
1174        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1175        <compilerarg value="-Werror"/>
1176        <compilerarg line="${build.args}"/>
1247
1177      </javac>
1178    </target>
1179  
1180 <
1252 <  <target name="extra166yjar"
1253 <          depends="extra166ycompile"
1254 <          description="Builds library jar from compiled sources">
1255 <
1180 >  <target name="extra166yjar" depends="extra166ycompile">
1181      <jar destfile="${extra166y.jar}" index="true">
1182        <fileset dir="${build.extra166y.classes.dir}"/>
1183        <manifest>
# Line 1260 | Line 1185
1185          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1186        </manifest>
1187      </jar>
1263
1188    </target>
1189  
1190 <
1267 <  <target name="extra166ydocs"
1268 <          description="Builds javadocs to build dir">
1269 <
1190 >  <target name="extra166ydocs">
1191      <delete dir="${extra166ydocs.dir}"/>
1192      <mkdir dir="${extra166ydocs.dir}"/>
1193  
# Line 1280 | Line 1201
1201               executable="${javadoc7}">
1202        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1203        <arg value="-XDignore.symbol.file=true"/>
1283
1204      </javadoc>
1205    </target>
1206  
1207 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1208  
1209 <  <target name="extra166ydist"
1289 <          depends="extra166ydist-jar, extra166ydist-docs"
1290 <          description="Puts all distributable products in single hierarchy"/>
1291 <
1292 <
1293 <  <target name="extra166yclean"
1294 <          description="Removes all extra166y build products">
1295 <
1209 >  <target name="extra166yclean">
1210      <delete dir="${build.extra166y.dir}"/>
1297
1211    </target>
1212  
1213 <
1301 <  <target name="extra166ydist-jar"
1302 <          depends="extra166yclean, extra166yjar">
1213 >  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1214      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1215    </target>
1216  
1217 <  <target name="extra166ydist-docs"
1307 <          depends="extra166yclean, extra166ydocs">
1217 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1218      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1219    </target>
1220  
1221 <  <!-- jsr166e -->
1221 >
1222 >  <!-- jsr166e (no longer maintained) -->
1223  
1224    <property name="build.jsr166e.java.version" value="6"/>
1225    <property name="build.jsr166e.javac" value="${javac6}"/>
1226  
1227 <  <target name="jsr166ecompile"
1317 <          depends="configure-compiler"
1318 <          description="Compiles jsr166e sources">
1319 <
1227 >  <target name="jsr166ecompile" depends="configure-compiler">
1228      <mkdir dir="${build.jsr166e.classes.dir}"/>
1229  
1230      <javac srcdir="${topsrc.dir}"
# Line 1337 | Line 1245
1245        <compilerarg value="-Xlint:all"/>
1246        <compilerarg value="-Werror"/>
1247        <compilerarg line="${build.args}"/>
1340
1248      </javac>
1249    </target>
1250  
1344  <!-- jsr166e: find doclint errors -->
1251    <target name="jsr166edoclint">
1346
1252      <mkdir dir="${build.jsr166e.classes.dir}"/>
1253  
1254      <javac srcdir="${topsrc.dir}"
# Line 1365 | Line 1270
1270        <compilerarg value="-Xlint:all"/>
1271        <compilerarg value="-Werror"/>
1272        <compilerarg value="-Xdoclint:all/protected"/>
1368
1273      </javac>
1274    </target>
1275  
1276 <
1373 <  <target name="jsr166ejar"
1374 <          depends="jsr166ecompile"
1375 <          description="Builds library jar from compiled sources">
1376 <
1276 >  <target name="jsr166ejar" depends="jsr166ecompile">
1277      <jar destfile="${jsr166e.jar}" index="true">
1278        <fileset dir="${build.jsr166e.classes.dir}"/>
1279        <manifest>
# Line 1381 | Line 1281
1281          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1282        </manifest>
1283      </jar>
1384
1284    </target>
1285  
1286 <
1388 <  <target name="jsr166edocs"
1389 <          description="Builds javadocs to build dir">
1390 <
1286 >  <target name="jsr166edocs">
1287      <delete dir="${jsr166edocs.dir}"/>
1288      <mkdir dir="${jsr166edocs.dir}"/>
1289  
# Line 1397 | Line 1293
1293               access="${build.javadoc.access}"
1294               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1295               source="${build.jsr166e.java.version}"
1296 <             executable="${javadoc7}">
1296 >             executable="${javadoc7}"
1297 >             failonerror = "true">
1298        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1299        <arg value="-XDignore.symbol.file=true"/>
1403
1300      </javadoc>
1301    </target>
1302  
1303 <
1408 <  <target name="jsr166e-tck-one-java-version"
1409 <          depends="jsr166ejar">
1410 <
1303 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1304      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1412
1305      <run-tck-tests
1306        tck.src.dir="${test.src.dir}/tck-jsr166e"
1307        target="${build.jsr166e.java.version}"
# Line 1417 | Line 1309
1309        classes="${jsr166e.jar}"/>
1310    </target>
1311  
1312 <  <target name="jsr166e-tck"
1421 <          description="Runs tck tests for jsr166e for multiple java versions">
1312 >  <target name="jsr166e-tck">
1313  
1314   <!--     <antcall target="clean"/> -->
1315   <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1439 | Line 1330
1330      </antcall>
1331    </target>
1332  
1333 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1334  
1335 <  <target name="jsr166e-test"
1444 <          depends="jsr166e-tck"
1445 <          description="Runs all tests for jsr166e">
1446 <  </target>
1447 <
1448 <  <target name="jsr166edist"
1449 <          depends="jsr166edist-jar, jsr166edist-docs"
1450 <          description="Puts all distributable products in single hierarchy"/>
1451 <
1335 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1336  
1337 <  <target name="jsr166eclean"
1454 <          description="Removes all jsr166e build products">
1337 >  <target name="jsr166eclean">
1338      <delete dir="${build.jsr166e.dir}"/>
1339    </target>
1340  
1458
1341    <target name="jsr166edist-jar"
1342            depends="jsr166eclean, jsr166ejar">
1343      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1344    </target>
1345  
1346 <  <target name="jsr166edist-docs"
1465 <          depends="jsr166eclean, jsr166edocs">
1346 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1347      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1348    </target>
1349  
# Line 1483 | Line 1364
1364    </target>
1365  
1366  
1367 + <!-- ==============================================================
1368 +  Experimental errorprone support - http://errorprone.info
1369 +  You may need to bring your own errorprone jar.
1370 + =================================================================== -->
1371 +  <target name="errorprone"
1372 +          depends="clean, configure-compiler"
1373 +          description="Run errorprone over jsr166 source code (experimental)">
1374 +
1375 +    <local name="destdir"/>
1376 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1377 +    <mkdir dir="${destdir}"/>
1378 +
1379 +    <javac srcdir="${src.dir}"
1380 +           destdir="${destdir}"
1381 +           debug="${build.debug}"
1382 +           debuglevel="${build.debuglevel}"
1383 +           deprecation="${build.deprecation}"
1384 +           classpath=""
1385 +           includeAntRuntime="false"
1386 +           includeJavaRuntime="false"
1387 +           encoding="ASCII"
1388 +           executable="${build.main.javac}"
1389 +           fork="true">
1390 +
1391 +      <include name="**/*.java"/>
1392 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1393 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1394 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1395 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1396 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1397 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1398 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1399 +      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1400 +      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1401 +      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1402 +      <compilerarg value="-Xplugin:ErrorProne
1403 +                          -Xep:IdentityBinaryExpression:WARN
1404 +                          -Xep:MissingOverride:OFF
1405 +                          -Xep:MixedArrayDimensions:WARN
1406 +                          -Xep:RemoveUnusedImports:ERROR
1407 +                          -Xep:ClassName:ERROR
1408 +                          -Xep:MultipleTopLevelClasses:ERROR
1409 +                          -Xep:EmptyIf:ERROR
1410 +                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1411 +                          -Xep:ArgumentParameterSwap:ERROR
1412 +                          -Xep:RedundantThrows:ERROR
1413 +                          -Xep:MethodCanBeStatic:WARN"/>
1414 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1415 +      <compilerarg value="-Xprefer:source"/>
1416 +      <compilerarg value="-XDignore.symbol.file=true"/>
1417 +      <compilerarg value="-Xlint:all"/>
1418 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1419 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1420 +      <compilerarg line="${build.args}"/>
1421 +    </javac>
1422 +
1423 +    <jar destfile="${product.jar}">
1424 +      <fileset dir="${destdir}"/>
1425 +    </jar>
1426 +
1427 +    <run-tck-tests
1428 +      target="${build.main.java.version}"
1429 +      workdir="${build.dir}"
1430 +      classes="${product.jar}">
1431 +      <javac-elements>
1432 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1433 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1434 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1435 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1436 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1437 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1438 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1439 +        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1440 +        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1441 +        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1442 +        <compilerarg value="-Xplugin:ErrorProne
1443 +                            -Xep:IdentityBinaryExpression:WARN
1444 +                            -Xep:BoxedPrimitiveConstructor:OFF
1445 +                            -Xep:HashtableContains:OFF
1446 +                            -Xep:ModifyingCollectionWithItself:OFF
1447 +                            -Xep:MissingOverride:OFF
1448 +                            -Xep:MixedArrayDimensions:WARN
1449 +                            -Xep:RemoveUnusedImports:ERROR
1450 +                            -Xep:ClassName:ERROR
1451 +                            -Xep:MultipleTopLevelClasses:ERROR
1452 +                            -Xep:EmptyIf:ERROR
1453 +                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1454 +                            -Xep:ArgumentParameterSwap:ERROR
1455 +                            -Xep:RedundantThrows:ERROR
1456 +                            -Xep:MethodCanBeStatic:WARN"/>
1457 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1458 +      </javac-elements>
1459 +    </run-tck-tests>
1460 +  </target>
1461 +
1462 +
1463 + <!-- ==============================================================
1464 +  Running guava tests against jsr166 code
1465 + =================================================================== -->
1466 +
1467 + <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1468 + <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1469 + <!-- <property name="guava.version" value="21.0"/> -->
1470 +
1471 + <!-- HOWTO debug print a path id -->
1472 + <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1473 + <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1474 +
1475 + <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1476 + <!--   organisation="com.google.guava" module="guava-tests"/> -->
1477 + <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1478 + <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1479 + <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1480 + <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1481 +
1482 + <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1483 + <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1484 + <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1485 + <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1486 +
1487 + <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1488 + <!--   type="*" inline="true" conf="*(private),*(public)" -->
1489 + <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1490 + <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1491 +
1492 + <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1493 + <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1494 + <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1495 +
1496 +  <target name="init-ivy">
1497 +    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1498 +         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1499 +    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1500 +             classpath="${build.dir}/ivy.jar"/>
1501 +  </target>
1502 +
1503 +  <target name="guava-tests" depends="jar, init-ivy"
1504 +          description="Guava tests run against jsr166 collections">
1505 +    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1506 +    <mkdir dir="${guava.dir}"/>
1507 +    <ivy:retrieve pathid="guava.testlib.classpath"
1508 +      type="jar,bundle" inline="true" conf="default,master"
1509 +      pattern="${guava.dir}/[artifact].[ext]"
1510 +      organisation="com.google.guava" module="guava-testlib"/>
1511 +    <property name="guava.version" value="21.0"/>
1512 +    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1513 +         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1514 +    <junit printsummary="true" showoutput="true" haltonfailure="true"
1515 +           jvm="${java9}" fork="true">
1516 +      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1517 +      <formatter type="brief"/>
1518 +      <classpath>
1519 +        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1520 +        <path refid="guava.testlib.classpath"/>
1521 +      </classpath>
1522 +
1523 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1524 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1525 +    </junit>
1526 +  </target>
1527 +
1528   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines