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

Diff of /jsr166/build.xml

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

revision 1.145 by jsr166, Sun Jul 14 22:39:31 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  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  As of 2013-02, the very latest lambda 8 Line 50  As of 2013-02, the very latest lambda 8
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  As of 2013-02, the very latest lambda 8 Line 122  As of 2013-02, the very latest lambda 8
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  As of 2013-02, the very latest lambda 8 Line 163  As of 2013-02, the very latest lambda 8
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  As of 2013-02, the very latest lambda 8 Line 199  As of 2013-02, the very latest lambda 8
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  As of 2013-02, the very latest lambda 8 Line 213  As of 2013-02, the very latest lambda 8
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  As of 2013-02, the very latest lambda 8 Line 221  As of 2013-02, the very latest lambda 8
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  As of 2013-02, the very latest lambda 8 Line 233  As of 2013-02, the very latest lambda 8
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 229  As of 2013-02, the very latest lambda 8 Line 251  As of 2013-02, the very latest lambda 8
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">    <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}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
283      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
284      <attribute name="target"/>      <attribute name="target"/>
# Line 245  As of 2013-02, the very latest lambda 8 Line 294  As of 2013-02, the very latest lambda 8
294             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
295             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
296             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
297          <patternset refid="jdk@{target}.jtreg.tests"/>
298        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}"/>
299        <arg value="-agentvm"/>        <arg value="-agentvm"/>
300        <arg value="-v:nopass,fail"/>        <arg value="-v:nopass,fail"/>
# Line 268  As of 2013-02, the very latest lambda 8 Line 317  As of 2013-02, the very latest lambda 8
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 286  As of 2013-02, the very latest lambda 8 Line 338  As of 2013-02, the very latest lambda 8
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"/>        <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 320  As of 2013-02, the very latest lambda 8 Line 375  As of 2013-02, the very latest lambda 8
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}"/>
# Line 376  As of 2013-02, the very latest lambda 8 Line 433  As of 2013-02, the very latest lambda 8
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>
# Line 391  As of 2013-02, the very latest lambda 8 Line 449  As of 2013-02, the very latest lambda 8
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"    <target name="test-tck"
454            depends="jar"            depends="jar"
455            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
456    
457      <run-tck-tests      <run-tck-tests
458        target="8"        target="${build.main.java.version}"
459        workdir="${build.dir}"        workdir="${build.dir}"
460        classes="${product.jar}"/>        classes="${product.jar}"/>
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="test-tck-parallelism-0"
471              description="Runs test-tck with given common pool parallelism">
472        <antcall target="test-tck">
473          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
474        </antcall>
475      </target>
476    
477      <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
478    <target name="test-jtreg"    <target name="test-jtreg"
479            depends="jar"            depends="jar"
480            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
481      <run-jtreg-tests      <run-jtreg-tests
482         target="8"         target="${build.main.java.version}"
483         workdir="${build.dir}"         workdir="${build.dir}"
484         classes="${product.jar}"/>         classes="${product.jar}"/>
485    </target>    </target>
486    
487    <target name="test"    <target name="test"
488            depends="test-tck, test-jtreg"            depends="test-tck, test-tck-parallelism-1, test-jtreg"
489            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
490    </target>    </target>
491    
492      <target name="test89"
493              description="Runs tck and jtreg tests for main for multiple java versions">
494    
495        <antcall target="clean"/>
496        <antcall target="test">
497          <param name="build.main.java.version" value="8"/>
498          <param name="build.main.javac" value="${javac8}"/>
499          <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>
500        </antcall>
501    
502        <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>
509    
510    
511    
512    <target name="configure-compiler">    <target name="configure-compiler">
# Line 490  As of 2013-02, the very latest lambda 8 Line 581  As of 2013-02, the very latest lambda 8
581        <compilerarg value="-Xprefer:source"/>        <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 518  As of 2013-02, the very latest lambda 8 Line 639  As of 2013-02, the very latest lambda 8
639        <javac-elements>        <javac-elements>
640          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
641          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
642            <exclude name="*9Test.java"/>
643          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
644          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
645          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 564  As of 2013-02, the very latest lambda 8 Line 686  As of 2013-02, the very latest lambda 8
686      <run-jtreg-tests      <run-jtreg-tests
687         target="7"         target="7"
688         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
689         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
690    </target>    </target>
691    
692    
# Line 583  As of 2013-02, the very latest lambda 8 Line 704  As of 2013-02, the very latest lambda 8
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 592  As of 2013-02, the very latest lambda 8 Line 713  As of 2013-02, the very latest lambda 8
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 610  As of 2013-02, the very latest lambda 8 Line 732  As of 2013-02, the very latest lambda 8
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 651  As of 2013-02, the very latest lambda 8 Line 768  As of 2013-02, the very latest lambda 8
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 676  As of 2013-02, the very latest lambda 8 Line 794  As of 2013-02, the very latest lambda 8
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 701  As of 2013-02, the very latest lambda 8 Line 820  As of 2013-02, the very latest lambda 8
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 742  As of 2013-02, the very latest lambda 8 Line 855  As of 2013-02, the very latest lambda 8
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 767  As of 2013-02, the very latest lambda 8 Line 881  As of 2013-02, the very latest lambda 8
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 792  As of 2013-02, the very latest lambda 8 Line 907  As of 2013-02, the very latest lambda 8
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 833  As of 2013-02, the very latest lambda 8 Line 943  As of 2013-02, the very latest lambda 8
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 858  As of 2013-02, the very latest lambda 8 Line 969  As of 2013-02, the very latest lambda 8
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 883  As of 2013-02, the very latest lambda 8 Line 995  As of 2013-02, the very latest lambda 8
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 924  As of 2013-02, the very latest lambda 8 Line 1031  As of 2013-02, the very latest lambda 8
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 949  As of 2013-02, the very latest lambda 8 Line 1084  As of 2013-02, the very latest lambda 8
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}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1090               source="${build.jsr166e.java.version}"               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>
# Line 961  As of 2013-02, the very latest lambda 8 Line 1097  As of 2013-02, the very latest lambda 8
1097    
1098    
1099    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-test-tck-one-java-version"
1100            depends="jsr166ejar"            depends="jsr166ejar">
           description="Runs tck tests for jsr166e">  
1101    
1102      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1103    
# Line 996  As of 2013-02, the very latest lambda 8 Line 1131  As of 2013-02, the very latest lambda 8
1131    </target>    </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"
1141            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
# Line 1007  As of 2013-02, the very latest lambda 8 Line 1147  As of 2013-02, the very latest lambda 8
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 1027  As of 2013-02, the very latest lambda 8 Line 1162  As of 2013-02, the very latest lambda 8
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.145  
changed lines
  Added in v.1.165

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