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.217 by jsr166, Tue Aug 30 02:41:07 2016 UTC vs.
Revision 1.265 by jsr166, Sun Feb 4 20:00:47 2018 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless">
2 >  xmlns:if="ant:if" xmlns:unless="ant:unless"
3 >  xmlns:ivy="antlib:org.apache.ivy.ant">
4  
5    <description>
6   ------------------------------------------------------------------------------
# Line 17 | Line 18
18    itself.  Because the JDK version matters and because different
19    targets require different JDKs, we assume that users have created a
20    hierarchy containing:
20  $HOME/jdk/jdk6
21  $HOME/jdk/jdk7
21    $HOME/jdk/jdk8
22    $HOME/jdk/jdk9
23 +  $HOME/jdk/jdk10
24 +  $HOME/jdk/jdk11
25    where each of the above is a JDK or a symlink to same, and
25  $HOME/jdk/src/jdk6
26  $HOME/jdk/src/jdk7
26    $HOME/jdk/src/jdk8
27    $HOME/jdk/src/jdk9
28 +  $HOME/jdk/src/jdk10
29 +  $HOME/jdk/src/jdk11
30    where each of the above is a complete JDK source tree
31    (e.g. mercurial forest) or a symlink to same.
32  
33    Alternatively, define ant variables thus:
34    ant -Djdk$N.home=... -Djdk$N.src.home=...
35 <  for $N in 6 7 8 9 ...
35 >  for $N in 8 9 10 ...
36  
37 <  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37 <  target is currently broken.
37 >  As of 2016-03, the sources in src/main are for jdk9+ only.
38   ------------------------------------------------------------------------------
39    </description>
40  
# Line 63 | Line 63
63    <property name="build.classes.dir"           location="${build.dir}/classes"/>
64    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
65    <property name="build.loops.dir"             location="${build.dir}/loops"/>
66  <property name="build.reports.dir"           location="${build.dir}/reports"/>
66  
67    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
# Line 134 | Line 133
133    <defjdklocations v="7"/>
134    <defjdklocations v="8"/>
135    <defjdklocations v="9"/>
136 +  <defjdklocations v="10"/>
137 +  <defjdklocations v="11"/>
138  
139    <!-- Source locations -->
140    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 143 | Line 144
144    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
145    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
146    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
147 +  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
148 +  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
149    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
150    <property name="lib.dir"              location="${basedir}/lib"/>
151    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 182 | Line 185
185    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
186  
187    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
188 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
189 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
190 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
191 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
192 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
193 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
194 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
188 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
189 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
190 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
191 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
192 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
193 >  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
194 >  <!-- The location of jdk9 early access docs (RIP) -->
195 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
196    <!-- Default jdk doc location (latest stable release seems best) -->
197 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
197 >  <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
198 >  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
199 >  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
200  
201    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
202    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 198 | Line 204
204    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
205    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
206    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
207 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
208 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
209    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
210  
211    <!-- Define the "jtreg" task -->
# Line 233 | Line 241
241        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
242      </condition>
243  
244 +    <local name="use-doclint"/>
245 +    <condition property="use-doclint">
246 +      <not> <equals arg1="@{target}" arg2="7"/> </not>
247 +    </condition>
248 +
249      <mkdir dir="@{workdir}/tck-classes"/>
250  
251      <javac srcdir="@{tck.src.dir}"
# Line 245 | Line 258
258             classpath="${junit.jar}"
259             includeAntRuntime="false"
260             includeJavaRuntime="false"
261 +           encoding="ASCII"
262             executable="${javac@{compile-target}}"
263             fork="true">
264  
265        <include name="*.java"/>
266        <compilerarg value="-XDignore.symbol.file=true"/>
267        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
268 +      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
269        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
270 <      <compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
270 >      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
271        <compilerarg line="${build.args}"/>
272        <javac-elements/>
273  
# Line 263 | Line 278
278            jvm="${java@{target}}"
279            fork="true">
280          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
281 <        <jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
281 >        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
282 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
283 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
284 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
285 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
286 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
287          <jvmarg line="@{jvmflags}"/>
288          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
289          <jvmarg line="${vmoptions}" if:set="vmoptions"/>
# Line 285 | Line 305
305    </macrodef>
306  
307    <!-- Define jtreg test sets for different jdk versions -->
308 +  <fileset dir="${jtreg11.src.dir}">
309 +    <patternset id="jdk11.jtreg.tests">
310 +      <include name="**/*.java"/>
311 +    </patternset>
312 +  </fileset>
313 +
314 +  <fileset dir="${jtreg10.src.dir}">
315 +    <patternset id="jdk10.jtreg.tests">
316 +      <include name="**/*.java"/>
317 +    </patternset>
318 +  </fileset>
319 +
320    <fileset dir="${jtreg9.src.dir}">
321      <patternset id="jdk9.jtreg.tests">
322        <include name="**/*.java"/>
# Line 294 | Line 326
326    <fileset dir="${jtreg8.src.dir}">
327      <patternset id="jdk8.jtreg.tests">
328        <include name="**/*.java"/>
297      <exclude name="**/SpliteratorCharacteristics.java"/>
298      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
299      <exclude name="**/GCDuringIteration.java"/>
329      </patternset>
330    </fileset>
331  
# Line 311 | Line 340
340  
341    <macrodef name="run-jtreg-tests">
342      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
314    <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 328 | Line 358
358      </condition>
359  
360      <delete dir="@{workdir}/JTwork"   quiet="true"/>
331    <delete dir="@{workdir}/JTreport" quiet="true"/>
361      <jtreg dir="${jtreg@{target}.src.dir}"
362             jdk="${jdk@{target}.home}"
363 <           workDir="@{workdir}/JTwork"
335 <           reportDir="@{workdir}/JTreport">
363 >           workDir="@{workdir}/JTwork">
364        <patternset refid="jdk@{target}.jtreg.tests"/>
365        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
366 <      <arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
366 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
367 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
368        <arg value="-agentvm"/>
369 <      <arg value="-verbose:${jtreg.verbose}"/>
369 >      <arg value="-noreport"/>
370 >      <arg value="-verbose:@{verbose}"/>
371        <arg value="-vmoptions:-esa -ea"/>
372        <arg value="-automatic"/>
373        <arg value="-k:!ignore"/>
374        <arg line="@{jtregflags}"/>
375        <arg line="${jtreg.flags}"/>
376 +      <jtreg-elements/>
377      </jtreg>
378      </sequential>
379    </macrodef>
# Line 359 | 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="${javadoc10}"
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  
372    <local name="modules"/>
373    <condition property="modules">
374      <and>
375        <available file="${jdk9.home}/jmods" type="dir"/>
376        <equals arg1="9" arg2="${build.main.java.version}"/>
377      </and>
378    </condition>
379
421      <local name="destdir"/>
422 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
382 <    <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 391 | Line 431
431             classpath=""
432             includeAntRuntime="false"
433             includeJavaRuntime="false"
434 +           encoding="ASCII"
435             executable="${build.main.javac}"
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"/>
403      <compilerarg value="-Xdoclint:all/protected"/>
446        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
447        <compilerarg line="${build.args}"/>
448  
# Line 432 | Line 474
474      <!-- the packagenames="none" hack below prevents scanning the -->
475      <!-- sourcepath for packages -->
476  
477 < <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
478 < <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
477 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
478 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
479 > <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
480 > <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
481 > <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
482      <javadoc destdir="${docs.dir}"
483               packagenames="none"
484               link="${java9.api.url}"
# Line 441 | 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 <      <arg value="-tag"/>
501 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
502 <      <arg value="-tag"/>
503 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
504 <      <arg value="-tag"/>
505 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
506 < <!-- tags added in jdk9 -->
507 <      <arg value="-tag"/>
462 <      <arg value="revised:X"/>
463 <      <arg value="-tag"/>
464 <      <arg value="spec:X"/>
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 > <!-- @apiNote tag currently unused -->
504 > <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
505 > <!-- tags added in jdk9: currently unused -->
506 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
507 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
508      </javadoc>
509    </target>
510  
# Line 495 | Line 538
538  
539    <target name="clean"
540            description="Removes all build products">
498
541      <delete dir="${build.dir}"/>
500
542    </target>
543  
544  
545    <target name="dist-clean"
546            description="Removes all build and distribution products">
506
547      <delete dir="${build.dir}"/>
548      <delete dir="${dist.dir}"/>
509
549    </target>
550  
551  
# Line 527 | Line 566
566      <run-tck-tests
567        target="${build.main.java.version}"
568        workdir="${build.dir}"
569 <      classes="${product.jar}"/>
569 >      classes="${product.jar}">
570 >      <javac-elements>
571 >        <compilerarg value="-Werror"/>
572 >      </javac-elements>
573 >    </run-tck-tests>
574    </target>
575  
576    <target name="tck-parallelism-1"
# Line 562 | Line 605
605  
606    <target name="test"
607            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
608 <          description="Runs tck and jtreg tests for src/main">
566 <  </target>
608 >          description="Runs tck and jtreg tests for src/main"/>
609  
610   <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
611  
# Line 574 | Line 616
616  
617   <!--   </target> -->
618  
619 < <!--   <target name="test89" -->
620 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
619 >  <target name="test91011"
620 >          description="Runs tck and jtreg tests for src/main for multiple java versions">
621  
622 < <!--     <antcall target="clean"/> -->
623 < <!--     <antcall target="test"> -->
624 < <!--       <param name="build.main.java.version" value="8"/> -->
625 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
584 < <!--     </antcall> -->
622 >    <antcall target="clean"/>
623 >    <antcall target="test">
624 >      <param name="build.main.java.version" value="9"/>
625 >    </antcall>
626  
627 < <!--     <antcall target="clean"/> -->
628 < <!--     <antcall target="test"> -->
629 < <!--       <param name="build.main.java.version" value="9"/> -->
630 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
590 < <!--     </antcall> -->
627 >    <antcall target="clean"/>
628 >    <antcall target="test">
629 >      <param name="build.main.java.version" value="10"/>
630 >    </antcall>
631  
632 < <!--   </target> -->
632 >    <antcall target="clean"/>
633 >    <antcall target="test">
634 >      <param name="build.main.java.version" value="11"/>
635 >    </antcall>
636 >
637 >    <!-- Clean up to avoid obscure wrong class file version bugs -->
638 >    <antcall target="clean"/>
639 >
640 >  </target>
641  
642  
643  
644    <target name="configure-compiler">
645      <fail message="ant version too old">
646 <      <condition>
599 <        <not> <antversion atleast="1.9.1"/> </not>
600 <      </condition>
646 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
647      </fail>
648  
649      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 631 | Line 677
677        deprecation="${build.deprecation}"
678             source="${build.sourcelevel}"
679             target="${build.sourcelevel}"
680 +         encoding="ASCII"
681               fork="true">
682  
683        <compilerarg line="${build.args}"/>
# Line 642 | Line 689
689      <java classname="ALoops" fork="true">
690        <classpath refid="loops.classpath"/>
691      </java>
645
692    </target>
693  
694  
695    <target name="compile-test-loops" depends="jar"
696 <          description="compile all the perf tests in src/test/loops">
696 >          description="Compiles all the perf tests in src/test/loops">
697  
698      <mkdir dir="${build.dir}/test/loops"/>
699  
# Line 658 | Line 704
704             deprecation="${build.deprecation}"
705             includeAntRuntime="false"
706             includeJavaRuntime="false"
707 <           executable="${javac9}"
707 >           encoding="ASCII"
708 >           executable="${build.main.javac}"
709             fork="true">
710  
711        <include name="*.java"/>
# Line 666 | Line 713
713        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
714        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
715        <compilerarg line="${build.args}"/>
669
716      </javac>
671
717    </target>
718  
719  
# Line 691 | Line 736
736             bootclasspath="${bootclasspath8}"
737             includeAntRuntime="false"
738             includeJavaRuntime="false"
739 +           encoding="ASCII"
740             executable="${javac8}"
741             fork="true">
696
742        <include name="**/*.java"/>
743        <compilerarg value="-Xprefer:source"/>
744        <compilerarg value="-XDignore.symbol.file=true"/>
745        <compilerarg value="-Xlint:all"/>
746        <compilerarg value="-Werror"/>
747        <compilerarg line="${build.args}"/>
703
748      </javac>
749    </target>
750  
# Line 721 | Line 765
765             bootclasspath="${bootclasspath8}"
766             includeAntRuntime="false"
767             includeJavaRuntime="false"
768 +           encoding="ASCII"
769             executable="${javac8}"
770             fork="true">
726
771        <include name="**/*.java"/>
772        <compilerarg value="-Xprefer:source"/>
773        <compilerarg value="-XDignore.symbol.file=true"/>
774        <compilerarg value="-Xlint:all"/>
775 <      <compilerarg value="-Xdoclint:all/protected"/>
775 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
776        <compilerarg line="${build.args}"/>
733
777      </javac>
778    </target>
779  
# Line 746 | Line 789
789          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
790        </manifest>
791      </jar>
749
792    </target>
793  
794  
# Line 762 | Line 804
804          <!-- JDK9+ test classes -->
805          <exclude name="*9Test.java"/>
806          <exclude name="*10Test.java"/>
807 +        <compilerarg value="-Werror"/>
808        </javac-elements>
809      </run-tck-tests>
810    </target>
# Line 779 | Line 822
822  
823    <target name="4jdk8-test"
824            depends="4jdk8-tck, 4jdk8-jtreg"
825 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
783 <  </target>
825 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
826  
827  
828    <target name="4jdk8docs"
# Line 796 | Line 838
838               access="${build.javadoc.access}"
839               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
840               classpath=""
841 +             source="8"
842               executable="${javadoc8}"
843               failonerror = "true">
844        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 803 | Line 846
846        </fileset>
847        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
848        <arg value="-XDignore.symbol.file=true"/>
849 <      <arg value="-tag"/>
850 <      <arg value="${javadoc.jls.option}"/>
851 <      <arg value="-tag"/>
852 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
853 <      <arg value="-tag"/>
811 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
812 <      <arg value="-tag"/>
813 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
849 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
850 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
851 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
852 > <!-- @apiNote tag currently unused -->
853 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
854      </javadoc>
855    </target>
856  
# Line 822 | Line 862
862  
863    <target name="4jdk8clean"
864            description="Removes all 4jdk8 build products">
825
865      <delete dir="${build.4jdk8.dir}"/>
827
866    </target>
867  
868  
# Line 840 | Line 878
878    </target>
879  
880  
881 +  <!-- jsr166 4jdk7 (no longer maintained) -->
882  
883 <  <!-- jsr166 4jdk7 -->
845 <
846 <  <target name="4jdk7compile"
847 <          depends="configure-compiler"
848 <          description="Compiles src/jdk7 sources, targeting jdk7">
849 <
883 >  <target name="4jdk7compile" depends="configure-compiler">
884      <mkdir dir="${build.4jdk7.classes.dir}"/>
885  
886      <javac srcdir="${4jdk7src.dir}"
# Line 860 | Line 894
894             bootclasspath="${bootclasspath6}"
895             includeAntRuntime="false"
896             includeJavaRuntime="false"
897 +           encoding="ASCII"
898             executable="${javac7}"
899             fork="true">
900  
# Line 869 | Line 904
904        <compilerarg value="-Xlint:all"/>
905        <compilerarg value="-Werror"/>
906        <compilerarg line="${build.args}"/>
872
907      </javac>
908    </target>
909  
910 <  <target name="4jdk7doclint"
877 <          depends="configure-compiler"
878 <          description="Finds doclint warnings">
879 <
910 >  <target name="4jdk7doclint" depends="configure-compiler">
911      <mkdir dir="${build.4jdk7.classes.dir}"/>
912  
913      <javac srcdir="${4jdk7src.dir}"
# Line 890 | Line 921
921             bootclasspath="${bootclasspath6}"
922             includeAntRuntime="false"
923             includeJavaRuntime="false"
924 +           encoding="ASCII"
925             executable="${javac8}"
926             fork="true">
927  
# Line 899 | Line 931
931        <compilerarg value="-Xlint:all"/>
932        <compilerarg value="-Xdoclint:all/protected"/>
933        <compilerarg line="${build.args}"/>
902
934      </javac>
935    </target>
936  
937 <
907 <  <target name="4jdk7jar"
908 <          depends="4jdk7compile"
909 <          description="Builds library jar from compiled sources">
910 <
937 >  <target name="4jdk7jar" depends="4jdk7compile">
938      <jar destfile="${4jdk7product.jar}">
939        <fileset dir="${build.4jdk7.classes.dir}"/>
940        <manifest>
# Line 915 | Line 942
942          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
943        </manifest>
944      </jar>
918
945    </target>
946  
947 <
922 <  <target name="4jdk7-tck"
923 <          depends="4jdk7jar"
924 <          description="Runs tck tests for jsr166-4jdk7 directly">
925 <
947 >  <target name="4jdk7-tck" depends="4jdk7jar">
948      <run-tck-tests
949        target="7"
950        workdir="${build.4jdk7.dir}"
# Line 940 | Line 962
962          <exclude name="SplittableRandomTest.java"/>
963          <exclude name="StampedLockTest.java"/>
964          <exclude name="SubmissionPublisherTest.java"/>
965 +        <compilerarg value="-Werror"/>
966        </javac-elements>
967      </run-tck-tests>
968    </target>
969  
947
970    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
971 <  <target name="4jdk7-tck-junit"
950 <          depends="4jdk7compile">
971 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
972  
973      <junit printsummary="true"
974             showoutput="true"
# Line 969 | Line 990
990  
991        <test name="${jsr166.tckTestClass}" haltonfailure="no">
992        </test>
972
993      </junit>
994    </target>
995  
996 <  <target name="4jdk7-jtreg"
977 <          depends="4jdk7jar"
978 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
996 >  <target name="4jdk7-jtreg" depends="4jdk7jar">
997      <run-jtreg-tests
998         target="7"
999         workdir="${build.4jdk7.dir}"
1000         classes="${4jdk7product.jar}"/>
1001    </target>
1002  
1003 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1004  
1005 <  <target name="4jdk7-test"
987 <          depends="4jdk7-tck, 4jdk7-jtreg"
988 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
989 <  </target>
990 <
991 <
992 <  <target name="4jdk7docs"
993 <          description="Builds javadocs for src/jdk7 to dist dir">
994 <
1005 >  <target name="4jdk7docs">
1006      <delete dir="${4jdk7docs.dir}"/>
1007      <mkdir dir="${4jdk7docs.dir}"/>
1008  
# Line 1012 | Line 1023
1023      </javadoc>
1024    </target>
1025  
1026 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1027  
1028 <  <target name="4jdk7dist"
1017 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1018 <          description="Puts all distributable products in single hierarchy"/>
1019 <
1020 <
1021 <  <target name="4jdk7clean"
1022 <          description="Removes all 4jdk7 build products">
1023 <
1028 >  <target name="4jdk7clean">
1029      <delete dir="${build.4jdk7.dir}"/>
1025
1030    </target>
1031  
1032 <
1029 <  <target name="4jdk7dist-jar"
1030 <          depends="4jdk7clean, 4jdk7jar">
1032 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1033      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1034    </target>
1035  
1036 <
1035 <  <target name="4jdk7dist-docs"
1036 <          depends="4jdk7clean, 4jdk7docs">
1036 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1037      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1038    </target>
1039  
1040  
1041 <  <!-- jsr166x -->
1042 <
1043 <  <target name="jsr166xcompile"
1044 <          depends="configure-compiler"
1045 <          description="Compiles jsr166x sources to build dir">
1041 >  <!-- jsr166x (no longer maintained) -->
1042  
1043 +  <target name="jsr166xcompile" depends="configure-compiler">
1044      <mkdir dir="${build.jsr166x.classes.dir}"/>
1045  
1046      <javac srcdir="${topsrc.dir}"
# Line 1057 | Line 1054
1054             target="5"
1055             includeAntRuntime="false"
1056             includeJavaRuntime="false"
1057 +           encoding="ASCII"
1058             executable="${javac7}"
1059             fork="true">
1062
1060        <include name="jsr166x/**/*.java"/>
1061        <compilerarg value="-XDignore.symbol.file=true"/>
1062        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1063        <compilerarg value="-Werror"/>
1064        <compilerarg line="${build.args}"/>
1068
1065      </javac>
1066    </target>
1067  
1068 <
1073 <  <target name="jsr166xjar"
1074 <          depends="jsr166xcompile"
1075 <          description="Builds library jar from compiled sources">
1076 <
1068 >  <target name="jsr166xjar" depends="jsr166xcompile">
1069      <jar destfile="${jsr166x.jar}">
1070        <fileset dir="${build.jsr166x.classes.dir}"/>
1071        <manifest>
# Line 1081 | Line 1073
1073          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1074        </manifest>
1075      </jar>
1084
1076    </target>
1077  
1078 <
1088 <  <target name="jsr166xdocs"
1089 <          description="Builds javadocs to dist dir">
1090 <
1078 >  <target name="jsr166xdocs">
1079      <delete dir="${jsr166xdocs.dir}"/>
1080      <mkdir dir="${jsr166xdocs.dir}"/>
1081  
# Line 1102 | Line 1090
1090               failonerror = "true">
1091        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1092        <arg value="-XDignore.symbol.file=true"/>
1105
1093      </javadoc>
1094    </target>
1095  
1096 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1097  
1098 <  <target name="jsr166xdist"
1111 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1112 <          description="Puts all distributable products in single hierarchy"/>
1113 <
1114 <
1115 <  <target name="jsr166xclean"
1116 <          description="Removes all jsr166x build products">
1117 <
1098 >  <target name="jsr166xclean">
1099      <delete dir="${build.jsr166x.dir}"/>
1119
1100    </target>
1101  
1102 <
1123 <  <target name="jsr166xdist-jar"
1124 <          depends="jsr166xclean, jsr166xjar">
1102 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1103      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1104    </target>
1105  
1106 <  <target name="jsr166xdist-docs"
1129 <          depends="jsr166xclean, jsr166xdocs">
1106 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1107      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1108    </target>
1109  
1133  <!-- jsr166y -->
1110  
1111 +  <!-- jsr166y (no longer maintained) -->
1112  
1113 <  <target name="jsr166ycompile"
1137 <          depends="configure-compiler"
1138 <          description="Compiles jsr166y sources">
1139 <
1113 >  <target name="jsr166ycompile" depends="configure-compiler">
1114      <mkdir dir="${build.jsr166y.classes.dir}"/>
1115  
1116      <javac srcdir="${topsrc.dir}"
# Line 1150 | Line 1124
1124             bootclasspath="${bootclasspath6}"
1125             includeAntRuntime="false"
1126             includeJavaRuntime="false"
1127 +           encoding="ASCII"
1128             executable="${javac7}"
1129             fork="true">
1130  
# Line 1158 | Line 1133
1133        <compilerarg value="-Xlint:all"/>
1134        <compilerarg value="-Werror"/>
1135        <compilerarg line="${build.args}"/>
1161
1136      </javac>
1137    </target>
1138  
1139 <
1166 <  <target name="jsr166yjar"
1167 <          depends="jsr166ycompile"
1168 <          description="Builds library jar from compiled sources">
1169 <
1139 >  <target name="jsr166yjar" depends="jsr166ycompile">
1140      <jar destfile="${jsr166y.jar}" index="true">
1141        <fileset dir="${build.jsr166y.classes.dir}"/>
1142        <manifest>
# Line 1174 | Line 1144
1144          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1145        </manifest>
1146      </jar>
1177
1147    </target>
1148  
1149 <
1181 <  <target name="jsr166ydocs"
1182 <          description="Builds javadocs to dist dir">
1183 <
1149 >  <target name="jsr166ydocs">
1150      <delete dir="${jsr166ydocs.dir}"/>
1151      <mkdir dir="${jsr166ydocs.dir}"/>
1152  
# Line 1195 | Line 1161
1161               failonerror = "true">
1162        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1163        <arg value="-XDignore.symbol.file=true"/>
1198
1164      </javadoc>
1165    </target>
1166  
1167 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1168  
1169 <  <target name="jsr166ydist"
1204 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1205 <          description="Puts all distributable products in single hierarchy"/>
1206 <
1207 <
1208 <  <target name="jsr166yclean"
1209 <          description="Removes all jsr166y build products">
1210 <
1169 >  <target name="jsr166yclean">
1170      <delete dir="${build.jsr166y.dir}"/>
1212
1171    </target>
1172  
1173 <
1216 <  <target name="jsr166ydist-jar"
1217 <          depends="jsr166yclean, jsr166yjar">
1173 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1174      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1175    </target>
1176  
1177 <  <target name="jsr166ydist-docs"
1222 <          depends="jsr166yclean, jsr166ydocs">
1177 >  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1178      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1179    </target>
1180  
1181  
1182 <  <!-- extra166y -->
1228 <
1229 <
1230 <  <target name="extra166ycompile"
1231 <          depends="configure-compiler, jsr166yjar"
1232 <          description="Compiles extra166y sources">
1182 >  <!-- extra166y (no longer maintained) -->
1183  
1184 +  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1185      <mkdir dir="${build.extra166y.classes.dir}"/>
1186  
1187      <javac srcdir="${topsrc.dir}"
# Line 1244 | Line 1195
1195             target="6"
1196             includeAntRuntime="false"
1197             includeJavaRuntime="false"
1198 +           encoding="ASCII"
1199             executable="${javac7}"
1200             fork="true">
1201  
# Line 1252 | Line 1204
1204        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1205        <compilerarg value="-Werror"/>
1206        <compilerarg line="${build.args}"/>
1255
1207      </javac>
1208    </target>
1209  
1210 <
1260 <  <target name="extra166yjar"
1261 <          depends="extra166ycompile"
1262 <          description="Builds library jar from compiled sources">
1263 <
1210 >  <target name="extra166yjar" depends="extra166ycompile">
1211      <jar destfile="${extra166y.jar}" index="true">
1212        <fileset dir="${build.extra166y.classes.dir}"/>
1213        <manifest>
# Line 1268 | Line 1215
1215          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1216        </manifest>
1217      </jar>
1271
1218    </target>
1219  
1220 <
1275 <  <target name="extra166ydocs"
1276 <          description="Builds javadocs to build dir">
1277 <
1220 >  <target name="extra166ydocs">
1221      <delete dir="${extra166ydocs.dir}"/>
1222      <mkdir dir="${extra166ydocs.dir}"/>
1223  
# Line 1288 | Line 1231
1231               executable="${javadoc7}">
1232        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1233        <arg value="-XDignore.symbol.file=true"/>
1291
1234      </javadoc>
1235    </target>
1236  
1237 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1238  
1239 <  <target name="extra166ydist"
1297 <          depends="extra166ydist-jar, extra166ydist-docs"
1298 <          description="Puts all distributable products in single hierarchy"/>
1299 <
1300 <
1301 <  <target name="extra166yclean"
1302 <          description="Removes all extra166y build products">
1303 <
1239 >  <target name="extra166yclean">
1240      <delete dir="${build.extra166y.dir}"/>
1305
1241    </target>
1242  
1243 <
1309 <  <target name="extra166ydist-jar"
1310 <          depends="extra166yclean, extra166yjar">
1243 >  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1244      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1245    </target>
1246  
1247 <  <target name="extra166ydist-docs"
1315 <          depends="extra166yclean, extra166ydocs">
1247 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1248      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1249    </target>
1250  
1251 <  <!-- jsr166e -->
1251 >
1252 >  <!-- jsr166e (no longer maintained) -->
1253  
1254    <property name="build.jsr166e.java.version" value="6"/>
1255    <property name="build.jsr166e.javac" value="${javac6}"/>
1256  
1257 <  <target name="jsr166ecompile"
1325 <          depends="configure-compiler"
1326 <          description="Compiles jsr166e sources">
1327 <
1257 >  <target name="jsr166ecompile" depends="configure-compiler">
1258      <mkdir dir="${build.jsr166e.classes.dir}"/>
1259  
1260      <javac srcdir="${topsrc.dir}"
# Line 1345 | Line 1275
1275        <compilerarg value="-Xlint:all"/>
1276        <compilerarg value="-Werror"/>
1277        <compilerarg line="${build.args}"/>
1348
1278      </javac>
1279    </target>
1280  
1352  <!-- jsr166e: find doclint errors -->
1281    <target name="jsr166edoclint">
1354
1282      <mkdir dir="${build.jsr166e.classes.dir}"/>
1283  
1284      <javac srcdir="${topsrc.dir}"
# Line 1373 | Line 1300
1300        <compilerarg value="-Xlint:all"/>
1301        <compilerarg value="-Werror"/>
1302        <compilerarg value="-Xdoclint:all/protected"/>
1376
1303      </javac>
1304    </target>
1305  
1306 <
1381 <  <target name="jsr166ejar"
1382 <          depends="jsr166ecompile"
1383 <          description="Builds library jar from compiled sources">
1384 <
1306 >  <target name="jsr166ejar" depends="jsr166ecompile">
1307      <jar destfile="${jsr166e.jar}" index="true">
1308        <fileset dir="${build.jsr166e.classes.dir}"/>
1309        <manifest>
# Line 1389 | Line 1311
1311          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1312        </manifest>
1313      </jar>
1392
1314    </target>
1315  
1316 <
1396 <  <target name="jsr166edocs"
1397 <          description="Builds javadocs to build dir">
1398 <
1316 >  <target name="jsr166edocs">
1317      <delete dir="${jsr166edocs.dir}"/>
1318      <mkdir dir="${jsr166edocs.dir}"/>
1319  
# Line 1409 | Line 1327
1327               failonerror = "true">
1328        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1329        <arg value="-XDignore.symbol.file=true"/>
1412
1330      </javadoc>
1331    </target>
1332  
1333 <
1417 <  <target name="jsr166e-tck-one-java-version"
1418 <          depends="jsr166ejar">
1419 <
1333 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1334      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1421
1335      <run-tck-tests
1336        tck.src.dir="${test.src.dir}/tck-jsr166e"
1337        target="${build.jsr166e.java.version}"
# Line 1426 | Line 1339
1339        classes="${jsr166e.jar}"/>
1340    </target>
1341  
1342 <  <target name="jsr166e-tck"
1430 <          description="Runs tck tests for jsr166e for multiple java versions">
1342 >  <target name="jsr166e-tck">
1343  
1344   <!--     <antcall target="clean"/> -->
1345   <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1448 | Line 1360
1360      </antcall>
1361    </target>
1362  
1363 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1364  
1365 <  <target name="jsr166e-test"
1453 <          depends="jsr166e-tck"
1454 <          description="Runs all tests for jsr166e">
1455 <  </target>
1456 <
1457 <  <target name="jsr166edist"
1458 <          depends="jsr166edist-jar, jsr166edist-docs"
1459 <          description="Puts all distributable products in single hierarchy"/>
1365 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1366  
1367 <
1462 <  <target name="jsr166eclean"
1463 <          description="Removes all jsr166e build products">
1367 >  <target name="jsr166eclean">
1368      <delete dir="${build.jsr166e.dir}"/>
1369    </target>
1370  
1467
1371    <target name="jsr166edist-jar"
1372            depends="jsr166eclean, jsr166ejar">
1373      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1374    </target>
1375  
1376 <  <target name="jsr166edist-docs"
1474 <          depends="jsr166eclean, jsr166edocs">
1376 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1377      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1378    </target>
1379  
# Line 1492 | Line 1394
1394    </target>
1395  
1396  
1397 + <!-- ==============================================================
1398 +  Experimental errorprone support - http://errorprone.info
1399 + =================================================================== -->
1400 +  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1401 +  <property name="errorprone.jsr166.flags"
1402 +            value="-Xep:HashtableContains:OFF
1403 +                   -Xep:JdkObsolete:OFF
1404 +                   -Xep:MissingOverride:OFF
1405 +                   -Xep:MissingFail:OFF
1406 +                   -Xep:MixedArrayDimensions:ERROR
1407 +                   -Xep:RemoveUnusedImports:ERROR
1408 +                   -Xep:EmptyIf:ERROR
1409 +                   -Xep:MultipleTopLevelClasses:ERROR
1410 +                   -Xep:ClassName:ERROR
1411 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1412 +                   -Xep:RedundantThrows:ERROR
1413 +                   -Xep:IdentityBinaryExpression:WARN
1414 +                   -Xep:MethodCanBeStatic:WARN"/>
1415 +  <!-- -Xep:WildcardImport:ERROR -->
1416 +  <property name="errorprone.jsr166.test.flags"
1417 +            value="-Xep:StringSplitter:OFF
1418 +                   -Xep:BoxedPrimitiveConstructor:OFF
1419 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1420 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1421 +  <target name="errorprone"
1422 +          depends="clean, configure-compiler"
1423 +          description="Run errorprone over jsr166 source code (experimental)">
1424 +
1425 +    <local name="destdir"/>
1426 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1427 +    <mkdir dir="${destdir}"/>
1428 +
1429 +    <javac srcdir="${src.dir}"
1430 +           destdir="${destdir}"
1431 +           debug="${build.debug}"
1432 +           debuglevel="${build.debuglevel}"
1433 +           deprecation="${build.deprecation}"
1434 +           classpath=""
1435 +           includeAntRuntime="false"
1436 +           includeJavaRuntime="false"
1437 +           encoding="ASCII"
1438 +           executable="${build.main.javac}"
1439 +           fork="true">
1440 +
1441 +      <include name="**/*.java"/>
1442 +      <compilerarg value="-XDcompilePolicy=simple"/>
1443 +      <compilerarg line="-processorpath ${errorprone.jar}"/>
1444 +      <compilerarg value="-Xplugin:ErrorProne
1445 +                          ${errorprone.jsr166.flags}"/>
1446 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1447 +      <compilerarg value="-Xprefer:source"/>
1448 +      <compilerarg value="-XDignore.symbol.file=true"/>
1449 +      <compilerarg value="-Xlint:all"/>
1450 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1451 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1452 +      <compilerarg line="${build.args}"/>
1453 +    </javac>
1454 +
1455 +    <jar destfile="${product.jar}">
1456 +      <fileset dir="${destdir}"/>
1457 +    </jar>
1458 +
1459 +    <run-tck-tests
1460 +      target="${build.main.java.version}"
1461 +      workdir="${build.dir}"
1462 +      classes="${product.jar}">
1463 +      <javac-elements>
1464 +        <compilerarg value="-XDcompilePolicy=simple"/>
1465 +        <compilerarg line="-processorpath ${errorprone.jar}"/>
1466 +        <compilerarg value="-Xplugin:ErrorProne
1467 +                            ${errorprone.jsr166.flags}
1468 +                            ${errorprone.jsr166.test.flags}"/>
1469 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1470 +      </javac-elements>
1471 +    </run-tck-tests>
1472 +  </target>
1473 +
1474 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1475 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1476 +  <target name="errorprone-jtreg"
1477 +          depends="jar"
1478 +          description="Run errorprone over jtreg tests (experimental)">
1479 +
1480 +    <run-jtreg-tests
1481 +       target="${build.main.java.version}"
1482 +       workdir="${build.dir}"
1483 +       classes="${product.jar}"
1484 +       verbose="all">
1485 +      <jtreg-elements>
1486 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1487 +        <arg value="-javacoption:-processorpath"/>
1488 +        <arg value="-javacoption:${errorprone.jar}"/>
1489 +        <arg value="-javacoption:-Xplugin:ErrorProne
1490 +                            ${errorprone.jsr166.flags}
1491 +                            ${errorprone.jsr166.test.flags}
1492 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1493 +      </jtreg-elements>
1494 +    </run-jtreg-tests>
1495 +  </target>
1496 +
1497 +
1498 + <!-- ==============================================================
1499 +  Running guava tests against jsr166 code
1500 + =================================================================== -->
1501 +
1502 + <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1503 + <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1504 + <!-- <property name="guava.version" value="21.0"/> -->
1505 +
1506 + <!-- HOWTO debug print a path id -->
1507 + <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1508 + <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1509 +
1510 + <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1511 + <!--   organisation="com.google.guava" module="guava-tests"/> -->
1512 + <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1513 + <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1514 + <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1515 + <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1516 +
1517 + <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1518 + <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1519 + <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1520 + <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1521 +
1522 + <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1523 + <!--   type="*" inline="true" conf="*(private),*(public)" -->
1524 + <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1525 + <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1526 +
1527 + <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1528 + <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1529 + <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1530 +
1531 +  <target name="init-ivy">
1532 +    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1533 +         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1534 +    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1535 +             classpath="${build.dir}/ivy.jar"/>
1536 +  </target>
1537 +
1538 +  <target name="guava-tests" depends="jar, init-ivy"
1539 +          description="Guava tests run against jsr166 collections">
1540 +    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1541 +    <mkdir dir="${guava.dir}"/>
1542 +    <ivy:retrieve pathid="guava.testlib.classpath"
1543 +      type="jar,bundle" inline="true" conf="default,master"
1544 +      pattern="${guava.dir}/[artifact].[ext]"
1545 +      organisation="com.google.guava" module="guava-testlib"/>
1546 +    <property name="guava.version" value="21.0"/>
1547 +    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1548 +         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1549 +    <junit printsummary="true" showoutput="true" haltonfailure="true"
1550 +           jvm="${build.main.java}" fork="true">
1551 +      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1552 +      <formatter type="brief"/>
1553 +      <classpath>
1554 +        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1555 +        <path refid="guava.testlib.classpath"/>
1556 +      </classpath>
1557 +
1558 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1559 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1560 +    </junit>
1561 +  </target>
1562 +
1563   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines