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.275 by jsr166, Wed Jul 18 01:16:42 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 >  <!-- The location of jdk early access docs (RIP) -->
201 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
202 >  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
203 >  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
204 >  <property name="java12.docroot.url" value="http://download.java.net/java/jdk12/docs"/>
205    <!-- Default jdk doc location (latest stable release seems best) -->
206 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
206 >  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
207  
208    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
209    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 198 | Line 211
211    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
212    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
213    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
214 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
215 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
216 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
217    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
218  
219    <!-- Define the "jtreg" task -->
# Line 230 | Line 246
246  
247      <local name="modules"/>
248      <condition property="modules">
249 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
249 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
250 >    </condition>
251 >
252 >    <local name="use-doclint"/>
253 >    <condition property="use-doclint">
254 >      <not> <equals arg1="@{target}" arg2="7"/> </not>
255      </condition>
256  
257      <mkdir dir="@{workdir}/tck-classes"/>
# Line 252 | Line 273
273        <include name="*.java"/>
274        <compilerarg value="-XDignore.symbol.file=true"/>
275        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
276 +      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
277        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
278 <      <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
278 >      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
279        <compilerarg line="${build.args}"/>
280        <javac-elements/>
281  
# Line 264 | Line 286
286            jvm="${java@{target}}"
287            fork="true">
288          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
289 <        <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
290 <        <jvmarg line="--add-opens java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
291 <        <jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
292 <        <jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
293 <        <jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
294 <        <jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
289 >        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
290 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
291 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
292 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
293 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
294 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
295          <jvmarg line="@{jvmflags}"/>
296          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
297          <jvmarg line="${vmoptions}" if:set="vmoptions"/>
# Line 291 | Line 313
313    </macrodef>
314  
315    <!-- Define jtreg test sets for different jdk versions -->
316 <  <fileset dir="${jtreg9.src.dir}">
317 <    <patternset id="jdk9.jtreg.tests">
318 <      <include name="**/*.java"/>
319 <    </patternset>
320 <  </fileset>
321 <
322 <  <fileset dir="${jtreg8.src.dir}">
323 <    <patternset id="jdk8.jtreg.tests">
324 <      <include name="**/*.java"/>
325 <    </patternset>
326 <  </fileset>
316 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
317 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
318 >  <property name="jtreg.test.pattern" value="**/*.java"/>
319 >  <macrodef name="defjtregtests">
320 >    <attribute name="v"/>
321 >    <sequential>
322 >      <fileset dir="${jtreg@{v}.src.dir}">
323 >        <patternset id="jdk@{v}.jtreg.tests">
324 >          <include name="${jtreg.test.pattern}"/>
325 >        </patternset>
326 >      </fileset>
327 >    </sequential>
328 >  </macrodef>
329  
330 <  <fileset dir="${jtreg7.src.dir}">
331 <    <patternset id="jdk7.jtreg.tests">
332 <      <include name="**/*.java"/>
333 <    </patternset>
334 <  </fileset>
330 >  <defjtregtests v="12"/>
331 >  <defjtregtests v="11"/>
332 >  <defjtregtests v="10"/>
333 >  <defjtregtests v="9"/>
334 >  <defjtregtests v="8"/>
335 >  <defjtregtests v="7"/>
336  
337    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
338    <property name="jtreg.flags" value=""/>
339  
340    <macrodef name="run-jtreg-tests">
341      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
317    <attribute name="source" default="7"/>
342      <attribute name="target"/>
343      <attribute name="workdir"/>
344      <attribute name="classes"/>
345 +    <attribute name="verbose" default="${jtreg.verbose}"/>
346      <attribute name="jtregflags" default=""/>
347 +    <element name="jtreg-elements" optional="true"/>
348  
349      <sequential>
350  
# Line 327 | Line 353
353  
354      <local name="modules"/>
355      <condition property="modules">
356 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
356 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
357      </condition>
358  
359      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 336 | Line 362
362             workDir="@{workdir}/JTwork">
363        <patternset refid="jdk@{target}.jtreg.tests"/>
364        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
365 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
366 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
365 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
366 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
367        <arg value="-agentvm"/>
368        <arg value="-noreport"/>
369 <      <arg value="-verbose:${jtreg.verbose}"/>
369 >      <arg value="-verbose:@{verbose}"/>
370        <arg value="-vmoptions:-esa -ea"/>
371        <arg value="-automatic"/>
372        <arg value="-k:!ignore"/>
373        <arg line="@{jtregflags}"/>
374        <arg line="${jtreg.flags}"/>
375 +      <jtreg-elements/>
376      </jtreg>
377      </sequential>
378    </macrodef>
# Line 362 | Line 389
389    <!-- Main targets -->
390  
391    <property name="build.main.java.version" value="9"/>
392 <  <property name="build.main.javac" value="${javac9}"/>
392 >  <!-- Workaround "no nested properties in ant" -->
393 >  <macrodef name="define-build-main-properties">
394 >    <attribute name="v"/>
395 >    <sequential>
396 >      <property name="build.main.java"    value="${java@{v}}"/>
397 >      <property name="build.main.javac"   value="${javac@{v}}"/>
398 >      <!-- Force javadoc version to be at least 10,
399 >           so we can use override-methods=summary -->
400 >      <condition property="build.main.javadoc"
401 >                 value="${javadoc11}"
402 >                 else="${javadoc@{v}}">
403 >        <equals arg1="@{v}" arg2="9"/>
404 >      </condition>
405 >    </sequential>
406 >  </macrodef>
407 >  <define-build-main-properties v="${build.main.java.version}"/>
408  
409    <target name="dists"
410 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
410 >          depends="dist, 4jdk8dist"
411            description="Builds all public jars and docs"/>
412 +          <!--
413 +              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
414 +          -->
415  
416    <target name="compile"
417            depends="configure-compiler"
418            description="Compiles src/main sources to build dir">
419  
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
420      <local name="destdir"/>
421 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
385 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
421 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
422  
423      <mkdir dir="${destdir}"/>
424  
# Line 399 | Line 435
435             fork="true">
436  
437        <include name="**/*.java"/>
438 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
438 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
439        <compilerarg value="-Xprefer:source"/>
440        <compilerarg value="-XDignore.symbol.file=true"/>
441        <compilerarg value="-Xlint:all"/>
442 +      <compilerarg line="--doclint-format html5"/>
443 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
444        <compilerarg value="-Werror"/>
407      <compilerarg value="-Xdoclint:all/protected"/>
445        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
446        <compilerarg line="${build.args}"/>
447  
# Line 448 | Line 485
485               access="${build.javadoc.access}"
486               sourcepath="${src.dir}"
487               classpath=""
488 <             executable="${javadoc9}">
488 >             source="9"
489 >             executable="${build.main.javadoc}">
490        <fileset dir="${src.dir}" defaultexcludes="yes">
491          <include name="**/*.java"/>
492        </fileset>
493        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
494        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
495        <arg value="-XDignore.symbol.file=true"/>
496 <      <arg value="-Xmodule:java.base"/>
497 <      <arg value="-tag"/>
498 <      <arg value="${javadoc.jls.option}"/>
499 < <!-- @apiNote currently unused -->
500 < <!--       <arg value="-tag"/> -->
501 < <!--       <arg value="apiNote:a:API Note:"/> -->
502 <      <arg value="-tag"/>
465 <      <arg value="implSpec:a:Implementation Requirements:"/>
466 <      <arg value="-tag"/>
467 <      <arg value="implNote:a:Implementation Note:"/>
496 >      <arg value="-html5"/>
497 >      <arg value="--patch-module=java.base=${src.dir}"/>
498 >      <arg value="--override-methods=summary"/>
499 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
500 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
501 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
502 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
503   <!-- tags added in jdk9: currently unused -->
504 < <!--       <arg value="-tag"/> -->
505 < <!--       <arg value="revised:X"/> -->
471 < <!--       <arg value="-tag"/> -->
472 < <!--       <arg value="spec:X"/> -->
504 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
505 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
506      </javadoc>
507    </target>
508  
# Line 503 | Line 536
536  
537    <target name="clean"
538            description="Removes all build products">
506
539      <delete dir="${build.dir}"/>
508
540    </target>
541  
542  
543    <target name="dist-clean"
544            description="Removes all build and distribution products">
514
545      <delete dir="${build.dir}"/>
546      <delete dir="${dist.dir}"/>
517
547    </target>
548  
549  
# Line 535 | Line 564
564      <run-tck-tests
565        target="${build.main.java.version}"
566        workdir="${build.dir}"
567 <      classes="${product.jar}"/>
567 >      classes="${product.jar}">
568 >      <javac-elements>
569 >        <compilerarg value="-Werror"/>
570 >      </javac-elements>
571 >    </run-tck-tests>
572    </target>
573  
574    <target name="tck-parallelism-1"
# Line 570 | Line 603
603  
604    <target name="test"
605            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
606 <          description="Runs tck and jtreg tests for src/main">
574 <  </target>
606 >          description="Runs tck and jtreg tests for src/main"/>
607  
608   <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
609  
# Line 582 | Line 614
614  
615   <!--   </target> -->
616  
617 < <!--   <target name="test89" -->
618 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
617 >  <target name="test9101112"
618 >          description="Runs tck and jtreg tests for src/main for multiple java versions">
619  
620 < <!--     <antcall target="clean"/> -->
621 < <!--     <antcall target="test"> -->
622 < <!--       <param name="build.main.java.version" value="8"/> -->
623 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
592 < <!--     </antcall> -->
620 >    <antcall target="clean"/>
621 >    <antcall target="test">
622 >      <param name="build.main.java.version" value="9"/>
623 >    </antcall>
624  
625 < <!--     <antcall target="clean"/> -->
626 < <!--     <antcall target="test"> -->
627 < <!--       <param name="build.main.java.version" value="9"/> -->
628 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
598 < <!--     </antcall> -->
625 >    <antcall target="clean"/>
626 >    <antcall target="test">
627 >      <param name="build.main.java.version" value="10"/>
628 >    </antcall>
629  
630 < <!--   </target> -->
630 >    <antcall target="clean"/>
631 >    <antcall target="test">
632 >      <param name="build.main.java.version" value="11"/>
633 >    </antcall>
634 >
635 >    <antcall target="clean"/>
636 >    <antcall target="test">
637 >      <param name="build.main.java.version" value="12"/>
638 >    </antcall>
639 >
640 >    <!-- Clean up to avoid obscure wrong class file version bugs -->
641 >    <antcall target="clean"/>
642 >
643 >  </target>
644  
645  
646  
647    <target name="configure-compiler">
648      <fail message="ant version too old">
649 <      <condition>
607 <        <not> <antversion atleast="1.9.1"/> </not>
608 <      </condition>
649 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
650      </fail>
651  
652      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 651 | Line 692
692      <java classname="ALoops" fork="true">
693        <classpath refid="loops.classpath"/>
694      </java>
654
695    </target>
696  
697  
698    <target name="compile-test-loops" depends="jar"
699 <          description="compile all the perf tests in src/test/loops">
699 >          description="Compiles all the perf tests in src/test/loops">
700  
701      <mkdir dir="${build.dir}/test/loops"/>
702  
# Line 668 | Line 708
708             includeAntRuntime="false"
709             includeJavaRuntime="false"
710             encoding="ASCII"
711 <           executable="${javac9}"
711 >           executable="${build.main.javac}"
712             fork="true">
713  
714        <include name="*.java"/>
# Line 676 | Line 716
716        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
717        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
718        <compilerarg line="${build.args}"/>
679
719      </javac>
681
720    </target>
721  
722  
# Line 704 | Line 742
742             encoding="ASCII"
743             executable="${javac8}"
744             fork="true">
707
745        <include name="**/*.java"/>
746        <compilerarg value="-Xprefer:source"/>
747        <compilerarg value="-XDignore.symbol.file=true"/>
748        <compilerarg value="-Xlint:all"/>
749        <compilerarg value="-Werror"/>
750        <compilerarg line="${build.args}"/>
714
751      </javac>
752    </target>
753  
# Line 735 | Line 771
771             encoding="ASCII"
772             executable="${javac8}"
773             fork="true">
738
774        <include name="**/*.java"/>
775        <compilerarg value="-Xprefer:source"/>
776        <compilerarg value="-XDignore.symbol.file=true"/>
777        <compilerarg value="-Xlint:all"/>
778 <      <compilerarg value="-Xdoclint:all/protected"/>
778 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
779        <compilerarg line="${build.args}"/>
745
780      </javac>
781    </target>
782  
# Line 758 | Line 792
792          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
793        </manifest>
794      </jar>
761
795    </target>
796  
797  
# Line 774 | Line 807
807          <!-- JDK9+ test classes -->
808          <exclude name="*9Test.java"/>
809          <exclude name="*10Test.java"/>
810 +        <compilerarg value="-Werror"/>
811        </javac-elements>
812      </run-tck-tests>
813    </target>
# Line 791 | Line 825
825  
826    <target name="4jdk8-test"
827            depends="4jdk8-tck, 4jdk8-jtreg"
828 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
795 <  </target>
828 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
829  
830  
831    <target name="4jdk8docs"
# Line 808 | Line 841
841               access="${build.javadoc.access}"
842               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
843               classpath=""
844 +             source="8"
845               executable="${javadoc8}"
846               failonerror = "true">
847        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 815 | Line 849
849        </fileset>
850        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
851        <arg value="-XDignore.symbol.file=true"/>
852 <      <arg value="-tag"/>
853 <      <arg value="${javadoc.jls.option}"/>
854 < <!-- @apiNote currently unused -->
855 < <!--       <arg value="-tag"/> -->
856 < <!--       <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;"/>
852 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
853 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
854 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
855 > <!-- @apiNote tag currently unused -->
856 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
857      </javadoc>
858    </target>
859  
# Line 835 | Line 865
865  
866    <target name="4jdk8clean"
867            description="Removes all 4jdk8 build products">
838
868      <delete dir="${build.4jdk8.dir}"/>
840
869    </target>
870  
871  
# Line 853 | Line 881
881    </target>
882  
883  
884 +  <!-- jsr166 4jdk7 (no longer maintained) -->
885  
886 <  <!-- jsr166 4jdk7 -->
858 <
859 <  <target name="4jdk7compile"
860 <          depends="configure-compiler"
861 <          description="Compiles src/jdk7 sources, targeting jdk7">
862 <
886 >  <target name="4jdk7compile" depends="configure-compiler">
887      <mkdir dir="${build.4jdk7.classes.dir}"/>
888  
889      <javac srcdir="${4jdk7src.dir}"
# Line 883 | Line 907
907        <compilerarg value="-Xlint:all"/>
908        <compilerarg value="-Werror"/>
909        <compilerarg line="${build.args}"/>
886
910      </javac>
911    </target>
912  
913 <  <target name="4jdk7doclint"
891 <          depends="configure-compiler"
892 <          description="Finds doclint warnings">
893 <
913 >  <target name="4jdk7doclint" depends="configure-compiler">
914      <mkdir dir="${build.4jdk7.classes.dir}"/>
915  
916      <javac srcdir="${4jdk7src.dir}"
# Line 914 | Line 934
934        <compilerarg value="-Xlint:all"/>
935        <compilerarg value="-Xdoclint:all/protected"/>
936        <compilerarg line="${build.args}"/>
917
937      </javac>
938    </target>
939  
940 <
922 <  <target name="4jdk7jar"
923 <          depends="4jdk7compile"
924 <          description="Builds library jar from compiled sources">
925 <
940 >  <target name="4jdk7jar" depends="4jdk7compile">
941      <jar destfile="${4jdk7product.jar}">
942        <fileset dir="${build.4jdk7.classes.dir}"/>
943        <manifest>
# Line 930 | Line 945
945          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
946        </manifest>
947      </jar>
933
948    </target>
949  
950 <
937 <  <target name="4jdk7-tck"
938 <          depends="4jdk7jar"
939 <          description="Runs tck tests for jsr166-4jdk7 directly">
940 <
950 >  <target name="4jdk7-tck" depends="4jdk7jar">
951      <run-tck-tests
952        target="7"
953        workdir="${build.4jdk7.dir}"
# Line 955 | 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  
962
973    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
974 <  <target name="4jdk7-tck-junit"
965 <          depends="4jdk7compile">
974 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
975  
976      <junit printsummary="true"
977             showoutput="true"
# Line 984 | Line 993
993  
994        <test name="${jsr166.tckTestClass}" haltonfailure="no">
995        </test>
987
996      </junit>
997    </target>
998  
999 <  <target name="4jdk7-jtreg"
992 <          depends="4jdk7jar"
993 <          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"
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 <
1008 >  <target name="4jdk7docs">
1009      <delete dir="${4jdk7docs.dir}"/>
1010      <mkdir dir="${4jdk7docs.dir}"/>
1011  
# Line 1027 | Line 1026
1026      </javadoc>
1027    </target>
1028  
1029 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1030  
1031 <  <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 <
1031 >  <target name="4jdk7clean">
1032      <delete dir="${build.4jdk7.dir}"/>
1040
1033    </target>
1034  
1035 <
1044 <  <target name="4jdk7dist-jar"
1045 <          depends="4jdk7clean, 4jdk7jar">
1035 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1036      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1037    </target>
1038  
1039 <
1050 <  <target name="4jdk7dist-docs"
1051 <          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 -->
1057 <
1058 <  <target name="jsr166xcompile"
1059 <          depends="configure-compiler"
1060 <          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 1075 | Line 1060
1060             encoding="ASCII"
1061             executable="${javac7}"
1062             fork="true">
1078
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}"/>
1084
1068      </javac>
1069    </target>
1070  
1071 <
1089 <  <target name="jsr166xjar"
1090 <          depends="jsr166xcompile"
1091 <          description="Builds library jar from compiled sources">
1092 <
1071 >  <target name="jsr166xjar" depends="jsr166xcompile">
1072      <jar destfile="${jsr166x.jar}">
1073        <fileset dir="${build.jsr166x.classes.dir}"/>
1074        <manifest>
# Line 1097 | Line 1076
1076          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1077        </manifest>
1078      </jar>
1100
1079    </target>
1080  
1081 <
1104 <  <target name="jsr166xdocs"
1105 <          description="Builds javadocs to dist dir">
1106 <
1081 >  <target name="jsr166xdocs">
1082      <delete dir="${jsr166xdocs.dir}"/>
1083      <mkdir dir="${jsr166xdocs.dir}"/>
1084  
# Line 1118 | Line 1093
1093               failonerror = "true">
1094        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1095        <arg value="-XDignore.symbol.file=true"/>
1121
1096      </javadoc>
1097    </target>
1098  
1099 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1100  
1101 <  <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 <
1101 >  <target name="jsr166xclean">
1102      <delete dir="${build.jsr166x.dir}"/>
1135
1103    </target>
1104  
1105 <
1139 <  <target name="jsr166xdist-jar"
1140 <          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"
1145 <          depends="jsr166xclean, jsr166xdocs">
1109 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1110      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1111    </target>
1112  
1149  <!-- jsr166y -->
1113  
1114 +  <!-- jsr166y (no longer maintained) -->
1115  
1116 <  <target name="jsr166ycompile"
1153 <          depends="configure-compiler"
1154 <          description="Compiles jsr166y sources">
1155 <
1116 >  <target name="jsr166ycompile" depends="configure-compiler">
1117      <mkdir dir="${build.jsr166y.classes.dir}"/>
1118  
1119      <javac srcdir="${topsrc.dir}"
# Line 1175 | Line 1136
1136        <compilerarg value="-Xlint:all"/>
1137        <compilerarg value="-Werror"/>
1138        <compilerarg line="${build.args}"/>
1178
1139      </javac>
1140    </target>
1141  
1142 <
1183 <  <target name="jsr166yjar"
1184 <          depends="jsr166ycompile"
1185 <          description="Builds library jar from compiled sources">
1186 <
1142 >  <target name="jsr166yjar" depends="jsr166ycompile">
1143      <jar destfile="${jsr166y.jar}" index="true">
1144        <fileset dir="${build.jsr166y.classes.dir}"/>
1145        <manifest>
# Line 1191 | Line 1147
1147          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1148        </manifest>
1149      </jar>
1194
1150    </target>
1151  
1152 <
1198 <  <target name="jsr166ydocs"
1199 <          description="Builds javadocs to dist dir">
1200 <
1152 >  <target name="jsr166ydocs">
1153      <delete dir="${jsr166ydocs.dir}"/>
1154      <mkdir dir="${jsr166ydocs.dir}"/>
1155  
# Line 1212 | Line 1164
1164               failonerror = "true">
1165        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1166        <arg value="-XDignore.symbol.file=true"/>
1215
1167      </javadoc>
1168    </target>
1169  
1170 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1171  
1172 <  <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 <
1172 >  <target name="jsr166yclean">
1173      <delete dir="${build.jsr166y.dir}"/>
1229
1174    </target>
1175  
1176 <
1233 <  <target name="jsr166ydist-jar"
1234 <          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"
1239 <          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 -->
1245 <
1246 <
1247 <  <target name="extra166ycompile"
1248 <          depends="configure-compiler, jsr166yjar"
1249 <          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 1270 | Line 1207
1207        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1208        <compilerarg value="-Werror"/>
1209        <compilerarg line="${build.args}"/>
1273
1210      </javac>
1211    </target>
1212  
1213 <
1278 <  <target name="extra166yjar"
1279 <          depends="extra166ycompile"
1280 <          description="Builds library jar from compiled sources">
1281 <
1213 >  <target name="extra166yjar" depends="extra166ycompile">
1214      <jar destfile="${extra166y.jar}" index="true">
1215        <fileset dir="${build.extra166y.classes.dir}"/>
1216        <manifest>
# Line 1286 | Line 1218
1218          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1219        </manifest>
1220      </jar>
1289
1221    </target>
1222  
1223 <
1293 <  <target name="extra166ydocs"
1294 <          description="Builds javadocs to build dir">
1295 <
1223 >  <target name="extra166ydocs">
1224      <delete dir="${extra166ydocs.dir}"/>
1225      <mkdir dir="${extra166ydocs.dir}"/>
1226  
# Line 1306 | Line 1234
1234               executable="${javadoc7}">
1235        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1236        <arg value="-XDignore.symbol.file=true"/>
1309
1237      </javadoc>
1238    </target>
1239  
1240 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1241  
1242 <  <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 <
1242 >  <target name="extra166yclean">
1243      <delete dir="${build.extra166y.dir}"/>
1323
1244    </target>
1245  
1246 <
1327 <  <target name="extra166ydist-jar"
1328 <          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"
1333 <          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"
1343 <          depends="configure-compiler"
1344 <          description="Compiles jsr166e sources">
1345 <
1260 >  <target name="jsr166ecompile" depends="configure-compiler">
1261      <mkdir dir="${build.jsr166e.classes.dir}"/>
1262  
1263      <javac srcdir="${topsrc.dir}"
# Line 1363 | Line 1278
1278        <compilerarg value="-Xlint:all"/>
1279        <compilerarg value="-Werror"/>
1280        <compilerarg line="${build.args}"/>
1366
1281      </javac>
1282    </target>
1283  
1370  <!-- jsr166e: find doclint errors -->
1284    <target name="jsr166edoclint">
1372
1285      <mkdir dir="${build.jsr166e.classes.dir}"/>
1286  
1287      <javac srcdir="${topsrc.dir}"
# Line 1391 | Line 1303
1303        <compilerarg value="-Xlint:all"/>
1304        <compilerarg value="-Werror"/>
1305        <compilerarg value="-Xdoclint:all/protected"/>
1394
1306      </javac>
1307    </target>
1308  
1309 <
1399 <  <target name="jsr166ejar"
1400 <          depends="jsr166ecompile"
1401 <          description="Builds library jar from compiled sources">
1402 <
1309 >  <target name="jsr166ejar" depends="jsr166ecompile">
1310      <jar destfile="${jsr166e.jar}" index="true">
1311        <fileset dir="${build.jsr166e.classes.dir}"/>
1312        <manifest>
# Line 1407 | Line 1314
1314          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1315        </manifest>
1316      </jar>
1410
1317    </target>
1318  
1319 <
1414 <  <target name="jsr166edocs"
1415 <          description="Builds javadocs to build dir">
1416 <
1319 >  <target name="jsr166edocs">
1320      <delete dir="${jsr166edocs.dir}"/>
1321      <mkdir dir="${jsr166edocs.dir}"/>
1322  
# Line 1427 | Line 1330
1330               failonerror = "true">
1331        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1332        <arg value="-XDignore.symbol.file=true"/>
1430
1333      </javadoc>
1334    </target>
1335  
1336 <
1435 <  <target name="jsr166e-tck-one-java-version"
1436 <          depends="jsr166ejar">
1437 <
1336 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1337      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1439
1338      <run-tck-tests
1339        tck.src.dir="${test.src.dir}/tck-jsr166e"
1340        target="${build.jsr166e.java.version}"
# Line 1444 | Line 1342
1342        classes="${jsr166e.jar}"/>
1343    </target>
1344  
1345 <  <target name="jsr166e-tck"
1448 <          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 1466 | Line 1363
1363      </antcall>
1364    </target>
1365  
1366 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1367  
1368 <  <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 <
1368 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1369  
1370 <  <target name="jsr166eclean"
1481 <          description="Removes all jsr166e build products">
1370 >  <target name="jsr166eclean">
1371      <delete dir="${build.jsr166e.dir}"/>
1372    </target>
1373  
1485
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"
1492 <          depends="jsr166eclean, jsr166edocs">
1379 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1380      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1381    </target>
1382  
1383  
1384   <!-- Find buglets that can be detected by static build tools -->
1385  
1386 <  <target name="lint">
1387 <    <antcall target="dists">
1388 <      <param name="build.javadoc.access" value="public"/>
1389 <    </antcall>
1390 <  </target>
1386 > <!--   <target name="lint"> -->
1387 > <!--     <antcall target="dists"> -->
1388 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1389 > <!--     </antcall> -->
1390 > <!--   </target> -->
1391  
1392   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1393 <  <target name="lint-private">
1393 >  <target name="doclint-private">
1394      <antcall target="dist">
1395        <param name="build.javadoc.access" value="private"/>
1396      </antcall>
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.3.1.jar"/>
1404 +  <property name="errorprone.jsr166.user.flags" value=""/>
1405 +  <property name="errorprone.jsr166.flags"
1406 +            value="-Xep:HashtableContains:OFF
1407 +                   -Xep:JdkObsolete:OFF
1408 +                   -Xep:MissingOverride:OFF
1409 +                   -Xep:MissingFail:OFF
1410 +                   -Xep:MixedArrayDimensions:ERROR
1411 +                   -Xep:RemoveUnusedImports:ERROR
1412 +                   -Xep:EmptyIf:ERROR
1413 +                   -Xep:MultipleTopLevelClasses:ERROR
1414 +                   -Xep:ClassName:ERROR
1415 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1416 +                   -Xep:RedundantThrows:ERROR
1417 +                   -Xep:IdentityBinaryExpression:WARN
1418 +                   -Xep:MethodCanBeStatic:WARN
1419 +                   ${errorprone.jsr166.user.flags}"/>
1420 +  <!-- -Xep:WildcardImport:ERROR -->
1421 +  <property name="errorprone.jsr166.test.flags"
1422 +            value="-Xep:StringSplitter:OFF
1423 +                   -Xep:BoxedPrimitiveConstructor:OFF
1424 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1425 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1426 +  <target name="errorprone"
1427 +          depends="clean, configure-compiler"
1428 +          description="Run errorprone over jsr166 source code (experimental)">
1429 +
1430 +    <local name="destdir"/>
1431 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1432 +    <mkdir dir="${destdir}"/>
1433 +
1434 +    <javac srcdir="${src.dir}"
1435 +           destdir="${destdir}"
1436 +           debug="${build.debug}"
1437 +           debuglevel="${build.debuglevel}"
1438 +           deprecation="${build.deprecation}"
1439 +           classpath=""
1440 +           includeAntRuntime="false"
1441 +           includeJavaRuntime="false"
1442 +           encoding="ASCII"
1443 +           executable="${build.main.javac}"
1444 +           fork="true">
1445 +
1446 +      <include name="**/*.java"/>
1447 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1448 +      <compilerarg value="-J--illegal-access=permit"/>
1449 +      <compilerarg value="-XDcompilePolicy=simple"/>
1450 +      <compilerarg line="-processorpath ${errorprone.jar}"/>
1451 +      <compilerarg value="-Xplugin:ErrorProne
1452 +                          ${errorprone.jsr166.flags}"/>
1453 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1454 +      <compilerarg value="-Xprefer:source"/>
1455 +      <compilerarg value="-XDignore.symbol.file=true"/>
1456 +      <compilerarg value="-Xlint:all"/>
1457 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1458 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1459 +      <compilerarg line="${build.args}"/>
1460 +    </javac>
1461 +
1462 +    <jar destfile="${product.jar}">
1463 +      <fileset dir="${destdir}"/>
1464 +    </jar>
1465 +
1466 +    <run-tck-tests
1467 +      target="${build.main.java.version}"
1468 +      workdir="${build.dir}"
1469 +      classes="${product.jar}">
1470 +      <javac-elements>
1471 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1472 +        <compilerarg value="-J--illegal-access=permit"/>
1473 +        <compilerarg value="-XDcompilePolicy=simple"/>
1474 +        <compilerarg line="-processorpath ${errorprone.jar}"/>
1475 +        <compilerarg value="-Xplugin:ErrorProne
1476 +                            ${errorprone.jsr166.flags}
1477 +                            ${errorprone.jsr166.test.flags}"/>
1478 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1479 +      </javac-elements>
1480 +    </run-tck-tests>
1481 +  </target>
1482 +
1483 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1484 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1485 +  <target name="errorprone-jtreg"
1486 +          depends="jar"
1487 +          description="Run errorprone over jtreg tests (experimental)">
1488 +
1489 +    <run-jtreg-tests
1490 +       target="${build.main.java.version}"
1491 +       workdir="${build.dir}"
1492 +       classes="${product.jar}"
1493 +       verbose="all">
1494 +      <jtreg-elements>
1495 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1496 +        <arg value="-javacoption:-processorpath"/>
1497 +        <arg value="-javacoption:${errorprone.jar}"/>
1498 +        <arg value="-javacoption:-Xplugin:ErrorProne
1499 +                            ${errorprone.jsr166.flags}
1500 +                            ${errorprone.jsr166.test.flags}
1501 +                            -Xep:MultipleTopLevelClasses:WARN
1502 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1503 +      </jtreg-elements>
1504 +    </run-jtreg-tests>
1505 +  </target>
1506 +
1507 +
1508   <!-- ==============================================================
1509    Running guava tests against jsr166 code
1510   =================================================================== -->
# Line 1561 | Line 1557
1557      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1558           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1559      <junit printsummary="true" showoutput="true" haltonfailure="true"
1560 <           jvm="${java9}" fork="true">
1561 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1560 >           jvm="${build.main.java}" fork="true">
1561 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1562        <formatter type="brief"/>
1563        <classpath>
1564          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines