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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines