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.246 by jsr166, Fri Jun 16 20:56:47 2017 UTC vs.
Revision 1.295 by jsr166, Sun Mar 24 00:44:14 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 181 | Line 193
193    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
194  
195    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
196 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
197 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
198 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
199 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
200 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
201 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
202 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
203 <  <!-- Default jdk doc location (latest stable release seems best) -->
204 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
196 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
197 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
198 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
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 >  <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 >  <!-- <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 197 | 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 229 | 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 296 | 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}">
312 <    <patternset id="jdk8.jtreg.tests">
313 <      <include name="**/*.java"/>
314 <    </patternset>
315 <  </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"/>
353 +    <attribute name="verbose" default="${jtreg.verbose}"/>
354      <attribute name="jtregflags" default=""/>
355 +    <element name="jtreg-elements" optional="true"/>
356  
357      <sequential>
358  
# Line 337 | 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 346 | Line 370
370             workDir="@{workdir}/JTwork">
371        <patternset refid="jdk@{target}.jtreg.tests"/>
372        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
373 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
374 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
373 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
374 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
375        <arg value="-agentvm"/>
376        <arg value="-noreport"/>
377 <      <arg value="-verbose:${jtreg.verbose}"/>
377 >      <arg value="-verbose:@{verbose}"/>
378        <arg value="-vmoptions:-esa -ea"/>
379        <arg value="-automatic"/>
380        <arg value="-k:!ignore"/>
381        <arg line="@{jtregflags}"/>
382        <arg line="${jtreg.flags}"/>
383 +      <jtreg-elements/>
384      </jtreg>
385      </sequential>
386    </macrodef>
# Line 371 | Line 396
396  
397    <!-- Main targets -->
398  
399 <  <property name="build.main.java.version" value="9"/>
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 <          <!--
381 <              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
382 <          -->
417 >          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
418  
419    <target name="compile"
420            depends="configure-compiler"
421            description="Compiles src/main sources to build dir">
422  
388 –    <local name="modules"/>
389 –    <condition property="modules">
390 –      <and>
391 –        <available file="${jdk9.home}/jmods" type="dir"/>
392 –        <equals arg1="9" arg2="${build.main.java.version}"/>
393 –      </and>
394 –    </condition>
395 –
423      <local name="destdir"/>
424 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
398 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
424 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
425  
426      <mkdir dir="${destdir}"/>
427  
# Line 412 | Line 438
438             fork="true">
439  
440        <include name="**/*.java"/>
441 <      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
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 457 | 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"
492 <             executable="${javadoc9}">
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:"/>
482 <      <arg value="-tag"/>
483 <      <arg value="implNote:a:Implementation Note:"/>
502 > <!-- old school frames via docs/index.html?overview-summary.html -->
503 >      <arg value="--frames"/>
504 >      <arg value="--override-methods=summary"/>
505 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
506 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
507 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
508 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
509   <!-- tags added in jdk9: currently unused -->
510 < <!--       <arg value="-tag"/> -->
511 < <!--       <arg value="revised:X"/> -->
487 < <!--       <arg value="-tag"/> -->
488 < <!--       <arg value="spec:X"/> -->
510 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
511 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
512      </javadoc>
513    </target>
514  
# Line 495 | Line 518
518            description="Puts all distributable products in single hierarchy"/>
519  
520  
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 –
521    <target name="clean"
522            description="Removes all build products">
523      <delete dir="${build.dir}"/>
# Line 545 | Line 546
546            description="Runs tck tests for src/main directly">
547  
548      <run-tck-tests
549 <      target="${build.main.java.version}"
549 >      target="${java.runtime.target}"
550        workdir="${build.dir}"
551        classes="${product.jar}">
552        <javac-elements>
# Line 579 | Line 580
580            depends="jar"
581            description="Runs jtreg tests for src/main using the jtreg ant task">
582      <run-jtreg-tests
583 <       target="${build.main.java.version}"
583 >       target="${java.runtime.target}"
584         workdir="${build.dir}"
585         classes="${product.jar}"/>
586    </target>
# Line 588 | Line 589
589            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
590            description="Runs tck and jtreg tests for src/main"/>
591  
592 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
592 >  <target name="test-version-permutations"
593 >          depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
594 >  </target>
595  
596 < <!--     <antcall target="jtreg"> -->
597 < <!--       <param name="build.main.java.version" value="8"/> -->
598 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
599 < <!--     </antcall> -->
596 >  <target name="test9">
597 >    <antcall target="clean"/>
598 >    <antcall>
599 >      <param name="java.runtime.target" value="9"/>
600 >      <param name="build.main.javac" value="${javac9}"/>
601 >      <param name="build.main.javadoc" value="${javadoc12}"/>
602 >      <param name="build.main.javadoc.source" value="9"/>
603 >      <target name="test"/>
604 >      <target name="docs"/>
605 >    </antcall>
606 >  </target>
607  
608 < <!--   </target> -->
608 >  <target name="test10">
609 >    <antcall target="clean"/>
610 >    <antcall>
611 >      <param name="java.runtime.target" value="10"/>
612 >      <param name="build.main.javac" value="${javac10}"/>
613 >      <param name="build.main.javadoc" value="${javadoc12}"/>
614 >      <param name="build.main.javadoc.source" value="10"/>
615 >      <target name="test"/>
616 >      <target name="docs"/>
617 >    </antcall>
618 >  </target>
619  
620 < <!--   <target name="test89" -->
621 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
620 >  <target name="test11">
621 >    <antcall target="clean"/>
622 >    <antcall>
623 >      <param name="java.runtime.target" value="11"/>
624 >      <param name="build.main.javac" value="${javac11}"/>
625 >      <param name="build.main.javadoc" value="${javadoc12}"/>
626 >      <param name="build.main.javadoc.source" value="11"/>
627 >      <target name="test"/>
628 >      <target name="docs"/>
629 >    </antcall>
630 >  </target>
631  
632 < <!--     <antcall target="clean"/> -->
633 < <!--     <antcall target="test"> -->
634 < <!--       <param name="build.main.java.version" value="8"/> -->
635 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
636 < <!--     </antcall> -->
632 >  <target name="test12">
633 >    <antcall target="clean"/>
634 >    <antcall>
635 >      <param name="java.runtime.target" value="12"/>
636 >      <param name="build.main.javac" value="${javac12}"/>
637 >      <param name="build.main.javadoc" value="${javadoc12}"/>
638 >      <param name="build.main.javadoc.source" value="12"/>
639 >      <target name="test"/>
640 >      <target name="docs"/>
641 >    </antcall>
642 >  </target>
643  
644 < <!--     <antcall target="clean"/> -->
645 < <!--     <antcall target="test"> -->
646 < <!--       <param name="build.main.java.version" value="9"/> -->
647 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
648 < <!--     </antcall> -->
644 >  <target name="test13">
645 >    <antcall target="clean"/>
646 >    <antcall>
647 >      <param name="java.runtime.target" value="13"/>
648 >      <param name="build.main.javac" value="${javac13}"/>
649 >      <param name="build.main.javadoc" value="${javadoc13}"/>
650 >      <param name="build.main.javadoc.source" value="13"/>
651 >      <target name="test"/>
652 >      <target name="docs"/>
653 >    </antcall>
654 >  </target>
655  
656 < <!--   </target> -->
656 >  <target name="test9-11">
657 >    <antcall target="clean"/>
658 >    <antcall>
659 >      <param name="java.runtime.target" value="11"/>
660 >      <param name="build.main.javac" value="${javac9}"/>
661 >      <param name="build.main.javadoc" value="${javadoc12}"/>
662 >      <param name="build.main.javadoc.source" value="9"/>
663 >      <target name="test"/>
664 >      <target name="docs"/>
665 >    </antcall>
666 >  </target>
667  
668 +  <target name="test9-12">
669 +    <antcall target="clean"/>
670 +    <antcall>
671 +      <param name="java.runtime.target" value="12"/>
672 +      <param name="build.main.javac" value="${javac9}"/>
673 +      <param name="build.main.javadoc" value="${javadoc12}"/>
674 +      <param name="build.main.javadoc.source" value="9"/>
675 +      <target name="test"/>
676 +      <target name="docs"/>
677 +    </antcall>
678 +  </target>
679 +
680 +  <target name="test9-13">
681 +    <antcall target="clean"/>
682 +    <antcall>
683 +      <param name="java.runtime.target" value="13"/>
684 +      <param name="build.main.javac" value="${javac9}"/>
685 +      <param name="build.main.javadoc" value="${javadoc13}"/>
686 +      <param name="build.main.javadoc.source" value="9"/>
687 +      <target name="test"/>
688 +      <target name="docs"/>
689 +    </antcall>
690 +  </target>
691  
692  
693    <target name="configure-compiler">
# Line 636 | Line 710
710    </target>
711  
712  
639 –
640 –  <!-- Various demos and test programs -->
641 –
642 –
643 –  <!-- description="Benchmark from Doug Lea's AQS paper" -->
644 –  <target name="loops" depends="configure-compiler">
645 –
646 –    <mkdir dir="${build.loops.dir}"/>
647 –
648 –    <javac srcdir="${loops.src.dir}"
649 –          destdir="${build.loops.dir}"
650 –            debug="${build.debug}"
651 –       debuglevel="${build.debuglevel}"
652 –      deprecation="${build.deprecation}"
653 –           source="${build.sourcelevel}"
654 –           target="${build.sourcelevel}"
655 –         encoding="ASCII"
656 –             fork="true">
657 –
658 –      <compilerarg line="${build.args}"/>
659 –      <classpath refid="loops.classpath"/>
660 –      <compilerarg value="-XDignore.symbol.file=true"/>
661 –
662 –    </javac>
663 –
664 –    <java classname="ALoops" fork="true">
665 –      <classpath refid="loops.classpath"/>
666 –    </java>
667 –  </target>
668 –
669 –
713    <target name="compile-test-loops" depends="jar"
714            description="Compiles all the perf tests in src/test/loops">
715  
# Line 680 | 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 821 | 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;"/> -->
829 <      <arg value="-tag"/>
830 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
831 <      <arg value="-tag"/>
832 <      <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 1359 | 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 1374 | Line 1413
1413  
1414  
1415   <!-- ==============================================================
1416 <  Experimental errorprone support - http://errorprone.info
1417 <  You may need to bring your own errorprone jar.
1416 >  Experimental errorprone support
1417 >  https://errorprone.info
1418 >  https://errorprone.info/docs/installation
1419 >  https://github.com/google/error-prone/issues/1143
1420   =================================================================== -->
1421 +  <path id="errorprone.processorpath.path">
1422 +    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1423 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1424 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1425 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1426 +  </path>
1427 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1428 +  <property name="errorprone.jsr166.user.flags" value=""/>
1429 +  <property name="errorprone.jsr166.flags"
1430 +            value="-Xep:HashtableContains:OFF
1431 +                   -Xep:JdkObsolete:OFF
1432 +                   -Xep:MissingOverride:OFF
1433 +                   -Xep:MissingFail:OFF
1434 +                   -Xep:ThreadPriorityCheck:OFF
1435 +                   -Xep:MixedArrayDimensions:ERROR
1436 +                   -Xep:RemoveUnusedImports:ERROR
1437 +                   -Xep:EmptyIf:ERROR
1438 +                   -Xep:MultipleTopLevelClasses:ERROR
1439 +                   -Xep:ClassName:ERROR
1440 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1441 +                   -Xep:RedundantThrows:ERROR
1442 +                   -Xep:IdentityBinaryExpression:WARN
1443 +                   -Xep:ConstructorInvokesOverridable:WARN
1444 +                   -Xep:MethodCanBeStatic:WARN
1445 +                   ${errorprone.jsr166.user.flags}"/>
1446 +  <!-- -Xep:WildcardImport:ERROR -->
1447 +  <property name="errorprone.jsr166.test.flags"
1448 +            value="-Xep:StringSplitter:OFF
1449 +                   -Xep:BoxedPrimitiveConstructor:OFF
1450 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1451 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1452    <target name="errorprone"
1453            depends="clean, configure-compiler"
1454            description="Run errorprone over jsr166 source code (experimental)">
# Line 1398 | Line 1470
1470             fork="true">
1471  
1472        <include name="**/*.java"/>
1473 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1474 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1475 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1476 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1477 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1406 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1407 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1408 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1409 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1410 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1473 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1474 >      <compilerarg value="-J--illegal-access=permit"/>
1475 >      <compilerarg value="-XDcompilePolicy=simple"/>
1476 >      <compilerarg value="-processorpath"/>
1477 >      <compilerarg pathref="errorprone.processorpath.path"/>
1478        <compilerarg value="-Xplugin:ErrorProne
1479 <                          -Xep:IdentityBinaryExpression:WARN
1413 <                          -Xep:MissingOverride:OFF
1414 <                          -Xep:MixedArrayDimensions:WARN
1415 <                          -Xep:RemoveUnusedImports:ERROR
1416 <                          -Xep:ClassName:ERROR
1417 <                          -Xep:MultipleTopLevelClasses:ERROR
1418 <                          -Xep:EmptyIf:ERROR
1419 <                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1420 <                          -Xep:ArgumentParameterSwap:ERROR
1421 <                          -Xep:RedundantThrows:ERROR
1422 <                          -Xep:MethodCanBeStatic:WARN"/>
1479 >                          ${errorprone.jsr166.flags}"/>
1480        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1481        <compilerarg value="-Xprefer:source"/>
1482        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1434 | Line 1491
1491      </jar>
1492  
1493      <run-tck-tests
1494 <      target="${build.main.java.version}"
1494 >      target="${java.runtime.target}"
1495        workdir="${build.dir}"
1496        classes="${product.jar}">
1497        <javac-elements>
1498 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1499 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1500 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1501 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1445 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1446 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1447 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1448 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1449 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1450 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1498 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1499 >        <compilerarg value="-J--illegal-access=permit"/>
1500 >        <compilerarg value="-XDcompilePolicy=simple"/>
1501 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1502          <compilerarg value="-Xplugin:ErrorProne
1503 <                            -Xep:IdentityBinaryExpression:WARN
1504 <                            -Xep:BoxedPrimitiveConstructor:OFF
1454 <                            -Xep:HashtableContains:OFF
1455 <                            -Xep:ModifyingCollectionWithItself:OFF
1456 <                            -Xep:MissingOverride:OFF
1457 <                            -Xep:MixedArrayDimensions:WARN
1458 <                            -Xep:RemoveUnusedImports:ERROR
1459 <                            -Xep:ClassName:ERROR
1460 <                            -Xep:MultipleTopLevelClasses:ERROR
1461 <                            -Xep:EmptyIf:ERROR
1462 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1463 <                            -Xep:ArgumentParameterSwap:ERROR
1464 <                            -Xep:RedundantThrows:ERROR
1465 <                            -Xep:MethodCanBeStatic:WARN"/>
1503 >                            ${errorprone.jsr166.flags}
1504 >                            ${errorprone.jsr166.test.flags}"/>
1505          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1506        </javac-elements>
1507      </run-tck-tests>
1508    </target>
1509  
1510 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1511 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1512 +  <target name="errorprone-jtreg"
1513 +          depends="jar"
1514 +          description="Run errorprone over jtreg tests (experimental)">
1515 +
1516 +    <run-jtreg-tests
1517 +       target="${java.runtime.target}"
1518 +       workdir="${build.dir}"
1519 +       classes="${product.jar}"
1520 +       verbose="all">
1521 +      <jtreg-elements>
1522 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1523 +        <arg value="-javacoption:-processorpath"/>
1524 +        <arg value="-javacoption:${errorprone.processorpath}"/>
1525 +        <arg value="-javacoption:-Xplugin:ErrorProne
1526 +                            ${errorprone.jsr166.flags}
1527 +                            ${errorprone.jsr166.test.flags}
1528 +                            -Xep:MultipleTopLevelClasses:WARN
1529 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1530 +      </jtreg-elements>
1531 +    </run-jtreg-tests>
1532 +  </target>
1533 +
1534  
1535   <!-- ==============================================================
1536    Running guava tests against jsr166 code
# Line 1521 | Line 1584
1584      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1585           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1586      <junit printsummary="true" showoutput="true" haltonfailure="true"
1587 <           jvm="${java9}" fork="true">
1588 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1587 >           jvm="${build.main.java}" fork="true">
1588 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1589        <formatter type="brief"/>
1590        <classpath>
1591          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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