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.238 by jsr166, Fri Mar 24 16:33:02 2017 UTC vs.
Revision 1.301 by jsr166, Sat Aug 10 16:48:04 2019 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
# Line 18 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
21 –  $HOME/jdk/jdk7
22    $HOME/jdk/jdk8
23 <  $HOME/jdk/jdk9
24 <  $HOME/jdk/jdk10
23 >  $HOME/jdk/jdk11
24 >  $HOME/jdk/jdk12
25 >  $HOME/jdk/jdk13
26 >  $HOME/jdk/jdk14
27    where each of the above is a JDK or a symlink to same, and
26 –  $HOME/jdk/src/jdk7
28    $HOME/jdk/src/jdk8
29 <  $HOME/jdk/src/jdk9
30 <  $HOME/jdk/src/jdk10
29 >  $HOME/jdk/src/jdk11
30 >  $HOME/jdk/src/jdk12
31 >  $HOME/jdk/src/jdk13
32 >  $HOME/jdk/src/jdk14
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 7 8 9 10 ...
38 >  for $N in 8 .. 14 ...
39  
40    As of 2016-03, the sources in src/main are for jdk9+ only.
41 +  As of 2019-08, the sources in src/main are for jdk11+ only.
42   ------------------------------------------------------------------------------
43    </description>
44  
# Line 52 | Line 56
56  
57  
58    <!-- Compilation options -->
55 –  <property name="build.sourcelevel"    value="6"/>
59    <property name="build.debug"          value="true"/>
60    <property name="build.debuglevel"     value="source,lines,vars"/>
61    <property name="build.deprecation"    value="false"/>
# Line 103 | 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 129 | Line 132
132      </sequential>
133    </macrodef>
134  
132 –  <defjdklocations v="6"/>
133 –  <defjdklocations v="7"/>
135    <defjdklocations v="8"/>
136 <  <defjdklocations v="9"/>
137 <  <defjdklocations v="10"/>
136 >  <defjdklocations v="11"/>
137 >  <defjdklocations v="12"/>
138 >  <defjdklocations v="13"/>
139 >  <defjdklocations v="14"/>
140  
141    <!-- Source locations -->
142    <property name="src.dir"              location="${basedir}/src/main"/>
143    <property name="test.src.dir"         location="${basedir}/src/test"/>
144    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
145    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
143 –  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
146    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
147 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
148 <  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
149 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
147 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
148 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
149 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
150 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
151 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
152    <property name="lib.dir"              location="${basedir}/lib"/>
153    <property name="dist.dir"             location="${basedir}/dist"/>
154    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 183 | Line 187
187    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
188  
189    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
190 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
191 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
192 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
193 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
194 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
195 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
196 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
197 <  <!-- Default jdk doc location (latest stable release seems best) -->
198 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
190 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
191 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
192 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
193 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
194 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
195 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
196 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
197 >  <!-- The location of jdk early access docs (RIP) -->
198 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
199 > <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
200 >  <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
201 >  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
202 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
203 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
204  
205    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
197 –  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
198 –  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
199 –  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
206    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
207 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
207 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
208 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
209 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
210 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
211    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
212  
213    <!-- Define the "jtreg" task -->
# Line 231 | Line 240
240  
241      <local name="modules"/>
242      <condition property="modules">
243 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
243 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
244      </condition>
245  
246      <local name="use-doclint"/>
# Line 298 | Line 307
307    </macrodef>
308  
309    <!-- Define jtreg test sets for different jdk versions -->
310 <  <fileset dir="${jtreg9.src.dir}">
311 <    <patternset id="jdk9.jtreg.tests">
312 <      <include name="**/*.java"/>
313 <    </patternset>
314 <  </fileset>
315 <
316 <  <fileset dir="${jtreg8.src.dir}">
317 <    <patternset id="jdk8.jtreg.tests">
318 <      <include name="**/*.java"/>
319 <    </patternset>
320 <  </fileset>
310 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
311 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
312 >  <property name="jtreg.test.pattern" value="**/*.java"/>
313 >  <macrodef name="defjtregtests">
314 >    <attribute name="v"/>
315 >    <sequential>
316 >      <fileset dir="${jtreg@{v}.src.dir}">
317 >        <patternset id="jdk@{v}.jtreg.tests">
318 >          <include name="${jtreg.test.pattern}"/>
319 >        </patternset>
320 >      </fileset>
321 >    </sequential>
322 >  </macrodef>
323  
324 <  <fileset dir="${jtreg7.src.dir}">
325 <    <patternset id="jdk7.jtreg.tests">
326 <      <include name="**/*.java"/>
327 <    </patternset>
328 <  </fileset>
324 >  <defjtregtests v="14"/>
325 >  <defjtregtests v="13"/>
326 >  <defjtregtests v="12"/>
327 >  <defjtregtests v="11"/>
328 >  <defjtregtests v="8"/>
329  
330    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
331    <property name="jtreg.flags" value=""/>
332  
333    <macrodef name="run-jtreg-tests">
334 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
324 <    <attribute name="source" default="7"/>
334 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
335      <attribute name="target"/>
336      <attribute name="workdir"/>
337      <attribute name="classes"/>
338 +    <attribute name="verbose" default="${jtreg.verbose}"/>
339      <attribute name="jtregflags" default=""/>
340 +    <element name="jtreg-elements" optional="true"/>
341  
342      <sequential>
343  
# Line 334 | Line 346
346  
347      <local name="modules"/>
348      <condition property="modules">
349 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
349 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
350      </condition>
351  
352      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 343 | Line 355
355             workDir="@{workdir}/JTwork">
356        <patternset refid="jdk@{target}.jtreg.tests"/>
357        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
358 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
359 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
358 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
359 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
360        <arg value="-agentvm"/>
361        <arg value="-noreport"/>
362 <      <arg value="-verbose:${jtreg.verbose}"/>
362 >      <arg value="-verbose:@{verbose}"/>
363        <arg value="-vmoptions:-esa -ea"/>
364        <arg value="-automatic"/>
365        <arg value="-k:!ignore"/>
366        <arg line="@{jtregflags}"/>
367        <arg line="${jtreg.flags}"/>
368 +      <jtreg-elements/>
369      </jtreg>
370      </sequential>
371    </macrodef>
# Line 363 | Line 376
376    </path>
377  
378    <!-- Support @jls tag, used in jdk8+ javadoc -->
379 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
380    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
381    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
382  
383    <!-- Main targets -->
384  
385 <  <property name="build.main.java.version" value="9"/>
386 <  <property name="build.main.javac" value="${javac9}"/>
385 >  <!-- Default values: may seem strange ... -->
386 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
387 >  <!-- But at build time, target jdk9, for maximal binary portability -->
388 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
389 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
390 >    o override-methods=summary
391 >    o {@systemProperty ...}
392 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
393 >    o 8202628: javadoc generates bad links in TestModules.java
394 >    -->
395 >  <property name="java.runtime.target" value="11"/>
396 >  <property name="build.main.java" value="${java11}"/>
397 >  <property name="build.main.javac" value="${javac11}"/>
398 >  <property name="build.main.javadoc" value="${javadoc12}"/>
399 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
400  
401    <target name="dists"
402 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
402 >          depends="dist, 4jdk8dist"
403            description="Builds all public jars and docs"/>
404 +          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
405  
406    <target name="compile"
407            depends="configure-compiler"
408            description="Compiles src/main sources to build dir">
409  
382 –    <local name="modules"/>
383 –    <condition property="modules">
384 –      <and>
385 –        <available file="${jdk9.home}/jmods" type="dir"/>
386 –        <equals arg1="9" arg2="${build.main.java.version}"/>
387 –      </and>
388 –    </condition>
389 –
410      <local name="destdir"/>
411 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
392 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
411 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
412  
413      <mkdir dir="${destdir}"/>
414  
# Line 406 | Line 425
425             fork="true">
426  
427        <include name="**/*.java"/>
428 <      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
428 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
429        <compilerarg value="-Xprefer:source"/>
430        <compilerarg value="-XDignore.symbol.file=true"/>
431 <      <compilerarg value="-Xlint:all"/>
432 <      <compilerarg value="-Werror"/>
431 >      <compilerarg value="-Xlint:all,-removal"/>
432 >      <compilerarg line="--doclint-format html5"/>
433        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
434 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
435 +      <compilerarg value="-Werror"/>
436        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
437        <compilerarg line="${build.args}"/>
438  
# Line 450 | Line 471
471   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
472      <javadoc destdir="${docs.dir}"
473               packagenames="none"
474 <             link="${java9.api.url}"
474 >             link="${java.api.url}"
475               overview="${src.dir}/intro.html"
476               access="${build.javadoc.access}"
477               sourcepath="${src.dir}"
478               classpath=""
479 <             executable="${javadoc9}">
479 >             source="${build.main.javadoc.source}"
480 >             executable="${build.main.javadoc}">
481 > <!-- TODO: JDK-8214571 failonerror = "true" -->
482        <fileset dir="${src.dir}" defaultexcludes="yes">
483          <include name="**/*.java"/>
484        </fileset>
485 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
485 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
486        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
487        <arg value="-XDignore.symbol.file=true"/>
488 +      <arg value="-html5"/>
489        <arg value="--patch-module=java.base=${src.dir}"/>
490 <      <arg value="-tag"/>
491 <      <arg value="${javadoc.jls.option}"/>
492 < <!-- @apiNote currently unused -->
493 < <!--       <arg value="-tag"/> -->
494 < <!--       <arg value="apiNote:a:API Note:"/> -->
495 <      <arg value="-tag"/>
496 <      <arg value="implSpec:a:Implementation Requirements:"/>
497 <      <arg value="-tag"/>
474 <      <arg value="implNote:a:Implementation Note:"/>
490 > <!-- old school frames via docs/index.html?overview-summary.html -->
491 > <!-- TODO: - -frames no longer a supported option in jdk13+ -->
492 >      <arg value="--frames"/>
493 >      <arg value="--override-methods=summary"/>
494 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
495 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
496 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
497 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
498   <!-- tags added in jdk9: currently unused -->
499 < <!--       <arg value="-tag"/> -->
500 < <!--       <arg value="revised:X"/> -->
478 < <!--       <arg value="-tag"/> -->
479 < <!--       <arg value="spec:X"/> -->
499 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
500 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
501      </javadoc>
502    </target>
503  
# Line 486 | Line 507
507            description="Puts all distributable products in single hierarchy"/>
508  
509  
489 –  <target name="release"
490 –          depends="dist"
491 –          description="Puts entire CVS tree, plus distribution productions, in a jar">
492 –
493 –    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
494 –
495 –    <jar basedir="${basedir}" destfile="${release.jar}">
496 –      <!-- <exclude name="build/**"/> -->
497 –      <exclude name="${release.jar}"/>
498 –      <exclude name="user.properties"/>
499 –      <exclude name="etc/notes/**"/>
500 –      <exclude name="src/emulation/**"/>
501 –      <exclude name="**/SyntaxTest.java"/>
502 –      <exclude name="**/SuperfluousAbstract.java"/>
503 –      <manifest>
504 –        <attribute name="Built-By" value="${user.name}"/>
505 –        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
506 –      </manifest>
507 –    </jar>
508 –  </target>
509 –
510 –
510    <target name="clean"
511            description="Removes all build products">
513 –
512      <delete dir="${build.dir}"/>
515 –
513    </target>
514  
515  
516    <target name="dist-clean"
517            description="Removes all build and distribution products">
521 –
518      <delete dir="${build.dir}"/>
519      <delete dir="${dist.dir}"/>
524 –
520    </target>
521  
522  
# Line 540 | Line 535
535            description="Runs tck tests for src/main directly">
536  
537      <run-tck-tests
538 <      target="${build.main.java.version}"
538 >      target="${java.runtime.target}"
539        workdir="${build.dir}"
540        classes="${product.jar}">
541        <javac-elements>
# Line 574 | Line 569
569            depends="jar"
570            description="Runs jtreg tests for src/main using the jtreg ant task">
571      <run-jtreg-tests
572 <       target="${build.main.java.version}"
572 >       target="${java.runtime.target}"
573         workdir="${build.dir}"
574         classes="${product.jar}"/>
575    </target>
576  
577    <target name="test"
578            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
579 <          description="Runs tck and jtreg tests for src/main">
585 <  </target>
579 >          description="Runs tck and jtreg tests for src/main"/>
580  
581 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
581 >  <target name="test-version-permutations"
582 >          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
583 >  </target>
584  
585 < <!--     <antcall target="jtreg"> -->
586 < <!--       <param name="build.main.java.version" value="8"/> -->
587 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
585 >  <!-- jdk9 is unsupported as of 2019-08 -->
586 > <!--   <target name="test9"> -->
587 > <!--     <antcall target="clean"/> -->
588 > <!--     <antcall> -->
589 > <!--       <param name="java.runtime.target" value="9"/> -->
590 > <!--       <param name="build.main.javac" value="${javac9}"/> -->
591 > <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
592 > <!--       <param name="build.main.javadoc.source" value="9"/> -->
593 > <!--       <target name="test"/> -->
594 > <!--       <target name="docs"/> -->
595   <!--     </antcall> -->
593 –
596   <!--   </target> -->
597  
598 < <!--   <target name="test89" -->
599 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
598 <
598 >  <!-- jdk10 is unsupported as of 2019-08 -->
599 > <!--   <target name="test10"> -->
600   <!--     <antcall target="clean"/> -->
601 < <!--     <antcall target="test"> -->
602 < <!--       <param name="build.main.java.version" value="8"/> -->
603 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
601 > <!--     <antcall> -->
602 > <!--       <param name="java.runtime.target" value="10"/> -->
603 > <!--       <param name="build.main.javac" value="${javac10}"/> -->
604 > <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
605 > <!--       <param name="build.main.javadoc.source" value="10"/> -->
606 > <!--       <target name="test"/> -->
607 > <!--       <target name="docs"/> -->
608   <!--     </antcall> -->
609 + <!--   </target> -->
610  
611 < <!--     <antcall target="clean"/> -->
612 < <!--     <antcall target="test"> -->
613 < <!--       <param name="build.main.java.version" value="9"/> -->
614 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
615 < <!--     </antcall> -->
611 >  <target name="test11">
612 >    <antcall target="clean"/>
613 >    <antcall>
614 >      <param name="java.runtime.target" value="11"/>
615 >      <param name="build.main.javac" value="${javac11}"/>
616 >      <param name="build.main.javadoc" value="${javadoc12}"/>
617 >      <param name="build.main.javadoc.source" value="11"/>
618 >      <target name="test"/>
619 >      <target name="docs"/>
620 >    </antcall>
621 >  </target>
622  
623 < <!--   </target> -->
623 >  <target name="test12">
624 >    <antcall target="clean"/>
625 >    <antcall>
626 >      <param name="java.runtime.target" value="12"/>
627 >      <param name="build.main.javac" value="${javac12}"/>
628 >      <param name="build.main.javadoc" value="${javadoc12}"/>
629 >      <param name="build.main.javadoc.source" value="12"/>
630 >      <target name="test"/>
631 >      <target name="docs"/>
632 >    </antcall>
633 >  </target>
634 >
635 >  <target name="test13">
636 >    <antcall target="clean"/>
637 >    <antcall>
638 >      <param name="java.runtime.target" value="13"/>
639 >      <param name="build.main.javac" value="${javac13}"/>
640 >      <param name="build.main.javadoc" value="${javadoc13}"/>
641 >      <param name="build.main.javadoc.source" value="13"/>
642 >      <target name="test"/>
643 >      <target name="docs"/>
644 >    </antcall>
645 >  </target>
646 >
647 >  <target name="test14">
648 >    <antcall target="clean"/>
649 >    <antcall>
650 >      <param name="java.runtime.target" value="14"/>
651 >      <param name="build.main.javac" value="${javac14}"/>
652 >      <param name="build.main.javadoc" value="${javadoc14}"/>
653 >      <param name="build.main.javadoc.source" value="14"/>
654 >      <target name="test"/>
655 >      <target name="docs"/>
656 >    </antcall>
657 >  </target>
658 >
659 >  <target name="test11-12">
660 >    <antcall target="clean"/>
661 >    <antcall>
662 >      <param name="java.runtime.target" value="12"/>
663 >      <param name="build.main.javac" value="${javac11}"/>
664 >      <param name="build.main.javadoc" value="${javadoc12}"/>
665 >      <param name="build.main.javadoc.source" value="11"/>
666 >      <target name="test"/>
667 >      <target name="docs"/>
668 >    </antcall>
669 >  </target>
670 >
671 >  <target name="test11-13">
672 >    <antcall target="clean"/>
673 >    <antcall>
674 >      <param name="java.runtime.target" value="13"/>
675 >      <param name="build.main.javac" value="${javac11}"/>
676 >      <param name="build.main.javadoc" value="${javadoc13}"/>
677 >      <param name="build.main.javadoc.source" value="11"/>
678 >      <target name="test"/>
679 >      <target name="docs"/>
680 >    </antcall>
681 >  </target>
682  
683 +  <target name="test11-14">
684 +    <antcall target="clean"/>
685 +    <antcall>
686 +      <param name="java.runtime.target" value="14"/>
687 +      <param name="build.main.javac" value="${javac11}"/>
688 +      <param name="build.main.javadoc" value="${javadoc14}"/>
689 +      <param name="build.main.javadoc.source" value="11"/>
690 +      <target name="test"/>
691 +      <target name="docs"/>
692 +    </antcall>
693 +  </target>
694  
695  
696    <target name="configure-compiler">
# Line 632 | Line 713
713    </target>
714  
715  
635 –
636 –  <!-- Various demos and test programs -->
637 –
638 –
639 –  <!-- description="Benchmark from Doug Lea's AQS paper" -->
640 –  <target name="loops" depends="configure-compiler">
641 –
642 –    <mkdir dir="${build.loops.dir}"/>
643 –
644 –    <javac srcdir="${loops.src.dir}"
645 –          destdir="${build.loops.dir}"
646 –            debug="${build.debug}"
647 –       debuglevel="${build.debuglevel}"
648 –      deprecation="${build.deprecation}"
649 –           source="${build.sourcelevel}"
650 –           target="${build.sourcelevel}"
651 –         encoding="ASCII"
652 –             fork="true">
653 –
654 –      <compilerarg line="${build.args}"/>
655 –      <classpath refid="loops.classpath"/>
656 –      <compilerarg value="-XDignore.symbol.file=true"/>
657 –
658 –    </javac>
659 –
660 –    <java classname="ALoops" fork="true">
661 –      <classpath refid="loops.classpath"/>
662 –    </java>
663 –
664 –  </target>
665 –
666 –
716    <target name="compile-test-loops" depends="jar"
717 <          description="compile all the perf tests in src/test/loops">
717 >          description="Compiles all the perf tests in src/test/loops">
718  
719      <mkdir dir="${build.dir}/test/loops"/>
720  
# Line 677 | Line 726
726             includeAntRuntime="false"
727             includeJavaRuntime="false"
728             encoding="ASCII"
729 <           executable="${javac9}"
729 >           executable="${build.main.javac}"
730             fork="true">
731  
732        <include name="*.java"/>
# Line 685 | Line 734
734        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
735        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
736        <compilerarg line="${build.args}"/>
688 –
737      </javac>
690 –
738    </target>
739  
740  
# Line 713 | Line 760
760             encoding="ASCII"
761             executable="${javac8}"
762             fork="true">
716 –
763        <include name="**/*.java"/>
764        <compilerarg value="-Xprefer:source"/>
765        <compilerarg value="-XDignore.symbol.file=true"/>
766        <compilerarg value="-Xlint:all"/>
767        <compilerarg value="-Werror"/>
768        <compilerarg line="${build.args}"/>
723 –
769      </javac>
770    </target>
771  
# Line 744 | Line 789
789             encoding="ASCII"
790             executable="${javac8}"
791             fork="true">
747 –
792        <include name="**/*.java"/>
793        <compilerarg value="-Xprefer:source"/>
794        <compilerarg value="-XDignore.symbol.file=true"/>
795        <compilerarg value="-Xlint:all"/>
796        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
797        <compilerarg line="${build.args}"/>
754 –
798      </javac>
799    </target>
800  
# Line 767 | Line 810
810          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
811        </manifest>
812      </jar>
770 –
813    </target>
814  
815  
# Line 801 | Line 843
843  
844    <target name="4jdk8-test"
845            depends="4jdk8-tck, 4jdk8-jtreg"
846 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
805 <  </target>
846 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
847  
848  
849    <target name="4jdk8docs"
# Line 818 | Line 859
859               access="${build.javadoc.access}"
860               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
861               classpath=""
862 +             source="8"
863               executable="${javadoc8}"
864               failonerror = "true">
865        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 825 | Line 867
867        </fileset>
868        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
869        <arg value="-XDignore.symbol.file=true"/>
870 <      <arg value="-tag"/>
871 <      <arg value="${javadoc.jls.option}"/>
872 < <!-- @apiNote currently unused -->
873 < <!--       <arg value="-tag"/> -->
874 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
833 <      <arg value="-tag"/>
834 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
835 <      <arg value="-tag"/>
836 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
870 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
871 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
872 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
873 > <!-- @apiNote tag currently unused -->
874 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
875      </javadoc>
876    </target>
877  
# Line 845 | Line 883
883  
884    <target name="4jdk8clean"
885            description="Removes all 4jdk8 build products">
848 –
886      <delete dir="${build.4jdk8.dir}"/>
850 –
887    </target>
888  
889  
# Line 863 | Line 899
899    </target>
900  
901  
902 +  <!-- jsr166 4jdk7 (no longer maintained) -->
903  
904 <  <!-- jsr166 4jdk7 -->
868 <
869 <  <target name="4jdk7compile"
870 <          depends="configure-compiler"
871 <          description="Compiles src/jdk7 sources, targeting jdk7">
872 <
904 >  <target name="4jdk7compile" depends="configure-compiler">
905      <mkdir dir="${build.4jdk7.classes.dir}"/>
906  
907      <javac srcdir="${4jdk7src.dir}"
# Line 893 | Line 925
925        <compilerarg value="-Xlint:all"/>
926        <compilerarg value="-Werror"/>
927        <compilerarg line="${build.args}"/>
896 –
928      </javac>
929    </target>
930  
931 <  <target name="4jdk7doclint"
901 <          depends="configure-compiler"
902 <          description="Finds doclint warnings">
903 <
931 >  <target name="4jdk7doclint" depends="configure-compiler">
932      <mkdir dir="${build.4jdk7.classes.dir}"/>
933  
934      <javac srcdir="${4jdk7src.dir}"
# Line 924 | Line 952
952        <compilerarg value="-Xlint:all"/>
953        <compilerarg value="-Xdoclint:all/protected"/>
954        <compilerarg line="${build.args}"/>
927 –
955      </javac>
956    </target>
957  
958 <
932 <  <target name="4jdk7jar"
933 <          depends="4jdk7compile"
934 <          description="Builds library jar from compiled sources">
935 <
958 >  <target name="4jdk7jar" depends="4jdk7compile">
959      <jar destfile="${4jdk7product.jar}">
960        <fileset dir="${build.4jdk7.classes.dir}"/>
961        <manifest>
# Line 940 | Line 963
963          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
964        </manifest>
965      </jar>
943 –
966    </target>
967  
968 <
947 <  <target name="4jdk7-tck"
948 <          depends="4jdk7jar"
949 <          description="Runs tck tests for jsr166-4jdk7 directly">
950 <
968 >  <target name="4jdk7-tck" depends="4jdk7jar">
969      <run-tck-tests
970        target="7"
971        workdir="${build.4jdk7.dir}"
# Line 970 | Line 988
988      </run-tck-tests>
989    </target>
990  
973 –
991    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
992 <  <target name="4jdk7-tck-junit"
976 <          depends="4jdk7compile">
992 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
993  
994      <junit printsummary="true"
995             showoutput="true"
# Line 995 | Line 1011
1011  
1012        <test name="${jsr166.tckTestClass}" haltonfailure="no">
1013        </test>
998 –
1014      </junit>
1015    </target>
1016  
1017 <  <target name="4jdk7-jtreg"
1003 <          depends="4jdk7jar"
1004 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
1017 >  <target name="4jdk7-jtreg" depends="4jdk7jar">
1018      <run-jtreg-tests
1019         target="7"
1020         workdir="${build.4jdk7.dir}"
1021         classes="${4jdk7product.jar}"/>
1022    </target>
1023  
1024 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1025  
1026 <  <target name="4jdk7-test"
1013 <          depends="4jdk7-tck, 4jdk7-jtreg"
1014 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
1015 <  </target>
1016 <
1017 <
1018 <  <target name="4jdk7docs"
1019 <          description="Builds javadocs for src/jdk7 to dist dir">
1020 <
1026 >  <target name="4jdk7docs">
1027      <delete dir="${4jdk7docs.dir}"/>
1028      <mkdir dir="${4jdk7docs.dir}"/>
1029  
# Line 1038 | Line 1044
1044      </javadoc>
1045    </target>
1046  
1047 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1048  
1049 <  <target name="4jdk7dist"
1043 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1044 <          description="Puts all distributable products in single hierarchy"/>
1045 <
1046 <
1047 <  <target name="4jdk7clean"
1048 <          description="Removes all 4jdk7 build products">
1049 <
1049 >  <target name="4jdk7clean">
1050      <delete dir="${build.4jdk7.dir}"/>
1051 –
1051    </target>
1052  
1053 <
1055 <  <target name="4jdk7dist-jar"
1056 <          depends="4jdk7clean, 4jdk7jar">
1053 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1054      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1055    </target>
1056  
1057 <
1061 <  <target name="4jdk7dist-docs"
1062 <          depends="4jdk7clean, 4jdk7docs">
1057 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1058      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1059    </target>
1060  
1061  
1062 <  <!-- jsr166x -->
1068 <
1069 <  <target name="jsr166xcompile"
1070 <          depends="configure-compiler"
1071 <          description="Compiles jsr166x sources to build dir">
1062 >  <!-- jsr166x (no longer maintained) -->
1063  
1064 +  <target name="jsr166xcompile" depends="configure-compiler">
1065      <mkdir dir="${build.jsr166x.classes.dir}"/>
1066  
1067      <javac srcdir="${topsrc.dir}"
# Line 1086 | Line 1078
1078             encoding="ASCII"
1079             executable="${javac7}"
1080             fork="true">
1089 –
1081        <include name="jsr166x/**/*.java"/>
1082        <compilerarg value="-XDignore.symbol.file=true"/>
1083        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1084        <compilerarg value="-Werror"/>
1085        <compilerarg line="${build.args}"/>
1095 –
1086      </javac>
1087    </target>
1088  
1089 <
1100 <  <target name="jsr166xjar"
1101 <          depends="jsr166xcompile"
1102 <          description="Builds library jar from compiled sources">
1103 <
1089 >  <target name="jsr166xjar" depends="jsr166xcompile">
1090      <jar destfile="${jsr166x.jar}">
1091        <fileset dir="${build.jsr166x.classes.dir}"/>
1092        <manifest>
# Line 1108 | Line 1094
1094          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1095        </manifest>
1096      </jar>
1111 –
1097    </target>
1098  
1099 <
1115 <  <target name="jsr166xdocs"
1116 <          description="Builds javadocs to dist dir">
1117 <
1099 >  <target name="jsr166xdocs">
1100      <delete dir="${jsr166xdocs.dir}"/>
1101      <mkdir dir="${jsr166xdocs.dir}"/>
1102  
# Line 1129 | Line 1111
1111               failonerror = "true">
1112        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1113        <arg value="-XDignore.symbol.file=true"/>
1132 –
1114      </javadoc>
1115    </target>
1116  
1117 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1118  
1119 <  <target name="jsr166xdist"
1138 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1139 <          description="Puts all distributable products in single hierarchy"/>
1140 <
1141 <
1142 <  <target name="jsr166xclean"
1143 <          description="Removes all jsr166x build products">
1144 <
1119 >  <target name="jsr166xclean">
1120      <delete dir="${build.jsr166x.dir}"/>
1146 –
1121    </target>
1122  
1123 <
1150 <  <target name="jsr166xdist-jar"
1151 <          depends="jsr166xclean, jsr166xjar">
1123 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1124      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1125    </target>
1126  
1127 <  <target name="jsr166xdist-docs"
1156 <          depends="jsr166xclean, jsr166xdocs">
1127 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1128      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1129    </target>
1130  
1160 –  <!-- jsr166y -->
1131  
1132 +  <!-- jsr166y (no longer maintained) -->
1133  
1134 <  <target name="jsr166ycompile"
1164 <          depends="configure-compiler"
1165 <          description="Compiles jsr166y sources">
1166 <
1134 >  <target name="jsr166ycompile" depends="configure-compiler">
1135      <mkdir dir="${build.jsr166y.classes.dir}"/>
1136  
1137      <javac srcdir="${topsrc.dir}"
# Line 1186 | Line 1154
1154        <compilerarg value="-Xlint:all"/>
1155        <compilerarg value="-Werror"/>
1156        <compilerarg line="${build.args}"/>
1189 –
1157      </javac>
1158    </target>
1159  
1160 <
1194 <  <target name="jsr166yjar"
1195 <          depends="jsr166ycompile"
1196 <          description="Builds library jar from compiled sources">
1197 <
1160 >  <target name="jsr166yjar" depends="jsr166ycompile">
1161      <jar destfile="${jsr166y.jar}" index="true">
1162        <fileset dir="${build.jsr166y.classes.dir}"/>
1163        <manifest>
# Line 1202 | Line 1165
1165          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1166        </manifest>
1167      </jar>
1205 –
1168    </target>
1169  
1170 <
1209 <  <target name="jsr166ydocs"
1210 <          description="Builds javadocs to dist dir">
1211 <
1170 >  <target name="jsr166ydocs">
1171      <delete dir="${jsr166ydocs.dir}"/>
1172      <mkdir dir="${jsr166ydocs.dir}"/>
1173  
# Line 1223 | Line 1182
1182               failonerror = "true">
1183        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1184        <arg value="-XDignore.symbol.file=true"/>
1226 –
1185      </javadoc>
1186    </target>
1187  
1188 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1189  
1190 <  <target name="jsr166ydist"
1232 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1233 <          description="Puts all distributable products in single hierarchy"/>
1234 <
1235 <
1236 <  <target name="jsr166yclean"
1237 <          description="Removes all jsr166y build products">
1238 <
1190 >  <target name="jsr166yclean">
1191      <delete dir="${build.jsr166y.dir}"/>
1240 –
1192    </target>
1193  
1194 <
1244 <  <target name="jsr166ydist-jar"
1245 <          depends="jsr166yclean, jsr166yjar">
1194 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1195      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1196    </target>
1197  
1198 <  <target name="jsr166ydist-docs"
1250 <          depends="jsr166yclean, jsr166ydocs">
1198 >  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1199      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1200    </target>
1201  
1202  
1203 <  <!-- extra166y -->
1256 <
1257 <
1258 <  <target name="extra166ycompile"
1259 <          depends="configure-compiler, jsr166yjar"
1260 <          description="Compiles extra166y sources">
1203 >  <!-- extra166y (no longer maintained) -->
1204  
1205 +  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1206      <mkdir dir="${build.extra166y.classes.dir}"/>
1207  
1208      <javac srcdir="${topsrc.dir}"
# Line 1281 | Line 1225
1225        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1226        <compilerarg value="-Werror"/>
1227        <compilerarg line="${build.args}"/>
1284 –
1228      </javac>
1229    </target>
1230  
1231 <
1289 <  <target name="extra166yjar"
1290 <          depends="extra166ycompile"
1291 <          description="Builds library jar from compiled sources">
1292 <
1231 >  <target name="extra166yjar" depends="extra166ycompile">
1232      <jar destfile="${extra166y.jar}" index="true">
1233        <fileset dir="${build.extra166y.classes.dir}"/>
1234        <manifest>
# Line 1297 | Line 1236
1236          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1237        </manifest>
1238      </jar>
1300 –
1239    </target>
1240  
1241 <
1304 <  <target name="extra166ydocs"
1305 <          description="Builds javadocs to build dir">
1306 <
1241 >  <target name="extra166ydocs">
1242      <delete dir="${extra166ydocs.dir}"/>
1243      <mkdir dir="${extra166ydocs.dir}"/>
1244  
# Line 1317 | Line 1252
1252               executable="${javadoc7}">
1253        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1254        <arg value="-XDignore.symbol.file=true"/>
1320 –
1255      </javadoc>
1256    </target>
1257  
1258 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1259  
1260 <  <target name="extra166ydist"
1326 <          depends="extra166ydist-jar, extra166ydist-docs"
1327 <          description="Puts all distributable products in single hierarchy"/>
1328 <
1329 <
1330 <  <target name="extra166yclean"
1331 <          description="Removes all extra166y build products">
1332 <
1260 >  <target name="extra166yclean">
1261      <delete dir="${build.extra166y.dir}"/>
1334 –
1262    </target>
1263  
1264 <
1338 <  <target name="extra166ydist-jar"
1339 <          depends="extra166yclean, extra166yjar">
1264 >  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1265      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1266    </target>
1267  
1268 <  <target name="extra166ydist-docs"
1344 <          depends="extra166yclean, extra166ydocs">
1268 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1269      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1270    </target>
1271  
1272 <  <!-- jsr166e -->
1272 >
1273 >  <!-- jsr166e (no longer maintained) -->
1274  
1275    <property name="build.jsr166e.java.version" value="6"/>
1276    <property name="build.jsr166e.javac" value="${javac6}"/>
1277  
1278 <  <target name="jsr166ecompile"
1354 <          depends="configure-compiler"
1355 <          description="Compiles jsr166e sources">
1356 <
1278 >  <target name="jsr166ecompile" depends="configure-compiler">
1279      <mkdir dir="${build.jsr166e.classes.dir}"/>
1280  
1281      <javac srcdir="${topsrc.dir}"
# Line 1374 | Line 1296
1296        <compilerarg value="-Xlint:all"/>
1297        <compilerarg value="-Werror"/>
1298        <compilerarg line="${build.args}"/>
1377 –
1299      </javac>
1300    </target>
1301  
1381 –  <!-- jsr166e: find doclint errors -->
1302    <target name="jsr166edoclint">
1383 –
1303      <mkdir dir="${build.jsr166e.classes.dir}"/>
1304  
1305      <javac srcdir="${topsrc.dir}"
# Line 1402 | Line 1321
1321        <compilerarg value="-Xlint:all"/>
1322        <compilerarg value="-Werror"/>
1323        <compilerarg value="-Xdoclint:all/protected"/>
1405 –
1324      </javac>
1325    </target>
1326  
1327 <
1410 <  <target name="jsr166ejar"
1411 <          depends="jsr166ecompile"
1412 <          description="Builds library jar from compiled sources">
1413 <
1327 >  <target name="jsr166ejar" depends="jsr166ecompile">
1328      <jar destfile="${jsr166e.jar}" index="true">
1329        <fileset dir="${build.jsr166e.classes.dir}"/>
1330        <manifest>
# Line 1418 | Line 1332
1332          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1333        </manifest>
1334      </jar>
1421 –
1335    </target>
1336  
1337 <
1425 <  <target name="jsr166edocs"
1426 <          description="Builds javadocs to build dir">
1427 <
1337 >  <target name="jsr166edocs">
1338      <delete dir="${jsr166edocs.dir}"/>
1339      <mkdir dir="${jsr166edocs.dir}"/>
1340  
# Line 1438 | Line 1348
1348               failonerror = "true">
1349        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1350        <arg value="-XDignore.symbol.file=true"/>
1441 –
1351      </javadoc>
1352    </target>
1353  
1354 <
1446 <  <target name="jsr166e-tck-one-java-version"
1447 <          depends="jsr166ejar">
1448 <
1354 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1355      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1450 –
1356      <run-tck-tests
1357        tck.src.dir="${test.src.dir}/tck-jsr166e"
1358        target="${build.jsr166e.java.version}"
# Line 1455 | Line 1360
1360        classes="${jsr166e.jar}"/>
1361    </target>
1362  
1363 <  <target name="jsr166e-tck"
1459 <          description="Runs tck tests for jsr166e for multiple java versions">
1363 >  <target name="jsr166e-tck">
1364  
1365   <!--     <antcall target="clean"/> -->
1366   <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1477 | Line 1381
1381      </antcall>
1382    </target>
1383  
1384 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1385  
1386 <  <target name="jsr166e-test"
1482 <          depends="jsr166e-tck"
1483 <          description="Runs all tests for jsr166e">
1484 <  </target>
1485 <
1486 <  <target name="jsr166edist"
1487 <          depends="jsr166edist-jar, jsr166edist-docs"
1488 <          description="Puts all distributable products in single hierarchy"/>
1386 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1387  
1388 <
1491 <  <target name="jsr166eclean"
1492 <          description="Removes all jsr166e build products">
1388 >  <target name="jsr166eclean">
1389      <delete dir="${build.jsr166e.dir}"/>
1390    </target>
1391  
1496 –
1392    <target name="jsr166edist-jar"
1393            depends="jsr166eclean, jsr166ejar">
1394      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1395    </target>
1396  
1397 <  <target name="jsr166edist-docs"
1503 <          depends="jsr166eclean, jsr166edocs">
1397 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1398      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1399    </target>
1400  
1401  
1402   <!-- Find buglets that can be detected by static build tools -->
1403  
1404 <  <target name="lint">
1405 <    <antcall target="dists">
1406 <      <param name="build.javadoc.access" value="public"/>
1407 <    </antcall>
1408 <  </target>
1404 > <!--   <target name="lint"> -->
1405 > <!--     <antcall target="dists"> -->
1406 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1407 > <!--     </antcall> -->
1408 > <!--   </target> -->
1409  
1410   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1411 <  <target name="lint-private">
1411 >  <target name="doclint-private">
1412      <antcall target="dist">
1413        <param name="build.javadoc.access" value="private"/>
1414      </antcall>
# Line 1522 | Line 1416
1416  
1417  
1418   <!-- ==============================================================
1419 <  Experimental errorprone support - http://errorprone.info
1420 <  You may need to bring your own errorprone jar.
1419 >  Experimental errorprone support
1420 >  https://errorprone.info
1421 >  https://errorprone.info/docs/installation
1422 >  https://github.com/google/error-prone/issues/1143
1423   =================================================================== -->
1424 +  <path id="errorprone.processorpath.path">
1425 +    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1426 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1427 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1428 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1429 +  </path>
1430 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1431 +  <property name="errorprone.jsr166.user.flags" value=""/>
1432 +  <property name="errorprone.jsr166.flags"
1433 +            value="-Xep:HashtableContains:OFF
1434 +                   -Xep:JdkObsolete:OFF
1435 +                   -Xep:MissingOverride:OFF
1436 +                   -Xep:MissingFail:OFF
1437 +                   -Xep:ThreadPriorityCheck:OFF
1438 +                   -Xep:MixedArrayDimensions:ERROR
1439 +                   -Xep:RemoveUnusedImports:ERROR
1440 +                   -Xep:EmptyIf:ERROR
1441 +                   -Xep:MultipleTopLevelClasses:ERROR
1442 +                   -Xep:ClassName:ERROR
1443 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1444 +                   -Xep:RedundantThrows:ERROR
1445 +                   -Xep:IdentityBinaryExpression:WARN
1446 +                   -Xep:ConstructorInvokesOverridable:WARN
1447 +                   -Xep:MethodCanBeStatic:WARN
1448 +                   ${errorprone.jsr166.user.flags}"/>
1449 +  <!-- -Xep:WildcardImport:ERROR -->
1450 +  <property name="errorprone.jsr166.test.flags"
1451 +            value="-Xep:StringSplitter:OFF
1452 +                   -Xep:BoxedPrimitiveConstructor:OFF
1453 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1454 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1455    <target name="errorprone"
1456            depends="clean, configure-compiler"
1457 <          description="Run errorprone over jsr166 source code">
1457 >          description="Run errorprone over jsr166 source code (experimental)">
1458  
1459      <local name="destdir"/>
1460      <property name="destdir" value="${build.classes.dir}/java.base"/>
# Line 1546 | Line 1473
1473             fork="true">
1474  
1475        <include name="**/*.java"/>
1476 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1477 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1478 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1479 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1480 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1554 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1555 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1556 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1557 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1558 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1476 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1477 >      <compilerarg value="-J--illegal-access=permit"/>
1478 >      <compilerarg value="-XDcompilePolicy=simple"/>
1479 >      <compilerarg value="-processorpath"/>
1480 >      <compilerarg pathref="errorprone.processorpath.path"/>
1481        <compilerarg value="-Xplugin:ErrorProne
1482 <                          -Xep:IdentityBinaryExpression:WARN
1561 <                          -Xep:MissingOverride:OFF
1562 <                          -Xep:MixedArrayDimensions:WARN
1563 <                          -Xep:RemoveUnusedImports:ERROR
1564 <                          -Xep:MethodCanBeStatic:WARN"/>
1482 >                          ${errorprone.jsr166.flags}"/>
1483        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1484        <compilerarg value="-Xprefer:source"/>
1485        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1576 | Line 1494
1494      </jar>
1495  
1496      <run-tck-tests
1497 <      target="${build.main.java.version}"
1497 >      target="${java.runtime.target}"
1498        workdir="${build.dir}"
1499        classes="${product.jar}">
1500        <javac-elements>
1501 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1502 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1503 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1504 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1505 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1506 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1507 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1590 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1591 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1592 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1593 <        <compilerarg value="-Xplugin:ErrorProne
1594 <                            -Xep:IdentityBinaryExpression:WARN
1595 <                            -Xep:BoxedPrimitiveConstructor:OFF
1596 <                            -Xep:HashtableContains:OFF
1597 <                            -Xep:ModifyingCollectionWithItself:OFF
1598 <                            -Xep:MissingOverride:OFF
1599 <                            -Xep:MixedArrayDimensions:WARN
1600 <                            -Xep:RemoveUnusedImports:ERROR
1601 <                            -Xep:MethodCanBeStatic:WARN"/>
1501 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1502 >        <compilerarg value="-J--illegal-access=permit"/>
1503 >        <compilerarg value="-XDcompilePolicy=simple"/>
1504 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1505 >        <compilerarg value="-Xplugin:ErrorProne
1506 >                            ${errorprone.jsr166.flags}
1507 >                            ${errorprone.jsr166.test.flags}"/>
1508          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1509        </javac-elements>
1510      </run-tck-tests>
1511    </target>
1512  
1513 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1514 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1515 +  <target name="errorprone-jtreg"
1516 +          depends="jar"
1517 +          description="Run errorprone over jtreg tests (experimental)">
1518 +
1519 +    <run-jtreg-tests
1520 +       target="${java.runtime.target}"
1521 +       workdir="${build.dir}"
1522 +       classes="${product.jar}"
1523 +       verbose="all">
1524 +      <jtreg-elements>
1525 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1526 +        <arg value="-javacoption:-processorpath"/>
1527 +        <arg value="-javacoption:${errorprone.processorpath}"/>
1528 +        <arg value="-javacoption:-Xplugin:ErrorProne
1529 +                            ${errorprone.jsr166.flags}
1530 +                            ${errorprone.jsr166.test.flags}
1531 +                            -Xep:MultipleTopLevelClasses:WARN
1532 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1533 +      </jtreg-elements>
1534 +    </run-jtreg-tests>
1535 +  </target>
1536 +
1537  
1538   <!-- ==============================================================
1539    Running guava tests against jsr166 code
# Line 1657 | Line 1587
1587      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1588           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1589      <junit printsummary="true" showoutput="true" haltonfailure="true"
1590 <           jvm="${java9}" fork="true">
1591 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1590 >           jvm="${build.main.java}" fork="true">
1591 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1592        <formatter type="brief"/>
1593        <classpath>
1594          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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