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.223 by jsr166, Thu Nov 24 01:53:50 2016 UTC vs.
Revision 1.279 by jsr166, Mon Oct 1 03:04:48 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>
7   ------------------------------------------------------------------------------
# Line 17 | 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:
20  $HOME/jdk/jdk6
21  $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
25  $HOME/jdk/src/jdk6
26  $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"
37 <  target is currently broken.
40 >  As of 2016-03, the sources in src/main are for jdk9+ only.
41   ------------------------------------------------------------------------------
42    </description>
43  
# Line 63 | Line 66
66    <property name="build.classes.dir"           location="${build.dir}/classes"/>
67    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
68    <property name="build.loops.dir"             location="${build.dir}/loops"/>
66  <property name="build.reports.dir"           location="${build.dir}/reports"/>
69  
70    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
71    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
# 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 >  <!-- But pin to jdk 10 until fix for -->
208 >  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
209 >  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
210  
211    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
212    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 198 | Line 214
214    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
215    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
216    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
217 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
218 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
219 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
220    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
221  
222    <!-- Define the "jtreg" task -->
# Line 230 | Line 249
249  
250      <local name="modules"/>
251      <condition property="modules">
252 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
252 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
253 >    </condition>
254 >
255 >    <local name="use-doclint"/>
256 >    <condition property="use-doclint">
257 >      <not> <equals arg1="@{target}" arg2="7"/> </not>
258      </condition>
259  
260      <mkdir dir="@{workdir}/tck-classes"/>
# Line 252 | Line 276
276        <include name="*.java"/>
277        <compilerarg value="-XDignore.symbol.file=true"/>
278        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
279 +      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
280        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
281 <      <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
281 >      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
282        <compilerarg line="${build.args}"/>
283        <javac-elements/>
284  
# Line 264 | Line 289
289            jvm="${java@{target}}"
290            fork="true">
291          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
292 <        <jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
292 >        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
293 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
294 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
295 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
296 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
297 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
298          <jvmarg line="@{jvmflags}"/>
299          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
300          <jvmarg line="${vmoptions}" if:set="vmoptions"/>
# Line 286 | Line 316
316    </macrodef>
317  
318    <!-- Define jtreg test sets for different jdk versions -->
319 <  <fileset dir="${jtreg9.src.dir}">
320 <    <patternset id="jdk9.jtreg.tests">
321 <      <include name="**/*.java"/>
322 <    </patternset>
323 <  </fileset>
324 <
325 <  <fileset dir="${jtreg8.src.dir}">
326 <    <patternset id="jdk8.jtreg.tests">
327 <      <include name="**/*.java"/>
328 <      <exclude name="**/SpliteratorCharacteristics.java"/>
329 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
330 <      <exclude name="**/GCDuringIteration.java"/>
331 <    </patternset>
302 <  </fileset>
319 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
320 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
321 >  <property name="jtreg.test.pattern" value="**/*.java"/>
322 >  <macrodef name="defjtregtests">
323 >    <attribute name="v"/>
324 >    <sequential>
325 >      <fileset dir="${jtreg@{v}.src.dir}">
326 >        <patternset id="jdk@{v}.jtreg.tests">
327 >          <include name="${jtreg.test.pattern}"/>
328 >        </patternset>
329 >      </fileset>
330 >    </sequential>
331 >  </macrodef>
332  
333 <  <fileset dir="${jtreg7.src.dir}">
334 <    <patternset id="jdk7.jtreg.tests">
335 <      <include name="**/*.java"/>
336 <    </patternset>
337 <  </fileset>
333 >  <defjtregtests v="12"/>
334 >  <defjtregtests v="11"/>
335 >  <defjtregtests v="10"/>
336 >  <defjtregtests v="9"/>
337 >  <defjtregtests v="8"/>
338 >  <defjtregtests v="7"/>
339  
340    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
341    <property name="jtreg.flags" value=""/>
342  
343    <macrodef name="run-jtreg-tests">
344      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
315    <attribute name="source" default="7"/>
345      <attribute name="target"/>
346      <attribute name="workdir"/>
347      <attribute name="classes"/>
348 +    <attribute name="verbose" default="${jtreg.verbose}"/>
349      <attribute name="jtregflags" default=""/>
350 +    <element name="jtreg-elements" optional="true"/>
351  
352      <sequential>
353  
# Line 325 | Line 356
356  
357      <local name="modules"/>
358      <condition property="modules">
359 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
359 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
360      </condition>
361  
362      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 334 | Line 365
365             workDir="@{workdir}/JTwork">
366        <patternset refid="jdk@{target}.jtreg.tests"/>
367        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
368 <      <arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
369 <      <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
368 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
369 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
370        <arg value="-agentvm"/>
371        <arg value="-noreport"/>
372 <      <arg value="-verbose:${jtreg.verbose}"/>
372 >      <arg value="-verbose:@{verbose}"/>
373        <arg value="-vmoptions:-esa -ea"/>
374        <arg value="-automatic"/>
375        <arg value="-k:!ignore"/>
376        <arg line="@{jtregflags}"/>
377        <arg line="${jtreg.flags}"/>
378 +      <jtreg-elements/>
379      </jtreg>
380      </sequential>
381    </macrodef>
# Line 359 | Line 391
391  
392    <!-- Main targets -->
393  
394 <  <property name="build.main.java.version" value="9"/>
395 <  <property name="build.main.javac" value="${javac9}"/>
394 >  <property name="build.main.java.version" value="11"/>
395 >  <!-- Workaround "no nested properties in ant" -->
396 >  <macrodef name="define-build-main-properties">
397 >    <attribute name="v"/>
398 >    <sequential>
399 >      <property name="build.main.java"    value="${java@{v}}"/>
400 >      <property name="build.main.javac"   value="${javac@{v}}"/>
401 >      <!-- Force javadoc version to be at least 10,
402 >           so we can use override-methods=summary -->
403 >      <condition property="build.main.javadoc"
404 >                 value="${javadoc11}"
405 >                 else="${javadoc@{v}}">
406 >        <equals arg1="@{v}" arg2="9"/>
407 >      </condition>
408 >    </sequential>
409 >  </macrodef>
410 >  <define-build-main-properties v="${build.main.java.version}"/>
411  
412    <target name="dists"
413 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
413 >          depends="dist, 4jdk8dist"
414            description="Builds all public jars and docs"/>
415 +          <!--
416 +              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
417 +          -->
418  
419    <target name="compile"
420            depends="configure-compiler"
421            description="Compiles src/main sources to build dir">
422  
373    <local name="modules"/>
374    <condition property="modules">
375      <and>
376        <available file="${jdk9.home}/jmods" type="dir"/>
377        <equals arg1="9" arg2="${build.main.java.version}"/>
378      </and>
379    </condition>
380
423      <local name="destdir"/>
424 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
383 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
424 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
425  
426      <mkdir dir="${destdir}"/>
427  
# Line 397 | Line 438
438             fork="true">
439  
440        <include name="**/*.java"/>
441 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
441 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
442        <compilerarg value="-Xprefer:source"/>
443        <compilerarg value="-XDignore.symbol.file=true"/>
444        <compilerarg value="-Xlint:all"/>
445 +      <compilerarg line="--doclint-format html5"/>
446 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
447        <compilerarg value="-Werror"/>
405      <compilerarg value="-Xdoclint:all/protected"/>
448        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
449        <compilerarg line="${build.args}"/>
450  
# Line 434 | Line 476
476      <!-- the packagenames="none" hack below prevents scanning the -->
477      <!-- sourcepath for packages -->
478  
479 < <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
480 < <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
479 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
480 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
481 > <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
482 > <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
483 > <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
484      <javadoc destdir="${docs.dir}"
485               packagenames="none"
486 <             link="${java9.api.url}"
486 >             link="${java10.api.url}"
487               overview="${src.dir}/intro.html"
488               access="${build.javadoc.access}"
489               sourcepath="${src.dir}"
490               classpath=""
491 <             executable="${javadoc9}">
491 >             source="11"
492 >             executable="${build.main.javadoc}">
493        <fileset dir="${src.dir}" defaultexcludes="yes">
494          <include name="**/*.java"/>
495        </fileset>
496 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
496 >      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
497        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
498        <arg value="-XDignore.symbol.file=true"/>
499 <      <arg value="-Xmodule:java.base"/>
500 <      <arg value="-tag"/>
501 <      <arg value="${javadoc.jls.option}"/>
502 < <!-- @apiNote currently unused -->
503 < <!--       <arg value="-tag"/> -->
504 < <!--       <arg value="apiNote:a:API Note:"/> -->
505 <      <arg value="-tag"/>
460 <      <arg value="implSpec:a:Implementation Requirements:"/>
461 <      <arg value="-tag"/>
462 <      <arg value="implNote:a:Implementation Note:"/>
499 >      <arg value="-html5"/>
500 >      <arg value="--patch-module=java.base=${src.dir}"/>
501 >      <arg value="--override-methods=summary"/>
502 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
503 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
504 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
505 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
506   <!-- tags added in jdk9: currently unused -->
507 < <!--       <arg value="-tag"/> -->
508 < <!--       <arg value="revised:X"/> -->
466 < <!--       <arg value="-tag"/> -->
467 < <!--       <arg value="spec:X"/> -->
507 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
508 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
509      </javadoc>
510    </target>
511  
# Line 498 | Line 539
539  
540    <target name="clean"
541            description="Removes all build products">
501
542      <delete dir="${build.dir}"/>
503
543    </target>
544  
545  
546    <target name="dist-clean"
547            description="Removes all build and distribution products">
509
548      <delete dir="${build.dir}"/>
549      <delete dir="${dist.dir}"/>
512
550    </target>
551  
552  
# Line 530 | Line 567
567      <run-tck-tests
568        target="${build.main.java.version}"
569        workdir="${build.dir}"
570 <      classes="${product.jar}"/>
570 >      classes="${product.jar}">
571 >      <javac-elements>
572 >        <compilerarg value="-Werror"/>
573 >      </javac-elements>
574 >    </run-tck-tests>
575    </target>
576  
577    <target name="tck-parallelism-1"
# Line 565 | Line 606
606  
607    <target name="test"
608            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
609 <          description="Runs tck and jtreg tests for src/main">
569 <  </target>
609 >          description="Runs tck and jtreg tests for src/main"/>
610  
611   <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
612  
# Line 577 | Line 617
617  
618   <!--   </target> -->
619  
620 < <!--   <target name="test89" -->
621 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
620 >  <target name="test9101112"
621 >          description="Runs tck and jtreg tests for src/main for multiple java versions">
622  
623 < <!--     <antcall target="clean"/> -->
624 < <!--     <antcall target="test"> -->
625 < <!--       <param name="build.main.java.version" value="8"/> -->
626 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
627 < <!--     </antcall> -->
623 >    <antcall target="clean"/>
624 >    <antcall target="test">
625 >      <param name="build.main.java.version" value="9"/>
626 >      <param name="build.main.java" value="${java9}"/>
627 >      <param name="build.main.javac" value="${javac9}"/>
628 >    </antcall>
629  
630 < <!--     <antcall target="clean"/> -->
631 < <!--     <antcall target="test"> -->
632 < <!--       <param name="build.main.java.version" value="9"/> -->
633 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
634 < <!--     </antcall> -->
630 >    <antcall target="clean"/>
631 >    <antcall target="test">
632 >      <param name="build.main.java.version" value="10"/>
633 >      <param name="build.main.java" value="${java10}"/>
634 >      <param name="build.main.javac" value="${javac10}"/>
635 >    </antcall>
636  
637 < <!--   </target> -->
637 >    <antcall target="clean"/>
638 >    <antcall target="test">
639 >      <param name="build.main.java.version" value="11"/>
640 >      <param name="build.main.java" value="${java11}"/>
641 >      <param name="build.main.javac" value="${javac11}"/>
642 >    </antcall>
643 >
644 >    <antcall target="clean"/>
645 >    <antcall target="test">
646 >      <param name="build.main.java.version" value="12"/>
647 >      <param name="build.main.java" value="${java12}"/>
648 >      <param name="build.main.javac" value="${javac12}"/>
649 >    </antcall>
650 >    <antcall target="docs">
651 >      <param name="build.main.java.version" value="12"/>
652 >      <param name="build.main.java" value="${java12}"/>
653 >      <param name="build.main.javac" value="${javac12}"/>
654 >      <param name="build.main.javadoc" value="${javadoc12}"/>
655 >    </antcall>
656 >
657 >    <!-- Clean up to avoid obscure wrong class file version bugs -->
658 >    <antcall target="clean"/>
659 >
660 >  </target>
661  
662  
663  
664    <target name="configure-compiler">
665      <fail message="ant version too old">
666 <      <condition>
602 <        <not> <antversion atleast="1.9.1"/> </not>
603 <      </condition>
666 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
667      </fail>
668  
669      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 646 | Line 709
709      <java classname="ALoops" fork="true">
710        <classpath refid="loops.classpath"/>
711      </java>
649
712    </target>
713  
714  
715    <target name="compile-test-loops" depends="jar"
716 <          description="compile all the perf tests in src/test/loops">
716 >          description="Compiles all the perf tests in src/test/loops">
717  
718      <mkdir dir="${build.dir}/test/loops"/>
719  
# Line 663 | Line 725
725             includeAntRuntime="false"
726             includeJavaRuntime="false"
727             encoding="ASCII"
728 <           executable="${javac9}"
728 >           executable="${build.main.javac}"
729             fork="true">
730  
731        <include name="*.java"/>
# Line 671 | Line 733
733        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
734        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
735        <compilerarg line="${build.args}"/>
674
736      </javac>
676
737    </target>
738  
739  
# Line 699 | Line 759
759             encoding="ASCII"
760             executable="${javac8}"
761             fork="true">
702
762        <include name="**/*.java"/>
763        <compilerarg value="-Xprefer:source"/>
764        <compilerarg value="-XDignore.symbol.file=true"/>
765        <compilerarg value="-Xlint:all"/>
766        <compilerarg value="-Werror"/>
767        <compilerarg line="${build.args}"/>
709
768      </javac>
769    </target>
770  
# Line 730 | Line 788
788             encoding="ASCII"
789             executable="${javac8}"
790             fork="true">
733
791        <include name="**/*.java"/>
792        <compilerarg value="-Xprefer:source"/>
793        <compilerarg value="-XDignore.symbol.file=true"/>
794        <compilerarg value="-Xlint:all"/>
795 <      <compilerarg value="-Xdoclint:all/protected"/>
795 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
796        <compilerarg line="${build.args}"/>
740
797      </javac>
798    </target>
799  
# Line 753 | Line 809
809          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
810        </manifest>
811      </jar>
756
812    </target>
813  
814  
# Line 769 | Line 824
824          <!-- JDK9+ test classes -->
825          <exclude name="*9Test.java"/>
826          <exclude name="*10Test.java"/>
827 +        <compilerarg value="-Werror"/>
828        </javac-elements>
829      </run-tck-tests>
830    </target>
# Line 786 | Line 842
842  
843    <target name="4jdk8-test"
844            depends="4jdk8-tck, 4jdk8-jtreg"
845 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
790 <  </target>
845 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
846  
847  
848    <target name="4jdk8docs"
# Line 803 | Line 858
858               access="${build.javadoc.access}"
859               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
860               classpath=""
861 +             source="8"
862               executable="${javadoc8}"
863               failonerror = "true">
864        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 810 | Line 866
866        </fileset>
867        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
868        <arg value="-XDignore.symbol.file=true"/>
869 <      <arg value="-tag"/>
870 <      <arg value="${javadoc.jls.option}"/>
871 < <!-- @apiNote currently unused -->
872 < <!--       <arg value="-tag"/> -->
873 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
818 <      <arg value="-tag"/>
819 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
820 <      <arg value="-tag"/>
821 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
869 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
870 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
871 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
872 > <!-- @apiNote tag currently unused -->
873 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
874      </javadoc>
875    </target>
876  
# Line 830 | Line 882
882  
883    <target name="4jdk8clean"
884            description="Removes all 4jdk8 build products">
833
885      <delete dir="${build.4jdk8.dir}"/>
835
886    </target>
887  
888  
# Line 848 | Line 898
898    </target>
899  
900  
901 +  <!-- jsr166 4jdk7 (no longer maintained) -->
902  
903 <  <!-- jsr166 4jdk7 -->
853 <
854 <  <target name="4jdk7compile"
855 <          depends="configure-compiler"
856 <          description="Compiles src/jdk7 sources, targeting jdk7">
857 <
903 >  <target name="4jdk7compile" depends="configure-compiler">
904      <mkdir dir="${build.4jdk7.classes.dir}"/>
905  
906      <javac srcdir="${4jdk7src.dir}"
# Line 878 | Line 924
924        <compilerarg value="-Xlint:all"/>
925        <compilerarg value="-Werror"/>
926        <compilerarg line="${build.args}"/>
881
927      </javac>
928    </target>
929  
930 <  <target name="4jdk7doclint"
886 <          depends="configure-compiler"
887 <          description="Finds doclint warnings">
888 <
930 >  <target name="4jdk7doclint" depends="configure-compiler">
931      <mkdir dir="${build.4jdk7.classes.dir}"/>
932  
933      <javac srcdir="${4jdk7src.dir}"
# Line 909 | Line 951
951        <compilerarg value="-Xlint:all"/>
952        <compilerarg value="-Xdoclint:all/protected"/>
953        <compilerarg line="${build.args}"/>
912
954      </javac>
955    </target>
956  
957 <
917 <  <target name="4jdk7jar"
918 <          depends="4jdk7compile"
919 <          description="Builds library jar from compiled sources">
920 <
957 >  <target name="4jdk7jar" depends="4jdk7compile">
958      <jar destfile="${4jdk7product.jar}">
959        <fileset dir="${build.4jdk7.classes.dir}"/>
960        <manifest>
# Line 925 | Line 962
962          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
963        </manifest>
964      </jar>
928
965    </target>
966  
967 <
932 <  <target name="4jdk7-tck"
933 <          depends="4jdk7jar"
934 <          description="Runs tck tests for jsr166-4jdk7 directly">
935 <
967 >  <target name="4jdk7-tck" depends="4jdk7jar">
968      <run-tck-tests
969        target="7"
970        workdir="${build.4jdk7.dir}"
# Line 950 | Line 982
982          <exclude name="SplittableRandomTest.java"/>
983          <exclude name="StampedLockTest.java"/>
984          <exclude name="SubmissionPublisherTest.java"/>
985 +        <compilerarg value="-Werror"/>
986        </javac-elements>
987      </run-tck-tests>
988    </target>
989  
957
990    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
991 <  <target name="4jdk7-tck-junit"
960 <          depends="4jdk7compile">
991 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
992  
993      <junit printsummary="true"
994             showoutput="true"
# Line 979 | Line 1010
1010  
1011        <test name="${jsr166.tckTestClass}" haltonfailure="no">
1012        </test>
982
1013      </junit>
1014    </target>
1015  
1016 <  <target name="4jdk7-jtreg"
987 <          depends="4jdk7jar"
988 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
1016 >  <target name="4jdk7-jtreg" depends="4jdk7jar">
1017      <run-jtreg-tests
1018         target="7"
1019         workdir="${build.4jdk7.dir}"
1020         classes="${4jdk7product.jar}"/>
1021    </target>
1022  
1023 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1024  
1025 <  <target name="4jdk7-test"
997 <          depends="4jdk7-tck, 4jdk7-jtreg"
998 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
999 <  </target>
1000 <
1001 <
1002 <  <target name="4jdk7docs"
1003 <          description="Builds javadocs for src/jdk7 to dist dir">
1004 <
1025 >  <target name="4jdk7docs">
1026      <delete dir="${4jdk7docs.dir}"/>
1027      <mkdir dir="${4jdk7docs.dir}"/>
1028  
# Line 1022 | Line 1043
1043      </javadoc>
1044    </target>
1045  
1046 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1047  
1048 <  <target name="4jdk7dist"
1027 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1028 <          description="Puts all distributable products in single hierarchy"/>
1029 <
1030 <
1031 <  <target name="4jdk7clean"
1032 <          description="Removes all 4jdk7 build products">
1033 <
1048 >  <target name="4jdk7clean">
1049      <delete dir="${build.4jdk7.dir}"/>
1035
1050    </target>
1051  
1052 <
1039 <  <target name="4jdk7dist-jar"
1040 <          depends="4jdk7clean, 4jdk7jar">
1052 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1053      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1054    </target>
1055  
1056 <
1045 <  <target name="4jdk7dist-docs"
1046 <          depends="4jdk7clean, 4jdk7docs">
1056 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1057      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1058    </target>
1059  
1060  
1061 <  <!-- jsr166x -->
1052 <
1053 <  <target name="jsr166xcompile"
1054 <          depends="configure-compiler"
1055 <          description="Compiles jsr166x sources to build dir">
1061 >  <!-- jsr166x (no longer maintained) -->
1062  
1063 +  <target name="jsr166xcompile" depends="configure-compiler">
1064      <mkdir dir="${build.jsr166x.classes.dir}"/>
1065  
1066      <javac srcdir="${topsrc.dir}"
# Line 1070 | Line 1077
1077             encoding="ASCII"
1078             executable="${javac7}"
1079             fork="true">
1073
1080        <include name="jsr166x/**/*.java"/>
1081        <compilerarg value="-XDignore.symbol.file=true"/>
1082        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1083        <compilerarg value="-Werror"/>
1084        <compilerarg line="${build.args}"/>
1079
1085      </javac>
1086    </target>
1087  
1088 <
1084 <  <target name="jsr166xjar"
1085 <          depends="jsr166xcompile"
1086 <          description="Builds library jar from compiled sources">
1087 <
1088 >  <target name="jsr166xjar" depends="jsr166xcompile">
1089      <jar destfile="${jsr166x.jar}">
1090        <fileset dir="${build.jsr166x.classes.dir}"/>
1091        <manifest>
# Line 1092 | Line 1093
1093          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1094        </manifest>
1095      </jar>
1095
1096    </target>
1097  
1098 <
1099 <  <target name="jsr166xdocs"
1100 <          description="Builds javadocs to dist dir">
1101 <
1098 >  <target name="jsr166xdocs">
1099      <delete dir="${jsr166xdocs.dir}"/>
1100      <mkdir dir="${jsr166xdocs.dir}"/>
1101  
# Line 1113 | Line 1110
1110               failonerror = "true">
1111        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1112        <arg value="-XDignore.symbol.file=true"/>
1116
1113      </javadoc>
1114    </target>
1115  
1116 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1117  
1118 <  <target name="jsr166xdist"
1122 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1123 <          description="Puts all distributable products in single hierarchy"/>
1124 <
1125 <
1126 <  <target name="jsr166xclean"
1127 <          description="Removes all jsr166x build products">
1128 <
1118 >  <target name="jsr166xclean">
1119      <delete dir="${build.jsr166x.dir}"/>
1130
1120    </target>
1121  
1122 <
1134 <  <target name="jsr166xdist-jar"
1135 <          depends="jsr166xclean, jsr166xjar">
1122 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1123      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1124    </target>
1125  
1126 <  <target name="jsr166xdist-docs"
1140 <          depends="jsr166xclean, jsr166xdocs">
1126 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1127      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1128    </target>
1129  
1144  <!-- jsr166y -->
1130  
1131 +  <!-- jsr166y (no longer maintained) -->
1132  
1133 <  <target name="jsr166ycompile"
1148 <          depends="configure-compiler"
1149 <          description="Compiles jsr166y sources">
1150 <
1133 >  <target name="jsr166ycompile" depends="configure-compiler">
1134      <mkdir dir="${build.jsr166y.classes.dir}"/>
1135  
1136      <javac srcdir="${topsrc.dir}"
# Line 1170 | Line 1153
1153        <compilerarg value="-Xlint:all"/>
1154        <compilerarg value="-Werror"/>
1155        <compilerarg line="${build.args}"/>
1173
1156      </javac>
1157    </target>
1158  
1159 <
1178 <  <target name="jsr166yjar"
1179 <          depends="jsr166ycompile"
1180 <          description="Builds library jar from compiled sources">
1181 <
1159 >  <target name="jsr166yjar" depends="jsr166ycompile">
1160      <jar destfile="${jsr166y.jar}" index="true">
1161        <fileset dir="${build.jsr166y.classes.dir}"/>
1162        <manifest>
# Line 1186 | Line 1164
1164          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1165        </manifest>
1166      </jar>
1189
1167    </target>
1168  
1169 <
1193 <  <target name="jsr166ydocs"
1194 <          description="Builds javadocs to dist dir">
1195 <
1169 >  <target name="jsr166ydocs">
1170      <delete dir="${jsr166ydocs.dir}"/>
1171      <mkdir dir="${jsr166ydocs.dir}"/>
1172  
# Line 1207 | Line 1181
1181               failonerror = "true">
1182        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1183        <arg value="-XDignore.symbol.file=true"/>
1210
1184      </javadoc>
1185    </target>
1186  
1187 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1188  
1189 <  <target name="jsr166ydist"
1216 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1217 <          description="Puts all distributable products in single hierarchy"/>
1218 <
1219 <
1220 <  <target name="jsr166yclean"
1221 <          description="Removes all jsr166y build products">
1222 <
1189 >  <target name="jsr166yclean">
1190      <delete dir="${build.jsr166y.dir}"/>
1224
1191    </target>
1192  
1193 <
1228 <  <target name="jsr166ydist-jar"
1229 <          depends="jsr166yclean, jsr166yjar">
1193 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1194      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1195    </target>
1196  
1197 <  <target name="jsr166ydist-docs"
1234 <          depends="jsr166yclean, jsr166ydocs">
1197 >  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1198      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1199    </target>
1200  
1201  
1202 <  <!-- extra166y -->
1240 <
1241 <
1242 <  <target name="extra166ycompile"
1243 <          depends="configure-compiler, jsr166yjar"
1244 <          description="Compiles extra166y sources">
1202 >  <!-- extra166y (no longer maintained) -->
1203  
1204 +  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1205      <mkdir dir="${build.extra166y.classes.dir}"/>
1206  
1207      <javac srcdir="${topsrc.dir}"
# Line 1265 | Line 1224
1224        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1225        <compilerarg value="-Werror"/>
1226        <compilerarg line="${build.args}"/>
1268
1227      </javac>
1228    </target>
1229  
1230 <
1273 <  <target name="extra166yjar"
1274 <          depends="extra166ycompile"
1275 <          description="Builds library jar from compiled sources">
1276 <
1230 >  <target name="extra166yjar" depends="extra166ycompile">
1231      <jar destfile="${extra166y.jar}" index="true">
1232        <fileset dir="${build.extra166y.classes.dir}"/>
1233        <manifest>
# Line 1281 | Line 1235
1235          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1236        </manifest>
1237      </jar>
1284
1238    </target>
1239  
1240 <
1288 <  <target name="extra166ydocs"
1289 <          description="Builds javadocs to build dir">
1290 <
1240 >  <target name="extra166ydocs">
1241      <delete dir="${extra166ydocs.dir}"/>
1242      <mkdir dir="${extra166ydocs.dir}"/>
1243  
# Line 1301 | Line 1251
1251               executable="${javadoc7}">
1252        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1253        <arg value="-XDignore.symbol.file=true"/>
1304
1254      </javadoc>
1255    </target>
1256  
1257 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1258  
1259 <  <target name="extra166ydist"
1310 <          depends="extra166ydist-jar, extra166ydist-docs"
1311 <          description="Puts all distributable products in single hierarchy"/>
1312 <
1313 <
1314 <  <target name="extra166yclean"
1315 <          description="Removes all extra166y build products">
1316 <
1259 >  <target name="extra166yclean">
1260      <delete dir="${build.extra166y.dir}"/>
1318
1261    </target>
1262  
1263 <
1322 <  <target name="extra166ydist-jar"
1323 <          depends="extra166yclean, extra166yjar">
1263 >  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1264      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1265    </target>
1266  
1267 <  <target name="extra166ydist-docs"
1328 <          depends="extra166yclean, extra166ydocs">
1267 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1268      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1269    </target>
1270  
1271 <  <!-- jsr166e -->
1271 >
1272 >  <!-- jsr166e (no longer maintained) -->
1273  
1274    <property name="build.jsr166e.java.version" value="6"/>
1275    <property name="build.jsr166e.javac" value="${javac6}"/>
1276  
1277 <  <target name="jsr166ecompile"
1338 <          depends="configure-compiler"
1339 <          description="Compiles jsr166e sources">
1340 <
1277 >  <target name="jsr166ecompile" depends="configure-compiler">
1278      <mkdir dir="${build.jsr166e.classes.dir}"/>
1279  
1280      <javac srcdir="${topsrc.dir}"
# Line 1358 | Line 1295
1295        <compilerarg value="-Xlint:all"/>
1296        <compilerarg value="-Werror"/>
1297        <compilerarg line="${build.args}"/>
1361
1298      </javac>
1299    </target>
1300  
1365  <!-- jsr166e: find doclint errors -->
1301    <target name="jsr166edoclint">
1367
1302      <mkdir dir="${build.jsr166e.classes.dir}"/>
1303  
1304      <javac srcdir="${topsrc.dir}"
# Line 1386 | Line 1320
1320        <compilerarg value="-Xlint:all"/>
1321        <compilerarg value="-Werror"/>
1322        <compilerarg value="-Xdoclint:all/protected"/>
1389
1323      </javac>
1324    </target>
1325  
1326 <
1394 <  <target name="jsr166ejar"
1395 <          depends="jsr166ecompile"
1396 <          description="Builds library jar from compiled sources">
1397 <
1326 >  <target name="jsr166ejar" depends="jsr166ecompile">
1327      <jar destfile="${jsr166e.jar}" index="true">
1328        <fileset dir="${build.jsr166e.classes.dir}"/>
1329        <manifest>
# Line 1402 | Line 1331
1331          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1332        </manifest>
1333      </jar>
1405
1334    </target>
1335  
1336 <
1409 <  <target name="jsr166edocs"
1410 <          description="Builds javadocs to build dir">
1411 <
1336 >  <target name="jsr166edocs">
1337      <delete dir="${jsr166edocs.dir}"/>
1338      <mkdir dir="${jsr166edocs.dir}"/>
1339  
# Line 1422 | Line 1347
1347               failonerror = "true">
1348        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1349        <arg value="-XDignore.symbol.file=true"/>
1425
1350      </javadoc>
1351    </target>
1352  
1353 <
1430 <  <target name="jsr166e-tck-one-java-version"
1431 <          depends="jsr166ejar">
1432 <
1353 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1354      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1434
1355      <run-tck-tests
1356        tck.src.dir="${test.src.dir}/tck-jsr166e"
1357        target="${build.jsr166e.java.version}"
# Line 1439 | Line 1359
1359        classes="${jsr166e.jar}"/>
1360    </target>
1361  
1362 <  <target name="jsr166e-tck"
1443 <          description="Runs tck tests for jsr166e for multiple java versions">
1362 >  <target name="jsr166e-tck">
1363  
1364   <!--     <antcall target="clean"/> -->
1365   <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1461 | Line 1380
1380      </antcall>
1381    </target>
1382  
1383 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1384  
1385 <  <target name="jsr166e-test"
1466 <          depends="jsr166e-tck"
1467 <          description="Runs all tests for jsr166e">
1468 <  </target>
1385 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1386  
1387 <  <target name="jsr166edist"
1471 <          depends="jsr166edist-jar, jsr166edist-docs"
1472 <          description="Puts all distributable products in single hierarchy"/>
1473 <
1474 <
1475 <  <target name="jsr166eclean"
1476 <          description="Removes all jsr166e build products">
1387 >  <target name="jsr166eclean">
1388      <delete dir="${build.jsr166e.dir}"/>
1389    </target>
1390  
1480
1391    <target name="jsr166edist-jar"
1392            depends="jsr166eclean, jsr166ejar">
1393      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1394    </target>
1395  
1396 <  <target name="jsr166edist-docs"
1487 <          depends="jsr166eclean, jsr166edocs">
1396 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1397      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1398    </target>
1399  
1400  
1401   <!-- Find buglets that can be detected by static build tools -->
1402  
1403 <  <target name="lint">
1404 <    <antcall target="dists">
1405 <      <param name="build.javadoc.access" value="public"/>
1406 <    </antcall>
1407 <  </target>
1403 > <!--   <target name="lint"> -->
1404 > <!--     <antcall target="dists"> -->
1405 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1406 > <!--     </antcall> -->
1407 > <!--   </target> -->
1408  
1409   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1410 <  <target name="lint-private">
1410 >  <target name="doclint-private">
1411      <antcall target="dist">
1412        <param name="build.javadoc.access" value="private"/>
1413      </antcall>
1414    </target>
1415  
1416  
1417 + <!-- ==============================================================
1418 +  Experimental errorprone support - https://errorprone.info
1419 + =================================================================== -->
1420 +  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1421 +  <property name="errorprone.jsr166.user.flags" value=""/>
1422 +  <property name="errorprone.jsr166.flags"
1423 +            value="-Xep:HashtableContains:OFF
1424 +                   -Xep:JdkObsolete:OFF
1425 +                   -Xep:MissingOverride:OFF
1426 +                   -Xep:MissingFail:OFF
1427 +                   -Xep:MixedArrayDimensions:ERROR
1428 +                   -Xep:RemoveUnusedImports:ERROR
1429 +                   -Xep:EmptyIf:ERROR
1430 +                   -Xep:MultipleTopLevelClasses:ERROR
1431 +                   -Xep:ClassName:ERROR
1432 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1433 +                   -Xep:RedundantThrows:ERROR
1434 +                   -Xep:IdentityBinaryExpression:WARN
1435 +                   -Xep:MethodCanBeStatic:WARN
1436 +                   ${errorprone.jsr166.user.flags}"/>
1437 +  <!-- -Xep:WildcardImport:ERROR -->
1438 +  <property name="errorprone.jsr166.test.flags"
1439 +            value="-Xep:StringSplitter:OFF
1440 +                   -Xep:BoxedPrimitiveConstructor:OFF
1441 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1442 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1443 +  <target name="errorprone"
1444 +          depends="clean, configure-compiler"
1445 +          description="Run errorprone over jsr166 source code (experimental)">
1446 +
1447 +    <local name="destdir"/>
1448 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1449 +    <mkdir dir="${destdir}"/>
1450 +
1451 +    <javac srcdir="${src.dir}"
1452 +           destdir="${destdir}"
1453 +           debug="${build.debug}"
1454 +           debuglevel="${build.debuglevel}"
1455 +           deprecation="${build.deprecation}"
1456 +           classpath=""
1457 +           includeAntRuntime="false"
1458 +           includeJavaRuntime="false"
1459 +           encoding="ASCII"
1460 +           executable="${build.main.javac}"
1461 +           fork="true">
1462 +
1463 +      <include name="**/*.java"/>
1464 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1465 +      <compilerarg value="-J--illegal-access=permit"/>
1466 +      <compilerarg value="-XDcompilePolicy=simple"/>
1467 +      <compilerarg line="-processorpath ${errorprone.jar}"/>
1468 +      <compilerarg value="-Xplugin:ErrorProne
1469 +                          ${errorprone.jsr166.flags}"/>
1470 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1471 +      <compilerarg value="-Xprefer:source"/>
1472 +      <compilerarg value="-XDignore.symbol.file=true"/>
1473 +      <compilerarg value="-Xlint:all"/>
1474 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1475 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1476 +      <compilerarg line="${build.args}"/>
1477 +    </javac>
1478 +
1479 +    <jar destfile="${product.jar}">
1480 +      <fileset dir="${destdir}"/>
1481 +    </jar>
1482 +
1483 +    <run-tck-tests
1484 +      target="${build.main.java.version}"
1485 +      workdir="${build.dir}"
1486 +      classes="${product.jar}">
1487 +      <javac-elements>
1488 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1489 +        <compilerarg value="-J--illegal-access=permit"/>
1490 +        <compilerarg value="-XDcompilePolicy=simple"/>
1491 +        <compilerarg line="-processorpath ${errorprone.jar}"/>
1492 +        <compilerarg value="-Xplugin:ErrorProne
1493 +                            ${errorprone.jsr166.flags}
1494 +                            ${errorprone.jsr166.test.flags}"/>
1495 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1496 +      </javac-elements>
1497 +    </run-tck-tests>
1498 +  </target>
1499 +
1500 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1501 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1502 +  <target name="errorprone-jtreg"
1503 +          depends="jar"
1504 +          description="Run errorprone over jtreg tests (experimental)">
1505 +
1506 +    <run-jtreg-tests
1507 +       target="${build.main.java.version}"
1508 +       workdir="${build.dir}"
1509 +       classes="${product.jar}"
1510 +       verbose="all">
1511 +      <jtreg-elements>
1512 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1513 +        <arg value="-javacoption:-processorpath"/>
1514 +        <arg value="-javacoption:${errorprone.jar}"/>
1515 +        <arg value="-javacoption:-Xplugin:ErrorProne
1516 +                            ${errorprone.jsr166.flags}
1517 +                            ${errorprone.jsr166.test.flags}
1518 +                            -Xep:MultipleTopLevelClasses:WARN
1519 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1520 +      </jtreg-elements>
1521 +    </run-jtreg-tests>
1522 +  </target>
1523 +
1524 +
1525 + <!-- ==============================================================
1526 +  Running guava tests against jsr166 code
1527 + =================================================================== -->
1528 +
1529 + <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1530 + <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1531 + <!-- <property name="guava.version" value="21.0"/> -->
1532 +
1533 + <!-- HOWTO debug print a path id -->
1534 + <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1535 + <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1536 +
1537 + <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1538 + <!--   organisation="com.google.guava" module="guava-tests"/> -->
1539 + <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1540 + <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1541 + <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1542 + <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1543 +
1544 + <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1545 + <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1546 + <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1547 + <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1548 +
1549 + <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1550 + <!--   type="*" inline="true" conf="*(private),*(public)" -->
1551 + <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1552 + <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1553 +
1554 + <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1555 + <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1556 + <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1557 +
1558 +  <target name="init-ivy">
1559 +    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1560 +         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1561 +    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1562 +             classpath="${build.dir}/ivy.jar"/>
1563 +  </target>
1564 +
1565 +  <target name="guava-tests" depends="jar, init-ivy"
1566 +          description="Guava tests run against jsr166 collections">
1567 +    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1568 +    <mkdir dir="${guava.dir}"/>
1569 +    <ivy:retrieve pathid="guava.testlib.classpath"
1570 +      type="jar,bundle" inline="true" conf="default,master"
1571 +      pattern="${guava.dir}/[artifact].[ext]"
1572 +      organisation="com.google.guava" module="guava-testlib"/>
1573 +    <property name="guava.version" value="21.0"/>
1574 +    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1575 +         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1576 +    <junit printsummary="true" showoutput="true" haltonfailure="true"
1577 +           jvm="${build.main.java}" fork="true">
1578 +      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1579 +      <formatter type="brief"/>
1580 +      <classpath>
1581 +        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1582 +        <path refid="guava.testlib.classpath"/>
1583 +      </classpath>
1584 +
1585 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1586 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1587 +    </junit>
1588 +  </target>
1589 +
1590   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines