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.251 by jsr166, Tue Sep 19 19:47:20 2017 UTC vs.
Revision 1.292 by jsr166, Thu Dec 13 01:12:01 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 50 | Line 55
55  
56  
57    <!-- Compilation options -->
53  <property name="build.sourcelevel"    value="6"/>
58    <property name="build.debug"          value="true"/>
59    <property name="build.debuglevel"     value="source,lines,vars"/>
60    <property name="build.deprecation"    value="false"/>
# Line 101 | Line 105
105      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
106        unless:set="have.java.base"/>
107      <local name="modules"/>
108 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
108 >    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
109      <local name="boot.jar.dir"/>
110      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
111      <path id="bootclasspath@{v}" unless:set="modules">
# Line 132 | Line 136
136    <defjdklocations v="8"/>
137    <defjdklocations v="9"/>
138    <defjdklocations v="10"/>
139 +  <defjdklocations v="11"/>
140 +  <defjdklocations v="12"/>
141  
142    <!-- Source locations -->
143    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 142 | Line 148
148    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
149    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
150    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
151 +  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
152 +  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
153    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
154    <property name="lib.dir"              location="${basedir}/lib"/>
155    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 181 | Line 189
189    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
190  
191    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
192 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
193 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
194 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
195 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
196 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
197 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
198 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
199 <  <!-- Default jdk doc location (latest stable release seems best) -->
200 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
192 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
193 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
194 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
195 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
196 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
197 >  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
198 >  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
199 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
200 >  <!-- The location of jdk early access docs (RIP) -->
201 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
202 >  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
203 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
204 >  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
205 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
206 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
207  
208    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
209    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 197 | Line 211
211    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
212    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
213    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
214 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
215 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
216 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
217    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
218  
219    <!-- Define the "jtreg" task -->
# Line 229 | Line 246
246  
247      <local name="modules"/>
248      <condition property="modules">
249 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
249 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
250      </condition>
251  
252      <local name="use-doclint"/>
# Line 296 | Line 313
313    </macrodef>
314  
315    <!-- Define jtreg test sets for different jdk versions -->
316 <  <fileset dir="${jtreg10.src.dir}">
317 <    <patternset id="jdk10.jtreg.tests">
318 <      <include name="**/*.java"/>
319 <    </patternset>
320 <  </fileset>
321 <
322 <  <fileset dir="${jtreg9.src.dir}">
323 <    <patternset id="jdk9.jtreg.tests">
324 <      <include name="**/*.java"/>
325 <    </patternset>
326 <  </fileset>
327 <
328 <  <fileset dir="${jtreg8.src.dir}">
312 <    <patternset id="jdk8.jtreg.tests">
313 <      <include name="**/*.java"/>
314 <    </patternset>
315 <  </fileset>
316 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
317 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
318 >  <property name="jtreg.test.pattern" value="**/*.java"/>
319 >  <macrodef name="defjtregtests">
320 >    <attribute name="v"/>
321 >    <sequential>
322 >      <fileset dir="${jtreg@{v}.src.dir}">
323 >        <patternset id="jdk@{v}.jtreg.tests">
324 >          <include name="${jtreg.test.pattern}"/>
325 >        </patternset>
326 >      </fileset>
327 >    </sequential>
328 >  </macrodef>
329  
330 <  <fileset dir="${jtreg7.src.dir}">
331 <    <patternset id="jdk7.jtreg.tests">
332 <      <include name="**/*.java"/>
333 <    </patternset>
334 <  </fileset>
330 >  <defjtregtests v="12"/>
331 >  <defjtregtests v="11"/>
332 >  <defjtregtests v="10"/>
333 >  <defjtregtests v="9"/>
334 >  <defjtregtests v="8"/>
335 >  <defjtregtests v="7"/>
336  
337    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
338    <property name="jtreg.flags" value=""/>
339  
340    <macrodef name="run-jtreg-tests">
341 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
341 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
342      <attribute name="target"/>
343      <attribute name="workdir"/>
344      <attribute name="classes"/>
345 +    <attribute name="verbose" default="${jtreg.verbose}"/>
346      <attribute name="jtregflags" default=""/>
347 +    <element name="jtreg-elements" optional="true"/>
348  
349      <sequential>
350  
# Line 337 | Line 353
353  
354      <local name="modules"/>
355      <condition property="modules">
356 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
356 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
357      </condition>
358  
359      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 350 | Line 366
366        <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
367        <arg value="-agentvm"/>
368        <arg value="-noreport"/>
369 <      <arg value="-verbose:${jtreg.verbose}"/>
369 >      <arg value="-verbose:@{verbose}"/>
370        <arg value="-vmoptions:-esa -ea"/>
371        <arg value="-automatic"/>
372        <arg value="-k:!ignore"/>
373        <arg line="@{jtregflags}"/>
374        <arg line="${jtreg.flags}"/>
375 +      <jtreg-elements/>
376      </jtreg>
377      </sequential>
378    </macrodef>
# Line 371 | Line 388
388  
389    <!-- Main targets -->
390  
391 <  <property name="build.main.java.version" value="9"/>
392 <  <!-- Workaround "no nested properties in ant" -->
393 <  <macrodef name="define-build-main-properties">
394 <    <attribute name="v"/>
395 <    <sequential>
396 <      <property name="build.main.java"    value="${java@{v}}"/>
397 <      <property name="build.main.javac"   value="${javac@{v}}"/>
398 <      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
399 <    </sequential>
400 <  </macrodef>
401 <  <define-build-main-properties v="${build.main.java.version}"/>
391 >  <!-- Default values: may seem strange ... -->
392 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
393 >  <!-- But at build time, target jdk9, for maximal binary portability -->
394 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
395 >    o override-methods=summary
396 >    o {@systemProperty ...}
397 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
398 >    o 8202628: javadoc generates bad links in TestModules.java
399 >    -->
400 >  <property name="java.runtime.target" value="11"/>
401 >  <property name="build.main.java" value="${java11}"/>
402 >  <property name="build.main.javac" value="${javac9}"/>
403 >  <property name="build.main.javadoc" value="${javadoc12}"/>
404 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
405  
406    <target name="dists"
407            depends="dist, 4jdk8dist"
408            description="Builds all public jars and docs"/>
409 <          <!--
390 <              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
391 <          -->
409 >          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
410  
411    <target name="compile"
412            depends="configure-compiler"
# Line 415 | Line 433
433        <compilerarg value="--patch-module=java.base=${src.dir}"/>
434        <compilerarg value="-Xprefer:source"/>
435        <compilerarg value="-XDignore.symbol.file=true"/>
436 <      <compilerarg value="-Xlint:all"/>
436 >      <compilerarg value="-Xlint:all,-removal"/>
437        <compilerarg line="--doclint-format html5"/>
438        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
439        <compilerarg value="-Werror"/>
# Line 457 | Line 475
475   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
476      <javadoc destdir="${docs.dir}"
477               packagenames="none"
478 <             link="${java9.api.url}"
478 >             link="${java.api.url}"
479               overview="${src.dir}/intro.html"
480               access="${build.javadoc.access}"
481               sourcepath="${src.dir}"
482               classpath=""
483 <             source="9"
483 >             source="${build.main.javadoc.source}"
484               executable="${build.main.javadoc}">
485 + <!-- TODO: JDK-8214571 failonerror = "true" -->
486        <fileset dir="${src.dir}" defaultexcludes="yes">
487          <include name="**/*.java"/>
488        </fileset>
489 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
489 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
490        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
491        <arg value="-XDignore.symbol.file=true"/>
492        <arg value="-html5"/>
493        <arg value="--patch-module=java.base=${src.dir}"/>
494 <      <arg value="-tag"/>
495 <      <arg value="${javadoc.jls.option}"/>
496 < <!-- @apiNote currently unused -->
497 < <!--       <arg value="-tag"/> -->
498 < <!--       <arg value="apiNote:a:API Note:"/> -->
499 <      <arg value="-tag"/>
500 <      <arg value="implSpec:a:Implementation Requirements:"/>
482 <      <arg value="-tag"/>
483 <      <arg value="implNote:a:Implementation Note:"/>
494 > <!-- old school frames via docs/index.html?overview-summary.html -->
495 >      <arg value="--frames"/>
496 >      <arg value="--override-methods=summary"/>
497 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
498 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
499 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
500 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
501   <!-- tags added in jdk9: currently unused -->
502 < <!--       <arg value="-tag"/> -->
503 < <!--       <arg value="revised:X"/> -->
487 < <!--       <arg value="-tag"/> -->
488 < <!--       <arg value="spec:X"/> -->
502 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
503 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
504      </javadoc>
505    </target>
506  
# Line 495 | Line 510
510            description="Puts all distributable products in single hierarchy"/>
511  
512  
498  <target name="release"
499          depends="dist"
500          description="Puts entire CVS tree, plus distribution productions, in a jar">
501
502    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
503
504    <jar basedir="${basedir}" destfile="${release.jar}">
505      <!-- <exclude name="build/**"/> -->
506      <exclude name="${release.jar}"/>
507      <exclude name="user.properties"/>
508      <exclude name="etc/notes/**"/>
509      <exclude name="src/emulation/**"/>
510      <exclude name="**/SyntaxTest.java"/>
511      <exclude name="**/SuperfluousAbstract.java"/>
512      <manifest>
513        <attribute name="Built-By" value="${user.name}"/>
514        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
515      </manifest>
516    </jar>
517  </target>
518
519
513    <target name="clean"
514            description="Removes all build products">
515      <delete dir="${build.dir}"/>
# Line 545 | Line 538
538            description="Runs tck tests for src/main directly">
539  
540      <run-tck-tests
541 <      target="${build.main.java.version}"
541 >      target="${java.runtime.target}"
542        workdir="${build.dir}"
543        classes="${product.jar}">
544        <javac-elements>
# Line 579 | Line 572
572            depends="jar"
573            description="Runs jtreg tests for src/main using the jtreg ant task">
574      <run-jtreg-tests
575 <       target="${build.main.java.version}"
575 >       target="${java.runtime.target}"
576         workdir="${build.dir}"
577         classes="${product.jar}"/>
578    </target>
# Line 588 | Line 581
581            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
582            description="Runs tck and jtreg tests for src/main"/>
583  
584 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
585 <
586 < <!--     <antcall target="jtreg"> -->
594 < <!--       <param name="build.main.java.version" value="8"/> -->
595 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
596 < <!--     </antcall> -->
597 <
598 < <!--   </target> -->
584 >  <target name="test-version-permutations"
585 >          depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
586 >  </target>
587  
588 <  <target name="test910"
589 <          description="Runs tck and jtreg tests for src/main for multiple java versions">
588 >  <target name="test9">
589 >    <antcall target="clean"/>
590 >    <antcall>
591 >      <param name="java.runtime.target" value="9"/>
592 >      <param name="build.main.javac" value="${javac9}"/>
593 >      <param name="build.main.javadoc" value="${javadoc12}"/>
594 >      <param name="build.main.javadoc.source" value="9"/>
595 >      <target name="test"/>
596 >      <target name="docs"/>
597 >    </antcall>
598 >  </target>
599  
600 +  <target name="test10">
601      <antcall target="clean"/>
602 <    <antcall target="test">
603 <      <param name="build.main.java.version" value="9"/>
602 >    <antcall>
603 >      <param name="java.runtime.target" value="10"/>
604 >      <param name="build.main.javac" value="${javac10}"/>
605 >      <param name="build.main.javadoc" value="${javadoc12}"/>
606 >      <param name="build.main.javadoc.source" value="10"/>
607 >      <target name="test"/>
608 >      <target name="docs"/>
609      </antcall>
610 +  </target>
611  
612 +  <target name="test11">
613      <antcall target="clean"/>
614 <    <antcall target="test">
615 <      <param name="build.main.java.version" value="10"/>
614 >    <antcall>
615 >      <param name="java.runtime.target" value="11"/>
616 >      <param name="build.main.javac" value="${javac11}"/>
617 >      <param name="build.main.javadoc" value="${javadoc12}"/>
618 >      <param name="build.main.javadoc.source" value="11"/>
619 >      <target name="test"/>
620 >      <target name="docs"/>
621      </antcall>
622 +  </target>
623  
624 <    <!-- Clean up to avoid obscure wrong class file version bugs -->
624 >  <target name="test12">
625      <antcall target="clean"/>
626 +    <antcall>
627 +      <param name="java.runtime.target" value="12"/>
628 +      <param name="build.main.javac" value="${javac12}"/>
629 +      <param name="build.main.javadoc" value="${javadoc12}"/>
630 +      <param name="build.main.javadoc.source" value="12"/>
631 +      <target name="test"/>
632 +      <target name="docs"/>
633 +    </antcall>
634 +  </target>
635  
636 +  <target name="test9-11">
637 +    <antcall target="clean"/>
638 +    <antcall>
639 +      <param name="java.runtime.target" value="11"/>
640 +      <param name="build.main.javac" value="${javac9}"/>
641 +      <param name="build.main.javadoc" value="${javadoc12}"/>
642 +      <param name="build.main.javadoc.source" value="9"/>
643 +      <target name="test"/>
644 +      <target name="docs"/>
645 +    </antcall>
646    </target>
647  
648 +  <target name="test9-12">
649 +    <antcall target="clean"/>
650 +    <antcall>
651 +      <param name="java.runtime.target" value="12"/>
652 +      <param name="build.main.javac" value="${javac9}"/>
653 +      <param name="build.main.javadoc" value="${javadoc12}"/>
654 +      <param name="build.main.javadoc.source" value="9"/>
655 +      <target name="test"/>
656 +      <target name="docs"/>
657 +    </antcall>
658 +  </target>
659  
660  
661    <target name="configure-compiler">
# Line 637 | Line 678
678    </target>
679  
680  
640
641  <!-- Various demos and test programs -->
642
643
644  <!-- description="Benchmark from Doug Lea's AQS paper" -->
645  <target name="loops" depends="configure-compiler">
646
647    <mkdir dir="${build.loops.dir}"/>
648
649    <javac srcdir="${loops.src.dir}"
650          destdir="${build.loops.dir}"
651            debug="${build.debug}"
652       debuglevel="${build.debuglevel}"
653      deprecation="${build.deprecation}"
654           source="${build.sourcelevel}"
655           target="${build.sourcelevel}"
656         encoding="ASCII"
657             fork="true">
658
659      <compilerarg line="${build.args}"/>
660      <classpath refid="loops.classpath"/>
661      <compilerarg value="-XDignore.symbol.file=true"/>
662
663    </javac>
664
665    <java classname="ALoops" fork="true">
666      <classpath refid="loops.classpath"/>
667    </java>
668  </target>
669
670
681    <target name="compile-test-loops" depends="jar"
682            description="Compiles all the perf tests in src/test/loops">
683  
# Line 822 | Line 832
832        </fileset>
833        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
834        <arg value="-XDignore.symbol.file=true"/>
835 <      <arg value="-tag"/>
836 <      <arg value="${javadoc.jls.option}"/>
837 < <!-- @apiNote currently unused -->
838 < <!--       <arg value="-tag"/> -->
839 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
830 <      <arg value="-tag"/>
831 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
832 <      <arg value="-tag"/>
833 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
835 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
836 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
837 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
838 > <!-- @apiNote tag currently unused -->
839 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
840      </javadoc>
841    </target>
842  
# Line 1360 | Line 1366
1366  
1367   <!-- Find buglets that can be detected by static build tools -->
1368  
1369 <  <target name="lint">
1370 <    <antcall target="dists">
1371 <      <param name="build.javadoc.access" value="public"/>
1372 <    </antcall>
1373 <  </target>
1369 > <!--   <target name="lint"> -->
1370 > <!--     <antcall target="dists"> -->
1371 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1372 > <!--     </antcall> -->
1373 > <!--   </target> -->
1374  
1375   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1376 <  <target name="lint-private">
1376 >  <target name="doclint-private">
1377      <antcall target="dist">
1378        <param name="build.javadoc.access" value="private"/>
1379      </antcall>
# Line 1375 | Line 1381
1381  
1382  
1383   <!-- ==============================================================
1384 <  Experimental errorprone support - http://errorprone.info
1384 >  Experimental errorprone support
1385 >  https://errorprone.info
1386 >  https://errorprone.info/docs/installation
1387 >  https://github.com/google/error-prone/issues/1143
1388   =================================================================== -->
1389 +  <path id="errorprone.processorpath.path">
1390 +    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1391 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1392 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1393 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1394 +  </path>
1395 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1396 +  <property name="errorprone.jsr166.user.flags" value=""/>
1397 +  <property name="errorprone.jsr166.flags"
1398 +            value="-Xep:HashtableContains:OFF
1399 +                   -Xep:JdkObsolete:OFF
1400 +                   -Xep:MissingOverride:OFF
1401 +                   -Xep:MissingFail:OFF
1402 +                   -Xep:ThreadPriorityCheck:OFF
1403 +                   -Xep:MixedArrayDimensions:ERROR
1404 +                   -Xep:RemoveUnusedImports:ERROR
1405 +                   -Xep:EmptyIf:ERROR
1406 +                   -Xep:MultipleTopLevelClasses:ERROR
1407 +                   -Xep:ClassName:ERROR
1408 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1409 +                   -Xep:RedundantThrows:ERROR
1410 +                   -Xep:IdentityBinaryExpression:WARN
1411 +                   -Xep:ConstructorInvokesOverridable:WARN
1412 +                   -Xep:MethodCanBeStatic:WARN
1413 +                   ${errorprone.jsr166.user.flags}"/>
1414 +  <!-- -Xep:WildcardImport:ERROR -->
1415 +  <property name="errorprone.jsr166.test.flags"
1416 +            value="-Xep:StringSplitter:OFF
1417 +                   -Xep:BoxedPrimitiveConstructor:OFF
1418 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1419 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1420    <target name="errorprone"
1421            depends="clean, configure-compiler"
1422            description="Run errorprone over jsr166 source code (experimental)">
# Line 1398 | Line 1438
1438             fork="true">
1439  
1440        <include name="**/*.java"/>
1441 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/>
1441 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1442 >      <compilerarg value="-J--illegal-access=permit"/>
1443 >      <compilerarg value="-XDcompilePolicy=simple"/>
1444 >      <compilerarg value="-processorpath"/>
1445 >      <compilerarg pathref="errorprone.processorpath.path"/>
1446        <compilerarg value="-Xplugin:ErrorProne
1447 <                          -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:RedundantThrows:ERROR
1412 <                          -Xep:MethodCanBeStatic:WARN"/>
1447 >                          ${errorprone.jsr166.flags}"/>
1448        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1449        <compilerarg value="-Xprefer:source"/>
1450        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1424 | Line 1459
1459      </jar>
1460  
1461      <run-tck-tests
1462 <      target="${build.main.java.version}"
1462 >      target="${java.runtime.target}"
1463        workdir="${build.dir}"
1464        classes="${product.jar}">
1465        <javac-elements>
1466 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/>
1466 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1467 >        <compilerarg value="-J--illegal-access=permit"/>
1468 >        <compilerarg value="-XDcompilePolicy=simple"/>
1469 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1470          <compilerarg value="-Xplugin:ErrorProne
1471 <                            -Xep:IdentityBinaryExpression:WARN
1472 <                            -Xep:BoxedPrimitiveConstructor:OFF
1435 <                            -Xep:HashtableContains:OFF
1436 <                            -Xep:ModifyingCollectionWithItself:OFF
1437 <                            -Xep:MissingOverride:OFF
1438 <                            -Xep:MixedArrayDimensions:WARN
1439 <                            -Xep:RemoveUnusedImports:ERROR
1440 <                            -Xep:ClassName:ERROR
1441 <                            -Xep:MultipleTopLevelClasses:ERROR
1442 <                            -Xep:EmptyIf:ERROR
1443 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1444 <                            -Xep:RedundantThrows:ERROR
1445 <                            -Xep:MethodCanBeStatic:WARN"/>
1471 >                            ${errorprone.jsr166.flags}
1472 >                            ${errorprone.jsr166.test.flags}"/>
1473          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1474        </javac-elements>
1475      </run-tck-tests>
1476    </target>
1477  
1478 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1479 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1480 +  <target name="errorprone-jtreg"
1481 +          depends="jar"
1482 +          description="Run errorprone over jtreg tests (experimental)">
1483 +
1484 +    <run-jtreg-tests
1485 +       target="${java.runtime.target}"
1486 +       workdir="${build.dir}"
1487 +       classes="${product.jar}"
1488 +       verbose="all">
1489 +      <jtreg-elements>
1490 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1491 +        <arg value="-javacoption:-processorpath"/>
1492 +        <arg value="-javacoption:${errorprone.processorpath}"/>
1493 +        <arg value="-javacoption:-Xplugin:ErrorProne
1494 +                            ${errorprone.jsr166.flags}
1495 +                            ${errorprone.jsr166.test.flags}
1496 +                            -Xep:MultipleTopLevelClasses:WARN
1497 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1498 +      </jtreg-elements>
1499 +    </run-jtreg-tests>
1500 +  </target>
1501 +
1502  
1503   <!-- ==============================================================
1504    Running guava tests against jsr166 code
# Line 1502 | Line 1553
1553           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1554      <junit printsummary="true" showoutput="true" haltonfailure="true"
1555             jvm="${build.main.java}" fork="true">
1556 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1556 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1557        <formatter type="brief"/>
1558        <classpath>
1559          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines