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

Diff of /jsr166/build.xml

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

revision 1.144 by jsr166, Sun Jul 14 19:55:04 2013 UTC revision 1.172 by jsr166, Wed Sep 2 05:00:20 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          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
266          <exclude name="util/WeakHashMap/GCDuringIteration.java"/>
267        </patternset>
268      </fileset>
269    
270      <fileset dir="${jtreg.src.dir}">
271        <patternset id="jdk7.jtreg.tests">
272          <include name="**/*.java"/>
273          <exclude name="util/Collection/CollectionDefaults.java"/>
274          <exclude name="util/List/ListDefaults.java"/>
275          <exclude name="util/Spliterator/**/*.java"/>
276          <exclude name="**/CompletableFuture/**/*.java"/>
277          <exclude name="**/ConcurrentAssociateTest.java"/>
278          <exclude name="**/ConcurrentContainsKeyTest.java"/>
279          <exclude name="**/ConcurrentHashMap/ToArray.java"/>
280          <exclude name="**/ConcurrentRemoveIf.java"/>
281          <exclude name="**/COWSubList.java"/>
282          <exclude name="**/FutureTask/NegativeTimeout.java"/>
283          <exclude name="**/LinkedTransferQueue/SpliteratorTraverseAddRemoveTest.java"/>
284          <exclude name="**/forkjoin/SubmissionTest.java"/>
285          <exclude name="**/StampedLock/**/*.java"/>
286          <exclude name="**/AtomicReferenceTest.java"/>
287          <exclude name="util/concurrent/atomic/Serial.java"/>
288        </patternset>
289      </fileset>
290    
291    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
292        <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
293      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
294      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
295      <attribute name="target"/>      <attribute name="target"/>
# Line 245  As of 2013-02, the very latest lambda 8 Line 305  As of 2013-02, the very latest lambda 8
305             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
306             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
307             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
308          <patternset refid="jdk@{target}.jtreg.tests"/>
309        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}"/>
310        <arg value="-agentvm"/>        <arg value="-agentvm"/>
311        <arg value="-v:nopass,fail"/>        <arg value="-v:nopass,fail"/>
# Line 268  As of 2013-02, the very latest lambda 8 Line 328  As of 2013-02, the very latest lambda 8
328    
329    <!-- Main targets -->    <!-- Main targets -->
330    
331      <property name="build.main.java.version" value="9"/>
332      <property name="build.main.javac" value="${javac9}"/>
333    
334    <target name="dists"    <target name="dists"
335            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
336            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 349  As of 2013-02, the very latest lambda 8
349             classpath=""             classpath=""
350             includeAntRuntime="false"             includeAntRuntime="false"
351             includeJavaRuntime="false"             includeJavaRuntime="false"
352             executable="${javac8}"             executable="${build.main.javac}"
353             fork="true">             fork="true">
354    
355        <include name="**/*.java"/>        <include name="**/*.java"/>
356        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
357        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
358        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
359          <compilerarg value="-Werror"/>
360          <compilerarg value="-Xdoclint:all/protected"/>
361          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
362        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
363    
364      </javac>      </javac>
# Line 320  As of 2013-02, the very latest lambda 8 Line 386  As of 2013-02, the very latest lambda 8
386    
387      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
388               packagenames="none"               packagenames="none"
389               link="${jdkapi8docs.url}"               link="${java9.api.url}"
390               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
391               access="${build.javadoc.access}"               access="${build.javadoc.access}"
392               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk9src.dir}"
393               classpath=""               classpath=""
394               executable="${javadoc8}">               executable="${javadoc9}">
395        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
396          <include name="**/*.java"/>          <include name="**/*.java"/>
397        </fileset>        </fileset>
398          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
399          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
400        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
401        <arg value="-tag"/>        <arg value="-tag"/>
402        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
# Line 376  As of 2013-02, the very latest lambda 8 Line 444  As of 2013-02, the very latest lambda 8
444    <target name="dist-clean"    <target name="dist-clean"
445            description="Removes all build and distribution products">            description="Removes all build and distribution products">
446    
447        <delete dir="${build.dir}"/>
448      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
449    
450    </target>    </target>
# Line 391  As of 2013-02, the very latest lambda 8 Line 460  As of 2013-02, the very latest lambda 8
460      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
461    </target>    </target>
462    
463      <target name="tck" depends="test-tck" description="alias for test-tck"/>
464    <target name="test-tck"    <target name="test-tck"
465            depends="jar"            depends="jar"
466            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
467    
468      <run-tck-tests      <run-tck-tests
469        target="8"        target="${build.main.java.version}"
470        workdir="${build.dir}"        workdir="${build.dir}"
471        classes="${product.jar}"/>        classes="${product.jar}"/>
472    </target>    </target>
473    
474      <target name="test-tck-parallelism-1"
475              description="Runs test-tck with given common pool parallelism">
476        <antcall target="test-tck">
477          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
478        </antcall>
479      </target>
480    
481      <target name="test-tck-parallelism-0"
482              description="Runs test-tck with given common pool parallelism">
483        <antcall target="test-tck">
484          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
485        </antcall>
486      </target>
487    
488      <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
489    <target name="test-jtreg"    <target name="test-jtreg"
490            depends="jar"            depends="jar"
491            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
492      <run-jtreg-tests      <run-jtreg-tests
493         target="8"         target="${build.main.java.version}"
494         workdir="${build.dir}"         workdir="${build.dir}"
495         classes="${product.jar}"/>         classes="${product.jar}"/>
496    </target>    </target>
497    
498    <target name="test"    <target name="test"
499            depends="test-tck, test-jtreg"            depends="test-tck, test-tck-parallelism-1, test-jtreg"
500            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
501    </target>    </target>
502    
503      <target name="jtreg8" description="Runs jtreg tests with jdk8">
504    
505        <antcall target="jtreg">
506          <param name="build.main.java.version" value="8"/>
507          <param name="build.main.javac" value="${javac8}"/>
508        </antcall>
509    
510      </target>
511    
512      <target name="test89"
513              description="Runs tck and jtreg tests for main for multiple java versions">
514    
515        <antcall target="clean"/>
516        <antcall target="test">
517          <param name="build.main.java.version" value="8"/>
518          <param name="build.main.javac" value="${javac8}"/>
519        </antcall>
520    
521        <antcall target="clean"/>
522        <antcall target="test">
523          <param name="build.main.java.version" value="9"/>
524          <param name="build.main.javac" value="${javac9}"/>
525        </antcall>
526    
527      </target>
528    
529    
530    
531    <target name="configure-compiler">    <target name="configure-compiler">
# Line 465  As of 2013-02, the very latest lambda 8 Line 575  As of 2013-02, the very latest lambda 8
575    </target>    </target>
576    
577    
578      <target name="compile-test-loops" depends="jar"
579              description="compile all the perf tests in src/test/loops">
580    
581        <mkdir dir="${build.dir}/test/loops"/>
582    
583        <javac srcdir="${basedir}/src/test/loops"
584               destdir="${build.dir}/test/loops"
585               debug="${build.debug}"
586               debuglevel="${build.debuglevel}"
587               deprecation="${build.deprecation}"
588               includeAntRuntime="false"
589               includeJavaRuntime="false"
590               executable="${javac9}"
591               fork="true">
592    
593          <include name="*.java"/>
594          <compilerarg value="-XDignore.symbol.file=true"/>
595          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
596          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
597          <compilerarg line="${build.args}"/>
598    
599        </javac>
600    
601      </target>
602    
603    
604    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
605    
606    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 490  As of 2013-02, the very latest lambda 8 Line 626  As of 2013-02, the very latest lambda 8
626        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
627        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
628        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
629          <compilerarg value="-Werror"/>
630          <compilerarg line="${build.args}"/>
631    
632        </javac>
633      </target>
634    
635      <target name="4jdk7doclint"
636              depends="configure-compiler"
637              description="Finds doclint warnings">
638    
639        <mkdir dir="${build.4jdk7.classes.dir}"/>
640    
641        <javac srcdir="${4jdk7src.dir}"
642               destdir="${build.4jdk7.classes.dir}"
643               debug="${build.debug}"
644               debuglevel="${build.debuglevel}"
645               deprecation="${build.deprecation}"
646               source="6"
647               classpath=""
648               bootclasspath="${bootclasspath7}"
649               includeAntRuntime="false"
650               includeJavaRuntime="false"
651               executable="${javac8}"
652               fork="true">
653    
654          <include name="**/*.java"/>
655          <compilerarg value="-Xprefer:source"/>
656          <compilerarg value="-XDignore.symbol.file=true"/>
657          <compilerarg value="-Xlint:all"/>
658          <compilerarg value="-Xdoclint:all/protected"/>
659        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
660    
661      </javac>      </javac>
# Line 518  As of 2013-02, the very latest lambda 8 Line 684  As of 2013-02, the very latest lambda 8
684        <javac-elements>        <javac-elements>
685          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
686          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
687            <exclude name="*9Test.java"/>
688          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
689          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
690          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
691          <exclude name="LongAdderTest.java"/>          <exclude name="LongAdderTest.java"/>
692          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
693            <exclude name="SplittableRandomTest.java"/>
694          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
695        </javac-elements>        </javac-elements>
696      </run-tck-tests>      </run-tck-tests>
# Line 563  As of 2013-02, the very latest lambda 8 Line 731  As of 2013-02, the very latest lambda 8
731      <run-jtreg-tests      <run-jtreg-tests
732         target="7"         target="7"
733         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
734         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
735    </target>    </target>
736    
737    
# Line 582  As of 2013-02, the very latest lambda 8 Line 749  As of 2013-02, the very latest lambda 8
749    
750      <javadoc destdir="${4jdk7docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
751               packagenames="none"               packagenames="none"
752               link="${jdkapi7docs.url}"               link="${java7.api.url}"
753               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
754               access="${build.javadoc.access}"               access="${build.javadoc.access}"
755               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 591  As of 2013-02, the very latest lambda 8 Line 758  As of 2013-02, the very latest lambda 8
758        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
759          <include name="**/*.java"/>          <include name="**/*.java"/>
760        </fileset>        </fileset>
761          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
762        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
763      </javadoc>      </javadoc>
764    </target>    </target>
# Line 609  As of 2013-02, the very latest lambda 8 Line 777  As of 2013-02, the very latest lambda 8
777    </target>    </target>
778    
779    
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
780    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
781            depends="4jdk7clean, 4jdk7jar">            depends="4jdk7clean, 4jdk7jar">
782      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 650  As of 2013-02, the very latest lambda 8 Line 813  As of 2013-02, the very latest lambda 8
813        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
814        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
815        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
816          <compilerarg value="-Werror"/>
817        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
818    
819      </javac>      </javac>
# Line 675  As of 2013-02, the very latest lambda 8 Line 839  As of 2013-02, the very latest lambda 8
839    
840      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
841               packagenames="jsr166x.*"               packagenames="jsr166x.*"
842               link="${jdkapidocs.url}"               link="${java.api.url}"
843               access="${build.javadoc.access}"               access="${build.javadoc.access}"
844               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
845               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
846               source="5"               source="5"
847               executable="${javadoc7}">               executable="${javadoc7}">
848          <arg line="-Xdocrootparent ${java.docroot.url}"/>
849        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
850    
851      </javadoc>      </javadoc>
# Line 700  As of 2013-02, the very latest lambda 8 Line 865  As of 2013-02, the very latest lambda 8
865    </target>    </target>
866    
867    
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
868    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
869            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
870      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 741  As of 2013-02, the very latest lambda 8 Line 900  As of 2013-02, the very latest lambda 8
900        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
901        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
902        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
903          <compilerarg value="-Werror"/>
904        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
905    
906      </javac>      </javac>
# Line 766  As of 2013-02, the very latest lambda 8 Line 926  As of 2013-02, the very latest lambda 8
926    
927      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
928               packagenames="jsr166y.*"               packagenames="jsr166y.*"
929               link="${jdkapidocs.url}"               link="${java.api.url}"
930               access="${build.javadoc.access}"               access="${build.javadoc.access}"
931               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
932               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
933               source="6"               source="6"
934               executable="${javadoc7}">               executable="${javadoc7}">
935          <arg line="-Xdocrootparent ${java.docroot.url}"/>
936        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
937    
938      </javadoc>      </javadoc>
# Line 791  As of 2013-02, the very latest lambda 8 Line 952  As of 2013-02, the very latest lambda 8
952    </target>    </target>
953    
954    
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
955    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
956            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
957      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 832  As of 2013-02, the very latest lambda 8 Line 988  As of 2013-02, the very latest lambda 8
988        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
989        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
990        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
991          <compilerarg value="-Werror"/>
992        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
993    
994      </javac>      </javac>
# Line 857  As of 2013-02, the very latest lambda 8 Line 1014  As of 2013-02, the very latest lambda 8
1014    
1015      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1016               packagenames="extra166y.*"               packagenames="extra166y.*"
1017               link="${jdkapidocs.url}"               link="${java.api.url}"
1018               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1019               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1020               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1021               source="6"               source="6"
1022               executable="${javadoc7}">               executable="${javadoc7}">
1023          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1024        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1025    
1026      </javadoc>      </javadoc>
# Line 882  As of 2013-02, the very latest lambda 8 Line 1040  As of 2013-02, the very latest lambda 8
1040    </target>    </target>
1041    
1042    
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1043    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1044            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
1045      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 923  As of 2013-02, the very latest lambda 8 Line 1076  As of 2013-02, the very latest lambda 8
1076        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1077        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1078        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1079          <compilerarg value="-Werror"/>
1080        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1081    
1082      </javac>      </javac>
1083    </target>    </target>
1084    
1085      <!-- jsr166e: find doclint errors -->
1086      <target name="jsr166edoclint">
1087    
1088        <mkdir dir="${build.jsr166e.classes.dir}"/>
1089    
1090        <javac srcdir="${topsrc.dir}"
1091               destdir="${build.jsr166e.classes.dir}"
1092               debug="${build.debug}"
1093               debuglevel="${build.debuglevel}"
1094               deprecation="${build.deprecation}"
1095               source="${build.jsr166e.java.version}"
1096               classpath=""
1097               bootclasspath="${bootclasspath7}"
1098               includeAntRuntime="false"
1099               includeJavaRuntime="false"
1100               executable="${javac8}"
1101               fork="true">
1102    
1103          <include name="jsr166e/**/*.java"/>
1104          <compilerarg value="-XDignore.symbol.file=true"/>
1105          <compilerarg value="-Xlint:all"/>
1106          <compilerarg value="-Werror"/>
1107          <compilerarg value="-Xdoclint:all/protected"/>
1108    
1109        </javac>
1110      </target>
1111    
1112    
1113    <target name="jsr166ejar"    <target name="jsr166ejar"
1114            depends="jsr166ecompile"            depends="jsr166ecompile"
# Line 948  As of 2013-02, the very latest lambda 8 Line 1129  As of 2013-02, the very latest lambda 8
1129    
1130      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1131               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1132               link="${jdkapidocs.url}"               link="${java.api.url}"
1133               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1134               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1135               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1136               executable="${javadoc7}">               executable="${javadoc7}">
1137          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1138        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1139    
1140      </javadoc>      </javadoc>
# Line 960  As of 2013-02, the very latest lambda 8 Line 1142  As of 2013-02, the very latest lambda 8
1142    
1143    
1144    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-test-tck-one-java-version"
1145            depends="jsr166ejar"            depends="jsr166ejar">
           description="Runs tck tests for jsr166e">  
1146    
1147      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1148    
# Line 995  As of 2013-02, the very latest lambda 8 Line 1176  As of 2013-02, the very latest lambda 8
1176    </target>    </target>
1177    
1178    
1179      <target name="jsr166e-test"
1180              depends="jsr166e-test-tck"
1181              description="Runs all tests for jsr166e">
1182      </target>
1183    
1184    <target name="jsr166edist"    <target name="jsr166edist"
1185            depends="jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
1186            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
# Line 1006  As of 2013-02, the very latest lambda 8 Line 1192  As of 2013-02, the very latest lambda 8
1192    </target>    </target>
1193    
1194    
   <target name="jsr166edist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1195    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1196            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1197      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
# Line 1026  As of 2013-02, the very latest lambda 8 Line 1207  As of 2013-02, the very latest lambda 8
1207    
1208    <target name="lint">    <target name="lint">
1209      <antcall target="dists">      <antcall target="dists">
1210          <param name="build.javadoc.access" value="public"/>
1211        </antcall>
1212      </target>
1213    
1214    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1215      <target name="lint-private">
1216        <antcall target="dist">
1217        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1218      </antcall>      </antcall>
1219    </target>    </target>

Legend:
Removed from v.1.144  
changed lines
  Added in v.1.172

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