/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.211 by jsr166, Sat May 21 00:12:12 2016 UTC revision 1.299 by jsr166, Fri Jun 14 20:10:53 2019 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage"  <project name="jsr166" default="usage"
2    xmlns:if="ant:if" xmlns:unless="ant:unless">    xmlns:if="ant:if"
3      xmlns:unless="ant:unless"
4      xmlns:ivy="antlib:org.apache.ivy.ant">
5    
6    <description>    <description>
7  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 17  Line 19 
19    itself.  Because the JDK version matters and because different    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a    targets require different JDKs, we assume that users have created a
21    hierarchy containing:    hierarchy containing:
   $HOME/jdk/jdk6  
   $HOME/jdk/jdk7  
22    $HOME/jdk/jdk8    $HOME/jdk/jdk8
23    $HOME/jdk/jdk9    $HOME/jdk/jdk9
24      $HOME/jdk/jdk10
25      $HOME/jdk/jdk11
26      $HOME/jdk/jdk12
27      $HOME/jdk/jdk13
28      $HOME/jdk/jdk14
29    where each of the above is a JDK or a symlink to same, and    where each of the above is a JDK or a symlink to same, and
   $HOME/jdk/src/jdk6  
   $HOME/jdk/src/jdk7  
30    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
31    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk9
32      $HOME/jdk/src/jdk10
33      $HOME/jdk/src/jdk11
34      $HOME/jdk/src/jdk12
35      $HOME/jdk/src/jdk13
36      $HOME/jdk/src/jdk14
37    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
38    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
39    
40    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
41    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
42    for $N in 6 7 8 9 ...    for $N in 8 .. 14 ...
43    
44    As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"    As of 2016-03, the sources in src/main are for jdk9+ only.
   target is currently broken.  
45  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
46    </description>    </description>
47    
# Line 52  Line 59 
59    
60    
61    <!-- Compilation options -->    <!-- Compilation options -->
   <property name="build.sourcelevel"    value="6"/>  
62    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
63    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
64    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 63  Line 69 
69    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
70    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
71    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.reports.dir"           location="${build.dir}/reports"/>  
72    
73    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
74    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
# Line 104  Line 109 
109      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
110        unless:set="have.java.base"/>        unless:set="have.java.base"/>
111      <local name="modules"/>      <local name="modules"/>
112      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>      <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
113      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
114      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
115      <path id="bootclasspath@{v}" unless:set="modules">      <path id="bootclasspath@{v}" unless:set="modules">
# Line 134  Line 139 
139    <defjdklocations v="7"/>    <defjdklocations v="7"/>
140    <defjdklocations v="8"/>    <defjdklocations v="8"/>
141    <defjdklocations v="9"/>    <defjdklocations v="9"/>
142      <defjdklocations v="10"/>
143      <defjdklocations v="11"/>
144      <defjdklocations v="12"/>
145      <defjdklocations v="13"/>
146      <defjdklocations v="14"/>
147    
148    <!-- Source locations -->    <!-- Source locations -->
149    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 143  Line 153 
153    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
154    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
155    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
156      <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
157      <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
158      <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
159      <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
160      <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
161    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
162    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
163    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 182  Line 197 
197    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
198    
199    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
200    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
201    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>    <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
202    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>    <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
203    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>    <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
204    <!-- The expected canonical location does not yet exist as of 2016-04 -->    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
205    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
206    <property name="java9.docroot.url"      value="http://http://download.java.net/java/jdk9/docs"/>    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
207    <!-- Default jdk doc location (latest stable release seems best) -->    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
208    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
209      <!-- The location of jdk early access docs (RIP) -->
210      <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
211      <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
212      <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
213    <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
214      <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
215      <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
216      <!-- Default jdk doc location (latest stable LTS release seems best) -->
217      <property name="java.docroot.url"   value="${java11.docroot.url}"/>
218    
219    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
220    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 198  Line 222 
222    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
223    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
224    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
225      <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
226      <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
227      <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
228      <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
229      <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
230    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
231    
232    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 230  Line 259 
259    
260      <local name="modules"/>      <local name="modules"/>
261      <condition property="modules">      <condition property="modules">
262        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>        <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
263        </condition>
264    
265        <local name="use-doclint"/>
266        <condition property="use-doclint">
267          <not> <equals arg1="@{target}" arg2="7"/> </not>
268      </condition>      </condition>
269    
270      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
# Line 245  Line 279 
279             classpath="${junit.jar}"             classpath="${junit.jar}"
280             includeAntRuntime="false"             includeAntRuntime="false"
281             includeJavaRuntime="false"             includeJavaRuntime="false"
282               encoding="ASCII"
283             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
284             fork="true">             fork="true">
285    
286        <include name="*.java"/>        <include name="*.java"/>
287        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
288        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
289          <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
290        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
291        <compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>        <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
292        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
293        <javac-elements/>        <javac-elements/>
294    
# Line 263  Line 299 
299            jvm="${java@{target}}"            jvm="${java@{target}}"
300            fork="true">            fork="true">
301          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
302          <jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>          <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
303            <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
304            <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
305            <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
306            <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
307            <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
308          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
309            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
310            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
311    
312          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
313          <syspropertyset id="system-properties-used-by-tck">          <syspropertyset id="system-properties-used-by-tck">
314            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
315            <propertyref prefix="jsr166."/>            <propertyref prefix="jsr166."/>
# Line 283  Line 326 
326    </macrodef>    </macrodef>
327    
328    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
329    <fileset dir="${jtreg9.src.dir}">    <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
330      <patternset id="jdk9.jtreg.tests">    <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
331        <include name="**/*.java"/>    <property name="jtreg.test.pattern" value="**/*.java"/>
332      </patternset>    <macrodef name="defjtregtests">
333    </fileset>      <attribute name="v"/>
334        <sequential>
335    <fileset dir="${jtreg8.src.dir}">        <fileset dir="${jtreg@{v}.src.dir}">
336      <patternset id="jdk8.jtreg.tests">          <patternset id="jdk@{v}.jtreg.tests">
337        <include name="**/*.java"/>            <include name="${jtreg.test.pattern}"/>
338        <exclude name="**/SpliteratorCharacteristics.java"/>          </patternset>
339        <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->        </fileset>
340        <exclude name="**/GCDuringIteration.java"/>      </sequential>
341      </patternset>    </macrodef>
   </fileset>  
342    
343    <fileset dir="${jtreg7.src.dir}">    <defjtregtests v="14"/>
344      <patternset id="jdk7.jtreg.tests">    <defjtregtests v="13"/>
345        <include name="**/*.java"/>    <defjtregtests v="12"/>
346      </patternset>    <defjtregtests v="11"/>
347    </fileset>    <defjtregtests v="10"/>
348      <defjtregtests v="9"/>
349      <defjtregtests v="8"/>
350      <defjtregtests v="7"/>
351    
352    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
353    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
354    
355    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
356      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="source" default="7"/>  
357      <attribute name="target"/>      <attribute name="target"/>
358      <attribute name="workdir"/>      <attribute name="workdir"/>
359      <attribute name="classes"/>      <attribute name="classes"/>
360        <attribute name="verbose" default="${jtreg.verbose}"/>
361      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
362        <element name="jtreg-elements" optional="true"/>
363    
364      <sequential>      <sequential>
365    
# Line 322  Line 368 
368    
369      <local name="modules"/>      <local name="modules"/>
370      <condition property="modules">      <condition property="modules">
371        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/lib/modules" type="file"/>
372      </condition>      </condition>
373    
374      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
     <delete dir="@{workdir}/JTreport" quiet="true"/>  
375      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
376             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
377             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork">
            reportDir="@{workdir}/JTreport">  
378        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
379        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
380        <arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>        <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
381          <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
382        <arg value="-agentvm"/>        <arg value="-agentvm"/>
383        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-noreport"/>
384          <arg value="-verbose:@{verbose}"/>
385        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
386        <arg value="-automatic"/>        <arg value="-automatic"/>
387        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
388        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
389        <arg line="${jtreg.flags}"/>        <arg line="${jtreg.flags}"/>
390          <jtreg-elements/>
391      </jtreg>      </jtreg>
392      </sequential>      </sequential>
393    </macrodef>    </macrodef>
# Line 356  Line 403 
403    
404    <!-- Main targets -->    <!-- Main targets -->
405    
406    <property name="build.main.java.version" value="9"/>    <!-- Default values: may seem strange ... -->
407      <!-- At runtime, target latest LTS, i.e. jdk11 -->
408      <!-- But at build time, target jdk9, for maximal binary portability -->
409      <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
410        o override-methods=summary
411        o {@systemProperty ...}
412        o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
413        o 8202628: javadoc generates bad links in TestModules.java
414        -->
415      <property name="java.runtime.target" value="11"/>
416      <property name="build.main.java" value="${java11}"/>
417    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
418      <property name="build.main.javadoc" value="${javadoc12}"/>
419      <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
420    
421    <target name="dists"    <target name="dists"
422            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist"
423            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
424              <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
425    
426    <target name="compile"    <target name="compile"
427            depends="configure-compiler"            depends="configure-compiler"
428            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
429    
     <local name="modules"/>  
     <condition property="modules">  
       <and>  
         <available file="${jdk9.home}/jmods" type="dir"/>  
         <equals arg1="9" arg2="${build.main.java.version}"/>  
       </and>  
     </condition>  
   
430      <local name="destdir"/>      <local name="destdir"/>
431      <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>      <property name="destdir" value="${build.classes.dir}/java.base"/>
     <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>  
432    
433      <mkdir dir="${destdir}"/>      <mkdir dir="${destdir}"/>
434    
# Line 389  Line 440 
440             classpath=""             classpath=""
441             includeAntRuntime="false"             includeAntRuntime="false"
442             includeJavaRuntime="false"             includeJavaRuntime="false"
443               encoding="ASCII"
444             executable="${build.main.javac}"             executable="${build.main.javac}"
445             fork="true">             fork="true">
446    
447        <include name="**/*.java"/>        <include name="**/*.java"/>
448        <compilerarg value="-Xmodule:java.base" if:set="modules"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
449        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
450        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
451        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all,-removal"/>
452          <compilerarg line="--doclint-format html5"/>
453          <compilerarg value="-Xdoclint:all/protected,reference/private"/>
454          <compilerarg value="-Xdoclint/package:java.util.*"/>
455        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
       <compilerarg value="-Xdoclint:all/protected"/>  
456        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
457        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
458    
# Line 409  Line 463 
463    <target name="jar"    <target name="jar"
464            depends="compile"            depends="compile"
465            description="Builds library jar for src/main from compiled sources">            description="Builds library jar for src/main from compiled sources">
466        <local name="subdir"/>
467        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
468      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
469        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
470        <manifest>        <manifest>
471          <attribute name="Built-By" value="${user.name}"/>          <attribute name="Built-By" value="${user.name}"/>
472          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 429  Line 484 
484      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
485      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
486    
487    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
488    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
489    <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
490    <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
491    <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
492      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
493               packagenames="none"               packagenames="none"
494               link="${java9.api.url}"               link="${java.api.url}"
495               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
496               access="${build.javadoc.access}"               access="${build.javadoc.access}"
497               sourcepath="${src.dir}:${jdk9.src.dir}"               sourcepath="${src.dir}"
498               classpath=""               classpath=""
499               executable="${javadoc9}">               source="${build.main.javadoc.source}"
500                 executable="${build.main.javadoc}">
501    <!-- TODO: JDK-8214571 failonerror = "true" -->
502        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
503          <include name="**/*.java"/>          <include name="**/*.java"/>
504        </fileset>        </fileset>
505        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
506        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
507        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
508  <!--  TODO     <arg value="-Xmodule:java.base"/> -->        <arg value="-html5"/>
509        <arg value="-tag"/>        <arg value="--patch-module=java.base=${src.dir}"/>
510        <arg value="${javadoc.jls.option}"/>  <!-- old school frames via docs/index.html?overview-summary.html -->
511        <arg value="-tag"/>  <!-- TODO: - -frames no longer a supported option in jdk13+ -->
512        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>        <arg value="--frames"/>
513        <arg value="-tag"/>        <arg value="--override-methods=summary"/>
514        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
515        <arg value="-tag"/>        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
516        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
517  <!-- tags added in jdk9 -->        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
518        <arg value="-tag"/>  <!-- tags added in jdk9: currently unused -->
519        <arg value="revised:X"/>  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
520        <arg value="-tag"/>  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
       <arg value="spec:X"/>  
521      </javadoc>      </javadoc>
522    </target>    </target>
523    
# Line 466  Line 527 
527            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
528    
529    
   <target name="release"  
           depends="dist"  
           description="Puts entire CVS tree, plus distribution productions, in a jar">  
   
     <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>  
   
     <jar basedir="${basedir}" destfile="${release.jar}">  
       <!-- <exclude name="build/**"/> -->  
       <exclude name="${release.jar}"/>  
       <exclude name="user.properties"/>  
       <exclude name="etc/notes/**"/>  
       <exclude name="src/emulation/**"/>  
       <exclude name="**/SyntaxTest.java"/>  
       <exclude name="**/SuperfluousAbstract.java"/>  
       <manifest>  
         <attribute name="Built-By" value="${user.name}"/>  
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>  
       </manifest>  
     </jar>  
   </target>  
   
   
530    <target name="clean"    <target name="clean"
531            description="Removes all build products">            description="Removes all build products">
   
532      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
   
533    </target>    </target>
534    
535    
536    <target name="dist-clean"    <target name="dist-clean"
537            description="Removes all build and distribution products">            description="Removes all build and distribution products">
   
538      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
539      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
   
540    </target>    </target>
541    
542    
# Line 520  Line 555 
555            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
556    
557      <run-tck-tests      <run-tck-tests
558        target="${build.main.java.version}"        target="${java.runtime.target}"
559        workdir="${build.dir}"        workdir="${build.dir}"
560        classes="${product.jar}"/>        classes="${product.jar}">
561          <javac-elements>
562            <compilerarg value="-Werror"/>
563          </javac-elements>
564        </run-tck-tests>
565    </target>    </target>
566    
567    <target name="tck-parallelism-1"    <target name="tck-parallelism-1"
# Line 539  Line 578 
578      </antcall>      </antcall>
579    </target>    </target>
580    
581      <target name="tck-security-manager"
582              description="Runs tck with a security manager">
583        <antcall target="tck">
584          <param name="jsr166.useSecurityManager" value="true"/>
585        </antcall>
586      </target>
587    
588    <target name="jtreg"    <target name="jtreg"
589            depends="jar"            depends="jar"
590            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
591      <run-jtreg-tests      <run-jtreg-tests
592         target="${build.main.java.version}"         target="${java.runtime.target}"
593         workdir="${build.dir}"         workdir="${build.dir}"
594         classes="${product.jar}"/>         classes="${product.jar}"/>
595    </target>    </target>
596    
597    <target name="test"    <target name="test"
598            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
599            description="Runs tck and jtreg tests for src/main">            description="Runs tck and jtreg tests for src/main"/>
600    
601      <target name="test-version-permutations"
602              depends="test9, test10, test11, test12, test13, test14, test9-11, test9-12, test9-13, test9-14, clean, test, docs">
603    </target>    </target>
604    
605  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->    <target name="test9">
606        <antcall target="clean"/>
607        <antcall>
608          <param name="java.runtime.target" value="9"/>
609          <param name="build.main.javac" value="${javac9}"/>
610          <param name="build.main.javadoc" value="${javadoc12}"/>
611          <param name="build.main.javadoc.source" value="9"/>
612          <target name="test"/>
613          <target name="docs"/>
614        </antcall>
615      </target>
616    
617  <!--     <antcall target="jtreg"> -->    <target name="test10">
618  <!--       <param name="build.main.java.version" value="8"/> -->      <antcall target="clean"/>
619  <!--       <param name="build.main.javac" value="${javac8}"/> -->      <antcall>
620  <!--     </antcall> -->        <param name="java.runtime.target" value="10"/>
621          <param name="build.main.javac" value="${javac10}"/>
622          <param name="build.main.javadoc" value="${javadoc12}"/>
623          <param name="build.main.javadoc.source" value="10"/>
624          <target name="test"/>
625          <target name="docs"/>
626        </antcall>
627      </target>
628    
629  <!--   </target> -->    <target name="test11">
630        <antcall target="clean"/>
631        <antcall>
632          <param name="java.runtime.target" value="11"/>
633          <param name="build.main.javac" value="${javac11}"/>
634          <param name="build.main.javadoc" value="${javadoc12}"/>
635          <param name="build.main.javadoc.source" value="11"/>
636          <target name="test"/>
637          <target name="docs"/>
638        </antcall>
639      </target>
640    
641  <!--   <target name="test89" -->    <target name="test12">
642  <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->      <antcall target="clean"/>
643        <antcall>
644          <param name="java.runtime.target" value="12"/>
645          <param name="build.main.javac" value="${javac12}"/>
646          <param name="build.main.javadoc" value="${javadoc12}"/>
647          <param name="build.main.javadoc.source" value="12"/>
648          <target name="test"/>
649          <target name="docs"/>
650        </antcall>
651      </target>
652    
653  <!--     <antcall target="clean"/> -->    <target name="test13">
654  <!--     <antcall target="test"> -->      <antcall target="clean"/>
655  <!--       <param name="build.main.java.version" value="8"/> -->      <antcall>
656  <!--       <param name="build.main.javac" value="${javac8}"/> -->        <param name="java.runtime.target" value="13"/>
657  <!--     </antcall> -->        <param name="build.main.javac" value="${javac13}"/>
658          <param name="build.main.javadoc" value="${javadoc13}"/>
659          <param name="build.main.javadoc.source" value="13"/>
660          <target name="test"/>
661          <target name="docs"/>
662        </antcall>
663      </target>
664    
665  <!--     <antcall target="clean"/> -->    <target name="test14">
666  <!--     <antcall target="test"> -->      <antcall target="clean"/>
667  <!--       <param name="build.main.java.version" value="9"/> -->      <antcall>
668  <!--       <param name="build.main.javac" value="${javac9}"/> -->        <param name="java.runtime.target" value="14"/>
669  <!--     </antcall> -->        <param name="build.main.javac" value="${javac14}"/>
670          <param name="build.main.javadoc" value="${javadoc14}"/>
671          <param name="build.main.javadoc.source" value="14"/>
672          <target name="test"/>
673          <target name="docs"/>
674        </antcall>
675      </target>
676    
677  <!--   </target> -->    <target name="test9-11">
678        <antcall target="clean"/>
679        <antcall>
680          <param name="java.runtime.target" value="11"/>
681          <param name="build.main.javac" value="${javac9}"/>
682          <param name="build.main.javadoc" value="${javadoc12}"/>
683          <param name="build.main.javadoc.source" value="9"/>
684          <target name="test"/>
685          <target name="docs"/>
686        </antcall>
687      </target>
688    
689      <target name="test9-12">
690        <antcall target="clean"/>
691        <antcall>
692          <param name="java.runtime.target" value="12"/>
693          <param name="build.main.javac" value="${javac9}"/>
694          <param name="build.main.javadoc" value="${javadoc12}"/>
695          <param name="build.main.javadoc.source" value="9"/>
696          <target name="test"/>
697          <target name="docs"/>
698        </antcall>
699      </target>
700    
701      <target name="test9-13">
702        <antcall target="clean"/>
703        <antcall>
704          <param name="java.runtime.target" value="13"/>
705          <param name="build.main.javac" value="${javac9}"/>
706          <param name="build.main.javadoc" value="${javadoc13}"/>
707          <param name="build.main.javadoc.source" value="9"/>
708          <target name="test"/>
709          <target name="docs"/>
710        </antcall>
711      </target>
712    
713      <target name="test9-14">
714        <antcall target="clean"/>
715        <antcall>
716          <param name="java.runtime.target" value="14"/>
717          <param name="build.main.javac" value="${javac9}"/>
718          <param name="build.main.javadoc" value="${javadoc14}"/>
719          <param name="build.main.javadoc.source" value="9"/>
720          <target name="test"/>
721          <target name="docs"/>
722        </antcall>
723      </target>
724    
725    
726    <target name="configure-compiler">    <target name="configure-compiler">
727      <fail message="ant version too old">      <fail message="ant version too old">
728        <condition>        <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
         <not> <antversion atleast="1.9.1"/> </not>  
       </condition>  
729      </fail>      </fail>
730    
731      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 603  Line 743 
743    </target>    </target>
744    
745    
   
   <!-- Various demos and test programs -->  
   
   
   <!-- description="Benchmark from Doug Lea's AQS paper" -->  
   <target name="loops" depends="configure-compiler">  
   
     <mkdir dir="${build.loops.dir}"/>  
   
     <javac srcdir="${loops.src.dir}"  
           destdir="${build.loops.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
            target="${build.sourcelevel}"  
              fork="true">  
   
       <compilerarg line="${build.args}"/>  
       <classpath refid="loops.classpath"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
   
     </javac>  
   
     <java classname="ALoops" fork="true">  
       <classpath refid="loops.classpath"/>  
     </java>  
   
   </target>  
   
   
746    <target name="compile-test-loops" depends="jar"    <target name="compile-test-loops" depends="jar"
747            description="compile all the perf tests in src/test/loops">            description="Compiles all the perf tests in src/test/loops">
748    
749      <mkdir dir="${build.dir}/test/loops"/>      <mkdir dir="${build.dir}/test/loops"/>
750    
# Line 646  Line 755 
755             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
756             includeAntRuntime="false"             includeAntRuntime="false"
757             includeJavaRuntime="false"             includeJavaRuntime="false"
758             executable="${javac9}"             encoding="ASCII"
759               executable="${build.main.javac}"
760             fork="true">             fork="true">
761    
762        <include name="*.java"/>        <include name="*.java"/>
# Line 654  Line 764 
764        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
765        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
766        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
767      </javac>      </javac>
   
768    </target>    </target>
769    
770    
# Line 679  Line 787 
787             bootclasspath="${bootclasspath8}"             bootclasspath="${bootclasspath8}"
788             includeAntRuntime="false"             includeAntRuntime="false"
789             includeJavaRuntime="false"             includeJavaRuntime="false"
790               encoding="ASCII"
791             executable="${javac8}"             executable="${javac8}"
792             fork="true">             fork="true">
   
793        <include name="**/*.java"/>        <include name="**/*.java"/>
794        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
795        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
796        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
797        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
798        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
799      </javac>      </javac>
800    </target>    </target>
801    
# Line 709  Line 816 
816             bootclasspath="${bootclasspath8}"             bootclasspath="${bootclasspath8}"
817             includeAntRuntime="false"             includeAntRuntime="false"
818             includeJavaRuntime="false"             includeJavaRuntime="false"
819               encoding="ASCII"
820             executable="${javac8}"             executable="${javac8}"
821             fork="true">             fork="true">
   
822        <include name="**/*.java"/>        <include name="**/*.java"/>
823        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
824        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
825        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
826        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
827        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
828      </javac>      </javac>
829    </target>    </target>
830    
# Line 734  Line 840 
840          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
841        </manifest>        </manifest>
842      </jar>      </jar>
   
843    </target>    </target>
844    
845    
# Line 750  Line 855 
855          <!-- JDK9+ test classes -->          <!-- JDK9+ test classes -->
856          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
857          <exclude name="*10Test.java"/>          <exclude name="*10Test.java"/>
858            <compilerarg value="-Werror"/>
859        </javac-elements>        </javac-elements>
860      </run-tck-tests>      </run-tck-tests>
861    </target>    </target>
# Line 767  Line 873 
873    
874    <target name="4jdk8-test"    <target name="4jdk8-test"
875            depends="4jdk8-tck, 4jdk8-jtreg"            depends="4jdk8-tck, 4jdk8-jtreg"
876            description="Runs tck and jtreg tests for jsr166-4jdk8">            description="Runs tck and jtreg tests for jsr166-4jdk8"/>
   </target>  
877    
878    
879    <target name="4jdk8docs"    <target name="4jdk8docs"
# Line 784  Line 889 
889               access="${build.javadoc.access}"               access="${build.javadoc.access}"
890               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
891               classpath=""               classpath=""
892                 source="8"
893               executable="${javadoc8}"               executable="${javadoc8}"
894               failonerror = "true">               failonerror = "true">
895        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 791  Line 897 
897        </fileset>        </fileset>
898        <arg line="-Xdocrootparent ${java8.docroot.url}"/>        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
899        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
900        <arg value="-tag"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
901        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
902        <arg value="-tag"/>        <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
903        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>  <!-- @apiNote tag currently unused -->
904        <arg value="-tag"/>  <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
       <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>  
       <arg value="-tag"/>  
       <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>  
905      </javadoc>      </javadoc>
906    </target>    </target>
907    
# Line 810  Line 913 
913    
914    <target name="4jdk8clean"    <target name="4jdk8clean"
915            description="Removes all 4jdk8 build products">            description="Removes all 4jdk8 build products">
   
916      <delete dir="${build.4jdk8.dir}"/>      <delete dir="${build.4jdk8.dir}"/>
   
917    </target>    </target>
918    
919    
# Line 828  Line 929 
929    </target>    </target>
930    
931    
932      <!-- jsr166 4jdk7 (no longer maintained) -->
933    
934    <!-- jsr166 4jdk7 -->    <target name="4jdk7compile" depends="configure-compiler">
   
   <target name="4jdk7compile"  
           depends="configure-compiler"  
           description="Compiles src/jdk7 sources, targeting jdk7">  
   
935      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
936    
937      <javac srcdir="${4jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
# Line 848  Line 945 
945             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
946             includeAntRuntime="false"             includeAntRuntime="false"
947             includeJavaRuntime="false"             includeJavaRuntime="false"
948               encoding="ASCII"
949             executable="${javac7}"             executable="${javac7}"
950             fork="true">             fork="true">
951    
# Line 857  Line 955 
955        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
956        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
957        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
958      </javac>      </javac>
959    </target>    </target>
960    
961    <target name="4jdk7doclint"    <target name="4jdk7doclint" depends="configure-compiler">
           depends="configure-compiler"  
           description="Finds doclint warnings">  
   
962      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
963    
964      <javac srcdir="${4jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
# Line 878  Line 972 
972             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
973             includeAntRuntime="false"             includeAntRuntime="false"
974             includeJavaRuntime="false"             includeJavaRuntime="false"
975               encoding="ASCII"
976             executable="${javac8}"             executable="${javac8}"
977             fork="true">             fork="true">
978    
# Line 887  Line 982 
982        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
983        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
984        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
985      </javac>      </javac>
986    </target>    </target>
987    
988      <target name="4jdk7jar" depends="4jdk7compile">
   <target name="4jdk7jar"  
           depends="4jdk7compile"  
           description="Builds library jar from compiled sources">  
   
989      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
990        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
991        <manifest>        <manifest>
# Line 903  Line 993 
993          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
994        </manifest>        </manifest>
995      </jar>      </jar>
   
996    </target>    </target>
997    
998      <target name="4jdk7-tck" depends="4jdk7jar">
   <target name="4jdk7-tck"  
           depends="4jdk7jar"  
           description="Runs tck tests for jsr166-4jdk7 directly">  
   
999      <run-tck-tests      <run-tck-tests
1000        target="7"        target="7"
1001        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
# Line 928  Line 1013 
1013          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
1014          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
1015          <exclude name="SubmissionPublisherTest.java"/>          <exclude name="SubmissionPublisherTest.java"/>
1016            <compilerarg value="-Werror"/>
1017        </javac-elements>        </javac-elements>
1018      </run-tck-tests>      </run-tck-tests>
1019    </target>    </target>
1020    
   
1021    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
1022    <target name="4jdk7-tck-junit"    <target name="4jdk7-tck-junit" depends="4jdk7compile">
           depends="4jdk7compile">  
1023    
1024      <junit printsummary="true"      <junit printsummary="true"
1025             showoutput="true"             showoutput="true"
# Line 957  Line 1041 
1041    
1042        <test name="${jsr166.tckTestClass}" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
1043        </test>        </test>
   
1044      </junit>      </junit>
1045    </target>    </target>
1046    
1047    <target name="4jdk7-jtreg"    <target name="4jdk7-jtreg" depends="4jdk7jar">
           depends="4jdk7jar"  
           description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">  
1048      <run-jtreg-tests      <run-jtreg-tests
1049         target="7"         target="7"
1050         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
1051         classes="${4jdk7product.jar}"/>         classes="${4jdk7product.jar}"/>
1052    </target>    </target>
1053    
1054      <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1055    
1056    <target name="4jdk7-test"    <target name="4jdk7docs">
           depends="4jdk7-tck, 4jdk7-jtreg"  
           description="Runs tck and jtreg tests for jsr166-4jdk7">  
   </target>  
   
   
   <target name="4jdk7docs"  
           description="Builds javadocs for src/jdk7 to dist dir">  
   
1057      <delete dir="${4jdk7docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
1058      <mkdir dir="${4jdk7docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
1059    
# Line 1000  Line 1074 
1074      </javadoc>      </javadoc>
1075    </target>    </target>
1076    
1077      <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1078    
1079    <target name="4jdk7dist"    <target name="4jdk7clean">
           depends="4jdk7dist-jar, 4jdk7dist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="4jdk7clean"  
           description="Removes all 4jdk7 build products">  
   
1080      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
   
1081    </target>    </target>
1082    
1083      <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
   <target name="4jdk7dist-jar"  
           depends="4jdk7clean, 4jdk7jar">  
1084      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1085    </target>    </target>
1086    
1087      <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
   <target name="4jdk7dist-docs"  
           depends="4jdk7clean, 4jdk7docs">  
1088      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1089    </target>    </target>
1090    
1091    
1092    <!-- jsr166x -->    <!-- jsr166x (no longer maintained) -->
   
   <target name="jsr166xcompile"  
           depends="configure-compiler"  
           description="Compiles jsr166x sources to build dir">  
1093    
1094      <target name="jsr166xcompile" depends="configure-compiler">
1095      <mkdir dir="${build.jsr166x.classes.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
1096    
1097      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1045  Line 1105 
1105             target="5"             target="5"
1106             includeAntRuntime="false"             includeAntRuntime="false"
1107             includeJavaRuntime="false"             includeJavaRuntime="false"
1108               encoding="ASCII"
1109             executable="${javac7}"             executable="${javac7}"
1110             fork="true">             fork="true">
   
1111        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
1112        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1113        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1114        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1115        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1116      </javac>      </javac>
1117    </target>    </target>
1118    
1119      <target name="jsr166xjar" depends="jsr166xcompile">
   <target name="jsr166xjar"  
           depends="jsr166xcompile"  
           description="Builds library jar from compiled sources">  
   
1120      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1121        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1122        <manifest>        <manifest>
# Line 1069  Line 1124 
1124          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1125        </manifest>        </manifest>
1126      </jar>      </jar>
   
1127    </target>    </target>
1128    
1129      <target name="jsr166xdocs">
   <target name="jsr166xdocs"  
           description="Builds javadocs to dist dir">  
   
1130      <delete dir="${jsr166xdocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
1131      <mkdir dir="${jsr166xdocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
1132    
# Line 1090  Line 1141 
1141               failonerror = "true">               failonerror = "true">
1142        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1143        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1144      </javadoc>      </javadoc>
1145    </target>    </target>
1146    
1147      <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1148    
1149    <target name="jsr166xdist"    <target name="jsr166xclean">
           depends="jsr166xdist-jar, jsr166xdist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="jsr166xclean"  
           description="Removes all jsr166x build products">  
   
1150      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
   
1151    </target>    </target>
1152    
1153      <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
   <target name="jsr166xdist-jar"  
           depends="jsr166xclean, jsr166xjar">  
1154      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1155    </target>    </target>
1156    
1157    <target name="jsr166xdist-docs"    <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
           depends="jsr166xclean, jsr166xdocs">  
1158      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1159    </target>    </target>
1160    
   <!-- jsr166y -->  
1161    
1162      <!-- jsr166y (no longer maintained) -->
1163    
1164    <target name="jsr166ycompile"    <target name="jsr166ycompile" depends="configure-compiler">
           depends="configure-compiler"  
           description="Compiles jsr166y sources">  
   
1165      <mkdir dir="${build.jsr166y.classes.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
1166    
1167      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1138  Line 1175 
1175             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1176             includeAntRuntime="false"             includeAntRuntime="false"
1177             includeJavaRuntime="false"             includeJavaRuntime="false"
1178               encoding="ASCII"
1179             executable="${javac7}"             executable="${javac7}"
1180             fork="true">             fork="true">
1181    
# Line 1146  Line 1184 
1184        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1185        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1186        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1187      </javac>      </javac>
1188    </target>    </target>
1189    
1190      <target name="jsr166yjar" depends="jsr166ycompile">
   <target name="jsr166yjar"  
           depends="jsr166ycompile"  
           description="Builds library jar from compiled sources">  
   
1191      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1192        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1193        <manifest>        <manifest>
# Line 1162  Line 1195 
1195          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1196        </manifest>        </manifest>
1197      </jar>      </jar>
   
1198    </target>    </target>
1199    
1200      <target name="jsr166ydocs">
   <target name="jsr166ydocs"  
           description="Builds javadocs to dist dir">  
   
1201      <delete dir="${jsr166ydocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
1202      <mkdir dir="${jsr166ydocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
1203    
# Line 1183  Line 1212 
1212               failonerror = "true">               failonerror = "true">
1213        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1214        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1215      </javadoc>      </javadoc>
1216    </target>    </target>
1217    
1218      <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1219    
1220    <target name="jsr166ydist"    <target name="jsr166yclean">
           depends="jsr166ydist-jar, jsr166ydist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="jsr166yclean"  
           description="Removes all jsr166y build products">  
   
1221      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
   
1222    </target>    </target>
1223    
1224      <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
   <target name="jsr166ydist-jar"  
           depends="jsr166yclean, jsr166yjar">  
1225      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1226    </target>    </target>
1227    
1228    <target name="jsr166ydist-docs"    <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
           depends="jsr166yclean, jsr166ydocs">  
1229      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1230    </target>    </target>
1231    
1232    
1233    <!-- extra166y -->    <!-- extra166y (no longer maintained) -->
   
   
   <target name="extra166ycompile"  
           depends="configure-compiler, jsr166yjar"  
           description="Compiles extra166y sources">  
1234    
1235      <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1236      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
1237    
1238      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1232  Line 1246 
1246             target="6"             target="6"
1247             includeAntRuntime="false"             includeAntRuntime="false"
1248             includeJavaRuntime="false"             includeJavaRuntime="false"
1249               encoding="ASCII"
1250             executable="${javac7}"             executable="${javac7}"
1251             fork="true">             fork="true">
1252    
# Line 1240  Line 1255 
1255        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1256        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1257        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1258      </javac>      </javac>
1259    </target>    </target>
1260    
1261      <target name="extra166yjar" depends="extra166ycompile">
   <target name="extra166yjar"  
           depends="extra166ycompile"  
           description="Builds library jar from compiled sources">  
   
1262      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1263        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1264        <manifest>        <manifest>
# Line 1256  Line 1266 
1266          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1267        </manifest>        </manifest>
1268      </jar>      </jar>
   
1269    </target>    </target>
1270    
1271      <target name="extra166ydocs">
   <target name="extra166ydocs"  
           description="Builds javadocs to build dir">  
   
1272      <delete dir="${extra166ydocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1273      <mkdir dir="${extra166ydocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1274    
# Line 1276  Line 1282 
1282               executable="${javadoc7}">               executable="${javadoc7}">
1283        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1284        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1285      </javadoc>      </javadoc>
1286    </target>    </target>
1287    
1288      <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1289    
1290    <target name="extra166ydist"    <target name="extra166yclean">
           depends="extra166ydist-jar, extra166ydist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="extra166yclean"  
           description="Removes all extra166y build products">  
   
1291      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
   
1292    </target>    </target>
1293    
1294      <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
   <target name="extra166ydist-jar"  
           depends="extra166yclean, extra166yjar">  
1295      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1296    </target>    </target>
1297    
1298    <target name="extra166ydist-docs"    <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
           depends="extra166yclean, extra166ydocs">  
1299      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1300    </target>    </target>
1301    
1302    <!-- jsr166e -->  
1303      <!-- jsr166e (no longer maintained) -->
1304    
1305    <property name="build.jsr166e.java.version" value="6"/>    <property name="build.jsr166e.java.version" value="6"/>
1306    <property name="build.jsr166e.javac" value="${javac6}"/>    <property name="build.jsr166e.javac" value="${javac6}"/>
1307    
1308    <target name="jsr166ecompile"    <target name="jsr166ecompile" depends="configure-compiler">
           depends="configure-compiler"  
           description="Compiles jsr166e sources">  
   
1309      <mkdir dir="${build.jsr166e.classes.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1310    
1311      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1333  Line 1326 
1326        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1327        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1328        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1329      </javac>      </javac>
1330    </target>    </target>
1331    
   <!-- jsr166e: find doclint errors -->  
1332    <target name="jsr166edoclint">    <target name="jsr166edoclint">
   
1333      <mkdir dir="${build.jsr166e.classes.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1334    
1335      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1361  Line 1351 
1351        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1352        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1353        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
   
1354      </javac>      </javac>
1355    </target>    </target>
1356    
1357      <target name="jsr166ejar" depends="jsr166ecompile">
   <target name="jsr166ejar"  
           depends="jsr166ecompile"  
           description="Builds library jar from compiled sources">  
   
1358      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1359        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1360        <manifest>        <manifest>
# Line 1377  Line 1362 
1362          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1363        </manifest>        </manifest>
1364      </jar>      </jar>
   
1365    </target>    </target>
1366    
1367      <target name="jsr166edocs">
   <target name="jsr166edocs"  
           description="Builds javadocs to build dir">  
   
1368      <delete dir="${jsr166edocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1369      <mkdir dir="${jsr166edocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1370    
# Line 1397  Line 1378 
1378               failonerror = "true">               failonerror = "true">
1379        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1380        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1381      </javadoc>      </javadoc>
1382    </target>    </target>
1383    
1384      <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
   <target name="jsr166e-tck-one-java-version"  
           depends="jsr166ejar">  
   
1385      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
   
1386      <run-tck-tests      <run-tck-tests
1387        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1388        target="${build.jsr166e.java.version}"        target="${build.jsr166e.java.version}"
# Line 1414  Line 1390 
1390        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1391    </target>    </target>
1392    
1393    <target name="jsr166e-tck"    <target name="jsr166e-tck">
           description="Runs tck tests for jsr166e for multiple java versions">  
1394    
1395  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1396  <!--     <antcall target="jsr166e-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1436  Line 1411 
1411      </antcall>      </antcall>
1412    </target>    </target>
1413    
1414      <target name="jsr166e-test" depends="jsr166e-tck"/>
1415    
1416    <target name="jsr166e-test"    <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
           depends="jsr166e-tck"  
           description="Runs all tests for jsr166e">  
   </target>  
   
   <target name="jsr166edist"  
           depends="jsr166edist-jar, jsr166edist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
1417    
1418    <target name="jsr166eclean"    <target name="jsr166eclean">
           description="Removes all jsr166e build products">  
1419      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
1420    </target>    </target>
1421    
   
1422    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1423            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1424      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1425    </target>    </target>
1426    
1427    <target name="jsr166edist-docs"    <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
           depends="jsr166eclean, jsr166edocs">  
1428      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1429    </target>    </target>
1430    
1431    
1432  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
1433    
1434    <target name="lint">  <!--   <target name="lint"> -->
1435      <antcall target="dists">  <!--     <antcall target="dists"> -->
1436        <param name="build.javadoc.access" value="public"/>  <!--       <param name="build.javadoc.access" value="protected"/> -->
1437      </antcall>  <!--     </antcall> -->
1438    </target>  <!--   </target> -->
1439    
1440  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1441    <target name="lint-private">    <target name="doclint-private">
1442      <antcall target="dist">      <antcall target="dist">
1443        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1444      </antcall>      </antcall>
1445    </target>    </target>
1446    
1447    
1448    <!-- ==============================================================
1449      Experimental errorprone support
1450      https://errorprone.info
1451      https://errorprone.info/docs/installation
1452      https://github.com/google/error-prone/issues/1143
1453    =================================================================== -->
1454      <path id="errorprone.processorpath.path">
1455        <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1456        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1457        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1458        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1459      </path>
1460      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1461      <property name="errorprone.jsr166.user.flags" value=""/>
1462      <property name="errorprone.jsr166.flags"
1463                value="-Xep:HashtableContains:OFF
1464                       -Xep:JdkObsolete:OFF
1465                       -Xep:MissingOverride:OFF
1466                       -Xep:MissingFail:OFF
1467                       -Xep:ThreadPriorityCheck:OFF
1468                       -Xep:MixedArrayDimensions:ERROR
1469                       -Xep:RemoveUnusedImports:ERROR
1470                       -Xep:EmptyIf:ERROR
1471                       -Xep:MultipleTopLevelClasses:ERROR
1472                       -Xep:ClassName:ERROR
1473                       -Xep:LongLiteralLowerCaseSuffix:ERROR
1474                       -Xep:RedundantThrows:ERROR
1475                       -Xep:IdentityBinaryExpression:WARN
1476                       -Xep:ConstructorInvokesOverridable:WARN
1477                       -Xep:MethodCanBeStatic:WARN
1478                       ${errorprone.jsr166.user.flags}"/>
1479      <!-- -Xep:WildcardImport:ERROR -->
1480      <property name="errorprone.jsr166.test.flags"
1481                value="-Xep:StringSplitter:OFF
1482                       -Xep:BoxedPrimitiveConstructor:OFF
1483                       -Xep:ModifyingCollectionWithItself:OFF"/>
1484      <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1485      <target name="errorprone"
1486              depends="clean, configure-compiler"
1487              description="Run errorprone over jsr166 source code (experimental)">
1488    
1489        <local name="destdir"/>
1490        <property name="destdir" value="${build.classes.dir}/java.base"/>
1491        <mkdir dir="${destdir}"/>
1492    
1493        <javac srcdir="${src.dir}"
1494               destdir="${destdir}"
1495               debug="${build.debug}"
1496               debuglevel="${build.debuglevel}"
1497               deprecation="${build.deprecation}"
1498               classpath=""
1499               includeAntRuntime="false"
1500               includeJavaRuntime="false"
1501               encoding="ASCII"
1502               executable="${build.main.javac}"
1503               fork="true">
1504    
1505          <include name="**/*.java"/>
1506          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1507          <compilerarg value="-J--illegal-access=permit"/>
1508          <compilerarg value="-XDcompilePolicy=simple"/>
1509          <compilerarg value="-processorpath"/>
1510          <compilerarg pathref="errorprone.processorpath.path"/>
1511          <compilerarg value="-Xplugin:ErrorProne
1512                              ${errorprone.jsr166.flags}"/>
1513          <compilerarg value="--patch-module=java.base=${src.dir}"/>
1514          <compilerarg value="-Xprefer:source"/>
1515          <compilerarg value="-XDignore.symbol.file=true"/>
1516          <compilerarg value="-Xlint:all"/>
1517          <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1518          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1519          <compilerarg line="${build.args}"/>
1520        </javac>
1521    
1522        <jar destfile="${product.jar}">
1523          <fileset dir="${destdir}"/>
1524        </jar>
1525    
1526        <run-tck-tests
1527          target="${java.runtime.target}"
1528          workdir="${build.dir}"
1529          classes="${product.jar}">
1530          <javac-elements>
1531            <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1532            <compilerarg value="-J--illegal-access=permit"/>
1533            <compilerarg value="-XDcompilePolicy=simple"/>
1534            <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1535            <compilerarg value="-Xplugin:ErrorProne
1536                                ${errorprone.jsr166.flags}
1537                                ${errorprone.jsr166.test.flags}"/>
1538            <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1539          </javac-elements>
1540        </run-tck-tests>
1541      </target>
1542    
1543      <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1544      <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1545      <target name="errorprone-jtreg"
1546              depends="jar"
1547              description="Run errorprone over jtreg tests (experimental)">
1548    
1549        <run-jtreg-tests
1550           target="${java.runtime.target}"
1551           workdir="${build.dir}"
1552           classes="${product.jar}"
1553           verbose="all">
1554          <jtreg-elements>
1555            <arg value="-javacoption:-XDcompilePolicy=simple"/>
1556            <arg value="-javacoption:-processorpath"/>
1557            <arg value="-javacoption:${errorprone.processorpath}"/>
1558            <arg value="-javacoption:-Xplugin:ErrorProne
1559                                ${errorprone.jsr166.flags}
1560                                ${errorprone.jsr166.test.flags}
1561                                -Xep:MultipleTopLevelClasses:WARN
1562                                -Xep:NonAtomicVolatileUpdate:OFF"/>
1563          </jtreg-elements>
1564        </run-jtreg-tests>
1565      </target>
1566    
1567    
1568    <!-- ==============================================================
1569      Running guava tests against jsr166 code
1570    =================================================================== -->
1571    
1572    <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1573    <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1574    <!-- <property name="guava.version" value="21.0"/> -->
1575    
1576    <!-- HOWTO debug print a path id -->
1577    <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1578    <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1579    
1580    <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1581    <!--   organisation="com.google.guava" module="guava-tests"/> -->
1582    <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1583    <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1584    <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1585    <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1586    
1587    <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1588    <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1589    <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1590    <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1591    
1592    <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1593    <!--   type="*" inline="true" conf="*(private),*(public)" -->
1594    <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1595    <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1596    
1597    <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1598    <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1599    <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1600    
1601      <target name="init-ivy">
1602        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1603             dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1604        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1605                 classpath="${build.dir}/ivy.jar"/>
1606      </target>
1607    
1608      <target name="guava-tests" depends="jar, init-ivy"
1609              description="Guava tests run against jsr166 collections">
1610        <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1611        <mkdir dir="${guava.dir}"/>
1612        <ivy:retrieve pathid="guava.testlib.classpath"
1613          type="jar,bundle" inline="true" conf="default,master"
1614          pattern="${guava.dir}/[artifact].[ext]"
1615          organisation="com.google.guava" module="guava-testlib"/>
1616        <property name="guava.version" value="21.0"/>
1617        <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1618             dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1619        <junit printsummary="true" showoutput="true" haltonfailure="true"
1620               jvm="${build.main.java}" fork="true">
1621          <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1622          <formatter type="brief"/>
1623          <classpath>
1624            <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1625            <path refid="guava.testlib.classpath"/>
1626          </classpath>
1627    
1628          <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1629          <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1630        </junit>
1631      </target>
1632    
1633  </project>  </project>

Legend:
Removed from v.1.211  
changed lines
  Added in v.1.299

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27