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

Diff of /jsr166/build.xml

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

revision 1.133 by jsr166, Sun Feb 3 02:16:08 2013 UTC revision 1.152 by jsr166, Tue Feb 25 16:33:15 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 -->
50      <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
51      <property name="jsr166.profileTests"     value="false"/>
52      <property name="jsr166.profileThreshold" value="100"/>
53      <property name="jsr166.runsPerTest"      value="1"/>
54      <!-- Allow running an individual tck test class -->
55      <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
56      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
57    
58    <!-- Build locations -->    <!-- Build locations -->
59    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
60    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
# Line 105  As of 2013-02, the very latest lambda 8 Line 116  As of 2013-02, the very latest lambda 8
116    <defjdklocations v="6"/>    <defjdklocations v="6"/>
117    <defjdklocations v="7"/>    <defjdklocations v="7"/>
118    <defjdklocations v="8"/>    <defjdklocations v="8"/>
119      <defjdklocations v="9"/>
120    
121    <!-- Source locations -->    <!-- Source locations -->
122    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 145  As of 2013-02, the very latest lambda 8 Line 157  As of 2013-02, the very latest lambda 8
157    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
158    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
159    
160    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
161    <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"/>
162    <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"/>
163    <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"/>
164      <!-- The expected canonical location does not yet exist as of 2014-02 -->
165    <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"/> -->
166    <!-- The below does not yet exist as of 2013-01 -->    <property name="java8.docroot.url"      value="http://download.java.net/jdk8/docs"/>
167    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <!-- No published jdk9 docs exist as of 2014-02 -->
168      <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
169      <property name="java9.docroot.url"      value="${java8.docroot.url}"/>
170      <!-- Default jdk doc location (latest stable release seems best) -->
171      <property name="java.docroot.url"       value="${java7.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 170  As of 2013-02, the very latest lambda 8 Line 191  As of 2013-02, the very latest lambda 8
191    
192    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
193      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
194      <attribute name="target"/>      <attribute name="target"/>
195        <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=""/>
# Line 185  As of 2013-02, the very latest lambda 8 Line 206  As of 2013-02, the very latest lambda 8
206             debug="${build.debug}"             debug="${build.debug}"
207             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
208             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
209             source="@{source}"             source="@{compile-target}"
210               target="@{compile-target}"
211             classpath="${junit.jar}"             classpath="${junit.jar}"
212             bootclasspath="@{classes}:${bootclasspath@{source}}"             bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
213             includeAntRuntime="false"             includeAntRuntime="false"
214             includeJavaRuntime="false"             includeJavaRuntime="false"
215             executable="${javac@{target}}"             executable="${javac@{compile-target}}"
216             fork="true">             fork="true">
217    
218        <include name="*.java"/>        <include name="*.java"/>
# Line 201  As of 2013-02, the very latest lambda 8 Line 223  As of 2013-02, the very latest lambda 8
223    
224      </javac>      </javac>
225    
226      <java classname="JSR166TestCase"      <java classname="${jsr166.tckTestClass}"
227            failonerror="true"            failonerror="true"
228            jvm="${java@{target}}"            jvm="${java@{target}}"
229            fork="true">            fork="true">
230          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
231          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
232            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
233            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
234            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
235          <classpath>          <classpath>
236            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
237            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 216  As of 2013-02, the very latest lambda 8 Line 241  As of 2013-02, the very latest lambda 8
241      </sequential>      </sequential>
242    </macrodef>    </macrodef>
243    
244      <macrodef name="run-jtreg-tests">
245        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
246        <attribute name="source" default="7"/>
247        <attribute name="target"/>
248        <attribute name="workdir"/>
249        <attribute name="classes"/>
250        <attribute name="jtregflags" default=""/>
251        <sequential>
252        <delete dir="@{workdir}/JTwork"   quiet="true"/>
253        <delete dir="@{workdir}/JTreport" quiet="true"/>
254        <mkdir dir="@{workdir}/JTwork/scratch"/>
255        <mkdir dir="@{workdir}/JTreport"/>
256        <jtreg dir="@{jtreg.src.dir}"
257               jdk="${jdk@{target}.home}"
258               workDir="@{workdir}/JTwork"
259               reportDir="@{workdir}/JTreport">
260    
261          <arg value="-Xbootclasspath/p:@{classes}"/>
262          <arg value="-agentvm"/>
263          <arg value="-v:nopass,fail"/>
264          <arg value="-vmoptions:-esa -ea"/>
265          <arg value="-automatic"/>
266          <arg value="-k:!ignore"/>
267          <arg line="@{jtregflags}"/>
268        </jtreg>
269        </sequential>
270      </macrodef>
271    
272    <!-- ALoops classpath -->    <!-- ALoops classpath -->
273    <path id="loops.classpath">    <path id="loops.classpath">
274      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 227  As of 2013-02, the very latest lambda 8 Line 280  As of 2013-02, the very latest lambda 8
280    
281    <!-- Main targets -->    <!-- Main targets -->
282    
283      <property name="build.main.java.version" value="9"/>
284      <property name="build.main.javac" value="${javac9}"/>
285    
286    <target name="dists"    <target name="dists"
287            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
288            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
# Line 245  As of 2013-02, the very latest lambda 8 Line 301  As of 2013-02, the very latest lambda 8
301             classpath=""             classpath=""
302             includeAntRuntime="false"             includeAntRuntime="false"
303             includeJavaRuntime="false"             includeJavaRuntime="false"
304             executable="${javac8}"             executable="${build.main.javac}"
305             fork="true">             fork="true">
306    
307        <include name="**/*.java"/>        <include name="**/*.java"/>
308        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
309        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
310        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
311          <compilerarg value="-Xdoclint:all/protected"/>
312          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
313        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
314    
315      </javac>      </javac>
# Line 268  As of 2013-02, the very latest lambda 8 Line 326  As of 2013-02, the very latest lambda 8
326    </target>    </target>
327    
328    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
329    <target name="docs"    <target name="docs"
330            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
331    
# Line 284  As of 2013-02, the very latest lambda 8 Line 337  As of 2013-02, the very latest lambda 8
337    
338      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
339               packagenames="none"               packagenames="none"
340               link="${jdkapi8docs.url}"               link="${java9.api.url}"
341               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
342               access="${build.javadoc.access}"               access="${build.javadoc.access}"
343               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk9src.dir}"
344               classpath=""               classpath=""
345               executable="${javadoc8}">               executable="${javadoc9}">
346        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
347          <include name="**/*.java"/>          <include name="**/*.java"/>
348        </fileset>        </fileset>
349          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
350          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
352        <arg value="-tag"/>        <arg value="-tag"/>
353        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
354          <arg value="-tag"/>
355          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
356          <arg value="-tag"/>
357          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
358          <arg value="-tag"/>
359          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
360      </javadoc>      </javadoc>
361    </target>    </target>
362    
# Line 334  As of 2013-02, the very latest lambda 8 Line 395  As of 2013-02, the very latest lambda 8
395    <target name="dist-clean"    <target name="dist-clean"
396            description="Removes all build and distribution products">            description="Removes all build and distribution products">
397    
398        <delete dir="${build.dir}"/>
399      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
400    
401    </target>    </target>
402    
403    
   <!-- Internal targets -->  
   
   
404    <target name="dist-jar"    <target name="dist-jar"
405            depends="clean, jar">            depends="clean, jar">
406      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 353  As of 2013-02, the very latest lambda 8 Line 412  As of 2013-02, the very latest lambda 8
412    </target>    </target>
413    
414    
   <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>  
   
415    <target name="test-tck"    <target name="test-tck"
416            depends="jar"            depends="jar"
417            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
418    
419      <run-tck-tests      <run-tck-tests
420        target="8"        target="${build.main.java.version}"
421        workdir="${build.dir}"        workdir="${build.dir}"
422        classes="${product.jar}"/>        classes="${product.jar}"/>
423    </target>    </target>
424    
425    <target name="run-tests"    <target name="test-jtreg"
426            depends="compile-tests">            depends="jar"
427              description="Runs jtreg tests for main using the jtreg ant task">
428      <!-- May be overridden by user.properties -->      <run-jtreg-tests
429      <property name="testcase" value="*"/>         target="${build.main.java.version}"
430           workdir="${build.dir}"
431      <mkdir dir="${build.reports.dir}"/>         classes="${product.jar}"/>
   
     <junit printsummary="true"  
              showoutput="true"  
           errorProperty="junit.failed"  
         failureProperty="junit.failed"  
                     dir="${build.reports.dir}"  
                     jvm="${java8}"  
                    fork="true">  
   
       <jvmarg value="-Xbootclasspath/p:${product.jar}"/>  
       <jvmarg value="-server"/>  
       <jvmarg value="-showversion"/>  
   
       <classpath refid="test.classpath"/>  
   
       <formatter type="xml"/>  
   
       <batchtest todir="${build.reports.dir}" unless="no.test.tck">  
         <fileset dir="${tck.src.dir}">  
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
   
       <batchtest todir="${build.reports.dir}" if="do.test.old">  
         <fileset dir="${test.src.dir}">  
           <include name="jsr166/test/**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
   
 <!--  
       <batchtest todir="${build.reports.dir}" if="do.test.jtreg">  
         <fileset dir="${jtreg.src.dir}">  
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
 -->  
   
     </junit>  
   
432    </target>    </target>
433    
434      <target name="test"
435              depends="test-tck, test-jtreg"
436              description="Runs tck and jtreg tests for main">
437      </target>
438    
439    <target name="report-tests"    <target name="test89"
440            depends="run-tests">            description="Runs tck and jtreg tests for main for multiple java versions">
441    
442      <!-- Sets junit.report.format to frames if redirection is present,      <antcall target="clean"/>
443           otherwise sets it to noframes. -->      <antcall target="test">
444      <available property="junit.report.format"        <param name="build.main.java.version" value="8"/>
445                    value="frames"        <param name="build.main.javac" value="${javac8}"/>
446                classname="org.apache.xalan.lib.Redirect"      </antcall>
     />  
     <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>  
447    
448      <fail message="Test Cases Failed" if="junit.failed"/>      <antcall target="clean"/>
449        <antcall target="test">
450          <param name="build.main.java.version" value="9"/>
451          <param name="build.main.javac" value="${javac9}"/>
452        </antcall>
453    
454    </target>    </target>
455    
456    
457    
458    <target name="configure-compiler">    <target name="configure-compiler">
459    
460      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 516  As of 2013-02, the very latest lambda 8 Line 472  As of 2013-02, the very latest lambda 8
472    </target>    </target>
473    
474    
   <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>  
   
475    
476    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
477    
# Line 599  As of 2013-02, the very latest lambda 8 Line 532  As of 2013-02, the very latest lambda 8
532      </javac>      </javac>
533    </target>    </target>
534    
535      <target name="4jdk7doclint"
536              depends="configure-compiler"
537              description="Finds doclint warnings">
538    
539        <mkdir dir="${build.4jdk7.classes.dir}"/>
540    
541        <javac srcdir="${4jdk7src.dir}"
542               destdir="${build.4jdk7.classes.dir}"
543               debug="${build.debug}"
544               debuglevel="${build.debuglevel}"
545               deprecation="${build.deprecation}"
546               source="6"
547               classpath=""
548               bootclasspath="${bootclasspath7}"
549               includeAntRuntime="false"
550               includeJavaRuntime="false"
551               executable="${javac8}"
552               fork="true">
553    
554          <include name="**/*.java"/>
555          <compilerarg value="-Xprefer:source"/>
556          <compilerarg value="-XDignore.symbol.file=true"/>
557          <compilerarg value="-Xlint:all"/>
558          <compilerarg value="-Xdoclint:all/protected"/>
559          <compilerarg line="${build.args}"/>
560    
561        </javac>
562      </target>
563    
564    
565    <target name="4jdk7jar"    <target name="4jdk7jar"
566            depends="4jdk7compile"            depends="4jdk7compile"
# Line 620  As of 2013-02, the very latest lambda 8 Line 582  As of 2013-02, the very latest lambda 8
582        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
583        classes="${4jdk7product.jar}">        classes="${4jdk7product.jar}">
584        <javac-elements>        <javac-elements>
585            <!-- JDK8+ test classes -->
586            <exclude name="*8Test.java"/>
587            <exclude name="*9Test.java"/>
588            <exclude name="DoubleAccumulatorTest.java"/>
589            <exclude name="DoubleAdderTest.java"/>
590            <exclude name="LongAccumulatorTest.java"/>
591            <exclude name="LongAdderTest.java"/>
592            <exclude name="CompletableFutureTest.java"/>
593            <exclude name="SplittableRandomTest.java"/>
594          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
595        </javac-elements>        </javac-elements>
596      </run-tck-tests>      </run-tck-tests>
# Line 648  As of 2013-02, the very latest lambda 8 Line 619  As of 2013-02, the very latest lambda 8
619    
620        <formatter type="brief"/>        <formatter type="brief"/>
621    
622        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
623        </test>        </test>
624    
625      </junit>      </junit>
626    </target>    </target>
627    
628    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
629            depends="4jdk7compile"            depends="4jdk7jar"
630            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
631      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
632      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
633      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
634      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"
635      <jtreg dir="${jtreg.src.dir}"         jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
            jdk="${jdk7.home}"  
            workDir="${build.4jdk7.dir}/JTwork"  
            reportDir="${build.4jdk7.dir}/JTreport">  
   
       <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>  
       <arg value="-agentvm"/>  
       <arg value="-v:nopass,fail"/>  
       <arg value="-vmoptions:-esa -ea"/>  
       <arg value="-automatic"/>  
       <arg value="-k:!ignore"/>  
     </jtreg>  
636    </target>    </target>
637    
638    
# Line 690  As of 2013-02, the very latest lambda 8 Line 650  As of 2013-02, the very latest lambda 8
650    
651      <javadoc destdir="${4jdk7docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
652               packagenames="none"               packagenames="none"
653               link="${jdkapi7docs.url}"               link="${java7.api.url}"
654               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
655               access="${build.javadoc.access}"               access="${build.javadoc.access}"
656               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 699  As of 2013-02, the very latest lambda 8 Line 659  As of 2013-02, the very latest lambda 8
659        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
660          <include name="**/*.java"/>          <include name="**/*.java"/>
661        </fileset>        </fileset>
662          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
663        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
664      </javadoc>      </javadoc>
665    </target>    </target>
# Line 717  As of 2013-02, the very latest lambda 8 Line 678  As of 2013-02, the very latest lambda 8
678    </target>    </target>
679    
680    
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
681    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
682            depends="4jdk7clean, 4jdk7jar">            depends="4jdk7clean, 4jdk7jar">
683      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 783  As of 2013-02, the very latest lambda 8 Line 739  As of 2013-02, the very latest lambda 8
739    
740      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
741               packagenames="jsr166x.*"               packagenames="jsr166x.*"
742               link="${jdkapidocs.url}"               link="${java.api.url}"
743               access="${build.javadoc.access}"               access="${build.javadoc.access}"
744               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
745               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
746               source="5"               source="5"
747               executable="${javadoc7}">               executable="${javadoc7}">
748          <arg line="-Xdocrootparent ${java.docroot.url}"/>
749        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
750    
751      </javadoc>      </javadoc>
# Line 808  As of 2013-02, the very latest lambda 8 Line 765  As of 2013-02, the very latest lambda 8
765    </target>    </target>
766    
767    
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
768    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
769            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
770      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 874  As of 2013-02, the very latest lambda 8 Line 825  As of 2013-02, the very latest lambda 8
825    
826      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
827               packagenames="jsr166y.*"               packagenames="jsr166y.*"
828               link="${jdkapidocs.url}"               link="${java.api.url}"
829               access="${build.javadoc.access}"               access="${build.javadoc.access}"
830               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
831               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
832               source="6"               source="6"
833               executable="${javadoc7}">               executable="${javadoc7}">
834          <arg line="-Xdocrootparent ${java.docroot.url}"/>
835        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
836    
837      </javadoc>      </javadoc>
# Line 899  As of 2013-02, the very latest lambda 8 Line 851  As of 2013-02, the very latest lambda 8
851    </target>    </target>
852    
853    
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
854    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
855            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
856      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 965  As of 2013-02, the very latest lambda 8 Line 912  As of 2013-02, the very latest lambda 8
912    
913      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
914               packagenames="extra166y.*"               packagenames="extra166y.*"
915               link="${jdkapidocs.url}"               link="${java.api.url}"
916               access="${build.javadoc.access}"               access="${build.javadoc.access}"
917               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
918               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
919               source="6"               source="6"
920               executable="${javadoc7}">               executable="${javadoc7}">
921          <arg line="-Xdocrootparent ${java.docroot.url}"/>
922        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
923    
924      </javadoc>      </javadoc>
# Line 990  As of 2013-02, the very latest lambda 8 Line 938  As of 2013-02, the very latest lambda 8
938    </target>    </target>
939    
940    
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
941    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
942            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
943      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 1007  As of 2013-02, the very latest lambda 8 Line 950  As of 2013-02, the very latest lambda 8
950    
951    <!-- jsr166e -->    <!-- jsr166e -->
952    
953      <property name="build.jsr166e.java.version" value="6"/>
954      <property name="build.jsr166e.javac" value="${javac6}"/>
955    
956    <target name="jsr166ecompile"    <target name="jsr166ecompile"
957            depends="configure-compiler"            depends="configure-compiler"
958            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 1018  As of 2013-02, the very latest lambda 8 Line 964  As of 2013-02, the very latest lambda 8
964             debug="${build.debug}"             debug="${build.debug}"
965             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
966             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
967             source="7"             source="${build.jsr166e.java.version}"
968             classpath=""             classpath=""
969             includeAntRuntime="false"             includeAntRuntime="false"
970             includeJavaRuntime="false"             includeJavaRuntime="false"
971             executable="${javac7}"             executable="${build.jsr166e.javac}"
972             fork="true">             fork="true">
973    
974        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
# Line 1033  As of 2013-02, the very latest lambda 8 Line 979  As of 2013-02, the very latest lambda 8
979      </javac>      </javac>
980    </target>    </target>
981    
982      <!-- jsr166e: find doclint errors -->
983      <target name="jsr166edoclint">
984    
985        <mkdir dir="${build.jsr166e.classes.dir}"/>
986    
987        <javac srcdir="${topsrc.dir}"
988               destdir="${build.jsr166e.classes.dir}"
989               debug="${build.debug}"
990               debuglevel="${build.debuglevel}"
991               deprecation="${build.deprecation}"
992               source="${build.jsr166e.java.version}"
993               classpath=""
994               bootclasspath="${bootclasspath7}"
995               includeAntRuntime="false"
996               includeJavaRuntime="false"
997               executable="${javac8}"
998               fork="true">
999    
1000          <include name="jsr166e/**/*.java"/>
1001          <compilerarg value="-XDignore.symbol.file=true"/>
1002          <compilerarg value="-Xlint:all"/>
1003          <compilerarg value="-Xdoclint:all/protected"/>
1004    
1005        </javac>
1006      </target>
1007    
1008    
1009    <target name="jsr166ejar"    <target name="jsr166ejar"
1010            depends="jsr166ecompile"            depends="jsr166ecompile"
# Line 1053  As of 2013-02, the very latest lambda 8 Line 1025  As of 2013-02, the very latest lambda 8
1025    
1026      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1027               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1028               link="${jdkapidocs.url}"               link="${java.api.url}"
1029               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1030               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1031               source="7"               source="${build.jsr166e.java.version}"
1032               executable="${javadoc7}">               executable="${javadoc7}">
1033          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1034        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1035    
1036      </javadoc>      </javadoc>
1037    </target>    </target>
1038    
1039    
1040    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck-one-java-version"
1041            depends="jsr166ejar"            depends="jsr166ejar">
1042            description="Runs tck tests for jsr166e">  
1043        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1044    
1045      <run-tck-tests      <run-tck-tests
1046        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1047        source="7"        target="${build.jsr166e.java.version}"
       target="8"  
1048        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1049        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1050    </target>    </target>
1051    
1052      <target name="jsr166e-test-tck"
1053              description="Runs tck tests for jsr166e for multiple java versions">
1054    
1055    <!--     <antcall target="clean"/> -->
1056    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1057    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1058    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1059    <!--     </antcall> -->
1060    
1061        <antcall target="clean"/>
1062        <antcall target="jsr166e-test-tck-one-java-version">
1063          <param name="build.jsr166e.java.version" value="7"/>
1064          <param name="build.jsr166e.javac" value="${javac7}"/>
1065        </antcall>
1066    
1067        <antcall target="clean"/>
1068        <antcall target="jsr166e-test-tck-one-java-version">
1069          <param name="build.jsr166e.java.version" value="6"/>
1070          <param name="build.jsr166e.javac" value="${javac6}"/>
1071        </antcall>
1072      </target>
1073    
1074    
1075      <target name="jsr166e-test"
1076              depends="jsr166e-test-tck"
1077              description="Runs all tests for jsr166e">
1078      </target>
1079    
1080    <target name="jsr166edist"    <target name="jsr166edist"
1081            depends="jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1088  As of 2013-02, the very latest lambda 8 Line 1088  As of 2013-02, the very latest lambda 8
1088    </target>    </target>
1089    
1090    
   <target name="jsr166edist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1091    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1092            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1093      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>

Legend:
Removed from v.1.133  
changed lines
  Added in v.1.152

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