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.238 by jsr166, Fri Mar 24 16:33:02 2017 UTC vs.
Revision 1.290 by jsr166, Sun Dec 2 22:46:53 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 18 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
21 –  $HOME/jdk/jdk7
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
26 –  $HOME/jdk/src/jdk7
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  
36    Alternatively, define ant variables thus:
37    ant -Djdk$N.home=... -Djdk$N.src.home=...
38 <  for $N in 7 8 9 10 ...
38 >  for $N in 8 9 10 ...
39  
40    As of 2016-03, the sources in src/main are for jdk9+ only.
41   ------------------------------------------------------------------------------
# Line 52 | Line 55
55  
56  
57    <!-- Compilation options -->
55 –  <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 103 | 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 134 | 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 144 | 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 183 | 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 199 | 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 231 | 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 298 | Line 313
313    </macrodef>
314  
315    <!-- Define jtreg test sets for different jdk versions -->
316 <  <fileset dir="${jtreg9.src.dir}">
317 <    <patternset id="jdk9.jtreg.tests">
318 <      <include name="**/*.java"/>
319 <    </patternset>
320 <  </fileset>
321 <
322 <  <fileset dir="${jtreg8.src.dir}">
323 <    <patternset id="jdk8.jtreg.tests">
324 <      <include name="**/*.java"/>
325 <    </patternset>
326 <  </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 -->
324 –    <attribute name="source" default="7"/>
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 334 | 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 343 | Line 362
362             workDir="@{workdir}/JTwork">
363        <patternset refid="jdk@{target}.jtreg.tests"/>
364        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
365 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
366 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
365 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
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 368 | Line 388
388  
389    <!-- Main targets -->
390  
391 <  <property name="build.main.java.version" value="9"/>
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, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
407 >          depends="dist, 4jdk8dist"
408            description="Builds all public jars and docs"/>
409 +          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
410  
411    <target name="compile"
412            depends="configure-compiler"
413            description="Compiles src/main sources to build dir">
414  
382 –    <local name="modules"/>
383 –    <condition property="modules">
384 –      <and>
385 –        <available file="${jdk9.home}/jmods" type="dir"/>
386 –        <equals arg1="9" arg2="${build.main.java.version}"/>
387 –      </and>
388 –    </condition>
389 –
415      <local name="destdir"/>
416 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
392 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
416 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
417  
418      <mkdir dir="${destdir}"/>
419  
# Line 406 | Line 430
430             fork="true">
431  
432        <include name="**/*.java"/>
433 <      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
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"/>
437 <      <compilerarg value="-Werror"/>
436 >      <compilerarg value="-Xlint:all,-removal"/>
437 >      <compilerarg line="--doclint-format html5"/>
438        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
439 +      <compilerarg value="-Werror"/>
440        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
441        <compilerarg line="${build.args}"/>
442  
# Line 450 | 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 <             executable="${javadoc9}">
483 >             source="${build.main.javadoc.source}"
484 >             executable="${build.main.javadoc}">
485        <fileset dir="${src.dir}" defaultexcludes="yes">
486          <include name="**/*.java"/>
487        </fileset>
488 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
488 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
489        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
490        <arg value="-XDignore.symbol.file=true"/>
491 +      <arg value="-html5"/>
492        <arg value="--patch-module=java.base=${src.dir}"/>
493 <      <arg value="-tag"/>
494 <      <arg value="${javadoc.jls.option}"/>
495 < <!-- @apiNote currently unused -->
496 < <!--       <arg value="-tag"/> -->
497 < <!--       <arg value="apiNote:a:API Note:"/> -->
498 <      <arg value="-tag"/>
499 <      <arg value="implSpec:a:Implementation Requirements:"/>
473 <      <arg value="-tag"/>
474 <      <arg value="implNote:a:Implementation Note:"/>
493 > <!-- old school frames via docs/index.html?overview-summary.html -->
494 >      <arg value="--frames"/>
495 >      <arg value="--override-methods=summary"/>
496 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
497 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
498 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
499 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
500   <!-- tags added in jdk9: currently unused -->
501 < <!--       <arg value="-tag"/> -->
502 < <!--       <arg value="revised:X"/> -->
478 < <!--       <arg value="-tag"/> -->
479 < <!--       <arg value="spec:X"/> -->
501 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
502 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
503      </javadoc>
504    </target>
505  
# Line 486 | Line 509
509            description="Puts all distributable products in single hierarchy"/>
510  
511  
489 –  <target name="release"
490 –          depends="dist"
491 –          description="Puts entire CVS tree, plus distribution productions, in a jar">
492 –
493 –    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
494 –
495 –    <jar basedir="${basedir}" destfile="${release.jar}">
496 –      <!-- <exclude name="build/**"/> -->
497 –      <exclude name="${release.jar}"/>
498 –      <exclude name="user.properties"/>
499 –      <exclude name="etc/notes/**"/>
500 –      <exclude name="src/emulation/**"/>
501 –      <exclude name="**/SyntaxTest.java"/>
502 –      <exclude name="**/SuperfluousAbstract.java"/>
503 –      <manifest>
504 –        <attribute name="Built-By" value="${user.name}"/>
505 –        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
506 –      </manifest>
507 –    </jar>
508 –  </target>
509 –
510 –
512    <target name="clean"
513            description="Removes all build products">
513 –
514      <delete dir="${build.dir}"/>
515 –
515    </target>
516  
517  
518    <target name="dist-clean"
519            description="Removes all build and distribution products">
521 –
520      <delete dir="${build.dir}"/>
521      <delete dir="${dist.dir}"/>
524 –
522    </target>
523  
524  
# Line 540 | Line 537
537            description="Runs tck tests for src/main directly">
538  
539      <run-tck-tests
540 <      target="${build.main.java.version}"
540 >      target="${java.runtime.target}"
541        workdir="${build.dir}"
542        classes="${product.jar}">
543        <javac-elements>
# Line 574 | Line 571
571            depends="jar"
572            description="Runs jtreg tests for src/main using the jtreg ant task">
573      <run-jtreg-tests
574 <       target="${build.main.java.version}"
574 >       target="${java.runtime.target}"
575         workdir="${build.dir}"
576         classes="${product.jar}"/>
577    </target>
578  
579    <target name="test"
580            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
581 <          description="Runs tck and jtreg tests for src/main">
585 <  </target>
581 >          description="Runs tck and jtreg tests for src/main"/>
582  
583 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
584 <
585 < <!--     <antcall target="jtreg"> -->
590 < <!--       <param name="build.main.java.version" value="8"/> -->
591 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
592 < <!--     </antcall> -->
583 >  <target name="test-version-permutations"
584 >          depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
585 >  </target>
586  
587 < <!--   </target> -->
587 >  <target name="test9">
588 >    <antcall target="clean"/>
589 >    <antcall>
590 >      <param name="java.runtime.target" value="9"/>
591 >      <param name="build.main.javac" value="${javac9}"/>
592 >      <param name="build.main.javadoc" value="${javadoc12}"/>
593 >      <param name="build.main.javadoc.source" value="9"/>
594 >      <target name="test"/>
595 >      <target name="docs"/>
596 >    </antcall>
597 >  </target>
598  
599 < <!--   <target name="test89" -->
600 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
599 >  <target name="test10">
600 >    <antcall target="clean"/>
601 >    <antcall>
602 >      <param name="java.runtime.target" value="10"/>
603 >      <param name="build.main.javac" value="${javac10}"/>
604 >      <param name="build.main.javadoc" value="${javadoc12}"/>
605 >      <param name="build.main.javadoc.source" value="10"/>
606 >      <target name="test"/>
607 >      <target name="docs"/>
608 >    </antcall>
609 >  </target>
610  
611 < <!--     <antcall target="clean"/> -->
612 < <!--     <antcall target="test"> -->
613 < <!--       <param name="build.main.java.version" value="8"/> -->
614 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
615 < <!--     </antcall> -->
611 >  <target name="test11">
612 >    <antcall target="clean"/>
613 >    <antcall>
614 >      <param name="java.runtime.target" value="11"/>
615 >      <param name="build.main.javac" value="${javac11}"/>
616 >      <param name="build.main.javadoc" value="${javadoc12}"/>
617 >      <param name="build.main.javadoc.source" value="11"/>
618 >      <target name="test"/>
619 >      <target name="docs"/>
620 >    </antcall>
621 >  </target>
622  
623 < <!--     <antcall target="clean"/> -->
624 < <!--     <antcall target="test"> -->
625 < <!--       <param name="build.main.java.version" value="9"/> -->
626 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
627 < <!--     </antcall> -->
623 >  <target name="test12">
624 >    <antcall target="clean"/>
625 >    <antcall>
626 >      <param name="java.runtime.target" value="12"/>
627 >      <param name="build.main.javac" value="${javac12}"/>
628 >      <param name="build.main.javadoc" value="${javadoc12}"/>
629 >      <param name="build.main.javadoc.source" value="12"/>
630 >      <target name="test"/>
631 >      <target name="docs"/>
632 >    </antcall>
633 >  </target>
634  
635 < <!--   </target> -->
635 >  <target name="test9-11">
636 >    <antcall target="clean"/>
637 >    <antcall>
638 >      <param name="java.runtime.target" value="11"/>
639 >      <param name="build.main.javac" value="${javac9}"/>
640 >      <param name="build.main.javadoc" value="${javadoc12}"/>
641 >      <param name="build.main.javadoc.source" value="9"/>
642 >      <target name="test"/>
643 >      <target name="docs"/>
644 >    </antcall>
645 >  </target>
646  
647 +  <target name="test9-12">
648 +    <antcall target="clean"/>
649 +    <antcall>
650 +      <param name="java.runtime.target" value="12"/>
651 +      <param name="build.main.javac" value="${javac9}"/>
652 +      <param name="build.main.javadoc" value="${javadoc12}"/>
653 +      <param name="build.main.javadoc.source" value="9"/>
654 +      <target name="test"/>
655 +      <target name="docs"/>
656 +    </antcall>
657 +  </target>
658  
659  
660    <target name="configure-compiler">
# Line 632 | Line 677
677    </target>
678  
679  
635 –
636 –  <!-- Various demos and test programs -->
637 –
638 –
639 –  <!-- description="Benchmark from Doug Lea's AQS paper" -->
640 –  <target name="loops" depends="configure-compiler">
641 –
642 –    <mkdir dir="${build.loops.dir}"/>
643 –
644 –    <javac srcdir="${loops.src.dir}"
645 –          destdir="${build.loops.dir}"
646 –            debug="${build.debug}"
647 –       debuglevel="${build.debuglevel}"
648 –      deprecation="${build.deprecation}"
649 –           source="${build.sourcelevel}"
650 –           target="${build.sourcelevel}"
651 –         encoding="ASCII"
652 –             fork="true">
653 –
654 –      <compilerarg line="${build.args}"/>
655 –      <classpath refid="loops.classpath"/>
656 –      <compilerarg value="-XDignore.symbol.file=true"/>
657 –
658 –    </javac>
659 –
660 –    <java classname="ALoops" fork="true">
661 –      <classpath refid="loops.classpath"/>
662 –    </java>
663 –
664 –  </target>
665 –
666 –
680    <target name="compile-test-loops" depends="jar"
681 <          description="compile all the perf tests in src/test/loops">
681 >          description="Compiles all the perf tests in src/test/loops">
682  
683      <mkdir dir="${build.dir}/test/loops"/>
684  
# Line 677 | Line 690
690             includeAntRuntime="false"
691             includeJavaRuntime="false"
692             encoding="ASCII"
693 <           executable="${javac9}"
693 >           executable="${build.main.javac}"
694             fork="true">
695  
696        <include name="*.java"/>
# Line 685 | Line 698
698        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
699        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
700        <compilerarg line="${build.args}"/>
688 –
701      </javac>
690 –
702    </target>
703  
704  
# Line 713 | Line 724
724             encoding="ASCII"
725             executable="${javac8}"
726             fork="true">
716 –
727        <include name="**/*.java"/>
728        <compilerarg value="-Xprefer:source"/>
729        <compilerarg value="-XDignore.symbol.file=true"/>
730        <compilerarg value="-Xlint:all"/>
731        <compilerarg value="-Werror"/>
732        <compilerarg line="${build.args}"/>
723 –
733      </javac>
734    </target>
735  
# Line 744 | Line 753
753             encoding="ASCII"
754             executable="${javac8}"
755             fork="true">
747 –
756        <include name="**/*.java"/>
757        <compilerarg value="-Xprefer:source"/>
758        <compilerarg value="-XDignore.symbol.file=true"/>
759        <compilerarg value="-Xlint:all"/>
760        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
761        <compilerarg line="${build.args}"/>
754 –
762      </javac>
763    </target>
764  
# Line 767 | Line 774
774          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
775        </manifest>
776      </jar>
770 –
777    </target>
778  
779  
# Line 801 | Line 807
807  
808    <target name="4jdk8-test"
809            depends="4jdk8-tck, 4jdk8-jtreg"
810 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
805 <  </target>
810 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
811  
812  
813    <target name="4jdk8docs"
# Line 818 | Line 823
823               access="${build.javadoc.access}"
824               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
825               classpath=""
826 +             source="8"
827               executable="${javadoc8}"
828               failonerror = "true">
829        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 825 | Line 831
831        </fileset>
832        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
833        <arg value="-XDignore.symbol.file=true"/>
834 <      <arg value="-tag"/>
835 <      <arg value="${javadoc.jls.option}"/>
836 < <!-- @apiNote currently unused -->
837 < <!--       <arg value="-tag"/> -->
838 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
833 <      <arg value="-tag"/>
834 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
835 <      <arg value="-tag"/>
836 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
834 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
835 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
836 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
837 > <!-- @apiNote tag currently unused -->
838 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
839      </javadoc>
840    </target>
841  
# Line 845 | Line 847
847  
848    <target name="4jdk8clean"
849            description="Removes all 4jdk8 build products">
848 –
850      <delete dir="${build.4jdk8.dir}"/>
850 –
851    </target>
852  
853  
# Line 863 | Line 863
863    </target>
864  
865  
866 +  <!-- jsr166 4jdk7 (no longer maintained) -->
867  
868 <  <!-- jsr166 4jdk7 -->
868 <
869 <  <target name="4jdk7compile"
870 <          depends="configure-compiler"
871 <          description="Compiles src/jdk7 sources, targeting jdk7">
872 <
868 >  <target name="4jdk7compile" depends="configure-compiler">
869      <mkdir dir="${build.4jdk7.classes.dir}"/>
870  
871      <javac srcdir="${4jdk7src.dir}"
# Line 893 | Line 889
889        <compilerarg value="-Xlint:all"/>
890        <compilerarg value="-Werror"/>
891        <compilerarg line="${build.args}"/>
896 –
892      </javac>
893    </target>
894  
895 <  <target name="4jdk7doclint"
901 <          depends="configure-compiler"
902 <          description="Finds doclint warnings">
903 <
895 >  <target name="4jdk7doclint" depends="configure-compiler">
896      <mkdir dir="${build.4jdk7.classes.dir}"/>
897  
898      <javac srcdir="${4jdk7src.dir}"
# Line 924 | Line 916
916        <compilerarg value="-Xlint:all"/>
917        <compilerarg value="-Xdoclint:all/protected"/>
918        <compilerarg line="${build.args}"/>
927 –
919      </javac>
920    </target>
921  
922 <
932 <  <target name="4jdk7jar"
933 <          depends="4jdk7compile"
934 <          description="Builds library jar from compiled sources">
935 <
922 >  <target name="4jdk7jar" depends="4jdk7compile">
923      <jar destfile="${4jdk7product.jar}">
924        <fileset dir="${build.4jdk7.classes.dir}"/>
925        <manifest>
# Line 940 | Line 927
927          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
928        </manifest>
929      </jar>
943 –
930    </target>
931  
932 <
947 <  <target name="4jdk7-tck"
948 <          depends="4jdk7jar"
949 <          description="Runs tck tests for jsr166-4jdk7 directly">
950 <
932 >  <target name="4jdk7-tck" depends="4jdk7jar">
933      <run-tck-tests
934        target="7"
935        workdir="${build.4jdk7.dir}"
# Line 970 | Line 952
952      </run-tck-tests>
953    </target>
954  
973 –
955    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
956 <  <target name="4jdk7-tck-junit"
976 <          depends="4jdk7compile">
956 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
957  
958      <junit printsummary="true"
959             showoutput="true"
# Line 995 | Line 975
975  
976        <test name="${jsr166.tckTestClass}" haltonfailure="no">
977        </test>
998 –
978      </junit>
979    </target>
980  
981 <  <target name="4jdk7-jtreg"
1003 <          depends="4jdk7jar"
1004 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
981 >  <target name="4jdk7-jtreg" depends="4jdk7jar">
982      <run-jtreg-tests
983         target="7"
984         workdir="${build.4jdk7.dir}"
985         classes="${4jdk7product.jar}"/>
986    </target>
987  
988 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
989  
990 <  <target name="4jdk7-test"
1013 <          depends="4jdk7-tck, 4jdk7-jtreg"
1014 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
1015 <  </target>
1016 <
1017 <
1018 <  <target name="4jdk7docs"
1019 <          description="Builds javadocs for src/jdk7 to dist dir">
1020 <
990 >  <target name="4jdk7docs">
991      <delete dir="${4jdk7docs.dir}"/>
992      <mkdir dir="${4jdk7docs.dir}"/>
993  
# Line 1038 | Line 1008
1008      </javadoc>
1009    </target>
1010  
1011 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1012  
1013 <  <target name="4jdk7dist"
1043 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1044 <          description="Puts all distributable products in single hierarchy"/>
1045 <
1046 <
1047 <  <target name="4jdk7clean"
1048 <          description="Removes all 4jdk7 build products">
1049 <
1013 >  <target name="4jdk7clean">
1014      <delete dir="${build.4jdk7.dir}"/>
1051 –
1015    </target>
1016  
1017 <
1055 <  <target name="4jdk7dist-jar"
1056 <          depends="4jdk7clean, 4jdk7jar">
1017 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1018      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1019    </target>
1020  
1021 <
1061 <  <target name="4jdk7dist-docs"
1062 <          depends="4jdk7clean, 4jdk7docs">
1021 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1022      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1023    </target>
1024  
1025  
1026 <  <!-- jsr166x -->
1068 <
1069 <  <target name="jsr166xcompile"
1070 <          depends="configure-compiler"
1071 <          description="Compiles jsr166x sources to build dir">
1026 >  <!-- jsr166x (no longer maintained) -->
1027  
1028 +  <target name="jsr166xcompile" depends="configure-compiler">
1029      <mkdir dir="${build.jsr166x.classes.dir}"/>
1030  
1031      <javac srcdir="${topsrc.dir}"
# Line 1086 | Line 1042
1042             encoding="ASCII"
1043             executable="${javac7}"
1044             fork="true">
1089 –
1045        <include name="jsr166x/**/*.java"/>
1046        <compilerarg value="-XDignore.symbol.file=true"/>
1047        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1048        <compilerarg value="-Werror"/>
1049        <compilerarg line="${build.args}"/>
1095 –
1050      </javac>
1051    </target>
1052  
1053 <
1100 <  <target name="jsr166xjar"
1101 <          depends="jsr166xcompile"
1102 <          description="Builds library jar from compiled sources">
1103 <
1053 >  <target name="jsr166xjar" depends="jsr166xcompile">
1054      <jar destfile="${jsr166x.jar}">
1055        <fileset dir="${build.jsr166x.classes.dir}"/>
1056        <manifest>
# Line 1108 | Line 1058
1058          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1059        </manifest>
1060      </jar>
1111 –
1061    </target>
1062  
1063 <
1115 <  <target name="jsr166xdocs"
1116 <          description="Builds javadocs to dist dir">
1117 <
1063 >  <target name="jsr166xdocs">
1064      <delete dir="${jsr166xdocs.dir}"/>
1065      <mkdir dir="${jsr166xdocs.dir}"/>
1066  
# Line 1129 | Line 1075
1075               failonerror = "true">
1076        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1077        <arg value="-XDignore.symbol.file=true"/>
1132 –
1078      </javadoc>
1079    </target>
1080  
1081 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1082  
1083 <  <target name="jsr166xdist"
1138 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1139 <          description="Puts all distributable products in single hierarchy"/>
1140 <
1141 <
1142 <  <target name="jsr166xclean"
1143 <          description="Removes all jsr166x build products">
1144 <
1083 >  <target name="jsr166xclean">
1084      <delete dir="${build.jsr166x.dir}"/>
1146 –
1085    </target>
1086  
1087 <
1150 <  <target name="jsr166xdist-jar"
1151 <          depends="jsr166xclean, jsr166xjar">
1087 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1088      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1089    </target>
1090  
1091 <  <target name="jsr166xdist-docs"
1156 <          depends="jsr166xclean, jsr166xdocs">
1091 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1092      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1093    </target>
1094  
1160 –  <!-- jsr166y -->
1095  
1096 +  <!-- jsr166y (no longer maintained) -->
1097  
1098 <  <target name="jsr166ycompile"
1164 <          depends="configure-compiler"
1165 <          description="Compiles jsr166y sources">
1166 <
1098 >  <target name="jsr166ycompile" depends="configure-compiler">
1099      <mkdir dir="${build.jsr166y.classes.dir}"/>
1100  
1101      <javac srcdir="${topsrc.dir}"
# Line 1186 | Line 1118
1118        <compilerarg value="-Xlint:all"/>
1119        <compilerarg value="-Werror"/>
1120        <compilerarg line="${build.args}"/>
1189 –
1121      </javac>
1122    </target>
1123  
1124 <
1194 <  <target name="jsr166yjar"
1195 <          depends="jsr166ycompile"
1196 <          description="Builds library jar from compiled sources">
1197 <
1124 >  <target name="jsr166yjar" depends="jsr166ycompile">
1125      <jar destfile="${jsr166y.jar}" index="true">
1126        <fileset dir="${build.jsr166y.classes.dir}"/>
1127        <manifest>
# Line 1202 | Line 1129
1129          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1130        </manifest>
1131      </jar>
1205 –
1132    </target>
1133  
1134 <
1209 <  <target name="jsr166ydocs"
1210 <          description="Builds javadocs to dist dir">
1211 <
1134 >  <target name="jsr166ydocs">
1135      <delete dir="${jsr166ydocs.dir}"/>
1136      <mkdir dir="${jsr166ydocs.dir}"/>
1137  
# Line 1223 | Line 1146
1146               failonerror = "true">
1147        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1148        <arg value="-XDignore.symbol.file=true"/>
1226 –
1149      </javadoc>
1150    </target>
1151  
1152 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1153  
1154 <  <target name="jsr166ydist"
1232 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1233 <          description="Puts all distributable products in single hierarchy"/>
1234 <
1235 <
1236 <  <target name="jsr166yclean"
1237 <          description="Removes all jsr166y build products">
1238 <
1154 >  <target name="jsr166yclean">
1155      <delete dir="${build.jsr166y.dir}"/>
1240 –
1156    </target>
1157  
1158 <
1244 <  <target name="jsr166ydist-jar"
1245 <          depends="jsr166yclean, jsr166yjar">
1158 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1159      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1160    </target>
1161  
1162 <  <target name="jsr166ydist-docs"
1250 <          depends="jsr166yclean, jsr166ydocs">
1162 >  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1163      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1164    </target>
1165  
1166  
1167 <  <!-- extra166y -->
1256 <
1257 <
1258 <  <target name="extra166ycompile"
1259 <          depends="configure-compiler, jsr166yjar"
1260 <          description="Compiles extra166y sources">
1167 >  <!-- extra166y (no longer maintained) -->
1168  
1169 +  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1170      <mkdir dir="${build.extra166y.classes.dir}"/>
1171  
1172      <javac srcdir="${topsrc.dir}"
# Line 1281 | Line 1189
1189        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1190        <compilerarg value="-Werror"/>
1191        <compilerarg line="${build.args}"/>
1284 –
1192      </javac>
1193    </target>
1194  
1195 <
1289 <  <target name="extra166yjar"
1290 <          depends="extra166ycompile"
1291 <          description="Builds library jar from compiled sources">
1292 <
1195 >  <target name="extra166yjar" depends="extra166ycompile">
1196      <jar destfile="${extra166y.jar}" index="true">
1197        <fileset dir="${build.extra166y.classes.dir}"/>
1198        <manifest>
# Line 1297 | Line 1200
1200          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1201        </manifest>
1202      </jar>
1300 –
1203    </target>
1204  
1205 <
1304 <  <target name="extra166ydocs"
1305 <          description="Builds javadocs to build dir">
1306 <
1205 >  <target name="extra166ydocs">
1206      <delete dir="${extra166ydocs.dir}"/>
1207      <mkdir dir="${extra166ydocs.dir}"/>
1208  
# Line 1317 | Line 1216
1216               executable="${javadoc7}">
1217        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1218        <arg value="-XDignore.symbol.file=true"/>
1320 –
1219      </javadoc>
1220    </target>
1221  
1222 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1223  
1224 <  <target name="extra166ydist"
1326 <          depends="extra166ydist-jar, extra166ydist-docs"
1327 <          description="Puts all distributable products in single hierarchy"/>
1328 <
1329 <
1330 <  <target name="extra166yclean"
1331 <          description="Removes all extra166y build products">
1332 <
1224 >  <target name="extra166yclean">
1225      <delete dir="${build.extra166y.dir}"/>
1334 –
1226    </target>
1227  
1228 <
1338 <  <target name="extra166ydist-jar"
1339 <          depends="extra166yclean, extra166yjar">
1228 >  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1229      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1230    </target>
1231  
1232 <  <target name="extra166ydist-docs"
1344 <          depends="extra166yclean, extra166ydocs">
1232 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1233      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1234    </target>
1235  
1236 <  <!-- jsr166e -->
1236 >
1237 >  <!-- jsr166e (no longer maintained) -->
1238  
1239    <property name="build.jsr166e.java.version" value="6"/>
1240    <property name="build.jsr166e.javac" value="${javac6}"/>
1241  
1242 <  <target name="jsr166ecompile"
1354 <          depends="configure-compiler"
1355 <          description="Compiles jsr166e sources">
1356 <
1242 >  <target name="jsr166ecompile" depends="configure-compiler">
1243      <mkdir dir="${build.jsr166e.classes.dir}"/>
1244  
1245      <javac srcdir="${topsrc.dir}"
# Line 1374 | Line 1260
1260        <compilerarg value="-Xlint:all"/>
1261        <compilerarg value="-Werror"/>
1262        <compilerarg line="${build.args}"/>
1377 –
1263      </javac>
1264    </target>
1265  
1381 –  <!-- jsr166e: find doclint errors -->
1266    <target name="jsr166edoclint">
1383 –
1267      <mkdir dir="${build.jsr166e.classes.dir}"/>
1268  
1269      <javac srcdir="${topsrc.dir}"
# Line 1402 | Line 1285
1285        <compilerarg value="-Xlint:all"/>
1286        <compilerarg value="-Werror"/>
1287        <compilerarg value="-Xdoclint:all/protected"/>
1405 –
1288      </javac>
1289    </target>
1290  
1291 <
1410 <  <target name="jsr166ejar"
1411 <          depends="jsr166ecompile"
1412 <          description="Builds library jar from compiled sources">
1413 <
1291 >  <target name="jsr166ejar" depends="jsr166ecompile">
1292      <jar destfile="${jsr166e.jar}" index="true">
1293        <fileset dir="${build.jsr166e.classes.dir}"/>
1294        <manifest>
# Line 1418 | Line 1296
1296          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1297        </manifest>
1298      </jar>
1421 –
1299    </target>
1300  
1301 <
1425 <  <target name="jsr166edocs"
1426 <          description="Builds javadocs to build dir">
1427 <
1301 >  <target name="jsr166edocs">
1302      <delete dir="${jsr166edocs.dir}"/>
1303      <mkdir dir="${jsr166edocs.dir}"/>
1304  
# Line 1438 | Line 1312
1312               failonerror = "true">
1313        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1314        <arg value="-XDignore.symbol.file=true"/>
1441 –
1315      </javadoc>
1316    </target>
1317  
1318 <
1446 <  <target name="jsr166e-tck-one-java-version"
1447 <          depends="jsr166ejar">
1448 <
1318 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1319      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1450 –
1320      <run-tck-tests
1321        tck.src.dir="${test.src.dir}/tck-jsr166e"
1322        target="${build.jsr166e.java.version}"
# Line 1455 | Line 1324
1324        classes="${jsr166e.jar}"/>
1325    </target>
1326  
1327 <  <target name="jsr166e-tck"
1459 <          description="Runs tck tests for jsr166e for multiple java versions">
1327 >  <target name="jsr166e-tck">
1328  
1329   <!--     <antcall target="clean"/> -->
1330   <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1477 | Line 1345
1345      </antcall>
1346    </target>
1347  
1348 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1349  
1350 <  <target name="jsr166e-test"
1482 <          depends="jsr166e-tck"
1483 <          description="Runs all tests for jsr166e">
1484 <  </target>
1485 <
1486 <  <target name="jsr166edist"
1487 <          depends="jsr166edist-jar, jsr166edist-docs"
1488 <          description="Puts all distributable products in single hierarchy"/>
1489 <
1350 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1351  
1352 <  <target name="jsr166eclean"
1492 <          description="Removes all jsr166e build products">
1352 >  <target name="jsr166eclean">
1353      <delete dir="${build.jsr166e.dir}"/>
1354    </target>
1355  
1496 –
1356    <target name="jsr166edist-jar"
1357            depends="jsr166eclean, jsr166ejar">
1358      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1359    </target>
1360  
1361 <  <target name="jsr166edist-docs"
1503 <          depends="jsr166eclean, jsr166edocs">
1361 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1362      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1363    </target>
1364  
1365  
1366   <!-- Find buglets that can be detected by static build tools -->
1367  
1368 <  <target name="lint">
1369 <    <antcall target="dists">
1370 <      <param name="build.javadoc.access" value="public"/>
1371 <    </antcall>
1372 <  </target>
1368 > <!--   <target name="lint"> -->
1369 > <!--     <antcall target="dists"> -->
1370 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1371 > <!--     </antcall> -->
1372 > <!--   </target> -->
1373  
1374   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1375 <  <target name="lint-private">
1375 >  <target name="doclint-private">
1376      <antcall target="dist">
1377        <param name="build.javadoc.access" value="private"/>
1378      </antcall>
# Line 1522 | Line 1380
1380  
1381  
1382   <!-- ==============================================================
1383 <  Experimental errorprone support - http://errorprone.info
1384 <  You may need to bring your own errorprone jar.
1383 >  Experimental errorprone support
1384 >  https://errorprone.info
1385 >  https://errorprone.info/docs/installation
1386 >  https://github.com/google/error-prone/issues/1143
1387   =================================================================== -->
1388 +  <path id="errorprone.processorpath.path">
1389 +    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1390 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1391 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1392 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1393 +  </path>
1394 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1395 +  <property name="errorprone.jsr166.user.flags" value=""/>
1396 +  <property name="errorprone.jsr166.flags"
1397 +            value="-Xep:HashtableContains:OFF
1398 +                   -Xep:JdkObsolete:OFF
1399 +                   -Xep:MissingOverride:OFF
1400 +                   -Xep:MissingFail:OFF
1401 +                   -Xep:ThreadPriorityCheck:OFF
1402 +                   -Xep:MixedArrayDimensions:ERROR
1403 +                   -Xep:RemoveUnusedImports:ERROR
1404 +                   -Xep:EmptyIf:ERROR
1405 +                   -Xep:MultipleTopLevelClasses:ERROR
1406 +                   -Xep:ClassName:ERROR
1407 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1408 +                   -Xep:RedundantThrows:ERROR
1409 +                   -Xep:IdentityBinaryExpression:WARN
1410 +                   -Xep:ConstructorInvokesOverridable:WARN
1411 +                   -Xep:MethodCanBeStatic:WARN
1412 +                   ${errorprone.jsr166.user.flags}"/>
1413 +  <!-- -Xep:WildcardImport:ERROR -->
1414 +  <property name="errorprone.jsr166.test.flags"
1415 +            value="-Xep:StringSplitter:OFF
1416 +                   -Xep:BoxedPrimitiveConstructor:OFF
1417 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1418 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1419    <target name="errorprone"
1420            depends="clean, configure-compiler"
1421 <          description="Run errorprone over jsr166 source code">
1421 >          description="Run errorprone over jsr166 source code (experimental)">
1422  
1423      <local name="destdir"/>
1424      <property name="destdir" value="${build.classes.dir}/java.base"/>
# Line 1546 | Line 1437
1437             fork="true">
1438  
1439        <include name="**/*.java"/>
1440 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1441 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1442 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1443 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1444 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1554 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1555 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1556 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1557 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1558 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1440 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1441 >      <compilerarg value="-J--illegal-access=permit"/>
1442 >      <compilerarg value="-XDcompilePolicy=simple"/>
1443 >      <compilerarg value="-processorpath"/>
1444 >      <compilerarg pathref="errorprone.processorpath.path"/>
1445        <compilerarg value="-Xplugin:ErrorProne
1446 <                          -Xep:IdentityBinaryExpression:WARN
1561 <                          -Xep:MissingOverride:OFF
1562 <                          -Xep:MixedArrayDimensions:WARN
1563 <                          -Xep:RemoveUnusedImports:ERROR
1564 <                          -Xep:MethodCanBeStatic:WARN"/>
1446 >                          ${errorprone.jsr166.flags}"/>
1447        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1448        <compilerarg value="-Xprefer:source"/>
1449        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1576 | Line 1458
1458      </jar>
1459  
1460      <run-tck-tests
1461 <      target="${build.main.java.version}"
1461 >      target="${java.runtime.target}"
1462        workdir="${build.dir}"
1463        classes="${product.jar}">
1464        <javac-elements>
1465 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1466 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1467 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1468 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1469 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1470 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1471 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1590 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1591 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1592 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1593 <        <compilerarg value="-Xplugin:ErrorProne
1594 <                            -Xep:IdentityBinaryExpression:WARN
1595 <                            -Xep:BoxedPrimitiveConstructor:OFF
1596 <                            -Xep:HashtableContains:OFF
1597 <                            -Xep:ModifyingCollectionWithItself:OFF
1598 <                            -Xep:MissingOverride:OFF
1599 <                            -Xep:MixedArrayDimensions:WARN
1600 <                            -Xep:RemoveUnusedImports:ERROR
1601 <                            -Xep:MethodCanBeStatic:WARN"/>
1465 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1466 >        <compilerarg value="-J--illegal-access=permit"/>
1467 >        <compilerarg value="-XDcompilePolicy=simple"/>
1468 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1469 >        <compilerarg value="-Xplugin:ErrorProne
1470 >                            ${errorprone.jsr166.flags}
1471 >                            ${errorprone.jsr166.test.flags}"/>
1472          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1473        </javac-elements>
1474      </run-tck-tests>
1475    </target>
1476  
1477 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1478 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1479 +  <target name="errorprone-jtreg"
1480 +          depends="jar"
1481 +          description="Run errorprone over jtreg tests (experimental)">
1482 +
1483 +    <run-jtreg-tests
1484 +       target="${java.runtime.target}"
1485 +       workdir="${build.dir}"
1486 +       classes="${product.jar}"
1487 +       verbose="all">
1488 +      <jtreg-elements>
1489 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1490 +        <arg value="-javacoption:-processorpath"/>
1491 +        <arg value="-javacoption:${errorprone.processorpath}"/>
1492 +        <arg value="-javacoption:-Xplugin:ErrorProne
1493 +                            ${errorprone.jsr166.flags}
1494 +                            ${errorprone.jsr166.test.flags}
1495 +                            -Xep:MultipleTopLevelClasses:WARN
1496 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1497 +      </jtreg-elements>
1498 +    </run-jtreg-tests>
1499 +  </target>
1500 +
1501  
1502   <!-- ==============================================================
1503    Running guava tests against jsr166 code
# Line 1657 | Line 1551
1551      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1552           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1553      <junit printsummary="true" showoutput="true" haltonfailure="true"
1554 <           jvm="${java9}" fork="true">
1555 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1554 >           jvm="${build.main.java}" fork="true">
1555 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1556        <formatter type="brief"/>
1557        <classpath>
1558          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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