/[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.168 by jsr166, Wed Sep 2 02:14:59 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="util/concurrent/CompletableFuture/**/*.java"/>
277          <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
278          <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
279        </patternset>
280      </fileset>
281    
282    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
283        <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
284      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
285      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
286      <attribute name="target"/>      <attribute name="target"/>
# Line 245  As of 2013-02, the very latest lambda 8 Line 296  As of 2013-02, the very latest lambda 8
296             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
297             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
298             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
299          <patternset refid="jdk@{target}.jtreg.tests"/>
300        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}"/>
301        <arg value="-agentvm"/>        <arg value="-agentvm"/>
302        <arg value="-v:nopass,fail"/>        <arg value="-v:nopass,fail"/>
# Line 268  As of 2013-02, the very latest lambda 8 Line 319  As of 2013-02, the very latest lambda 8
319    
320    <!-- Main targets -->    <!-- Main targets -->
321    
322      <property name="build.main.java.version" value="9"/>
323      <property name="build.main.javac" value="${javac9}"/>
324    
325    <target name="dists"    <target name="dists"
326            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
327            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 340  As of 2013-02, the very latest lambda 8
340             classpath=""             classpath=""
341             includeAntRuntime="false"             includeAntRuntime="false"
342             includeJavaRuntime="false"             includeJavaRuntime="false"
343             executable="${javac8}"             executable="${build.main.javac}"
344             fork="true">             fork="true">
345    
346        <include name="**/*.java"/>        <include name="**/*.java"/>
347        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
348        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
349        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
350          <compilerarg value="-Werror"/>
351          <compilerarg value="-Xdoclint:all/protected"/>
352          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
353        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
354    
355      </javac>      </javac>
# Line 320  As of 2013-02, the very latest lambda 8 Line 377  As of 2013-02, the very latest lambda 8
377    
378      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
379               packagenames="none"               packagenames="none"
380               link="${jdkapi8docs.url}"               link="${java9.api.url}"
381               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
382               access="${build.javadoc.access}"               access="${build.javadoc.access}"
383               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk9src.dir}"
384               classpath=""               classpath=""
385               executable="${javadoc8}">               executable="${javadoc9}">
386        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
387          <include name="**/*.java"/>          <include name="**/*.java"/>
388        </fileset>        </fileset>
389          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
390          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
391        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
392        <arg value="-tag"/>        <arg value="-tag"/>
393        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
# Line 376  As of 2013-02, the very latest lambda 8 Line 435  As of 2013-02, the very latest lambda 8
435    <target name="dist-clean"    <target name="dist-clean"
436            description="Removes all build and distribution products">            description="Removes all build and distribution products">
437    
438        <delete dir="${build.dir}"/>
439      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
440    
441    </target>    </target>
# Line 391  As of 2013-02, the very latest lambda 8 Line 451  As of 2013-02, the very latest lambda 8
451      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
452    </target>    </target>
453    
454      <target name="tck" depends="test-tck" description="alias for test-tck"/>
455    <target name="test-tck"    <target name="test-tck"
456            depends="jar"            depends="jar"
457            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
458    
459      <run-tck-tests      <run-tck-tests
460        target="8"        target="${build.main.java.version}"
461        workdir="${build.dir}"        workdir="${build.dir}"
462        classes="${product.jar}"/>        classes="${product.jar}"/>
463    </target>    </target>
464    
465      <target name="test-tck-parallelism-1"
466              description="Runs test-tck with given common pool parallelism">
467        <antcall target="test-tck">
468          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
469        </antcall>
470      </target>
471    
472      <target name="test-tck-parallelism-0"
473              description="Runs test-tck with given common pool parallelism">
474        <antcall target="test-tck">
475          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
476        </antcall>
477      </target>
478    
479      <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
480    <target name="test-jtreg"    <target name="test-jtreg"
481            depends="jar"            depends="jar"
482            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
483      <run-jtreg-tests      <run-jtreg-tests
484         target="8"         target="${build.main.java.version}"
485         workdir="${build.dir}"         workdir="${build.dir}"
486         classes="${product.jar}"/>         classes="${product.jar}"/>
487    </target>    </target>
488    
489    <target name="test"    <target name="test"
490            depends="test-tck, test-jtreg"            depends="test-tck, test-tck-parallelism-1, test-jtreg"
491            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
492    </target>    </target>
493    
494      <target name="jtreg8" description="Runs jtreg tests with jdk8">
495    
496        <antcall target="jtreg">
497          <param name="build.main.java.version" value="8"/>
498          <param name="build.main.javac" value="${javac8}"/>
499        </antcall>
500    
501      </target>
502    
503      <target name="test89"
504              description="Runs tck and jtreg tests for main for multiple java versions">
505    
506        <antcall target="clean"/>
507        <antcall target="test">
508          <param name="build.main.java.version" value="8"/>
509          <param name="build.main.javac" value="${javac8}"/>
510        </antcall>
511    
512        <antcall target="clean"/>
513        <antcall target="test">
514          <param name="build.main.java.version" value="9"/>
515          <param name="build.main.javac" value="${javac9}"/>
516        </antcall>
517    
518      </target>
519    
520    
521    
522    <target name="configure-compiler">    <target name="configure-compiler">
# Line 465  As of 2013-02, the very latest lambda 8 Line 566  As of 2013-02, the very latest lambda 8
566    </target>    </target>
567    
568    
569      <target name="compile-test-loops" depends="jar"
570              description="compile all the perf tests in src/test/loops">
571    
572        <mkdir dir="${build.dir}/test/loops"/>
573    
574        <javac srcdir="${basedir}/src/test/loops"
575               destdir="${build.dir}/test/loops"
576               debug="${build.debug}"
577               debuglevel="${build.debuglevel}"
578               deprecation="${build.deprecation}"
579               includeAntRuntime="false"
580               includeJavaRuntime="false"
581               executable="${javac9}"
582               fork="true">
583    
584          <include name="*.java"/>
585          <compilerarg value="-XDignore.symbol.file=true"/>
586          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
587          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
588          <compilerarg line="${build.args}"/>
589    
590        </javac>
591    
592      </target>
593    
594    
595    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
596    
597    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 490  As of 2013-02, the very latest lambda 8 Line 617  As of 2013-02, the very latest lambda 8
617        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
618        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
619        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
620          <compilerarg value="-Werror"/>
621          <compilerarg line="${build.args}"/>
622    
623        </javac>
624      </target>
625    
626      <target name="4jdk7doclint"
627              depends="configure-compiler"
628              description="Finds doclint warnings">
629    
630        <mkdir dir="${build.4jdk7.classes.dir}"/>
631    
632        <javac srcdir="${4jdk7src.dir}"
633               destdir="${build.4jdk7.classes.dir}"
634               debug="${build.debug}"
635               debuglevel="${build.debuglevel}"
636               deprecation="${build.deprecation}"
637               source="6"
638               classpath=""
639               bootclasspath="${bootclasspath7}"
640               includeAntRuntime="false"
641               includeJavaRuntime="false"
642               executable="${javac8}"
643               fork="true">
644    
645          <include name="**/*.java"/>
646          <compilerarg value="-Xprefer:source"/>
647          <compilerarg value="-XDignore.symbol.file=true"/>
648          <compilerarg value="-Xlint:all"/>
649          <compilerarg value="-Xdoclint:all/protected"/>
650        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
651    
652      </javac>      </javac>
# Line 518  As of 2013-02, the very latest lambda 8 Line 675  As of 2013-02, the very latest lambda 8
675        <javac-elements>        <javac-elements>
676          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
677          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
678            <exclude name="*9Test.java"/>
679          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
680          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
681          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
682          <exclude name="LongAdderTest.java"/>          <exclude name="LongAdderTest.java"/>
683          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
684            <exclude name="SplittableRandomTest.java"/>
685          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
686        </javac-elements>        </javac-elements>
687      </run-tck-tests>      </run-tck-tests>
# Line 563  As of 2013-02, the very latest lambda 8 Line 722  As of 2013-02, the very latest lambda 8
722      <run-jtreg-tests      <run-jtreg-tests
723         target="7"         target="7"
724         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
725         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
726    </target>    </target>
727    
728    
# Line 582  As of 2013-02, the very latest lambda 8 Line 740  As of 2013-02, the very latest lambda 8
740    
741      <javadoc destdir="${4jdk7docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
742               packagenames="none"               packagenames="none"
743               link="${jdkapi7docs.url}"               link="${java7.api.url}"
744               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
745               access="${build.javadoc.access}"               access="${build.javadoc.access}"
746               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 591  As of 2013-02, the very latest lambda 8 Line 749  As of 2013-02, the very latest lambda 8
749        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
750          <include name="**/*.java"/>          <include name="**/*.java"/>
751        </fileset>        </fileset>
752          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
753        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
754      </javadoc>      </javadoc>
755    </target>    </target>
# Line 609  As of 2013-02, the very latest lambda 8 Line 768  As of 2013-02, the very latest lambda 8
768    </target>    </target>
769    
770    
   <target name="4jdk7dist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
771    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
772            depends="4jdk7clean, 4jdk7jar">            depends="4jdk7clean, 4jdk7jar">
773      <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 804  As of 2013-02, the very latest lambda 8
804        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
805        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
806        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
807          <compilerarg value="-Werror"/>
808        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
809    
810      </javac>      </javac>
# Line 675  As of 2013-02, the very latest lambda 8 Line 830  As of 2013-02, the very latest lambda 8
830    
831      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
832               packagenames="jsr166x.*"               packagenames="jsr166x.*"
833               link="${jdkapidocs.url}"               link="${java.api.url}"
834               access="${build.javadoc.access}"               access="${build.javadoc.access}"
835               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
836               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
837               source="5"               source="5"
838               executable="${javadoc7}">               executable="${javadoc7}">
839          <arg line="-Xdocrootparent ${java.docroot.url}"/>
840        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
841    
842      </javadoc>      </javadoc>
# Line 700  As of 2013-02, the very latest lambda 8 Line 856  As of 2013-02, the very latest lambda 8
856    </target>    </target>
857    
858    
   <target name="jsr166xdist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
   
859    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
860            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
861      <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 891  As of 2013-02, the very latest lambda 8
891        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
892        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
893        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
894          <compilerarg value="-Werror"/>
895        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
896    
897      </javac>      </javac>
# Line 766  As of 2013-02, the very latest lambda 8 Line 917  As of 2013-02, the very latest lambda 8
917    
918      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
919               packagenames="jsr166y.*"               packagenames="jsr166y.*"
920               link="${jdkapidocs.url}"               link="${java.api.url}"
921               access="${build.javadoc.access}"               access="${build.javadoc.access}"
922               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
923               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
924               source="6"               source="6"
925               executable="${javadoc7}">               executable="${javadoc7}">
926          <arg line="-Xdocrootparent ${java.docroot.url}"/>
927        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
928    
929      </javadoc>      </javadoc>
# Line 791  As of 2013-02, the very latest lambda 8 Line 943  As of 2013-02, the very latest lambda 8
943    </target>    </target>
944    
945    
   <target name="jsr166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
946    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
947            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
948      <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 979  As of 2013-02, the very latest lambda 8
979        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
980        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
981        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
982          <compilerarg value="-Werror"/>
983        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
984    
985      </javac>      </javac>
# Line 857  As of 2013-02, the very latest lambda 8 Line 1005  As of 2013-02, the very latest lambda 8
1005    
1006      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1007               packagenames="extra166y.*"               packagenames="extra166y.*"
1008               link="${jdkapidocs.url}"               link="${java.api.url}"
1009               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1010               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1011               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1012               source="6"               source="6"
1013               executable="${javadoc7}">               executable="${javadoc7}">
1014          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1015        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1016    
1017      </javadoc>      </javadoc>
# Line 882  As of 2013-02, the very latest lambda 8 Line 1031  As of 2013-02, the very latest lambda 8
1031    </target>    </target>
1032    
1033    
   <target name="extra166ydist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1034    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
1035            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
1036      <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 1067  As of 2013-02, the very latest lambda 8
1067        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1068        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1069        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1070          <compilerarg value="-Werror"/>
1071        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1072    
1073      </javac>      </javac>
1074    </target>    </target>
1075    
1076      <!-- jsr166e: find doclint errors -->
1077      <target name="jsr166edoclint">
1078    
1079        <mkdir dir="${build.jsr166e.classes.dir}"/>
1080    
1081        <javac srcdir="${topsrc.dir}"
1082               destdir="${build.jsr166e.classes.dir}"
1083               debug="${build.debug}"
1084               debuglevel="${build.debuglevel}"
1085               deprecation="${build.deprecation}"
1086               source="${build.jsr166e.java.version}"
1087               classpath=""
1088               bootclasspath="${bootclasspath7}"
1089               includeAntRuntime="false"
1090               includeJavaRuntime="false"
1091               executable="${javac8}"
1092               fork="true">
1093    
1094          <include name="jsr166e/**/*.java"/>
1095          <compilerarg value="-XDignore.symbol.file=true"/>
1096          <compilerarg value="-Xlint:all"/>
1097          <compilerarg value="-Werror"/>
1098          <compilerarg value="-Xdoclint:all/protected"/>
1099    
1100        </javac>
1101      </target>
1102    
1103    
1104    <target name="jsr166ejar"    <target name="jsr166ejar"
1105            depends="jsr166ecompile"            depends="jsr166ecompile"
# Line 948  As of 2013-02, the very latest lambda 8 Line 1120  As of 2013-02, the very latest lambda 8
1120    
1121      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1122               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1123               link="${jdkapidocs.url}"               link="${java.api.url}"
1124               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1125               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1126               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1127               executable="${javadoc7}">               executable="${javadoc7}">
1128          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1129        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1130    
1131      </javadoc>      </javadoc>
# Line 960  As of 2013-02, the very latest lambda 8 Line 1133  As of 2013-02, the very latest lambda 8
1133    
1134    
1135    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-test-tck-one-java-version"
1136            depends="jsr166ejar"            depends="jsr166ejar">
           description="Runs tck tests for jsr166e">  
1137    
1138      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1139    
# Line 995  As of 2013-02, the very latest lambda 8 Line 1167  As of 2013-02, the very latest lambda 8
1167    </target>    </target>
1168    
1169    
1170      <target name="jsr166e-test"
1171              depends="jsr166e-test-tck"
1172              description="Runs all tests for jsr166e">
1173      </target>
1174    
1175    <target name="jsr166edist"    <target name="jsr166edist"
1176            depends="jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"
1177            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 1183  As of 2013-02, the very latest lambda 8
1183    </target>    </target>
1184    
1185    
   <target name="jsr166edist-clean"  
           description="Removes all build and distribution products">  
   
   </target>  
   
1186    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1187            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1188      <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 1198  As of 2013-02, the very latest lambda 8
1198    
1199    <target name="lint">    <target name="lint">
1200      <antcall target="dists">      <antcall target="dists">
1201          <param name="build.javadoc.access" value="public"/>
1202        </antcall>
1203      </target>
1204    
1205    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1206      <target name="lint-private">
1207        <antcall target="dist">
1208        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1209      </antcall>      </antcall>
1210    </target>    </target>

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

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