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.231 by jsr166, Sun Jan 29 20:19:00 2017 UTC vs.
Revision 1.278 by jsr166, Mon Oct 1 00:10:52 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/jdk6
22  $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/jdk6
27  $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 6 7 8 9 ...
38 >  for $N in 8 9 10 ...
39  
40 <  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
38 <  target is currently broken.
40 >  As of 2016-03, the sources in src/main are for jdk9+ only.
41   ------------------------------------------------------------------------------
42    </description>
43  
# Line 104 | Line 106
106      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
107        unless:set="have.java.base"/>
108      <local name="modules"/>
109 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
109 >    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
110      <local name="boot.jar.dir"/>
111      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
112      <path id="bootclasspath@{v}" unless:set="modules">
# Line 134 | Line 136
136    <defjdklocations v="7"/>
137    <defjdklocations v="8"/>
138    <defjdklocations v="9"/>
139 +  <defjdklocations v="10"/>
140 +  <defjdklocations v="11"/>
141 +  <defjdklocations v="12"/>
142  
143    <!-- Source locations -->
144    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 143 | Line 148
148    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
149    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
150    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
151 +  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
152 +  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
153 +  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
154    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
155    <property name="lib.dir"              location="${basedir}/lib"/>
156    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 182 | Line 190
190    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
191  
192    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
193 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
194 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
195 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
196 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
197 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
198 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
199 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
193 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
194 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
195 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
196 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
197 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
198 >  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
199 >  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
200 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
201 >  <!-- The location of jdk early access docs (RIP) -->
202 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
203 >  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
204 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
205 >  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
206    <!-- Default jdk doc location (latest stable release seems best) -->
207 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
207 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
208  
209    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
210    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 198 | Line 212
212    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
213    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
214    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
215 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
216 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
217 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
218    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
219  
220    <!-- Define the "jtreg" task -->
# Line 230 | Line 247
247  
248      <local name="modules"/>
249      <condition property="modules">
250 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
250 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
251 >    </condition>
252 >
253 >    <local name="use-doclint"/>
254 >    <condition property="use-doclint">
255 >      <not> <equals arg1="@{target}" arg2="7"/> </not>
256      </condition>
257  
258      <mkdir dir="@{workdir}/tck-classes"/>
# Line 252 | Line 274
274        <include name="*.java"/>
275        <compilerarg value="-XDignore.symbol.file=true"/>
276        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
277 +      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
278        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
279 <      <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
279 >      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
280        <compilerarg line="${build.args}"/>
281        <javac-elements/>
282  
# Line 264 | Line 287
287            jvm="${java@{target}}"
288            fork="true">
289          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
290 <        <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
291 <        <jvmarg line="--add-opens java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
292 <        <jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
293 <        <jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
294 <        <jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
295 <        <jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
290 >        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
291 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
292 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
293 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
294 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
295 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
296          <jvmarg line="@{jvmflags}"/>
297          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
298          <jvmarg line="${vmoptions}" if:set="vmoptions"/>
# Line 291 | Line 314
314    </macrodef>
315  
316    <!-- Define jtreg test sets for different jdk versions -->
317 <  <fileset dir="${jtreg9.src.dir}">
318 <    <patternset id="jdk9.jtreg.tests">
319 <      <include name="**/*.java"/>
320 <    </patternset>
321 <  </fileset>
322 <
323 <  <fileset dir="${jtreg8.src.dir}">
324 <    <patternset id="jdk8.jtreg.tests">
325 <      <include name="**/*.java"/>
326 <    </patternset>
327 <  </fileset>
317 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
318 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
319 >  <property name="jtreg.test.pattern" value="**/*.java"/>
320 >  <macrodef name="defjtregtests">
321 >    <attribute name="v"/>
322 >    <sequential>
323 >      <fileset dir="${jtreg@{v}.src.dir}">
324 >        <patternset id="jdk@{v}.jtreg.tests">
325 >          <include name="${jtreg.test.pattern}"/>
326 >        </patternset>
327 >      </fileset>
328 >    </sequential>
329 >  </macrodef>
330  
331 <  <fileset dir="${jtreg7.src.dir}">
332 <    <patternset id="jdk7.jtreg.tests">
333 <      <include name="**/*.java"/>
334 <    </patternset>
335 <  </fileset>
331 >  <defjtregtests v="12"/>
332 >  <defjtregtests v="11"/>
333 >  <defjtregtests v="10"/>
334 >  <defjtregtests v="9"/>
335 >  <defjtregtests v="8"/>
336 >  <defjtregtests v="7"/>
337  
338    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
339    <property name="jtreg.flags" value=""/>
340  
341    <macrodef name="run-jtreg-tests">
342      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
317    <attribute name="source" default="7"/>
343      <attribute name="target"/>
344      <attribute name="workdir"/>
345      <attribute name="classes"/>
346 +    <attribute name="verbose" default="${jtreg.verbose}"/>
347      <attribute name="jtregflags" default=""/>
348 +    <element name="jtreg-elements" optional="true"/>
349  
350      <sequential>
351  
# Line 327 | Line 354
354  
355      <local name="modules"/>
356      <condition property="modules">
357 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
357 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
358      </condition>
359  
360      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 336 | Line 363
363             workDir="@{workdir}/JTwork">
364        <patternset refid="jdk@{target}.jtreg.tests"/>
365        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
366 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
367 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
366 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
367 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
368        <arg value="-agentvm"/>
369        <arg value="-noreport"/>
370 <      <arg value="-verbose:${jtreg.verbose}"/>
370 >      <arg value="-verbose:@{verbose}"/>
371        <arg value="-vmoptions:-esa -ea"/>
372        <arg value="-automatic"/>
373        <arg value="-k:!ignore"/>
374        <arg line="@{jtregflags}"/>
375        <arg line="${jtreg.flags}"/>
376 +      <jtreg-elements/>
377      </jtreg>
378      </sequential>
379    </macrodef>
# Line 361 | Line 389
389  
390    <!-- Main targets -->
391  
392 <  <property name="build.main.java.version" value="9"/>
393 <  <property name="build.main.javac" value="${javac9}"/>
392 >  <property name="build.main.java.version" value="11"/>
393 >  <!-- Workaround "no nested properties in ant" -->
394 >  <macrodef name="define-build-main-properties">
395 >    <attribute name="v"/>
396 >    <sequential>
397 >      <property name="build.main.java"    value="${java@{v}}"/>
398 >      <property name="build.main.javac"   value="${javac@{v}}"/>
399 >      <!-- Force javadoc version to be at least 10,
400 >           so we can use override-methods=summary -->
401 >      <condition property="build.main.javadoc"
402 >                 value="${javadoc11}"
403 >                 else="${javadoc@{v}}">
404 >        <equals arg1="@{v}" arg2="9"/>
405 >      </condition>
406 >    </sequential>
407 >  </macrodef>
408 >  <define-build-main-properties v="${build.main.java.version}"/>
409  
410    <target name="dists"
411 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
411 >          depends="dist, 4jdk8dist"
412            description="Builds all public jars and docs"/>
413 +          <!--
414 +              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
415 +          -->
416  
417    <target name="compile"
418            depends="configure-compiler"
419            description="Compiles src/main sources to build dir">
420  
375    <local name="modules"/>
376    <condition property="modules">
377      <and>
378        <available file="${jdk9.home}/jmods" type="dir"/>
379        <equals arg1="9" arg2="${build.main.java.version}"/>
380      </and>
381    </condition>
382
421      <local name="destdir"/>
422 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
385 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
422 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
423  
424      <mkdir dir="${destdir}"/>
425  
# Line 399 | Line 436
436             fork="true">
437  
438        <include name="**/*.java"/>
439 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
439 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
440        <compilerarg value="-Xprefer:source"/>
441        <compilerarg value="-XDignore.symbol.file=true"/>
442        <compilerarg value="-Xlint:all"/>
443 +      <compilerarg line="--doclint-format html5"/>
444 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
445        <compilerarg value="-Werror"/>
407      <compilerarg value="-Xdoclint:all/protected"/>
446        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
447        <compilerarg line="${build.args}"/>
448  
# Line 443 | Line 481
481   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
482      <javadoc destdir="${docs.dir}"
483               packagenames="none"
484 <             link="${java9.api.url}"
484 >             link="${java10.api.url}"
485               overview="${src.dir}/intro.html"
486               access="${build.javadoc.access}"
487               sourcepath="${src.dir}"
488               classpath=""
489 <             executable="${javadoc9}">
489 >             source="11"
490 >             executable="${build.main.javadoc}">
491        <fileset dir="${src.dir}" defaultexcludes="yes">
492          <include name="**/*.java"/>
493        </fileset>
494 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
494 >      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
495        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
496        <arg value="-XDignore.symbol.file=true"/>
497 <      <arg value="-Xmodule:java.base"/>
498 <      <arg value="-tag"/>
499 <      <arg value="${javadoc.jls.option}"/>
500 < <!-- @apiNote currently unused -->
501 < <!--       <arg value="-tag"/> -->
502 < <!--       <arg value="apiNote:a:API Note:"/> -->
503 <      <arg value="-tag"/>
465 <      <arg value="implSpec:a:Implementation Requirements:"/>
466 <      <arg value="-tag"/>
467 <      <arg value="implNote:a:Implementation Note:"/>
497 >      <arg value="-html5"/>
498 >      <arg value="--patch-module=java.base=${src.dir}"/>
499 >      <arg value="--override-methods=summary"/>
500 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
501 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
502 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
503 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
504   <!-- tags added in jdk9: currently unused -->
505 < <!--       <arg value="-tag"/> -->
506 < <!--       <arg value="revised:X"/> -->
471 < <!--       <arg value="-tag"/> -->
472 < <!--       <arg value="spec:X"/> -->
505 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
506 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
507      </javadoc>
508    </target>
509  
# Line 503 | Line 537
537  
538    <target name="clean"
539            description="Removes all build products">
506
540      <delete dir="${build.dir}"/>
508
541    </target>
542  
543  
544    <target name="dist-clean"
545            description="Removes all build and distribution products">
514
546      <delete dir="${build.dir}"/>
547      <delete dir="${dist.dir}"/>
517
548    </target>
549  
550  
# Line 535 | Line 565
565      <run-tck-tests
566        target="${build.main.java.version}"
567        workdir="${build.dir}"
568 <      classes="${product.jar}"/>
568 >      classes="${product.jar}">
569 >      <javac-elements>
570 >        <compilerarg value="-Werror"/>
571 >      </javac-elements>
572 >    </run-tck-tests>
573    </target>
574  
575    <target name="tck-parallelism-1"
# Line 570 | Line 604
604  
605    <target name="test"
606            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
607 <          description="Runs tck and jtreg tests for src/main">
574 <  </target>
607 >          description="Runs tck and jtreg tests for src/main"/>
608  
609   <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
610  
# Line 582 | Line 615
615  
616   <!--   </target> -->
617  
618 < <!--   <target name="test89" -->
619 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
618 >  <target name="test9101112"
619 >          description="Runs tck and jtreg tests for src/main for multiple java versions">
620  
621 < <!--     <antcall target="clean"/> -->
622 < <!--     <antcall target="test"> -->
623 < <!--       <param name="build.main.java.version" value="8"/> -->
624 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
625 < <!--     </antcall> -->
621 >    <antcall target="clean"/>
622 >    <antcall target="test">
623 >      <param name="build.main.java.version" value="9"/>
624 >      <param name="build.main.java" value="${java9}"/>
625 >      <param name="build.main.javac" value="${javac9}"/>
626 >    </antcall>
627  
628 < <!--     <antcall target="clean"/> -->
629 < <!--     <antcall target="test"> -->
630 < <!--       <param name="build.main.java.version" value="9"/> -->
631 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
632 < <!--     </antcall> -->
628 >    <antcall target="clean"/>
629 >    <antcall target="test">
630 >      <param name="build.main.java.version" value="10"/>
631 >      <param name="build.main.java" value="${java10}"/>
632 >      <param name="build.main.javac" value="${javac10}"/>
633 >    </antcall>
634  
635 < <!--   </target> -->
635 >    <antcall target="clean"/>
636 >    <antcall target="test">
637 >      <param name="build.main.java.version" value="11"/>
638 >      <param name="build.main.java" value="${java11}"/>
639 >      <param name="build.main.javac" value="${javac11}"/>
640 >    </antcall>
641 >
642 >    <antcall target="clean"/>
643 >    <antcall target="test">
644 >      <param name="build.main.java.version" value="12"/>
645 >      <param name="build.main.java" value="${java12}"/>
646 >      <param name="build.main.javac" value="${javac12}"/>
647 >    </antcall>
648 >    <antcall target="docs">
649 >      <param name="build.main.java.version" value="12"/>
650 >      <param name="build.main.java" value="${java12}"/>
651 >      <param name="build.main.javac" value="${javac12}"/>
652 >      <param name="build.main.javadoc" value="${javadoc12}"/>
653 >    </antcall>
654 >
655 >    <!-- Clean up to avoid obscure wrong class file version bugs -->
656 >    <antcall target="clean"/>
657 >
658 >  </target>
659  
660  
661  
662    <target name="configure-compiler">
663      <fail message="ant version too old">
664 <      <condition>
607 <        <not> <antversion atleast="1.9.1"/> </not>
608 <      </condition>
664 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
665      </fail>
666  
667      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 651 | Line 707
707      <java classname="ALoops" fork="true">
708        <classpath refid="loops.classpath"/>
709      </java>
654
710    </target>
711  
712  
713    <target name="compile-test-loops" depends="jar"
714 <          description="compile all the perf tests in src/test/loops">
714 >          description="Compiles all the perf tests in src/test/loops">
715  
716      <mkdir dir="${build.dir}/test/loops"/>
717  
# Line 668 | 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 676 | Line 731
731        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
732        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
733        <compilerarg line="${build.args}"/>
679
734      </javac>
681
735    </target>
736  
737  
# Line 704 | Line 757
757             encoding="ASCII"
758             executable="${javac8}"
759             fork="true">
707
760        <include name="**/*.java"/>
761        <compilerarg value="-Xprefer:source"/>
762        <compilerarg value="-XDignore.symbol.file=true"/>
763        <compilerarg value="-Xlint:all"/>
764        <compilerarg value="-Werror"/>
765        <compilerarg line="${build.args}"/>
714
766      </javac>
767    </target>
768  
# Line 735 | Line 786
786             encoding="ASCII"
787             executable="${javac8}"
788             fork="true">
738
789        <include name="**/*.java"/>
790        <compilerarg value="-Xprefer:source"/>
791        <compilerarg value="-XDignore.symbol.file=true"/>
792        <compilerarg value="-Xlint:all"/>
793 <      <compilerarg value="-Xdoclint:all/protected"/>
793 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
794        <compilerarg line="${build.args}"/>
745
795      </javac>
796    </target>
797  
# Line 758 | Line 807
807          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
808        </manifest>
809      </jar>
761
810    </target>
811  
812  
# Line 774 | Line 822
822          <!-- JDK9+ test classes -->
823          <exclude name="*9Test.java"/>
824          <exclude name="*10Test.java"/>
825 +        <compilerarg value="-Werror"/>
826        </javac-elements>
827      </run-tck-tests>
828    </target>
# Line 791 | Line 840
840  
841    <target name="4jdk8-test"
842            depends="4jdk8-tck, 4jdk8-jtreg"
843 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
795 <  </target>
843 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
844  
845  
846    <target name="4jdk8docs"
# Line 808 | Line 856
856               access="${build.javadoc.access}"
857               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
858               classpath=""
859 +             source="8"
860               executable="${javadoc8}"
861               failonerror = "true">
862        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 815 | 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;"/> -->
823 <      <arg value="-tag"/>
824 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
825 <      <arg value="-tag"/>
826 <      <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 835 | Line 880
880  
881    <target name="4jdk8clean"
882            description="Removes all 4jdk8 build products">
838
883      <delete dir="${build.4jdk8.dir}"/>
840
884    </target>
885  
886  
# Line 853 | Line 896
896    </target>
897  
898  
899 +  <!-- jsr166 4jdk7 (no longer maintained) -->
900  
901 <  <!-- jsr166 4jdk7 -->
858 <
859 <  <target name="4jdk7compile"
860 <          depends="configure-compiler"
861 <          description="Compiles src/jdk7 sources, targeting jdk7">
862 <
901 >  <target name="4jdk7compile" depends="configure-compiler">
902      <mkdir dir="${build.4jdk7.classes.dir}"/>
903  
904      <javac srcdir="${4jdk7src.dir}"
# Line 883 | Line 922
922        <compilerarg value="-Xlint:all"/>
923        <compilerarg value="-Werror"/>
924        <compilerarg line="${build.args}"/>
886
925      </javac>
926    </target>
927  
928 <  <target name="4jdk7doclint"
891 <          depends="configure-compiler"
892 <          description="Finds doclint warnings">
893 <
928 >  <target name="4jdk7doclint" depends="configure-compiler">
929      <mkdir dir="${build.4jdk7.classes.dir}"/>
930  
931      <javac srcdir="${4jdk7src.dir}"
# Line 914 | Line 949
949        <compilerarg value="-Xlint:all"/>
950        <compilerarg value="-Xdoclint:all/protected"/>
951        <compilerarg line="${build.args}"/>
917
952      </javac>
953    </target>
954  
955 <
922 <  <target name="4jdk7jar"
923 <          depends="4jdk7compile"
924 <          description="Builds library jar from compiled sources">
925 <
955 >  <target name="4jdk7jar" depends="4jdk7compile">
956      <jar destfile="${4jdk7product.jar}">
957        <fileset dir="${build.4jdk7.classes.dir}"/>
958        <manifest>
# Line 930 | Line 960
960          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
961        </manifest>
962      </jar>
933
963    </target>
964  
965 <
937 <  <target name="4jdk7-tck"
938 <          depends="4jdk7jar"
939 <          description="Runs tck tests for jsr166-4jdk7 directly">
940 <
965 >  <target name="4jdk7-tck" depends="4jdk7jar">
966      <run-tck-tests
967        target="7"
968        workdir="${build.4jdk7.dir}"
# Line 955 | Line 980
980          <exclude name="SplittableRandomTest.java"/>
981          <exclude name="StampedLockTest.java"/>
982          <exclude name="SubmissionPublisherTest.java"/>
983 +        <compilerarg value="-Werror"/>
984        </javac-elements>
985      </run-tck-tests>
986    </target>
987  
962
988    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
989 <  <target name="4jdk7-tck-junit"
965 <          depends="4jdk7compile">
989 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
990  
991      <junit printsummary="true"
992             showoutput="true"
# Line 984 | Line 1008
1008  
1009        <test name="${jsr166.tckTestClass}" haltonfailure="no">
1010        </test>
987
1011      </junit>
1012    </target>
1013  
1014 <  <target name="4jdk7-jtreg"
992 <          depends="4jdk7jar"
993 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
1014 >  <target name="4jdk7-jtreg" depends="4jdk7jar">
1015      <run-jtreg-tests
1016         target="7"
1017         workdir="${build.4jdk7.dir}"
1018         classes="${4jdk7product.jar}"/>
1019    </target>
1020  
1021 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1022  
1023 <  <target name="4jdk7-test"
1002 <          depends="4jdk7-tck, 4jdk7-jtreg"
1003 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
1004 <  </target>
1005 <
1006 <
1007 <  <target name="4jdk7docs"
1008 <          description="Builds javadocs for src/jdk7 to dist dir">
1009 <
1023 >  <target name="4jdk7docs">
1024      <delete dir="${4jdk7docs.dir}"/>
1025      <mkdir dir="${4jdk7docs.dir}"/>
1026  
# Line 1027 | Line 1041
1041      </javadoc>
1042    </target>
1043  
1044 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1045  
1046 <  <target name="4jdk7dist"
1032 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1033 <          description="Puts all distributable products in single hierarchy"/>
1034 <
1035 <
1036 <  <target name="4jdk7clean"
1037 <          description="Removes all 4jdk7 build products">
1038 <
1046 >  <target name="4jdk7clean">
1047      <delete dir="${build.4jdk7.dir}"/>
1040
1048    </target>
1049  
1050 <
1044 <  <target name="4jdk7dist-jar"
1045 <          depends="4jdk7clean, 4jdk7jar">
1050 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1051      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1052    </target>
1053  
1054 <
1050 <  <target name="4jdk7dist-docs"
1051 <          depends="4jdk7clean, 4jdk7docs">
1054 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1055      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1056    </target>
1057  
1058  
1059 <  <!-- jsr166x -->
1057 <
1058 <  <target name="jsr166xcompile"
1059 <          depends="configure-compiler"
1060 <          description="Compiles jsr166x sources to build dir">
1059 >  <!-- jsr166x (no longer maintained) -->
1060  
1061 +  <target name="jsr166xcompile" depends="configure-compiler">
1062      <mkdir dir="${build.jsr166x.classes.dir}"/>
1063  
1064      <javac srcdir="${topsrc.dir}"
# Line 1075 | Line 1075
1075             encoding="ASCII"
1076             executable="${javac7}"
1077             fork="true">
1078
1078        <include name="jsr166x/**/*.java"/>
1079        <compilerarg value="-XDignore.symbol.file=true"/>
1080        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1081        <compilerarg value="-Werror"/>
1082        <compilerarg line="${build.args}"/>
1084
1083      </javac>
1084    </target>
1085  
1086 <
1089 <  <target name="jsr166xjar"
1090 <          depends="jsr166xcompile"
1091 <          description="Builds library jar from compiled sources">
1092 <
1086 >  <target name="jsr166xjar" depends="jsr166xcompile">
1087      <jar destfile="${jsr166x.jar}">
1088        <fileset dir="${build.jsr166x.classes.dir}"/>
1089        <manifest>
# Line 1097 | Line 1091
1091          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1092        </manifest>
1093      </jar>
1100
1094    </target>
1095  
1096 <
1104 <  <target name="jsr166xdocs"
1105 <          description="Builds javadocs to dist dir">
1106 <
1096 >  <target name="jsr166xdocs">
1097      <delete dir="${jsr166xdocs.dir}"/>
1098      <mkdir dir="${jsr166xdocs.dir}"/>
1099  
# Line 1118 | Line 1108
1108               failonerror = "true">
1109        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1110        <arg value="-XDignore.symbol.file=true"/>
1121
1111      </javadoc>
1112    </target>
1113  
1114 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1115  
1116 <  <target name="jsr166xdist"
1127 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1128 <          description="Puts all distributable products in single hierarchy"/>
1129 <
1130 <
1131 <  <target name="jsr166xclean"
1132 <          description="Removes all jsr166x build products">
1133 <
1116 >  <target name="jsr166xclean">
1117      <delete dir="${build.jsr166x.dir}"/>
1135
1118    </target>
1119  
1120 <
1139 <  <target name="jsr166xdist-jar"
1140 <          depends="jsr166xclean, jsr166xjar">
1120 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1121      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1122    </target>
1123  
1124 <  <target name="jsr166xdist-docs"
1145 <          depends="jsr166xclean, jsr166xdocs">
1124 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1125      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1126    </target>
1127  
1149  <!-- jsr166y -->
1128  
1129 +  <!-- jsr166y (no longer maintained) -->
1130  
1131 <  <target name="jsr166ycompile"
1153 <          depends="configure-compiler"
1154 <          description="Compiles jsr166y sources">
1155 <
1131 >  <target name="jsr166ycompile" depends="configure-compiler">
1132      <mkdir dir="${build.jsr166y.classes.dir}"/>
1133  
1134      <javac srcdir="${topsrc.dir}"
# Line 1175 | Line 1151
1151        <compilerarg value="-Xlint:all"/>
1152        <compilerarg value="-Werror"/>
1153        <compilerarg line="${build.args}"/>
1178
1154      </javac>
1155    </target>
1156  
1157 <
1183 <  <target name="jsr166yjar"
1184 <          depends="jsr166ycompile"
1185 <          description="Builds library jar from compiled sources">
1186 <
1157 >  <target name="jsr166yjar" depends="jsr166ycompile">
1158      <jar destfile="${jsr166y.jar}" index="true">
1159        <fileset dir="${build.jsr166y.classes.dir}"/>
1160        <manifest>
# Line 1191 | Line 1162
1162          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1163        </manifest>
1164      </jar>
1194
1165    </target>
1166  
1167 <
1198 <  <target name="jsr166ydocs"
1199 <          description="Builds javadocs to dist dir">
1200 <
1167 >  <target name="jsr166ydocs">
1168      <delete dir="${jsr166ydocs.dir}"/>
1169      <mkdir dir="${jsr166ydocs.dir}"/>
1170  
# Line 1212 | Line 1179
1179               failonerror = "true">
1180        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1181        <arg value="-XDignore.symbol.file=true"/>
1215
1182      </javadoc>
1183    </target>
1184  
1185 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1186  
1187 <  <target name="jsr166ydist"
1221 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1222 <          description="Puts all distributable products in single hierarchy"/>
1223 <
1224 <
1225 <  <target name="jsr166yclean"
1226 <          description="Removes all jsr166y build products">
1227 <
1187 >  <target name="jsr166yclean">
1188      <delete dir="${build.jsr166y.dir}"/>
1229
1189    </target>
1190  
1191 <
1233 <  <target name="jsr166ydist-jar"
1234 <          depends="jsr166yclean, jsr166yjar">
1191 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1192      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1193    </target>
1194  
1195 <  <target name="jsr166ydist-docs"
1239 <          depends="jsr166yclean, jsr166ydocs">
1195 >  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1196      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1197    </target>
1198  
1199  
1200 <  <!-- extra166y -->
1245 <
1246 <
1247 <  <target name="extra166ycompile"
1248 <          depends="configure-compiler, jsr166yjar"
1249 <          description="Compiles extra166y sources">
1200 >  <!-- extra166y (no longer maintained) -->
1201  
1202 +  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1203      <mkdir dir="${build.extra166y.classes.dir}"/>
1204  
1205      <javac srcdir="${topsrc.dir}"
# Line 1270 | Line 1222
1222        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1223        <compilerarg value="-Werror"/>
1224        <compilerarg line="${build.args}"/>
1273
1225      </javac>
1226    </target>
1227  
1228 <
1278 <  <target name="extra166yjar"
1279 <          depends="extra166ycompile"
1280 <          description="Builds library jar from compiled sources">
1281 <
1228 >  <target name="extra166yjar" depends="extra166ycompile">
1229      <jar destfile="${extra166y.jar}" index="true">
1230        <fileset dir="${build.extra166y.classes.dir}"/>
1231        <manifest>
# Line 1286 | Line 1233
1233          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1234        </manifest>
1235      </jar>
1289
1236    </target>
1237  
1238 <
1293 <  <target name="extra166ydocs"
1294 <          description="Builds javadocs to build dir">
1295 <
1238 >  <target name="extra166ydocs">
1239      <delete dir="${extra166ydocs.dir}"/>
1240      <mkdir dir="${extra166ydocs.dir}"/>
1241  
# Line 1306 | Line 1249
1249               executable="${javadoc7}">
1250        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1251        <arg value="-XDignore.symbol.file=true"/>
1309
1252      </javadoc>
1253    </target>
1254  
1255 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1256  
1257 <  <target name="extra166ydist"
1315 <          depends="extra166ydist-jar, extra166ydist-docs"
1316 <          description="Puts all distributable products in single hierarchy"/>
1317 <
1318 <
1319 <  <target name="extra166yclean"
1320 <          description="Removes all extra166y build products">
1321 <
1257 >  <target name="extra166yclean">
1258      <delete dir="${build.extra166y.dir}"/>
1323
1259    </target>
1260  
1261 <
1327 <  <target name="extra166ydist-jar"
1328 <          depends="extra166yclean, extra166yjar">
1261 >  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1262      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1263    </target>
1264  
1265 <  <target name="extra166ydist-docs"
1333 <          depends="extra166yclean, extra166ydocs">
1265 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1266      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1267    </target>
1268  
1269 <  <!-- jsr166e -->
1269 >
1270 >  <!-- jsr166e (no longer maintained) -->
1271  
1272    <property name="build.jsr166e.java.version" value="6"/>
1273    <property name="build.jsr166e.javac" value="${javac6}"/>
1274  
1275 <  <target name="jsr166ecompile"
1343 <          depends="configure-compiler"
1344 <          description="Compiles jsr166e sources">
1345 <
1275 >  <target name="jsr166ecompile" depends="configure-compiler">
1276      <mkdir dir="${build.jsr166e.classes.dir}"/>
1277  
1278      <javac srcdir="${topsrc.dir}"
# Line 1363 | Line 1293
1293        <compilerarg value="-Xlint:all"/>
1294        <compilerarg value="-Werror"/>
1295        <compilerarg line="${build.args}"/>
1366
1296      </javac>
1297    </target>
1298  
1370  <!-- jsr166e: find doclint errors -->
1299    <target name="jsr166edoclint">
1372
1300      <mkdir dir="${build.jsr166e.classes.dir}"/>
1301  
1302      <javac srcdir="${topsrc.dir}"
# Line 1391 | Line 1318
1318        <compilerarg value="-Xlint:all"/>
1319        <compilerarg value="-Werror"/>
1320        <compilerarg value="-Xdoclint:all/protected"/>
1394
1321      </javac>
1322    </target>
1323  
1324 <
1399 <  <target name="jsr166ejar"
1400 <          depends="jsr166ecompile"
1401 <          description="Builds library jar from compiled sources">
1402 <
1324 >  <target name="jsr166ejar" depends="jsr166ecompile">
1325      <jar destfile="${jsr166e.jar}" index="true">
1326        <fileset dir="${build.jsr166e.classes.dir}"/>
1327        <manifest>
# Line 1407 | Line 1329
1329          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1330        </manifest>
1331      </jar>
1410
1332    </target>
1333  
1334 <
1414 <  <target name="jsr166edocs"
1415 <          description="Builds javadocs to build dir">
1416 <
1334 >  <target name="jsr166edocs">
1335      <delete dir="${jsr166edocs.dir}"/>
1336      <mkdir dir="${jsr166edocs.dir}"/>
1337  
# Line 1427 | Line 1345
1345               failonerror = "true">
1346        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1347        <arg value="-XDignore.symbol.file=true"/>
1430
1348      </javadoc>
1349    </target>
1350  
1351 <
1435 <  <target name="jsr166e-tck-one-java-version"
1436 <          depends="jsr166ejar">
1437 <
1351 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1352      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1439
1353      <run-tck-tests
1354        tck.src.dir="${test.src.dir}/tck-jsr166e"
1355        target="${build.jsr166e.java.version}"
# Line 1444 | Line 1357
1357        classes="${jsr166e.jar}"/>
1358    </target>
1359  
1360 <  <target name="jsr166e-tck"
1448 <          description="Runs tck tests for jsr166e for multiple java versions">
1360 >  <target name="jsr166e-tck">
1361  
1362   <!--     <antcall target="clean"/> -->
1363   <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1466 | Line 1378
1378      </antcall>
1379    </target>
1380  
1381 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1382  
1383 <  <target name="jsr166e-test"
1471 <          depends="jsr166e-tck"
1472 <          description="Runs all tests for jsr166e">
1473 <  </target>
1474 <
1475 <  <target name="jsr166edist"
1476 <          depends="jsr166edist-jar, jsr166edist-docs"
1477 <          description="Puts all distributable products in single hierarchy"/>
1478 <
1383 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1384  
1385 <  <target name="jsr166eclean"
1481 <          description="Removes all jsr166e build products">
1385 >  <target name="jsr166eclean">
1386      <delete dir="${build.jsr166e.dir}"/>
1387    </target>
1388  
1485
1389    <target name="jsr166edist-jar"
1390            depends="jsr166eclean, jsr166ejar">
1391      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1392    </target>
1393  
1394 <  <target name="jsr166edist-docs"
1492 <          depends="jsr166eclean, jsr166edocs">
1394 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1395      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1396    </target>
1397  
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>
1412    </target>
1413  
1414 +
1415 + <!-- ==============================================================
1416 +  Experimental errorprone support - https://errorprone.info
1417 + =================================================================== -->
1418 +  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1419 +  <property name="errorprone.jsr166.user.flags" value=""/>
1420 +  <property name="errorprone.jsr166.flags"
1421 +            value="-Xep:HashtableContains:OFF
1422 +                   -Xep:JdkObsolete:OFF
1423 +                   -Xep:MissingOverride:OFF
1424 +                   -Xep:MissingFail:OFF
1425 +                   -Xep:MixedArrayDimensions:ERROR
1426 +                   -Xep:RemoveUnusedImports:ERROR
1427 +                   -Xep:EmptyIf:ERROR
1428 +                   -Xep:MultipleTopLevelClasses:ERROR
1429 +                   -Xep:ClassName:ERROR
1430 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1431 +                   -Xep:RedundantThrows:ERROR
1432 +                   -Xep:IdentityBinaryExpression:WARN
1433 +                   -Xep:MethodCanBeStatic:WARN
1434 +                   ${errorprone.jsr166.user.flags}"/>
1435 +  <!-- -Xep:WildcardImport:ERROR -->
1436 +  <property name="errorprone.jsr166.test.flags"
1437 +            value="-Xep:StringSplitter:OFF
1438 +                   -Xep:BoxedPrimitiveConstructor:OFF
1439 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1440 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1441 +  <target name="errorprone"
1442 +          depends="clean, configure-compiler"
1443 +          description="Run errorprone over jsr166 source code (experimental)">
1444 +
1445 +    <local name="destdir"/>
1446 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1447 +    <mkdir dir="${destdir}"/>
1448 +
1449 +    <javac srcdir="${src.dir}"
1450 +           destdir="${destdir}"
1451 +           debug="${build.debug}"
1452 +           debuglevel="${build.debuglevel}"
1453 +           deprecation="${build.deprecation}"
1454 +           classpath=""
1455 +           includeAntRuntime="false"
1456 +           includeJavaRuntime="false"
1457 +           encoding="ASCII"
1458 +           executable="${build.main.javac}"
1459 +           fork="true">
1460 +
1461 +      <include name="**/*.java"/>
1462 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1463 +      <compilerarg value="-J--illegal-access=permit"/>
1464 +      <compilerarg value="-XDcompilePolicy=simple"/>
1465 +      <compilerarg line="-processorpath ${errorprone.jar}"/>
1466 +      <compilerarg value="-Xplugin:ErrorProne
1467 +                          ${errorprone.jsr166.flags}"/>
1468 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1469 +      <compilerarg value="-Xprefer:source"/>
1470 +      <compilerarg value="-XDignore.symbol.file=true"/>
1471 +      <compilerarg value="-Xlint:all"/>
1472 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1473 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1474 +      <compilerarg line="${build.args}"/>
1475 +    </javac>
1476 +
1477 +    <jar destfile="${product.jar}">
1478 +      <fileset dir="${destdir}"/>
1479 +    </jar>
1480 +
1481 +    <run-tck-tests
1482 +      target="${build.main.java.version}"
1483 +      workdir="${build.dir}"
1484 +      classes="${product.jar}">
1485 +      <javac-elements>
1486 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1487 +        <compilerarg value="-J--illegal-access=permit"/>
1488 +        <compilerarg value="-XDcompilePolicy=simple"/>
1489 +        <compilerarg line="-processorpath ${errorprone.jar}"/>
1490 +        <compilerarg value="-Xplugin:ErrorProne
1491 +                            ${errorprone.jsr166.flags}
1492 +                            ${errorprone.jsr166.test.flags}"/>
1493 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1494 +      </javac-elements>
1495 +    </run-tck-tests>
1496 +  </target>
1497 +
1498 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1499 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1500 +  <target name="errorprone-jtreg"
1501 +          depends="jar"
1502 +          description="Run errorprone over jtreg tests (experimental)">
1503 +
1504 +    <run-jtreg-tests
1505 +       target="${build.main.java.version}"
1506 +       workdir="${build.dir}"
1507 +       classes="${product.jar}"
1508 +       verbose="all">
1509 +      <jtreg-elements>
1510 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1511 +        <arg value="-javacoption:-processorpath"/>
1512 +        <arg value="-javacoption:${errorprone.jar}"/>
1513 +        <arg value="-javacoption:-Xplugin:ErrorProne
1514 +                            ${errorprone.jsr166.flags}
1515 +                            ${errorprone.jsr166.test.flags}
1516 +                            -Xep:MultipleTopLevelClasses:WARN
1517 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1518 +      </jtreg-elements>
1519 +    </run-jtreg-tests>
1520 +  </target>
1521 +
1522 +
1523   <!-- ==============================================================
1524    Running guava tests against jsr166 code
1525   =================================================================== -->
# Line 1561 | Line 1572
1572      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1573           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1574      <junit printsummary="true" showoutput="true" haltonfailure="true"
1575 <           jvm="${java9}" fork="true">
1576 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1575 >           jvm="${build.main.java}" fork="true">
1576 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1577        <formatter type="brief"/>
1578        <classpath>
1579          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines