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.207 by jsr166, Mon Mar 28 04:00:09 2016 UTC vs.
Revision 1.263 by jsr166, Tue Jan 23 06:09: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" xmlns:unless="ant:unless"
3 >  xmlns:ivy="antlib:org.apache.ivy.ant">
4  
5    <description>
6   ------------------------------------------------------------------------------
# Line 17 | Line 18
18    itself.  Because the JDK version matters and because different
19    targets require different JDKs, we assume that users have created a
20    hierarchy containing:
20  $HOME/jdk/jdk6
21  $HOME/jdk/jdk7
21    $HOME/jdk/jdk8
22    $HOME/jdk/jdk9
23 +  $HOME/jdk/jdk10
24 +  $HOME/jdk/jdk11
25    where each of the above is a JDK or a symlink to same, and
25  $HOME/jdk/src/jdk6
26  $HOME/jdk/src/jdk7
26    $HOME/jdk/src/jdk8
27    $HOME/jdk/src/jdk9
28 +  $HOME/jdk/src/jdk10
29 +  $HOME/jdk/src/jdk11
30    where each of the above is a complete JDK source tree
31    (e.g. mercurial forest) or a symlink to same.
32  
33    Alternatively, define ant variables thus:
34    ant -Djdk$N.home=... -Djdk$N.src.home=...
35 <  for $N in 6 7 8 9 ...
35 >  for $N in 8 9 10 ...
36  
37 <  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37 <  target is currently broken.
37 >  As of 2016-03, the sources in src/main are for jdk9+ only.
38   ------------------------------------------------------------------------------
39    </description>
40  
41 <  <!-- Display main targets by running 'ant -projecthelp' -->
41 >  <!-- Run 'ant -projecthelp' (default target) -->
42    <target name="usage">
43      <java classname="org.apache.tools.ant.Main">
44        <arg value="-projecthelp" />
# Line 63 | Line 63
63    <property name="build.classes.dir"           location="${build.dir}/classes"/>
64    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
65    <property name="build.loops.dir"             location="${build.dir}/loops"/>
66  <property name="build.reports.dir"           location="${build.dir}/reports"/>
66  
67    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
# Line 134 | Line 133
133    <defjdklocations v="7"/>
134    <defjdklocations v="8"/>
135    <defjdklocations v="9"/>
136 +  <defjdklocations v="10"/>
137 +  <defjdklocations v="11"/>
138  
139    <!-- Source locations -->
140    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 143 | Line 144
144    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
145    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
146    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
147 +  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
148 +  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
149    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
150    <property name="lib.dir"              location="${basedir}/lib"/>
151    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 182 | Line 185
185    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
186  
187    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
188 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
189 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
190 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
191 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
192 <  <!-- The expected canonical location does not yet exist as of 2016-03 -->
193 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
194 <  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
188 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
189 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
190 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
191 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
192 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
193 >  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
194 >  <!-- The location of jdk9 early access docs (RIP) -->
195 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
196    <!-- Default jdk doc location (latest stable release seems best) -->
197 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
197 >  <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
198 >  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
199 >  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
200  
201    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
202    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 198 | Line 204
204    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
205    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
206    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
207 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
208 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
209    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
210  
211    <!-- Define the "jtreg" task -->
# Line 233 | Line 241
241        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
242      </condition>
243  
244 +    <local name="use-doclint"/>
245 +    <condition property="use-doclint">
246 +      <not> <equals arg1="@{target}" arg2="7"/> </not>
247 +    </condition>
248 +
249      <mkdir dir="@{workdir}/tck-classes"/>
250  
251      <javac srcdir="@{tck.src.dir}"
# Line 245 | Line 258
258             classpath="${junit.jar}"
259             includeAntRuntime="false"
260             includeJavaRuntime="false"
261 +           encoding="ASCII"
262             executable="${javac@{compile-target}}"
263             fork="true">
264  
265        <include name="*.java"/>
266        <compilerarg value="-XDignore.symbol.file=true"/>
267        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
268 +      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
269        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
270 <      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
270 >      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
271        <compilerarg line="${build.args}"/>
272        <javac-elements/>
273  
# Line 263 | Line 278
278            jvm="${java@{target}}"
279            fork="true">
280          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
281 <        <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
281 >        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
282 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
283 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
284 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
285 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
286 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
287          <jvmarg line="@{jvmflags}"/>
288 +        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
289 +        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
290  
291 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
291 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
292          <syspropertyset id="system-properties-used-by-tck">
293            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
294            <propertyref prefix="jsr166."/>
# Line 283 | Line 305
305    </macrodef>
306  
307    <!-- Define jtreg test sets for different jdk versions -->
308 +  <fileset dir="${jtreg11.src.dir}">
309 +    <patternset id="jdk11.jtreg.tests">
310 +      <include name="**/*.java"/>
311 +    </patternset>
312 +  </fileset>
313 +
314 +  <fileset dir="${jtreg10.src.dir}">
315 +    <patternset id="jdk10.jtreg.tests">
316 +      <include name="**/*.java"/>
317 +    </patternset>
318 +  </fileset>
319 +
320    <fileset dir="${jtreg9.src.dir}">
321      <patternset id="jdk9.jtreg.tests">
322        <include name="**/*.java"/>
# Line 292 | Line 326
326    <fileset dir="${jtreg8.src.dir}">
327      <patternset id="jdk8.jtreg.tests">
328        <include name="**/*.java"/>
295      <exclude name="**/SpliteratorCharacteristics.java"/>
296      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
297      <exclude name="**/GCDuringIteration.java"/>
329      </patternset>
330    </fileset>
331  
# Line 309 | Line 340
340  
341    <macrodef name="run-jtreg-tests">
342      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
312    <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 326 | Line 358
358      </condition>
359  
360      <delete dir="@{workdir}/JTwork"   quiet="true"/>
329    <delete dir="@{workdir}/JTreport" quiet="true"/>
361      <jtreg dir="${jtreg@{target}.src.dir}"
362             jdk="${jdk@{target}.home}"
363 <           workDir="@{workdir}/JTwork"
333 <           reportDir="@{workdir}/JTreport">
363 >           workDir="@{workdir}/JTwork">
364        <patternset refid="jdk@{target}.jtreg.tests"/>
365        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
366 <      <arg value="-Xpatch:${build.classes.dir}" 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="-verbose:${jtreg.verbose}"/>
369 >      <arg value="-noreport"/>
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 357 | Line 390
390    <!-- Main targets -->
391  
392    <property name="build.main.java.version" value="9"/>
393 <  <property name="build.main.javac" value="${javac9}"/>
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 >      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
400 >    </sequential>
401 >  </macrodef>
402 >  <define-build-main-properties v="${build.main.java.version}"/>
403  
404    <target name="dists"
405 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
405 >          depends="dist, 4jdk8dist"
406            description="Builds all public jars and docs"/>
407 +          <!--
408 +              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
409 +          -->
410  
411    <target name="compile"
412            depends="configure-compiler"
413            description="Compiles src/main sources to build dir">
414  
370    <local name="modules"/>
371    <condition property="modules">
372      <and>
373        <available file="${jdk9.home}/jmods" type="dir"/>
374        <equals arg1="9" arg2="${build.main.java.version}"/>
375      </and>
376    </condition>
377
415      <local name="destdir"/>
416 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
380 <    <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 389 | Line 425
425             classpath=""
426             includeAntRuntime="false"
427             includeJavaRuntime="false"
428 +           encoding="ASCII"
429             executable="${build.main.javac}"
430             fork="true">
431  
432        <include name="**/*.java"/>
433 <      <compilerarg value="-Xmodule:java.base" 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 line="--doclint-format html5"/>
438 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
439        <compilerarg value="-Werror"/>
401      <compilerarg value="-Xdoclint:all/protected"/>
440        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
441        <compilerarg line="${build.args}"/>
442  
# Line 409 | Line 447
447    <target name="jar"
448            depends="compile"
449            description="Builds library jar for src/main from compiled sources">
450 <
450 >    <local name="subdir"/>
451 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
452      <jar destfile="${product.jar}">
453 <      <fileset dir="${build.classes.dir}"/>
453 >      <fileset dir="${build.classes.dir}${subdir}"/>
454        <manifest>
455          <attribute name="Built-By" value="${user.name}"/>
456          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 429 | Line 468
468      <!-- the packagenames="none" hack below prevents scanning the -->
469      <!-- sourcepath for packages -->
470  
471 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
472 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
473 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
474 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
475 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
476      <javadoc destdir="${docs.dir}"
477               packagenames="none"
478               link="${java9.api.url}"
479               overview="${src.dir}/intro.html"
480               access="${build.javadoc.access}"
481 <             sourcepath="${src.dir}:${jdk9.src.dir}"
481 >             sourcepath="${src.dir}"
482               classpath=""
483 <             executable="${javadoc9}">
483 >             source="9"
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}"/>
489        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
490        <arg value="-XDignore.symbol.file=true"/>
491 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
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="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
499 >      <arg value="implSpec:a:Implementation Requirements:"/>
500        <arg value="-tag"/>
501 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
502 <      <arg value="-tag"/>
503 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
504 < <!-- tags added in jdk9 -->
505 <      <arg value="-tag"/>
506 <      <arg value="revised:X"/>
458 <      <arg value="-tag"/>
459 <      <arg value="spec:X"/>
501 >      <arg value="implNote:a:Implementation Note:"/>
502 > <!-- tags added in jdk9: currently unused -->
503 > <!--       <arg value="-tag"/> -->
504 > <!--       <arg value="revised:X"/> -->
505 > <!--       <arg value="-tag"/> -->
506 > <!--       <arg value="spec:X"/> -->
507      </javadoc>
508    </target>
509  
# Line 490 | Line 537
537  
538    <target name="clean"
539            description="Removes all build products">
493
540      <delete dir="${build.dir}"/>
495
541    </target>
542  
543  
544    <target name="dist-clean"
545            description="Removes all build and distribution products">
501
546      <delete dir="${build.dir}"/>
547      <delete dir="${dist.dir}"/>
504
548    </target>
549  
550  
# Line 522 | 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"
576 <          description="Runs tck with given common pool parallelism">
576 >          description="Runs tck with common pool parallelism 1">
577      <antcall target="tck">
578        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
579      </antcall>
580    </target>
581  
582    <target name="tck-parallelism-0"
583 <          description="Runs tck with given common pool parallelism">
583 >          description="Runs tck with common pool parallelism 0">
584      <antcall target="tck">
585        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
586      </antcall>
587    </target>
588  
589 +  <target name="tck-security-manager"
590 +          description="Runs tck with a security manager">
591 +    <antcall target="tck">
592 +      <param name="jsr166.useSecurityManager" value="true"/>
593 +    </antcall>
594 +  </target>
595 +
596    <target name="jtreg"
597            depends="jar"
598            description="Runs jtreg tests for src/main using the jtreg ant task">
# Line 549 | Line 603
603    </target>
604  
605    <target name="test"
606 <          depends="tck, tck-parallelism-1, jtreg"
607 <          description="Runs tck and jtreg tests for src/main">
554 <  </target>
606 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
607 >          description="Runs tck and jtreg tests for src/main"/>
608  
609   <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
610  
# Line 562 | 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="test91011"
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}"/> -->
572 < <!--     </antcall> -->
621 >    <antcall target="clean"/>
622 >    <antcall target="test">
623 >      <param name="build.main.java.version" value="9"/>
624 >    </antcall>
625  
626 < <!--     <antcall target="clean"/> -->
627 < <!--     <antcall target="test"> -->
628 < <!--       <param name="build.main.java.version" value="9"/> -->
629 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
578 < <!--     </antcall> -->
626 >    <antcall target="clean"/>
627 >    <antcall target="test">
628 >      <param name="build.main.java.version" value="10"/>
629 >    </antcall>
630  
631 < <!--   </target> -->
631 >    <antcall target="clean"/>
632 >    <antcall target="test">
633 >      <param name="build.main.java.version" value="11"/>
634 >    </antcall>
635 >
636 >    <!-- Clean up to avoid obscure wrong class file version bugs -->
637 >    <antcall target="clean"/>
638 >
639 >  </target>
640  
641  
642  
643    <target name="configure-compiler">
644      <fail message="ant version too old">
645 <      <condition>
587 <        <not> <antversion atleast="1.9.1"/> </not>
588 <      </condition>
645 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
646      </fail>
647  
648      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 619 | Line 676
676        deprecation="${build.deprecation}"
677             source="${build.sourcelevel}"
678             target="${build.sourcelevel}"
679 +         encoding="ASCII"
680               fork="true">
681  
682        <compilerarg line="${build.args}"/>
# Line 630 | Line 688
688      <java classname="ALoops" fork="true">
689        <classpath refid="loops.classpath"/>
690      </java>
633
691    </target>
692  
693  
694    <target name="compile-test-loops" depends="jar"
695 <          description="compile all the perf tests in src/test/loops">
695 >          description="Compiles all the perf tests in src/test/loops">
696  
697      <mkdir dir="${build.dir}/test/loops"/>
698  
# Line 646 | Line 703
703             deprecation="${build.deprecation}"
704             includeAntRuntime="false"
705             includeJavaRuntime="false"
706 <           executable="${javac9}"
706 >           encoding="ASCII"
707 >           executable="${build.main.javac}"
708             fork="true">
709  
710        <include name="*.java"/>
# Line 654 | Line 712
712        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
713        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
714        <compilerarg line="${build.args}"/>
657
715      </javac>
659
716    </target>
717  
718  
# Line 679 | Line 735
735             bootclasspath="${bootclasspath8}"
736             includeAntRuntime="false"
737             includeJavaRuntime="false"
738 +           encoding="ASCII"
739             executable="${javac8}"
740             fork="true">
684
741        <include name="**/*.java"/>
742        <compilerarg value="-Xprefer:source"/>
743        <compilerarg value="-XDignore.symbol.file=true"/>
744        <compilerarg value="-Xlint:all"/>
745        <compilerarg value="-Werror"/>
746        <compilerarg line="${build.args}"/>
691
747      </javac>
748    </target>
749  
# Line 709 | Line 764
764             bootclasspath="${bootclasspath8}"
765             includeAntRuntime="false"
766             includeJavaRuntime="false"
767 +           encoding="ASCII"
768             executable="${javac8}"
769             fork="true">
714
770        <include name="**/*.java"/>
771        <compilerarg value="-Xprefer:source"/>
772        <compilerarg value="-XDignore.symbol.file=true"/>
773        <compilerarg value="-Xlint:all"/>
774 <      <compilerarg value="-Xdoclint:all/protected"/>
774 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
775        <compilerarg line="${build.args}"/>
721
776      </javac>
777    </target>
778  
# Line 734 | Line 788
788          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
789        </manifest>
790      </jar>
737
791    </target>
792  
793  
# Line 750 | Line 803
803          <!-- JDK9+ test classes -->
804          <exclude name="*9Test.java"/>
805          <exclude name="*10Test.java"/>
806 +        <compilerarg value="-Werror"/>
807        </javac-elements>
808      </run-tck-tests>
809    </target>
# Line 767 | Line 821
821  
822    <target name="4jdk8-test"
823            depends="4jdk8-tck, 4jdk8-jtreg"
824 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
771 <  </target>
824 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
825  
826  
827    <target name="4jdk8docs"
# Line 784 | Line 837
837               access="${build.javadoc.access}"
838               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
839               classpath=""
840 +             source="8"
841               executable="${javadoc8}"
842               failonerror = "true">
843        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 793 | Line 847
847        <arg value="-XDignore.symbol.file=true"/>
848        <arg value="-tag"/>
849        <arg value="${javadoc.jls.option}"/>
850 <      <arg value="-tag"/>
851 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
850 > <!-- @apiNote currently unused -->
851 > <!--       <arg value="-tag"/> -->
852 > <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
853        <arg value="-tag"/>
854        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
855        <arg value="-tag"/>
# Line 810 | Line 865
865  
866    <target name="4jdk8clean"
867            description="Removes all 4jdk8 build products">
813
868      <delete dir="${build.4jdk8.dir}"/>
815
869    </target>
870  
871  
# Line 828 | Line 881
881    </target>
882  
883  
884 +  <!-- jsr166 4jdk7 (no longer maintained) -->
885  
886 <  <!-- jsr166 4jdk7 -->
833 <
834 <  <target name="4jdk7compile"
835 <          depends="configure-compiler"
836 <          description="Compiles src/jdk7 sources, targeting jdk7">
837 <
886 >  <target name="4jdk7compile" depends="configure-compiler">
887      <mkdir dir="${build.4jdk7.classes.dir}"/>
888  
889      <javac srcdir="${4jdk7src.dir}"
# Line 848 | Line 897
897             bootclasspath="${bootclasspath6}"
898             includeAntRuntime="false"
899             includeJavaRuntime="false"
900 +           encoding="ASCII"
901             executable="${javac7}"
902             fork="true">
903  
# Line 857 | Line 907
907        <compilerarg value="-Xlint:all"/>
908        <compilerarg value="-Werror"/>
909        <compilerarg line="${build.args}"/>
860
910      </javac>
911    </target>
912  
913 <  <target name="4jdk7doclint"
865 <          depends="configure-compiler"
866 <          description="Finds doclint warnings">
867 <
913 >  <target name="4jdk7doclint" depends="configure-compiler">
914      <mkdir dir="${build.4jdk7.classes.dir}"/>
915  
916      <javac srcdir="${4jdk7src.dir}"
# Line 878 | Line 924
924             bootclasspath="${bootclasspath6}"
925             includeAntRuntime="false"
926             includeJavaRuntime="false"
927 +           encoding="ASCII"
928             executable="${javac8}"
929             fork="true">
930  
# Line 887 | Line 934
934        <compilerarg value="-Xlint:all"/>
935        <compilerarg value="-Xdoclint:all/protected"/>
936        <compilerarg line="${build.args}"/>
890
937      </javac>
938    </target>
939  
940 <
895 <  <target name="4jdk7jar"
896 <          depends="4jdk7compile"
897 <          description="Builds library jar from compiled sources">
898 <
940 >  <target name="4jdk7jar" depends="4jdk7compile">
941      <jar destfile="${4jdk7product.jar}">
942        <fileset dir="${build.4jdk7.classes.dir}"/>
943        <manifest>
# Line 903 | Line 945
945          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
946        </manifest>
947      </jar>
906
948    </target>
949  
950 <
910 <  <target name="4jdk7-tck"
911 <          depends="4jdk7jar"
912 <          description="Runs tck tests for jsr166-4jdk7 directly">
913 <
950 >  <target name="4jdk7-tck" depends="4jdk7jar">
951      <run-tck-tests
952        target="7"
953        workdir="${build.4jdk7.dir}"
# Line 928 | Line 965
965          <exclude name="SplittableRandomTest.java"/>
966          <exclude name="StampedLockTest.java"/>
967          <exclude name="SubmissionPublisherTest.java"/>
968 +        <compilerarg value="-Werror"/>
969        </javac-elements>
970      </run-tck-tests>
971    </target>
972  
935
973    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
974 <  <target name="4jdk7-tck-junit"
938 <          depends="4jdk7compile">
974 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
975  
976      <junit printsummary="true"
977             showoutput="true"
# Line 957 | Line 993
993  
994        <test name="${jsr166.tckTestClass}" haltonfailure="no">
995        </test>
960
996      </junit>
997    </target>
998  
999 <  <target name="4jdk7-jtreg"
965 <          depends="4jdk7jar"
966 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
999 >  <target name="4jdk7-jtreg" depends="4jdk7jar">
1000      <run-jtreg-tests
1001         target="7"
1002         workdir="${build.4jdk7.dir}"
1003         classes="${4jdk7product.jar}"/>
1004    </target>
1005  
1006 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1007  
1008 <  <target name="4jdk7-test"
975 <          depends="4jdk7-tck, 4jdk7-jtreg"
976 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
977 <  </target>
978 <
979 <
980 <  <target name="4jdk7docs"
981 <          description="Builds javadocs for src/jdk7 to dist dir">
982 <
1008 >  <target name="4jdk7docs">
1009      <delete dir="${4jdk7docs.dir}"/>
1010      <mkdir dir="${4jdk7docs.dir}"/>
1011  
# Line 1000 | Line 1026
1026      </javadoc>
1027    </target>
1028  
1029 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1030  
1031 <  <target name="4jdk7dist"
1005 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1006 <          description="Puts all distributable products in single hierarchy"/>
1007 <
1008 <
1009 <  <target name="4jdk7clean"
1010 <          description="Removes all 4jdk7 build products">
1011 <
1031 >  <target name="4jdk7clean">
1032      <delete dir="${build.4jdk7.dir}"/>
1013
1033    </target>
1034  
1035 <
1017 <  <target name="4jdk7dist-jar"
1018 <          depends="4jdk7clean, 4jdk7jar">
1035 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1036      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1037    </target>
1038  
1039 <
1023 <  <target name="4jdk7dist-docs"
1024 <          depends="4jdk7clean, 4jdk7docs">
1039 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1040      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1041    </target>
1042  
1043  
1044 <  <!-- jsr166x -->
1030 <
1031 <  <target name="jsr166xcompile"
1032 <          depends="configure-compiler"
1033 <          description="Compiles jsr166x sources to build dir">
1044 >  <!-- jsr166x (no longer maintained) -->
1045  
1046 +  <target name="jsr166xcompile" depends="configure-compiler">
1047      <mkdir dir="${build.jsr166x.classes.dir}"/>
1048  
1049      <javac srcdir="${topsrc.dir}"
# Line 1045 | Line 1057
1057             target="5"
1058             includeAntRuntime="false"
1059             includeJavaRuntime="false"
1060 +           encoding="ASCII"
1061             executable="${javac7}"
1062             fork="true">
1050
1063        <include name="jsr166x/**/*.java"/>
1064        <compilerarg value="-XDignore.symbol.file=true"/>
1065        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1066        <compilerarg value="-Werror"/>
1067        <compilerarg line="${build.args}"/>
1056
1068      </javac>
1069    </target>
1070  
1071 <
1061 <  <target name="jsr166xjar"
1062 <          depends="jsr166xcompile"
1063 <          description="Builds library jar from compiled sources">
1064 <
1071 >  <target name="jsr166xjar" depends="jsr166xcompile">
1072      <jar destfile="${jsr166x.jar}">
1073        <fileset dir="${build.jsr166x.classes.dir}"/>
1074        <manifest>
# Line 1069 | Line 1076
1076          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1077        </manifest>
1078      </jar>
1072
1079    </target>
1080  
1081 <
1076 <  <target name="jsr166xdocs"
1077 <          description="Builds javadocs to dist dir">
1078 <
1081 >  <target name="jsr166xdocs">
1082      <delete dir="${jsr166xdocs.dir}"/>
1083      <mkdir dir="${jsr166xdocs.dir}"/>
1084  
# Line 1090 | Line 1093
1093               failonerror = "true">
1094        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1095        <arg value="-XDignore.symbol.file=true"/>
1093
1096      </javadoc>
1097    </target>
1098  
1099 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1100  
1101 <  <target name="jsr166xdist"
1099 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1100 <          description="Puts all distributable products in single hierarchy"/>
1101 <
1102 <
1103 <  <target name="jsr166xclean"
1104 <          description="Removes all jsr166x build products">
1105 <
1101 >  <target name="jsr166xclean">
1102      <delete dir="${build.jsr166x.dir}"/>
1107
1103    </target>
1104  
1105 <
1111 <  <target name="jsr166xdist-jar"
1112 <          depends="jsr166xclean, jsr166xjar">
1105 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1106      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1107    </target>
1108  
1109 <  <target name="jsr166xdist-docs"
1117 <          depends="jsr166xclean, jsr166xdocs">
1109 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1110      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1111    </target>
1112  
1121  <!-- jsr166y -->
1113  
1114 +  <!-- jsr166y (no longer maintained) -->
1115  
1116 <  <target name="jsr166ycompile"
1125 <          depends="configure-compiler"
1126 <          description="Compiles jsr166y sources">
1127 <
1116 >  <target name="jsr166ycompile" depends="configure-compiler">
1117      <mkdir dir="${build.jsr166y.classes.dir}"/>
1118  
1119      <javac srcdir="${topsrc.dir}"
# Line 1138 | Line 1127
1127             bootclasspath="${bootclasspath6}"
1128             includeAntRuntime="false"
1129             includeJavaRuntime="false"
1130 +           encoding="ASCII"
1131             executable="${javac7}"
1132             fork="true">
1133  
# Line 1146 | Line 1136
1136        <compilerarg value="-Xlint:all"/>
1137        <compilerarg value="-Werror"/>
1138        <compilerarg line="${build.args}"/>
1149
1139      </javac>
1140    </target>
1141  
1142 <
1154 <  <target name="jsr166yjar"
1155 <          depends="jsr166ycompile"
1156 <          description="Builds library jar from compiled sources">
1157 <
1142 >  <target name="jsr166yjar" depends="jsr166ycompile">
1143      <jar destfile="${jsr166y.jar}" index="true">
1144        <fileset dir="${build.jsr166y.classes.dir}"/>
1145        <manifest>
# Line 1162 | Line 1147
1147          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1148        </manifest>
1149      </jar>
1165
1150    </target>
1151  
1152 <
1169 <  <target name="jsr166ydocs"
1170 <          description="Builds javadocs to dist dir">
1171 <
1152 >  <target name="jsr166ydocs">
1153      <delete dir="${jsr166ydocs.dir}"/>
1154      <mkdir dir="${jsr166ydocs.dir}"/>
1155  
# Line 1183 | Line 1164
1164               failonerror = "true">
1165        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1166        <arg value="-XDignore.symbol.file=true"/>
1186
1167      </javadoc>
1168    </target>
1169  
1170 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1171  
1172 <  <target name="jsr166ydist"
1192 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1193 <          description="Puts all distributable products in single hierarchy"/>
1194 <
1195 <
1196 <  <target name="jsr166yclean"
1197 <          description="Removes all jsr166y build products">
1198 <
1172 >  <target name="jsr166yclean">
1173      <delete dir="${build.jsr166y.dir}"/>
1200
1174    </target>
1175  
1176 <
1204 <  <target name="jsr166ydist-jar"
1205 <          depends="jsr166yclean, jsr166yjar">
1176 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1177      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1178    </target>
1179  
1180 <  <target name="jsr166ydist-docs"
1210 <          depends="jsr166yclean, jsr166ydocs">
1180 >  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1181      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1182    </target>
1183  
1184  
1185 <  <!-- extra166y -->
1216 <
1217 <
1218 <  <target name="extra166ycompile"
1219 <          depends="configure-compiler, jsr166yjar"
1220 <          description="Compiles extra166y sources">
1185 >  <!-- extra166y (no longer maintained) -->
1186  
1187 +  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1188      <mkdir dir="${build.extra166y.classes.dir}"/>
1189  
1190      <javac srcdir="${topsrc.dir}"
# Line 1232 | Line 1198
1198             target="6"
1199             includeAntRuntime="false"
1200             includeJavaRuntime="false"
1201 +           encoding="ASCII"
1202             executable="${javac7}"
1203             fork="true">
1204  
# Line 1240 | Line 1207
1207        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1208        <compilerarg value="-Werror"/>
1209        <compilerarg line="${build.args}"/>
1243
1210      </javac>
1211    </target>
1212  
1213 <
1248 <  <target name="extra166yjar"
1249 <          depends="extra166ycompile"
1250 <          description="Builds library jar from compiled sources">
1251 <
1213 >  <target name="extra166yjar" depends="extra166ycompile">
1214      <jar destfile="${extra166y.jar}" index="true">
1215        <fileset dir="${build.extra166y.classes.dir}"/>
1216        <manifest>
# Line 1256 | Line 1218
1218          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1219        </manifest>
1220      </jar>
1259
1221    </target>
1222  
1223 <
1263 <  <target name="extra166ydocs"
1264 <          description="Builds javadocs to build dir">
1265 <
1223 >  <target name="extra166ydocs">
1224      <delete dir="${extra166ydocs.dir}"/>
1225      <mkdir dir="${extra166ydocs.dir}"/>
1226  
# Line 1276 | Line 1234
1234               executable="${javadoc7}">
1235        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1236        <arg value="-XDignore.symbol.file=true"/>
1279
1237      </javadoc>
1238    </target>
1239  
1240 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1241  
1242 <  <target name="extra166ydist"
1285 <          depends="extra166ydist-jar, extra166ydist-docs"
1286 <          description="Puts all distributable products in single hierarchy"/>
1287 <
1288 <
1289 <  <target name="extra166yclean"
1290 <          description="Removes all extra166y build products">
1291 <
1242 >  <target name="extra166yclean">
1243      <delete dir="${build.extra166y.dir}"/>
1293
1244    </target>
1245  
1246 <
1297 <  <target name="extra166ydist-jar"
1298 <          depends="extra166yclean, extra166yjar">
1246 >  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1247      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1248    </target>
1249  
1250 <  <target name="extra166ydist-docs"
1303 <          depends="extra166yclean, extra166ydocs">
1250 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1251      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1252    </target>
1253  
1254 <  <!-- jsr166e -->
1254 >
1255 >  <!-- jsr166e (no longer maintained) -->
1256  
1257    <property name="build.jsr166e.java.version" value="6"/>
1258    <property name="build.jsr166e.javac" value="${javac6}"/>
1259  
1260 <  <target name="jsr166ecompile"
1313 <          depends="configure-compiler"
1314 <          description="Compiles jsr166e sources">
1315 <
1260 >  <target name="jsr166ecompile" depends="configure-compiler">
1261      <mkdir dir="${build.jsr166e.classes.dir}"/>
1262  
1263      <javac srcdir="${topsrc.dir}"
# Line 1333 | Line 1278
1278        <compilerarg value="-Xlint:all"/>
1279        <compilerarg value="-Werror"/>
1280        <compilerarg line="${build.args}"/>
1336
1281      </javac>
1282    </target>
1283  
1340  <!-- jsr166e: find doclint errors -->
1284    <target name="jsr166edoclint">
1342
1285      <mkdir dir="${build.jsr166e.classes.dir}"/>
1286  
1287      <javac srcdir="${topsrc.dir}"
# Line 1361 | Line 1303
1303        <compilerarg value="-Xlint:all"/>
1304        <compilerarg value="-Werror"/>
1305        <compilerarg value="-Xdoclint:all/protected"/>
1364
1306      </javac>
1307    </target>
1308  
1309 <
1369 <  <target name="jsr166ejar"
1370 <          depends="jsr166ecompile"
1371 <          description="Builds library jar from compiled sources">
1372 <
1309 >  <target name="jsr166ejar" depends="jsr166ecompile">
1310      <jar destfile="${jsr166e.jar}" index="true">
1311        <fileset dir="${build.jsr166e.classes.dir}"/>
1312        <manifest>
# Line 1377 | Line 1314
1314          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1315        </manifest>
1316      </jar>
1380
1317    </target>
1318  
1319 <
1384 <  <target name="jsr166edocs"
1385 <          description="Builds javadocs to build dir">
1386 <
1319 >  <target name="jsr166edocs">
1320      <delete dir="${jsr166edocs.dir}"/>
1321      <mkdir dir="${jsr166edocs.dir}"/>
1322  
# Line 1397 | Line 1330
1330               failonerror = "true">
1331        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1332        <arg value="-XDignore.symbol.file=true"/>
1400
1333      </javadoc>
1334    </target>
1335  
1336 <
1405 <  <target name="jsr166e-tck-one-java-version"
1406 <          depends="jsr166ejar">
1407 <
1336 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1337      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1409
1338      <run-tck-tests
1339        tck.src.dir="${test.src.dir}/tck-jsr166e"
1340        target="${build.jsr166e.java.version}"
# Line 1414 | Line 1342
1342        classes="${jsr166e.jar}"/>
1343    </target>
1344  
1345 <  <target name="jsr166e-tck"
1418 <          description="Runs tck tests for jsr166e for multiple java versions">
1345 >  <target name="jsr166e-tck">
1346  
1347   <!--     <antcall target="clean"/> -->
1348   <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1436 | Line 1363
1363      </antcall>
1364    </target>
1365  
1366 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1367  
1368 <  <target name="jsr166e-test"
1441 <          depends="jsr166e-tck"
1442 <          description="Runs all tests for jsr166e">
1443 <  </target>
1444 <
1445 <  <target name="jsr166edist"
1446 <          depends="jsr166edist-jar, jsr166edist-docs"
1447 <          description="Puts all distributable products in single hierarchy"/>
1448 <
1368 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1369  
1370 <  <target name="jsr166eclean"
1451 <          description="Removes all jsr166e build products">
1370 >  <target name="jsr166eclean">
1371      <delete dir="${build.jsr166e.dir}"/>
1372    </target>
1373  
1455
1374    <target name="jsr166edist-jar"
1375            depends="jsr166eclean, jsr166ejar">
1376      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1377    </target>
1378  
1379 <  <target name="jsr166edist-docs"
1462 <          depends="jsr166eclean, jsr166edocs">
1379 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1380      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1381    </target>
1382  
# Line 1480 | Line 1397
1397    </target>
1398  
1399  
1400 + <!-- ==============================================================
1401 +  Experimental errorprone support - http://errorprone.info
1402 + =================================================================== -->
1403 +  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1404 +  <property name="errorprone.jsr166.flags"
1405 +            value="-Xep:HashtableContains:OFF
1406 +                   -Xep:JdkObsolete:OFF
1407 +                   -Xep:MissingOverride:OFF
1408 +                   -Xep:MissingFail:OFF
1409 +                   -Xep:MixedArrayDimensions:ERROR
1410 +                   -Xep:RemoveUnusedImports:ERROR
1411 +                   -Xep:EmptyIf:ERROR
1412 +                   -Xep:MultipleTopLevelClasses:ERROR
1413 +                   -Xep:ClassName:ERROR
1414 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1415 +                   -Xep:RedundantThrows:ERROR
1416 +                   -Xep:IdentityBinaryExpression:WARN
1417 +                   -Xep:MethodCanBeStatic:WARN"/>
1418 +  <!-- -Xep:WildcardImport:ERROR -->
1419 +  <property name="errorprone.jsr166.test.flags"
1420 +            value="-Xep:StringSplitter:OFF
1421 +                   -Xep:BoxedPrimitiveConstructor:OFF
1422 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1423 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1424 +  <target name="errorprone"
1425 +          depends="clean, configure-compiler"
1426 +          description="Run errorprone over jsr166 source code (experimental)">
1427 +
1428 +    <local name="destdir"/>
1429 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1430 +    <mkdir dir="${destdir}"/>
1431 +
1432 +    <javac srcdir="${src.dir}"
1433 +           destdir="${destdir}"
1434 +           debug="${build.debug}"
1435 +           debuglevel="${build.debuglevel}"
1436 +           deprecation="${build.deprecation}"
1437 +           classpath=""
1438 +           includeAntRuntime="false"
1439 +           includeJavaRuntime="false"
1440 +           encoding="ASCII"
1441 +           executable="${build.main.javac}"
1442 +           fork="true">
1443 +
1444 +      <include name="**/*.java"/>
1445 +      <compilerarg line="-processorpath ${errorprone.jar}"/>
1446 +      <compilerarg value="-Xplugin:ErrorProne
1447 +                          ${errorprone.jsr166.flags}"/>
1448 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1449 +      <compilerarg value="-Xprefer:source"/>
1450 +      <compilerarg value="-XDignore.symbol.file=true"/>
1451 +      <compilerarg value="-Xlint:all"/>
1452 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1453 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1454 +      <compilerarg line="${build.args}"/>
1455 +    </javac>
1456 +
1457 +    <jar destfile="${product.jar}">
1458 +      <fileset dir="${destdir}"/>
1459 +    </jar>
1460 +
1461 +    <run-tck-tests
1462 +      target="${build.main.java.version}"
1463 +      workdir="${build.dir}"
1464 +      classes="${product.jar}">
1465 +      <javac-elements>
1466 +        <compilerarg line="-processorpath ${errorprone.jar}"/>
1467 +        <compilerarg value="-Xplugin:ErrorProne
1468 +                            ${errorprone.jsr166.flags}
1469 +                            ${errorprone.jsr166.test.flags}"/>
1470 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1471 +      </javac-elements>
1472 +    </run-tck-tests>
1473 +  </target>
1474 +
1475 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1476 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1477 +  <target name="errorprone-jtreg"
1478 +          depends="jar"
1479 +          description="Run errorprone over jtreg tests (experimental)">
1480 +
1481 +    <run-jtreg-tests
1482 +       target="${build.main.java.version}"
1483 +       workdir="${build.dir}"
1484 +       classes="${product.jar}"
1485 +       verbose="all">
1486 +      <jtreg-elements>
1487 +        <arg value="-javacoption:-XDcompilePolicy=byfile"/>
1488 +        <arg value="-javacoption:-processorpath"/>
1489 +        <arg value="-javacoption:${errorprone.jar}"/>
1490 +        <arg value="-javacoption:-Xplugin:ErrorProne
1491 +                            ${errorprone.jsr166.flags}
1492 +                            ${errorprone.jsr166.test.flags}
1493 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1494 +      </jtreg-elements>
1495 +    </run-jtreg-tests>
1496 +  </target>
1497 +
1498 +
1499 + <!-- ==============================================================
1500 +  Running guava tests against jsr166 code
1501 + =================================================================== -->
1502 +
1503 + <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1504 + <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1505 + <!-- <property name="guava.version" value="21.0"/> -->
1506 +
1507 + <!-- HOWTO debug print a path id -->
1508 + <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1509 + <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1510 +
1511 + <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1512 + <!--   organisation="com.google.guava" module="guava-tests"/> -->
1513 + <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1514 + <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1515 + <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1516 + <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1517 +
1518 + <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1519 + <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1520 + <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1521 + <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1522 +
1523 + <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1524 + <!--   type="*" inline="true" conf="*(private),*(public)" -->
1525 + <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1526 + <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1527 +
1528 + <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1529 + <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1530 + <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1531 +
1532 +  <target name="init-ivy">
1533 +    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1534 +         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1535 +    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1536 +             classpath="${build.dir}/ivy.jar"/>
1537 +  </target>
1538 +
1539 +  <target name="guava-tests" depends="jar, init-ivy"
1540 +          description="Guava tests run against jsr166 collections">
1541 +    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1542 +    <mkdir dir="${guava.dir}"/>
1543 +    <ivy:retrieve pathid="guava.testlib.classpath"
1544 +      type="jar,bundle" inline="true" conf="default,master"
1545 +      pattern="${guava.dir}/[artifact].[ext]"
1546 +      organisation="com.google.guava" module="guava-testlib"/>
1547 +    <property name="guava.version" value="21.0"/>
1548 +    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1549 +         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1550 +    <junit printsummary="true" showoutput="true" haltonfailure="true"
1551 +           jvm="${build.main.java}" fork="true">
1552 +      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1553 +      <formatter type="brief"/>
1554 +      <classpath>
1555 +        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1556 +        <path refid="guava.testlib.classpath"/>
1557 +      </classpath>
1558 +
1559 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1560 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1561 +    </junit>
1562 +  </target>
1563 +
1564   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines