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

Diff of /jsr166/build.xml

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

revision 1.149, Sat Jul 20 20:40:24 2013 UTC revision 1.179, Sun Sep 13 03:22:29 2015 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage">  <project name="jsr166" default="usage"
2      xmlns:if="ant:if" xmlns:unless="ant:unless">
3    
4    <description>    <description>
5  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 16  Line 17 
17    $HOME/jdk/jdk6    $HOME/jdk/jdk6
18    $HOME/jdk/jdk7    $HOME/jdk/jdk7
19    $HOME/jdk/jdk8    $HOME/jdk/jdk8
20      $HOME/jdk/jdk9
21    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
22    $HOME/jdk/src/jdk6    $HOME/jdk/src/jdk6
23    $HOME/jdk/src/jdk7    $HOME/jdk/src/jdk7
24    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
25      $HOME/jdk/src/jdk9
26    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
27    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
28  As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.  
29      Alternatively, define ant variables thus:
30      ant -Djdk$N.home=...
31      for $N in 6 7 8 9 ...
32  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
33    </description>    </description>
34    
# Line 33  Line 39 
39      </java>      </java>
40    </target>    </target>
41    
42      <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
43    
44    <!-- User-specific settings -->    <!-- User-specific settings -->
45    <property file="user.properties"/>    <property file="user.properties"/>
# Line 45  Line 52 
52    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
53    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
54    
55    <!-- Tck options; see JSR166TestCase.java -->    <!-- Tck options; see JSR166TestCase.java
56    <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->     To profile a single tck test class:
57       ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
58       To stress test a single tck test class:
59       ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
60      -->
61    <property name="jsr166.profileTests"     value="false"/>    <property name="jsr166.profileTests"     value="false"/>
62    <property name="jsr166.profileThreshold" value="100"/>    <property name="jsr166.profileThreshold" value="100"/>
63    <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 -->  
64    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
65    
66    <!-- Build locations -->    <!-- Build locations -->
# Line 86  Line 95 
95      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
98      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <available property="jdk@{v}.have.java.base"
99          file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
100        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
101          if:set="jdk@{v}.have.java.base"/>
102        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
103          unless:set="jdk@{v}.have.java.base"/>
104      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
105      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
106      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}">
# Line 115  Line 129 
129    <defjdklocations v="6"/>    <defjdklocations v="6"/>
130    <defjdklocations v="7"/>    <defjdklocations v="7"/>
131    <defjdklocations v="8"/>    <defjdklocations v="8"/>
132      <defjdklocations v="9"/>
133    
134    <!-- Source locations -->    <!-- Source locations -->
135    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
136    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
137    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
138    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
139    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
140      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
141      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
142      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
143    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
144    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
145    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 155  Line 173 
173    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
174    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
175    
176    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
177    <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"/>
178    <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"/>
179    <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"/>
180      <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
181    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <!-- The expected canonical location does not yet exist as of 2014-07 -->
182    <!-- The below does not yet exist as of 2013-01 -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
183    <!-- <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"/>
184      <!-- Default jdk doc location (latest stable release seems best) -->
185      <property name="java.docroot.url"       value="${java8.docroot.url}"/>
186    
187    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
188    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
189      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
190      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
191      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
192      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
193      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
194    
195    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
196    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
# Line 184  Line 209 
209      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
210      <attribute name="workdir"/>      <attribute name="workdir"/>
211      <attribute name="classes"/>      <attribute name="classes"/>
212      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
213      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
214      <sequential>      <sequential>
215    
# Line 198  Line 223 
223             source="@{compile-target}"             source="@{compile-target}"
224             target="@{compile-target}"             target="@{compile-target}"
225             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{compile-target}}"  
226             includeAntRuntime="false"             includeAntRuntime="false"
227             includeJavaRuntime="false"             includeJavaRuntime="false"
228             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
# Line 207  Line 231 
231        <include name="*.java"/>        <include name="*.java"/>
232        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
233        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
234          <compilerarg value="-Xbootclasspath/p:@{classes}"/>
235        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
236        <javac-elements/>        <javac-elements/>
237    
# Line 218  Line 243 
243            fork="true">            fork="true">
244          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
245          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
246    
247            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
248            <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
249              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
250            </syspropertyset>
251    
252          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
253          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
254          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
# Line 230  Line 261 
261      </sequential>      </sequential>
262    </macrodef>    </macrodef>
263    
264      <!-- Define jtreg test sets for different jdk versions -->
265      <fileset dir="${jtreg9.src.dir}">
266        <patternset id="jdk9.jtreg.tests">
267          <include name="**/*.java"/>
268        </patternset>
269      </fileset>
270    
271      <fileset dir="${jtreg8.src.dir}">
272        <patternset id="jdk8.jtreg.tests">
273          <include name="**/*.java"/>
274          <exclude name="**/SpliteratorCharacteristics.java"/>
275          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
276          <exclude name="**/GCDuringIteration.java"/>
277        </patternset>
278      </fileset>
279    
280      <fileset dir="${jtreg7.src.dir}">
281        <patternset id="jdk7.jtreg.tests">
282          <include name="**/*.java"/>
283        </patternset>
284      </fileset>
285    
286    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
287      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
288      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
289      <attribute name="target"/>      <attribute name="target"/>
290      <attribute name="workdir"/>      <attribute name="workdir"/>
# Line 242  Line 295 
295      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
296      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
297      <mkdir dir="@{workdir}/JTreport"/>      <mkdir dir="@{workdir}/JTreport"/>
298      <jtreg dir="@{jtreg.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
299             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
300             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
301             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
302          <patternset refid="jdk@{target}.jtreg.tests"/>
303        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}"/>
304        <arg value="-agentvm"/>        <arg value="-agentvm"/>
305        <arg value="-v:nopass,fail"/>        <arg value="-v:nopass,fail"/>
# Line 269  Line 322 
322    
323    <!-- Main targets -->    <!-- Main targets -->
324    
325      <property name="build.main.java.version" value="9"/>
326      <property name="build.main.javac" value="${javac9}"/>
327    
328    <target name="dists"    <target name="dists"
329            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
330            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
# Line 287  Line 343 
343             classpath=""             classpath=""
344             includeAntRuntime="false"             includeAntRuntime="false"
345             includeJavaRuntime="false"             includeJavaRuntime="false"
346             executable="${javac8}"             executable="${build.main.javac}"
347             fork="true">             fork="true">
348    
349        <include name="**/*.java"/>        <include name="**/*.java"/>
350        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
351        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
352        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
353          <compilerarg value="-Werror"/>
354        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
355        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
356        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 308  Line 365 
365    
366      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
367        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
368          <manifest>
369            <attribute name="Built-By" value="${user.name}"/>
370            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
371          </manifest>
372      </jar>      </jar>
373    </target>    </target>
374    
# Line 323  Line 384 
384    
385      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
386               packagenames="none"               packagenames="none"
387               link="${jdkapi8docs.url}"               link="${java9.api.url}"
388               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
389               access="${build.javadoc.access}"               access="${build.javadoc.access}"
390               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk9src.dir}"
391               classpath=""               classpath=""
392               executable="${javadoc8}">               executable="${javadoc9}">
393        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
394          <include name="**/*.java"/>          <include name="**/*.java"/>
395        </fileset>        </fileset>
396          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
397        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
398        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
399        <arg value="-tag"/>        <arg value="-tag"/>
# Line 365  Line 427 
427        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
428        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
429        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
430          <manifest>
431            <attribute name="Built-By" value="${user.name}"/>
432            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
433          </manifest>
434      </jar>      </jar>
435    </target>    </target>
436    
# Line 396  Line 462 
462      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
463    </target>    </target>
464    
465      <target name="tck"
   <target name="test-tck"  
466            depends="jar"            depends="jar"
467            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
468    
469      <run-tck-tests      <run-tck-tests
470        target="8"        target="${build.main.java.version}"
471        workdir="${build.dir}"        workdir="${build.dir}"
472        classes="${product.jar}"/>        classes="${product.jar}"/>
473    </target>    </target>
474    
475    <target name="test-jtreg"    <target name="tck-parallelism-1"
476              description="Runs tck with given common pool parallelism">
477        <antcall target="tck">
478          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
479        </antcall>
480      </target>
481    
482      <target name="tck-parallelism-0"
483              description="Runs tck with given common pool parallelism">
484        <antcall target="tck">
485          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
486        </antcall>
487      </target>
488    
489      <target name="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="tck, tck-parallelism-1, 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 470  Line 575 
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 495  Line 626 
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}"/>        <compilerarg line="${build.args}"/>
631    
632      </javac>      </javac>
# Line 536  Line 668 
668    
669      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
670        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
671          <manifest>
672            <attribute name="Built-By" value="${user.name}"/>
673            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
674          </manifest>
675      </jar>      </jar>
676    
677    </target>    </target>
678    
679    
680    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
681            depends="4jdk7jar"            depends="4jdk7jar"
682            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
683    
# Line 552  Line 688 
688        <javac-elements>        <javac-elements>
689          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
690          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
691            <exclude name="*9Test.java"/>
692            <exclude name="*10Test.java"/>
693          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
694          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
695          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 559  Line 697 
697          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
698          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
699          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
700            <exclude name="SubmissionPublisherTest.java"/>
701        </javac-elements>        </javac-elements>
702      </run-tck-tests>      </run-tck-tests>
703    </target>    </target>
704    
705    
706    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
707            depends="4jdk7compile"            depends="4jdk7compile"
708            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
709    
# Line 592  Line 731 
731      </junit>      </junit>
732    </target>    </target>
733    
734    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
735            depends="4jdk7jar"            depends="4jdk7jar"
736            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
737      <run-jtreg-tests      <run-jtreg-tests
738         target="7"         target="7"
739         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
740         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
741    </target>    </target>
742    
743    
744    <target name="4jdk7-test"    <target name="4jdk7-test"
745            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
746            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
747    </target>    </target>
748    
# Line 617  Line 755 
755    
756      <javadoc destdir="${4jdk7docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
757               packagenames="none"               packagenames="none"
758               link="${jdkapi7docs.url}"               link="${java7.api.url}"
759               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
760               access="${build.javadoc.access}"               access="${build.javadoc.access}"
761               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
# Line 626  Line 764 
764        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
765          <include name="**/*.java"/>          <include name="**/*.java"/>
766        </fileset>        </fileset>
767          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
768        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
769      </javadoc>      </javadoc>
770    </target>    </target>
# Line 680  Line 819 
819        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
820        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
821        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
822          <compilerarg value="-Werror"/>
823        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
824    
825      </javac>      </javac>
# Line 692  Line 832 
832    
833      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
834        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
835          <manifest>
836            <attribute name="Built-By" value="${user.name}"/>
837            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
838          </manifest>
839      </jar>      </jar>
840    
841    </target>    </target>
# Line 705  Line 849 
849    
850      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
851               packagenames="jsr166x.*"               packagenames="jsr166x.*"
852               link="${jdkapidocs.url}"               link="${java.api.url}"
853               access="${build.javadoc.access}"               access="${build.javadoc.access}"
854               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
855               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
856               source="5"               source="5"
857               executable="${javadoc7}">               executable="${javadoc7}">
858          <arg line="-Xdocrootparent ${java.docroot.url}"/>
859        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
860    
861      </javadoc>      </javadoc>
# Line 765  Line 910 
910        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
911        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
912        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
913          <compilerarg value="-Werror"/>
914        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
915    
916      </javac>      </javac>
# Line 777  Line 923 
923    
924      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
925        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
926          <manifest>
927            <attribute name="Built-By" value="${user.name}"/>
928            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
929          </manifest>
930      </jar>      </jar>
931    
932    </target>    </target>
# Line 790  Line 940 
940    
941      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
942               packagenames="jsr166y.*"               packagenames="jsr166y.*"
943               link="${jdkapidocs.url}"               link="${java.api.url}"
944               access="${build.javadoc.access}"               access="${build.javadoc.access}"
945               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
946               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
947               source="6"               source="6"
948               executable="${javadoc7}">               executable="${javadoc7}">
949          <arg line="-Xdocrootparent ${java.docroot.url}"/>
950        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
951    
952      </javadoc>      </javadoc>
# Line 851  Line 1002 
1002        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
1003        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1004        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1005          <compilerarg value="-Werror"/>
1006        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1007    
1008      </javac>      </javac>
# Line 863  Line 1015 
1015    
1016      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1017        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1018          <manifest>
1019            <attribute name="Built-By" value="${user.name}"/>
1020            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1021          </manifest>
1022      </jar>      </jar>
1023    
1024    </target>    </target>
# Line 876  Line 1032 
1032    
1033      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1034               packagenames="extra166y.*"               packagenames="extra166y.*"
1035               link="${jdkapidocs.url}"               link="${java.api.url}"
1036               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1037               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1038               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1039               source="6"               source="6"
1040               executable="${javadoc7}">               executable="${javadoc7}">
1041          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1042        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1043    
1044      </javadoc>      </javadoc>
# Line 937  Line 1094 
1094        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1095        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1096        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1097          <compilerarg value="-Werror"/>
1098        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1099    
1100      </javac>      </javac>
1101    </target>    </target>
1102    
1103      <!-- jsr166e: find doclint errors -->
1104      <target name="jsr166edoclint">
1105    
1106        <mkdir dir="${build.jsr166e.classes.dir}"/>
1107    
1108        <javac srcdir="${topsrc.dir}"
1109               destdir="${build.jsr166e.classes.dir}"
1110               debug="${build.debug}"
1111               debuglevel="${build.debuglevel}"
1112               deprecation="${build.deprecation}"
1113               source="${build.jsr166e.java.version}"
1114               classpath=""
1115               bootclasspath="${bootclasspath7}"
1116               includeAntRuntime="false"
1117               includeJavaRuntime="false"
1118               executable="${javac8}"
1119               fork="true">
1120    
1121          <include name="jsr166e/**/*.java"/>
1122          <compilerarg value="-XDignore.symbol.file=true"/>
1123          <compilerarg value="-Xlint:all"/>
1124          <compilerarg value="-Werror"/>
1125          <compilerarg value="-Xdoclint:all/protected"/>
1126    
1127        </javac>
1128      </target>
1129    
1130    
1131    <target name="jsr166ejar"    <target name="jsr166ejar"
1132            depends="jsr166ecompile"            depends="jsr166ecompile"
# Line 949  Line 1134 
1134    
1135      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1136        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1137          <manifest>
1138            <attribute name="Built-By" value="${user.name}"/>
1139            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1140          </manifest>
1141      </jar>      </jar>
1142    
1143    </target>    </target>
# Line 962  Line 1151 
1151    
1152      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1153               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1154               link="${jdkapidocs.url}"               link="${java.api.url}"
1155               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1156               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1157               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1158               executable="${javadoc7}">               executable="${javadoc7}">
1159          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1160        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1161    
1162      </javadoc>      </javadoc>
1163    </target>    </target>
1164    
1165    
1166    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1167            depends="jsr166ejar">            depends="jsr166ejar">
1168    
1169      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 985  Line 1175 
1175        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1176    </target>    </target>
1177    
1178    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1179            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1180    
1181  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1182  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1183  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1184  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1185  <!--     </antcall> -->  <!--     </antcall> -->
1186    
1187      <antcall target="clean"/>      <antcall target="clean"/>
1188      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1189        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1190        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1191      </antcall>      </antcall>
1192    
1193      <antcall target="clean"/>      <antcall target="clean"/>
1194      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1195        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1196        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1197      </antcall>      </antcall>
# Line 1009  Line 1199 
1199    
1200    
1201    <target name="jsr166e-test"    <target name="jsr166e-test"
1202            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1203            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1204    </target>    </target>
1205    
# Line 1039  Line 1229 
1229    
1230    <target name="lint">    <target name="lint">
1231      <antcall target="dists">      <antcall target="dists">
1232          <param name="build.javadoc.access" value="public"/>
1233        </antcall>
1234      </target>
1235    
1236    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1237      <target name="lint-private">
1238        <antcall target="dist">
1239        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1240      </antcall>      </antcall>
1241    </target>    </target>

Legend:
Removed from v.1.149  
changed lines
  Added in v.1.179

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8