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

Diff of /jsr166/build.xml

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

revision 1.140 by jsr166, Mon May 20 19:12:23 2013 UTC revision 1.173 by jsr166, Thu Sep 3 01:24:31 2015 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  As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.  
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="Display main targets by running 'ant -projecthelp'">    <!-- Display main targets by running 'ant -projecthelp' -->
35      <target name="usage">
36      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
37        <arg value="-projecthelp" />        <arg value="-projecthelp" />
38      </java>      </java>
# Line 44  As of 2013-02, the very latest lambda 8 Line 50  As of 2013-02, the very latest lambda 8
50    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
51    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
52    
53    <!-- Tck options; see JSR166TestCase.java -->    <!-- Tck options; see JSR166TestCase.java
54    <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->     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"/>    <property name="jsr166.profileTests"     value="false"/>
60    <property name="jsr166.profileThreshold" value="100"/>    <property name="jsr166.profileThreshold" value="100"/>
61    <property name="jsr166.runsPerTest"      value="1"/>    <property name="jsr166.runsPerTest"      value="1"/>
   <!-- Allow running an individual tck test class -->  
   <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->  
62    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63    
64    <!-- Build locations -->    <!-- Build locations -->
# Line 114  As of 2013-02, the very latest lambda 8 Line 122  As of 2013-02, the very latest lambda 8
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"/>
129    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
130    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
131    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
132    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
133      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
134      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
135      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
136    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
137    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
138    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 154  As of 2013-02, the very latest lambda 8 Line 166  As of 2013-02, the very latest lambda 8
166    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
167    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
168    
169    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
170    <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"/>
171    <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"/>
172    <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"/>
173      <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
174    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <!-- The expected canonical location does not yet exist as of 2014-07 -->
175    <!-- The below does not yet exist as of 2013-01 -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
176    <!-- <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"/>
177      <!-- Default jdk doc location (latest stable release seems best) -->
178      <property name="java.docroot.url"       value="${java8.docroot.url}"/>
179    
180    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
181    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
182      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
183      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
184      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
185      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
186      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
187    
188    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
189    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 183  As of 2013-02, the very latest lambda 8 Line 202  As of 2013-02, the very latest lambda 8
202      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
203      <attribute name="workdir"/>      <attribute name="workdir"/>
204      <attribute name="classes"/>      <attribute name="classes"/>
205      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
206      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
207      <sequential>      <sequential>
208    
# Line 197  As of 2013-02, the very latest lambda 8 Line 216  As of 2013-02, the very latest lambda 8
216             source="@{compile-target}"             source="@{compile-target}"
217             target="@{compile-target}"             target="@{compile-target}"
218             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{compile-target}}"  
219             includeAntRuntime="false"             includeAntRuntime="false"
220             includeJavaRuntime="false"             includeJavaRuntime="false"
221             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
# Line 206  As of 2013-02, the very latest lambda 8 Line 224  As of 2013-02, the very latest lambda 8
224        <include name="*.java"/>        <include name="*.java"/>
225        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
226        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
227          <compilerarg value="-Xbootclasspath/p:@{classes}"/>
228        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
229        <javac-elements/>        <javac-elements/>
230    
# Line 217  As of 2013-02, the very latest lambda 8 Line 236  As of 2013-02, the very latest lambda 8
236            fork="true">            fork="true">
237          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
238          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
239    
240            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
241            <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
242              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
243            </syspropertyset>
244    
245          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
246          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
247          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
# Line 229  As of 2013-02, the very latest lambda 8 Line 254  As of 2013-02, the very latest lambda 8
254      </sequential>      </sequential>
255    </macrodef>    </macrodef>
256    
257      <!-- Define jtreg test sets for different jdk versions -->
258      <fileset dir="${jtreg9.src.dir}">
259        <patternset id="jdk9.jtreg.tests">
260          <include name="**/*.java"/>
261        </patternset>
262      </fileset>
263    
264      <fileset dir="${jtreg8.src.dir}">
265        <patternset id="jdk8.jtreg.tests">
266          <include name="**/*.java"/>
267          <exclude name="**/SpliteratorCharacteristics.java"/>
268          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
269          <exclude name="**/GCDuringIteration.java"/>
270        </patternset>
271      </fileset>
272    
273      <fileset dir="${jtreg7.src.dir}">
274        <patternset id="jdk7.jtreg.tests">
275          <include name="**/*.java"/>
276        </patternset>
277      </fileset>
278    
279    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
280      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
281      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
282      <attribute name="target"/>      <attribute name="target"/>
283      <attribute name="workdir"/>      <attribute name="workdir"/>
# Line 241  As of 2013-02, the very latest lambda 8 Line 288  As of 2013-02, the very latest lambda 8
288      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
289      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
290      <mkdir dir="@{workdir}/JTreport"/>      <mkdir dir="@{workdir}/JTreport"/>
291      <jtreg dir="@{jtreg.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
292             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
293             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
294             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
295          <patternset refid="jdk@{target}.jtreg.tests"/>
296        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}"/>
297        <arg value="-agentvm"/>        <arg value="-agentvm"/>
298        <arg value="-v:nopass,fail"/>        <arg value="-v:nopass,fail"/>
# Line 268  As of 2013-02, the very latest lambda 8 Line 315  As of 2013-02, the very latest lambda 8
315    
316    <!-- Main targets -->    <!-- Main targets -->
317    
318      <property name="build.main.java.version" value="9"/>
319      <property name="build.main.javac" value="${javac9}"/>
320    
321    <target name="dists"    <target name="dists"
322            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
323            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
# Line 286  As of 2013-02, the very latest lambda 8 Line 336  As of 2013-02, the very latest lambda 8
336             classpath=""             classpath=""
337             includeAntRuntime="false"             includeAntRuntime="false"
338             includeJavaRuntime="false"             includeJavaRuntime="false"
339             executable="${javac8}"             executable="${build.main.javac}"
340             fork="true">             fork="true">
341    
342        <include name="**/*.java"/>        <include name="**/*.java"/>
343        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
344        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
345        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
346          <compilerarg value="-Werror"/>
347          <compilerarg value="-Xdoclint:all/protected"/>
348          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
349        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
350    
351      </javac>      </javac>
# Line 309  As of 2013-02, the very latest lambda 8 Line 362  As of 2013-02, the very latest lambda 8
362    </target>    </target>
363    
364    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
365    <target name="docs"    <target name="docs"
366            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
367    
# Line 325  As of 2013-02, the very latest lambda 8 Line 373  As of 2013-02, the very latest lambda 8
373    
374      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
375               packagenames="none"               packagenames="none"
376               link="${jdkapi8docs.url}"               link="${java9.api.url}"
377               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
378               access="${build.javadoc.access}"               access="${build.javadoc.access}"
379               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk9src.dir}"
380               classpath=""               classpath=""
381               executable="${javadoc8}">               executable="${javadoc9}">
382        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
383          <include name="**/*.java"/>          <include name="**/*.java"/>
384        </fileset>        </fileset>
385          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
386          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
387        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
388        <arg value="-tag"/>        <arg value="-tag"/>
389        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
390          <arg value="-tag"/>
391          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
392          <arg value="-tag"/>
393          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
394          <arg value="-tag"/>
395          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
396      </javadoc>      </javadoc>
397    </target>    </target>
398    
# Line 375  As of 2013-02, the very latest lambda 8 Line 431  As of 2013-02, the very latest lambda 8
431    <target name="dist-clean"    <target name="dist-clean"
432            description="Removes all build and distribution products">            description="Removes all build and distribution products">
433    
434        <delete dir="${build.dir}"/>
435      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
436    
437    </target>    </target>
438    
439    
   <!-- Internal targets -->  
   
   
440    <target name="dist-jar"    <target name="dist-jar"
441            depends="clean, jar">            depends="clean, jar">
442      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 393  As of 2013-02, the very latest lambda 8 Line 447  As of 2013-02, the very latest lambda 8
447      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
448    </target>    </target>
449    
450      <target name="tck" depends="test-tck" description="alias for test-tck"/>
   <target name="compile-tests"  
           depends="jar">  
   
     <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>  
 -->  
   
   </target>  
   
451    <target name="test-tck"    <target name="test-tck"
452            depends="jar"            depends="jar"
453            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
454    
455      <run-tck-tests      <run-tck-tests
456        target="8"        target="${build.main.java.version}"
457        workdir="${build.dir}"        workdir="${build.dir}"
458        classes="${product.jar}"/>        classes="${product.jar}"/>
459    </target>    </target>
460    
461      <target name="test-tck-parallelism-1"
462              description="Runs test-tck with given common pool parallelism">
463        <antcall target="test-tck">
464          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
465        </antcall>
466      </target>
467    
468      <target name="test-tck-parallelism-0"
469              description="Runs test-tck with given common pool parallelism">
470        <antcall target="test-tck">
471          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
472        </antcall>
473      </target>
474    
475      <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
476    <target name="test-jtreg"    <target name="test-jtreg"
477            depends="jar"            depends="jar"
478            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
479      <run-jtreg-tests      <run-jtreg-tests
480         target="8"         target="${build.main.java.version}"
481         workdir="${build.dir}"         workdir="${build.dir}"
482         classes="${product.jar}"/>         classes="${product.jar}"/>
483    </target>    </target>
484    
485    <target name="test-ng"    <target name="test"
486            depends="test-tck, test-jtreg"            depends="test-tck, test-tck-parallelism-1, test-jtreg"
487            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
488    </target>    </target>
489    
490    <target name="run-tests"    <target name="jtreg8" description="Runs jtreg tests with jdk8">
           depends="compile-tests">  
   
     <!-- May be overridden by user.properties -->  
     <property name="testcase" value="*"/>  
   
     <mkdir dir="${build.reports.dir}"/>  
491    
492      <junit printsummary="true"      <antcall target="jtreg">
493               showoutput="true"        <param name="build.main.java.version" value="8"/>
494            errorProperty="junit.failed"        <param name="build.main.javac" value="${javac8}"/>
495          failureProperty="junit.failed"      </antcall>
                     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>  
496    
497    </target>    </target>
498    
499      <target name="test89"
500              description="Runs tck and jtreg tests for main for multiple java versions">
501    
502    <target name="report-tests"      <antcall target="clean"/>
503            depends="run-tests">      <antcall target="test">
504          <param name="build.main.java.version" value="8"/>
505      <!-- Sets junit.report.format to frames if redirection is present,        <param name="build.main.javac" value="${javac8}"/>
506           otherwise sets it to noframes. -->      </antcall>
     <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>  
507    
508      <fail message="Test Cases Failed" if="junit.failed"/>      <antcall target="clean"/>
509        <antcall target="test">
510          <param name="build.main.java.version" value="9"/>
511          <param name="build.main.javac" value="${javac9}"/>
512        </antcall>
513    
514    </target>    </target>
515    
516    
517    
518    <target name="configure-compiler">    <target name="configure-compiler">
519    
520      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 571  As of 2013-02, the very latest lambda 8 Line 532  As of 2013-02, the very latest lambda 8
532    </target>    </target>
533    
534    
   <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>  
   
535    
536    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
537    
# Line 624  As of 2013-02, the very latest lambda 8 Line 562  As of 2013-02, the very latest lambda 8
562    </target>    </target>
563    
564    
565      <target name="compile-test-loops" depends="jar"
566              description="compile all the perf tests in src/test/loops">
567    
568        <mkdir dir="${build.dir}/test/loops"/>
569    
570        <javac srcdir="${basedir}/src/test/loops"
571               destdir="${build.dir}/test/loops"
572               debug="${build.debug}"
573               debuglevel="${build.debuglevel}"
574               deprecation="${build.deprecation}"
575               includeAntRuntime="false"
576               includeJavaRuntime="false"
577               executable="${javac9}"
578               fork="true">
579    
580          <include name="*.java"/>
581          <compilerarg value="-XDignore.symbol.file=true"/>
582          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
583          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
584          <compilerarg line="${build.args}"/>
585    
586        </javac>
587    
588      </target>
589    
590    
591    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
592    
593    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 649  As of 2013-02, the very latest lambda 8 Line 613  As of 2013-02, the very latest lambda 8
613        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
614        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
615        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
616          <compilerarg value="-Werror"/>
617          <compilerarg line="${build.args}"/>
618    
619        </javac>
620      </target>
621    
622      <target name="4jdk7doclint"
623              depends="configure-compiler"
624              description="Finds doclint warnings">
625    
626        <mkdir dir="${build.4jdk7.classes.dir}"/>
627    
628        <javac srcdir="${4jdk7src.dir}"
629               destdir="${build.4jdk7.classes.dir}"
630               debug="${build.debug}"
631               debuglevel="${build.debuglevel}"
632               deprecation="${build.deprecation}"
633               source="6"
634               classpath=""
635               bootclasspath="${bootclasspath7}"
636               includeAntRuntime="false"
637               includeJavaRuntime="false"
638               executable="${javac8}"
639               fork="true">
640    
641          <include name="**/*.java"/>
642          <compilerarg value="-Xprefer:source"/>
643          <compilerarg value="-XDignore.symbol.file=true"/>
644          <compilerarg value="-Xlint:all"/>
645          <compilerarg value="-Xdoclint:all/protected"/>
646        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
647    
648      </javac>      </javac>
# Line 677  As of 2013-02, the very latest lambda 8 Line 671  As of 2013-02, the very latest lambda 8
671        <javac-elements>        <javac-elements>
672          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
673          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
674            <exclude name="*9Test.java"/>
675          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
676          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
677          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
678          <exclude name="LongAdderTest.java"/>          <exclude name="LongAdderTest.java"/>
679          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
680            <exclude name="SplittableRandomTest.java"/>
681          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
682        </javac-elements>        </javac-elements>
683      </run-tck-tests>      </run-tck-tests>
# Line 740  As of 2013-02, the very latest lambda 8 Line 736  As of 2013-02, the very latest lambda 8
736    
737      <javadoc destdir="${4jdk7docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
738               packagenames="none"               packagenames="none"
739               link="${jdkapi7docs.url}"               link="${java7.api.url}"
740               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
741               access="${build.javadoc.access}"               access="${build.javadoc.access}"
742               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 749  As of 2013-02, the very latest lambda 8 Line 745  As of 2013-02, the very latest lambda 8
745        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
746          <include name="**/*.java"/>          <include name="**/*.java"/>
747        </fileset>        </fileset>
748          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
749        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
750      </javadoc>      </javadoc>
751    </target>    </target>
# Line 767  As of 2013-02, the very latest lambda 8 Line 764  As of 2013-02, the very latest lambda 8
764    </target>    </target>
765    
766    
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
767    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
768            depends="4jdk7clean, 4jdk7jar">            depends="4jdk7clean, 4jdk7jar">
769      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 808  As of 2013-02, the very latest lambda 8 Line 800  As of 2013-02, the very latest lambda 8
800        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
801        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
802        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
803          <compilerarg value="-Werror"/>
804        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
805    
806      </javac>      </javac>
# Line 833  As of 2013-02, the very latest lambda 8 Line 826  As of 2013-02, the very latest lambda 8
826    
827      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
828               packagenames="jsr166x.*"               packagenames="jsr166x.*"
829               link="${jdkapidocs.url}"               link="${java.api.url}"
830               access="${build.javadoc.access}"               access="${build.javadoc.access}"
831               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
832               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
833               source="5"               source="5"
834               executable="${javadoc7}">               executable="${javadoc7}">
835          <arg line="-Xdocrootparent ${java.docroot.url}"/>
836        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
837    
838      </javadoc>      </javadoc>
# Line 858  As of 2013-02, the very latest lambda 8 Line 852  As of 2013-02, the very latest lambda 8
852    </target>    </target>
853    
854    
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
855    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
856            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
857      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 899  As of 2013-02, the very latest lambda 8 Line 887  As of 2013-02, the very latest lambda 8
887        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
888        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
889        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
890          <compilerarg value="-Werror"/>
891        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
892    
893      </javac>      </javac>
# Line 924  As of 2013-02, the very latest lambda 8 Line 913  As of 2013-02, the very latest lambda 8
913    
914      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
915               packagenames="jsr166y.*"               packagenames="jsr166y.*"
916               link="${jdkapidocs.url}"               link="${java.api.url}"
917               access="${build.javadoc.access}"               access="${build.javadoc.access}"
918               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
919               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
920               source="6"               source="6"
921               executable="${javadoc7}">               executable="${javadoc7}">
922          <arg line="-Xdocrootparent ${java.docroot.url}"/>
923        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
924    
925      </javadoc>      </javadoc>
# Line 949  As of 2013-02, the very latest lambda 8 Line 939  As of 2013-02, the very latest lambda 8
939    </target>    </target>
940    
941    
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
942    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
943            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
944      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 990  As of 2013-02, the very latest lambda 8 Line 975  As of 2013-02, the very latest lambda 8
975        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
976        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
977        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
978          <compilerarg value="-Werror"/>
979        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
980    
981      </javac>      </javac>
# Line 1015  As of 2013-02, the very latest lambda 8 Line 1001  As of 2013-02, the very latest lambda 8
1001    
1002      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1003               packagenames="extra166y.*"               packagenames="extra166y.*"
1004               link="${jdkapidocs.url}"               link="${java.api.url}"
1005               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1006               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1007               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1008               source="6"               source="6"
1009               executable="${javadoc7}">               executable="${javadoc7}">
1010          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1011        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1012    
1013      </javadoc>      </javadoc>
# Line 1040  As of 2013-02, the very latest lambda 8 Line 1027  As of 2013-02, the very latest lambda 8
1027    </target>    </target>
1028    
1029    
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1030    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1031            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
1032      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 1057  As of 2013-02, the very latest lambda 8 Line 1039  As of 2013-02, the very latest lambda 8
1039    
1040    <!-- jsr166e -->    <!-- jsr166e -->
1041    
1042      <property name="build.jsr166e.java.version" value="6"/>
1043      <property name="build.jsr166e.javac" value="${javac6}"/>
1044    
1045    <target name="jsr166ecompile"    <target name="jsr166ecompile"
1046            depends="configure-compiler"            depends="configure-compiler"
1047            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 1068  As of 2013-02, the very latest lambda 8 Line 1053  As of 2013-02, the very latest lambda 8
1053             debug="${build.debug}"             debug="${build.debug}"
1054             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1055             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1056             source="7"             source="${build.jsr166e.java.version}"
1057             classpath=""             classpath=""
1058             includeAntRuntime="false"             includeAntRuntime="false"
1059             includeJavaRuntime="false"             includeJavaRuntime="false"
1060             executable="${javac7}"             executable="${build.jsr166e.javac}"
1061             fork="true">             fork="true">
1062    
1063        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1064        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1065        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1066          <compilerarg value="-Werror"/>
1067        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1068    
1069      </javac>      </javac>
1070    </target>    </target>
1071    
1072      <!-- jsr166e: find doclint errors -->
1073      <target name="jsr166edoclint">
1074    
1075        <mkdir dir="${build.jsr166e.classes.dir}"/>
1076    
1077        <javac srcdir="${topsrc.dir}"
1078               destdir="${build.jsr166e.classes.dir}"
1079               debug="${build.debug}"
1080               debuglevel="${build.debuglevel}"
1081               deprecation="${build.deprecation}"
1082               source="${build.jsr166e.java.version}"
1083               classpath=""
1084               bootclasspath="${bootclasspath7}"
1085               includeAntRuntime="false"
1086               includeJavaRuntime="false"
1087               executable="${javac8}"
1088               fork="true">
1089    
1090          <include name="jsr166e/**/*.java"/>
1091          <compilerarg value="-XDignore.symbol.file=true"/>
1092          <compilerarg value="-Xlint:all"/>
1093          <compilerarg value="-Werror"/>
1094          <compilerarg value="-Xdoclint:all/protected"/>
1095    
1096        </javac>
1097      </target>
1098    
1099    
1100    <target name="jsr166ejar"    <target name="jsr166ejar"
1101            depends="jsr166ecompile"            depends="jsr166ecompile"
# Line 1103  As of 2013-02, the very latest lambda 8 Line 1116  As of 2013-02, the very latest lambda 8
1116    
1117      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1118               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1119               link="${jdkapidocs.url}"               link="${java.api.url}"
1120               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1121               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1122               source="7"               source="${build.jsr166e.java.version}"
1123               executable="${javadoc7}">               executable="${javadoc7}">
1124          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1125        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1126    
1127      </javadoc>      </javadoc>
1128    </target>    </target>
1129    
1130    
1131    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck-one-java-version"
1132            depends="jsr166ejar"            depends="jsr166ejar">
1133            description="Runs tck tests for jsr166e">  
1134        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1135    
1136      <run-tck-tests      <run-tck-tests
1137        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1138        target="7"        target="${build.jsr166e.java.version}"
1139        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1140        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1141    </target>    </target>
1142    
1143      <target name="jsr166e-test-tck"
1144              description="Runs tck tests for jsr166e for multiple java versions">
1145    
1146    <!--     <antcall target="clean"/> -->
1147    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1148    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1149    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1150    <!--     </antcall> -->
1151    
1152        <antcall target="clean"/>
1153        <antcall target="jsr166e-test-tck-one-java-version">
1154          <param name="build.jsr166e.java.version" value="7"/>
1155          <param name="build.jsr166e.javac" value="${javac7}"/>
1156        </antcall>
1157    
1158        <antcall target="clean"/>
1159        <antcall target="jsr166e-test-tck-one-java-version">
1160          <param name="build.jsr166e.java.version" value="6"/>
1161          <param name="build.jsr166e.javac" value="${javac6}"/>
1162        </antcall>
1163      </target>
1164    
1165    
1166      <target name="jsr166e-test"
1167              depends="jsr166e-test-tck"
1168              description="Runs all tests for jsr166e">
1169      </target>
1170    
1171    <target name="jsr166edist"    <target name="jsr166edist"
1172            depends="jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1137  As of 2013-02, the very latest lambda 8 Line 1179  As of 2013-02, the very latest lambda 8
1179    </target>    </target>
1180    
1181    
   <target name="jsr166edist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1182    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1183            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1184      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
# Line 1157  As of 2013-02, the very latest lambda 8 Line 1194  As of 2013-02, the very latest lambda 8
1194    
1195    <target name="lint">    <target name="lint">
1196      <antcall target="dists">      <antcall target="dists">
1197          <param name="build.javadoc.access" value="public"/>
1198        </antcall>
1199      </target>
1200    
1201    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1202      <target name="lint-private">
1203        <antcall target="dist">
1204        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1205      </antcall>      </antcall>
1206    </target>    </target>

Legend:
Removed from v.1.140  
changed lines
  Added in v.1.173

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