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.220 by jsr166, Sun Sep 25 01:28:54 2016 UTC vs.
Revision 1.295 by jsr166, Sun Mar 24 00:44:14 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>
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 +  $HOME/jdk/jdk13
28    where each of the above is a JDK or a symlink to same, and
25 –  $HOME/jdk/src/jdk6
26 –  $HOME/jdk/src/jdk7
29    $HOME/jdk/src/jdk8
30    $HOME/jdk/src/jdk9
31 +  $HOME/jdk/src/jdk10
32 +  $HOME/jdk/src/jdk11
33 +  $HOME/jdk/src/jdk12
34 +  $HOME/jdk/src/jdk13
35    where each of the above is a complete JDK source tree
36    (e.g. mercurial forest) or a symlink to same.
37  
38    Alternatively, define ant variables thus:
39    ant -Djdk$N.home=... -Djdk$N.src.home=...
40 <  for $N in 6 7 8 9 ...
40 >  for $N in 8 .. 13 ...
41  
42 <  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37 <  target is currently broken.
42 >  As of 2016-03, the sources in src/main are for jdk9+ only.
43   ------------------------------------------------------------------------------
44    </description>
45  
# Line 52 | Line 57
57  
58  
59    <!-- Compilation options -->
55 –  <property name="build.sourcelevel"    value="6"/>
60    <property name="build.debug"          value="true"/>
61    <property name="build.debuglevel"     value="source,lines,vars"/>
62    <property name="build.deprecation"    value="false"/>
# Line 63 | Line 67
67    <property name="build.classes.dir"           location="${build.dir}/classes"/>
68    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
69    <property name="build.loops.dir"             location="${build.dir}/loops"/>
66 –  <property name="build.reports.dir"           location="${build.dir}/reports"/>
70  
71    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
72    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
# Line 104 | Line 107
107      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
108        unless:set="have.java.base"/>
109      <local name="modules"/>
110 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
110 >    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
111      <local name="boot.jar.dir"/>
112      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
113      <path id="bootclasspath@{v}" unless:set="modules">
# Line 134 | Line 137
137    <defjdklocations v="7"/>
138    <defjdklocations v="8"/>
139    <defjdklocations v="9"/>
140 +  <defjdklocations v="10"/>
141 +  <defjdklocations v="11"/>
142 +  <defjdklocations v="12"/>
143 +  <defjdklocations v="13"/>
144  
145    <!-- Source locations -->
146    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 143 | Line 150
150    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
151    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
152    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
153 +  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
154 +  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
155 +  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
156 +  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
157    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
158    <property name="lib.dir"              location="${basedir}/lib"/>
159    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 182 | Line 193
193    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
194  
195    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
196 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
197 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
198 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
199 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
200 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
201 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
202 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
203 <  <!-- Default jdk doc location (latest stable release seems best) -->
204 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
196 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
197 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
198 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
199 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
200 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
201 >  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
202 >  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
203 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
204 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
205 >  <!-- The location of jdk early access docs (RIP) -->
206 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
207 >  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
208 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
209 > <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
210 >  <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
211 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
212 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
213  
214    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
215    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 198 | Line 217
217    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
218    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
219    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
220 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
221 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
222 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
223 +  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
224    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
225  
226    <!-- Define the "jtreg" task -->
# Line 230 | Line 253
253  
254      <local name="modules"/>
255      <condition property="modules">
256 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
256 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
257 >    </condition>
258 >
259 >    <local name="use-doclint"/>
260 >    <condition property="use-doclint">
261 >      <not> <equals arg1="@{target}" arg2="7"/> </not>
262      </condition>
263  
264      <mkdir dir="@{workdir}/tck-classes"/>
# Line 252 | Line 280
280        <include name="*.java"/>
281        <compilerarg value="-XDignore.symbol.file=true"/>
282        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
283 +      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
284        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
285 <      <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
285 >      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
286        <compilerarg line="${build.args}"/>
287        <javac-elements/>
288  
# Line 264 | Line 293
293            jvm="${java@{target}}"
294            fork="true">
295          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
296 <        <jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
296 >        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
297 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
298 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
299 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
300 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
301 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
302          <jvmarg line="@{jvmflags}"/>
303          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
304          <jvmarg line="${vmoptions}" if:set="vmoptions"/>
# Line 286 | Line 320
320    </macrodef>
321  
322    <!-- Define jtreg test sets for different jdk versions -->
323 <  <fileset dir="${jtreg9.src.dir}">
324 <    <patternset id="jdk9.jtreg.tests">
325 <      <include name="**/*.java"/>
326 <    </patternset>
327 <  </fileset>
328 <
329 <  <fileset dir="${jtreg8.src.dir}">
330 <    <patternset id="jdk8.jtreg.tests">
331 <      <include name="**/*.java"/>
332 <      <exclude name="**/SpliteratorCharacteristics.java"/>
333 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
334 <      <exclude name="**/GCDuringIteration.java"/>
335 <    </patternset>
302 <  </fileset>
323 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
324 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
325 >  <property name="jtreg.test.pattern" value="**/*.java"/>
326 >  <macrodef name="defjtregtests">
327 >    <attribute name="v"/>
328 >    <sequential>
329 >      <fileset dir="${jtreg@{v}.src.dir}">
330 >        <patternset id="jdk@{v}.jtreg.tests">
331 >          <include name="${jtreg.test.pattern}"/>
332 >        </patternset>
333 >      </fileset>
334 >    </sequential>
335 >  </macrodef>
336  
337 <  <fileset dir="${jtreg7.src.dir}">
338 <    <patternset id="jdk7.jtreg.tests">
339 <      <include name="**/*.java"/>
340 <    </patternset>
341 <  </fileset>
337 >  <defjtregtests v="13"/>
338 >  <defjtregtests v="12"/>
339 >  <defjtregtests v="11"/>
340 >  <defjtregtests v="10"/>
341 >  <defjtregtests v="9"/>
342 >  <defjtregtests v="8"/>
343 >  <defjtregtests v="7"/>
344  
345    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
346    <property name="jtreg.flags" value=""/>
347  
348    <macrodef name="run-jtreg-tests">
349 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
315 <    <attribute name="source" default="7"/>
349 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
350      <attribute name="target"/>
351      <attribute name="workdir"/>
352      <attribute name="classes"/>
353 +    <attribute name="verbose" default="${jtreg.verbose}"/>
354      <attribute name="jtregflags" default=""/>
355 +    <element name="jtreg-elements" optional="true"/>
356  
357      <sequential>
358  
# Line 325 | Line 361
361  
362      <local name="modules"/>
363      <condition property="modules">
364 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
364 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
365      </condition>
366  
367      <delete dir="@{workdir}/JTwork"   quiet="true"/>
332 –    <delete dir="@{workdir}/JTreport" quiet="true"/>
368      <jtreg dir="${jtreg@{target}.src.dir}"
369             jdk="${jdk@{target}.home}"
370 <           workDir="@{workdir}/JTwork"
336 <           reportDir="@{workdir}/JTreport">
370 >           workDir="@{workdir}/JTwork">
371        <patternset refid="jdk@{target}.jtreg.tests"/>
372        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
373 <      <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
373 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
374 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
375        <arg value="-agentvm"/>
376 <      <arg value="-verbose:${jtreg.verbose}"/>
376 >      <arg value="-noreport"/>
377 >      <arg value="-verbose:@{verbose}"/>
378        <arg value="-vmoptions:-esa -ea"/>
379        <arg value="-automatic"/>
380        <arg value="-k:!ignore"/>
381        <arg line="@{jtregflags}"/>
382        <arg line="${jtreg.flags}"/>
383 +      <jtreg-elements/>
384      </jtreg>
385      </sequential>
386    </macrodef>
# Line 359 | Line 396
396  
397    <!-- Main targets -->
398  
399 <  <property name="build.main.java.version" value="9"/>
399 >  <!-- Default values: may seem strange ... -->
400 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
401 >  <!-- But at build time, target jdk9, for maximal binary portability -->
402 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
403 >    o override-methods=summary
404 >    o {@systemProperty ...}
405 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
406 >    o 8202628: javadoc generates bad links in TestModules.java
407 >    -->
408 >  <property name="java.runtime.target" value="11"/>
409 >  <property name="build.main.java" value="${java11}"/>
410    <property name="build.main.javac" value="${javac9}"/>
411 +  <property name="build.main.javadoc" value="${javadoc12}"/>
412 +  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
413  
414    <target name="dists"
415 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
415 >          depends="dist, 4jdk8dist"
416            description="Builds all public jars and docs"/>
417 +          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
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"/>
444 >      <compilerarg value="-Xlint:all,-removal"/>
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="${java.api.url}"
487               overview="${src.dir}/intro.html"
488               access="${build.javadoc.access}"
489               sourcepath="${src.dir}"
490               classpath=""
491 <             executable="${javadoc9}">
491 >             source="${build.main.javadoc.source}"
492 >             executable="${build.main.javadoc}">
493 > <!-- TODO: JDK-8214571 failonerror = "true" -->
494        <fileset dir="${src.dir}" defaultexcludes="yes">
495          <include name="**/*.java"/>
496        </fileset>
497 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
497 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
498        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
499        <arg value="-XDignore.symbol.file=true"/>
500 <      <arg value="-Xmodule:java.base"/>
501 <      <arg value="-tag"/>
502 <      <arg value="${javadoc.jls.option}"/>
503 < <!-- @apiNote currently unused -->
504 < <!--       <arg value="-tag"/> -->
505 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
506 <      <arg value="-tag"/>
507 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
508 <      <arg value="-tag"/>
462 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
500 >      <arg value="-html5"/>
501 >      <arg value="--patch-module=java.base=${src.dir}"/>
502 > <!-- old school frames via docs/index.html?overview-summary.html -->
503 >      <arg value="--frames"/>
504 >      <arg value="--override-methods=summary"/>
505 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
506 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
507 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
508 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
509   <!-- tags added in jdk9: currently unused -->
510 < <!--       <arg value="-tag"/> -->
511 < <!--       <arg value="revised:X"/> -->
466 < <!--       <arg value="-tag"/> -->
467 < <!--       <arg value="spec:X"/> -->
510 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
511 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
512      </javadoc>
513    </target>
514  
# Line 474 | Line 518
518            description="Puts all distributable products in single hierarchy"/>
519  
520  
477 –  <target name="release"
478 –          depends="dist"
479 –          description="Puts entire CVS tree, plus distribution productions, in a jar">
480 –
481 –    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
482 –
483 –    <jar basedir="${basedir}" destfile="${release.jar}">
484 –      <!-- <exclude name="build/**"/> -->
485 –      <exclude name="${release.jar}"/>
486 –      <exclude name="user.properties"/>
487 –      <exclude name="etc/notes/**"/>
488 –      <exclude name="src/emulation/**"/>
489 –      <exclude name="**/SyntaxTest.java"/>
490 –      <exclude name="**/SuperfluousAbstract.java"/>
491 –      <manifest>
492 –        <attribute name="Built-By" value="${user.name}"/>
493 –        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
494 –      </manifest>
495 –    </jar>
496 –  </target>
497 –
498 –
521    <target name="clean"
522            description="Removes all build products">
501 –
523      <delete dir="${build.dir}"/>
503 –
524    </target>
525  
526  
527    <target name="dist-clean"
528            description="Removes all build and distribution products">
509 –
529      <delete dir="${build.dir}"/>
530      <delete dir="${dist.dir}"/>
512 –
531    </target>
532  
533  
# Line 528 | Line 546
546            description="Runs tck tests for src/main directly">
547  
548      <run-tck-tests
549 <      target="${build.main.java.version}"
549 >      target="${java.runtime.target}"
550        workdir="${build.dir}"
551 <      classes="${product.jar}"/>
551 >      classes="${product.jar}">
552 >      <javac-elements>
553 >        <compilerarg value="-Werror"/>
554 >      </javac-elements>
555 >    </run-tck-tests>
556    </target>
557  
558    <target name="tck-parallelism-1"
# Line 558 | Line 580
580            depends="jar"
581            description="Runs jtreg tests for src/main using the jtreg ant task">
582      <run-jtreg-tests
583 <       target="${build.main.java.version}"
583 >       target="${java.runtime.target}"
584         workdir="${build.dir}"
585         classes="${product.jar}"/>
586    </target>
587  
588    <target name="test"
589            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
590 <          description="Runs tck and jtreg tests for src/main">
590 >          description="Runs tck and jtreg tests for src/main"/>
591 >
592 >  <target name="test-version-permutations"
593 >          depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
594    </target>
595  
596 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
596 >  <target name="test9">
597 >    <antcall target="clean"/>
598 >    <antcall>
599 >      <param name="java.runtime.target" value="9"/>
600 >      <param name="build.main.javac" value="${javac9}"/>
601 >      <param name="build.main.javadoc" value="${javadoc12}"/>
602 >      <param name="build.main.javadoc.source" value="9"/>
603 >      <target name="test"/>
604 >      <target name="docs"/>
605 >    </antcall>
606 >  </target>
607  
608 < <!--     <antcall target="jtreg"> -->
609 < <!--       <param name="build.main.java.version" value="8"/> -->
610 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
611 < <!--     </antcall> -->
608 >  <target name="test10">
609 >    <antcall target="clean"/>
610 >    <antcall>
611 >      <param name="java.runtime.target" value="10"/>
612 >      <param name="build.main.javac" value="${javac10}"/>
613 >      <param name="build.main.javadoc" value="${javadoc12}"/>
614 >      <param name="build.main.javadoc.source" value="10"/>
615 >      <target name="test"/>
616 >      <target name="docs"/>
617 >    </antcall>
618 >  </target>
619  
620 < <!--   </target> -->
620 >  <target name="test11">
621 >    <antcall target="clean"/>
622 >    <antcall>
623 >      <param name="java.runtime.target" value="11"/>
624 >      <param name="build.main.javac" value="${javac11}"/>
625 >      <param name="build.main.javadoc" value="${javadoc12}"/>
626 >      <param name="build.main.javadoc.source" value="11"/>
627 >      <target name="test"/>
628 >      <target name="docs"/>
629 >    </antcall>
630 >  </target>
631  
632 < <!--   <target name="test89" -->
633 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
632 >  <target name="test12">
633 >    <antcall target="clean"/>
634 >    <antcall>
635 >      <param name="java.runtime.target" value="12"/>
636 >      <param name="build.main.javac" value="${javac12}"/>
637 >      <param name="build.main.javadoc" value="${javadoc12}"/>
638 >      <param name="build.main.javadoc.source" value="12"/>
639 >      <target name="test"/>
640 >      <target name="docs"/>
641 >    </antcall>
642 >  </target>
643  
644 < <!--     <antcall target="clean"/> -->
645 < <!--     <antcall target="test"> -->
646 < <!--       <param name="build.main.java.version" value="8"/> -->
647 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
648 < <!--     </antcall> -->
644 >  <target name="test13">
645 >    <antcall target="clean"/>
646 >    <antcall>
647 >      <param name="java.runtime.target" value="13"/>
648 >      <param name="build.main.javac" value="${javac13}"/>
649 >      <param name="build.main.javadoc" value="${javadoc13}"/>
650 >      <param name="build.main.javadoc.source" value="13"/>
651 >      <target name="test"/>
652 >      <target name="docs"/>
653 >    </antcall>
654 >  </target>
655  
656 < <!--     <antcall target="clean"/> -->
657 < <!--     <antcall target="test"> -->
658 < <!--       <param name="build.main.java.version" value="9"/> -->
659 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
660 < <!--     </antcall> -->
656 >  <target name="test9-11">
657 >    <antcall target="clean"/>
658 >    <antcall>
659 >      <param name="java.runtime.target" value="11"/>
660 >      <param name="build.main.javac" value="${javac9}"/>
661 >      <param name="build.main.javadoc" value="${javadoc12}"/>
662 >      <param name="build.main.javadoc.source" value="9"/>
663 >      <target name="test"/>
664 >      <target name="docs"/>
665 >    </antcall>
666 >  </target>
667  
668 < <!--   </target> -->
668 >  <target name="test9-12">
669 >    <antcall target="clean"/>
670 >    <antcall>
671 >      <param name="java.runtime.target" value="12"/>
672 >      <param name="build.main.javac" value="${javac9}"/>
673 >      <param name="build.main.javadoc" value="${javadoc12}"/>
674 >      <param name="build.main.javadoc.source" value="9"/>
675 >      <target name="test"/>
676 >      <target name="docs"/>
677 >    </antcall>
678 >  </target>
679  
680 +  <target name="test9-13">
681 +    <antcall target="clean"/>
682 +    <antcall>
683 +      <param name="java.runtime.target" value="13"/>
684 +      <param name="build.main.javac" value="${javac9}"/>
685 +      <param name="build.main.javadoc" value="${javadoc13}"/>
686 +      <param name="build.main.javadoc.source" value="9"/>
687 +      <target name="test"/>
688 +      <target name="docs"/>
689 +    </antcall>
690 +  </target>
691  
692  
693    <target name="configure-compiler">
694      <fail message="ant version too old">
695 <      <condition>
602 <        <not> <antversion atleast="1.9.1"/> </not>
603 <      </condition>
695 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
696      </fail>
697  
698      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 618 | Line 710
710    </target>
711  
712  
621 –
622 –  <!-- Various demos and test programs -->
623 –
624 –
625 –  <!-- description="Benchmark from Doug Lea's AQS paper" -->
626 –  <target name="loops" depends="configure-compiler">
627 –
628 –    <mkdir dir="${build.loops.dir}"/>
629 –
630 –    <javac srcdir="${loops.src.dir}"
631 –          destdir="${build.loops.dir}"
632 –            debug="${build.debug}"
633 –       debuglevel="${build.debuglevel}"
634 –      deprecation="${build.deprecation}"
635 –           source="${build.sourcelevel}"
636 –           target="${build.sourcelevel}"
637 –         encoding="ASCII"
638 –             fork="true">
639 –
640 –      <compilerarg line="${build.args}"/>
641 –      <classpath refid="loops.classpath"/>
642 –      <compilerarg value="-XDignore.symbol.file=true"/>
643 –
644 –    </javac>
645 –
646 –    <java classname="ALoops" fork="true">
647 –      <classpath refid="loops.classpath"/>
648 –    </java>
649 –
650 –  </target>
651 –
652 –
713    <target name="compile-test-loops" depends="jar"
714 <          description="compile all the perf tests in src/test/loops">
714 >          description="Compiles all the perf tests in src/test/loops">
715  
716      <mkdir dir="${build.dir}/test/loops"/>
717  
# Line 663 | Line 723
723             includeAntRuntime="false"
724             includeJavaRuntime="false"
725             encoding="ASCII"
726 <           executable="${javac9}"
726 >           executable="${build.main.javac}"
727             fork="true">
728  
729        <include name="*.java"/>
# Line 671 | Line 731
731        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
732        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
733        <compilerarg line="${build.args}"/>
674 –
734      </javac>
676 –
735    </target>
736  
737  
# Line 699 | Line 757
757             encoding="ASCII"
758             executable="${javac8}"
759             fork="true">
702 –
760        <include name="**/*.java"/>
761        <compilerarg value="-Xprefer:source"/>
762        <compilerarg value="-XDignore.symbol.file=true"/>
763        <compilerarg value="-Xlint:all"/>
764        <compilerarg value="-Werror"/>
765        <compilerarg line="${build.args}"/>
709 –
766      </javac>
767    </target>
768  
# Line 730 | Line 786
786             encoding="ASCII"
787             executable="${javac8}"
788             fork="true">
733 –
789        <include name="**/*.java"/>
790        <compilerarg value="-Xprefer:source"/>
791        <compilerarg value="-XDignore.symbol.file=true"/>
792        <compilerarg value="-Xlint:all"/>
793 <      <compilerarg value="-Xdoclint:all/protected"/>
793 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
794        <compilerarg line="${build.args}"/>
740 –
795      </javac>
796    </target>
797  
# Line 753 | Line 807
807          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
808        </manifest>
809      </jar>
756 –
810    </target>
811  
812  
# Line 769 | Line 822
822          <!-- JDK9+ test classes -->
823          <exclude name="*9Test.java"/>
824          <exclude name="*10Test.java"/>
825 +        <compilerarg value="-Werror"/>
826        </javac-elements>
827      </run-tck-tests>
828    </target>
# Line 786 | Line 840
840  
841    <target name="4jdk8-test"
842            depends="4jdk8-tck, 4jdk8-jtreg"
843 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
790 <  </target>
843 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
844  
845  
846    <target name="4jdk8docs"
# Line 803 | Line 856
856               access="${build.javadoc.access}"
857               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
858               classpath=""
859 +             source="8"
860               executable="${javadoc8}"
861               failonerror = "true">
862        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 810 | Line 864
864        </fileset>
865        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
866        <arg value="-XDignore.symbol.file=true"/>
867 <      <arg value="-tag"/>
868 <      <arg value="${javadoc.jls.option}"/>
869 < <!-- @apiNote currently unused -->
870 < <!--       <arg value="-tag"/> -->
871 < <!--       <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;"/>
867 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
868 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
869 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
870 > <!-- @apiNote tag currently unused -->
871 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
872      </javadoc>
873    </target>
874  
# Line 830 | Line 880
880  
881    <target name="4jdk8clean"
882            description="Removes all 4jdk8 build products">
833 –
883      <delete dir="${build.4jdk8.dir}"/>
835 –
884    </target>
885  
886  
# Line 848 | Line 896
896    </target>
897  
898  
899 +  <!-- jsr166 4jdk7 (no longer maintained) -->
900  
901 <  <!-- jsr166 4jdk7 -->
853 <
854 <  <target name="4jdk7compile"
855 <          depends="configure-compiler"
856 <          description="Compiles src/jdk7 sources, targeting jdk7">
857 <
901 >  <target name="4jdk7compile" depends="configure-compiler">
902      <mkdir dir="${build.4jdk7.classes.dir}"/>
903  
904      <javac srcdir="${4jdk7src.dir}"
# Line 878 | Line 922
922        <compilerarg value="-Xlint:all"/>
923        <compilerarg value="-Werror"/>
924        <compilerarg line="${build.args}"/>
881 –
925      </javac>
926    </target>
927  
928 <  <target name="4jdk7doclint"
886 <          depends="configure-compiler"
887 <          description="Finds doclint warnings">
888 <
928 >  <target name="4jdk7doclint" depends="configure-compiler">
929      <mkdir dir="${build.4jdk7.classes.dir}"/>
930  
931      <javac srcdir="${4jdk7src.dir}"
# Line 909 | Line 949
949        <compilerarg value="-Xlint:all"/>
950        <compilerarg value="-Xdoclint:all/protected"/>
951        <compilerarg line="${build.args}"/>
912 –
952      </javac>
953    </target>
954  
955 <
917 <  <target name="4jdk7jar"
918 <          depends="4jdk7compile"
919 <          description="Builds library jar from compiled sources">
920 <
955 >  <target name="4jdk7jar" depends="4jdk7compile">
956      <jar destfile="${4jdk7product.jar}">
957        <fileset dir="${build.4jdk7.classes.dir}"/>
958        <manifest>
# Line 925 | Line 960
960          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
961        </manifest>
962      </jar>
928 –
963    </target>
964  
965 <
932 <  <target name="4jdk7-tck"
933 <          depends="4jdk7jar"
934 <          description="Runs tck tests for jsr166-4jdk7 directly">
935 <
965 >  <target name="4jdk7-tck" depends="4jdk7jar">
966      <run-tck-tests
967        target="7"
968        workdir="${build.4jdk7.dir}"
# Line 950 | Line 980
980          <exclude name="SplittableRandomTest.java"/>
981          <exclude name="StampedLockTest.java"/>
982          <exclude name="SubmissionPublisherTest.java"/>
983 +        <compilerarg value="-Werror"/>
984        </javac-elements>
985      </run-tck-tests>
986    </target>
987  
957 –
988    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
989 <  <target name="4jdk7-tck-junit"
960 <          depends="4jdk7compile">
989 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
990  
991      <junit printsummary="true"
992             showoutput="true"
# Line 979 | Line 1008
1008  
1009        <test name="${jsr166.tckTestClass}" haltonfailure="no">
1010        </test>
982 –
1011      </junit>
1012    </target>
1013  
1014 <  <target name="4jdk7-jtreg"
987 <          depends="4jdk7jar"
988 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
1014 >  <target name="4jdk7-jtreg" depends="4jdk7jar">
1015      <run-jtreg-tests
1016         target="7"
1017         workdir="${build.4jdk7.dir}"
1018         classes="${4jdk7product.jar}"/>
1019    </target>
1020  
1021 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1022  
1023 <  <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 <
1023 >  <target name="4jdk7docs">
1024      <delete dir="${4jdk7docs.dir}"/>
1025      <mkdir dir="${4jdk7docs.dir}"/>
1026  
# Line 1022 | Line 1041
1041      </javadoc>
1042    </target>
1043  
1044 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1045  
1046 <  <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 <
1046 >  <target name="4jdk7clean">
1047      <delete dir="${build.4jdk7.dir}"/>
1035 –
1048    </target>
1049  
1050 <
1039 <  <target name="4jdk7dist-jar"
1040 <          depends="4jdk7clean, 4jdk7jar">
1050 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1051      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1052    </target>
1053  
1054 <
1045 <  <target name="4jdk7dist-docs"
1046 <          depends="4jdk7clean, 4jdk7docs">
1054 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1055      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1056    </target>
1057  
1058  
1059 <  <!-- jsr166x -->
1052 <
1053 <  <target name="jsr166xcompile"
1054 <          depends="configure-compiler"
1055 <          description="Compiles jsr166x sources to build dir">
1059 >  <!-- jsr166x (no longer maintained) -->
1060  
1061 +  <target name="jsr166xcompile" depends="configure-compiler">
1062      <mkdir dir="${build.jsr166x.classes.dir}"/>
1063  
1064      <javac srcdir="${topsrc.dir}"
# Line 1070 | Line 1075
1075             encoding="ASCII"
1076             executable="${javac7}"
1077             fork="true">
1073 –
1078        <include name="jsr166x/**/*.java"/>
1079        <compilerarg value="-XDignore.symbol.file=true"/>
1080        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1081        <compilerarg value="-Werror"/>
1082        <compilerarg line="${build.args}"/>
1079 –
1083      </javac>
1084    </target>
1085  
1086 <
1084 <  <target name="jsr166xjar"
1085 <          depends="jsr166xcompile"
1086 <          description="Builds library jar from compiled sources">
1087 <
1086 >  <target name="jsr166xjar" depends="jsr166xcompile">
1087      <jar destfile="${jsr166x.jar}">
1088        <fileset dir="${build.jsr166x.classes.dir}"/>
1089        <manifest>
# Line 1092 | Line 1091
1091          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1092        </manifest>
1093      </jar>
1095 –
1094    </target>
1095  
1096 <
1099 <  <target name="jsr166xdocs"
1100 <          description="Builds javadocs to dist dir">
1101 <
1096 >  <target name="jsr166xdocs">
1097      <delete dir="${jsr166xdocs.dir}"/>
1098      <mkdir dir="${jsr166xdocs.dir}"/>
1099  
# Line 1113 | Line 1108
1108               failonerror = "true">
1109        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1110        <arg value="-XDignore.symbol.file=true"/>
1116 –
1111      </javadoc>
1112    </target>
1113  
1114 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1115  
1116 <  <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 <
1116 >  <target name="jsr166xclean">
1117      <delete dir="${build.jsr166x.dir}"/>
1130 –
1118    </target>
1119  
1120 <
1134 <  <target name="jsr166xdist-jar"
1135 <          depends="jsr166xclean, jsr166xjar">
1120 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1121      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1122    </target>
1123  
1124 <  <target name="jsr166xdist-docs"
1140 <          depends="jsr166xclean, jsr166xdocs">
1124 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1125      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1126    </target>
1127  
1144 –  <!-- jsr166y -->
1128  
1129 +  <!-- jsr166y (no longer maintained) -->
1130  
1131 <  <target name="jsr166ycompile"
1148 <          depends="configure-compiler"
1149 <          description="Compiles jsr166y sources">
1150 <
1131 >  <target name="jsr166ycompile" depends="configure-compiler">
1132      <mkdir dir="${build.jsr166y.classes.dir}"/>
1133  
1134      <javac srcdir="${topsrc.dir}"
# Line 1170 | Line 1151
1151        <compilerarg value="-Xlint:all"/>
1152        <compilerarg value="-Werror"/>
1153        <compilerarg line="${build.args}"/>
1173 –
1154      </javac>
1155    </target>
1156  
1157 <
1178 <  <target name="jsr166yjar"
1179 <          depends="jsr166ycompile"
1180 <          description="Builds library jar from compiled sources">
1181 <
1157 >  <target name="jsr166yjar" depends="jsr166ycompile">
1158      <jar destfile="${jsr166y.jar}" index="true">
1159        <fileset dir="${build.jsr166y.classes.dir}"/>
1160        <manifest>
# Line 1186 | Line 1162
1162          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1163        </manifest>
1164      </jar>
1189 –
1165    </target>
1166  
1167 <
1193 <  <target name="jsr166ydocs"
1194 <          description="Builds javadocs to dist dir">
1195 <
1167 >  <target name="jsr166ydocs">
1168      <delete dir="${jsr166ydocs.dir}"/>
1169      <mkdir dir="${jsr166ydocs.dir}"/>
1170  
# Line 1207 | Line 1179
1179               failonerror = "true">
1180        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1181        <arg value="-XDignore.symbol.file=true"/>
1210 –
1182      </javadoc>
1183    </target>
1184  
1185 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1186  
1187 <  <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 <
1187 >  <target name="jsr166yclean">
1188      <delete dir="${build.jsr166y.dir}"/>
1224 –
1189    </target>
1190  
1191 <
1228 <  <target name="jsr166ydist-jar"
1229 <          depends="jsr166yclean, jsr166yjar">
1191 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1192      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1193    </target>
1194  
1195 <  <target name="jsr166ydist-docs"
1234 <          depends="jsr166yclean, jsr166ydocs">
1195 >  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1196      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1197    </target>
1198  
1199  
1200 <  <!-- extra166y -->
1240 <
1241 <
1242 <  <target name="extra166ycompile"
1243 <          depends="configure-compiler, jsr166yjar"
1244 <          description="Compiles extra166y sources">
1200 >  <!-- extra166y (no longer maintained) -->
1201  
1202 +  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1203      <mkdir dir="${build.extra166y.classes.dir}"/>
1204  
1205      <javac srcdir="${topsrc.dir}"
# Line 1265 | Line 1222
1222        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1223        <compilerarg value="-Werror"/>
1224        <compilerarg line="${build.args}"/>
1268 –
1225      </javac>
1226    </target>
1227  
1228 <
1273 <  <target name="extra166yjar"
1274 <          depends="extra166ycompile"
1275 <          description="Builds library jar from compiled sources">
1276 <
1228 >  <target name="extra166yjar" depends="extra166ycompile">
1229      <jar destfile="${extra166y.jar}" index="true">
1230        <fileset dir="${build.extra166y.classes.dir}"/>
1231        <manifest>
# Line 1281 | Line 1233
1233          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1234        </manifest>
1235      </jar>
1284 –
1236    </target>
1237  
1238 <
1288 <  <target name="extra166ydocs"
1289 <          description="Builds javadocs to build dir">
1290 <
1238 >  <target name="extra166ydocs">
1239      <delete dir="${extra166ydocs.dir}"/>
1240      <mkdir dir="${extra166ydocs.dir}"/>
1241  
# Line 1301 | Line 1249
1249               executable="${javadoc7}">
1250        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1251        <arg value="-XDignore.symbol.file=true"/>
1304 –
1252      </javadoc>
1253    </target>
1254  
1255 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1256  
1257 <  <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 <
1257 >  <target name="extra166yclean">
1258      <delete dir="${build.extra166y.dir}"/>
1318 –
1259    </target>
1260  
1261 <
1322 <  <target name="extra166ydist-jar"
1323 <          depends="extra166yclean, extra166yjar">
1261 >  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1262      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1263    </target>
1264  
1265 <  <target name="extra166ydist-docs"
1328 <          depends="extra166yclean, extra166ydocs">
1265 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1266      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1267    </target>
1268  
1269 <  <!-- jsr166e -->
1269 >
1270 >  <!-- jsr166e (no longer maintained) -->
1271  
1272    <property name="build.jsr166e.java.version" value="6"/>
1273    <property name="build.jsr166e.javac" value="${javac6}"/>
1274  
1275 <  <target name="jsr166ecompile"
1338 <          depends="configure-compiler"
1339 <          description="Compiles jsr166e sources">
1340 <
1275 >  <target name="jsr166ecompile" depends="configure-compiler">
1276      <mkdir dir="${build.jsr166e.classes.dir}"/>
1277  
1278      <javac srcdir="${topsrc.dir}"
# Line 1358 | Line 1293
1293        <compilerarg value="-Xlint:all"/>
1294        <compilerarg value="-Werror"/>
1295        <compilerarg line="${build.args}"/>
1361 –
1296      </javac>
1297    </target>
1298  
1365 –  <!-- jsr166e: find doclint errors -->
1299    <target name="jsr166edoclint">
1367 –
1300      <mkdir dir="${build.jsr166e.classes.dir}"/>
1301  
1302      <javac srcdir="${topsrc.dir}"
# Line 1386 | Line 1318
1318        <compilerarg value="-Xlint:all"/>
1319        <compilerarg value="-Werror"/>
1320        <compilerarg value="-Xdoclint:all/protected"/>
1389 –
1321      </javac>
1322    </target>
1323  
1324 <
1394 <  <target name="jsr166ejar"
1395 <          depends="jsr166ecompile"
1396 <          description="Builds library jar from compiled sources">
1397 <
1324 >  <target name="jsr166ejar" depends="jsr166ecompile">
1325      <jar destfile="${jsr166e.jar}" index="true">
1326        <fileset dir="${build.jsr166e.classes.dir}"/>
1327        <manifest>
# Line 1402 | Line 1329
1329          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1330        </manifest>
1331      </jar>
1405 –
1332    </target>
1333  
1334 <
1409 <  <target name="jsr166edocs"
1410 <          description="Builds javadocs to build dir">
1411 <
1334 >  <target name="jsr166edocs">
1335      <delete dir="${jsr166edocs.dir}"/>
1336      <mkdir dir="${jsr166edocs.dir}"/>
1337  
# Line 1422 | Line 1345
1345               failonerror = "true">
1346        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1347        <arg value="-XDignore.symbol.file=true"/>
1425 –
1348      </javadoc>
1349    </target>
1350  
1351 <
1430 <  <target name="jsr166e-tck-one-java-version"
1431 <          depends="jsr166ejar">
1432 <
1351 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1352      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1434 –
1353      <run-tck-tests
1354        tck.src.dir="${test.src.dir}/tck-jsr166e"
1355        target="${build.jsr166e.java.version}"
# Line 1439 | Line 1357
1357        classes="${jsr166e.jar}"/>
1358    </target>
1359  
1360 <  <target name="jsr166e-tck"
1443 <          description="Runs tck tests for jsr166e for multiple java versions">
1360 >  <target name="jsr166e-tck">
1361  
1362   <!--     <antcall target="clean"/> -->
1363   <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1461 | Line 1378
1378      </antcall>
1379    </target>
1380  
1381 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1382  
1383 <  <target name="jsr166e-test"
1466 <          depends="jsr166e-tck"
1467 <          description="Runs all tests for jsr166e">
1468 <  </target>
1383 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1384  
1385 <  <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">
1385 >  <target name="jsr166eclean">
1386      <delete dir="${build.jsr166e.dir}"/>
1387    </target>
1388  
1480 –
1389    <target name="jsr166edist-jar"
1390            depends="jsr166eclean, jsr166ejar">
1391      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1392    </target>
1393  
1394 <  <target name="jsr166edist-docs"
1487 <          depends="jsr166eclean, jsr166edocs">
1394 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1395      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1396    </target>
1397  
1398  
1399   <!-- Find buglets that can be detected by static build tools -->
1400  
1401 <  <target name="lint">
1402 <    <antcall target="dists">
1403 <      <param name="build.javadoc.access" value="public"/>
1404 <    </antcall>
1405 <  </target>
1401 > <!--   <target name="lint"> -->
1402 > <!--     <antcall target="dists"> -->
1403 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1404 > <!--     </antcall> -->
1405 > <!--   </target> -->
1406  
1407   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1408 <  <target name="lint-private">
1408 >  <target name="doclint-private">
1409      <antcall target="dist">
1410        <param name="build.javadoc.access" value="private"/>
1411      </antcall>
1412    </target>
1413  
1414  
1415 + <!-- ==============================================================
1416 +  Experimental errorprone support
1417 +  https://errorprone.info
1418 +  https://errorprone.info/docs/installation
1419 +  https://github.com/google/error-prone/issues/1143
1420 + =================================================================== -->
1421 +  <path id="errorprone.processorpath.path">
1422 +    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1423 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1424 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1425 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1426 +  </path>
1427 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1428 +  <property name="errorprone.jsr166.user.flags" value=""/>
1429 +  <property name="errorprone.jsr166.flags"
1430 +            value="-Xep:HashtableContains:OFF
1431 +                   -Xep:JdkObsolete:OFF
1432 +                   -Xep:MissingOverride:OFF
1433 +                   -Xep:MissingFail:OFF
1434 +                   -Xep:ThreadPriorityCheck:OFF
1435 +                   -Xep:MixedArrayDimensions:ERROR
1436 +                   -Xep:RemoveUnusedImports:ERROR
1437 +                   -Xep:EmptyIf:ERROR
1438 +                   -Xep:MultipleTopLevelClasses:ERROR
1439 +                   -Xep:ClassName:ERROR
1440 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1441 +                   -Xep:RedundantThrows:ERROR
1442 +                   -Xep:IdentityBinaryExpression:WARN
1443 +                   -Xep:ConstructorInvokesOverridable:WARN
1444 +                   -Xep:MethodCanBeStatic:WARN
1445 +                   ${errorprone.jsr166.user.flags}"/>
1446 +  <!-- -Xep:WildcardImport:ERROR -->
1447 +  <property name="errorprone.jsr166.test.flags"
1448 +            value="-Xep:StringSplitter:OFF
1449 +                   -Xep:BoxedPrimitiveConstructor:OFF
1450 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1451 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1452 +  <target name="errorprone"
1453 +          depends="clean, configure-compiler"
1454 +          description="Run errorprone over jsr166 source code (experimental)">
1455 +
1456 +    <local name="destdir"/>
1457 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1458 +    <mkdir dir="${destdir}"/>
1459 +
1460 +    <javac srcdir="${src.dir}"
1461 +           destdir="${destdir}"
1462 +           debug="${build.debug}"
1463 +           debuglevel="${build.debuglevel}"
1464 +           deprecation="${build.deprecation}"
1465 +           classpath=""
1466 +           includeAntRuntime="false"
1467 +           includeJavaRuntime="false"
1468 +           encoding="ASCII"
1469 +           executable="${build.main.javac}"
1470 +           fork="true">
1471 +
1472 +      <include name="**/*.java"/>
1473 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1474 +      <compilerarg value="-J--illegal-access=permit"/>
1475 +      <compilerarg value="-XDcompilePolicy=simple"/>
1476 +      <compilerarg value="-processorpath"/>
1477 +      <compilerarg pathref="errorprone.processorpath.path"/>
1478 +      <compilerarg value="-Xplugin:ErrorProne
1479 +                          ${errorprone.jsr166.flags}"/>
1480 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1481 +      <compilerarg value="-Xprefer:source"/>
1482 +      <compilerarg value="-XDignore.symbol.file=true"/>
1483 +      <compilerarg value="-Xlint:all"/>
1484 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1485 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1486 +      <compilerarg line="${build.args}"/>
1487 +    </javac>
1488 +
1489 +    <jar destfile="${product.jar}">
1490 +      <fileset dir="${destdir}"/>
1491 +    </jar>
1492 +
1493 +    <run-tck-tests
1494 +      target="${java.runtime.target}"
1495 +      workdir="${build.dir}"
1496 +      classes="${product.jar}">
1497 +      <javac-elements>
1498 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1499 +        <compilerarg value="-J--illegal-access=permit"/>
1500 +        <compilerarg value="-XDcompilePolicy=simple"/>
1501 +        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1502 +        <compilerarg value="-Xplugin:ErrorProne
1503 +                            ${errorprone.jsr166.flags}
1504 +                            ${errorprone.jsr166.test.flags}"/>
1505 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1506 +      </javac-elements>
1507 +    </run-tck-tests>
1508 +  </target>
1509 +
1510 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1511 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1512 +  <target name="errorprone-jtreg"
1513 +          depends="jar"
1514 +          description="Run errorprone over jtreg tests (experimental)">
1515 +
1516 +    <run-jtreg-tests
1517 +       target="${java.runtime.target}"
1518 +       workdir="${build.dir}"
1519 +       classes="${product.jar}"
1520 +       verbose="all">
1521 +      <jtreg-elements>
1522 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1523 +        <arg value="-javacoption:-processorpath"/>
1524 +        <arg value="-javacoption:${errorprone.processorpath}"/>
1525 +        <arg value="-javacoption:-Xplugin:ErrorProne
1526 +                            ${errorprone.jsr166.flags}
1527 +                            ${errorprone.jsr166.test.flags}
1528 +                            -Xep:MultipleTopLevelClasses:WARN
1529 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1530 +      </jtreg-elements>
1531 +    </run-jtreg-tests>
1532 +  </target>
1533 +
1534 +
1535 + <!-- ==============================================================
1536 +  Running guava tests against jsr166 code
1537 + =================================================================== -->
1538 +
1539 + <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1540 + <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1541 + <!-- <property name="guava.version" value="21.0"/> -->
1542 +
1543 + <!-- HOWTO debug print a path id -->
1544 + <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1545 + <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1546 +
1547 + <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1548 + <!--   organisation="com.google.guava" module="guava-tests"/> -->
1549 + <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1550 + <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1551 + <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1552 + <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1553 +
1554 + <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1555 + <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1556 + <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1557 + <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1558 +
1559 + <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1560 + <!--   type="*" inline="true" conf="*(private),*(public)" -->
1561 + <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1562 + <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1563 +
1564 + <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1565 + <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1566 + <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1567 +
1568 +  <target name="init-ivy">
1569 +    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1570 +         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1571 +    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1572 +             classpath="${build.dir}/ivy.jar"/>
1573 +  </target>
1574 +
1575 +  <target name="guava-tests" depends="jar, init-ivy"
1576 +          description="Guava tests run against jsr166 collections">
1577 +    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1578 +    <mkdir dir="${guava.dir}"/>
1579 +    <ivy:retrieve pathid="guava.testlib.classpath"
1580 +      type="jar,bundle" inline="true" conf="default,master"
1581 +      pattern="${guava.dir}/[artifact].[ext]"
1582 +      organisation="com.google.guava" module="guava-testlib"/>
1583 +    <property name="guava.version" value="21.0"/>
1584 +    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1585 +         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1586 +    <junit printsummary="true" showoutput="true" haltonfailure="true"
1587 +           jvm="${build.main.java}" fork="true">
1588 +      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1589 +      <formatter type="brief"/>
1590 +      <classpath>
1591 +        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1592 +        <path refid="guava.testlib.classpath"/>
1593 +      </classpath>
1594 +
1595 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1596 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1597 +    </junit>
1598 +  </target>
1599 +
1600   </project>

Diff Legend

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