/[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.158 by jsr166, Sat Jul 12 17:29:12 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.
 As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.  
27  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
28    </description>    </description>
29    
30    <target name="usage" description="Display main targets by running 'ant -projecthelp'">    <!-- Display main targets by running 'ant -projecthelp' -->
31      <target name="usage">
32      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
33        <arg value="-projecthelp" />        <arg value="-projecthelp" />
34      </java>      </java>
# Line 44  As of 2013-02, the very latest lambda 8 Line 46  As of 2013-02, the very latest lambda 8
46    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
47    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
48    
49    <!-- Tck options; see JSR166TestCase.java -->    <!-- Tck options; see JSR166TestCase.java
50    <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->     To profile a single tck test class:
51       ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
52       To stress test a single tck test class:
53       ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
54      -->
55    <property name="jsr166.profileTests"     value="false"/>    <property name="jsr166.profileTests"     value="false"/>
56    <property name="jsr166.profileThreshold" value="100"/>    <property name="jsr166.profileThreshold" value="100"/>
57    <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 -->  
58    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
59    
60    <!-- Build locations -->    <!-- Build locations -->
# Line 114  As of 2013-02, the very latest lambda 8 Line 118  As of 2013-02, the very latest lambda 8
118    <defjdklocations v="6"/>    <defjdklocations v="6"/>
119    <defjdklocations v="7"/>    <defjdklocations v="7"/>
120    <defjdklocations v="8"/>    <defjdklocations v="8"/>
121      <defjdklocations v="9"/>
122    
123    <!-- Source locations -->    <!-- Source locations -->
124    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 154  As of 2013-02, the very latest lambda 8 Line 159  As of 2013-02, the very latest lambda 8
159    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
160    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
161    
162    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
163    <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"/>
164    <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"/>
165    <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"/>
166      <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
167    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <!-- The expected canonical location does not yet exist as of 2014-07 -->
168    <!-- The below does not yet exist as of 2013-01 -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
169    <!-- <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"/>
170      <!-- Default jdk doc location (latest stable release seems best) -->
171      <property name="java.docroot.url"       value="${java8.docroot.url}"/>
172    
173    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
174    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
175      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
176      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
177      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
178      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
179      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
180    
181    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
182    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 183  As of 2013-02, the very latest lambda 8 Line 195  As of 2013-02, the very latest lambda 8
195      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
196      <attribute name="workdir"/>      <attribute name="workdir"/>
197      <attribute name="classes"/>      <attribute name="classes"/>
198      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
199      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
200      <sequential>      <sequential>
201    
# Line 230  As of 2013-02, the very latest lambda 8 Line 242  As of 2013-02, the very latest lambda 8
242    </macrodef>    </macrodef>
243    
244    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
245        <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
246      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
247      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
248      <attribute name="target"/>      <attribute name="target"/>
# Line 268  As of 2013-02, the very latest lambda 8 Line 281  As of 2013-02, the very latest lambda 8
281    
282    <!-- Main targets -->    <!-- Main targets -->
283    
284      <property name="build.main.java.version" value="9"/>
285      <property name="build.main.javac" value="${javac9}"/>
286    
287    <target name="dists"    <target name="dists"
288            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
289            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 302  As of 2013-02, the very latest lambda 8
302             classpath=""             classpath=""
303             includeAntRuntime="false"             includeAntRuntime="false"
304             includeJavaRuntime="false"             includeJavaRuntime="false"
305             executable="${javac8}"             executable="${build.main.javac}"
306             fork="true">             fork="true">
307    
308        <include name="**/*.java"/>        <include name="**/*.java"/>
309        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
310        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
311        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
312          <compilerarg value="-Xdoclint:all/protected"/>
313          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
314        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
315    
316      </javac>      </javac>
# Line 309  As of 2013-02, the very latest lambda 8 Line 327  As of 2013-02, the very latest lambda 8
327    </target>    </target>
328    
329    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
330    <target name="docs"    <target name="docs"
331            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
332    
# Line 325  As of 2013-02, the very latest lambda 8 Line 338  As of 2013-02, the very latest lambda 8
338    
339      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
340               packagenames="none"               packagenames="none"
341               link="${jdkapi8docs.url}"               link="${java9.api.url}"
342               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
343               access="${build.javadoc.access}"               access="${build.javadoc.access}"
344               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk9src.dir}"
345               classpath=""               classpath=""
346               executable="${javadoc8}">               executable="${javadoc9}">
347        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
348          <include name="**/*.java"/>          <include name="**/*.java"/>
349        </fileset>        </fileset>
350          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
351          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
352        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
353        <arg value="-tag"/>        <arg value="-tag"/>
354        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
355          <arg value="-tag"/>
356          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
357          <arg value="-tag"/>
358          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
359          <arg value="-tag"/>
360          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
361      </javadoc>      </javadoc>
362    </target>    </target>
363    
# Line 375  As of 2013-02, the very latest lambda 8 Line 396  As of 2013-02, the very latest lambda 8
396    <target name="dist-clean"    <target name="dist-clean"
397            description="Removes all build and distribution products">            description="Removes all build and distribution products">
398    
399        <delete dir="${build.dir}"/>
400      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
401    
402    </target>    </target>
403    
404    
   <!-- Internal targets -->  
   
   
405    <target name="dist-jar"    <target name="dist-jar"
406            depends="clean, jar">            depends="clean, jar">
407      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 394  As of 2013-02, the very latest lambda 8 Line 413  As of 2013-02, the very latest lambda 8
413    </target>    </target>
414    
415    
   <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>  
   
416    <target name="test-tck"    <target name="test-tck"
417            depends="jar"            depends="jar"
418            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
419    
420      <run-tck-tests      <run-tck-tests
421        target="8"        target="${build.main.java.version}"
422        workdir="${build.dir}"        workdir="${build.dir}"
423        classes="${product.jar}"/>        classes="${product.jar}"/>
424    </target>    </target>
# Line 471  As of 2013-02, the very latest lambda 8 Line 427  As of 2013-02, the very latest lambda 8
427            depends="jar"            depends="jar"
428            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
429      <run-jtreg-tests      <run-jtreg-tests
430         target="8"         target="${build.main.java.version}"
431         workdir="${build.dir}"         workdir="${build.dir}"
432         classes="${product.jar}"/>         classes="${product.jar}"/>
433    </target>    </target>
434    
435    <target name="test-ng"    <target name="test"
436            depends="test-tck, test-jtreg"            depends="test-tck, test-jtreg"
437            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
438    </target>    </target>
439    
440    <target name="run-tests"    <target name="test89"
441            depends="compile-tests">            description="Runs tck and jtreg tests for main for multiple java versions">
   
     <!-- May be overridden by user.properties -->  
     <property name="testcase" value="*"/>  
442    
443      <mkdir dir="${build.reports.dir}"/>      <antcall target="clean"/>
444        <antcall target="test">
445      <junit printsummary="true"        <param name="build.main.java.version" value="8"/>
446               showoutput="true"        <param name="build.main.javac" value="${javac8}"/>
447            errorProperty="junit.failed"      </antcall>
         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>  
 -->  
448    
449      </junit>      <antcall target="clean"/>
450        <antcall target="test">
451          <param name="build.main.java.version" value="9"/>
452          <param name="build.main.javac" value="${javac9}"/>
453        </antcall>
454    
455    </target>    </target>
456    
457    
   <target name="report-tests"  
           depends="run-tests">  
   
     <!-- Sets junit.report.format to frames if redirection is present,  
          otherwise sets it to noframes. -->  
     <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>  
   
     <fail message="Test Cases Failed" if="junit.failed"/>  
   
   </target>  
   
458    
459    <target name="configure-compiler">    <target name="configure-compiler">
460    
# Line 571  As of 2013-02, the very latest lambda 8 Line 473  As of 2013-02, the very latest lambda 8
473    </target>    </target>
474    
475    
   <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>  
   
476    
477    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
478    
# Line 654  As of 2013-02, the very latest lambda 8 Line 533  As of 2013-02, the very latest lambda 8
533      </javac>      </javac>
534    </target>    </target>
535    
536      <target name="4jdk7doclint"
537              depends="configure-compiler"
538              description="Finds doclint warnings">
539    
540        <mkdir dir="${build.4jdk7.classes.dir}"/>
541    
542        <javac srcdir="${4jdk7src.dir}"
543               destdir="${build.4jdk7.classes.dir}"
544               debug="${build.debug}"
545               debuglevel="${build.debuglevel}"
546               deprecation="${build.deprecation}"
547               source="6"
548               classpath=""
549               bootclasspath="${bootclasspath7}"
550               includeAntRuntime="false"
551               includeJavaRuntime="false"
552               executable="${javac8}"
553               fork="true">
554    
555          <include name="**/*.java"/>
556          <compilerarg value="-Xprefer:source"/>
557          <compilerarg value="-XDignore.symbol.file=true"/>
558          <compilerarg value="-Xlint:all"/>
559          <compilerarg value="-Xdoclint:all/protected"/>
560          <compilerarg line="${build.args}"/>
561    
562        </javac>
563      </target>
564    
565    
566    <target name="4jdk7jar"    <target name="4jdk7jar"
567            depends="4jdk7compile"            depends="4jdk7compile"
# Line 677  As of 2013-02, the very latest lambda 8 Line 585  As of 2013-02, the very latest lambda 8
585        <javac-elements>        <javac-elements>
586          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
587          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
588            <exclude name="*9Test.java"/>
589          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
590          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
591          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
592          <exclude name="LongAdderTest.java"/>          <exclude name="LongAdderTest.java"/>
593          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
594            <exclude name="SplittableRandomTest.java"/>
595          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
596        </javac-elements>        </javac-elements>
597      </run-tck-tests>      </run-tck-tests>
# Line 722  As of 2013-02, the very latest lambda 8 Line 632  As of 2013-02, the very latest lambda 8
632      <run-jtreg-tests      <run-jtreg-tests
633         target="7"         target="7"
634         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
635         classes="${4jdk7product.jar}"/>         classes="${4jdk7product.jar}"
636           jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
637    </target>    </target>
638    
639    
# Line 740  As of 2013-02, the very latest lambda 8 Line 651  As of 2013-02, the very latest lambda 8
651    
652      <javadoc destdir="${4jdk7docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
653               packagenames="none"               packagenames="none"
654               link="${jdkapi7docs.url}"               link="${java7.api.url}"
655               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
656               access="${build.javadoc.access}"               access="${build.javadoc.access}"
657               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 749  As of 2013-02, the very latest lambda 8 Line 660  As of 2013-02, the very latest lambda 8
660        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
661          <include name="**/*.java"/>          <include name="**/*.java"/>
662        </fileset>        </fileset>
663          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
664        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
665      </javadoc>      </javadoc>
666    </target>    </target>
# Line 767  As of 2013-02, the very latest lambda 8 Line 679  As of 2013-02, the very latest lambda 8
679    </target>    </target>
680    
681    
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
682    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
683            depends="4jdk7clean, 4jdk7jar">            depends="4jdk7clean, 4jdk7jar">
684      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 833  As of 2013-02, the very latest lambda 8 Line 740  As of 2013-02, the very latest lambda 8
740    
741      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
742               packagenames="jsr166x.*"               packagenames="jsr166x.*"
743               link="${jdkapidocs.url}"               link="${java.api.url}"
744               access="${build.javadoc.access}"               access="${build.javadoc.access}"
745               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
746               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
747               source="5"               source="5"
748               executable="${javadoc7}">               executable="${javadoc7}">
749          <arg line="-Xdocrootparent ${java.docroot.url}"/>
750        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
751    
752      </javadoc>      </javadoc>
# Line 858  As of 2013-02, the very latest lambda 8 Line 766  As of 2013-02, the very latest lambda 8
766    </target>    </target>
767    
768    
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
769    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
770            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
771      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 924  As of 2013-02, the very latest lambda 8 Line 826  As of 2013-02, the very latest lambda 8
826    
827      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
828               packagenames="jsr166y.*"               packagenames="jsr166y.*"
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="6"               source="6"
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 949  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="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
855    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
856            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
857      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 1015  As of 2013-02, the very latest lambda 8 Line 913  As of 2013-02, the very latest lambda 8
913    
914      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
915               packagenames="extra166y.*"               packagenames="extra166y.*"
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 1040  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="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
942    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
943            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
944      <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 951  As of 2013-02, the very latest lambda 8
951    
952    <!-- jsr166e -->    <!-- jsr166e -->
953    
954      <property name="build.jsr166e.java.version" value="6"/>
955      <property name="build.jsr166e.javac" value="${javac6}"/>
956    
957    <target name="jsr166ecompile"    <target name="jsr166ecompile"
958            depends="configure-compiler"            depends="configure-compiler"
959            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 1068  As of 2013-02, the very latest lambda 8 Line 965  As of 2013-02, the very latest lambda 8
965             debug="${build.debug}"             debug="${build.debug}"
966             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
967             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
968             source="7"             source="${build.jsr166e.java.version}"
969             classpath=""             classpath=""
970             includeAntRuntime="false"             includeAntRuntime="false"
971             includeJavaRuntime="false"             includeJavaRuntime="false"
972             executable="${javac7}"             executable="${build.jsr166e.javac}"
973             fork="true">             fork="true">
974    
975        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
# Line 1083  As of 2013-02, the very latest lambda 8 Line 980  As of 2013-02, the very latest lambda 8
980      </javac>      </javac>
981    </target>    </target>
982    
983      <!-- jsr166e: find doclint errors -->
984      <target name="jsr166edoclint">
985    
986        <mkdir dir="${build.jsr166e.classes.dir}"/>
987    
988        <javac srcdir="${topsrc.dir}"
989               destdir="${build.jsr166e.classes.dir}"
990               debug="${build.debug}"
991               debuglevel="${build.debuglevel}"
992               deprecation="${build.deprecation}"
993               source="${build.jsr166e.java.version}"
994               classpath=""
995               bootclasspath="${bootclasspath7}"
996               includeAntRuntime="false"
997               includeJavaRuntime="false"
998               executable="${javac8}"
999               fork="true">
1000    
1001          <include name="jsr166e/**/*.java"/>
1002          <compilerarg value="-XDignore.symbol.file=true"/>
1003          <compilerarg value="-Xlint:all"/>
1004          <compilerarg value="-Xdoclint:all/protected"/>
1005    
1006        </javac>
1007      </target>
1008    
1009    
1010    <target name="jsr166ejar"    <target name="jsr166ejar"
1011            depends="jsr166ecompile"            depends="jsr166ecompile"
# Line 1103  As of 2013-02, the very latest lambda 8 Line 1026  As of 2013-02, the very latest lambda 8
1026    
1027      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1028               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1029               link="${jdkapidocs.url}"               link="${java.api.url}"
1030               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1031               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1032               source="7"               source="${build.jsr166e.java.version}"
1033               executable="${javadoc7}">               executable="${javadoc7}">
1034          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1035        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1036    
1037      </javadoc>      </javadoc>
1038    </target>    </target>
1039    
1040    
1041    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck-one-java-version"
1042            depends="jsr166ejar"            depends="jsr166ejar">
1043            description="Runs tck tests for jsr166e">  
1044        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1045    
1046      <run-tck-tests      <run-tck-tests
1047        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1048        target="7"        target="${build.jsr166e.java.version}"
1049        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1050        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1051    </target>    </target>
1052    
1053      <target name="jsr166e-test-tck"
1054              description="Runs tck tests for jsr166e for multiple java versions">
1055    
1056    <!--     <antcall target="clean"/> -->
1057    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1058    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1059    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1060    <!--     </antcall> -->
1061    
1062        <antcall target="clean"/>
1063        <antcall target="jsr166e-test-tck-one-java-version">
1064          <param name="build.jsr166e.java.version" value="7"/>
1065          <param name="build.jsr166e.javac" value="${javac7}"/>
1066        </antcall>
1067    
1068        <antcall target="clean"/>
1069        <antcall target="jsr166e-test-tck-one-java-version">
1070          <param name="build.jsr166e.java.version" value="6"/>
1071          <param name="build.jsr166e.javac" value="${javac6}"/>
1072        </antcall>
1073      </target>
1074    
1075    
1076      <target name="jsr166e-test"
1077              depends="jsr166e-test-tck"
1078              description="Runs all tests for jsr166e">
1079      </target>
1080    
1081    <target name="jsr166edist"    <target name="jsr166edist"
1082            depends="jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1137  As of 2013-02, the very latest lambda 8 Line 1089  As of 2013-02, the very latest lambda 8
1089    </target>    </target>
1090    
1091    
   <target name="jsr166edist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1092    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1093            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1094      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>

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

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