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.230 by jsr166, Fri Jan 13 01:22:13 2017 UTC vs.
Revision 1.276 by jsr166, Wed Sep 26 06:40:33 2018 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
# Line 18 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
21 –  $HOME/jdk/jdk6
22 –  $HOME/jdk/jdk7
22    $HOME/jdk/jdk8
23    $HOME/jdk/jdk9
24 +  $HOME/jdk/jdk10
25 +  $HOME/jdk/jdk11
26 +  $HOME/jdk/jdk12
27    where each of the above is a JDK or a symlink to same, and
26 –  $HOME/jdk/src/jdk6
27 –  $HOME/jdk/src/jdk7
28    $HOME/jdk/src/jdk8
29    $HOME/jdk/src/jdk9
30 +  $HOME/jdk/src/jdk10
31 +  $HOME/jdk/src/jdk11
32 +  $HOME/jdk/src/jdk12
33    where each of the above is a complete JDK source tree
34    (e.g. mercurial forest) or a symlink to same.
35  
36    Alternatively, define ant variables thus:
37    ant -Djdk$N.home=... -Djdk$N.src.home=...
38 <  for $N in 6 7 8 9 ...
38 >  for $N in 8 9 10 ...
39  
40 <  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
38 <  target is currently broken.
40 >  As of 2016-03, the sources in src/main are for jdk9+ only.
41   ------------------------------------------------------------------------------
42    </description>
43  
# Line 104 | Line 106
106      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
107        unless:set="have.java.base"/>
108      <local name="modules"/>
109 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
109 >    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
110      <local name="boot.jar.dir"/>
111      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
112      <path id="bootclasspath@{v}" unless:set="modules">
# Line 134 | Line 136
136    <defjdklocations v="7"/>
137    <defjdklocations v="8"/>
138    <defjdklocations v="9"/>
139 +  <defjdklocations v="10"/>
140 +  <defjdklocations v="11"/>
141 +  <defjdklocations v="12"/>
142  
143    <!-- Source locations -->
144    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 143 | Line 148
148    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
149    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
150    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
151 +  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
152 +  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
153 +  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
154    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
155    <property name="lib.dir"              location="${basedir}/lib"/>
156    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 182 | Line 190
190    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
191  
192    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
193 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
194 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
195 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
196 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
197 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
198 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
199 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
193 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
194 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
195 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
196 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
197 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
198 >  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
199 >  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
200 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
201 >  <!-- The location of jdk early access docs (RIP) -->
202 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
203 >  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
204 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
205 >  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
206    <!-- Default jdk doc location (latest stable release seems best) -->
207 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
207 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
208  
209    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
210    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 198 | Line 212
212    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
213    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
214    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
215 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
216 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
217 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
218    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
219  
220    <!-- Define the "jtreg" task -->
# Line 230 | Line 247
247  
248      <local name="modules"/>
249      <condition property="modules">
250 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
250 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
251 >    </condition>
252 >
253 >    <local name="use-doclint"/>
254 >    <condition property="use-doclint">
255 >      <not> <equals arg1="@{target}" arg2="7"/> </not>
256      </condition>
257  
258      <mkdir dir="@{workdir}/tck-classes"/>
# Line 252 | Line 274
274        <include name="*.java"/>
275        <compilerarg value="-XDignore.symbol.file=true"/>
276        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
277 +      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
278        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
279 <      <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
279 >      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
280        <compilerarg line="${build.args}"/>
281        <javac-elements/>
282  
# Line 264 | Line 287
287            jvm="${java@{target}}"
288            fork="true">
289          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
290 <        <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
291 <        <jvmarg line="--add-opens java.base/java.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"/>
290 >        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
291 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
292 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
293 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
294 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
295 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
296          <jvmarg line="@{jvmflags}"/>
297          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
298          <jvmarg line="${vmoptions}" if:set="vmoptions"/>
# Line 290 | Line 314
314    </macrodef>
315  
316    <!-- Define jtreg test sets for different jdk versions -->
317 <  <fileset dir="${jtreg9.src.dir}">
318 <    <patternset id="jdk9.jtreg.tests">
319 <      <include name="**/*.java"/>
320 <    </patternset>
321 <  </fileset>
322 <
323 <  <fileset dir="${jtreg8.src.dir}">
324 <    <patternset id="jdk8.jtreg.tests">
325 <      <include name="**/*.java"/>
326 <    </patternset>
327 <  </fileset>
317 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
318 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
319 >  <property name="jtreg.test.pattern" value="**/*.java"/>
320 >  <macrodef name="defjtregtests">
321 >    <attribute name="v"/>
322 >    <sequential>
323 >      <fileset dir="${jtreg@{v}.src.dir}">
324 >        <patternset id="jdk@{v}.jtreg.tests">
325 >          <include name="${jtreg.test.pattern}"/>
326 >        </patternset>
327 >      </fileset>
328 >    </sequential>
329 >  </macrodef>
330  
331 <  <fileset dir="${jtreg7.src.dir}">
332 <    <patternset id="jdk7.jtreg.tests">
333 <      <include name="**/*.java"/>
334 <    </patternset>
335 <  </fileset>
331 >  <defjtregtests v="12"/>
332 >  <defjtregtests v="11"/>
333 >  <defjtregtests v="10"/>
334 >  <defjtregtests v="9"/>
335 >  <defjtregtests v="8"/>
336 >  <defjtregtests v="7"/>
337  
338    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
339    <property name="jtreg.flags" value=""/>
340  
341    <macrodef name="run-jtreg-tests">
342      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
316 –    <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 354
354  
355      <local name="modules"/>
356      <condition property="modules">
357 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
357 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
358      </condition>
359  
360      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 335 | Line 363
363             workDir="@{workdir}/JTwork">
364        <patternset refid="jdk@{target}.jtreg.tests"/>
365        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
366 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
367 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
366 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
367 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
368        <arg value="-agentvm"/>
369        <arg value="-noreport"/>
370 <      <arg value="-verbose:${jtreg.verbose}"/>
370 >      <arg value="-verbose:@{verbose}"/>
371        <arg value="-vmoptions:-esa -ea"/>
372        <arg value="-automatic"/>
373        <arg value="-k:!ignore"/>
374        <arg line="@{jtregflags}"/>
375        <arg line="${jtreg.flags}"/>
376 +      <jtreg-elements/>
377      </jtreg>
378      </sequential>
379    </macrodef>
# Line 361 | Line 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 >      <!-- Force javadoc version to be at least 10,
400 >           so we can use override-methods=summary -->
401 >      <condition property="build.main.javadoc"
402 >                 value="${javadoc11}"
403 >                 else="${javadoc@{v}}">
404 >        <equals arg1="@{v}" arg2="9"/>
405 >      </condition>
406 >    </sequential>
407 >  </macrodef>
408 >  <define-build-main-properties v="${build.main.java.version}"/>
409  
410    <target name="dists"
411 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
411 >          depends="dist, 4jdk8dist"
412            description="Builds all public jars and docs"/>
413 +          <!--
414 +              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
415 +          -->
416  
417    <target name="compile"
418            depends="configure-compiler"
419            description="Compiles src/main sources to build dir">
420  
374 –    <local name="modules"/>
375 –    <condition property="modules">
376 –      <and>
377 –        <available file="${jdk9.home}/jmods" type="dir"/>
378 –        <equals arg1="9" arg2="${build.main.java.version}"/>
379 –      </and>
380 –    </condition>
381 –
421      <local name="destdir"/>
422 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
384 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
422 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
423  
424      <mkdir dir="${destdir}"/>
425  
# Line 398 | Line 436
436             fork="true">
437  
438        <include name="**/*.java"/>
439 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
439 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
440        <compilerarg value="-Xprefer:source"/>
441        <compilerarg value="-XDignore.symbol.file=true"/>
442        <compilerarg value="-Xlint:all"/>
443 +      <compilerarg line="--doclint-format html5"/>
444 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
445        <compilerarg value="-Werror"/>
406 –      <compilerarg value="-Xdoclint:all/protected"/>
446        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
447        <compilerarg line="${build.args}"/>
448  
# Line 447 | Line 486
486               access="${build.javadoc.access}"
487               sourcepath="${src.dir}"
488               classpath=""
489 <             executable="${javadoc9}">
489 >             source="9"
490 >             executable="${build.main.javadoc}">
491        <fileset dir="${src.dir}" defaultexcludes="yes">
492          <include name="**/*.java"/>
493        </fileset>
494        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
495        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
496        <arg value="-XDignore.symbol.file=true"/>
497 <      <arg value="-Xmodule:java.base"/>
498 <      <arg value="-tag"/>
499 <      <arg value="${javadoc.jls.option}"/>
500 < <!-- @apiNote currently unused -->
501 < <!--       <arg value="-tag"/> -->
502 < <!--       <arg value="apiNote:a:API Note:"/> -->
503 <      <arg value="-tag"/>
464 <      <arg value="implSpec:a:Implementation Requirements:"/>
465 <      <arg value="-tag"/>
466 <      <arg value="implNote:a:Implementation Note:"/>
497 >      <arg value="-html5"/>
498 >      <arg value="--patch-module=java.base=${src.dir}"/>
499 >      <arg value="--override-methods=summary"/>
500 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
501 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
502 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
503 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
504   <!-- tags added in jdk9: currently unused -->
505 < <!--       <arg value="-tag"/> -->
506 < <!--       <arg value="revised:X"/> -->
470 < <!--       <arg value="-tag"/> -->
471 < <!--       <arg value="spec:X"/> -->
505 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
506 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
507      </javadoc>
508    </target>
509  
# Line 502 | Line 537
537  
538    <target name="clean"
539            description="Removes all build products">
505 –
540      <delete dir="${build.dir}"/>
507 –
541    </target>
542  
543  
544    <target name="dist-clean"
545            description="Removes all build and distribution products">
513 –
546      <delete dir="${build.dir}"/>
547      <delete dir="${dist.dir}"/>
516 –
548    </target>
549  
550  
# Line 534 | Line 565
565      <run-tck-tests
566        target="${build.main.java.version}"
567        workdir="${build.dir}"
568 <      classes="${product.jar}"/>
568 >      classes="${product.jar}">
569 >      <javac-elements>
570 >        <compilerarg value="-Werror"/>
571 >      </javac-elements>
572 >    </run-tck-tests>
573    </target>
574  
575    <target name="tck-parallelism-1"
# Line 569 | Line 604
604  
605    <target name="test"
606            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
607 <          description="Runs tck and jtreg tests for src/main">
573 <  </target>
607 >          description="Runs tck and jtreg tests for src/main"/>
608  
609   <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
610  
# Line 581 | Line 615
615  
616   <!--   </target> -->
617  
618 < <!--   <target name="test89" -->
619 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
618 >  <target name="test9101112"
619 >          description="Runs tck and jtreg tests for src/main for multiple java versions">
620  
621 < <!--     <antcall target="clean"/> -->
622 < <!--     <antcall target="test"> -->
623 < <!--       <param name="build.main.java.version" value="8"/> -->
624 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
591 < <!--     </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}"/> -->
597 < <!--     </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 >    <antcall target="clean"/>
637 >    <antcall target="test">
638 >      <param name="build.main.java.version" value="12"/>
639 >    </antcall>
640 >
641 >    <!-- Clean up to avoid obscure wrong class file version bugs -->
642 >    <antcall target="clean"/>
643 >
644 >  </target>
645  
646  
647  
648    <target name="configure-compiler">
649      <fail message="ant version too old">
650 <      <condition>
606 <        <not> <antversion atleast="1.9.1"/> </not>
607 <      </condition>
650 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
651      </fail>
652  
653      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 650 | Line 693
693      <java classname="ALoops" fork="true">
694        <classpath refid="loops.classpath"/>
695      </java>
653 –
696    </target>
697  
698  
699    <target name="compile-test-loops" depends="jar"
700 <          description="compile all the perf tests in src/test/loops">
700 >          description="Compiles all the perf tests in src/test/loops">
701  
702      <mkdir dir="${build.dir}/test/loops"/>
703  
# Line 667 | Line 709
709             includeAntRuntime="false"
710             includeJavaRuntime="false"
711             encoding="ASCII"
712 <           executable="${javac9}"
712 >           executable="${build.main.javac}"
713             fork="true">
714  
715        <include name="*.java"/>
# Line 675 | Line 717
717        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
718        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
719        <compilerarg line="${build.args}"/>
678 –
720      </javac>
680 –
721    </target>
722  
723  
# Line 703 | Line 743
743             encoding="ASCII"
744             executable="${javac8}"
745             fork="true">
706 –
746        <include name="**/*.java"/>
747        <compilerarg value="-Xprefer:source"/>
748        <compilerarg value="-XDignore.symbol.file=true"/>
749        <compilerarg value="-Xlint:all"/>
750        <compilerarg value="-Werror"/>
751        <compilerarg line="${build.args}"/>
713 –
752      </javac>
753    </target>
754  
# Line 734 | Line 772
772             encoding="ASCII"
773             executable="${javac8}"
774             fork="true">
737 –
775        <include name="**/*.java"/>
776        <compilerarg value="-Xprefer:source"/>
777        <compilerarg value="-XDignore.symbol.file=true"/>
778        <compilerarg value="-Xlint:all"/>
779 <      <compilerarg value="-Xdoclint:all/protected"/>
779 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
780        <compilerarg line="${build.args}"/>
744 –
781      </javac>
782    </target>
783  
# Line 757 | Line 793
793          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
794        </manifest>
795      </jar>
760 –
796    </target>
797  
798  
# Line 773 | Line 808
808          <!-- JDK9+ test classes -->
809          <exclude name="*9Test.java"/>
810          <exclude name="*10Test.java"/>
811 +        <compilerarg value="-Werror"/>
812        </javac-elements>
813      </run-tck-tests>
814    </target>
# Line 790 | Line 826
826  
827    <target name="4jdk8-test"
828            depends="4jdk8-tck, 4jdk8-jtreg"
829 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
794 <  </target>
829 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
830  
831  
832    <target name="4jdk8docs"
# Line 807 | Line 842
842               access="${build.javadoc.access}"
843               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
844               classpath=""
845 +             source="8"
846               executable="${javadoc8}"
847               failonerror = "true">
848        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 814 | Line 850
850        </fileset>
851        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
852        <arg value="-XDignore.symbol.file=true"/>
853 <      <arg value="-tag"/>
854 <      <arg value="${javadoc.jls.option}"/>
855 < <!-- @apiNote currently unused -->
856 < <!--       <arg value="-tag"/> -->
857 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
822 <      <arg value="-tag"/>
823 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
824 <      <arg value="-tag"/>
825 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
853 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
854 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
855 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
856 > <!-- @apiNote tag currently unused -->
857 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
858      </javadoc>
859    </target>
860  
# Line 834 | Line 866
866  
867    <target name="4jdk8clean"
868            description="Removes all 4jdk8 build products">
837 –
869      <delete dir="${build.4jdk8.dir}"/>
839 –
870    </target>
871  
872  
# Line 852 | Line 882
882    </target>
883  
884  
885 +  <!-- jsr166 4jdk7 (no longer maintained) -->
886  
887 <  <!-- jsr166 4jdk7 -->
857 <
858 <  <target name="4jdk7compile"
859 <          depends="configure-compiler"
860 <          description="Compiles src/jdk7 sources, targeting jdk7">
861 <
887 >  <target name="4jdk7compile" depends="configure-compiler">
888      <mkdir dir="${build.4jdk7.classes.dir}"/>
889  
890      <javac srcdir="${4jdk7src.dir}"
# Line 882 | Line 908
908        <compilerarg value="-Xlint:all"/>
909        <compilerarg value="-Werror"/>
910        <compilerarg line="${build.args}"/>
885 –
911      </javac>
912    </target>
913  
914 <  <target name="4jdk7doclint"
890 <          depends="configure-compiler"
891 <          description="Finds doclint warnings">
892 <
914 >  <target name="4jdk7doclint" depends="configure-compiler">
915      <mkdir dir="${build.4jdk7.classes.dir}"/>
916  
917      <javac srcdir="${4jdk7src.dir}"
# Line 913 | Line 935
935        <compilerarg value="-Xlint:all"/>
936        <compilerarg value="-Xdoclint:all/protected"/>
937        <compilerarg line="${build.args}"/>
916 –
938      </javac>
939    </target>
940  
941 <
921 <  <target name="4jdk7jar"
922 <          depends="4jdk7compile"
923 <          description="Builds library jar from compiled sources">
924 <
941 >  <target name="4jdk7jar" depends="4jdk7compile">
942      <jar destfile="${4jdk7product.jar}">
943        <fileset dir="${build.4jdk7.classes.dir}"/>
944        <manifest>
# Line 929 | Line 946
946          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
947        </manifest>
948      </jar>
932 –
949    </target>
950  
951 <
936 <  <target name="4jdk7-tck"
937 <          depends="4jdk7jar"
938 <          description="Runs tck tests for jsr166-4jdk7 directly">
939 <
951 >  <target name="4jdk7-tck" depends="4jdk7jar">
952      <run-tck-tests
953        target="7"
954        workdir="${build.4jdk7.dir}"
# Line 954 | Line 966
966          <exclude name="SplittableRandomTest.java"/>
967          <exclude name="StampedLockTest.java"/>
968          <exclude name="SubmissionPublisherTest.java"/>
969 +        <compilerarg value="-Werror"/>
970        </javac-elements>
971      </run-tck-tests>
972    </target>
973  
961 –
974    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
975 <  <target name="4jdk7-tck-junit"
964 <          depends="4jdk7compile">
975 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
976  
977      <junit printsummary="true"
978             showoutput="true"
# Line 983 | Line 994
994  
995        <test name="${jsr166.tckTestClass}" haltonfailure="no">
996        </test>
986 –
997      </junit>
998    </target>
999  
1000 <  <target name="4jdk7-jtreg"
991 <          depends="4jdk7jar"
992 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
1000 >  <target name="4jdk7-jtreg" depends="4jdk7jar">
1001      <run-jtreg-tests
1002         target="7"
1003         workdir="${build.4jdk7.dir}"
1004         classes="${4jdk7product.jar}"/>
1005    </target>
1006  
1007 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1008  
1009 <  <target name="4jdk7-test"
1001 <          depends="4jdk7-tck, 4jdk7-jtreg"
1002 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
1003 <  </target>
1004 <
1005 <
1006 <  <target name="4jdk7docs"
1007 <          description="Builds javadocs for src/jdk7 to dist dir">
1008 <
1009 >  <target name="4jdk7docs">
1010      <delete dir="${4jdk7docs.dir}"/>
1011      <mkdir dir="${4jdk7docs.dir}"/>
1012  
# Line 1026 | Line 1027
1027      </javadoc>
1028    </target>
1029  
1030 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1031  
1032 <  <target name="4jdk7dist"
1031 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1032 <          description="Puts all distributable products in single hierarchy"/>
1033 <
1034 <
1035 <  <target name="4jdk7clean"
1036 <          description="Removes all 4jdk7 build products">
1037 <
1032 >  <target name="4jdk7clean">
1033      <delete dir="${build.4jdk7.dir}"/>
1039 –
1034    </target>
1035  
1036 <
1043 <  <target name="4jdk7dist-jar"
1044 <          depends="4jdk7clean, 4jdk7jar">
1036 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1037      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1038    </target>
1039  
1040 <
1049 <  <target name="4jdk7dist-docs"
1050 <          depends="4jdk7clean, 4jdk7docs">
1040 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1041      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1042    </target>
1043  
1044  
1045 <  <!-- jsr166x -->
1056 <
1057 <  <target name="jsr166xcompile"
1058 <          depends="configure-compiler"
1059 <          description="Compiles jsr166x sources to build dir">
1045 >  <!-- jsr166x (no longer maintained) -->
1046  
1047 +  <target name="jsr166xcompile" depends="configure-compiler">
1048      <mkdir dir="${build.jsr166x.classes.dir}"/>
1049  
1050      <javac srcdir="${topsrc.dir}"
# Line 1074 | Line 1061
1061             encoding="ASCII"
1062             executable="${javac7}"
1063             fork="true">
1077 –
1064        <include name="jsr166x/**/*.java"/>
1065        <compilerarg value="-XDignore.symbol.file=true"/>
1066        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1067        <compilerarg value="-Werror"/>
1068        <compilerarg line="${build.args}"/>
1083 –
1069      </javac>
1070    </target>
1071  
1072 <
1088 <  <target name="jsr166xjar"
1089 <          depends="jsr166xcompile"
1090 <          description="Builds library jar from compiled sources">
1091 <
1072 >  <target name="jsr166xjar" depends="jsr166xcompile">
1073      <jar destfile="${jsr166x.jar}">
1074        <fileset dir="${build.jsr166x.classes.dir}"/>
1075        <manifest>
# Line 1096 | Line 1077
1077          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1078        </manifest>
1079      </jar>
1099 –
1080    </target>
1081  
1082 <
1103 <  <target name="jsr166xdocs"
1104 <          description="Builds javadocs to dist dir">
1105 <
1082 >  <target name="jsr166xdocs">
1083      <delete dir="${jsr166xdocs.dir}"/>
1084      <mkdir dir="${jsr166xdocs.dir}"/>
1085  
# Line 1117 | Line 1094
1094               failonerror = "true">
1095        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1096        <arg value="-XDignore.symbol.file=true"/>
1120 –
1097      </javadoc>
1098    </target>
1099  
1100 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1101  
1102 <  <target name="jsr166xdist"
1126 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1127 <          description="Puts all distributable products in single hierarchy"/>
1128 <
1129 <
1130 <  <target name="jsr166xclean"
1131 <          description="Removes all jsr166x build products">
1132 <
1102 >  <target name="jsr166xclean">
1103      <delete dir="${build.jsr166x.dir}"/>
1134 –
1104    </target>
1105  
1106 <
1138 <  <target name="jsr166xdist-jar"
1139 <          depends="jsr166xclean, jsr166xjar">
1106 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1107      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1108    </target>
1109  
1110 <  <target name="jsr166xdist-docs"
1144 <          depends="jsr166xclean, jsr166xdocs">
1110 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1111      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1112    </target>
1113  
1148 –  <!-- jsr166y -->
1114  
1115 +  <!-- jsr166y (no longer maintained) -->
1116  
1117 <  <target name="jsr166ycompile"
1152 <          depends="configure-compiler"
1153 <          description="Compiles jsr166y sources">
1154 <
1117 >  <target name="jsr166ycompile" depends="configure-compiler">
1118      <mkdir dir="${build.jsr166y.classes.dir}"/>
1119  
1120      <javac srcdir="${topsrc.dir}"
# Line 1174 | Line 1137
1137        <compilerarg value="-Xlint:all"/>
1138        <compilerarg value="-Werror"/>
1139        <compilerarg line="${build.args}"/>
1177 –
1140      </javac>
1141    </target>
1142  
1143 <
1182 <  <target name="jsr166yjar"
1183 <          depends="jsr166ycompile"
1184 <          description="Builds library jar from compiled sources">
1185 <
1143 >  <target name="jsr166yjar" depends="jsr166ycompile">
1144      <jar destfile="${jsr166y.jar}" index="true">
1145        <fileset dir="${build.jsr166y.classes.dir}"/>
1146        <manifest>
# Line 1190 | Line 1148
1148          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1149        </manifest>
1150      </jar>
1193 –
1151    </target>
1152  
1153 <
1197 <  <target name="jsr166ydocs"
1198 <          description="Builds javadocs to dist dir">
1199 <
1153 >  <target name="jsr166ydocs">
1154      <delete dir="${jsr166ydocs.dir}"/>
1155      <mkdir dir="${jsr166ydocs.dir}"/>
1156  
# Line 1211 | Line 1165
1165               failonerror = "true">
1166        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1167        <arg value="-XDignore.symbol.file=true"/>
1214 –
1168      </javadoc>
1169    </target>
1170  
1171 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1172  
1173 <  <target name="jsr166ydist"
1220 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1221 <          description="Puts all distributable products in single hierarchy"/>
1222 <
1223 <
1224 <  <target name="jsr166yclean"
1225 <          description="Removes all jsr166y build products">
1226 <
1173 >  <target name="jsr166yclean">
1174      <delete dir="${build.jsr166y.dir}"/>
1228 –
1175    </target>
1176  
1177 <
1232 <  <target name="jsr166ydist-jar"
1233 <          depends="jsr166yclean, jsr166yjar">
1177 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1178      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1179    </target>
1180  
1181 <  <target name="jsr166ydist-docs"
1238 <          depends="jsr166yclean, jsr166ydocs">
1181 >  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1182      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1183    </target>
1184  
1185  
1186 <  <!-- extra166y -->
1244 <
1245 <
1246 <  <target name="extra166ycompile"
1247 <          depends="configure-compiler, jsr166yjar"
1248 <          description="Compiles extra166y sources">
1186 >  <!-- extra166y (no longer maintained) -->
1187  
1188 +  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1189      <mkdir dir="${build.extra166y.classes.dir}"/>
1190  
1191      <javac srcdir="${topsrc.dir}"
# Line 1269 | Line 1208
1208        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1209        <compilerarg value="-Werror"/>
1210        <compilerarg line="${build.args}"/>
1272 –
1211      </javac>
1212    </target>
1213  
1214 <
1277 <  <target name="extra166yjar"
1278 <          depends="extra166ycompile"
1279 <          description="Builds library jar from compiled sources">
1280 <
1214 >  <target name="extra166yjar" depends="extra166ycompile">
1215      <jar destfile="${extra166y.jar}" index="true">
1216        <fileset dir="${build.extra166y.classes.dir}"/>
1217        <manifest>
# Line 1285 | Line 1219
1219          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1220        </manifest>
1221      </jar>
1288 –
1222    </target>
1223  
1224 <
1292 <  <target name="extra166ydocs"
1293 <          description="Builds javadocs to build dir">
1294 <
1224 >  <target name="extra166ydocs">
1225      <delete dir="${extra166ydocs.dir}"/>
1226      <mkdir dir="${extra166ydocs.dir}"/>
1227  
# Line 1305 | Line 1235
1235               executable="${javadoc7}">
1236        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1237        <arg value="-XDignore.symbol.file=true"/>
1308 –
1238      </javadoc>
1239    </target>
1240  
1241 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1242  
1243 <  <target name="extra166ydist"
1314 <          depends="extra166ydist-jar, extra166ydist-docs"
1315 <          description="Puts all distributable products in single hierarchy"/>
1316 <
1317 <
1318 <  <target name="extra166yclean"
1319 <          description="Removes all extra166y build products">
1320 <
1243 >  <target name="extra166yclean">
1244      <delete dir="${build.extra166y.dir}"/>
1322 –
1245    </target>
1246  
1247 <
1326 <  <target name="extra166ydist-jar"
1327 <          depends="extra166yclean, extra166yjar">
1247 >  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1248      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1249    </target>
1250  
1251 <  <target name="extra166ydist-docs"
1332 <          depends="extra166yclean, extra166ydocs">
1251 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1252      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1253    </target>
1254  
1255 <  <!-- jsr166e -->
1255 >
1256 >  <!-- jsr166e (no longer maintained) -->
1257  
1258    <property name="build.jsr166e.java.version" value="6"/>
1259    <property name="build.jsr166e.javac" value="${javac6}"/>
1260  
1261 <  <target name="jsr166ecompile"
1342 <          depends="configure-compiler"
1343 <          description="Compiles jsr166e sources">
1344 <
1261 >  <target name="jsr166ecompile" depends="configure-compiler">
1262      <mkdir dir="${build.jsr166e.classes.dir}"/>
1263  
1264      <javac srcdir="${topsrc.dir}"
# Line 1362 | Line 1279
1279        <compilerarg value="-Xlint:all"/>
1280        <compilerarg value="-Werror"/>
1281        <compilerarg line="${build.args}"/>
1365 –
1282      </javac>
1283    </target>
1284  
1369 –  <!-- jsr166e: find doclint errors -->
1285    <target name="jsr166edoclint">
1371 –
1286      <mkdir dir="${build.jsr166e.classes.dir}"/>
1287  
1288      <javac srcdir="${topsrc.dir}"
# Line 1390 | Line 1304
1304        <compilerarg value="-Xlint:all"/>
1305        <compilerarg value="-Werror"/>
1306        <compilerarg value="-Xdoclint:all/protected"/>
1393 –
1307      </javac>
1308    </target>
1309  
1310 <
1398 <  <target name="jsr166ejar"
1399 <          depends="jsr166ecompile"
1400 <          description="Builds library jar from compiled sources">
1401 <
1310 >  <target name="jsr166ejar" depends="jsr166ecompile">
1311      <jar destfile="${jsr166e.jar}" index="true">
1312        <fileset dir="${build.jsr166e.classes.dir}"/>
1313        <manifest>
# Line 1406 | Line 1315
1315          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1316        </manifest>
1317      </jar>
1409 –
1318    </target>
1319  
1320 <
1413 <  <target name="jsr166edocs"
1414 <          description="Builds javadocs to build dir">
1415 <
1320 >  <target name="jsr166edocs">
1321      <delete dir="${jsr166edocs.dir}"/>
1322      <mkdir dir="${jsr166edocs.dir}"/>
1323  
# Line 1426 | Line 1331
1331               failonerror = "true">
1332        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1333        <arg value="-XDignore.symbol.file=true"/>
1429 –
1334      </javadoc>
1335    </target>
1336  
1337 <
1434 <  <target name="jsr166e-tck-one-java-version"
1435 <          depends="jsr166ejar">
1436 <
1337 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1338      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1438 –
1339      <run-tck-tests
1340        tck.src.dir="${test.src.dir}/tck-jsr166e"
1341        target="${build.jsr166e.java.version}"
# Line 1443 | Line 1343
1343        classes="${jsr166e.jar}"/>
1344    </target>
1345  
1346 <  <target name="jsr166e-tck"
1447 <          description="Runs tck tests for jsr166e for multiple java versions">
1346 >  <target name="jsr166e-tck">
1347  
1348   <!--     <antcall target="clean"/> -->
1349   <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1465 | Line 1364
1364      </antcall>
1365    </target>
1366  
1367 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1368  
1369 <  <target name="jsr166e-test"
1470 <          depends="jsr166e-tck"
1471 <          description="Runs all tests for jsr166e">
1472 <  </target>
1473 <
1474 <  <target name="jsr166edist"
1475 <          depends="jsr166edist-jar, jsr166edist-docs"
1476 <          description="Puts all distributable products in single hierarchy"/>
1477 <
1369 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1370  
1371 <  <target name="jsr166eclean"
1480 <          description="Removes all jsr166e build products">
1371 >  <target name="jsr166eclean">
1372      <delete dir="${build.jsr166e.dir}"/>
1373    </target>
1374  
1484 –
1375    <target name="jsr166edist-jar"
1376            depends="jsr166eclean, jsr166ejar">
1377      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1378    </target>
1379  
1380 <  <target name="jsr166edist-docs"
1491 <          depends="jsr166eclean, jsr166edocs">
1380 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1381      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1382    </target>
1383  
1384  
1385   <!-- Find buglets that can be detected by static build tools -->
1386  
1387 <  <target name="lint">
1388 <    <antcall target="dists">
1389 <      <param name="build.javadoc.access" value="public"/>
1390 <    </antcall>
1391 <  </target>
1387 > <!--   <target name="lint"> -->
1388 > <!--     <antcall target="dists"> -->
1389 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1390 > <!--     </antcall> -->
1391 > <!--   </target> -->
1392  
1393   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1394 <  <target name="lint-private">
1394 >  <target name="doclint-private">
1395      <antcall target="dist">
1396        <param name="build.javadoc.access" value="private"/>
1397      </antcall>
1398    </target>
1399  
1400 +
1401 + <!-- ==============================================================
1402 +  Experimental errorprone support - http://errorprone.info
1403 + =================================================================== -->
1404 +  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1405 +  <property name="errorprone.jsr166.user.flags" value=""/>
1406 +  <property name="errorprone.jsr166.flags"
1407 +            value="-Xep:HashtableContains:OFF
1408 +                   -Xep:JdkObsolete:OFF
1409 +                   -Xep:MissingOverride:OFF
1410 +                   -Xep:MissingFail:OFF
1411 +                   -Xep:MixedArrayDimensions:ERROR
1412 +                   -Xep:RemoveUnusedImports:ERROR
1413 +                   -Xep:EmptyIf:ERROR
1414 +                   -Xep:MultipleTopLevelClasses:ERROR
1415 +                   -Xep:ClassName:ERROR
1416 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1417 +                   -Xep:RedundantThrows:ERROR
1418 +                   -Xep:IdentityBinaryExpression:WARN
1419 +                   -Xep:MethodCanBeStatic:WARN
1420 +                   ${errorprone.jsr166.user.flags}"/>
1421 +  <!-- -Xep:WildcardImport:ERROR -->
1422 +  <property name="errorprone.jsr166.test.flags"
1423 +            value="-Xep:StringSplitter:OFF
1424 +                   -Xep:BoxedPrimitiveConstructor:OFF
1425 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1426 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1427 +  <target name="errorprone"
1428 +          depends="clean, configure-compiler"
1429 +          description="Run errorprone over jsr166 source code (experimental)">
1430 +
1431 +    <local name="destdir"/>
1432 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1433 +    <mkdir dir="${destdir}"/>
1434 +
1435 +    <javac srcdir="${src.dir}"
1436 +           destdir="${destdir}"
1437 +           debug="${build.debug}"
1438 +           debuglevel="${build.debuglevel}"
1439 +           deprecation="${build.deprecation}"
1440 +           classpath=""
1441 +           includeAntRuntime="false"
1442 +           includeJavaRuntime="false"
1443 +           encoding="ASCII"
1444 +           executable="${build.main.javac}"
1445 +           fork="true">
1446 +
1447 +      <include name="**/*.java"/>
1448 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1449 +      <compilerarg value="-J--illegal-access=permit"/>
1450 +      <compilerarg value="-XDcompilePolicy=simple"/>
1451 +      <compilerarg line="-processorpath ${errorprone.jar}"/>
1452 +      <compilerarg value="-Xplugin:ErrorProne
1453 +                          ${errorprone.jsr166.flags}"/>
1454 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1455 +      <compilerarg value="-Xprefer:source"/>
1456 +      <compilerarg value="-XDignore.symbol.file=true"/>
1457 +      <compilerarg value="-Xlint:all"/>
1458 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1459 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1460 +      <compilerarg line="${build.args}"/>
1461 +    </javac>
1462 +
1463 +    <jar destfile="${product.jar}">
1464 +      <fileset dir="${destdir}"/>
1465 +    </jar>
1466 +
1467 +    <run-tck-tests
1468 +      target="${build.main.java.version}"
1469 +      workdir="${build.dir}"
1470 +      classes="${product.jar}">
1471 +      <javac-elements>
1472 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1473 +        <compilerarg value="-J--illegal-access=permit"/>
1474 +        <compilerarg value="-XDcompilePolicy=simple"/>
1475 +        <compilerarg line="-processorpath ${errorprone.jar}"/>
1476 +        <compilerarg value="-Xplugin:ErrorProne
1477 +                            ${errorprone.jsr166.flags}
1478 +                            ${errorprone.jsr166.test.flags}"/>
1479 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1480 +      </javac-elements>
1481 +    </run-tck-tests>
1482 +  </target>
1483 +
1484 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1485 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1486 +  <target name="errorprone-jtreg"
1487 +          depends="jar"
1488 +          description="Run errorprone over jtreg tests (experimental)">
1489 +
1490 +    <run-jtreg-tests
1491 +       target="${build.main.java.version}"
1492 +       workdir="${build.dir}"
1493 +       classes="${product.jar}"
1494 +       verbose="all">
1495 +      <jtreg-elements>
1496 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1497 +        <arg value="-javacoption:-processorpath"/>
1498 +        <arg value="-javacoption:${errorprone.jar}"/>
1499 +        <arg value="-javacoption:-Xplugin:ErrorProne
1500 +                            ${errorprone.jsr166.flags}
1501 +                            ${errorprone.jsr166.test.flags}
1502 +                            -Xep:MultipleTopLevelClasses:WARN
1503 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1504 +      </jtreg-elements>
1505 +    </run-jtreg-tests>
1506 +  </target>
1507 +
1508 +
1509   <!-- ==============================================================
1510    Running guava tests against jsr166 code
1511   =================================================================== -->
# Line 1560 | Line 1558
1558      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1559           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1560      <junit printsummary="true" showoutput="true" haltonfailure="true"
1561 <           jvm="${java9}" fork="true">
1562 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1561 >           jvm="${build.main.java}" fork="true">
1562 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1563        <formatter type="brief"/>
1564        <classpath>
1565          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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