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

Diff of /jsr166/build.xml

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

revision 1.131 by jsr166, Fri Feb 1 18:31:17 2013 UTC revision 1.157 by jsr166, Tue Jul 8 00:01:39 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       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"/>
56      <property name="jsr166.profileThreshold" value="100"/>
57      <property name="jsr166.runsPerTest"      value="1"/>
58      <!-- Stress test an individual tck test class:
59      ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
60      -->
61      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
62    
63    <!-- Build locations -->    <!-- Build locations -->
64    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
65    <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 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 145  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      <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
170    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <!-- The expected canonical location does not yet exist as of 2014-07 -->
171    <!-- The below does not yet exist as of 2013-01 -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
172    <!-- <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"/>
173      <!-- Default jdk doc location (latest stable release seems best) -->
174      <property name="java.docroot.url"       value="${java8.docroot.url}"/>
175    
176    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
177    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
178      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
179      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
180      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
181      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
182      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
183    
184    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
185    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 170  As of 2013-02, the very latest lambda 8 Line 194  As of 2013-02, the very latest lambda 8
194    
195    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
196      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
197      <attribute name="target"/>      <attribute name="target"/>
198        <attribute name="compile-target" default="@{target}"/>
199      <attribute name="workdir"/>      <attribute name="workdir"/>
200      <attribute name="classes"/>      <attribute name="classes"/>
201      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
202        <element name="javac-elements" optional="true"/>
203      <sequential>      <sequential>
204    
205      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
# Line 184  As of 2013-02, the very latest lambda 8 Line 209  As of 2013-02, the very latest lambda 8
209             debug="${build.debug}"             debug="${build.debug}"
210             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
211             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
212             source="@{source}"             source="@{compile-target}"
213               target="@{compile-target}"
214             classpath="${junit.jar}"             classpath="${junit.jar}"
215             bootclasspath="@{classes}:${bootclasspath@{source}}"             bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
216             includeAntRuntime="false"             includeAntRuntime="false"
217             includeJavaRuntime="false"             includeJavaRuntime="false"
218             executable="${javac@{target}}"             executable="${javac@{compile-target}}"
219             fork="true">             fork="true">
220    
221        <include name="*.java"/>        <include name="*.java"/>
222        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
223        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
224        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
225          <javac-elements/>
226    
227      </javac>      </javac>
228    
229      <java classname="JSR166TestCase"      <java classname="${jsr166.tckTestClass}"
230            failonerror="true"            failonerror="true"
231            jvm="${java@{target}}"            jvm="${java@{target}}"
232            fork="true">            fork="true">
233          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
234          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
235            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
236            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
237            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
238          <classpath>          <classpath>
239            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
240            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 214  As of 2013-02, the very latest lambda 8 Line 244  As of 2013-02, the very latest lambda 8
244      </sequential>      </sequential>
245    </macrodef>    </macrodef>
246    
247      <macrodef name="run-jtreg-tests">
248        <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
249        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
250        <attribute name="source" default="7"/>
251        <attribute name="target"/>
252        <attribute name="workdir"/>
253        <attribute name="classes"/>
254        <attribute name="jtregflags" default=""/>
255        <sequential>
256        <delete dir="@{workdir}/JTwork"   quiet="true"/>
257        <delete dir="@{workdir}/JTreport" quiet="true"/>
258        <mkdir dir="@{workdir}/JTwork/scratch"/>
259        <mkdir dir="@{workdir}/JTreport"/>
260        <jtreg dir="@{jtreg.src.dir}"
261               jdk="${jdk@{target}.home}"
262               workDir="@{workdir}/JTwork"
263               reportDir="@{workdir}/JTreport">
264    
265          <arg value="-Xbootclasspath/p:@{classes}"/>
266          <arg value="-agentvm"/>
267          <arg value="-v:nopass,fail"/>
268          <arg value="-vmoptions:-esa -ea"/>
269          <arg value="-automatic"/>
270          <arg value="-k:!ignore"/>
271          <arg line="@{jtregflags}"/>
272        </jtreg>
273        </sequential>
274      </macrodef>
275    
276    <!-- ALoops classpath -->    <!-- ALoops classpath -->
277    <path id="loops.classpath">    <path id="loops.classpath">
278      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 225  As of 2013-02, the very latest lambda 8 Line 284  As of 2013-02, the very latest lambda 8
284    
285    <!-- Main targets -->    <!-- Main targets -->
286    
287      <property name="build.main.java.version" value="9"/>
288      <property name="build.main.javac" value="${javac9}"/>
289    
290    <target name="dists"    <target name="dists"
291            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
292            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
# Line 243  As of 2013-02, the very latest lambda 8 Line 305  As of 2013-02, the very latest lambda 8
305             classpath=""             classpath=""
306             includeAntRuntime="false"             includeAntRuntime="false"
307             includeJavaRuntime="false"             includeJavaRuntime="false"
308             executable="${javac8}"             executable="${build.main.javac}"
309             fork="true">             fork="true">
310    
311        <include name="**/*.java"/>        <include name="**/*.java"/>
312          <compilerarg value="-Xprefer:source"/>
313        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
314        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
315          <compilerarg value="-Xdoclint:all/protected"/>
316          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
317        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
318    
319      </javac>      </javac>
# Line 265  As of 2013-02, the very latest lambda 8 Line 330  As of 2013-02, the very latest lambda 8
330    </target>    </target>
331    
332    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
333    <target name="docs"    <target name="docs"
334            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
335    
# Line 281  As of 2013-02, the very latest lambda 8 Line 341  As of 2013-02, the very latest lambda 8
341    
342      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
343               packagenames="none"               packagenames="none"
344               link="${jdkapi8docs.url}"               link="${java9.api.url}"
345               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
346               access="${build.javadoc.access}"               access="${build.javadoc.access}"
347               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk9src.dir}"
348               classpath=""               classpath=""
349               executable="${javadoc8}">               executable="${javadoc9}">
350        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
351          <include name="**/*.java"/>          <include name="**/*.java"/>
352        </fileset>        </fileset>
353          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
354          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
355        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
356        <arg value="-tag"/>        <arg value="-tag"/>
357        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
358          <arg value="-tag"/>
359          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
360          <arg value="-tag"/>
361          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
362          <arg value="-tag"/>
363          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
364      </javadoc>      </javadoc>
365    </target>    </target>
366    
# Line 331  As of 2013-02, the very latest lambda 8 Line 399  As of 2013-02, the very latest lambda 8
399    <target name="dist-clean"    <target name="dist-clean"
400            description="Removes all build and distribution products">            description="Removes all build and distribution products">
401    
402        <delete dir="${build.dir}"/>
403      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
404    
405    </target>    </target>
406    
407    
   <!-- Internal targets -->  
   
   
408    <target name="dist-jar"    <target name="dist-jar"
409            depends="clean, jar">            depends="clean, jar">
410      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 350  As of 2013-02, the very latest lambda 8 Line 416  As of 2013-02, the very latest lambda 8
416    </target>    </target>
417    
418    
   <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>  
   
419    <target name="test-tck"    <target name="test-tck"
420            depends="jar"            depends="jar"
421            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
422    
423      <run-tck-tests      <run-tck-tests
424        target="8"        target="${build.main.java.version}"
425        workdir="${build.dir}"        workdir="${build.dir}"
426        classes="${product.jar}"/>        classes="${product.jar}"/>
427    </target>    </target>
428    
429    <target name="run-tests"    <target name="test-jtreg"
430            depends="compile-tests">            depends="jar"
431              description="Runs jtreg tests for main using the jtreg ant task">
432      <!-- May be overridden by user.properties -->      <run-jtreg-tests
433      <property name="testcase" value="*"/>         target="${build.main.java.version}"
434           workdir="${build.dir}"
435      <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>  
   
436    </target>    </target>
437    
438      <target name="test"
439              depends="test-tck, test-jtreg"
440              description="Runs tck and jtreg tests for main">
441      </target>
442    
443    <target name="report-tests"    <target name="test89"
444            depends="run-tests">            description="Runs tck and jtreg tests for main for multiple java versions">
445    
446      <!-- Sets junit.report.format to frames if redirection is present,      <antcall target="clean"/>
447           otherwise sets it to noframes. -->      <antcall target="test">
448      <available property="junit.report.format"        <param name="build.main.java.version" value="8"/>
449                    value="frames"        <param name="build.main.javac" value="${javac8}"/>
450                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>  
451    
452      <fail message="Test Cases Failed" if="junit.failed"/>      <antcall target="clean"/>
453        <antcall target="test">
454          <param name="build.main.java.version" value="9"/>
455          <param name="build.main.javac" value="${javac9}"/>
456        </antcall>
457    
458    </target>    </target>
459    
460    
461    
462    <target name="configure-compiler">    <target name="configure-compiler">
463    
464      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 513  As of 2013-02, the very latest lambda 8 Line 476  As of 2013-02, the very latest lambda 8
476    </target>    </target>
477    
478    
   <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>  
   
479    
480    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
481    
# Line 588  As of 2013-02, the very latest lambda 8 Line 528  As of 2013-02, the very latest lambda 8
528             fork="true">             fork="true">
529    
530        <include name="**/*.java"/>        <include name="**/*.java"/>
531          <compilerarg value="-Xprefer:source"/>
532        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
533        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
534        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 595  As of 2013-02, the very latest lambda 8 Line 536  As of 2013-02, the very latest lambda 8
536      </javac>      </javac>
537    </target>    </target>
538    
539      <target name="4jdk7doclint"
540              depends="configure-compiler"
541              description="Finds doclint warnings">
542    
543        <mkdir dir="${build.4jdk7.classes.dir}"/>
544    
545        <javac srcdir="${4jdk7src.dir}"
546               destdir="${build.4jdk7.classes.dir}"
547               debug="${build.debug}"
548               debuglevel="${build.debuglevel}"
549               deprecation="${build.deprecation}"
550               source="6"
551               classpath=""
552               bootclasspath="${bootclasspath7}"
553               includeAntRuntime="false"
554               includeJavaRuntime="false"
555               executable="${javac8}"
556               fork="true">
557    
558          <include name="**/*.java"/>
559          <compilerarg value="-Xprefer:source"/>
560          <compilerarg value="-XDignore.symbol.file=true"/>
561          <compilerarg value="-Xlint:all"/>
562          <compilerarg value="-Xdoclint:all/protected"/>
563          <compilerarg line="${build.args}"/>
564    
565        </javac>
566      </target>
567    
568    
569    <target name="4jdk7jar"    <target name="4jdk7jar"
570            depends="4jdk7compile"            depends="4jdk7compile"
# Line 614  As of 2013-02, the very latest lambda 8 Line 584  As of 2013-02, the very latest lambda 8
584      <run-tck-tests      <run-tck-tests
585        target="7"        target="7"
586        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
587        classes="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
588          <javac-elements>
589            <!-- JDK8+ test classes -->
590            <exclude name="*8Test.java"/>
591            <exclude name="*9Test.java"/>
592            <exclude name="DoubleAccumulatorTest.java"/>
593            <exclude name="DoubleAdderTest.java"/>
594            <exclude name="LongAccumulatorTest.java"/>
595            <exclude name="LongAdderTest.java"/>
596            <exclude name="CompletableFutureTest.java"/>
597            <exclude name="SplittableRandomTest.java"/>
598            <exclude name="StampedLockTest.java"/>
599          </javac-elements>
600        </run-tck-tests>
601    </target>    </target>
602    
603    
# Line 640  As of 2013-02, the very latest lambda 8 Line 623  As of 2013-02, the very latest lambda 8
623    
624        <formatter type="brief"/>        <formatter type="brief"/>
625    
626        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
627        </test>        </test>
628    
629      </junit>      </junit>
630    </target>    </target>
631    
632    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
633            depends="4jdk7compile"            depends="4jdk7jar"
634            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
635      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
636      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
637      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
638      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"
639      <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>  
640    </target>    </target>
641    
642    
# Line 682  As of 2013-02, the very latest lambda 8 Line 654  As of 2013-02, the very latest lambda 8
654    
655      <javadoc destdir="${4jdk7docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
656               packagenames="none"               packagenames="none"
657               link="${jdkapi7docs.url}"               link="${java7.api.url}"
658               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
659               access="${build.javadoc.access}"               access="${build.javadoc.access}"
660               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 691  As of 2013-02, the very latest lambda 8 Line 663  As of 2013-02, the very latest lambda 8
663        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
664          <include name="**/*.java"/>          <include name="**/*.java"/>
665        </fileset>        </fileset>
666          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
667        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
668      </javadoc>      </javadoc>
669    </target>    </target>
# Line 709  As of 2013-02, the very latest lambda 8 Line 682  As of 2013-02, the very latest lambda 8
682    </target>    </target>
683    
684    
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
685    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
686            depends="4jdk7clean, 4jdk7jar">            depends="4jdk7clean, 4jdk7jar">
687      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 775  As of 2013-02, the very latest lambda 8 Line 743  As of 2013-02, the very latest lambda 8
743    
744      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
745               packagenames="jsr166x.*"               packagenames="jsr166x.*"
746               link="${jdkapidocs.url}"               link="${java.api.url}"
747               access="${build.javadoc.access}"               access="${build.javadoc.access}"
748               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
749               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
750               source="5"               source="5"
751               executable="${javadoc7}">               executable="${javadoc7}">
752          <arg line="-Xdocrootparent ${java.docroot.url}"/>
753        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
754    
755      </javadoc>      </javadoc>
# Line 800  As of 2013-02, the very latest lambda 8 Line 769  As of 2013-02, the very latest lambda 8
769    </target>    </target>
770    
771    
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
772    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
773            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
774      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 866  As of 2013-02, the very latest lambda 8 Line 829  As of 2013-02, the very latest lambda 8
829    
830      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
831               packagenames="jsr166y.*"               packagenames="jsr166y.*"
832               link="${jdkapidocs.url}"               link="${java.api.url}"
833               access="${build.javadoc.access}"               access="${build.javadoc.access}"
834               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
835               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
836               source="6"               source="6"
837               executable="${javadoc7}">               executable="${javadoc7}">
838          <arg line="-Xdocrootparent ${java.docroot.url}"/>
839        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
840    
841      </javadoc>      </javadoc>
# Line 891  As of 2013-02, the very latest lambda 8 Line 855  As of 2013-02, the very latest lambda 8
855    </target>    </target>
856    
857    
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
858    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
859            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
860      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 957  As of 2013-02, the very latest lambda 8 Line 916  As of 2013-02, the very latest lambda 8
916    
917      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
918               packagenames="extra166y.*"               packagenames="extra166y.*"
919               link="${jdkapidocs.url}"               link="${java.api.url}"
920               access="${build.javadoc.access}"               access="${build.javadoc.access}"
921               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
922               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
923               source="6"               source="6"
924               executable="${javadoc7}">               executable="${javadoc7}">
925          <arg line="-Xdocrootparent ${java.docroot.url}"/>
926        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
927    
928      </javadoc>      </javadoc>
# Line 982  As of 2013-02, the very latest lambda 8 Line 942  As of 2013-02, the very latest lambda 8
942    </target>    </target>
943    
944    
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
945    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
946            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
947      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 999  As of 2013-02, the very latest lambda 8 Line 954  As of 2013-02, the very latest lambda 8
954    
955    <!-- jsr166e -->    <!-- jsr166e -->
956    
957      <property name="build.jsr166e.java.version" value="6"/>
958      <property name="build.jsr166e.javac" value="${javac6}"/>
959    
960    <target name="jsr166ecompile"    <target name="jsr166ecompile"
961            depends="configure-compiler"            depends="configure-compiler"
962            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 1010  As of 2013-02, the very latest lambda 8 Line 968  As of 2013-02, the very latest lambda 8
968             debug="${build.debug}"             debug="${build.debug}"
969             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
970             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
971             source="7"             source="${build.jsr166e.java.version}"
972             classpath=""             classpath=""
973             includeAntRuntime="false"             includeAntRuntime="false"
974             includeJavaRuntime="false"             includeJavaRuntime="false"
975             executable="${javac7}"             executable="${build.jsr166e.javac}"
976             fork="true">             fork="true">
977    
978        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
# Line 1025  As of 2013-02, the very latest lambda 8 Line 983  As of 2013-02, the very latest lambda 8
983      </javac>      </javac>
984    </target>    </target>
985    
986      <!-- jsr166e: find doclint errors -->
987      <target name="jsr166edoclint">
988    
989        <mkdir dir="${build.jsr166e.classes.dir}"/>
990    
991        <javac srcdir="${topsrc.dir}"
992               destdir="${build.jsr166e.classes.dir}"
993               debug="${build.debug}"
994               debuglevel="${build.debuglevel}"
995               deprecation="${build.deprecation}"
996               source="${build.jsr166e.java.version}"
997               classpath=""
998               bootclasspath="${bootclasspath7}"
999               includeAntRuntime="false"
1000               includeJavaRuntime="false"
1001               executable="${javac8}"
1002               fork="true">
1003    
1004          <include name="jsr166e/**/*.java"/>
1005          <compilerarg value="-XDignore.symbol.file=true"/>
1006          <compilerarg value="-Xlint:all"/>
1007          <compilerarg value="-Xdoclint:all/protected"/>
1008    
1009        </javac>
1010      </target>
1011    
1012    
1013    <target name="jsr166ejar"    <target name="jsr166ejar"
1014            depends="jsr166ecompile"            depends="jsr166ecompile"
# Line 1045  As of 2013-02, the very latest lambda 8 Line 1029  As of 2013-02, the very latest lambda 8
1029    
1030      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1031               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1032               link="${jdkapidocs.url}"               link="${java.api.url}"
1033               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1034               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1035               source="7"               source="${build.jsr166e.java.version}"
1036               executable="${javadoc7}">               executable="${javadoc7}">
1037          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1038        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1039    
1040      </javadoc>      </javadoc>
1041    </target>    </target>
1042    
1043    
1044    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck-one-java-version"
1045            depends="jsr166ejar"            depends="jsr166ejar">
1046            description="Runs tck tests for jsr166e">  
1047        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1048    
1049      <run-tck-tests      <run-tck-tests
1050        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1051        source="7"        target="${build.jsr166e.java.version}"
       target="8"  
1052        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1053        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1054    </target>    </target>
1055    
1056      <target name="jsr166e-test-tck"
1057              description="Runs tck tests for jsr166e for multiple java versions">
1058    
1059    <!--     <antcall target="clean"/> -->
1060    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1061    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1062    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1063    <!--     </antcall> -->
1064    
1065        <antcall target="clean"/>
1066        <antcall target="jsr166e-test-tck-one-java-version">
1067          <param name="build.jsr166e.java.version" value="7"/>
1068          <param name="build.jsr166e.javac" value="${javac7}"/>
1069        </antcall>
1070    
1071        <antcall target="clean"/>
1072        <antcall target="jsr166e-test-tck-one-java-version">
1073          <param name="build.jsr166e.java.version" value="6"/>
1074          <param name="build.jsr166e.javac" value="${javac6}"/>
1075        </antcall>
1076      </target>
1077    
1078    
1079      <target name="jsr166e-test"
1080              depends="jsr166e-test-tck"
1081              description="Runs all tests for jsr166e">
1082      </target>
1083    
1084    <target name="jsr166edist"    <target name="jsr166edist"
1085            depends="jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1080  As of 2013-02, the very latest lambda 8 Line 1092  As of 2013-02, the very latest lambda 8
1092    </target>    </target>
1093    
1094    
   <target name="jsr166edist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1095    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1096            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1097      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>

Legend:
Removed from v.1.131  
changed lines
  Added in v.1.157

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