ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.223 by jsr166, Thu Nov 24 01:53:50 2016 UTC vs.
Revision 1.298 by jsr166, Wed May 22 17:36:58 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"/>
# Line 334 | Line 370
370             workDir="@{workdir}/JTwork">
371        <patternset refid="jdk@{target}.jtreg.tests"/>
372        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
373 <      <arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
374 <      <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="-noreport"/>
377 <      <arg value="-verbose:${jtreg.verbose}"/>
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="-Xdoclint/package:java.util.*"/>
448        <compilerarg value="-Werror"/>
405      <compilerarg value="-Xdoclint:all/protected"/>
449        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
450        <compilerarg line="${build.args}"/>
451  
# Line 434 | Line 477
477      <!-- the packagenames="none" hack below prevents scanning the -->
478      <!-- sourcepath for packages -->
479  
480 < <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
481 < <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
480 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
481 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
482 > <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
483 > <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
484 > <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
485      <javadoc destdir="${docs.dir}"
486               packagenames="none"
487 <             link="${java9.api.url}"
487 >             link="${java.api.url}"
488               overview="${src.dir}/intro.html"
489               access="${build.javadoc.access}"
490               sourcepath="${src.dir}"
491               classpath=""
492 <             executable="${javadoc9}">
492 >             source="${build.main.javadoc.source}"
493 >             executable="${build.main.javadoc}">
494 > <!-- TODO: JDK-8214571 failonerror = "true" -->
495        <fileset dir="${src.dir}" defaultexcludes="yes">
496          <include name="**/*.java"/>
497        </fileset>
498 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
498 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
499        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
500        <arg value="-XDignore.symbol.file=true"/>
501 <      <arg value="-Xmodule:java.base"/>
502 <      <arg value="-tag"/>
503 <      <arg value="${javadoc.jls.option}"/>
504 < <!-- @apiNote currently unused -->
505 < <!--       <arg value="-tag"/> -->
506 < <!--       <arg value="apiNote:a:API Note:"/> -->
507 <      <arg value="-tag"/>
508 <      <arg value="implSpec:a:Implementation Requirements:"/>
509 <      <arg value="-tag"/>
510 <      <arg value="implNote:a:Implementation Note:"/>
501 >      <arg value="-html5"/>
502 >      <arg value="--patch-module=java.base=${src.dir}"/>
503 > <!-- old school frames via docs/index.html?overview-summary.html -->
504 > <!-- TODO: - -frames no longer a supported option in jdk13+ -->
505 >      <arg value="--frames"/>
506 >      <arg value="--override-methods=summary"/>
507 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
508 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
509 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
510 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
511   <!-- tags added in jdk9: currently unused -->
512 < <!--       <arg value="-tag"/> -->
513 < <!--       <arg value="revised:X"/> -->
466 < <!--       <arg value="-tag"/> -->
467 < <!--       <arg value="spec:X"/> -->
512 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
513 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
514      </javadoc>
515    </target>
516  
# Line 474 | Line 520
520            description="Puts all distributable products in single hierarchy"/>
521  
522  
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
523    <target name="clean"
524            description="Removes all build products">
501
525      <delete dir="${build.dir}"/>
503
526    </target>
527  
528  
529    <target name="dist-clean"
530            description="Removes all build and distribution products">
509
531      <delete dir="${build.dir}"/>
532      <delete dir="${dist.dir}"/>
512
533    </target>
534  
535  
# Line 528 | Line 548
548            description="Runs tck tests for src/main directly">
549  
550      <run-tck-tests
551 <      target="${build.main.java.version}"
551 >      target="${java.runtime.target}"
552        workdir="${build.dir}"
553 <      classes="${product.jar}"/>
553 >      classes="${product.jar}">
554 >      <javac-elements>
555 >        <compilerarg value="-Werror"/>
556 >      </javac-elements>
557 >    </run-tck-tests>
558    </target>
559  
560    <target name="tck-parallelism-1"
# Line 558 | Line 582
582            depends="jar"
583            description="Runs jtreg tests for src/main using the jtreg ant task">
584      <run-jtreg-tests
585 <       target="${build.main.java.version}"
585 >       target="${java.runtime.target}"
586         workdir="${build.dir}"
587         classes="${product.jar}"/>
588    </target>
589  
590    <target name="test"
591            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
592 <          description="Runs tck and jtreg tests for src/main">
592 >          description="Runs tck and jtreg tests for src/main"/>
593 >
594 >  <target name="test-version-permutations"
595 >          depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
596    </target>
597  
598 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
598 >  <target name="test9">
599 >    <antcall target="clean"/>
600 >    <antcall>
601 >      <param name="java.runtime.target" value="9"/>
602 >      <param name="build.main.javac" value="${javac9}"/>
603 >      <param name="build.main.javadoc" value="${javadoc12}"/>
604 >      <param name="build.main.javadoc.source" value="9"/>
605 >      <target name="test"/>
606 >      <target name="docs"/>
607 >    </antcall>
608 >  </target>
609  
610 < <!--     <antcall target="jtreg"> -->
611 < <!--       <param name="build.main.java.version" value="8"/> -->
612 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
613 < <!--     </antcall> -->
610 >  <target name="test10">
611 >    <antcall target="clean"/>
612 >    <antcall>
613 >      <param name="java.runtime.target" value="10"/>
614 >      <param name="build.main.javac" value="${javac10}"/>
615 >      <param name="build.main.javadoc" value="${javadoc12}"/>
616 >      <param name="build.main.javadoc.source" value="10"/>
617 >      <target name="test"/>
618 >      <target name="docs"/>
619 >    </antcall>
620 >  </target>
621  
622 < <!--   </target> -->
622 >  <target name="test11">
623 >    <antcall target="clean"/>
624 >    <antcall>
625 >      <param name="java.runtime.target" value="11"/>
626 >      <param name="build.main.javac" value="${javac11}"/>
627 >      <param name="build.main.javadoc" value="${javadoc12}"/>
628 >      <param name="build.main.javadoc.source" value="11"/>
629 >      <target name="test"/>
630 >      <target name="docs"/>
631 >    </antcall>
632 >  </target>
633  
634 < <!--   <target name="test89" -->
635 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
634 >  <target name="test12">
635 >    <antcall target="clean"/>
636 >    <antcall>
637 >      <param name="java.runtime.target" value="12"/>
638 >      <param name="build.main.javac" value="${javac12}"/>
639 >      <param name="build.main.javadoc" value="${javadoc12}"/>
640 >      <param name="build.main.javadoc.source" value="12"/>
641 >      <target name="test"/>
642 >      <target name="docs"/>
643 >    </antcall>
644 >  </target>
645  
646 < <!--     <antcall target="clean"/> -->
647 < <!--     <antcall target="test"> -->
648 < <!--       <param name="build.main.java.version" value="8"/> -->
649 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
650 < <!--     </antcall> -->
646 >  <target name="test13">
647 >    <antcall target="clean"/>
648 >    <antcall>
649 >      <param name="java.runtime.target" value="13"/>
650 >      <param name="build.main.javac" value="${javac13}"/>
651 >      <param name="build.main.javadoc" value="${javadoc13}"/>
652 >      <param name="build.main.javadoc.source" value="13"/>
653 >      <target name="test"/>
654 >      <target name="docs"/>
655 >    </antcall>
656 >  </target>
657  
658 < <!--     <antcall target="clean"/> -->
659 < <!--     <antcall target="test"> -->
660 < <!--       <param name="build.main.java.version" value="9"/> -->
661 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
662 < <!--     </antcall> -->
658 >  <target name="test9-11">
659 >    <antcall target="clean"/>
660 >    <antcall>
661 >      <param name="java.runtime.target" value="11"/>
662 >      <param name="build.main.javac" value="${javac9}"/>
663 >      <param name="build.main.javadoc" value="${javadoc12}"/>
664 >      <param name="build.main.javadoc.source" value="9"/>
665 >      <target name="test"/>
666 >      <target name="docs"/>
667 >    </antcall>
668 >  </target>
669  
670 < <!--   </target> -->
670 >  <target name="test9-12">
671 >    <antcall target="clean"/>
672 >    <antcall>
673 >      <param name="java.runtime.target" value="12"/>
674 >      <param name="build.main.javac" value="${javac9}"/>
675 >      <param name="build.main.javadoc" value="${javadoc12}"/>
676 >      <param name="build.main.javadoc.source" value="9"/>
677 >      <target name="test"/>
678 >      <target name="docs"/>
679 >    </antcall>
680 >  </target>
681  
682 +  <target name="test9-13">
683 +    <antcall target="clean"/>
684 +    <antcall>
685 +      <param name="java.runtime.target" value="13"/>
686 +      <param name="build.main.javac" value="${javac9}"/>
687 +      <param name="build.main.javadoc" value="${javadoc13}"/>
688 +      <param name="build.main.javadoc.source" value="9"/>
689 +      <target name="test"/>
690 +      <target name="docs"/>
691 +    </antcall>
692 +  </target>
693  
694  
695    <target name="configure-compiler">
696      <fail message="ant version too old">
697 <      <condition>
602 <        <not> <antversion atleast="1.9.1"/> </not>
603 <      </condition>
697 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
698      </fail>
699  
700      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 618 | Line 712
712    </target>
713  
714  
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
715    <target name="compile-test-loops" depends="jar"
716 <          description="compile all the perf tests in src/test/loops">
716 >          description="Compiles all the perf tests in src/test/loops">
717  
718      <mkdir dir="${build.dir}/test/loops"/>
719  
# Line 663 | Line 725
725             includeAntRuntime="false"
726             includeJavaRuntime="false"
727             encoding="ASCII"
728 <           executable="${javac9}"
728 >           executable="${build.main.javac}"
729             fork="true">
730  
731        <include name="*.java"/>
# Line 671 | Line 733
733        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
734        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
735        <compilerarg line="${build.args}"/>
674
736      </javac>
676
737    </target>
738  
739  
# Line 699 | Line 759
759             encoding="ASCII"
760             executable="${javac8}"
761             fork="true">
702
762        <include name="**/*.java"/>
763        <compilerarg value="-Xprefer:source"/>
764        <compilerarg value="-XDignore.symbol.file=true"/>
765        <compilerarg value="-Xlint:all"/>
766        <compilerarg value="-Werror"/>
767        <compilerarg line="${build.args}"/>
709
768      </javac>
769    </target>
770  
# Line 730 | Line 788
788             encoding="ASCII"
789             executable="${javac8}"
790             fork="true">
733
791        <include name="**/*.java"/>
792        <compilerarg value="-Xprefer:source"/>
793        <compilerarg value="-XDignore.symbol.file=true"/>
794        <compilerarg value="-Xlint:all"/>
795 <      <compilerarg value="-Xdoclint:all/protected"/>
795 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
796        <compilerarg line="${build.args}"/>
740
797      </javac>
798    </target>
799  
# Line 753 | Line 809
809          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
810        </manifest>
811      </jar>
756
812    </target>
813  
814  
# Line 769 | Line 824
824          <!-- JDK9+ test classes -->
825          <exclude name="*9Test.java"/>
826          <exclude name="*10Test.java"/>
827 +        <compilerarg value="-Werror"/>
828        </javac-elements>
829      </run-tck-tests>
830    </target>
# Line 786 | Line 842
842  
843    <target name="4jdk8-test"
844            depends="4jdk8-tck, 4jdk8-jtreg"
845 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
790 <  </target>
845 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
846  
847  
848    <target name="4jdk8docs"
# Line 803 | Line 858
858               access="${build.javadoc.access}"
859               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
860               classpath=""
861 +             source="8"
862               executable="${javadoc8}"
863               failonerror = "true">
864        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 810 | Line 866
866        </fileset>
867        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
868        <arg value="-XDignore.symbol.file=true"/>
869 <      <arg value="-tag"/>
870 <      <arg value="${javadoc.jls.option}"/>
871 < <!-- @apiNote currently unused -->
872 < <!--       <arg value="-tag"/> -->
873 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
818 <      <arg value="-tag"/>
819 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
820 <      <arg value="-tag"/>
821 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
869 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
870 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
871 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
872 > <!-- @apiNote tag currently unused -->
873 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
874      </javadoc>
875    </target>
876  
# Line 830 | Line 882
882  
883    <target name="4jdk8clean"
884            description="Removes all 4jdk8 build products">
833
885      <delete dir="${build.4jdk8.dir}"/>
835
886    </target>
887  
888  
# Line 848 | Line 898
898    </target>
899  
900  
901 +  <!-- jsr166 4jdk7 (no longer maintained) -->
902  
903 <  <!-- jsr166 4jdk7 -->
853 <
854 <  <target name="4jdk7compile"
855 <          depends="configure-compiler"
856 <          description="Compiles src/jdk7 sources, targeting jdk7">
857 <
903 >  <target name="4jdk7compile" depends="configure-compiler">
904      <mkdir dir="${build.4jdk7.classes.dir}"/>
905  
906      <javac srcdir="${4jdk7src.dir}"
# Line 878 | Line 924
924        <compilerarg value="-Xlint:all"/>
925        <compilerarg value="-Werror"/>
926        <compilerarg line="${build.args}"/>
881
927      </javac>
928    </target>
929  
930 <  <target name="4jdk7doclint"
886 <          depends="configure-compiler"
887 <          description="Finds doclint warnings">
888 <
930 >  <target name="4jdk7doclint" depends="configure-compiler">
931      <mkdir dir="${build.4jdk7.classes.dir}"/>
932  
933      <javac srcdir="${4jdk7src.dir}"
# Line 909 | Line 951
951        <compilerarg value="-Xlint:all"/>
952        <compilerarg value="-Xdoclint:all/protected"/>
953        <compilerarg line="${build.args}"/>
912
954      </javac>
955    </target>
956  
957 <
917 <  <target name="4jdk7jar"
918 <          depends="4jdk7compile"
919 <          description="Builds library jar from compiled sources">
920 <
957 >  <target name="4jdk7jar" depends="4jdk7compile">
958      <jar destfile="${4jdk7product.jar}">
959        <fileset dir="${build.4jdk7.classes.dir}"/>
960        <manifest>
# Line 925 | Line 962
962          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
963        </manifest>
964      </jar>
928
965    </target>
966  
967 <
932 <  <target name="4jdk7-tck"
933 <          depends="4jdk7jar"
934 <          description="Runs tck tests for jsr166-4jdk7 directly">
935 <
967 >  <target name="4jdk7-tck" depends="4jdk7jar">
968      <run-tck-tests
969        target="7"
970        workdir="${build.4jdk7.dir}"
# Line 950 | Line 982
982          <exclude name="SplittableRandomTest.java"/>
983          <exclude name="StampedLockTest.java"/>
984          <exclude name="SubmissionPublisherTest.java"/>
985 +        <compilerarg value="-Werror"/>
986        </javac-elements>
987      </run-tck-tests>
988    </target>
989  
957
990    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
991 <  <target name="4jdk7-tck-junit"
960 <          depends="4jdk7compile">
991 >  <target name="4jdk7-tck-junit" depends="4jdk7compile">
992  
993      <junit printsummary="true"
994             showoutput="true"
# Line 979 | Line 1010
1010  
1011        <test name="${jsr166.tckTestClass}" haltonfailure="no">
1012        </test>
982
1013      </junit>
1014    </target>
1015  
1016 <  <target name="4jdk7-jtreg"
987 <          depends="4jdk7jar"
988 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
1016 >  <target name="4jdk7-jtreg" depends="4jdk7jar">
1017      <run-jtreg-tests
1018         target="7"
1019         workdir="${build.4jdk7.dir}"
1020         classes="${4jdk7product.jar}"/>
1021    </target>
1022  
1023 +  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1024  
1025 <  <target name="4jdk7-test"
997 <          depends="4jdk7-tck, 4jdk7-jtreg"
998 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
999 <  </target>
1000 <
1001 <
1002 <  <target name="4jdk7docs"
1003 <          description="Builds javadocs for src/jdk7 to dist dir">
1004 <
1025 >  <target name="4jdk7docs">
1026      <delete dir="${4jdk7docs.dir}"/>
1027      <mkdir dir="${4jdk7docs.dir}"/>
1028  
# Line 1022 | Line 1043
1043      </javadoc>
1044    </target>
1045  
1046 +  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1047  
1048 <  <target name="4jdk7dist"
1027 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1028 <          description="Puts all distributable products in single hierarchy"/>
1029 <
1030 <
1031 <  <target name="4jdk7clean"
1032 <          description="Removes all 4jdk7 build products">
1033 <
1048 >  <target name="4jdk7clean">
1049      <delete dir="${build.4jdk7.dir}"/>
1035
1050    </target>
1051  
1052 <
1039 <  <target name="4jdk7dist-jar"
1040 <          depends="4jdk7clean, 4jdk7jar">
1052 >  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1053      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1054    </target>
1055  
1056 <
1045 <  <target name="4jdk7dist-docs"
1046 <          depends="4jdk7clean, 4jdk7docs">
1056 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1057      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1058    </target>
1059  
1060  
1061 <  <!-- jsr166x -->
1052 <
1053 <  <target name="jsr166xcompile"
1054 <          depends="configure-compiler"
1055 <          description="Compiles jsr166x sources to build dir">
1061 >  <!-- jsr166x (no longer maintained) -->
1062  
1063 +  <target name="jsr166xcompile" depends="configure-compiler">
1064      <mkdir dir="${build.jsr166x.classes.dir}"/>
1065  
1066      <javac srcdir="${topsrc.dir}"
# Line 1070 | Line 1077
1077             encoding="ASCII"
1078             executable="${javac7}"
1079             fork="true">
1073
1080        <include name="jsr166x/**/*.java"/>
1081        <compilerarg value="-XDignore.symbol.file=true"/>
1082        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1083        <compilerarg value="-Werror"/>
1084        <compilerarg line="${build.args}"/>
1079
1085      </javac>
1086    </target>
1087  
1088 <
1084 <  <target name="jsr166xjar"
1085 <          depends="jsr166xcompile"
1086 <          description="Builds library jar from compiled sources">
1087 <
1088 >  <target name="jsr166xjar" depends="jsr166xcompile">
1089      <jar destfile="${jsr166x.jar}">
1090        <fileset dir="${build.jsr166x.classes.dir}"/>
1091        <manifest>
# Line 1092 | Line 1093
1093          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1094        </manifest>
1095      </jar>
1095
1096    </target>
1097  
1098 <
1099 <  <target name="jsr166xdocs"
1100 <          description="Builds javadocs to dist dir">
1101 <
1098 >  <target name="jsr166xdocs">
1099      <delete dir="${jsr166xdocs.dir}"/>
1100      <mkdir dir="${jsr166xdocs.dir}"/>
1101  
# Line 1113 | Line 1110
1110               failonerror = "true">
1111        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1112        <arg value="-XDignore.symbol.file=true"/>
1116
1113      </javadoc>
1114    </target>
1115  
1116 +  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1117  
1118 <  <target name="jsr166xdist"
1122 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1123 <          description="Puts all distributable products in single hierarchy"/>
1124 <
1125 <
1126 <  <target name="jsr166xclean"
1127 <          description="Removes all jsr166x build products">
1128 <
1118 >  <target name="jsr166xclean">
1119      <delete dir="${build.jsr166x.dir}"/>
1130
1120    </target>
1121  
1122 <
1134 <  <target name="jsr166xdist-jar"
1135 <          depends="jsr166xclean, jsr166xjar">
1122 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1123      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1124    </target>
1125  
1126 <  <target name="jsr166xdist-docs"
1140 <          depends="jsr166xclean, jsr166xdocs">
1126 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1127      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1128    </target>
1129  
1144  <!-- jsr166y -->
1130  
1131 +  <!-- jsr166y (no longer maintained) -->
1132  
1133 <  <target name="jsr166ycompile"
1148 <          depends="configure-compiler"
1149 <          description="Compiles jsr166y sources">
1150 <
1133 >  <target name="jsr166ycompile" depends="configure-compiler">
1134      <mkdir dir="${build.jsr166y.classes.dir}"/>
1135  
1136      <javac srcdir="${topsrc.dir}"
# Line 1170 | Line 1153
1153        <compilerarg value="-Xlint:all"/>
1154        <compilerarg value="-Werror"/>
1155        <compilerarg line="${build.args}"/>
1173
1156      </javac>
1157    </target>
1158  
1159 <
1178 <  <target name="jsr166yjar"
1179 <          depends="jsr166ycompile"
1180 <          description="Builds library jar from compiled sources">
1181 <
1159 >  <target name="jsr166yjar" depends="jsr166ycompile">
1160      <jar destfile="${jsr166y.jar}" index="true">
1161        <fileset dir="${build.jsr166y.classes.dir}"/>
1162        <manifest>
# Line 1186 | Line 1164
1164          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1165        </manifest>
1166      </jar>
1189
1167    </target>
1168  
1169 <
1193 <  <target name="jsr166ydocs"
1194 <          description="Builds javadocs to dist dir">
1195 <
1169 >  <target name="jsr166ydocs">
1170      <delete dir="${jsr166ydocs.dir}"/>
1171      <mkdir dir="${jsr166ydocs.dir}"/>
1172  
# Line 1207 | Line 1181
1181               failonerror = "true">
1182        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1183        <arg value="-XDignore.symbol.file=true"/>
1210
1184      </javadoc>
1185    </target>
1186  
1187 +  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1188  
1189 <  <target name="jsr166ydist"
1216 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1217 <          description="Puts all distributable products in single hierarchy"/>
1218 <
1219 <
1220 <  <target name="jsr166yclean"
1221 <          description="Removes all jsr166y build products">
1222 <
1189 >  <target name="jsr166yclean">
1190      <delete dir="${build.jsr166y.dir}"/>
1224
1191    </target>
1192  
1193 <
1228 <  <target name="jsr166ydist-jar"
1229 <          depends="jsr166yclean, jsr166yjar">
1193 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1194      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1195    </target>
1196  
1197 <  <target name="jsr166ydist-docs"
1234 <          depends="jsr166yclean, jsr166ydocs">
1197 >  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1198      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1199    </target>
1200  
1201  
1202 <  <!-- extra166y -->
1240 <
1241 <
1242 <  <target name="extra166ycompile"
1243 <          depends="configure-compiler, jsr166yjar"
1244 <          description="Compiles extra166y sources">
1202 >  <!-- extra166y (no longer maintained) -->
1203  
1204 +  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1205      <mkdir dir="${build.extra166y.classes.dir}"/>
1206  
1207      <javac srcdir="${topsrc.dir}"
# Line 1265 | Line 1224
1224        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1225        <compilerarg value="-Werror"/>
1226        <compilerarg line="${build.args}"/>
1268
1227      </javac>
1228    </target>
1229  
1230 <
1273 <  <target name="extra166yjar"
1274 <          depends="extra166ycompile"
1275 <          description="Builds library jar from compiled sources">
1276 <
1230 >  <target name="extra166yjar" depends="extra166ycompile">
1231      <jar destfile="${extra166y.jar}" index="true">
1232        <fileset dir="${build.extra166y.classes.dir}"/>
1233        <manifest>
# Line 1281 | Line 1235
1235          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1236        </manifest>
1237      </jar>
1284
1238    </target>
1239  
1240 <
1288 <  <target name="extra166ydocs"
1289 <          description="Builds javadocs to build dir">
1290 <
1240 >  <target name="extra166ydocs">
1241      <delete dir="${extra166ydocs.dir}"/>
1242      <mkdir dir="${extra166ydocs.dir}"/>
1243  
# Line 1301 | Line 1251
1251               executable="${javadoc7}">
1252        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1253        <arg value="-XDignore.symbol.file=true"/>
1304
1254      </javadoc>
1255    </target>
1256  
1257 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1258  
1259 <  <target name="extra166ydist"
1310 <          depends="extra166ydist-jar, extra166ydist-docs"
1311 <          description="Puts all distributable products in single hierarchy"/>
1312 <
1313 <
1314 <  <target name="extra166yclean"
1315 <          description="Removes all extra166y build products">
1316 <
1259 >  <target name="extra166yclean">
1260      <delete dir="${build.extra166y.dir}"/>
1318
1261    </target>
1262  
1263 <
1322 <  <target name="extra166ydist-jar"
1323 <          depends="extra166yclean, extra166yjar">
1263 >  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1264      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1265    </target>
1266  
1267 <  <target name="extra166ydist-docs"
1328 <          depends="extra166yclean, extra166ydocs">
1267 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1268      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1269    </target>
1270  
1271 <  <!-- jsr166e -->
1271 >
1272 >  <!-- jsr166e (no longer maintained) -->
1273  
1274    <property name="build.jsr166e.java.version" value="6"/>
1275    <property name="build.jsr166e.javac" value="${javac6}"/>
1276  
1277 <  <target name="jsr166ecompile"
1338 <          depends="configure-compiler"
1339 <          description="Compiles jsr166e sources">
1340 <
1277 >  <target name="jsr166ecompile" depends="configure-compiler">
1278      <mkdir dir="${build.jsr166e.classes.dir}"/>
1279  
1280      <javac srcdir="${topsrc.dir}"
# Line 1358 | Line 1295
1295        <compilerarg value="-Xlint:all"/>
1296        <compilerarg value="-Werror"/>
1297        <compilerarg line="${build.args}"/>
1361
1298      </javac>
1299    </target>
1300  
1365  <!-- jsr166e: find doclint errors -->
1301    <target name="jsr166edoclint">
1367
1302      <mkdir dir="${build.jsr166e.classes.dir}"/>
1303  
1304      <javac srcdir="${topsrc.dir}"
# Line 1386 | Line 1320
1320        <compilerarg value="-Xlint:all"/>
1321        <compilerarg value="-Werror"/>
1322        <compilerarg value="-Xdoclint:all/protected"/>
1389
1323      </javac>
1324    </target>
1325  
1326 <
1394 <  <target name="jsr166ejar"
1395 <          depends="jsr166ecompile"
1396 <          description="Builds library jar from compiled sources">
1397 <
1326 >  <target name="jsr166ejar" depends="jsr166ecompile">
1327      <jar destfile="${jsr166e.jar}" index="true">
1328        <fileset dir="${build.jsr166e.classes.dir}"/>
1329        <manifest>
# Line 1402 | Line 1331
1331          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1332        </manifest>
1333      </jar>
1405
1334    </target>
1335  
1336 <
1409 <  <target name="jsr166edocs"
1410 <          description="Builds javadocs to build dir">
1411 <
1336 >  <target name="jsr166edocs">
1337      <delete dir="${jsr166edocs.dir}"/>
1338      <mkdir dir="${jsr166edocs.dir}"/>
1339  
# Line 1422 | Line 1347
1347               failonerror = "true">
1348        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1349        <arg value="-XDignore.symbol.file=true"/>
1425
1350      </javadoc>
1351    </target>
1352  
1353 <
1430 <  <target name="jsr166e-tck-one-java-version"
1431 <          depends="jsr166ejar">
1432 <
1353 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1354      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1434
1355      <run-tck-tests
1356        tck.src.dir="${test.src.dir}/tck-jsr166e"
1357        target="${build.jsr166e.java.version}"
# Line 1439 | Line 1359
1359        classes="${jsr166e.jar}"/>
1360    </target>
1361  
1362 <  <target name="jsr166e-tck"
1443 <          description="Runs tck tests for jsr166e for multiple java versions">
1362 >  <target name="jsr166e-tck">
1363  
1364   <!--     <antcall target="clean"/> -->
1365   <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1461 | Line 1380
1380      </antcall>
1381    </target>
1382  
1383 +  <target name="jsr166e-test" depends="jsr166e-tck"/>
1384  
1385 <  <target name="jsr166e-test"
1466 <          depends="jsr166e-tck"
1467 <          description="Runs all tests for jsr166e">
1468 <  </target>
1385 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1386  
1387 <  <target name="jsr166edist"
1471 <          depends="jsr166edist-jar, jsr166edist-docs"
1472 <          description="Puts all distributable products in single hierarchy"/>
1473 <
1474 <
1475 <  <target name="jsr166eclean"
1476 <          description="Removes all jsr166e build products">
1387 >  <target name="jsr166eclean">
1388      <delete dir="${build.jsr166e.dir}"/>
1389    </target>
1390  
1480
1391    <target name="jsr166edist-jar"
1392            depends="jsr166eclean, jsr166ejar">
1393      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1394    </target>
1395  
1396 <  <target name="jsr166edist-docs"
1487 <          depends="jsr166eclean, jsr166edocs">
1396 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1397      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1398    </target>
1399  
1400  
1401   <!-- Find buglets that can be detected by static build tools -->
1402  
1403 <  <target name="lint">
1404 <    <antcall target="dists">
1405 <      <param name="build.javadoc.access" value="public"/>
1406 <    </antcall>
1407 <  </target>
1403 > <!--   <target name="lint"> -->
1404 > <!--     <antcall target="dists"> -->
1405 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1406 > <!--     </antcall> -->
1407 > <!--   </target> -->
1408  
1409   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1410 <  <target name="lint-private">
1410 >  <target name="doclint-private">
1411      <antcall target="dist">
1412        <param name="build.javadoc.access" value="private"/>
1413      </antcall>
1414    </target>
1415  
1416  
1417 + <!-- ==============================================================
1418 +  Experimental errorprone support
1419 +  https://errorprone.info
1420 +  https://errorprone.info/docs/installation
1421 +  https://github.com/google/error-prone/issues/1143
1422 + =================================================================== -->
1423 +  <path id="errorprone.processorpath.path">
1424 +    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1425 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1426 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1427 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1428 +  </path>
1429 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1430 +  <property name="errorprone.jsr166.user.flags" value=""/>
1431 +  <property name="errorprone.jsr166.flags"
1432 +            value="-Xep:HashtableContains:OFF
1433 +                   -Xep:JdkObsolete:OFF
1434 +                   -Xep:MissingOverride:OFF
1435 +                   -Xep:MissingFail:OFF
1436 +                   -Xep:ThreadPriorityCheck:OFF
1437 +                   -Xep:MixedArrayDimensions:ERROR
1438 +                   -Xep:RemoveUnusedImports:ERROR
1439 +                   -Xep:EmptyIf:ERROR
1440 +                   -Xep:MultipleTopLevelClasses:ERROR
1441 +                   -Xep:ClassName:ERROR
1442 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1443 +                   -Xep:RedundantThrows:ERROR
1444 +                   -Xep:IdentityBinaryExpression:WARN
1445 +                   -Xep:ConstructorInvokesOverridable:WARN
1446 +                   -Xep:MethodCanBeStatic:WARN
1447 +                   ${errorprone.jsr166.user.flags}"/>
1448 +  <!-- -Xep:WildcardImport:ERROR -->
1449 +  <property name="errorprone.jsr166.test.flags"
1450 +            value="-Xep:StringSplitter:OFF
1451 +                   -Xep:BoxedPrimitiveConstructor:OFF
1452 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1453 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1454 +  <target name="errorprone"
1455 +          depends="clean, configure-compiler"
1456 +          description="Run errorprone over jsr166 source code (experimental)">
1457 +
1458 +    <local name="destdir"/>
1459 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
1460 +    <mkdir dir="${destdir}"/>
1461 +
1462 +    <javac srcdir="${src.dir}"
1463 +           destdir="${destdir}"
1464 +           debug="${build.debug}"
1465 +           debuglevel="${build.debuglevel}"
1466 +           deprecation="${build.deprecation}"
1467 +           classpath=""
1468 +           includeAntRuntime="false"
1469 +           includeJavaRuntime="false"
1470 +           encoding="ASCII"
1471 +           executable="${build.main.javac}"
1472 +           fork="true">
1473 +
1474 +      <include name="**/*.java"/>
1475 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1476 +      <compilerarg value="-J--illegal-access=permit"/>
1477 +      <compilerarg value="-XDcompilePolicy=simple"/>
1478 +      <compilerarg value="-processorpath"/>
1479 +      <compilerarg pathref="errorprone.processorpath.path"/>
1480 +      <compilerarg value="-Xplugin:ErrorProne
1481 +                          ${errorprone.jsr166.flags}"/>
1482 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1483 +      <compilerarg value="-Xprefer:source"/>
1484 +      <compilerarg value="-XDignore.symbol.file=true"/>
1485 +      <compilerarg value="-Xlint:all"/>
1486 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1487 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1488 +      <compilerarg line="${build.args}"/>
1489 +    </javac>
1490 +
1491 +    <jar destfile="${product.jar}">
1492 +      <fileset dir="${destdir}"/>
1493 +    </jar>
1494 +
1495 +    <run-tck-tests
1496 +      target="${java.runtime.target}"
1497 +      workdir="${build.dir}"
1498 +      classes="${product.jar}">
1499 +      <javac-elements>
1500 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1501 +        <compilerarg value="-J--illegal-access=permit"/>
1502 +        <compilerarg value="-XDcompilePolicy=simple"/>
1503 +        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1504 +        <compilerarg value="-Xplugin:ErrorProne
1505 +                            ${errorprone.jsr166.flags}
1506 +                            ${errorprone.jsr166.test.flags}"/>
1507 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1508 +      </javac-elements>
1509 +    </run-tck-tests>
1510 +  </target>
1511 +
1512 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1513 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1514 +  <target name="errorprone-jtreg"
1515 +          depends="jar"
1516 +          description="Run errorprone over jtreg tests (experimental)">
1517 +
1518 +    <run-jtreg-tests
1519 +       target="${java.runtime.target}"
1520 +       workdir="${build.dir}"
1521 +       classes="${product.jar}"
1522 +       verbose="all">
1523 +      <jtreg-elements>
1524 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1525 +        <arg value="-javacoption:-processorpath"/>
1526 +        <arg value="-javacoption:${errorprone.processorpath}"/>
1527 +        <arg value="-javacoption:-Xplugin:ErrorProne
1528 +                            ${errorprone.jsr166.flags}
1529 +                            ${errorprone.jsr166.test.flags}
1530 +                            -Xep:MultipleTopLevelClasses:WARN
1531 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1532 +      </jtreg-elements>
1533 +    </run-jtreg-tests>
1534 +  </target>
1535 +
1536 +
1537 + <!-- ==============================================================
1538 +  Running guava tests against jsr166 code
1539 + =================================================================== -->
1540 +
1541 + <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1542 + <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1543 + <!-- <property name="guava.version" value="21.0"/> -->
1544 +
1545 + <!-- HOWTO debug print a path id -->
1546 + <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1547 + <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1548 +
1549 + <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1550 + <!--   organisation="com.google.guava" module="guava-tests"/> -->
1551 + <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1552 + <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1553 + <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1554 + <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1555 +
1556 + <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1557 + <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1558 + <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1559 + <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1560 +
1561 + <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1562 + <!--   type="*" inline="true" conf="*(private),*(public)" -->
1563 + <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1564 + <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1565 +
1566 + <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1567 + <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1568 + <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1569 +
1570 +  <target name="init-ivy">
1571 +    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1572 +         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1573 +    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1574 +             classpath="${build.dir}/ivy.jar"/>
1575 +  </target>
1576 +
1577 +  <target name="guava-tests" depends="jar, init-ivy"
1578 +          description="Guava tests run against jsr166 collections">
1579 +    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1580 +    <mkdir dir="${guava.dir}"/>
1581 +    <ivy:retrieve pathid="guava.testlib.classpath"
1582 +      type="jar,bundle" inline="true" conf="default,master"
1583 +      pattern="${guava.dir}/[artifact].[ext]"
1584 +      organisation="com.google.guava" module="guava-testlib"/>
1585 +    <property name="guava.version" value="21.0"/>
1586 +    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1587 +         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1588 +    <junit printsummary="true" showoutput="true" haltonfailure="true"
1589 +           jvm="${build.main.java}" fork="true">
1590 +      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1591 +      <formatter type="brief"/>
1592 +      <classpath>
1593 +        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1594 +        <path refid="guava.testlib.classpath"/>
1595 +      </classpath>
1596 +
1597 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1598 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1599 +    </junit>
1600 +  </target>
1601 +
1602   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines