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

Diff of /jsr166/build.xml

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

revision 1.142, Tue Jun 18 20:54:57 2013 UTC revision 1.164, Wed May 20 06:13:09 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  As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.  
28      Alternatively, define ant variables thus:
29      ant -Djdk$N.home=...
30      for $N in 6 7 8 9 ...
31  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
32    </description>    </description>
33    
34    <target name="usage" description="Display main targets by running 'ant -projecthelp'">    <!-- Display main targets by running 'ant -projecthelp' -->
35      <target name="usage">
36      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
37        <arg value="-projecthelp" />        <arg value="-projecthelp" />
38      </java>      </java>
# Line 44  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 -->    <!-- Tck options; see JSR166TestCase.java
54    <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->     To profile a single tck test class:
55       ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
56       To stress test a single tck test class:
57       ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
58      -->
59    <property name="jsr166.profileTests"     value="false"/>    <property name="jsr166.profileTests"     value="false"/>
60    <property name="jsr166.profileThreshold" value="100"/>    <property name="jsr166.profileThreshold" value="100"/>
61    <property name="jsr166.runsPerTest"      value="1"/>    <property name="jsr166.runsPerTest"      value="1"/>
   <!-- Allow running an individual tck test class -->  
   <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->  
62    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63    
64    <!-- Build locations -->    <!-- Build locations -->
# Line 114  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 154  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 183  Line 199 
199      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
200      <attribute name="workdir"/>      <attribute name="workdir"/>
201      <attribute name="classes"/>      <attribute name="classes"/>
202      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
203      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
204      <sequential>      <sequential>
205    
# Line 197  Line 213 
213             source="@{compile-target}"             source="@{compile-target}"
214             target="@{compile-target}"             target="@{compile-target}"
215             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{compile-target}}"  
216             includeAntRuntime="false"             includeAntRuntime="false"
217             includeJavaRuntime="false"             includeJavaRuntime="false"
218             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
# Line 206  Line 221 
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/>        <javac-elements/>
227    
# Line 217  Line 233 
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}"/>          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
# Line 230  Line 252 
252    </macrodef>    </macrodef>
253    
254    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
255        <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
256      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
257      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
258      <attribute name="target"/>      <attribute name="target"/>
# Line 268  Line 291 
291    
292    <!-- Main targets -->    <!-- Main targets -->
293    
294      <property name="build.main.java.version" value="9"/>
295      <property name="build.main.javac" value="${javac9}"/>
296    
297    <target name="dists"    <target name="dists"
298            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
299            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
# Line 286  Line 312 
312             classpath=""             classpath=""
313             includeAntRuntime="false"             includeAntRuntime="false"
314             includeJavaRuntime="false"             includeJavaRuntime="false"
315             executable="${javac8}"             executable="${build.main.javac}"
316             fork="true">             fork="true">
317    
318        <include name="**/*.java"/>        <include name="**/*.java"/>
319        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
320        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
321        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
322          <compilerarg value="-Werror"/>
323          <compilerarg value="-Xdoclint:all/protected"/>
324          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
325        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
326    
327      </javac>      </javac>
# Line 320  Line 349 
349    
350      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
351               packagenames="none"               packagenames="none"
352               link="${jdkapi8docs.url}"               link="${java9.api.url}"
353               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
354               access="${build.javadoc.access}"               access="${build.javadoc.access}"
355               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk9src.dir}"
356               classpath=""               classpath=""
357               executable="${javadoc8}">               executable="${javadoc9}">
358        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
359          <include name="**/*.java"/>          <include name="**/*.java"/>
360        </fileset>        </fileset>
361          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
362          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
363        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
364        <arg value="-tag"/>        <arg value="-tag"/>
365        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
366          <arg value="-tag"/>
367          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
368          <arg value="-tag"/>
369          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
370          <arg value="-tag"/>
371          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
372      </javadoc>      </javadoc>
373    </target>    </target>
374    
# Line 370  Line 407 
407    <target name="dist-clean"    <target name="dist-clean"
408            description="Removes all build and distribution products">            description="Removes all build and distribution products">
409    
410        <delete dir="${build.dir}"/>
411      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
412    
413    </target>    </target>
# Line 385  Line 423 
423      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
424    </target>    </target>
425    
426      <target name="tck" depends="test-tck" description="alias for test-tck"/>
427    <target name="test-tck"    <target name="test-tck"
428            depends="jar"            depends="jar"
429            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
430    
431      <run-tck-tests      <run-tck-tests
432        target="8"        target="${build.main.java.version}"
433        workdir="${build.dir}"        workdir="${build.dir}"
434        classes="${product.jar}"/>        classes="${product.jar}"/>
435    </target>    </target>
436    
437      <target name="test-tck-parallelism-1"
438              description="Runs test-tck with given common pool parallelism">
439        <antcall target="test-tck">
440          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
441        </antcall>
442      </target>
443    
444      <target name="test-tck-parallelism-0"
445              description="Runs test-tck with given common pool parallelism">
446        <antcall target="test-tck">
447          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
448        </antcall>
449      </target>
450    
451      <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
452    <target name="test-jtreg"    <target name="test-jtreg"
453            depends="jar"            depends="jar"
454            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
455      <run-jtreg-tests      <run-jtreg-tests
456         target="8"         target="${build.main.java.version}"
457         workdir="${build.dir}"         workdir="${build.dir}"
458         classes="${product.jar}"/>         classes="${product.jar}"/>
459    </target>    </target>
460    
461    <target name="test"    <target name="test"
462            depends="test-tck, test-jtreg"            depends="test-tck, test-tck-parallelism-1, test-jtreg"
463            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
464    </target>    </target>
465    
466      <target name="test89"
467              description="Runs tck and jtreg tests for main for multiple java versions">
468    
469        <antcall target="clean"/>
470        <antcall target="test">
471          <param name="build.main.java.version" value="8"/>
472          <param name="build.main.javac" value="${javac8}"/>
473        </antcall>
474    
475        <antcall target="clean"/>
476        <antcall target="test">
477          <param name="build.main.java.version" value="9"/>
478          <param name="build.main.javac" value="${javac9}"/>
479        </antcall>
480    
481      </target>
482    
483    
484    
485    <target name="configure-compiler">    <target name="configure-compiler">
# Line 484  Line 554 
554        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
555        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
556        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
557          <compilerarg value="-Werror"/>
558          <compilerarg line="${build.args}"/>
559    
560        </javac>
561      </target>
562    
563      <target name="4jdk7doclint"
564              depends="configure-compiler"
565              description="Finds doclint warnings">
566    
567        <mkdir dir="${build.4jdk7.classes.dir}"/>
568    
569        <javac srcdir="${4jdk7src.dir}"
570               destdir="${build.4jdk7.classes.dir}"
571               debug="${build.debug}"
572               debuglevel="${build.debuglevel}"
573               deprecation="${build.deprecation}"
574               source="6"
575               classpath=""
576               bootclasspath="${bootclasspath7}"
577               includeAntRuntime="false"
578               includeJavaRuntime="false"
579               executable="${javac8}"
580               fork="true">
581    
582          <include name="**/*.java"/>
583          <compilerarg value="-Xprefer:source"/>
584          <compilerarg value="-XDignore.symbol.file=true"/>
585          <compilerarg value="-Xlint:all"/>
586          <compilerarg value="-Xdoclint:all/protected"/>
587        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
588    
589      </javac>      </javac>
# Line 512  Line 612 
612        <javac-elements>        <javac-elements>
613          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
614          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
615            <exclude name="*9Test.java"/>
616          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
617          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
618          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
619          <exclude name="LongAdderTest.java"/>          <exclude name="LongAdderTest.java"/>
620          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
621            <exclude name="SplittableRandomTest.java"/>
622          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
623        </javac-elements>        </javac-elements>
624      </run-tck-tests>      </run-tck-tests>
# Line 576  Line 678 
678    
679      <javadoc destdir="${4jdk7docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
680               packagenames="none"               packagenames="none"
681               link="${jdkapi7docs.url}"               link="${java7.api.url}"
682               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
683               access="${build.javadoc.access}"               access="${build.javadoc.access}"
684               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 585  Line 687 
687        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
688          <include name="**/*.java"/>          <include name="**/*.java"/>
689        </fileset>        </fileset>
690          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
691        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
692      </javadoc>      </javadoc>
693    </target>    </target>
# Line 603  Line 706 
706    </target>    </target>
707    
708    
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
709    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
710            depends="4jdk7clean, 4jdk7jar">            depends="4jdk7clean, 4jdk7jar">
711      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 644  Line 742 
742        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
743        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
744        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
745          <compilerarg value="-Werror"/>
746        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
747    
748      </javac>      </javac>
# Line 669  Line 768 
768    
769      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
770               packagenames="jsr166x.*"               packagenames="jsr166x.*"
771               link="${jdkapidocs.url}"               link="${java.api.url}"
772               access="${build.javadoc.access}"               access="${build.javadoc.access}"
773               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
774               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
775               source="5"               source="5"
776               executable="${javadoc7}">               executable="${javadoc7}">
777          <arg line="-Xdocrootparent ${java.docroot.url}"/>
778        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
779    
780      </javadoc>      </javadoc>
# Line 694  Line 794 
794    </target>    </target>
795    
796    
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
797    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
798            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
799      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 735  Line 829 
829        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
830        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
831        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
832          <compilerarg value="-Werror"/>
833        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
834    
835      </javac>      </javac>
# Line 760  Line 855 
855    
856      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
857               packagenames="jsr166y.*"               packagenames="jsr166y.*"
858               link="${jdkapidocs.url}"               link="${java.api.url}"
859               access="${build.javadoc.access}"               access="${build.javadoc.access}"
860               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
861               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
862               source="6"               source="6"
863               executable="${javadoc7}">               executable="${javadoc7}">
864          <arg line="-Xdocrootparent ${java.docroot.url}"/>
865        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
866    
867      </javadoc>      </javadoc>
# Line 785  Line 881 
881    </target>    </target>
882    
883    
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
884    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
885            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
886      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 826  Line 917 
917        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
918        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
919        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
920          <compilerarg value="-Werror"/>
921        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
922    
923      </javac>      </javac>
# Line 851  Line 943 
943    
944      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
945               packagenames="extra166y.*"               packagenames="extra166y.*"
946               link="${jdkapidocs.url}"               link="${java.api.url}"
947               access="${build.javadoc.access}"               access="${build.javadoc.access}"
948               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
949               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
950               source="6"               source="6"
951               executable="${javadoc7}">               executable="${javadoc7}">
952          <arg line="-Xdocrootparent ${java.docroot.url}"/>
953        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
954    
955      </javadoc>      </javadoc>
# Line 876  Line 969 
969    </target>    </target>
970    
971    
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
972    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
973            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
974      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 893  Line 981 
981    
982    <!-- jsr166e -->    <!-- jsr166e -->
983    
984      <property name="build.jsr166e.java.version" value="6"/>
985      <property name="build.jsr166e.javac" value="${javac6}"/>
986    
987    <target name="jsr166ecompile"    <target name="jsr166ecompile"
988            depends="configure-compiler"            depends="configure-compiler"
989            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 904  Line 995 
995             debug="${build.debug}"             debug="${build.debug}"
996             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
997             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
998             source="7"             source="${build.jsr166e.java.version}"
999             classpath=""             classpath=""
1000             includeAntRuntime="false"             includeAntRuntime="false"
1001             includeJavaRuntime="false"             includeJavaRuntime="false"
1002             executable="${javac7}"             executable="${build.jsr166e.javac}"
1003             fork="true">             fork="true">
1004    
1005        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1006        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1007        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1008          <compilerarg value="-Werror"/>
1009        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1010    
1011      </javac>      </javac>
1012    </target>    </target>
1013    
1014      <!-- jsr166e: find doclint errors -->
1015      <target name="jsr166edoclint">
1016    
1017        <mkdir dir="${build.jsr166e.classes.dir}"/>
1018    
1019        <javac srcdir="${topsrc.dir}"
1020               destdir="${build.jsr166e.classes.dir}"
1021               debug="${build.debug}"
1022               debuglevel="${build.debuglevel}"
1023               deprecation="${build.deprecation}"
1024               source="${build.jsr166e.java.version}"
1025               classpath=""
1026               bootclasspath="${bootclasspath7}"
1027               includeAntRuntime="false"
1028               includeJavaRuntime="false"
1029               executable="${javac8}"
1030               fork="true">
1031    
1032          <include name="jsr166e/**/*.java"/>
1033          <compilerarg value="-XDignore.symbol.file=true"/>
1034          <compilerarg value="-Xlint:all"/>
1035          <compilerarg value="-Werror"/>
1036          <compilerarg value="-Xdoclint:all/protected"/>
1037    
1038        </javac>
1039      </target>
1040    
1041    
1042    <target name="jsr166ejar"    <target name="jsr166ejar"
1043            depends="jsr166ecompile"            depends="jsr166ecompile"
# Line 939  Line 1058 
1058    
1059      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1060               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1061               link="${jdkapidocs.url}"               link="${java.api.url}"
1062               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1063               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1064               source="7"               source="${build.jsr166e.java.version}"
1065               executable="${javadoc7}">               executable="${javadoc7}">
1066          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1067        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1068    
1069      </javadoc>      </javadoc>
1070    </target>    </target>
1071    
1072    
1073    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck-one-java-version"
1074            depends="jsr166ejar"            depends="jsr166ejar">
1075            description="Runs tck tests for jsr166e">  
1076        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1077    
1078      <run-tck-tests      <run-tck-tests
1079        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1080        target="7"        target="${build.jsr166e.java.version}"
1081        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1082        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1083    </target>    </target>
1084    
1085      <target name="jsr166e-test-tck"
1086              description="Runs tck tests for jsr166e for multiple java versions">
1087    
1088    <!--     <antcall target="clean"/> -->
1089    <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1090    <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1091    <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1092    <!--     </antcall> -->
1093    
1094        <antcall target="clean"/>
1095        <antcall target="jsr166e-test-tck-one-java-version">
1096          <param name="build.jsr166e.java.version" value="7"/>
1097          <param name="build.jsr166e.javac" value="${javac7}"/>
1098        </antcall>
1099    
1100        <antcall target="clean"/>
1101        <antcall target="jsr166e-test-tck-one-java-version">
1102          <param name="build.jsr166e.java.version" value="6"/>
1103          <param name="build.jsr166e.javac" value="${javac6}"/>
1104        </antcall>
1105      </target>
1106    
1107    
1108      <target name="jsr166e-test"
1109              depends="jsr166e-test-tck"
1110              description="Runs all tests for jsr166e">
1111      </target>
1112    
1113    <target name="jsr166edist"    <target name="jsr166edist"
1114            depends="jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
# Line 973  Line 1121 
1121    </target>    </target>
1122    
1123    
   <target name="jsr166edist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1124    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1125            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1126      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
# Line 993  Line 1136 
1136    
1137    <target name="lint">    <target name="lint">
1138      <antcall target="dists">      <antcall target="dists">
1139          <param name="build.javadoc.access" value="public"/>
1140        </antcall>
1141      </target>
1142    
1143    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1144      <target name="lint-private">
1145        <antcall target="dist">
1146        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1147      </antcall>      </antcall>
1148    </target>    </target>

Legend:
Removed from v.1.142  
changed lines
  Added in v.1.164

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8