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.241 by jsr166, Mon Mar 27 02:11:26 2017 UTC vs.
Revision 1.281 by jsr166, Sun Oct 7 03:56:13 2018 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    where each of the above is a JDK or a symlink to same, and
28    $HOME/jdk/src/jdk8
29    $HOME/jdk/src/jdk9
30    $HOME/jdk/src/jdk10
31 +  $HOME/jdk/src/jdk11
32 +  $HOME/jdk/src/jdk12
33    where each of the above is a complete JDK source tree
34    (e.g. mercurial forest) or a symlink to same.
35  
# Line 101 | Line 106
106      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
107        unless:set="have.java.base"/>
108      <local name="modules"/>
109 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
109 >    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
110      <local name="boot.jar.dir"/>
111      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
112      <path id="bootclasspath@{v}" unless:set="modules">
# Line 132 | Line 137
137    <defjdklocations v="8"/>
138    <defjdklocations v="9"/>
139    <defjdklocations v="10"/>
140 +  <defjdklocations v="11"/>
141 +  <defjdklocations v="12"/>
142  
143    <!-- Source locations -->
144    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 142 | Line 149
149    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
150    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
151    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
152 +  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
153 +  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
154    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
155    <property name="lib.dir"              location="${basedir}/lib"/>
156    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 181 | Line 190
190    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
191  
192    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
193 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
194 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
195 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
196 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
197 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
198 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
199 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
193 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
194 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
195 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
196 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
197 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
198 >  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
199 >  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
200 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
201 >  <!-- The location of jdk early access docs (RIP) -->
202 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
203 >  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
204 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
205 >  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
206    <!-- Default jdk doc location (latest stable release seems best) -->
207 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
207 >  <!-- But pin to jdk 10 until fix for -->
208 >  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
209 >  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
210  
211    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
212    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 197 | Line 214
214    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
215    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
216    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
217 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
218 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
219 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
220    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
221  
222    <!-- Define the "jtreg" task -->
# Line 229 | Line 249
249  
250      <local name="modules"/>
251      <condition property="modules">
252 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
252 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
253      </condition>
254  
255      <local name="use-doclint"/>
# Line 296 | Line 316
316    </macrodef>
317  
318    <!-- Define jtreg test sets for different jdk versions -->
319 <  <fileset dir="${jtreg9.src.dir}">
320 <    <patternset id="jdk9.jtreg.tests">
321 <      <include name="**/*.java"/>
322 <    </patternset>
323 <  </fileset>
324 <
325 <  <fileset dir="${jtreg8.src.dir}">
326 <    <patternset id="jdk8.jtreg.tests">
327 <      <include name="**/*.java"/>
328 <    </patternset>
329 <  </fileset>
319 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
320 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
321 >  <property name="jtreg.test.pattern" value="**/*.java"/>
322 >  <macrodef name="defjtregtests">
323 >    <attribute name="v"/>
324 >    <sequential>
325 >      <fileset dir="${jtreg@{v}.src.dir}">
326 >        <patternset id="jdk@{v}.jtreg.tests">
327 >          <include name="${jtreg.test.pattern}"/>
328 >        </patternset>
329 >      </fileset>
330 >    </sequential>
331 >  </macrodef>
332  
333 <  <fileset dir="${jtreg7.src.dir}">
334 <    <patternset id="jdk7.jtreg.tests">
335 <      <include name="**/*.java"/>
336 <    </patternset>
337 <  </fileset>
333 >  <defjtregtests v="12"/>
334 >  <defjtregtests v="11"/>
335 >  <defjtregtests v="10"/>
336 >  <defjtregtests v="9"/>
337 >  <defjtregtests v="8"/>
338 >  <defjtregtests v="7"/>
339  
340    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
341    <property name="jtreg.flags" value=""/>
342  
343    <macrodef name="run-jtreg-tests">
344      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
322 –    <attribute name="source" default="7"/>
345      <attribute name="target"/>
346      <attribute name="workdir"/>
347      <attribute name="classes"/>
348 +    <attribute name="verbose" default="${jtreg.verbose}"/>
349      <attribute name="jtregflags" default=""/>
350 +    <element name="jtreg-elements" optional="true"/>
351  
352      <sequential>
353  
# Line 332 | Line 356
356  
357      <local name="modules"/>
358      <condition property="modules">
359 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
359 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
360      </condition>
361  
362      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 341 | Line 365
365             workDir="@{workdir}/JTwork">
366        <patternset refid="jdk@{target}.jtreg.tests"/>
367        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
368 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
369 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
368 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
369 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
370        <arg value="-agentvm"/>
371        <arg value="-noreport"/>
372 <      <arg value="-verbose:${jtreg.verbose}"/>
372 >      <arg value="-verbose:@{verbose}"/>
373        <arg value="-vmoptions:-esa -ea"/>
374        <arg value="-automatic"/>
375        <arg value="-k:!ignore"/>
376        <arg line="@{jtregflags}"/>
377        <arg line="${jtreg.flags}"/>
378 +      <jtreg-elements/>
379      </jtreg>
380      </sequential>
381    </macrodef>
# Line 366 | Line 391
391  
392    <!-- Main targets -->
393  
394 <  <property name="build.main.java.version" value="9"/>
395 <  <property name="build.main.javac" value="${javac9}"/>
394 >  <property name="build.main.java.version" value="11"/>
395 >  <!-- Workaround "no nested properties in ant" -->
396 >  <macrodef name="define-build-main-properties">
397 >    <attribute name="v"/>
398 >    <sequential>
399 >      <property name="build.main.java"    value="${java@{v}}"/>
400 >      <property name="build.main.javac"   value="${javac@{v}}"/>
401 >      <!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->
402 >      <!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
403 >      <condition property="build.main.javadoc"
404 >                 value="${javadoc12}"
405 >                 else="${javadoc@{v}}">
406 >        <matches pattern="^(9|10|11)$" string="@{v}"/>
407 >      </condition>
408 >    </sequential>
409 >  </macrodef>
410 >  <define-build-main-properties v="${build.main.java.version}"/>
411  
412    <target name="dists"
413            depends="dist, 4jdk8dist"
414            description="Builds all public jars and docs"/>
415 <          <!--
376 <              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
377 <          -->
415 >          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
416  
417    <target name="compile"
418            depends="configure-compiler"
419            description="Compiles src/main sources to build dir">
420  
383 –    <local name="modules"/>
384 –    <condition property="modules">
385 –      <and>
386 –        <available file="${jdk9.home}/jmods" type="dir"/>
387 –        <equals arg1="9" arg2="${build.main.java.version}"/>
388 –      </and>
389 –    </condition>
390 –
421      <local name="destdir"/>
422 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
393 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
422 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
423  
424      <mkdir dir="${destdir}"/>
425  
# Line 407 | Line 436
436             fork="true">
437  
438        <include name="**/*.java"/>
439 <      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
439 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
440        <compilerarg value="-Xprefer:source"/>
441        <compilerarg value="-XDignore.symbol.file=true"/>
442        <compilerarg value="-Xlint:all"/>
443 <      <compilerarg value="-Werror"/>
443 >      <compilerarg line="--doclint-format html5"/>
444        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
445 +      <compilerarg value="-Werror"/>
446        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
447        <compilerarg line="${build.args}"/>
448  
# Line 451 | Line 481
481   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
482      <javadoc destdir="${docs.dir}"
483               packagenames="none"
484 <             link="${java9.api.url}"
484 >             link="${java11.api.url}"
485               overview="${src.dir}/intro.html"
486               access="${build.javadoc.access}"
487               sourcepath="${src.dir}"
488               classpath=""
489 <             executable="${javadoc9}">
489 >             source="11"
490 >             executable="${build.main.javadoc}">
491        <fileset dir="${src.dir}" defaultexcludes="yes">
492          <include name="**/*.java"/>
493        </fileset>
494 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
494 >      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
495        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
496        <arg value="-XDignore.symbol.file=true"/>
497 +      <arg value="-html5"/>
498        <arg value="--patch-module=java.base=${src.dir}"/>
499 <      <arg value="-tag"/>
500 <      <arg value="${javadoc.jls.option}"/>
501 < <!-- @apiNote currently unused -->
502 < <!--       <arg value="-tag"/> -->
503 < <!--       <arg value="apiNote:a:API Note:"/> -->
472 <      <arg value="-tag"/>
473 <      <arg value="implSpec:a:Implementation Requirements:"/>
474 <      <arg value="-tag"/>
475 <      <arg value="implNote:a:Implementation Note:"/>
499 >      <arg value="--override-methods=summary"/>
500 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
501 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
502 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
503 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
504   <!-- tags added in jdk9: currently unused -->
505 < <!--       <arg value="-tag"/> -->
506 < <!--       <arg value="revised:X"/> -->
479 < <!--       <arg value="-tag"/> -->
480 < <!--       <arg value="spec:X"/> -->
505 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
506 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
507      </javadoc>
508    </target>
509  
# Line 589 | Line 615
615  
616   <!--   </target> -->
617  
618 < <!--   <target name="test89" -->
619 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
618 >  <target name="test9101112"
619 >          description="Runs tck and jtreg tests for src/main for multiple java versions">
620  
621 < <!--     <antcall target="clean"/> -->
622 < <!--     <antcall target="test"> -->
623 < <!--       <param name="build.main.java.version" value="8"/> -->
624 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
625 < <!--     </antcall> -->
621 >    <antcall target="clean"/>
622 >    <antcall target="test">
623 >      <param name="build.main.java.version" value="9"/>
624 >      <param name="build.main.java" value="${java9}"/>
625 >      <param name="build.main.javac" value="${javac9}"/>
626 >    </antcall>
627  
628 < <!--     <antcall target="clean"/> -->
629 < <!--     <antcall target="test"> -->
630 < <!--       <param name="build.main.java.version" value="9"/> -->
631 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
632 < <!--     </antcall> -->
628 >    <antcall target="clean"/>
629 >    <antcall target="test">
630 >      <param name="build.main.java.version" value="10"/>
631 >      <param name="build.main.java" value="${java10}"/>
632 >      <param name="build.main.javac" value="${javac10}"/>
633 >    </antcall>
634  
635 < <!--   </target> -->
635 >    <antcall target="clean"/>
636 >    <antcall target="test">
637 >      <param name="build.main.java.version" value="11"/>
638 >      <param name="build.main.java" value="${java11}"/>
639 >      <param name="build.main.javac" value="${javac11}"/>
640 >    </antcall>
641 >
642 >    <antcall target="clean"/>
643 >    <antcall target="test">
644 >      <param name="build.main.java.version" value="12"/>
645 >      <param name="build.main.java" value="${java12}"/>
646 >      <param name="build.main.javac" value="${javac12}"/>
647 >    </antcall>
648 >    <antcall target="docs">
649 >      <param name="build.main.java.version" value="12"/>
650 >      <param name="build.main.java" value="${java12}"/>
651 >      <param name="build.main.javac" value="${javac12}"/>
652 >      <param name="build.main.javadoc" value="${javadoc12}"/>
653 >    </antcall>
654 >
655 >    <!-- Clean up to avoid obscure wrong class file version bugs -->
656 >    <antcall target="clean"/>
657 >
658 >  </target>
659  
660  
661  
# Line 672 | Line 723
723             includeAntRuntime="false"
724             includeJavaRuntime="false"
725             encoding="ASCII"
726 <           executable="${javac9}"
726 >           executable="${build.main.javac}"
727             fork="true">
728  
729        <include name="*.java"/>
# Line 805 | Line 856
856               access="${build.javadoc.access}"
857               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
858               classpath=""
859 +             source="8"
860               executable="${javadoc8}"
861               failonerror = "true">
862        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 812 | Line 864
864        </fileset>
865        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
866        <arg value="-XDignore.symbol.file=true"/>
867 <      <arg value="-tag"/>
868 <      <arg value="${javadoc.jls.option}"/>
869 < <!-- @apiNote currently unused -->
870 < <!--       <arg value="-tag"/> -->
871 < <!--       <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"/>
823 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
867 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
868 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
869 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
870 > <!-- @apiNote tag currently unused -->
871 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
872      </javadoc>
873    </target>
874  
# Line 1350 | Line 1398
1398  
1399   <!-- Find buglets that can be detected by static build tools -->
1400  
1401 <  <target name="lint">
1402 <    <antcall target="dists">
1403 <      <param name="build.javadoc.access" value="public"/>
1404 <    </antcall>
1405 <  </target>
1401 > <!--   <target name="lint"> -->
1402 > <!--     <antcall target="dists"> -->
1403 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1404 > <!--     </antcall> -->
1405 > <!--   </target> -->
1406  
1407   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1408 <  <target name="lint-private">
1408 >  <target name="doclint-private">
1409      <antcall target="dist">
1410        <param name="build.javadoc.access" value="private"/>
1411      </antcall>
# Line 1365 | Line 1413
1413  
1414  
1415   <!-- ==============================================================
1416 <  Experimental errorprone support - http://errorprone.info
1369 <  You may need to bring your own errorprone jar.
1416 >  Experimental errorprone support - https://errorprone.info
1417   =================================================================== -->
1418 +  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1419 +  <property name="errorprone.jsr166.user.flags" value=""/>
1420 +  <property name="errorprone.jsr166.flags"
1421 +            value="-Xep:HashtableContains:OFF
1422 +                   -Xep:JdkObsolete:OFF
1423 +                   -Xep:MissingOverride:OFF
1424 +                   -Xep:MissingFail:OFF
1425 +                   -Xep:MixedArrayDimensions:ERROR
1426 +                   -Xep:RemoveUnusedImports:ERROR
1427 +                   -Xep:EmptyIf:ERROR
1428 +                   -Xep:MultipleTopLevelClasses:ERROR
1429 +                   -Xep:ClassName:ERROR
1430 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1431 +                   -Xep:RedundantThrows:ERROR
1432 +                   -Xep:IdentityBinaryExpression:WARN
1433 +                   -Xep:MethodCanBeStatic:WARN
1434 +                   ${errorprone.jsr166.user.flags}"/>
1435 +  <!-- -Xep:WildcardImport:ERROR -->
1436 +  <property name="errorprone.jsr166.test.flags"
1437 +            value="-Xep:StringSplitter:OFF
1438 +                   -Xep:BoxedPrimitiveConstructor:OFF
1439 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1440 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1441    <target name="errorprone"
1442            depends="clean, configure-compiler"
1443            description="Run errorprone over jsr166 source code (experimental)">
# Line 1389 | Line 1459
1459             fork="true">
1460  
1461        <include name="**/*.java"/>
1462 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1463 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1464 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1465 <      <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"/>
1462 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1463 >      <compilerarg value="-J--illegal-access=permit"/>
1464 >      <compilerarg value="-XDcompilePolicy=simple"/>
1465 >      <compilerarg line="-processorpath ${errorprone.jar}"/>
1466        <compilerarg value="-Xplugin:ErrorProne
1467 <                          -Xep:IdentityBinaryExpression:WARN
1404 <                          -Xep:MissingOverride:OFF
1405 <                          -Xep:MixedArrayDimensions:WARN
1406 <                          -Xep:RemoveUnusedImports:ERROR
1407 <                          -Xep:MethodCanBeStatic:WARN"/>
1467 >                          ${errorprone.jsr166.flags}"/>
1468        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1469        <compilerarg value="-Xprefer:source"/>
1470        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1423 | Line 1483
1483        workdir="${build.dir}"
1484        classes="${product.jar}">
1485        <javac-elements>
1486 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1487 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1488 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1489 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1430 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1431 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1432 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1433 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1434 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1435 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1486 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1487 >        <compilerarg value="-J--illegal-access=permit"/>
1488 >        <compilerarg value="-XDcompilePolicy=simple"/>
1489 >        <compilerarg line="-processorpath ${errorprone.jar}"/>
1490          <compilerarg value="-Xplugin:ErrorProne
1491 <                            -Xep:IdentityBinaryExpression:WARN
1492 <                            -Xep:BoxedPrimitiveConstructor:OFF
1439 <                            -Xep:HashtableContains:OFF
1440 <                            -Xep:ModifyingCollectionWithItself:OFF
1441 <                            -Xep:MissingOverride:OFF
1442 <                            -Xep:MixedArrayDimensions:WARN
1443 <                            -Xep:RemoveUnusedImports:ERROR
1444 <                            -Xep:MethodCanBeStatic:WARN"/>
1491 >                            ${errorprone.jsr166.flags}
1492 >                            ${errorprone.jsr166.test.flags}"/>
1493          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1494        </javac-elements>
1495      </run-tck-tests>
1496    </target>
1497  
1498 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1499 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1500 +  <target name="errorprone-jtreg"
1501 +          depends="jar"
1502 +          description="Run errorprone over jtreg tests (experimental)">
1503 +
1504 +    <run-jtreg-tests
1505 +       target="${build.main.java.version}"
1506 +       workdir="${build.dir}"
1507 +       classes="${product.jar}"
1508 +       verbose="all">
1509 +      <jtreg-elements>
1510 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1511 +        <arg value="-javacoption:-processorpath"/>
1512 +        <arg value="-javacoption:${errorprone.jar}"/>
1513 +        <arg value="-javacoption:-Xplugin:ErrorProne
1514 +                            ${errorprone.jsr166.flags}
1515 +                            ${errorprone.jsr166.test.flags}
1516 +                            -Xep:MultipleTopLevelClasses:WARN
1517 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1518 +      </jtreg-elements>
1519 +    </run-jtreg-tests>
1520 +  </target>
1521 +
1522  
1523   <!-- ==============================================================
1524    Running guava tests against jsr166 code
# Line 1500 | Line 1572
1572      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1573           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1574      <junit printsummary="true" showoutput="true" haltonfailure="true"
1575 <           jvm="${java9}" fork="true">
1576 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1575 >           jvm="${build.main.java}" fork="true">
1576 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1577        <formatter type="brief"/>
1578        <classpath>
1579          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines