/[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.159 by jsr166, 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  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"/>
# Line 154  As of 2013-02, the very latest lambda 8 Line 163  As of 2013-02, the very latest lambda 8
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 183  As of 2013-02, the very latest lambda 8 Line 199  As of 2013-02, the very latest lambda 8
199      <attribute name="compile-target" default="@{target}"/>      <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"/>      <element name="javac-elements" optional="true"/>
204      <sequential>      <sequential>
205    
# Line 230  As of 2013-02, the very latest lambda 8 Line 246  As of 2013-02, the very latest lambda 8
246    </macrodef>    </macrodef>
247    
248    <macrodef name="run-jtreg-tests">    <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}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
251      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
252      <attribute name="target"/>      <attribute name="target"/>
# Line 268  As of 2013-02, the very latest lambda 8 Line 285  As of 2013-02, the very latest lambda 8
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 286  As of 2013-02, the very latest lambda 8 Line 306  As of 2013-02, the very latest lambda 8
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"/>        <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 309  As of 2013-02, the very latest lambda 8 Line 331  As of 2013-02, the very latest lambda 8
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    
# Line 325  As of 2013-02, the very latest lambda 8 Line 342  As of 2013-02, the very latest lambda 8
342    
343      <javadoc destdir="${docs.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               access="${build.javadoc.access}"               access="${build.javadoc.access}"
348               sourcepath="${src.dir}:${jdk8src.dir}"               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    
# Line 375  As of 2013-02, the very latest lambda 8 Line 400  As of 2013-02, the very latest lambda 8
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}"/>
# Line 394  As of 2013-02, the very latest lambda 8 Line 417  As of 2013-02, the very latest lambda 8
417    </target>    </target>
418    
419    
   <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>  
   
420    <target name="test-tck"    <target name="test-tck"
421            depends="jar"            depends="jar"
422            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
423    
424      <run-tck-tests      <run-tck-tests
425        target="8"        target="${build.main.java.version}"
426        workdir="${build.dir}"        workdir="${build.dir}"
427        classes="${product.jar}"/>        classes="${product.jar}"/>
428    </target>    </target>
# Line 471  As of 2013-02, the very latest lambda 8 Line 431  As of 2013-02, the very latest lambda 8
431            depends="jar"            depends="jar"
432            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
433      <run-jtreg-tests      <run-jtreg-tests
434         target="8"         target="${build.main.java.version}"
435         workdir="${build.dir}"         workdir="${build.dir}"
436         classes="${product.jar}"/>         classes="${product.jar}"/>
437    </target>    </target>
438    
439    <target name="test-ng"    <target name="test"
440            depends="test-tck, test-jtreg"            depends="test-tck, test-jtreg"
441            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
442    </target>    </target>
443    
444    <target name="run-tests"    <target name="test89"
445            depends="compile-tests">            description="Runs tck and jtreg tests for main for multiple java versions">
446    
447      <!-- May be overridden by user.properties -->      <antcall target="clean"/>
448      <property name="testcase" value="*"/>      <antcall target="test">
449          <param name="build.main.java.version" value="8"/>
450      <mkdir dir="${build.reports.dir}"/>        <param name="build.main.javac" value="${javac8}"/>
451        </antcall>
     <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>  
 -->  
452    
453      </junit>      <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    
   <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>  
   
462    
463    <target name="configure-compiler">    <target name="configure-compiler">
464    
# Line 571  As of 2013-02, the very latest lambda 8 Line 477  As of 2013-02, the very latest lambda 8
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 654  As of 2013-02, the very latest lambda 8 Line 537  As of 2013-02, the very latest lambda 8
537      </javac>      </javac>
538    </target>    </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"/>
562          <compilerarg value="-Xlint:all"/>
563          <compilerarg value="-Xdoclint:all/protected"/>
564          <compilerarg line="${build.args}"/>
565    
566        </javac>
567      </target>
568    
569    
570    <target name="4jdk7jar"    <target name="4jdk7jar"
571            depends="4jdk7compile"            depends="4jdk7compile"
# Line 677  As of 2013-02, the very latest lambda 8 Line 589  As of 2013-02, the very latest lambda 8
589        <javac-elements>        <javac-elements>
590          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
591          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
592            <exclude name="*9Test.java"/>
593          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
594          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
595          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
596          <exclude name="LongAdderTest.java"/>          <exclude name="LongAdderTest.java"/>
597          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
598            <exclude name="SplittableRandomTest.java"/>
599          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
600        </javac-elements>        </javac-elements>
601      </run-tck-tests>      </run-tck-tests>
# Line 722  As of 2013-02, the very latest lambda 8 Line 636  As of 2013-02, the very latest lambda 8
636      <run-jtreg-tests      <run-jtreg-tests
637         target="7"         target="7"
638         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
639         classes="${4jdk7product.jar}"/>         classes="${4jdk7product.jar}"
640           jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
641    </target>    </target>
642    
643    
# Line 740  As of 2013-02, the very latest lambda 8 Line 655  As of 2013-02, the very latest lambda 8
655    
656      <javadoc destdir="${4jdk7docs.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}"               access="${build.javadoc.access}"
661               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 749  As of 2013-02, the very latest lambda 8 Line 664  As of 2013-02, the very latest lambda 8
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>
# Line 767  As of 2013-02, the very latest lambda 8 Line 683  As of 2013-02, the very latest lambda 8
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, 4jdk7jar">            depends="4jdk7clean, 4jdk7jar">
688      <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 744  As of 2013-02, the very latest lambda 8
744    
745      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
746               packagenames="jsr166x.*"               packagenames="jsr166x.*"
747               link="${jdkapidocs.url}"               link="${java.api.url}"
748               access="${build.javadoc.access}"               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 858  As of 2013-02, the very latest lambda 8 Line 770  As of 2013-02, the very latest lambda 8
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, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
775      <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 830  As of 2013-02, the very latest lambda 8
830    
831      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
832               packagenames="jsr166y.*"               packagenames="jsr166y.*"
833               link="${jdkapidocs.url}"               link="${java.api.url}"
834               access="${build.javadoc.access}"               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 949  As of 2013-02, the very latest lambda 8 Line 856  As of 2013-02, the very latest lambda 8
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, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
861      <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 917  As of 2013-02, the very latest lambda 8
917    
918      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
919               packagenames="extra166y.*"               packagenames="extra166y.*"
920               link="${jdkapidocs.url}"               link="${java.api.url}"
921               access="${build.javadoc.access}"               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 1040  As of 2013-02, the very latest lambda 8 Line 943  As of 2013-02, the very latest lambda 8
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, extra166yjar">            depends="extra166yclean, extra166yjar">
948      <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 955  As of 2013-02, the very latest lambda 8
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 1068  As of 2013-02, the very latest lambda 8 Line 969  As of 2013-02, the very latest lambda 8
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 1083  As of 2013-02, the very latest lambda 8 Line 984  As of 2013-02, the very latest lambda 8
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        <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"    <target name="jsr166ejar"
1015            depends="jsr166ecompile"            depends="jsr166ecompile"
# Line 1103  As of 2013-02, the very latest lambda 8 Line 1030  As of 2013-02, the very latest lambda 8
1030    
1031      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1032               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1033               link="${jdkapidocs.url}"               link="${java.api.url}"
1034               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1035               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1036               source="7"               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="jsr166ejar"            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        target="7"        target="${build.jsr166e.java.version}"
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-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1137  As of 2013-02, the very latest lambda 8 Line 1093  As of 2013-02, the very latest lambda 8
1093    </target>    </target>
1094    
1095    
   <target name="jsr166edist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1096    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1097            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1098      <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.159

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