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

Diff of /jsr166/build.xml

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

revision 1.236, Mon Mar 20 00:03:57 2017 UTC revision 1.297, Mon Apr 29 14:16:38 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">    xmlns:ivy="antlib:org.apache.ivy.ant">
5    
6    <description>    <description>
# Line 18  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/jdk7  
22    $HOME/jdk/jdk8    $HOME/jdk/jdk8
23    $HOME/jdk/jdk9    $HOME/jdk/jdk9
24    $HOME/jdk/jdk10    $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    where each of the above is a JDK or a symlink to same, and
   $HOME/jdk/src/jdk7  
29    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
30    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk9
31    $HOME/jdk/src/jdk10    $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    where each of the above is a complete JDK source tree
36    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
37    
38    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
39    ant -Djdk$N.home=... -Djdk$N.src.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
40    for $N in 7 8 9 10 ...    for $N in 8 .. 13 ...
41    
42    As of 2016-03, the sources in src/main are for jdk9+ only.    As of 2016-03, the sources in src/main are for jdk9+ only.
43  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 52  Line 57 
57    
58    
59    <!-- Compilation options -->    <!-- Compilation options -->
   <property name="build.sourcelevel"    value="6"/>  
60    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
61    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
62    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 103  Line 107 
107      <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"
108        unless:set="have.java.base"/>        unless:set="have.java.base"/>
109      <local name="modules"/>      <local name="modules"/>
110      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>      <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
111      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
112      <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"/>
113      <path id="bootclasspath@{v}" unless:set="modules">      <path id="bootclasspath@{v}" unless:set="modules">
# Line 134  Line 138 
138    <defjdklocations v="8"/>    <defjdklocations v="8"/>
139    <defjdklocations v="9"/>    <defjdklocations v="9"/>
140    <defjdklocations v="10"/>    <defjdklocations v="10"/>
141      <defjdklocations v="11"/>
142      <defjdklocations v="12"/>
143      <defjdklocations v="13"/>
144    
145    <!-- Source locations -->    <!-- Source locations -->
146    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 144  Line 151 
151    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
152    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
153    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>    <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}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
158    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
159    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 183  Line 193 
193    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
194    
195    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->    <!-- 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"/>    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
197    <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"/>
198    <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"/>
199    <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"/>
200    <!-- 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"/>
201    <!-- <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"/>
202    <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
203    <!-- Default jdk doc location (latest stable release seems best) -->    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
204    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <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 -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
215    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 199  Line 217 
217    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
218    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
219    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>    <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/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
225    
226    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 231  Line 253 
253    
254      <local name="modules"/>      <local name="modules"/>
255      <condition property="modules">      <condition property="modules">
256        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>        <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>      </condition>
263    
264      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
# Line 253  Line 280 
280        <include name="*.java"/>        <include name="*.java"/>
281        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
282        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
283        <compilerarg value="-Xdoclint:reference/private"/>        <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
284        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
285        <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>        <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
286        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 293  Line 320 
320    </macrodef>    </macrodef>
321    
322    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
323    <fileset dir="${jtreg9.src.dir}">    <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
324      <patternset id="jdk9.jtreg.tests">    <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
325        <include name="**/*.java"/>    <property name="jtreg.test.pattern" value="**/*.java"/>
326      </patternset>    <macrodef name="defjtregtests">
327    </fileset>      <attribute name="v"/>
328        <sequential>
329    <fileset dir="${jtreg8.src.dir}">        <fileset dir="${jtreg@{v}.src.dir}">
330      <patternset id="jdk8.jtreg.tests">          <patternset id="jdk@{v}.jtreg.tests">
331        <include name="**/*.java"/>            <include name="${jtreg.test.pattern}"/>
332      </patternset>      </patternset>
333    </fileset>    </fileset>
334        </sequential>
335      </macrodef>
336    
337    <fileset dir="${jtreg7.src.dir}">    <defjtregtests v="13"/>
338      <patternset id="jdk7.jtreg.tests">    <defjtregtests v="12"/>
339        <include name="**/*.java"/>    <defjtregtests v="11"/>
340      </patternset>    <defjtregtests v="10"/>
341    </fileset>    <defjtregtests v="9"/>
342      <defjtregtests v="8"/>
343      <defjtregtests v="7"/>
344    
345    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
346    <property name="jtreg.flags" value=""/>    <property name="jtreg.flags" value=""/>
347    
348    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
349      <!-- 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"/>  
350      <attribute name="target"/>      <attribute name="target"/>
351      <attribute name="workdir"/>      <attribute name="workdir"/>
352      <attribute name="classes"/>      <attribute name="classes"/>
353        <attribute name="verbose" default="${jtreg.verbose}"/>
354      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
355        <element name="jtreg-elements" optional="true"/>
356    
357      <sequential>      <sequential>
358    
# Line 329  Line 361 
361    
362      <local name="modules"/>      <local name="modules"/>
363      <condition property="modules">      <condition property="modules">
364        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/lib/modules" type="file"/>
365      </condition>      </condition>
366    
367      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 338  Line 370 
370             workDir="@{workdir}/JTwork">             workDir="@{workdir}/JTwork">
371        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
372        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
373        <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>        <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
374        <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>        <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
375        <arg value="-agentvm"/>        <arg value="-agentvm"/>
376        <arg value="-noreport"/>        <arg value="-noreport"/>
377        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:@{verbose}"/>
378        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
379        <arg value="-automatic"/>        <arg value="-automatic"/>
380        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
381        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
382        <arg line="${jtreg.flags}"/>        <arg line="${jtreg.flags}"/>
383          <jtreg-elements/>
384      </jtreg>      </jtreg>
385      </sequential>      </sequential>
386    </macrodef>    </macrodef>
# Line 363  Line 396 
396    
397    <!-- Main targets -->    <!-- Main targets -->
398    
399    <property name="build.main.java.version" value="9"/>    <!-- 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}"/>    <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"    <target name="dists"
415            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist"
416            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
417              <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
418    
419    <target name="compile"    <target name="compile"
420            depends="configure-compiler"            depends="configure-compiler"
421            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
422    
     <local name="modules"/>  
     <condition property="modules">  
       <and>  
         <available file="${jdk9.home}/jmods" type="dir"/>  
         <equals arg1="9" arg2="${build.main.java.version}"/>  
       </and>  
     </condition>  
   
423      <local name="destdir"/>      <local name="destdir"/>
424      <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"/>  
425    
426      <mkdir dir="${destdir}"/>      <mkdir dir="${destdir}"/>
427    
# Line 401  Line 438 
438             fork="true">             fork="true">
439    
440        <include name="**/*.java"/>        <include name="**/*.java"/>
441        <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
442        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
443        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
444        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all,-removal"/>
445        <compilerarg value="-Werror"/>        <compilerarg line="--doclint-format html5"/>
446        <compilerarg value="-Xdoclint:all/protected,reference/private"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
447          <compilerarg value="-Werror"/>
448        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
449        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
450    
# Line 445  Line 483 
483  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->  <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
484      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
485               packagenames="none"               packagenames="none"
486               link="${java9.api.url}"               link="${java.api.url}"
487               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
488               access="${build.javadoc.access}"               access="${build.javadoc.access}"
489               sourcepath="${src.dir}"               sourcepath="${src.dir}"
490               classpath=""               classpath=""
491               executable="${javadoc9}">               source="${build.main.javadoc.source}"
492                 executable="${build.main.javadoc}">
493    <!-- TODO: JDK-8214571 failonerror = "true" -->
494        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
495          <include name="**/*.java"/>          <include name="**/*.java"/>
496        </fileset>        </fileset>
497        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
498        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
499        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
500          <arg value="-html5"/>
501        <arg value="--patch-module=java.base=${src.dir}"/>        <arg value="--patch-module=java.base=${src.dir}"/>
502        <arg value="-tag"/>  <!-- old school frames via docs/index.html?overview-summary.html -->
503        <arg value="${javadoc.jls.option}"/>  <!-- TODO: - -frames no longer a supported option in jdk13+ -->
504  <!-- @apiNote currently unused -->        <arg value="--frames"/>
505  <!--       <arg value="-tag"/> -->        <arg value="--override-methods=summary"/>
506  <!--       <arg value="apiNote:a:API Note:"/> -->        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
507        <arg value="-tag"/>        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
508        <arg value="implSpec:a:Implementation Requirements:"/>        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
509        <arg value="-tag"/>        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
       <arg value="implNote:a:Implementation Note:"/>  
510  <!-- tags added in jdk9: currently unused -->  <!-- tags added in jdk9: currently unused -->
511  <!--       <arg value="-tag"/> -->  <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
512  <!--       <arg value="revised:X"/> -->  <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
 <!--       <arg value="-tag"/> -->  
 <!--       <arg value="spec:X"/> -->  
513      </javadoc>      </javadoc>
514    </target>    </target>
515    
# Line 481  Line 519 
519            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
520    
521    
   <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>  
   
   
522    <target name="clean"    <target name="clean"
523            description="Removes all build products">            description="Removes all build products">
   
524      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
   
525    </target>    </target>
526    
527    
528    <target name="dist-clean"    <target name="dist-clean"
529            description="Removes all build and distribution products">            description="Removes all build and distribution products">
   
530      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
531      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
   
532    </target>    </target>
533    
534    
# Line 535  Line 547 
547            description="Runs tck tests for src/main directly">            description="Runs tck tests for src/main directly">
548    
549      <run-tck-tests      <run-tck-tests
550        target="${build.main.java.version}"        target="${java.runtime.target}"
551        workdir="${build.dir}"        workdir="${build.dir}"
552        classes="${product.jar}">        classes="${product.jar}">
553        <javac-elements>        <javac-elements>
# Line 569  Line 581 
581            depends="jar"            depends="jar"
582            description="Runs jtreg tests for src/main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
583      <run-jtreg-tests      <run-jtreg-tests
584         target="${build.main.java.version}"         target="${java.runtime.target}"
585         workdir="${build.dir}"         workdir="${build.dir}"
586         classes="${product.jar}"/>         classes="${product.jar}"/>
587    </target>    </target>
588    
589    <target name="test"    <target name="test"
590            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
591            description="Runs tck and jtreg tests for src/main">            description="Runs tck and jtreg tests for src/main"/>
592    
593      <target name="test-version-permutations"
594              depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
595    </target>    </target>
596    
597  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->    <target name="test9">
598        <antcall target="clean"/>
599        <antcall>
600          <param name="java.runtime.target" value="9"/>
601          <param name="build.main.javac" value="${javac9}"/>
602          <param name="build.main.javadoc" value="${javadoc12}"/>
603          <param name="build.main.javadoc.source" value="9"/>
604          <target name="test"/>
605          <target name="docs"/>
606        </antcall>
607      </target>
608    
609  <!--     <antcall target="jtreg"> -->    <target name="test10">
610  <!--       <param name="build.main.java.version" value="8"/> -->      <antcall target="clean"/>
611  <!--       <param name="build.main.javac" value="${javac8}"/> -->      <antcall>
612  <!--     </antcall> -->        <param name="java.runtime.target" value="10"/>
613          <param name="build.main.javac" value="${javac10}"/>
614          <param name="build.main.javadoc" value="${javadoc12}"/>
615          <param name="build.main.javadoc.source" value="10"/>
616          <target name="test"/>
617          <target name="docs"/>
618        </antcall>
619      </target>
620    
621  <!--   </target> -->    <target name="test11">
622        <antcall target="clean"/>
623        <antcall>
624          <param name="java.runtime.target" value="11"/>
625          <param name="build.main.javac" value="${javac11}"/>
626          <param name="build.main.javadoc" value="${javadoc12}"/>
627          <param name="build.main.javadoc.source" value="11"/>
628          <target name="test"/>
629          <target name="docs"/>
630        </antcall>
631      </target>
632    
633  <!--   <target name="test89" -->    <target name="test12">
634  <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->      <antcall target="clean"/>
635        <antcall>
636          <param name="java.runtime.target" value="12"/>
637          <param name="build.main.javac" value="${javac12}"/>
638          <param name="build.main.javadoc" value="${javadoc12}"/>
639          <param name="build.main.javadoc.source" value="12"/>
640          <target name="test"/>
641          <target name="docs"/>
642        </antcall>
643      </target>
644    
645  <!--     <antcall target="clean"/> -->    <target name="test13">
646  <!--     <antcall target="test"> -->      <antcall target="clean"/>
647  <!--       <param name="build.main.java.version" value="8"/> -->      <antcall>
648  <!--       <param name="build.main.javac" value="${javac8}"/> -->        <param name="java.runtime.target" value="13"/>
649  <!--     </antcall> -->        <param name="build.main.javac" value="${javac13}"/>
650          <param name="build.main.javadoc" value="${javadoc13}"/>
651          <param name="build.main.javadoc.source" value="13"/>
652          <target name="test"/>
653          <target name="docs"/>
654        </antcall>
655      </target>
656    
657  <!--     <antcall target="clean"/> -->    <target name="test9-11">
658  <!--     <antcall target="test"> -->      <antcall target="clean"/>
659  <!--       <param name="build.main.java.version" value="9"/> -->      <antcall>
660  <!--       <param name="build.main.javac" value="${javac9}"/> -->        <param name="java.runtime.target" value="11"/>
661  <!--     </antcall> -->        <param name="build.main.javac" value="${javac9}"/>
662          <param name="build.main.javadoc" value="${javadoc12}"/>
663          <param name="build.main.javadoc.source" value="9"/>
664          <target name="test"/>
665          <target name="docs"/>
666        </antcall>
667      </target>
668    
669  <!--   </target> -->    <target name="test9-12">
670        <antcall target="clean"/>
671        <antcall>
672          <param name="java.runtime.target" value="12"/>
673          <param name="build.main.javac" value="${javac9}"/>
674          <param name="build.main.javadoc" value="${javadoc12}"/>
675          <param name="build.main.javadoc.source" value="9"/>
676          <target name="test"/>
677          <target name="docs"/>
678        </antcall>
679      </target>
680    
681      <target name="test9-13">
682        <antcall target="clean"/>
683        <antcall>
684          <param name="java.runtime.target" value="13"/>
685          <param name="build.main.javac" value="${javac9}"/>
686          <param name="build.main.javadoc" value="${javadoc13}"/>
687          <param name="build.main.javadoc.source" value="9"/>
688          <target name="test"/>
689          <target name="docs"/>
690        </antcall>
691      </target>
692    
693    
694    <target name="configure-compiler">    <target name="configure-compiler">
695      <fail message="ant version too old">      <fail message="ant version too old">
696        <condition>        <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
         <not> <antversion atleast="1.9.1"/> </not>  
       </condition>  
697      </fail>      </fail>
698    
699      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 629  Line 711 
711    </target>    </target>
712    
713    
   
   <!-- 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}"  
          encoding="ASCII"  
              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>  
   
   
714    <target name="compile-test-loops" depends="jar"    <target name="compile-test-loops" depends="jar"
715            description="compile all the perf tests in src/test/loops">            description="Compiles all the perf tests in src/test/loops">
716    
717      <mkdir dir="${build.dir}/test/loops"/>      <mkdir dir="${build.dir}/test/loops"/>
718    
# Line 674  Line 724 
724             includeAntRuntime="false"             includeAntRuntime="false"
725             includeJavaRuntime="false"             includeJavaRuntime="false"
726             encoding="ASCII"             encoding="ASCII"
727             executable="${javac9}"             executable="${build.main.javac}"
728             fork="true">             fork="true">
729    
730        <include name="*.java"/>        <include name="*.java"/>
# Line 682  Line 732 
732        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
733        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
734        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
735      </javac>      </javac>
   
736    </target>    </target>
737    
738    
# Line 710  Line 758 
758             encoding="ASCII"             encoding="ASCII"
759             executable="${javac8}"             executable="${javac8}"
760             fork="true">             fork="true">
   
761        <include name="**/*.java"/>        <include name="**/*.java"/>
762        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
763        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
764        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
765        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
766        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
767      </javac>      </javac>
768    </target>    </target>
769    
# Line 741  Line 787 
787             encoding="ASCII"             encoding="ASCII"
788             executable="${javac8}"             executable="${javac8}"
789             fork="true">             fork="true">
   
790        <include name="**/*.java"/>        <include name="**/*.java"/>
791        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
792        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
793        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
794        <compilerarg value="-Xdoclint:all/protected,reference/private"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
795        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
796      </javac>      </javac>
797    </target>    </target>
798    
# Line 764  Line 808 
808          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
809        </manifest>        </manifest>
810      </jar>      </jar>
   
811    </target>    </target>
812    
813    
# Line 798  Line 841 
841    
842    <target name="4jdk8-test"    <target name="4jdk8-test"
843            depends="4jdk8-tck, 4jdk8-jtreg"            depends="4jdk8-tck, 4jdk8-jtreg"
844            description="Runs tck and jtreg tests for jsr166-4jdk8">            description="Runs tck and jtreg tests for jsr166-4jdk8"/>
   </target>  
845    
846    
847    <target name="4jdk8docs"    <target name="4jdk8docs"
# Line 815  Line 857 
857               access="${build.javadoc.access}"               access="${build.javadoc.access}"
858               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
859               classpath=""               classpath=""
860                 source="8"
861               executable="${javadoc8}"               executable="${javadoc8}"
862               failonerror = "true">               failonerror = "true">
863        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
# Line 822  Line 865 
865        </fileset>        </fileset>
866        <arg line="-Xdocrootparent ${java8.docroot.url}"/>        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
867        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
868        <arg value="-tag"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
869        <arg value="${javadoc.jls.option}"/>        <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
870  <!-- @apiNote currently unused -->        <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
871  <!--       <arg value="-tag"/> -->  <!-- @apiNote tag currently unused -->
872  <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->  <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
       <arg value="-tag"/>  
       <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;"/>  
873      </javadoc>      </javadoc>
874    </target>    </target>
875    
# Line 842  Line 881 
881    
882    <target name="4jdk8clean"    <target name="4jdk8clean"
883            description="Removes all 4jdk8 build products">            description="Removes all 4jdk8 build products">
   
884      <delete dir="${build.4jdk8.dir}"/>      <delete dir="${build.4jdk8.dir}"/>
   
885    </target>    </target>
886    
887    
# Line 860  Line 897 
897    </target>    </target>
898    
899    
900      <!-- jsr166 4jdk7 (no longer maintained) -->
901    
902    <!-- jsr166 4jdk7 -->    <target name="4jdk7compile" depends="configure-compiler">
   
   <target name="4jdk7compile"  
           depends="configure-compiler"  
           description="Compiles src/jdk7 sources, targeting jdk7">  
   
903      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
904    
905      <javac srcdir="${4jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
# Line 890  Line 923 
923        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
924        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
925        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
926      </javac>      </javac>
927    </target>    </target>
928    
929    <target name="4jdk7doclint"    <target name="4jdk7doclint" depends="configure-compiler">
           depends="configure-compiler"  
           description="Finds doclint warnings">  
   
930      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
931    
932      <javac srcdir="${4jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
# Line 921  Line 950 
950        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
951        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
952        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
953      </javac>      </javac>
954    </target>    </target>
955    
956      <target name="4jdk7jar" depends="4jdk7compile">
   <target name="4jdk7jar"  
           depends="4jdk7compile"  
           description="Builds library jar from compiled sources">  
   
957      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
958        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
959        <manifest>        <manifest>
# Line 937  Line 961 
961          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
962        </manifest>        </manifest>
963      </jar>      </jar>
   
964    </target>    </target>
965    
966      <target name="4jdk7-tck" depends="4jdk7jar">
   <target name="4jdk7-tck"  
           depends="4jdk7jar"  
           description="Runs tck tests for jsr166-4jdk7 directly">  
   
967      <run-tck-tests      <run-tck-tests
968        target="7"        target="7"
969        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
# Line 967  Line 986 
986      </run-tck-tests>      </run-tck-tests>
987    </target>    </target>
988    
   
989    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
990    <target name="4jdk7-tck-junit"    <target name="4jdk7-tck-junit" depends="4jdk7compile">
           depends="4jdk7compile">  
991    
992      <junit printsummary="true"      <junit printsummary="true"
993             showoutput="true"             showoutput="true"
# Line 992  Line 1009 
1009    
1010        <test name="${jsr166.tckTestClass}" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
1011        </test>        </test>
   
1012      </junit>      </junit>
1013    </target>    </target>
1014    
1015    <target name="4jdk7-jtreg"    <target name="4jdk7-jtreg" depends="4jdk7jar">
           depends="4jdk7jar"  
           description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">  
1016      <run-jtreg-tests      <run-jtreg-tests
1017         target="7"         target="7"
1018         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
1019         classes="${4jdk7product.jar}"/>         classes="${4jdk7product.jar}"/>
1020    </target>    </target>
1021    
1022      <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1023    
1024    <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">  
   
1025      <delete dir="${4jdk7docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
1026      <mkdir dir="${4jdk7docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
1027    
# Line 1035  Line 1042 
1042      </javadoc>      </javadoc>
1043    </target>    </target>
1044    
1045      <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1046    
1047    <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">  
   
1048      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
   
1049    </target>    </target>
1050    
1051      <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
   <target name="4jdk7dist-jar"  
           depends="4jdk7clean, 4jdk7jar">  
1052      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1053    </target>    </target>
1054    
1055      <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
   <target name="4jdk7dist-docs"  
           depends="4jdk7clean, 4jdk7docs">  
1056      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1057    </target>    </target>
1058    
1059    
1060    <!-- jsr166x -->    <!-- jsr166x (no longer maintained) -->
   
   <target name="jsr166xcompile"  
           depends="configure-compiler"  
           description="Compiles jsr166x sources to build dir">  
1061    
1062      <target name="jsr166xcompile" depends="configure-compiler">
1063      <mkdir dir="${build.jsr166x.classes.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
1064    
1065      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1083  Line 1076 
1076             encoding="ASCII"             encoding="ASCII"
1077             executable="${javac7}"             executable="${javac7}"
1078             fork="true">             fork="true">
   
1079        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
1080        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1081        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1082        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1083        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1084      </javac>      </javac>
1085    </target>    </target>
1086    
1087      <target name="jsr166xjar" depends="jsr166xcompile">
   <target name="jsr166xjar"  
           depends="jsr166xcompile"  
           description="Builds library jar from compiled sources">  
   
1088      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1089        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1090        <manifest>        <manifest>
# Line 1105  Line 1092 
1092          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1093        </manifest>        </manifest>
1094      </jar>      </jar>
   
1095    </target>    </target>
1096    
1097      <target name="jsr166xdocs">
   <target name="jsr166xdocs"  
           description="Builds javadocs to dist dir">  
   
1098      <delete dir="${jsr166xdocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
1099      <mkdir dir="${jsr166xdocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
1100    
# Line 1126  Line 1109 
1109               failonerror = "true">               failonerror = "true">
1110        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1111        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1112      </javadoc>      </javadoc>
1113    </target>    </target>
1114    
1115      <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1116    
1117    <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">  
   
1118      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
   
1119    </target>    </target>
1120    
1121      <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
   <target name="jsr166xdist-jar"  
           depends="jsr166xclean, jsr166xjar">  
1122      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1123    </target>    </target>
1124    
1125    <target name="jsr166xdist-docs"    <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
           depends="jsr166xclean, jsr166xdocs">  
1126      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1127    </target>    </target>
1128    
   <!-- jsr166y -->  
   
1129    
1130    <target name="jsr166ycompile"    <!-- jsr166y (no longer maintained) -->
           depends="configure-compiler"  
           description="Compiles jsr166y sources">  
1131    
1132      <target name="jsr166ycompile" depends="configure-compiler">
1133      <mkdir dir="${build.jsr166y.classes.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
1134    
1135      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1183  Line 1152 
1152        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1153        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1154        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1155      </javac>      </javac>
1156    </target>    </target>
1157    
1158      <target name="jsr166yjar" depends="jsr166ycompile">
   <target name="jsr166yjar"  
           depends="jsr166ycompile"  
           description="Builds library jar from compiled sources">  
   
1159      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1160        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1161        <manifest>        <manifest>
# Line 1199  Line 1163 
1163          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1164        </manifest>        </manifest>
1165      </jar>      </jar>
   
1166    </target>    </target>
1167    
1168      <target name="jsr166ydocs">
   <target name="jsr166ydocs"  
           description="Builds javadocs to dist dir">  
   
1169      <delete dir="${jsr166ydocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
1170      <mkdir dir="${jsr166ydocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
1171    
# Line 1220  Line 1180 
1180               failonerror = "true">               failonerror = "true">
1181        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1182        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1183      </javadoc>      </javadoc>
1184    </target>    </target>
1185    
1186      <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1187    
1188    <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">  
   
1189      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
   
1190    </target>    </target>
1191    
1192      <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
   <target name="jsr166ydist-jar"  
           depends="jsr166yclean, jsr166yjar">  
1193      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1194    </target>    </target>
1195    
1196    <target name="jsr166ydist-docs"    <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
           depends="jsr166yclean, jsr166ydocs">  
1197      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1198    </target>    </target>
1199    
1200    
1201    <!-- extra166y -->    <!-- extra166y (no longer maintained) -->
   
   
   <target name="extra166ycompile"  
           depends="configure-compiler, jsr166yjar"  
           description="Compiles extra166y sources">  
1202    
1203      <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1204      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
1205    
1206      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1278  Line 1223 
1223        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1224        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1225        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1226      </javac>      </javac>
1227    </target>    </target>
1228    
1229      <target name="extra166yjar" depends="extra166ycompile">
   <target name="extra166yjar"  
           depends="extra166ycompile"  
           description="Builds library jar from compiled sources">  
   
1230      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1231        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1232        <manifest>        <manifest>
# Line 1294  Line 1234 
1234          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1235        </manifest>        </manifest>
1236      </jar>      </jar>
   
1237    </target>    </target>
1238    
1239      <target name="extra166ydocs">
   <target name="extra166ydocs"  
           description="Builds javadocs to build dir">  
   
1240      <delete dir="${extra166ydocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1241      <mkdir dir="${extra166ydocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1242    
# Line 1314  Line 1250 
1250               executable="${javadoc7}">               executable="${javadoc7}">
1251        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1252        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1253      </javadoc>      </javadoc>
1254    </target>    </target>
1255    
1256      <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1257    
1258    <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">  
   
1259      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
   
1260    </target>    </target>
1261    
1262      <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
   <target name="extra166ydist-jar"  
           depends="extra166yclean, extra166yjar">  
1263      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1264    </target>    </target>
1265    
1266    <target name="extra166ydist-docs"    <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
           depends="extra166yclean, extra166ydocs">  
1267      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1268    </target>    </target>
1269    
1270    <!-- jsr166e -->  
1271      <!-- jsr166e (no longer maintained) -->
1272    
1273    <property name="build.jsr166e.java.version" value="6"/>    <property name="build.jsr166e.java.version" value="6"/>
1274    <property name="build.jsr166e.javac" value="${javac6}"/>    <property name="build.jsr166e.javac" value="${javac6}"/>
1275    
1276    <target name="jsr166ecompile"    <target name="jsr166ecompile" depends="configure-compiler">
           depends="configure-compiler"  
           description="Compiles jsr166e sources">  
   
1277      <mkdir dir="${build.jsr166e.classes.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1278    
1279      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1371  Line 1294 
1294        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1295        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1296        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1297      </javac>      </javac>
1298    </target>    </target>
1299    
   <!-- jsr166e: find doclint errors -->  
1300    <target name="jsr166edoclint">    <target name="jsr166edoclint">
   
1301      <mkdir dir="${build.jsr166e.classes.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1302    
1303      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1399  Line 1319 
1319        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1320        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1321        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
   
1322      </javac>      </javac>
1323    </target>    </target>
1324    
1325      <target name="jsr166ejar" depends="jsr166ecompile">
   <target name="jsr166ejar"  
           depends="jsr166ecompile"  
           description="Builds library jar from compiled sources">  
   
1326      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1327        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1328        <manifest>        <manifest>
# Line 1415  Line 1330 
1330          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1331        </manifest>        </manifest>
1332      </jar>      </jar>
   
1333    </target>    </target>
1334    
1335      <target name="jsr166edocs">
   <target name="jsr166edocs"  
           description="Builds javadocs to build dir">  
   
1336      <delete dir="${jsr166edocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1337      <mkdir dir="${jsr166edocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1338    
# Line 1435  Line 1346 
1346               failonerror = "true">               failonerror = "true">
1347        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1348        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1349      </javadoc>      </javadoc>
1350    </target>    </target>
1351    
1352      <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
   <target name="jsr166e-tck-one-java-version"  
           depends="jsr166ejar">  
   
1353      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
   
1354      <run-tck-tests      <run-tck-tests
1355        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1356        target="${build.jsr166e.java.version}"        target="${build.jsr166e.java.version}"
# Line 1452  Line 1358 
1358        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1359    </target>    </target>
1360    
1361    <target name="jsr166e-tck"    <target name="jsr166e-tck">
           description="Runs tck tests for jsr166e for multiple java versions">  
1362    
1363  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1364  <!--     <antcall target="jsr166e-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1474  Line 1379 
1379      </antcall>      </antcall>
1380    </target>    </target>
1381    
1382      <target name="jsr166e-test" depends="jsr166e-tck"/>
1383    
1384    <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"/>  
   
1385    
1386    <target name="jsr166eclean"    <target name="jsr166eclean">
           description="Removes all jsr166e build products">  
1387      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
1388    </target>    </target>
1389    
   
1390    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1391            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1392      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1393    </target>    </target>
1394    
1395    <target name="jsr166edist-docs"    <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
           depends="jsr166eclean, jsr166edocs">  
1396      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1397    </target>    </target>
1398    
1399    
1400  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
1401    
1402    <target name="lint">  <!--   <target name="lint"> -->
1403      <antcall target="dists">  <!--     <antcall target="dists"> -->
1404        <param name="build.javadoc.access" value="public"/>  <!--       <param name="build.javadoc.access" value="protected"/> -->
1405      </antcall>  <!--     </antcall> -->
1406    </target>  <!--   </target> -->
1407    
1408  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1409    <target name="lint-private">    <target name="doclint-private">
1410      <antcall target="dist">      <antcall target="dist">
1411        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1412      </antcall>      </antcall>
# Line 1519  Line 1414 
1414    
1415    
1416  <!-- ==============================================================  <!-- ==============================================================
1417    Experimental errorprone support - http://errorprone.info    Experimental errorprone support
1418    You may need to bring your own errorprone jar.    https://errorprone.info
1419      https://errorprone.info/docs/installation
1420      https://github.com/google/error-prone/issues/1143
1421  =================================================================== -->  =================================================================== -->
1422      <path id="errorprone.processorpath.path">
1423        <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1424        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1425        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1426        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1427      </path>
1428      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1429      <property name="errorprone.jsr166.user.flags" value=""/>
1430      <property name="errorprone.jsr166.flags"
1431                value="-Xep:HashtableContains:OFF
1432                       -Xep:JdkObsolete:OFF
1433                       -Xep:MissingOverride:OFF
1434                       -Xep:MissingFail:OFF
1435                       -Xep:ThreadPriorityCheck:OFF
1436                       -Xep:MixedArrayDimensions:ERROR
1437                       -Xep:RemoveUnusedImports:ERROR
1438                       -Xep:EmptyIf:ERROR
1439                       -Xep:MultipleTopLevelClasses:ERROR
1440                       -Xep:ClassName:ERROR
1441                       -Xep:LongLiteralLowerCaseSuffix:ERROR
1442                       -Xep:RedundantThrows:ERROR
1443                       -Xep:IdentityBinaryExpression:WARN
1444                       -Xep:ConstructorInvokesOverridable:WARN
1445                       -Xep:MethodCanBeStatic:WARN
1446                       ${errorprone.jsr166.user.flags}"/>
1447      <!-- -Xep:WildcardImport:ERROR -->
1448      <property name="errorprone.jsr166.test.flags"
1449                value="-Xep:StringSplitter:OFF
1450                       -Xep:BoxedPrimitiveConstructor:OFF
1451                       -Xep:ModifyingCollectionWithItself:OFF"/>
1452      <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1453    <target name="errorprone"    <target name="errorprone"
1454            depends="clean, configure-compiler"            depends="clean, configure-compiler"
1455            description="Run errorprone over jsr166 source code">            description="Run errorprone over jsr166 source code (experimental)">
1456    
1457      <local name="destdir"/>      <local name="destdir"/>
1458      <property name="destdir" value="${build.classes.dir}/java.base"/>      <property name="destdir" value="${build.classes.dir}/java.base"/>
# Line 1543  Line 1471 
1471             fork="true">             fork="true">
1472    
1473        <include name="**/*.java"/>        <include name="**/*.java"/>
1474        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1475        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>        <compilerarg value="-J--illegal-access=permit"/>
1476        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>        <compilerarg value="-XDcompilePolicy=simple"/>
1477        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>        <compilerarg value="-processorpath"/>
1478        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>        <compilerarg pathref="errorprone.processorpath.path"/>
       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>  
       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>  
       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>  
       <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>  
       <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>  
1479        <compilerarg value="-Xplugin:ErrorProne        <compilerarg value="-Xplugin:ErrorProne
1480                            -Xep:IdentityBinaryExpression:WARN                            ${errorprone.jsr166.flags}"/>
                           -Xep:MissingOverride:OFF  
                           -Xep:MixedArrayDimensions:WARN  
                           -Xep:RemoveUnusedImports:ERROR  
                           -Xep:MethodCanBeStatic:WARN"/>  
1481        <compilerarg value="--patch-module=java.base=${src.dir}"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1482        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
1483        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1573  Line 1492 
1492      </jar>      </jar>
1493    
1494      <run-tck-tests      <run-tck-tests
1495        target="${build.main.java.version}"        target="${java.runtime.target}"
1496        workdir="${build.dir}"        workdir="${build.dir}"
1497        classes="${product.jar}">        classes="${product.jar}">
1498        <javac-elements>        <javac-elements>
1499          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1500          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>          <compilerarg value="-J--illegal-access=permit"/>
1501          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>          <compilerarg value="-XDcompilePolicy=simple"/>
1502          <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>          <compilerarg line="-processorpath ${errorprone.processorpath}"/>
         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>  
         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>  
         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>  
         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>  
         <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>  
         <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>  
1503          <compilerarg value="-Xplugin:ErrorProne          <compilerarg value="-Xplugin:ErrorProne
1504                              -Xep:IdentityBinaryExpression:WARN                              ${errorprone.jsr166.flags}
1505                              -Xep:BoxedPrimitiveConstructor:OFF                              ${errorprone.jsr166.test.flags}"/>
                             -Xep:HashtableContains:OFF  
                             -Xep:ModifyingCollectionWithItself:OFF  
                             -Xep:MissingOverride:OFF  
                             -Xep:MixedArrayDimensions:WARN  
                             -Xep:RemoveUnusedImports:ERROR  
                             -Xep:MethodCanBeStatic:WARN"/>  
1506          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1507        </javac-elements>        </javac-elements>
1508      </run-tck-tests>      </run-tck-tests>
1509    </target>    </target>
1510    
1511      <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1512      <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1513      <target name="errorprone-jtreg"
1514              depends="jar"
1515              description="Run errorprone over jtreg tests (experimental)">
1516    
1517        <run-jtreg-tests
1518           target="${java.runtime.target}"
1519           workdir="${build.dir}"
1520           classes="${product.jar}"
1521           verbose="all">
1522          <jtreg-elements>
1523            <arg value="-javacoption:-XDcompilePolicy=simple"/>
1524            <arg value="-javacoption:-processorpath"/>
1525            <arg value="-javacoption:${errorprone.processorpath}"/>
1526            <arg value="-javacoption:-Xplugin:ErrorProne
1527                                ${errorprone.jsr166.flags}
1528                                ${errorprone.jsr166.test.flags}
1529                                -Xep:MultipleTopLevelClasses:WARN
1530                                -Xep:NonAtomicVolatileUpdate:OFF"/>
1531          </jtreg-elements>
1532        </run-jtreg-tests>
1533      </target>
1534    
1535    
1536  <!-- ==============================================================  <!-- ==============================================================
1537    Running guava tests against jsr166 code    Running guava tests against jsr166 code
# Line 1654  Line 1585 
1585      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1586           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1587      <junit printsummary="true" showoutput="true" haltonfailure="true"      <junit printsummary="true" showoutput="true" haltonfailure="true"
1588             jvm="${java9}" fork="true">             jvm="${build.main.java}" fork="true">
1589        <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>        <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1590        <formatter type="brief"/>        <formatter type="brief"/>
1591        <classpath>        <classpath>
1592          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Legend:
Removed from v.1.236  
changed lines
  Added in v.1.297

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8