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

Diff of /jsr166/build.xml

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

revision 1.130 by jsr166, Mon Jan 28 22:00:34 2013 UTC revision 1.165 by jsr166, Wed Jun 17 01:55:44 2015 UTC
# Line 16  Line 16 
16    $HOME/jdk/jdk6    $HOME/jdk/jdk6
17    $HOME/jdk/jdk7    $HOME/jdk/jdk7
18    $HOME/jdk/jdk8    $HOME/jdk/jdk8
19      $HOME/jdk/jdk9
20    where each of the above is a JDK or a symlink to same, and    where each of the above is a JDK or a symlink to same, and
21    $HOME/jdk/src/jdk6    $HOME/jdk/src/jdk6
22    $HOME/jdk/src/jdk7    $HOME/jdk/src/jdk7
23    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
24      $HOME/jdk/src/jdk9
25    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
26    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
27    
28      Alternatively, define ant variables thus:
29      ant -Djdk$N.home=...
30      for $N in 6 7 8 9 ...
31  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
32    </description>    </description>
33    
34    <target name="usage" description="Display main targets by running 'ant -projecthelp'">    <!-- Display main targets by running 'ant -projecthelp' -->
35      <target name="usage">
36      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
37        <arg value="-projecthelp" />        <arg value="-projecthelp" />
38      </java>      </java>
# Line 43  Line 50 
50    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
51    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
52    
53      <!-- Tck options; see JSR166TestCase.java
54       To profile a single tck test class:
55       ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
56       To stress test a single tck test class:
57       ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
58      -->
59      <property name="jsr166.profileTests"     value="false"/>
60      <property name="jsr166.profileThreshold" value="100"/>
61      <property name="jsr166.runsPerTest"      value="1"/>
62      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63    
64    <!-- Build locations -->    <!-- Build locations -->
65    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
66    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
# Line 104  Line 122 
122    <defjdklocations v="6"/>    <defjdklocations v="6"/>
123    <defjdklocations v="7"/>    <defjdklocations v="7"/>
124    <defjdklocations v="8"/>    <defjdklocations v="8"/>
125      <defjdklocations v="9"/>
126    
127    <!-- Source locations -->    <!-- Source locations -->
128    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 144  Line 163 
163    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
164    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
165    
166    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
167    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
168    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
169    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
170      <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
171    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <!-- The expected canonical location does not yet exist as of 2014-07 -->
172    <!-- The below does not yet exist as of 2013-01 -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
173    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
174      <!-- Default jdk doc location (latest stable release seems best) -->
175      <property name="java.docroot.url"       value="${java8.docroot.url}"/>
176    
177    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
178    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
179      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
180      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
181      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
182      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
183      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
184    
185    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
186    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 169  Line 195 
195    
196    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
197      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
198      <attribute name="target"/>      <attribute name="target"/>
199        <attribute name="compile-target" default="@{target}"/>
200      <attribute name="workdir"/>      <attribute name="workdir"/>
201      <attribute name="classes"/>      <attribute name="classes"/>
202      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
203        <element name="javac-elements" optional="true"/>
204      <sequential>      <sequential>
205    
206      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
# Line 183  Line 210 
210             debug="${build.debug}"             debug="${build.debug}"
211             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
212             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
213             source="@{source}"             source="@{compile-target}"
214               target="@{compile-target}"
215             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{source}}"  
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 value="-Xbootclasspath/p:@{classes}"/>
225        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
226          <javac-elements/>
227    
228      </javac>      </javac>
229    
230      <java classname="JSR166TestCase"      <java classname="${jsr166.tckTestClass}"
231            failonerror="true"            failonerror="true"
232            jvm="${java@{target}}"            jvm="${java@{target}}"
233            fork="true">            fork="true">
234          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
235          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
236    
237            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
238            <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
239              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
240            </syspropertyset>
241    
242            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
245          <classpath>          <classpath>
246            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
247            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 213  Line 251 
251      </sequential>      </sequential>
252    </macrodef>    </macrodef>
253    
254      <!-- Define jtreg test sets for different jdk versions -->
255      <fileset dir="${jtreg.src.dir}">
256        <patternset id="jdk9.jtreg.tests">
257          <include name="**/*.java"/>
258        </patternset>
259      </fileset>
260    
261      <fileset dir="${jtreg.src.dir}">
262        <patternset id="jdk8.jtreg.tests">
263          <include name="**/*.java"/>
264          <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
265        </patternset>
266      </fileset>
267    
268      <fileset dir="${jtreg.src.dir}">
269        <patternset id="jdk7.jtreg.tests">
270          <include name="**/*.java"/>
271          <exclude name="util/Collection/CollectionDefaults.java"/>
272          <exclude name="util/List/ListDefaults.java"/>
273          <exclude name="util/Spliterator/**/*.java"/>
274          <exclude name="util/concurrent/CompletableFuture/**/*.java"/>
275          <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
276          <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
277        </patternset>
278      </fileset>
279    
280      <macrodef name="run-jtreg-tests">
281        <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
282        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
283        <attribute name="source" default="7"/>
284        <attribute name="target"/>
285        <attribute name="workdir"/>
286        <attribute name="classes"/>
287        <attribute name="jtregflags" default=""/>
288        <sequential>
289        <delete dir="@{workdir}/JTwork"   quiet="true"/>
290        <delete dir="@{workdir}/JTreport" quiet="true"/>
291        <mkdir dir="@{workdir}/JTwork/scratch"/>
292        <mkdir dir="@{workdir}/JTreport"/>
293        <jtreg dir="@{jtreg.src.dir}"
294               jdk="${jdk@{target}.home}"
295               workDir="@{workdir}/JTwork"
296               reportDir="@{workdir}/JTreport">
297          <patternset refid="jdk@{target}.jtreg.tests"/>
298          <arg value="-Xbootclasspath/p:@{classes}"/>
299          <arg value="-agentvm"/>
300          <arg value="-v:nopass,fail"/>
301          <arg value="-vmoptions:-esa -ea"/>
302          <arg value="-automatic"/>
303          <arg value="-k:!ignore"/>
304          <arg line="@{jtregflags}"/>
305        </jtreg>
306        </sequential>
307      </macrodef>
308    
309    <!-- ALoops classpath -->    <!-- ALoops classpath -->
310    <path id="loops.classpath">    <path id="loops.classpath">
311      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 224  Line 317 
317    
318    <!-- Main targets -->    <!-- Main targets -->
319    
320      <property name="build.main.java.version" value="9"/>
321      <property name="build.main.javac" value="${javac9}"/>
322    
323    <target name="dists"    <target name="dists"
324            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
325            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
# Line 242  Line 338 
338             classpath=""             classpath=""
339             includeAntRuntime="false"             includeAntRuntime="false"
340             includeJavaRuntime="false"             includeJavaRuntime="false"
341             executable="${javac8}"             executable="${build.main.javac}"
342             fork="true">             fork="true">
343    
344        <include name="**/*.java"/>        <include name="**/*.java"/>
345          <compilerarg value="-Xprefer:source"/>
346        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
347        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
348          <compilerarg value="-Werror"/>
349          <compilerarg value="-Xdoclint:all/protected"/>
350          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
352    
353      </javac>      </javac>
# Line 264  Line 364 
364    </target>    </target>
365    
366    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
367    <target name="docs"    <target name="docs"
368            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
369    
# Line 280  Line 375 
375    
376      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
377               packagenames="none"               packagenames="none"
378               link="${jdkapi8docs.url}"               link="${java9.api.url}"
379               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
380               access="${build.javadoc.access}"               access="${build.javadoc.access}"
381               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk9src.dir}"
382               classpath=""               classpath=""
383               executable="${javadoc8}">               executable="${javadoc9}">
384        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
385          <include name="**/*.java"/>          <include name="**/*.java"/>
386        </fileset>        </fileset>
387          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
388          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
389        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
390        <arg value="-tag"/>        <arg value="-tag"/>
391        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
392          <arg value="-tag"/>
393          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
394          <arg value="-tag"/>
395          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
396          <arg value="-tag"/>
397          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
398      </javadoc>      </javadoc>
399    </target>    </target>
400    
# Line 330  Line 433 
433    <target name="dist-clean"    <target name="dist-clean"
434            description="Removes all build and distribution products">            description="Removes all build and distribution products">
435    
436        <delete dir="${build.dir}"/>
437      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
438    
439    </target>    </target>
440    
441    
   <!-- Internal targets -->  
   
   
442    <target name="dist-jar"    <target name="dist-jar"
443            depends="clean, jar">            depends="clean, jar">
444      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 348  Line 449 
449      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
450    </target>    </target>
451    
452      <target name="tck" depends="test-tck" description="alias for test-tck"/>
453      <target name="test-tck"
454              depends="jar"
455              description="Runs tck tests for main directly">
456    
457    <target name="compile-tests"      <run-tck-tests
458            depends="jar">        target="${build.main.java.version}"
459          workdir="${build.dir}"
460      <mkdir dir="${build.testcases.dir}"/>        classes="${product.jar}"/>
   
     <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>  
 -->  
   
461    </target>    </target>
462    
463      <target name="test-tck-parallelism-1"
464              description="Runs test-tck with given common pool parallelism">
465        <antcall target="test-tck">
466          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
467        </antcall>
468      </target>
469    
470    <target name="run-tests"    <target name="test-tck-parallelism-0"
471            depends="compile-tests">            description="Runs test-tck with given common pool parallelism">
472        <antcall target="test-tck">
473      <!-- May be overridden by user.properties -->        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
474      <property name="testcase" value="*"/>      </antcall>
475      </target>
     <mkdir dir="${build.reports.dir}"/>  
   
     <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>  
476    
477      <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
478      <target name="test-jtreg"
479              depends="jar"
480              description="Runs jtreg tests for main using the jtreg ant task">
481        <run-jtreg-tests
482           target="${build.main.java.version}"
483           workdir="${build.dir}"
484           classes="${product.jar}"/>
485    </target>    </target>
486    
487      <target name="test"
488              depends="test-tck, test-tck-parallelism-1, test-jtreg"
489              description="Runs tck and jtreg tests for main">
490      </target>
491    
492    <target name="report-tests"    <target name="test89"
493            depends="run-tests">            description="Runs tck and jtreg tests for main for multiple java versions">
494    
495      <!-- Sets junit.report.format to frames if redirection is present,      <antcall target="clean"/>
496           otherwise sets it to noframes. -->      <antcall target="test">
497      <available property="junit.report.format"        <param name="build.main.java.version" value="8"/>
498                    value="frames"        <param name="build.main.javac" value="${javac8}"/>
499                classname="org.apache.xalan.lib.Redirect"        <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>
500      />      </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>  
501    
502      <fail message="Test Cases Failed" if="junit.failed"/>      <antcall target="clean"/>
503        <antcall target="test">
504          <param name="build.main.java.version" value="9"/>
505          <param name="build.main.javac" value="${javac9}"/>
506        </antcall>
507    
508    </target>    </target>
509    
510    
511    
512    <target name="configure-compiler">    <target name="configure-compiler">
513    
514      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 503  Line 526 
526    </target>    </target>
527    
528    
   <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>  
   
529    
530    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
531    
# Line 578  Line 578 
578             fork="true">             fork="true">
579    
580        <include name="**/*.java"/>        <include name="**/*.java"/>
581          <compilerarg value="-Xprefer:source"/>
582        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
583        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
584          <compilerarg value="-Werror"/>
585          <compilerarg line="${build.args}"/>
586    
587        </javac>
588      </target>
589    
590      <target name="4jdk7doclint"
591              depends="configure-compiler"
592              description="Finds doclint warnings">
593    
594        <mkdir dir="${build.4jdk7.classes.dir}"/>
595    
596        <javac srcdir="${4jdk7src.dir}"
597               destdir="${build.4jdk7.classes.dir}"
598               debug="${build.debug}"
599               debuglevel="${build.debuglevel}"
600               deprecation="${build.deprecation}"
601               source="6"
602               classpath=""
603               bootclasspath="${bootclasspath7}"
604               includeAntRuntime="false"
605               includeJavaRuntime="false"
606               executable="${javac8}"
607               fork="true">
608    
609          <include name="**/*.java"/>
610          <compilerarg value="-Xprefer:source"/>
611          <compilerarg value="-XDignore.symbol.file=true"/>
612          <compilerarg value="-Xlint:all"/>
613          <compilerarg value="-Xdoclint:all/protected"/>
614        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
615    
616      </javac>      </javac>
# Line 604  Line 635 
635      <run-tck-tests      <run-tck-tests
636        target="7"        target="7"
637        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
638        classes="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
639          <javac-elements>
640            <!-- JDK8+ test classes -->
641            <exclude name="*8Test.java"/>
642            <exclude name="*9Test.java"/>
643            <exclude name="DoubleAccumulatorTest.java"/>
644            <exclude name="DoubleAdderTest.java"/>
645            <exclude name="LongAccumulatorTest.java"/>
646            <exclude name="LongAdderTest.java"/>
647            <exclude name="CompletableFutureTest.java"/>
648            <exclude name="SplittableRandomTest.java"/>
649            <exclude name="StampedLockTest.java"/>
650          </javac-elements>
651        </run-tck-tests>
652    </target>    </target>
653    
654    
# Line 630  Line 674 
674    
675        <formatter type="brief"/>        <formatter type="brief"/>
676    
677        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
678        </test>        </test>
679    
680      </junit>      </junit>
681    </target>    </target>
682    
683    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
684            depends="4jdk7compile"            depends="4jdk7jar"
685            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
686      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
687      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
688      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
689      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"/>
     <jtreg dir="${jtreg.src.dir}"  
            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>  
690    </target>    </target>
691    
692    
# Line 672  Line 704 
704    
705      <javadoc destdir="${4jdk7docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
706               packagenames="none"               packagenames="none"
707               link="${jdkapi7docs.url}"               link="${java7.api.url}"
708               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
709               access="${build.javadoc.access}"               access="${build.javadoc.access}"
710               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 681  Line 713 
713        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
714          <include name="**/*.java"/>          <include name="**/*.java"/>
715        </fileset>        </fileset>
716          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
717        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
718      </javadoc>      </javadoc>
719    </target>    </target>
# Line 699  Line 732 
732    </target>    </target>
733    
734    
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
735    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
736            depends="4jdk7clean, 4jdk7jar">            depends="4jdk7clean, 4jdk7jar">
737      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 740  Line 768 
768        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
769        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
770        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
771          <compilerarg value="-Werror"/>
772        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
773    
774      </javac>      </javac>
# Line 765  Line 794 
794    
795      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
796               packagenames="jsr166x.*"               packagenames="jsr166x.*"
797               link="${jdkapidocs.url}"               link="${java.api.url}"
798               access="${build.javadoc.access}"               access="${build.javadoc.access}"
799               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
800               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
801               source="5"               source="5"
802               executable="${javadoc7}">               executable="${javadoc7}">
803          <arg line="-Xdocrootparent ${java.docroot.url}"/>
804        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
805    
806      </javadoc>      </javadoc>
# Line 790  Line 820 
820    </target>    </target>
821    
822    
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
823    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
824            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
825      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 831  Line 855 
855        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
856        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
857        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
858          <compilerarg value="-Werror"/>
859        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
860    
861      </javac>      </javac>
# Line 856  Line 881 
881    
882      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
883               packagenames="jsr166y.*"               packagenames="jsr166y.*"
884               link="${jdkapidocs.url}"               link="${java.api.url}"
885               access="${build.javadoc.access}"               access="${build.javadoc.access}"
886               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
887               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
888               source="6"               source="6"
889               executable="${javadoc7}">               executable="${javadoc7}">
890          <arg line="-Xdocrootparent ${java.docroot.url}"/>
891        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
892    
893      </javadoc>      </javadoc>
# Line 881  Line 907 
907    </target>    </target>
908    
909    
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
910    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
911            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
912      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 922  Line 943 
943        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
944        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
945        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
946          <compilerarg value="-Werror"/>
947        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
948    
949      </javac>      </javac>
# Line 947  Line 969 
969    
970      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
971               packagenames="extra166y.*"               packagenames="extra166y.*"
972               link="${jdkapidocs.url}"               link="${java.api.url}"
973               access="${build.javadoc.access}"               access="${build.javadoc.access}"
974               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
975               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
976               source="6"               source="6"
977               executable="${javadoc7}">               executable="${javadoc7}">
978          <arg line="-Xdocrootparent ${java.docroot.url}"/>
979        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
980    
981      </javadoc>      </javadoc>
# Line 972  Line 995 
995    </target>    </target>
996    
997    
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
998    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
999            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
1000      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 989  Line 1007 
1007    
1008    <!-- jsr166e -->    <!-- jsr166e -->
1009    
1010      <property name="build.jsr166e.java.version" value="6"/>
1011      <property name="build.jsr166e.javac" value="${javac6}"/>
1012    
1013    <target name="jsr166ecompile"    <target name="jsr166ecompile"
1014            depends="configure-compiler"            depends="configure-compiler"
1015            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 1000  Line 1021 
1021             debug="${build.debug}"             debug="${build.debug}"
1022             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1023             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1024             source="7"             source="${build.jsr166e.java.version}"
1025             classpath=""             classpath=""
1026             includeAntRuntime="false"             includeAntRuntime="false"
1027             includeJavaRuntime="false"             includeJavaRuntime="false"
1028             executable="${javac7}"             executable="${build.jsr166e.javac}"
1029             fork="true">             fork="true">
1030    
1031        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1032        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1033        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1034          <compilerarg value="-Werror"/>
1035        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1036    
1037      </javac>      </javac>
1038    </target>    </target>
1039    
1040      <!-- jsr166e: find doclint errors -->
1041      <target name="jsr166edoclint">
1042    
1043        <mkdir dir="${build.jsr166e.classes.dir}"/>
1044    
1045        <javac srcdir="${topsrc.dir}"
1046               destdir="${build.jsr166e.classes.dir}"
1047               debug="${build.debug}"
1048               debuglevel="${build.debuglevel}"
1049               deprecation="${build.deprecation}"
1050               source="${build.jsr166e.java.version}"
1051               classpath=""
1052               bootclasspath="${bootclasspath7}"
1053               includeAntRuntime="false"
1054               includeJavaRuntime="false"
1055               executable="${javac8}"
1056               fork="true">
1057    
1058          <include name="jsr166e/**/*.java"/>
1059          <compilerarg value="-XDignore.symbol.file=true"/>
1060          <compilerarg value="-Xlint:all"/>
1061          <compilerarg value="-Werror"/>
1062          <compilerarg value="-Xdoclint:all/protected"/>
1063    
1064        </javac>
1065      </target>
1066    
1067    
1068    <target name="jsr166ejar"    <target name="jsr166ejar"
1069            depends="jsr166ecompile"            depends="jsr166ecompile"
# Line 1035  Line 1084 
1084    
1085      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1086               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1087               link="${jdkapidocs.url}"               link="${java.api.url}"
1088               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1089               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1090               source="7"               source="${build.jsr166e.java.version}"
1091               executable="${javadoc7}">               executable="${javadoc7}">
1092          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1093        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1094    
1095      </javadoc>      </javadoc>
1096    </target>    </target>
1097    
1098    
1099    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck-one-java-version"
1100            depends="jsr166ejar"            depends="jsr166ejar">
1101            description="Runs tck tests for jsr166e">  
1102        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1103    
1104      <run-tck-tests      <run-tck-tests
1105        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1106        source="7"        target="${build.jsr166e.java.version}"
       target="8"  
1107        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1108        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1109    </target>    </target>
1110    
1111      <target name="jsr166e-test-tck"
1112              description="Runs tck tests for jsr166e for multiple java versions">
1113    
1114    <!--     <antcall target="clean"/> -->
1115    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1116    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1117    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1118    <!--     </antcall> -->
1119    
1120        <antcall target="clean"/>
1121        <antcall target="jsr166e-test-tck-one-java-version">
1122          <param name="build.jsr166e.java.version" value="7"/>
1123          <param name="build.jsr166e.javac" value="${javac7}"/>
1124        </antcall>
1125    
1126        <antcall target="clean"/>
1127        <antcall target="jsr166e-test-tck-one-java-version">
1128          <param name="build.jsr166e.java.version" value="6"/>
1129          <param name="build.jsr166e.javac" value="${javac6}"/>
1130        </antcall>
1131      </target>
1132    
1133    
1134      <target name="jsr166e-test"
1135              depends="jsr166e-test-tck"
1136              description="Runs all tests for jsr166e">
1137      </target>
1138    
1139    <target name="jsr166edist"    <target name="jsr166edist"
1140            depends="jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
# Line 1070  Line 1147 
1147    </target>    </target>
1148    
1149    
   <target name="jsr166edist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1150    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1151            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1152      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
# Line 1090  Line 1162 
1162    
1163    <target name="lint">    <target name="lint">
1164      <antcall target="dists">      <antcall target="dists">
1165          <param name="build.javadoc.access" value="public"/>
1166        </antcall>
1167      </target>
1168    
1169    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1170      <target name="lint-private">
1171        <antcall target="dist">
1172        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1173      </antcall>      </antcall>
1174    </target>    </target>

Legend:
Removed from v.1.130  
changed lines
  Added in v.1.165

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