/[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.156 by jsr166, Wed Jun 25 08:29:01 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 -->     Profiling a tck test class:
51       ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
52       Stress test a 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"/>
58    <!-- Allow running an individual tck test class -->    <!-- Stress test an individual tck test class:
59    <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->    ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
60      -->
61    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
62    
63    <!-- Build locations -->    <!-- Build locations -->
# Line 114  As of 2013-02, the very latest lambda 8 Line 121  As of 2013-02, the very latest lambda 8
121    <defjdklocations v="6"/>    <defjdklocations v="6"/>
122    <defjdklocations v="7"/>    <defjdklocations v="7"/>
123    <defjdklocations v="8"/>    <defjdklocations v="8"/>
124      <defjdklocations v="9"/>
125    
126    <!-- Source locations -->    <!-- Source locations -->
127    <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 162  As of 2013-02, the very latest lambda 8
162    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
163    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
164    
165    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
166    <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"/>
167    <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"/>
168    <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"/>
169      <!-- The expected canonical location does not yet exist as of 2014-02 -->
170    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> -->
171    <!-- The below does not yet exist as of 2013-01 -->    <property name="java8.docroot.url"      value="http://download.java.net/jdk8/docs"/>
172    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <!-- No published jdk9 docs exist as of 2014-02 -->
173      <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
174      <property name="java9.docroot.url"      value="${java8.docroot.url}"/>
175      <!-- Default jdk doc location (latest stable release seems best) -->
176      <property name="java.docroot.url"       value="${java7.docroot.url}"/>
177    
178    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
179    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
180      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
181      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
182      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
183      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
184      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
185    
186    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
187    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 183  As of 2013-02, the very latest lambda 8 Line 200  As of 2013-02, the very latest lambda 8
200      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
201      <attribute name="workdir"/>      <attribute name="workdir"/>
202      <attribute name="classes"/>      <attribute name="classes"/>
203      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
204      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
205      <sequential>      <sequential>
206    
# Line 230  As of 2013-02, the very latest lambda 8 Line 247  As of 2013-02, the very latest lambda 8
247    </macrodef>    </macrodef>
248    
249    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
250        <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
251      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
252      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
253      <attribute name="target"/>      <attribute name="target"/>
# Line 268  As of 2013-02, the very latest lambda 8 Line 286  As of 2013-02, the very latest lambda 8
286    
287    <!-- Main targets -->    <!-- Main targets -->
288    
289      <property name="build.main.java.version" value="9"/>
290      <property name="build.main.javac" value="${javac9}"/>
291    
292    <target name="dists"    <target name="dists"
293            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
294            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 307  As of 2013-02, the very latest lambda 8
307             classpath=""             classpath=""
308             includeAntRuntime="false"             includeAntRuntime="false"
309             includeJavaRuntime="false"             includeJavaRuntime="false"
310             executable="${javac8}"             executable="${build.main.javac}"
311             fork="true">             fork="true">
312    
313        <include name="**/*.java"/>        <include name="**/*.java"/>
314        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
315        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
316        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
317          <compilerarg value="-Xdoclint:all/protected"/>
318          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
319        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
320    
321      </javac>      </javac>
# Line 309  As of 2013-02, the very latest lambda 8 Line 332  As of 2013-02, the very latest lambda 8
332    </target>    </target>
333    
334    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
335    <target name="docs"    <target name="docs"
336            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
337    
# Line 325  As of 2013-02, the very latest lambda 8 Line 343  As of 2013-02, the very latest lambda 8
343    
344      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
345               packagenames="none"               packagenames="none"
346               link="${jdkapi8docs.url}"               link="${java9.api.url}"
347               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
348               access="${build.javadoc.access}"               access="${build.javadoc.access}"
349               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk9src.dir}"
350               classpath=""               classpath=""
351               executable="${javadoc8}">               executable="${javadoc9}">
352        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
353          <include name="**/*.java"/>          <include name="**/*.java"/>
354        </fileset>        </fileset>
355          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
356          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
357        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
358        <arg value="-tag"/>        <arg value="-tag"/>
359        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
360          <arg value="-tag"/>
361          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
362          <arg value="-tag"/>
363          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
364          <arg value="-tag"/>
365          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
366      </javadoc>      </javadoc>
367    </target>    </target>
368    
# Line 375  As of 2013-02, the very latest lambda 8 Line 401  As of 2013-02, the very latest lambda 8
401    <target name="dist-clean"    <target name="dist-clean"
402            description="Removes all build and distribution products">            description="Removes all build and distribution products">
403    
404        <delete dir="${build.dir}"/>
405      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
406    
407    </target>    </target>
408    
409    
   <!-- Internal targets -->  
   
   
410    <target name="dist-jar"    <target name="dist-jar"
411            depends="clean, jar">            depends="clean, jar">
412      <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 418  As of 2013-02, the very latest lambda 8
418    </target>    </target>
419    
420    
   <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>  
   
421    <target name="test-tck"    <target name="test-tck"
422            depends="jar"            depends="jar"
423            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
424    
425      <run-tck-tests      <run-tck-tests
426        target="8"        target="${build.main.java.version}"
427        workdir="${build.dir}"        workdir="${build.dir}"
428        classes="${product.jar}"/>        classes="${product.jar}"/>
429    </target>    </target>
# Line 471  As of 2013-02, the very latest lambda 8 Line 432  As of 2013-02, the very latest lambda 8
432            depends="jar"            depends="jar"
433            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
434      <run-jtreg-tests      <run-jtreg-tests
435         target="8"         target="${build.main.java.version}"
436         workdir="${build.dir}"         workdir="${build.dir}"
437         classes="${product.jar}"/>         classes="${product.jar}"/>
438    </target>    </target>
439    
440    <target name="test-ng"    <target name="test"
441            depends="test-tck, test-jtreg"            depends="test-tck, test-jtreg"
442            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
443    </target>    </target>
444    
445    <target name="run-tests"    <target name="test89"
446            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="*"/>  
447    
448      <mkdir dir="${build.reports.dir}"/>      <antcall target="clean"/>
449        <antcall target="test">
450      <junit printsummary="true"        <param name="build.main.java.version" value="8"/>
451               showoutput="true"        <param name="build.main.javac" value="${javac8}"/>
452            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>  
 -->  
453    
454      </junit>      <antcall target="clean"/>
455        <antcall target="test">
456          <param name="build.main.java.version" value="9"/>
457          <param name="build.main.javac" value="${javac9}"/>
458        </antcall>
459    
460    </target>    </target>
461    
462    
   <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>  
   
463    
464    <target name="configure-compiler">    <target name="configure-compiler">
465    
# Line 571  As of 2013-02, the very latest lambda 8 Line 478  As of 2013-02, the very latest lambda 8
478    </target>    </target>
479    
480    
   <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>  
   
481    
482    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
483    
# Line 654  As of 2013-02, the very latest lambda 8 Line 538  As of 2013-02, the very latest lambda 8
538      </javac>      </javac>
539    </target>    </target>
540    
541      <target name="4jdk7doclint"
542              depends="configure-compiler"
543              description="Finds doclint warnings">
544    
545        <mkdir dir="${build.4jdk7.classes.dir}"/>
546    
547        <javac srcdir="${4jdk7src.dir}"
548               destdir="${build.4jdk7.classes.dir}"
549               debug="${build.debug}"
550               debuglevel="${build.debuglevel}"
551               deprecation="${build.deprecation}"
552               source="6"
553               classpath=""
554               bootclasspath="${bootclasspath7}"
555               includeAntRuntime="false"
556               includeJavaRuntime="false"
557               executable="${javac8}"
558               fork="true">
559    
560          <include name="**/*.java"/>
561          <compilerarg value="-Xprefer:source"/>
562          <compilerarg value="-XDignore.symbol.file=true"/>
563          <compilerarg value="-Xlint:all"/>
564          <compilerarg value="-Xdoclint:all/protected"/>
565          <compilerarg line="${build.args}"/>
566    
567        </javac>
568      </target>
569    
570    
571    <target name="4jdk7jar"    <target name="4jdk7jar"
572            depends="4jdk7compile"            depends="4jdk7compile"
# Line 677  As of 2013-02, the very latest lambda 8 Line 590  As of 2013-02, the very latest lambda 8
590        <javac-elements>        <javac-elements>
591          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
592          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
593            <exclude name="*9Test.java"/>
594          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
595          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
596          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
597          <exclude name="LongAdderTest.java"/>          <exclude name="LongAdderTest.java"/>
598          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
599            <exclude name="SplittableRandomTest.java"/>
600          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
601        </javac-elements>        </javac-elements>
602      </run-tck-tests>      </run-tck-tests>
# Line 722  As of 2013-02, the very latest lambda 8 Line 637  As of 2013-02, the very latest lambda 8
637      <run-jtreg-tests      <run-jtreg-tests
638         target="7"         target="7"
639         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
640         classes="${4jdk7product.jar}"/>         classes="${4jdk7product.jar}"
641           jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
642    </target>    </target>
643    
644    
# Line 740  As of 2013-02, the very latest lambda 8 Line 656  As of 2013-02, the very latest lambda 8
656    
657      <javadoc destdir="${4jdk7docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
658               packagenames="none"               packagenames="none"
659               link="${jdkapi7docs.url}"               link="${java7.api.url}"
660               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
661               access="${build.javadoc.access}"               access="${build.javadoc.access}"
662               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 749  As of 2013-02, the very latest lambda 8 Line 665  As of 2013-02, the very latest lambda 8
665        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
666          <include name="**/*.java"/>          <include name="**/*.java"/>
667        </fileset>        </fileset>
668          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
669        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
670      </javadoc>      </javadoc>
671    </target>    </target>
# Line 767  As of 2013-02, the very latest lambda 8 Line 684  As of 2013-02, the very latest lambda 8
684    </target>    </target>
685    
686    
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
687    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
688            depends="4jdk7clean, 4jdk7jar">            depends="4jdk7clean, 4jdk7jar">
689      <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 745  As of 2013-02, the very latest lambda 8
745    
746      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
747               packagenames="jsr166x.*"               packagenames="jsr166x.*"
748               link="${jdkapidocs.url}"               link="${java.api.url}"
749               access="${build.javadoc.access}"               access="${build.javadoc.access}"
750               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
751               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
752               source="5"               source="5"
753               executable="${javadoc7}">               executable="${javadoc7}">
754          <arg line="-Xdocrootparent ${java.docroot.url}"/>
755        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
756    
757      </javadoc>      </javadoc>
# Line 858  As of 2013-02, the very latest lambda 8 Line 771  As of 2013-02, the very latest lambda 8
771    </target>    </target>
772    
773    
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
774    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
775            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
776      <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 831  As of 2013-02, the very latest lambda 8
831    
832      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
833               packagenames="jsr166y.*"               packagenames="jsr166y.*"
834               link="${jdkapidocs.url}"               link="${java.api.url}"
835               access="${build.javadoc.access}"               access="${build.javadoc.access}"
836               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
837               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
838               source="6"               source="6"
839               executable="${javadoc7}">               executable="${javadoc7}">
840          <arg line="-Xdocrootparent ${java.docroot.url}"/>
841        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
842    
843      </javadoc>      </javadoc>
# Line 949  As of 2013-02, the very latest lambda 8 Line 857  As of 2013-02, the very latest lambda 8
857    </target>    </target>
858    
859    
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
860    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
861            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
862      <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 918  As of 2013-02, the very latest lambda 8
918    
919      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
920               packagenames="extra166y.*"               packagenames="extra166y.*"
921               link="${jdkapidocs.url}"               link="${java.api.url}"
922               access="${build.javadoc.access}"               access="${build.javadoc.access}"
923               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
924               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
925               source="6"               source="6"
926               executable="${javadoc7}">               executable="${javadoc7}">
927          <arg line="-Xdocrootparent ${java.docroot.url}"/>
928        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
929    
930      </javadoc>      </javadoc>
# Line 1040  As of 2013-02, the very latest lambda 8 Line 944  As of 2013-02, the very latest lambda 8
944    </target>    </target>
945    
946    
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
947    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
948            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
949      <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 956  As of 2013-02, the very latest lambda 8
956    
957    <!-- jsr166e -->    <!-- jsr166e -->
958    
959      <property name="build.jsr166e.java.version" value="6"/>
960      <property name="build.jsr166e.javac" value="${javac6}"/>
961    
962    <target name="jsr166ecompile"    <target name="jsr166ecompile"
963            depends="configure-compiler"            depends="configure-compiler"
964            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 1068  As of 2013-02, the very latest lambda 8 Line 970  As of 2013-02, the very latest lambda 8
970             debug="${build.debug}"             debug="${build.debug}"
971             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
972             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
973             source="7"             source="${build.jsr166e.java.version}"
974             classpath=""             classpath=""
975             includeAntRuntime="false"             includeAntRuntime="false"
976             includeJavaRuntime="false"             includeJavaRuntime="false"
977             executable="${javac7}"             executable="${build.jsr166e.javac}"
978             fork="true">             fork="true">
979    
980        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
# Line 1083  As of 2013-02, the very latest lambda 8 Line 985  As of 2013-02, the very latest lambda 8
985      </javac>      </javac>
986    </target>    </target>
987    
988      <!-- jsr166e: find doclint errors -->
989      <target name="jsr166edoclint">
990    
991        <mkdir dir="${build.jsr166e.classes.dir}"/>
992    
993        <javac srcdir="${topsrc.dir}"
994               destdir="${build.jsr166e.classes.dir}"
995               debug="${build.debug}"
996               debuglevel="${build.debuglevel}"
997               deprecation="${build.deprecation}"
998               source="${build.jsr166e.java.version}"
999               classpath=""
1000               bootclasspath="${bootclasspath7}"
1001               includeAntRuntime="false"
1002               includeJavaRuntime="false"
1003               executable="${javac8}"
1004               fork="true">
1005    
1006          <include name="jsr166e/**/*.java"/>
1007          <compilerarg value="-XDignore.symbol.file=true"/>
1008          <compilerarg value="-Xlint:all"/>
1009          <compilerarg value="-Xdoclint:all/protected"/>
1010    
1011        </javac>
1012      </target>
1013    
1014    
1015    <target name="jsr166ejar"    <target name="jsr166ejar"
1016            depends="jsr166ecompile"            depends="jsr166ecompile"
# Line 1103  As of 2013-02, the very latest lambda 8 Line 1031  As of 2013-02, the very latest lambda 8
1031    
1032      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1033               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1034               link="${jdkapidocs.url}"               link="${java.api.url}"
1035               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1036               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1037               source="7"               source="${build.jsr166e.java.version}"
1038               executable="${javadoc7}">               executable="${javadoc7}">
1039          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1040        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1041    
1042      </javadoc>      </javadoc>
1043    </target>    </target>
1044    
1045    
1046    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck-one-java-version"
1047            depends="jsr166ejar"            depends="jsr166ejar">
1048            description="Runs tck tests for jsr166e">  
1049        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1050    
1051      <run-tck-tests      <run-tck-tests
1052        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1053        target="7"        target="${build.jsr166e.java.version}"
1054        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1055        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1056    </target>    </target>
1057    
1058      <target name="jsr166e-test-tck"
1059              description="Runs tck tests for jsr166e for multiple java versions">
1060    
1061    <!--     <antcall target="clean"/> -->
1062    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1063    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1064    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1065    <!--     </antcall> -->
1066    
1067        <antcall target="clean"/>
1068        <antcall target="jsr166e-test-tck-one-java-version">
1069          <param name="build.jsr166e.java.version" value="7"/>
1070          <param name="build.jsr166e.javac" value="${javac7}"/>
1071        </antcall>
1072    
1073        <antcall target="clean"/>
1074        <antcall target="jsr166e-test-tck-one-java-version">
1075          <param name="build.jsr166e.java.version" value="6"/>
1076          <param name="build.jsr166e.javac" value="${javac6}"/>
1077        </antcall>
1078      </target>
1079    
1080    
1081      <target name="jsr166e-test"
1082              depends="jsr166e-test-tck"
1083              description="Runs all tests for jsr166e">
1084      </target>
1085    
1086    <target name="jsr166edist"    <target name="jsr166edist"
1087            depends="jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1137  As of 2013-02, the very latest lambda 8 Line 1094  As of 2013-02, the very latest lambda 8
1094    </target>    </target>
1095    
1096    
   <target name="jsr166edist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1097    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1098            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1099      <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.156

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