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

Diff of /jsr166/build.xml

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

revision 1.150 by jsr166, Mon Jul 22 17:50:12 2013 UTC revision 1.193 by jsr166, Fri Dec 11 23:58:52 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      As of 2015-09, there is incomplete hacky support for jigsaw
34      Build for jigsaw using something like:
35      ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
36      "docs" target is still broken.
37  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
38    </description>    </description>
39    
# Line 33  As of 2013-02, the very latest lambda 8 Line 44  As of 2013-02, the very latest lambda 8
44      </java>      </java>
45    </target>    </target>
46    
47      <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
48    
49    <!-- User-specific settings -->    <!-- User-specific settings -->
50    <property file="user.properties"/>    <property file="user.properties"/>
# Line 45  As of 2013-02, the very latest lambda 8 Line 57  As of 2013-02, the very latest lambda 8
57    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
58    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
59    
   <!-- Tck options; see JSR166TestCase.java -->  
   <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->  
   <property name="jsr166.profileTests"     value="false"/>  
   <property name="jsr166.profileThreshold" value="100"/>  
   <property name="jsr166.runsPerTest"      value="1"/>  
   <!-- Allow running an individual tck test class -->  
   <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->  
   <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>  
   
60    <!-- Build locations -->    <!-- Build locations -->
61    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
62    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
# Line 86  As of 2013-02, the very latest lambda 8 Line 89  As of 2013-02, the very latest lambda 8
89      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
90      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
91      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
92      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <local name="have.java.base"/>
93        <available property="have.java.base"
94          file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
95        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
96          if:set="have.java.base"/>
97        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
98          unless:set="have.java.base"/>
99        <local name="modules"/>
100        <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
101      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
102      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
103      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}" unless:set="modules">
104        <pathelement path="${boot.jar.dir}/resources.jar"/>        <pathelement path="${boot.jar.dir}/resources.jar"/>
105        <pathelement path="${boot.jar.dir}/rt.jar"/>        <pathelement path="${boot.jar.dir}/rt.jar"/>
106        <pathelement path="${boot.jar.dir}/jsse.jar"/>        <pathelement path="${boot.jar.dir}/jsse.jar"/>
107        <pathelement path="${boot.jar.dir}/jce.jar"/>        <pathelement path="${boot.jar.dir}/jce.jar"/>
108        <pathelement path="${boot.jar.dir}/charsets.jar"/>        <pathelement path="${boot.jar.dir}/charsets.jar"/>
109      </path>      </path>
110      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
111      </sequential>      </sequential>
112    </macrodef>    </macrodef>
113    
# Line 115  As of 2013-02, the very latest lambda 8 Line 126  As of 2013-02, the very latest lambda 8
126    <defjdklocations v="6"/>    <defjdklocations v="6"/>
127    <defjdklocations v="7"/>    <defjdklocations v="7"/>
128    <defjdklocations v="8"/>    <defjdklocations v="8"/>
129      <defjdklocations v="9"/>
130    
131    <!-- Source locations -->    <!-- Source locations -->
132    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
133    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
134    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
135    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
136    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
137      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
138      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
139      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
140    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
141    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
142    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 155  As of 2013-02, the very latest lambda 8 Line 170  As of 2013-02, the very latest lambda 8
170    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
171    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
172    
173    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
174    <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"/>
175    <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"/>
176    <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"/>
177      <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
178    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <!-- The expected canonical location does not yet exist as of 2015-11 -->
179    <!-- The below does not yet exist as of 2013-01 -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
180    <!-- <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"/>
181      <!-- Default jdk doc location (latest stable release seems best) -->
182      <property name="java.docroot.url"       value="${java8.docroot.url}"/>
183    
184    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
185    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
186      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
187      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
188      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
189      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
190      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
191    
192    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
193    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
194    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
195             classpath="${lib.dir}/jtreg.jar" />             classpath="${lib.dir}/jtreg.jar" />
196    
197    <!-- Test classpath -->    <!-- Tck options; see JSR166TestCase.java
198    <path id="test.classpath">     To profile a single tck test class:
199      <pathelement location="${build.testcases.dir}"/>     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
200      <pathelement location="${junit.jar}"/>     To stress test a single tck test class:
201    </path>     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
202       To stress test a single tck test method:
203       ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
204      -->
205      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
206    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
207      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
208      <attribute name="target"/>      <attribute name="target"/>
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    
215      <sequential>      <sequential>
216    
217        <local name="modules"/>
218        <condition property="modules">
219          <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
220        </condition>
221    
222      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
223    
224      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 198  As of 2013-02, the very latest lambda 8 Line 229  As of 2013-02, the very latest lambda 8
229             source="@{compile-target}"             source="@{compile-target}"
230             target="@{compile-target}"             target="@{compile-target}"
231             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{compile-target}}"  
232             includeAntRuntime="false"             includeAntRuntime="false"
233             includeJavaRuntime="false"             includeJavaRuntime="false"
234             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
# Line 206  As of 2013-02, the very latest lambda 8 Line 236  As of 2013-02, the very latest lambda 8
236    
237        <include name="*.java"/>        <include name="*.java"/>
238        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
239        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
240          <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
241          <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
242        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
243        <javac-elements/>        <javac-elements/>
244    
# Line 216  As of 2013-02, the very latest lambda 8 Line 248  As of 2013-02, the very latest lambda 8
248            failonerror="true"            failonerror="true"
249            jvm="${java@{target}}"            jvm="${java@{target}}"
250            fork="true">            fork="true">
251          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
252            <jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
253          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
254          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>  
255          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
256          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>          <syspropertyset id="system-properties-used-by-tck">
257              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
258              <propertyref prefix="jsr166."/>
259            </syspropertyset>
260    
261          <classpath>          <classpath>
262            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
263            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 230  As of 2013-02, the very latest lambda 8 Line 267  As of 2013-02, the very latest lambda 8
267      </sequential>      </sequential>
268    </macrodef>    </macrodef>
269    
270      <!-- Define jtreg test sets for different jdk versions -->
271      <fileset dir="${jtreg9.src.dir}">
272        <patternset id="jdk9.jtreg.tests">
273          <include name="**/*.java"/>
274        </patternset>
275      </fileset>
276    
277      <fileset dir="${jtreg8.src.dir}">
278        <patternset id="jdk8.jtreg.tests">
279          <include name="**/*.java"/>
280          <exclude name="**/SpliteratorCharacteristics.java"/>
281          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
282          <exclude name="**/GCDuringIteration.java"/>
283        </patternset>
284      </fileset>
285    
286      <fileset dir="${jtreg7.src.dir}">
287        <patternset id="jdk7.jtreg.tests">
288          <include name="**/*.java"/>
289        </patternset>
290      </fileset>
291    
292    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
293      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
294      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
295      <attribute name="target"/>      <attribute name="target"/>
296      <attribute name="workdir"/>      <attribute name="workdir"/>
297      <attribute name="classes"/>      <attribute name="classes"/>
298      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
299    
300      <sequential>      <sequential>
301    
302        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
303        <property name="jtreg.verbose" value="nopass,fail,error"/>
304    
305        <local name="modules"/>
306        <condition property="modules">
307          <available file="${jdk@{target}.home}/jmods" type="dir"/>
308        </condition>
309    
310      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
311      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
312      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
313      <mkdir dir="@{workdir}/JTreport"/>      <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
314      <jtreg dir="@{jtreg.src.dir}"      <mkdir dir="@{workdir}/JTreport/html"/>
315        <mkdir dir="@{workdir}/JTreport/text"/>
316        <jtreg dir="${jtreg@{target}.src.dir}"
317             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
318             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
319             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
320          <patternset refid="jdk@{target}.jtreg.tests"/>
321        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
322          <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
323        <arg value="-agentvm"/>        <arg value="-agentvm"/>
324        <arg value="-v:nopass,fail"/>        <arg value="-verbose:${jtreg.verbose}"/>
325        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
326        <arg value="-automatic"/>        <arg value="-automatic"/>
327        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
# Line 269  As of 2013-02, the very latest lambda 8 Line 341  As of 2013-02, the very latest lambda 8
341    
342    <!-- Main targets -->    <!-- Main targets -->
343    
344      <property name="build.main.java.version" value="9"/>
345      <property name="build.main.javac" value="${javac9}"/>
346    
347    <target name="dists"    <target name="dists"
348            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
349            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
# Line 277  As of 2013-02, the very latest lambda 8 Line 352  As of 2013-02, the very latest lambda 8
352            depends="configure-compiler"            depends="configure-compiler"
353            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
354    
355      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
356        <condition property="modules">
357          <and>
358            <available file="${jdk9.home}/jmods" type="dir"/>
359            <equals arg1="9" arg2="${build.main.java.version}"/>
360          </and>
361        </condition>
362    
363        <local name="destdir"/>
364        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
365        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
366    
367        <mkdir dir="${destdir}"/>
368    
369      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
370             destdir="${build.classes.dir}"             destdir="${destdir}"
371             debug="${build.debug}"             debug="${build.debug}"
372             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
373             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
374             classpath=""             classpath=""
375             includeAntRuntime="false"             includeAntRuntime="false"
376             includeJavaRuntime="false"             includeJavaRuntime="false"
377             executable="${javac8}"             executable="${build.main.javac}"
378             fork="true">             fork="true">
379    
380        <include name="**/*.java"/>        <include name="**/*.java"/>
381          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
382        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
383        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
384        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
385          <compilerarg value="-Werror"/>
386        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
387        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
388        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 308  As of 2013-02, the very latest lambda 8 Line 397  As of 2013-02, the very latest lambda 8
397    
398      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
399        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
400          <manifest>
401            <attribute name="Built-By" value="${user.name}"/>
402            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
403          </manifest>
404      </jar>      </jar>
405    </target>    </target>
406    
# Line 323  As of 2013-02, the very latest lambda 8 Line 416  As of 2013-02, the very latest lambda 8
416    
417      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
418               packagenames="none"               packagenames="none"
419               link="${jdkapi8docs.url}"               link="${java9.api.url}"
420               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
421               access="${build.javadoc.access}"               access="${build.javadoc.access}"
422               sourcepath="${src.dir}:${jdk8src.dir}"               sourcepath="${src.dir}:${jdk9src.dir}"
423               classpath=""               classpath=""
424               executable="${javadoc8}">               executable="${javadoc9}">
425        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
426          <include name="**/*.java"/>          <include name="**/*.java"/>
427        </fileset>        </fileset>
428          <arg line="-Xdocrootparent ${java9.docroot.url}"/>
429        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
430        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
431    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
432        <arg value="-tag"/>        <arg value="-tag"/>
433        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
434        <arg value="-tag"/>        <arg value="-tag"/>
# Line 365  As of 2013-02, the very latest lambda 8 Line 460  As of 2013-02, the very latest lambda 8
460        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
461        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
462        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
463          <manifest>
464            <attribute name="Built-By" value="${user.name}"/>
465            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
466          </manifest>
467      </jar>      </jar>
468    </target>    </target>
469    
# Line 396  As of 2013-02, the very latest lambda 8 Line 495  As of 2013-02, the very latest lambda 8
495      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
496    </target>    </target>
497    
498      <target name="tck"
   <target name="test-tck"  
499            depends="jar"            depends="jar"
500            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
501    
502      <run-tck-tests      <run-tck-tests
503        target="8"        target="${build.main.java.version}"
504        workdir="${build.dir}"        workdir="${build.dir}"
505        classes="${product.jar}"/>        classes="${product.jar}"/>
506    </target>    </target>
507    
508    <target name="test-jtreg"    <target name="tck-parallelism-1"
509              description="Runs tck with given common pool parallelism">
510        <antcall target="tck">
511          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
512        </antcall>
513      </target>
514    
515      <target name="tck-parallelism-0"
516              description="Runs tck with given common pool parallelism">
517        <antcall target="tck">
518          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
519        </antcall>
520      </target>
521    
522      <target name="jtreg"
523            depends="jar"            depends="jar"
524            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
525      <run-jtreg-tests      <run-jtreg-tests
526         target="8"         target="${build.main.java.version}"
527         workdir="${build.dir}"         workdir="${build.dir}"
528         classes="${product.jar}"/>         classes="${product.jar}"/>
529    </target>    </target>
530    
531    <target name="test"    <target name="test"
532            depends="test-tck, test-jtreg"            depends="tck, tck-parallelism-1, jtreg"
533            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
534    </target>    </target>
535    
536      <target name="jtreg8" description="Runs jtreg tests with jdk8">
537    
538        <antcall target="jtreg">
539          <param name="build.main.java.version" value="8"/>
540          <param name="build.main.javac" value="${javac8}"/>
541        </antcall>
542    
543      </target>
544    
545      <target name="test89"
546              description="Runs tck and jtreg tests for main for multiple java versions">
547    
548        <antcall target="clean"/>
549        <antcall target="test">
550          <param name="build.main.java.version" value="8"/>
551          <param name="build.main.javac" value="${javac8}"/>
552        </antcall>