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.243 by jsr166, Sat May 13 20:16:55 2017 UTC vs.
Revision 1.289 by jsr166, Sun Dec 2 22:40:03 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"/>
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 release seems best) -->
206 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
206 >  <!-- But pin to jdk 10 until fix for -->
207 >  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
208 >  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
209  
210    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
211    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 197 | Line 213
213    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
214    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
215    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
216 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
217 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
218 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
219    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
220  
221    <!-- Define the "jtreg" task -->
# Line 229 | Line 248
248  
249      <local name="modules"/>
250      <condition property="modules">
251 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
251 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
252      </condition>
253  
254      <local name="use-doclint"/>
# Line 296 | Line 315
315    </macrodef>
316  
317    <!-- Define jtreg test sets for different jdk versions -->
318 <  <fileset dir="${jtreg9.src.dir}">
319 <    <patternset id="jdk9.jtreg.tests">
320 <      <include name="**/*.java"/>
321 <    </patternset>
322 <  </fileset>
323 <
324 <  <fileset dir="${jtreg8.src.dir}">
325 <    <patternset id="jdk8.jtreg.tests">
326 <      <include name="**/*.java"/>
327 <    </patternset>
328 <  </fileset>
318 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
319 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
320 >  <property name="jtreg.test.pattern" value="**/*.java"/>
321 >  <macrodef name="defjtregtests">
322 >    <attribute name="v"/>
323 >    <sequential>
324 >      <fileset dir="${jtreg@{v}.src.dir}">
325 >        <patternset id="jdk@{v}.jtreg.tests">
326 >          <include name="${jtreg.test.pattern}"/>
327 >        </patternset>
328 >      </fileset>
329 >    </sequential>
330 >  </macrodef>
331  
332 <  <fileset dir="${jtreg7.src.dir}">
333 <    <patternset id="jdk7.jtreg.tests">
334 <      <include name="**/*.java"/>
335 <    </patternset>
336 <  </fileset>
332 >  <defjtregtests v="12"/>
333 >  <defjtregtests v="11"/>
334 >  <defjtregtests v="10"/>
335 >  <defjtregtests v="9"/>
336 >  <defjtregtests v="8"/>
337 >  <defjtregtests v="7"/>
338  
339    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
340    <property name="jtreg.flags" value=""/>
341  
342    <macrodef name="run-jtreg-tests">
343      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
322 –    <attribute name="source" default="7"/>
344      <attribute name="target"/>
345      <attribute name="workdir"/>
346      <attribute name="classes"/>
347 +    <attribute name="verbose" default="${jtreg.verbose}"/>
348      <attribute name="jtregflags" default=""/>
349 +    <element name="jtreg-elements" optional="true"/>
350  
351      <sequential>
352  
# Line 332 | Line 355
355  
356      <local name="modules"/>
357      <condition property="modules">
358 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
358 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
359      </condition>
360  
361      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 341 | Line 364
364             workDir="@{workdir}/JTwork">
365        <patternset refid="jdk@{target}.jtreg.tests"/>
366        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
367 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
368 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
367 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
368 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
369        <arg value="-agentvm"/>
370        <arg value="-noreport"/>
371 <      <arg value="-verbose:${jtreg.verbose}"/>
371 >      <arg value="-verbose:@{verbose}"/>
372        <arg value="-vmoptions:-esa -ea"/>
373        <arg value="-automatic"/>
374        <arg value="-k:!ignore"/>
375        <arg line="@{jtregflags}"/>
376        <arg line="${jtreg.flags}"/>
377 +      <jtreg-elements/>
378      </jtreg>
379      </sequential>
380    </macrodef>
# Line 366 | Line 390
390  
391    <!-- Main targets -->
392  
393 <  <property name="build.main.java.version" value="9"/>
393 >  <!-- Default values: may seem strange ... -->
394 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
395 >  <!-- But at build time, target jdk9, for maximal binary portability -->
396 >  <!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
397 >  <property name="build.main.java.version" value="11"/>
398 >  <property name="build.main.java" value="${java11}"/>
399    <property name="build.main.javac" value="${javac9}"/>
400 +  <property name="build.main.javadoc" value="${javadoc12}"/>
401  
402    <target name="dists"
403            depends="dist, 4jdk8dist"
404            description="Builds all public jars and docs"/>
405 <          <!--
376 <              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
377 <          -->
405 >          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
406  
407    <target name="compile"
408            depends="configure-compiler"
409            description="Compiles src/main sources to build dir">
410  
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 –
411      <local name="destdir"/>
412 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
393 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
412 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
413  
414      <mkdir dir="${destdir}"/>
415  
# Line 407 | Line 426
426             fork="true">
427  
428        <include name="**/*.java"/>
429 <      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
429 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
430        <compilerarg value="-Xprefer:source"/>
431        <compilerarg value="-XDignore.symbol.file=true"/>
432 <      <compilerarg value="-Xlint:all"/>
432 >      <compilerarg value="-Xlint:all,-removal"/>
433        <compilerarg line="--doclint-format html5"/>
434        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
435        <compilerarg value="-Werror"/>
# Line 452 | Line 471
471   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
472      <javadoc destdir="${docs.dir}"
473               packagenames="none"
474 <             link="${java9.api.url}"
474 >             link="${java11.api.url}"
475               overview="${src.dir}/intro.html"
476               access="${build.javadoc.access}"
477               sourcepath="${src.dir}"
478               classpath=""
479 <             executable="${javadoc9}">
479 >             source="11"
480 >             executable="${build.main.javadoc}">
481        <fileset dir="${src.dir}" defaultexcludes="yes">
482          <include name="**/*.java"/>
483        </fileset>
484 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
484 >      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
485        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
486        <arg value="-XDignore.symbol.file=true"/>
487        <arg value="-html5"/>
488        <arg value="--patch-module=java.base=${src.dir}"/>
489 <      <arg value="-tag"/>
490 <      <arg value="${javadoc.jls.option}"/>
491 < <!-- @apiNote currently unused -->
492 < <!--       <arg value="-tag"/> -->
493 < <!--       <arg value="apiNote:a:API Note:"/> -->
494 <      <arg value="-tag"/>
495 <      <arg value="implSpec:a:Implementation Requirements:"/>
476 <      <arg value="-tag"/>
477 <      <arg value="implNote:a:Implementation Note:"/>
489 > <!-- old school frames via docs/index.html?overview-summary.html -->
490 >      <arg value="--frames"/>
491 >      <arg value="--override-methods=summary"/>
492 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
493 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
494 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
495 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
496   <!-- tags added in jdk9: currently unused -->
497 < <!--       <arg value="-tag"/> -->
498 < <!--       <arg value="revised:X"/> -->
481 < <!--       <arg value="-tag"/> -->
482 < <!--       <arg value="spec:X"/> -->
497 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
498 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
499      </javadoc>
500    </target>
501  
# Line 489 | Line 505
505            description="Puts all distributable products in single hierarchy"/>
506  
507  
492 –  <target name="release"
493 –          depends="dist"
494 –          description="Puts entire CVS tree, plus distribution productions, in a jar">
495 –
496 –    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
497 –
498 –    <jar basedir="${basedir}" destfile="${release.jar}">
499 –      <!-- <exclude name="build/**"/> -->
500 –      <exclude name="${release.jar}"/>
501 –      <exclude name="user.properties"/>
502 –      <exclude name="etc/notes/**"/>
503 –      <exclude name="src/emulation/**"/>
504 –      <exclude name="**/SyntaxTest.java"/>
505 –      <exclude name="**/SuperfluousAbstract.java"/>
506 –      <manifest>
507 –        <attribute name="Built-By" value="${user.name}"/>
508 –        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
509 –      </manifest>
510 –    </jar>
511 –  </target>
512 –
513 –
508    <target name="clean"
509            description="Removes all build products">
510      <delete dir="${build.dir}"/>
# Line 582 | Line 576
576            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
577            description="Runs tck and jtreg tests for src/main"/>
578  
579 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
580 <
581 < <!--     <antcall target="jtreg"> -->
588 < <!--       <param name="build.main.java.version" value="8"/> -->
589 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
590 < <!--     </antcall> -->
579 >  <target name="test-version-permutations"
580 >          depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
581 >  </target>
582  
583 < <!--   </target> -->
583 >  <target name="test9">
584 >    <antcall target="clean"/>
585 >    <antcall>
586 >      <param name="build.main.java.version" value="9"/>
587 >      <param name="build.main.java" value="${java9}"/>
588 >      <param name="build.main.javac" value="${javac9}"/>
589 >      <target name="test"/>
590 >    </antcall>
591 >  </target>
592  
593 < <!--   <target name="test89" -->
594 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
593 >  <target name="test10">
594 >    <antcall target="clean"/>
595 >    <antcall>
596 >      <param name="build.main.java.version" value="10"/>
597 >      <param name="build.main.java" value="${java10}"/>
598 >      <param name="build.main.javac" value="${javac10}"/>
599 >      <param name="build.main.javadoc" value="${javadoc10}"/>
600 >      <target name="test"/>
601 >      <target name="docs"/>
602 >    </antcall>
603 >  </target>
604  
605 < <!--     <antcall target="clean"/> -->
606 < <!--     <antcall target="test"> -->
607 < <!--       <param name="build.main.java.version" value="8"/> -->
608 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
609 < <!--     </antcall> -->
605 >  <target name="test11">
606 >    <antcall target="clean"/>
607 >    <antcall>
608 >      <param name="build.main.java.version" value="11"/>
609 >      <param name="build.main.java" value="${java11}"/>
610 >      <param name="build.main.javac" value="${javac11}"/>
611 >      <param name="build.main.javadoc" value="${javadoc11}"/>
612 >      <target name="test"/>
613 >      <target name="docs"/>
614 >    </antcall>
615 >  </target>
616  
617 < <!--     <antcall target="clean"/> -->
618 < <!--     <antcall target="test"> -->
619 < <!--       <param name="build.main.java.version" value="9"/> -->
620 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
621 < <!--     </antcall> -->
617 >  <target name="test12">
618 >    <antcall target="clean"/>
619 >    <antcall>
620 >      <param name="build.main.java.version" value="12"/>
621 >      <param name="build.main.java" value="${java12}"/>
622 >      <param name="build.main.javac" value="${javac12}"/>
623 >      <param name="build.main.javadoc" value="${javadoc12}"/>
624 >      <target name="test"/>
625 >      <target name="docs"/>
626 >    </antcall>
627 >  </target>
628  
629 < <!--   </target> -->
629 >  <target name="test9-11">
630 >    <antcall target="clean"/>
631 >    <antcall>
632 >      <param name="build.main.java.version" value="11"/>
633 >      <param name="build.main.java" value="${java11}"/>
634 >      <param name="build.main.javac" value="${javac9}"/>
635 >      <param name="build.main.javadoc" value="${javadoc11}"/>
636 >      <target name="test"/>
637 >      <target name="docs"/>
638 >    </antcall>
639 >  </target>
640  
641 +  <target name="test9-12">
642 +    <antcall target="clean"/>
643 +    <antcall>
644 +      <param name="build.main.java.version" value="12"/>
645 +      <param name="build.main.java" value="${java12}"/>
646 +      <param name="build.main.javac" value="${javac9}"/>
647 +      <param name="build.main.javadoc" value="${javadoc12}"/>
648 +      <target name="test"/>
649 +      <target name="docs"/>
650 +    </antcall>
651 +  </target>
652  
653  
654    <target name="configure-compiler">
# Line 630 | Line 671
671    </target>
672  
673  
633 –
634 –  <!-- Various demos and test programs -->
635 –
636 –
637 –  <!-- description="Benchmark from Doug Lea's AQS paper" -->
638 –  <target name="loops" depends="configure-compiler">
639 –
640 –    <mkdir dir="${build.loops.dir}"/>
641 –
642 –    <javac srcdir="${loops.src.dir}"
643 –          destdir="${build.loops.dir}"
644 –            debug="${build.debug}"
645 –       debuglevel="${build.debuglevel}"
646 –      deprecation="${build.deprecation}"
647 –           source="${build.sourcelevel}"
648 –           target="${build.sourcelevel}"
649 –         encoding="ASCII"
650 –             fork="true">
651 –
652 –      <compilerarg line="${build.args}"/>
653 –      <classpath refid="loops.classpath"/>
654 –      <compilerarg value="-XDignore.symbol.file=true"/>
655 –
656 –    </javac>
657 –
658 –    <java classname="ALoops" fork="true">
659 –      <classpath refid="loops.classpath"/>
660 –    </java>
661 –  </target>
662 –
663 –
674    <target name="compile-test-loops" depends="jar"
675            description="Compiles all the perf tests in src/test/loops">
676  
# Line 674 | Line 684
684             includeAntRuntime="false"
685             includeJavaRuntime="false"
686             encoding="ASCII"
687 <           executable="${javac9}"
687 >           executable="${build.main.javac}"
688             fork="true">
689  
690        <include name="*.java"/>
# Line 807 | Line 817
817               access="${build.javadoc.access}"
818               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
819               classpath=""
820 +             source="8"
821               executable="${javadoc8}"
822               failonerror = "true">
823        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 814 | Line 825
825        </fileset>
826        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
827        <arg value="-XDignore.symbol.file=true"/>
828 <      <arg value="-tag"/>
829 <      <arg value="${javadoc.jls.option}"/>
830 < <!-- @apiNote currently unused -->
831 < <!--       <arg value="-tag"/> -->
832 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
822 <      <arg value="-tag"/>
823 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
824 <      <arg value="-tag"/>
825 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
828 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
829 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
830 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
831 > <!-- @apiNote tag currently unused -->
832 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
833      </javadoc>
834    </target>
835  
# Line 1352 | Line 1359
1359  
1360   <!-- Find buglets that can be detected by static build tools -->
1361  
1362 <  <target name="lint">
1363 <    <antcall target="dists">
1364 <      <param name="build.javadoc.access" value="public"/>
1365 <    </antcall>
1366 <  </target>
1362 > <!--   <target name="lint"> -->
1363 > <!--     <antcall target="dists"> -->
1364 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1365 > <!--     </antcall> -->
1366 > <!--   </target> -->
1367  
1368   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1369 <  <target name="lint-private">
1369 >  <target name="doclint-private">
1370      <antcall target="dist">
1371        <param name="build.javadoc.access" value="private"/>
1372      </antcall>
# Line 1367 | Line 1374
1374  
1375  
1376   <!-- ==============================================================
1377 <  Experimental errorprone support - http://errorprone.info
1378 <  You may need to bring your own errorprone jar.
1377 >  Experimental errorprone support
1378 >  https://errorprone.info
1379 >  https://errorprone.info/docs/installation
1380 >  https://github.com/google/error-prone/issues/1143
1381   =================================================================== -->
1382 +  <path id="errorprone.processorpath.path">
1383 +    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1384 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1385 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1386 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1387 +  </path>
1388 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1389 +  <property name="errorprone.jsr166.user.flags" value=""/>
1390 +  <property name="errorprone.jsr166.flags"
1391 +            value="-Xep:HashtableContains:OFF
1392 +                   -Xep:JdkObsolete:OFF
1393 +                   -Xep:MissingOverride:OFF
1394 +                   -Xep:MissingFail:OFF
1395 +                   -Xep:ThreadPriorityCheck:OFF
1396 +                   -Xep:MixedArrayDimensions:ERROR
1397 +                   -Xep:RemoveUnusedImports:ERROR
1398 +                   -Xep:EmptyIf:ERROR
1399 +                   -Xep:MultipleTopLevelClasses:ERROR
1400 +                   -Xep:ClassName:ERROR
1401 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1402 +                   -Xep:RedundantThrows:ERROR
1403 +                   -Xep:IdentityBinaryExpression:WARN
1404 +                   -Xep:ConstructorInvokesOverridable:WARN
1405 +                   -Xep:MethodCanBeStatic:WARN
1406 +                   ${errorprone.jsr166.user.flags}"/>
1407 +  <!-- -Xep:WildcardImport:ERROR -->
1408 +  <property name="errorprone.jsr166.test.flags"
1409 +            value="-Xep:StringSplitter:OFF
1410 +                   -Xep:BoxedPrimitiveConstructor:OFF
1411 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1412 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1413    <target name="errorprone"
1414            depends="clean, configure-compiler"
1415            description="Run errorprone over jsr166 source code (experimental)">
# Line 1391 | Line 1431
1431             fork="true">
1432  
1433        <include name="**/*.java"/>
1434 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1435 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1436 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1437 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1438 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1399 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1400 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1401 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1402 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1403 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1434 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1435 >      <compilerarg value="-J--illegal-access=permit"/>
1436 >      <compilerarg value="-XDcompilePolicy=simple"/>
1437 >      <compilerarg value="-processorpath"/>
1438 >      <compilerarg pathref="errorprone.processorpath.path"/>
1439        <compilerarg value="-Xplugin:ErrorProne
1440 <                          -Xep:IdentityBinaryExpression:WARN
1406 <                          -Xep:MissingOverride:OFF
1407 <                          -Xep:MixedArrayDimensions:WARN
1408 <                          -Xep:RemoveUnusedImports:ERROR
1409 <                          -Xep:ClassName:ERROR
1410 <                          -Xep:MultipleTopLevelClasses:ERROR
1411 <                          -Xep:EmptyIf:ERROR
1412 <                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1413 <                          -Xep:ArgumentParameterSwap:ERROR
1414 <                          -Xep:RedundantThrows:ERROR
1415 <                          -Xep:MethodCanBeStatic:WARN"/>
1440 >                          ${errorprone.jsr166.flags}"/>
1441        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1442        <compilerarg value="-Xprefer:source"/>
1443        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1431 | Line 1456
1456        workdir="${build.dir}"
1457        classes="${product.jar}">
1458        <javac-elements>
1459 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1460 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1461 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1462 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1438 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1439 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1440 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1441 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1442 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1443 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1459 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1460 >        <compilerarg value="-J--illegal-access=permit"/>
1461 >        <compilerarg value="-XDcompilePolicy=simple"/>
1462 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1463          <compilerarg value="-Xplugin:ErrorProne
1464 <                            -Xep:IdentityBinaryExpression:WARN
1465 <                            -Xep:BoxedPrimitiveConstructor:OFF
1447 <                            -Xep:HashtableContains:OFF
1448 <                            -Xep:ModifyingCollectionWithItself:OFF
1449 <                            -Xep:MissingOverride:OFF
1450 <                            -Xep:MixedArrayDimensions:WARN
1451 <                            -Xep:RemoveUnusedImports:ERROR
1452 <                            -Xep:ClassName:ERROR
1453 <                            -Xep:MultipleTopLevelClasses:ERROR
1454 <                            -Xep:EmptyIf:ERROR
1455 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1456 <                            -Xep:ArgumentParameterSwap:ERROR
1457 <                            -Xep:RedundantThrows:ERROR
1458 <                            -Xep:MethodCanBeStatic:WARN"/>
1464 >                            ${errorprone.jsr166.flags}
1465 >                            ${errorprone.jsr166.test.flags}"/>
1466          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1467        </javac-elements>
1468      </run-tck-tests>
1469    </target>
1470  
1471 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1472 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1473 +  <target name="errorprone-jtreg"
1474 +          depends="jar"
1475 +          description="Run errorprone over jtreg tests (experimental)">
1476 +
1477 +    <run-jtreg-tests
1478 +       target="${build.main.java.version}"
1479 +       workdir="${build.dir}"
1480 +       classes="${product.jar}"
1481 +       verbose="all">
1482 +      <jtreg-elements>
1483 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1484 +        <arg value="-javacoption:-processorpath"/>
1485 +        <arg value="-javacoption:${errorprone.processorpath}"/>
1486 +        <arg value="-javacoption:-Xplugin:ErrorProne
1487 +                            ${errorprone.jsr166.flags}
1488 +                            ${errorprone.jsr166.test.flags}
1489 +                            -Xep:MultipleTopLevelClasses:WARN
1490 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1491 +      </jtreg-elements>
1492 +    </run-jtreg-tests>
1493 +  </target>
1494 +
1495  
1496   <!-- ==============================================================
1497    Running guava tests against jsr166 code
# Line 1514 | Line 1545
1545      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1546           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1547      <junit printsummary="true" showoutput="true" haltonfailure="true"
1548 <           jvm="${java9}" fork="true">
1549 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1548 >           jvm="${build.main.java}" fork="true">
1549 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1550        <formatter type="brief"/>
1551        <classpath>
1552          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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