[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.123, Tue Jan 22 20:22:00 2013 UTC revision 1.159, Fri Oct 3 23:18:13 2014 UTC
# Line 16  Line 16 
16    $HOME/jdk/jdk6    $HOME/jdk/jdk6
17    $HOME/jdk/jdk7    $HOME/jdk/jdk7
18    $HOME/jdk/jdk8    $HOME/jdk/jdk8
19      $HOME/jdk/jdk9
20    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
21    $HOME/jdk/src/jdk6    $HOME/jdk/src/jdk6
22    $HOME/jdk/src/jdk7    $HOME/jdk/src/jdk7
23    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
24      $HOME/jdk/src/jdk9
25    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
26    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
27    
28      Alternatively, define ant variables thus:
29      ant -Djdk$N.home=...
30      for $N in 6 7 8 9 ...
31  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
32    </description>    </description>
33    
34    <target name="usage" description="Advises user to run with -projecthelp">    <!-- Display main targets by running 'ant -projecthelp' -->
35      <echo>Run "ant -projecthelp" for full usage information.</echo>    <target name="usage">
36        <java classname="org.apache.tools.ant.Main">
37          <arg value="-projecthelp" />
38        </java>
39    </target>    </target>
40    
41    
# Line 39  Line 48 
48    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
49    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
50    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
51      <property name="build.javadoc.access" value="protected"/>
52    
53      <!-- Tck options; see JSR166TestCase.java
54       To profile a single tck test class:
55       ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
56       To stress test a single tck test class:
57       ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
58      -->
59      <property name="jsr166.profileTests"     value="false"/>
60      <property name="jsr166.profileThreshold" value="100"/>
61      <property name="jsr166.runsPerTest"      value="1"/>
62      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63    
64    <!-- Build locations -->    <!-- Build locations -->
65    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
# Line 86  Line 107 
107      </sequential>      </sequential>
108    </macrodef>    </macrodef>
109    
110      <macrodef name="mirror-dir">
111        <attribute name="src"/>
112        <attribute name="dst"/>
113        <sequential>
114        <delete dir="@{dst}"/>
115        <mkdir dir="@{dst}"/>
116        <copy todir="@{dst}" preservelastmodified="true">
117          <fileset dir="@{src}"/>
118        </copy>
119        </sequential>
120      </macrodef>
121    
122    <defjdklocations v="6"/>    <defjdklocations v="6"/>
123    <defjdklocations v="7"/>    <defjdklocations v="7"/>
124    <defjdklocations v="8"/>    <defjdklocations v="8"/>
125      <defjdklocations v="9"/>
126    
127    <!-- Source locations -->    <!-- Source locations -->
128    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 105  Line 139 
139    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
140    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
141    
142    <!-- Distribution locations -->    <!-- Javadoc locations -->
143    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
144    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
145    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
146    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
147    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
148    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>    <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
149    
150      <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
151      <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
152      <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
153      <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
154      <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
155      <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
156    
157    <!-- Jar locations -->    <!-- Jar locations -->
158    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 122  Line 163 
163    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
164    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
165    
166    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
167    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
168    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
169    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
170      <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
171    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <!-- The expected canonical location does not yet exist as of 2014-07 -->
172    <!-- The below does not yet exist as of 2013-01 -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
173    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
174      <!-- Default jdk doc location (latest stable release seems best) -->
175      <property name="java.docroot.url"       value="${java8.docroot.url}"/>
176    
177    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
178    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
179      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
180      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
181      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
182      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
183      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
184    
185    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
186    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 147  Line 195 
195    
196    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
197      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
198      <attribute name="target"/>      <attribute name="target"/>
199        <attribute name="compile-target" default="@{target}"/>
200      <attribute name="workdir"/>      <attribute name="workdir"/>
201      <attribute name="classes"/>      <attribute name="classes"/>
202      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
203        <element name="javac-elements" optional="true"/>
204      <sequential>      <sequential>
205    
206      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
# Line 161  Line 210 
210             debug="${build.debug}"             debug="${build.debug}"
211             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
212             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
213             source="@{source}"             source="@{compile-target}"
214               target="@{compile-target}"
215             classpath="${junit.jar}"             classpath="${junit.jar}"
216             bootclasspath="@{classes}:${bootclasspath@{source}}"             bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
217             includeAntRuntime="false"             includeAntRuntime="false"
218             includeJavaRuntime="false"             includeJavaRuntime="false"
219             executable="${javac@{target}}"             executable="${javac@{compile-target}}"
220             fork="true">             fork="true">
221    
222        <include name="*.java"/>        <include name="*.java"/>
223        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
224        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
225        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
226          <javac-elements/>
227    
228      </javac>      </javac>
229    
230      <java classname="JSR166TestCase"      <java classname="${jsr166.tckTestClass}"
231            failonerror="true"            failonerror="true"
232            jvm="${java@{target}}"            jvm="${java@{target}}"
233            fork="true">            fork="true">
234          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
235          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
236            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
237            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
238            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
239          <classpath>          <classpath>
240            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
241            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 191  Line 245 
245      </sequential>      </sequential>
246    </macrodef>    </macrodef>
247    
248      <macrodef name="run-jtreg-tests">
249        <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
250        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
251        <attribute name="source" default="7"/>
252        <attribute name="target"/>
253        <attribute name="workdir"/>
254        <attribute name="classes"/>
255        <attribute name="jtregflags" default=""/>
256        <sequential>
257        <delete dir="@{workdir}/JTwork"   quiet="true"/>
258        <delete dir="@{workdir}/JTreport" quiet="true"/>
259        <mkdir dir="@{workdir}/JTwork/scratch"/>
260        <mkdir dir="@{workdir}/JTreport"/>
261        <jtreg dir="@{jtreg.src.dir}"
262               jdk="${jdk@{target}.home}"
263               workDir="@{workdir}/JTwork"
264               reportDir="@{workdir}/JTreport">
265    
266          <arg value="-Xbootclasspath/p:@{classes}"/>
267          <arg value="-agentvm"/>
268          <arg value="-v:nopass,fail"/>
269          <arg value="-vmoptions:-esa -ea"/>
270          <arg value="-automatic"/>
271          <arg value="-k:!ignore"/>
272          <arg line="@{jtregflags}"/>
273        </jtreg>
274        </sequential>
275      </macrodef>
276    
277    <!-- ALoops classpath -->    <!-- ALoops classpath -->
278    <path id="loops.classpath">    <path id="loops.classpath">
279      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 202  Line 285 
285    
286    <!-- Main targets -->    <!-- Main targets -->
287    
288      <property name="build.main.java.version" value="9"/>
289      <property name="build.main.javac" value="${javac9}"/>
290    
291    <target name="dists"    <target name="dists"
292            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
293            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
# Line 220  Line 306 
306             classpath=""             classpath=""
307             includeAntRuntime="false"             includeAntRuntime="false"
308             includeJavaRuntime="false"             includeJavaRuntime="false"
309             executable="${javac8}"             executable="${build.main.javac}"
310             fork="true">             fork="true">
311    
312        <include name="**/*.java"/>        <include name="**/*.java"/>
313          <compilerarg value="-Xprefer:source"/>
314        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
315        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
316          <compilerarg value="-Xdoclint:all/protected"/>
317          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
318        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
319    
320      </javac>      </javac>
# Line 242  Line 331 
331    </target>    </target>
332    
333    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
334    <target name="docs"    <target name="docs"
335            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
336    
337      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${docs.dir}"/>
338      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${docs.dir}"/>
339    
340      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
341      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
342    
343      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${docs.dir}"
344               packagenames="none"               packagenames="none"
345               link="${jdkapi8docs.url}"               link="${java9.api.url}"
346               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
347               sourcepath="${src.dir}:${jdk8src.dir}"               access="${build.javadoc.access}"
348                 sourcepath="${src.dir}:${jdk9src.dir}"
349               classpath=""               classpath=""
350               executable="${javadoc8}">               executable="${javadoc9}">
351        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
352          <include name="**/*.java"/>          <include name="**/*.java"/>
353        </fileset>        </fileset>
354          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
355          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
356        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
357        <arg value="-tag"/>        <arg value="-tag"/>
358        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
359          <arg value="-tag"/>
360          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
361          <arg value="-tag"/>
362          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
363          <arg value="-tag"/>
364          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
365      </javadoc>      </javadoc>
366    </target>    </target>
367    
368    
369    <target name="dist"    <target name="dist"
370            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
371            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
372    
373    
# Line 307  Line 400 
400    <target name="dist-clean"    <target name="dist-clean"
401            description="Removes all build and distribution products">            description="Removes all build and distribution products">
402    
403        <delete dir="${build.dir}"/>
404      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
405    
406    </target>    </target>
407    
408    
   <!-- Internal targets -->  
   
   
409    <target name="dist-jar"    <target name="dist-jar"
410            depends="clean, jar">            depends="clean, jar">
   
411      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
   
412    </target>    </target>
413    
414      <target name="dist-docs"
415    <target name="compile-tests"            depends="clean, docs">
416            depends="jar">      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
   
     <mkdir dir="${build.testcases.dir}"/>  
   
     <javac srcdir="${tck.src.dir}"  
            destdir="${build.testcases.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath="${junit.jar}"  
            bootclasspath="@{product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac8}"  
            fork="true">  
   
       <include name="**/*.java"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
       <compilerarg line="${build.args}"/>  
   
     </javac>  
   
     <javac srcdir="${test.src.dir}"  
            destdir="${build.testcases.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath=""  
            bootclasspath="@{product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac8}"  
            fork="true">  
   
       <include name="jsr166/test/**/*.java"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
       <compilerarg line="${build.args}"/>  
   
     </javac>  
   
 <!--  
     <javac srcdir="${jtreg.src.dir}"  
           destdir="${build.testcases.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
              fork="true">  
   
       <compilerarg value="-Xbootclasspath/p:${product.jar}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg line="${build.args}"/>  
   
     </javac>  
 -->  
   
417    </target>    </target>
418    
419    
420    <target name="run-tests"    <target name="test-tck"
421            depends="compile-tests">            depends="jar"
422              description="Runs tck tests for main directly">
     <!-- May be overridden by user.properties -->  
     <property name="testcase" value="*"/>  
   
     <mkdir dir="${build.reports.dir}"/>  
   
     <junit printsummary="true"  
              showoutput="true"  
           errorProperty="junit.failed"  
         failureProperty="junit.failed"  
                     dir="${build.reports.dir}"  
                     jvm="${java8}"  
                    fork="true">  
   
       <jvmarg value="-Xbootclasspath/p:${product.jar}"/>  
       <jvmarg value="-server"/>  
       <jvmarg value="-showversion"/>  
   
       <classpath refid="test.classpath"/>  
   
       <formatter type="xml"/>  
   
       <batchtest todir="${build.reports.dir}" unless="no.test.tck">  
         <fileset dir="${tck.src.dir}">  
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
   
       <batchtest todir="${build.reports.dir}" if="do.test.old">  
         <fileset dir="${test.src.dir}">  
           <include name="jsr166/test/**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
   
 <!--  
       <batchtest todir="${build.reports.dir}" if="do.test.jtreg">  
         <fileset dir="${jtreg.src.dir}">  
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
 -->  
   
     </junit>  
423    
424        <run-tck-tests
425          target="${build.main.java.version}"
426          workdir="${build.dir}"
427          classes="${product.jar}"/>
428    </target>    </target>
429    
430      <target name="test-jtreg"
431              depends="jar"
432              description="Runs jtreg tests for main using the jtreg ant task">
433        <run-jtreg-tests
434           target="${build.main.java.version}"
435           workdir="${build.dir}"
436           classes="${product.jar}"/>
437      </target>
438    
439    <target name="report-tests"    <target name="test"
440            depends="run-tests">            depends="test-tck, test-jtreg"
441              description="Runs tck and jtreg tests for main">
442      </target>
443    
444      <!-- Sets junit.report.format to frames if redirection is present,    <target name="test89"
445           otherwise sets it to noframes. -->            description="Runs tck and jtreg tests for main for multiple java versions">
     <available property="junit.report.format"  
                   value="frames"  
               classname="org.apache.xalan.lib.Redirect"  
     />  
     <property name="junit.report.format" value="noframes"/>  
   
     <junitreport todir="${build.reports.dir}">  
       <fileset dir="${build.reports.dir}">  
         <include name="TEST-*.xml"/>  
       </fileset>  
       <report format="${junit.report.format}" todir="${build.reports.dir}"  
       />  
     </junitreport>  
446    
447      <fail message="Test Cases Failed" if="junit.failed"/>      <antcall target="clean"/>
448        <antcall target="test">
449          <param name="build.main.java.version" value="8"/>
450          <param name="build.main.javac" value="${javac8}"/>
451        </antcall>
452    
453        <antcall target="clean"/>
454        <antcall target="test">
455          <param name="build.main.java.version" value="9"/>
456          <param name="build.main.javac" value="${javac9}"/>
457        </antcall>
458    
459    </target>    </target>
460    
461    
462    
463    <target name="configure-compiler">    <target name="configure-compiler">
464    
465      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 477  Line 477 
477    </target>    </target>
478    
479    
   <target name="configure-tests"  
        depends="configure-compiler">  
   
     <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->  
     <available property="junit.available"  
                classname="junit.framework.Protectable"/>  
   
     <!-- Xalan -->  
     <available property="xalan.available"  
                classname="org.apache.xalan.Version"/>  
   
   
     <!-- Ant 1.6beta and later don't need or want this check -->  
     <!--  
     <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"  
           unless="junit.available"/>  
   
     <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"  
           unless="xalan.available"/>  
     -->  
   
   </target>  
   
480    
481    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
482    
# Line 552  Line 529 
529             fork="true">             fork="true">
530    
531        <include name="**/*.java"/>        <include name="**/*.java"/>
532          <compilerarg value="-Xprefer:source"/>
533          <compilerarg value="-XDignore.symbol.file=true"/>
534          <compilerarg value="-Xlint:all"/>
535          <compilerarg line="${build.args}"/>
536    
537        </javac>
538      </target>
539    
540      <target name="4jdk7doclint"
541              depends="configure-compiler"
542              description="Finds doclint warnings">
543    
544        <mkdir dir="${build.4jdk7.classes.dir}"/>
545    
546        <javac srcdir="${4jdk7src.dir}"
547               destdir="${build.4jdk7.classes.dir}"
548               debug="${build.debug}"
549               debuglevel="${build.debuglevel}"
550               deprecation="${build.deprecation}"
551               source="6"
552               classpath=""
553               bootclasspath="${bootclasspath7}"
554               includeAntRuntime="false"
555               includeJavaRuntime="false"
556               executable="${javac8}"
557               fork="true">
558    
559          <include name="**/*.java"/>
560          <compilerarg value="-Xprefer:source"/>
561        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
562        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
563          <compilerarg value="-Xdoclint:all/protected"/>
564        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
565    
566      </javac>      </javac>
567    </target>    </target>
568    
569    
570    <target name="4jdk7-jar"    <target name="4jdk7jar"
571            depends="4jdk7compile"            depends="4jdk7compile"
572            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
573    
# Line 572  Line 579 
579    
580    
581    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
582            depends="4jdk7-jar"            depends="4jdk7jar"
583            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
584    
585      <run-tck-tests      <run-tck-tests
586        target="7"        target="7"
587        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
588        classes="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
589          <javac-elements>
590            <!-- JDK8+ test classes -->
591            <exclude name="*8Test.java"/>
592            <exclude name="*9Test.java"/>
593            <exclude name="DoubleAccumulatorTest.java"/>
594            <exclude name="DoubleAdderTest.java"/>
595            <exclude name="LongAccumulatorTest.java"/>
596            <exclude name="LongAdderTest.java"/>
597            <exclude name="CompletableFutureTest.java"/>
598            <exclude name="SplittableRandomTest.java"/>
599            <exclude name="StampedLockTest.java"/>
600          </javac-elements>
601        </run-tck-tests>
602    </target>    </target>
603    
604    
# Line 604  Line 624 
624    
625        <formatter type="brief"/>        <formatter type="brief"/>
626    
627        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
628        </test>        </test>
629    
630      </junit>      </junit>
631    </target>    </target>
632    
633    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
634            depends="4jdk7compile"            depends="4jdk7jar"
635            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
636      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
637      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
638      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
639      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"
640      <jtreg dir="${jtreg.src.dir}"         jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
            jdk="${jdk7.home}"  
            workDir="${build.4jdk7.dir}/JTwork"  
            reportDir="${build.4jdk7.dir}/JTreport">  
   
       <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>  
       <arg value="-agentvm"/>  
       <arg value="-v:nopass,fail"/>  
       <arg value="-vmoptions:-esa -ea"/>  
       <arg value="-automatic"/>  
       <arg value="-k:!ignore"/>  
     </jtreg>  
641    </target>    </target>
642    
643    
# Line 641  Line 650 
650    <target name="4jdk7docs"    <target name="4jdk7docs"
651            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
652    
653      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
654      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
655    
656      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
657               packagenames="none"               packagenames="none"
658               link="${jdkapi7docs.url}"               link="${java7.api.url}"
659               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
660                 access="${build.javadoc.access}"
661               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
662               classpath=""               classpath=""
663               executable="${javadoc7}">               executable="${javadoc7}">
664        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
665          <include name="**/*.java"/>          <include name="**/*.java"/>
666        </fileset>        </fileset>
667          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
668        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
669      </javadoc>      </javadoc>
670    </target>    </target>
671    
672    
673    <target name="4jdk7dist"    <target name="4jdk7dist"
674            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
675            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
676    
677    
# Line 672  Line 683 
683    </target>    </target>
684    
685    
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
686    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
687            depends="4jdk7clean, 4jdk7-jar">            depends="4jdk7clean, 4jdk7jar">
   
688      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
689      </target>
690    
691    
692      <target name="4jdk7dist-docs"
693              depends="4jdk7clean, 4jdk7docs">
694        <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
695    </target>    </target>
696    
697    
# Line 715  Line 725 
725    </target>    </target>
726    
727    
728    <target name="jsr166x-jar"    <target name="jsr166xjar"
729            depends="jsr166xcompile"            depends="jsr166xcompile"
730            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
731    
# Line 729  Line 739 
739    <target name="jsr166xdocs"    <target name="jsr166xdocs"
740            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
741    
742      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
743      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
744    
745      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
746               packagenames="jsr166x.*"               packagenames="jsr166x.*"
747               link="${jdkapidocs.url}"               link="${java.api.url}"
748                 access="${build.javadoc.access}"
749               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
750               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
751               source="5"               source="5"
752               executable="${javadoc7}">               executable="${javadoc7}">
753          <arg line="-Xdocrootparent ${java.docroot.url}"/>
754        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
755    
756      </javadoc>      </javadoc>
# Line 746  Line 758 
758    
759    
760    <target name="jsr166xdist"    <target name="jsr166xdist"
761            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
762            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
763    
764    
# Line 758  Line 770 
770    </target>    </target>
771    
772    
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
773    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
774            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166xjar">
   
775      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
776      </target>
777    
778      <target name="jsr166xdist-docs"
779              depends="jsr166xclean, jsr166xdocs">
780        <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
781    </target>    </target>
782    
783    <!-- jsr166y -->    <!-- jsr166y -->
# Line 802  Line 811 
811    </target>    </target>
812    
813    
814    <target name="jsr166y-jar"    <target name="jsr166yjar"
815            depends="jsr166ycompile"            depends="jsr166ycompile"
816            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
817    
# Line 816  Line 825 
825    <target name="jsr166ydocs"    <target name="jsr166ydocs"
826            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
827    
828      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
829      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
830    
831      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
832               packagenames="jsr166y.*"               packagenames="jsr166y.*"
833               link="${jdkapidocs.url}"               link="${java.api.url}"
834                 access="${build.javadoc.access}"
835               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
836               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
837               source="6"               source="6"
838               executable="${javadoc7}">               executable="${javadoc7}">
839          <arg line="-Xdocrootparent ${java.docroot.url}"/>
840        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
841    
842      </javadoc>      </javadoc>
# Line 833  Line 844 
844    
845    
846    <target name="jsr166ydist"    <target name="jsr166ydist"
847            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
848            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
849    
850    
# Line 845  Line 856 
856    </target>    </target>
857    
858    
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
859    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
860            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166yjar">
   
861      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
862      </target>
863    
864      <target name="jsr166ydist-docs"
865              depends="jsr166yclean, jsr166ydocs">
866        <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
867    </target>    </target>
868    
869    
# Line 862  Line 871 
871    
872    
873    <target name="extra166ycompile"    <target name="extra166ycompile"
874            depends="configure-compiler, jsr166y-jar"            depends="configure-compiler, jsr166yjar"
875            description="Compiles extra166y sources">            description="Compiles extra166y sources">
876    
877      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 889  Line 898 
898    </target>    </target>
899    
900    
901    <target name="extra166y-jar"    <target name="extra166yjar"
902            depends="extra166ycompile"            depends="extra166ycompile"
903            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
904    
# Line 903  Line 912 
912    <target name="extra166ydocs"    <target name="extra166ydocs"
913            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
914    
915      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
916      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
917    
918      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
919               packagenames="extra166y.*"               packagenames="extra166y.*"
920               link="${jdkapidocs.url}"               link="${java.api.url}"
921                 access="${build.javadoc.access}"
922               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
923               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
924               source="6"               source="6"
925               executable="${javadoc7}">               executable="${javadoc7}">
926          <arg line="-Xdocrootparent ${java.docroot.url}"/>
927        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
928    
929      </javadoc>      </javadoc>
# Line 920  Line 931 
931    
932    
933    <target name="extra166ydist"    <target name="extra166ydist"
934            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
935            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
936    
937    
# Line 932  Line 943 
943    </target>    </target>
944    
945    
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
946    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
947            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166yjar">
   
948      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
949      </target>
950    
951      <target name="extra166ydist-docs"
952              depends="extra166yclean, extra166ydocs">
953        <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
954    </target>    </target>
955    
956    <!-- jsr166e -->    <!-- jsr166e -->
957    
958      <property name="build.jsr166e.java.version" value="6"/>
959      <property name="build.jsr166e.javac" value="${javac6}"/>
960    
961    <target name="jsr166ecompile"    <target name="jsr166ecompile"
962            depends="configure-compiler"            depends="configure-compiler"
963            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 957  Line 969 
969             debug="${build.debug}"             debug="${build.debug}"
970             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
971             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
972             source="7"             source="${build.jsr166e.java.version}"
973             classpath=""             classpath=""
974             includeAntRuntime="false"             includeAntRuntime="false"
975             includeJavaRuntime="false"             includeJavaRuntime="false"
976             executable="${javac7}"             executable="${build.jsr166e.javac}"
977             fork="true">             fork="true">
978    
979        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
# Line 972  Line 984 
984      </javac>      </javac>
985    </target>    </target>
986    
987      <!-- jsr166e: find doclint errors -->
988      <target name="jsr166edoclint">
989    
990        <mkdir dir="${build.jsr166e.classes.dir}"/>
991    
992    <target name="jsr166e-jar"      <javac srcdir="${topsrc.dir}"
993               destdir="${build.jsr166e.classes.dir}"
994               debug="${build.debug}"
995               debuglevel="${build.debuglevel}"
996               deprecation="${build.deprecation}"
997               source="${build.jsr166e.java.version}"
998               classpath=""
999               bootclasspath="${bootclasspath7}"
1000               includeAntRuntime="false"
1001               includeJavaRuntime="false"
1002               executable="${javac8}"
1003               fork="true">
1004    
1005          <include name="jsr166e/**/*.java"/>
1006          <compilerarg value="-XDignore.symbol.file=true"/>
1007          <compilerarg value="-Xlint:all"/>
1008          <compilerarg value="-Xdoclint:all/protected"/>
1009    
1010        </javac>
1011      </target>
1012    
1013    
1014      <target name="jsr166ejar"
1015            depends="jsr166ecompile"            depends="jsr166ecompile"
1016            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1017    
# Line 987  Line 1025 
1025    <target name="jsr166edocs"    <target name="jsr166edocs"
1026            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1027    
1028      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1029      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1030    
1031      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1032               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1033               link="${jdkapidocs.url}"               link="${java.api.url}"
1034               sourcepath="${topsrc.dir}:${jdk7src.dir}"               access="${build.javadoc.access}"
1035               source="7"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1036                 source="${build.jsr166e.java.version}"
1037               executable="${javadoc7}">               executable="${javadoc7}">
1038          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1039        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1040    
1041      </javadoc>      </javadoc>
1042    </target>    </target>
1043    
1044    
1045    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck-one-java-version"
1046            depends="jsr166e-jar"            depends="jsr166ejar">
1047            description="Runs tck tests for jsr166e">  
1048        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1049    
1050      <run-tck-tests      <run-tck-tests
1051        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1052        source="7"        target="${build.jsr166e.java.version}"
       target="8"  
1053        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1054        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1055    </target>    </target>
1056    
1057      <target name="jsr166e-test-tck"
1058              description="Runs tck tests for jsr166e for multiple java versions">
1059    
1060    <!--     <antcall target="clean"/> -->
1061    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1062    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1063    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1064    <!--     </antcall> -->
1065    
1066        <antcall target="clean"/>
1067        <antcall target="jsr166e-test-tck-one-java-version">
1068          <param name="build.jsr166e.java.version" value="7"/>
1069          <param name="build.jsr166e.javac" value="${javac7}"/>
1070        </antcall>
1071    
1072        <antcall target="clean"/>
1073        <antcall target="jsr166e-test-tck-one-java-version">
1074          <param name="build.jsr166e.java.version" value="6"/>
1075          <param name="build.jsr166e.javac" value="${javac6}"/>
1076        </antcall>
1077      </target>
1078    
1079    
1080      <target name="jsr166e-test"
1081              depends="jsr166e-test-tck"
1082              description="Runs all tests for jsr166e">
1083      </target>
1084    
1085    <target name="jsr166edist"    <target name="jsr166edist"
1086            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1087            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1088    
1089    
1090    <target name="jsr166eclean"    <target name="jsr166eclean"
1091            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1092      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1093    </target>    </target>
1094    
1095    
1096    <target name="jsr166edist-clean"    <target name="jsr166edist-jar"
1097            description="Removes all build and distribution products">            depends="jsr166eclean, jsr166ejar">
1098        <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1099      </target>
1100    
1101      <target name="jsr166edist-docs"
1102              depends="jsr166eclean, jsr166edocs">
1103        <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1104    </target>    </target>
1105    
   <target name="jsr166edist-jar"  
           depends="jsr166eclean, jsr166e-jar">  
1106    
1107      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>  <!-- Find buglets that can be detected by static build tools -->
1108    
1109      <target name="lint">
1110        <antcall target="dists">
1111          <param name="build.javadoc.access" value="private"/>
1112        </antcall>
1113    </target>    </target>
1114    
1115    
1116  </project>  </project>

Legend:
Removed from v.1.123  
changed lines
  Added in v.1.159

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8