[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.166, Mon Aug 10 06:32:23 2015 UTC revision 1.224, Thu Nov 24 01:58:04 2016 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 6  Line 7 
7    
8    Usage: ant [target]    Usage: ant [target]
9    
10      See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
11      more details.
12    
13    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
14    See user.properties.sample for an explanation of some useful settings.    See user.properties.sample for an explanation of some useful settings.
15    
# Line 26  Line 30 
30    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
31    
32    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
33    ant -Djdk$N.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
34    for $N in 6 7 8 9 ...    for $N in 6 7 8 9 ...
35    
36      As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37      target is currently broken.
38  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
39    </description>    </description>
40    
41    <!-- Display main targets by running 'ant -projecthelp' -->    <!-- Run 'ant -projecthelp' (default target) -->
42    <target name="usage">    <target name="usage">
43      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
44        <arg value="-projecthelp" />        <arg value="-projecthelp" />
45      </java>      </java>
46    </target>    </target>
47    
48      <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
49    
50    <!-- User-specific settings -->    <!-- User-specific settings -->
51    <property file="user.properties"/>    <property file="user.properties"/>
# Line 50  Line 58 
58    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
59    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
60    
   <!-- Tck options; see JSR166TestCase.java  
    To profile a single tck test class:  
    ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck  
    To stress test a single tck test class:  
    ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck  
   -->  
   <property name="jsr166.profileTests"     value="false"/>  
   <property name="jsr166.profileThreshold" value="100"/>  
   <property name="jsr166.runsPerTest"      value="1"/>  
   <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>  
   
61    <!-- Build locations -->    <!-- Build locations -->
62    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
63    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
64    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
65    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.reports.dir"           location="${build.dir}/reports"/>  
66    
67    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
69    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71    
72      <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
73      <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
74      <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
75      <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
76    
77    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
78    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
79    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
# Line 93  Line 94 
94      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
95      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
96      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
97      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
98        <local name="have.java.base"/>
99        <available property="have.java.base"
100          file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
101        <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
102          if:set="have.java.base"/>
103        <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
104          unless:set="have.java.base"/>
105        <local name="modules"/>
106        <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
107      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
108      <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"/>
109      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}" unless:set="modules">
110        <pathelement path="${boot.jar.dir}/resources.jar"/>        <pathelement path="${boot.jar.dir}/resources.jar"/>
111        <pathelement path="${boot.jar.dir}/rt.jar"/>        <pathelement path="${boot.jar.dir}/rt.jar"/>
112        <pathelement path="${boot.jar.dir}/jsse.jar"/>        <pathelement path="${boot.jar.dir}/jsse.jar"/>
113        <pathelement path="${boot.jar.dir}/jce.jar"/>        <pathelement path="${boot.jar.dir}/jce.jar"/>
114        <pathelement path="${boot.jar.dir}/charsets.jar"/>        <pathelement path="${boot.jar.dir}/charsets.jar"/>
115      </path>      </path>
116      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
117      </sequential>      </sequential>
118    </macrodef>    </macrodef>
119    
# Line 129  Line 139 
139    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
140    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
141    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
142    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
143      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
144      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
145      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
146    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
147    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
148    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
149    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150      <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 142  Line 156 
156    <!-- Javadoc locations -->    <!-- Javadoc locations -->
157    <property name="docs.dir"          location="${build.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
158    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159      <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
# Line 149  Line 164 
164    
165    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167      <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 157  Line 173 
173    <!-- Jar locations -->    <!-- Jar locations -->
174    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176      <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
# Line 168  Line 185 
185    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
186    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
187    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
188    <!-- The expected canonical location does not yet exist as of 2014-07 -->    <!-- The expected canonical location does not yet exist as of 2016-04 -->
189    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
190    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>    <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
191    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
192    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
193    
# Line 187  Line 204 
204    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
205             classpath="${lib.dir}/jtreg.jar" />             classpath="${lib.dir}/jtreg.jar" />
206    
207    <!-- Test classpath -->    <!-- Tck options; see JSR166TestCase.java
208    <path id="test.classpath">     To profile a single tck test class:
209      <pathelement location="${build.testcases.dir}"/>     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
210      <pathelement location="${junit.jar}"/>     To stress test a single tck test class:
211    </path>     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
212       To stress test a single tck test method:
213       ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
214      -->
215      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
216    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
217      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
218      <attribute name="target"/>      <attribute name="target"/>
219      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
220      <attribute name="workdir"/>      <attribute name="workdir"/>
221      <attribute name="classes"/>      <attribute name="classes"/>
222        <!--
223            <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
224        -->
225      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
226      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
227    
228      <sequential>      <sequential>
229    
230        <local name="modules"/>
231        <condition property="modules">
232          <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233        </condition>
234    
235      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
236    
237      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 215  Line 244 
244             classpath="${junit.jar}"             classpath="${junit.jar}"
245             includeAntRuntime="false"             includeAntRuntime="false"
246             includeJavaRuntime="false"             includeJavaRuntime="false"
247               encoding="ASCII"
248             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
249             fork="true">             fork="true">
250    
251        <include name="*.java"/>        <include name="*.java"/>
252        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
253        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
254        <compilerarg value="-Xbootclasspath/p:@{classes}"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
255          <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
256        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
257        <javac-elements/>        <javac-elements/>
258    
# Line 231  Line 262 
262            failonerror="true"            failonerror="true"
263            jvm="${java@{target}}"            jvm="${java@{target}}"
264            fork="true">            fork="true">
265          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266            <jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
267          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
268            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
269            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
270    
271          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
272          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">          <syspropertyset id="system-properties-used-by-tck">
273            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
274              <propertyref prefix="jsr166."/>
275              <propertyref name="test.timeout.factor"/>
276          </syspropertyset>          </syspropertyset>
277    
         <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>  
         <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>  
         <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>  
278          <classpath>          <classpath>
279            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
280            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 252  Line 285 
285    </macrodef>    </macrodef>
286    
287    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
288    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg9.src.dir}">
289      <patternset id="jdk9.jtreg.tests">      <patternset id="jdk9.jtreg.tests">
290        <include name="**/*.java"/>        <include name="**/*.java"/>
291      </patternset>      </patternset>
292    </fileset>    </fileset>
293    
294    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg8.src.dir}">
295      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
296        <include name="**/*.java"/>        <include name="**/*.java"/>
297        <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>        <exclude name="**/SpliteratorCharacteristics.java"/>
298          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
299          <exclude name="**/GCDuringIteration.java"/>
300      </patternset>      </patternset>
301    </fileset>    </fileset>
302    
303    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg7.src.dir}">
304      <patternset id="jdk7.jtreg.tests">      <patternset id="jdk7.jtreg.tests">
305        <include name="**/*.java"/>        <include name="**/*.java"/>
       <exclude name="util/Collection/CollectionDefaults.java"/>  
       <exclude name="util/List/ListDefaults.java"/>  
       <exclude name="util/Spliterator/**/*.java"/>  
       <exclude name="util/concurrent/CompletableFuture/**/*.java"/>  
       <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>  
       <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>  
306      </patternset>      </patternset>
307    </fileset>    </fileset>
308    
309      <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
310      <property name="jtreg.flags" value=""/>
311    
312    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
313      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>  
314      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
315      <attribute name="target"/>      <attribute name="target"/>
316      <attribute name="workdir"/>      <attribute name="workdir"/>
317      <attribute name="classes"/>      <attribute name="classes"/>
318      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
319    
320      <sequential>      <sequential>
321    
322        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
323        <property name="jtreg.verbose" value="nopass,fail,error"/>
324    
325        <local name="modules"/>
326        <condition property="modules">
327          <available file="${jdk@{target}.home}/jmods" type="dir"/>
328        </condition>
329    
330      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
331      <delete dir="@{workdir}/JTreport" quiet="true"/>      <jtreg dir="${jtreg@{target}.src.dir}"
     <mkdir dir="@{workdir}/JTwork/scratch"/>  
     <mkdir dir="@{workdir}/JTreport"/>  
     <jtreg dir="@{jtreg.src.dir}"  
332             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
333             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork">
            reportDir="@{workdir}/JTreport">  
334        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
335        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
336          <arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
337          <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
338        <arg value="-agentvm"/>        <arg value="-agentvm"/>
339        <arg value="-v:nopass,fail"/>        <arg value="-noreport"/>
340          <arg value="-verbose:${jtreg.verbose}"/>
341        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
342        <arg value="-automatic"/>        <arg value="-automatic"/>
343        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
344        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
345          <arg line="${jtreg.flags}"/>
346      </jtreg>      </jtreg>
347      </sequential>      </sequential>
348    </macrodef>    </macrodef>
# Line 321  Line 362 
362    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
363    
364    <target name="dists"    <target name="dists"
365            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
366            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
367    
368    <target name="compile"    <target name="compile"
369            depends="configure-compiler"            depends="configure-compiler"
370            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
371    
372      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
373        <condition property="modules">
374          <and>
375            <available file="${jdk9.home}/jmods" type="dir"/>
376            <equals arg1="9" arg2="${build.main.java.version}"/>
377          </and>
378        </condition>
379    
380        <local name="destdir"/>
381        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
382        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
383    
384        <mkdir dir="${destdir}"/>
385    
386      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
387             destdir="${build.classes.dir}"             destdir="${destdir}"
388             debug="${build.debug}"             debug="${build.debug}"
389             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
390             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
391             classpath=""             classpath=""
392             includeAntRuntime="false"             includeAntRuntime="false"
393             includeJavaRuntime="false"             includeJavaRuntime="false"
394               encoding="ASCII"
395             executable="${build.main.javac}"             executable="${build.main.javac}"
396             fork="true">             fork="true">
397    
398        <include name="**/*.java"/>        <include name="**/*.java"/>
399          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
400        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
401        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
402        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
# Line 356  Line 411 
411    
412    <target name="jar"    <target name="jar"
413            depends="compile"            depends="compile"
414            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
415        <local name="subdir"/>
416        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
417      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
418        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
419          <manifest>
420            <attribute name="Built-By" value="${user.name}"/>
421            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
422          </manifest>
423      </jar>      </jar>
424    </target>    </target>
425    
# Line 373  Line 433 
433      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
434      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
435    
436    <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
437    <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
438      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
439               packagenames="none"               packagenames="none"
440               link="${java9.api.url}"               link="${java9.api.url}"
441               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
442               access="${build.javadoc.access}"               access="${build.javadoc.access}"
443               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}"
444               classpath=""               classpath=""
445               executable="${javadoc9}">               executable="${javadoc9}">
446        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 387  Line 449 
449        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
450        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
451        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
452          <arg value="-Xmodule:java.base"/>
453        <arg value="-tag"/>        <arg value="-tag"/>
454        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
455    <!-- @apiNote currently unused -->
456    <!--       <arg value="-tag"/> -->
457    <!--       <arg value="apiNote:a:API Note:"/> -->
458        <arg value="-tag"/>        <arg value="-tag"/>
459        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>        <arg value="implSpec:a:Implementation Requirements:"/>
460        <arg value="-tag"/>        <arg value="-tag"/>
461        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implNote:a:Implementation Note:"/>
462        <arg value="-tag"/>  <!-- tags added in jdk9: currently unused -->
463        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>  <!--       <arg value="-tag"/> -->
464    <!--       <arg value="revised:X"/> -->
465    <!--       <arg value="-tag"/> -->
466    <!--       <arg value="spec:X"/> -->
467      </javadoc>      </javadoc>
468    </target>    </target>
469    
# Line 418  Line 487 
487        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
488        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
489        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
490          <manifest>
491            <attribute name="Built-By" value="${user.name}"/>
492            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
493          </manifest>
494      </jar>      </jar>
495    </target>    </target>
496    
# Line 449  Line 522 
522      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
523    </target>    </target>
524    
525    <target name="tck" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <target name="test-tck"  
526            depends="jar"            depends="jar"
527            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
528    
529      <run-tck-tests      <run-tck-tests
530        target="${build.main.java.version}"        target="${build.main.java.version}"
# Line 460  Line 532 
532        classes="${product.jar}"/>        classes="${product.jar}"/>
533    </target>    </target>
534    
535    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
536            description="Runs test-tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
537      <antcall target="test-tck">      <antcall target="tck">
538        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
539      </antcall>      </antcall>
540    </target>    </target>
541    
542    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
543            description="Runs test-tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
544      <antcall target="test-tck">      <antcall target="tck">
545        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
546      </antcall>      </antcall>
547    </target>    </target>
548    
549    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="tck-security-manager"
550    <target name="test-jtreg"            description="Runs tck with a security manager">
551        <antcall target="tck">
552          <param name="jsr166.useSecurityManager" value="true"/>
553        </antcall>
554      </target>
555    
556      <target name="jtreg"
557            depends="jar"            depends="jar"
558            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
559      <run-jtreg-tests      <run-jtreg-tests
560         target="${build.main.java.version}"         target="${build.main.java.version}"
561         workdir="${build.dir}"         workdir="${build.dir}"
# Line 485  Line 563 
563    </target>    </target>
564    
565    <target name="test"    <target name="test"
566            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
567            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main">
568    </target>    </target>
569    
570    <target name="test89"  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
           description="Runs tck and jtreg tests for main for multiple java versions">  
571    
572      <antcall target="clean"/>  <!--     <antcall target="jtreg"> -->
573      <antcall target="test">  <!--       <param name="build.main.java.version" value="8"/> -->
574        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
575        <param name="build.main.javac" value="${javac8}"/>  <!--     </antcall> -->
       <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>  
     </antcall>  
576    
577      <antcall target="clean"/>  <!--   </target> -->
     <antcall target="test">  
       <param name="build.main.java.version" value="9"/>  
       <param name="build.main.javac" value="${javac9}"/>  
     </antcall>  
578    
579    </target>  <!--   <target name="test89" -->
580    <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
581    
582    <!--     <antcall target="clean"/> -->
583    <!--     <antcall target="test"> -->
584    <!--       <param name="build.main.java.version" value="8"/> -->
585    <!--       <param name="build.main.javac" value="${javac8}"/> -->
586    <!--     </antcall> -->
587    
588    <!--     <antcall target="clean"/> -->
589    <!--     <antcall target="test"> -->
590    <!--       <param name="build.main.java.version" value="9"/> -->
591    <!--       <param name="build.main.javac" value="${javac9}"/> -->
592    <!--     </antcall> -->
593    
594    <!--   </target> -->
595    
596    
597    
598    <target name="configure-compiler">    <target name="configure-compiler">
599        <fail message="ant version too old">
600          <condition>
601            <not> <antversion atleast="1.9.1"/> </not>
602          </condition>
603        </fail>
604    
605      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
606    
# Line 530  Line 621 
621    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
622    
623    
624    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
625            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
626    
627      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
628    
# Line 541  Line 632 
632         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
633        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
634             source="${build.sourcelevel}"             source="${build.sourcelevel}"
635               target="${build.sourcelevel}"
636             encoding="ASCII"
637               fork="true">               fork="true">
638    
639        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 568  Line 661 
661             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
662             includeAntRuntime="false"             includeAntRuntime="false"
663             includeJavaRuntime="false"             includeJavaRuntime="false"
664               encoding="ASCII"
665             executable="${javac9}"             executable="${javac9}"
666             fork="true">             fork="true">
667    
668        <include name="*.java"/>        <include name="*.java"/>
669        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
670        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
671        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
672        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
673    
# Line 582  Line 676 
676    </target>    </target>
677    
678    
679      <!-- jsr166 4jdk8 -->
680    
681      <target name="4jdk8compile"
682              depends="configure-compiler"
683              description="Compiles src/jdk8 sources, targeting jdk8">
684    
685        <mkdir dir="${build.4jdk8.classes.dir}"/>
686    
687        <javac srcdir="${4jdk8src.dir}"
688               destdir="${build.4jdk8.classes.dir}"
689               debug="${build.debug}"
690               debuglevel="${build.debuglevel}"
691               deprecation="${build.deprecation}"
692               source="8"
693               target="8"
694               classpath=""
695               bootclasspath="${bootclasspath8}"
696               includeAntRuntime="false"
697               includeJavaRuntime="false"
698               encoding="ASCII"
699               executable="${javac8}"
700               fork="true">
701    
702          <include name="**/*.java"/>
703          <compilerarg value="-Xprefer:source"/>
704          <compilerarg value="-XDignore.symbol.file=true"/>
705          <compilerarg value="-Xlint:all"/>
706          <compilerarg value="-Werror"/>
707          <compilerarg line="${build.args}"/>
708    
709        </javac>
710      </target>
711    
712      <target name="4jdk8doclint"
713              depends="configure-compiler"
714              description="Finds doclint warnings">
715    
716        <mkdir dir="${build.4jdk8.classes.dir}"/>
717    
718        <javac srcdir="${4jdk8src.dir}"
719               destdir="${build.4jdk8.classes.dir}"
720               debug="${build.debug}"
721               debuglevel="${build.debuglevel}"
722               deprecation="${build.deprecation}"
723               source="8"
724               target="8"
725               classpath=""
726               bootclasspath="${bootclasspath8}"
727               includeAntRuntime="false"
728               includeJavaRuntime="false"
729               encoding="ASCII"
730               executable="${javac8}"
731               fork="true">
732    
733          <include name="**/*.java"/>
734          <compilerarg value="-Xprefer:source"/>
735          <compilerarg value="-XDignore.symbol.file=true"/>
736          <compilerarg value="-Xlint:all"/>
737          <compilerarg value="-Xdoclint:all/protected"/>
738          <compilerarg line="${build.args}"/>
739    
740        </javac>
741      </target>
742    
743    
744      <target name="4jdk8jar"
745              depends="4jdk8compile"
746              description="Builds library jar from compiled sources">
747    
748        <jar destfile="${4jdk8product.jar}">
749          <fileset dir="${build.4jdk8.classes.dir}"/>
750          <manifest>
751            <attribute name="Built-By" value="${user.name}"/>
752            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
753          </manifest>
754        </jar>
755    
756      </target>
757    
758    
759      <target name="4jdk8-tck"
760              depends="4jdk8jar"
761              description="Runs tck tests for jsr166-4jdk8 directly">
762    
763        <run-tck-tests
764          target="8"
765          workdir="${build.4jdk8.dir}"
766          classes="${4jdk8product.jar}">
767          <javac-elements>
768            <!-- JDK9+ test classes -->
769            <exclude name="*9Test.java"/>
770            <exclude name="*10Test.java"/>
771          </javac-elements>
772        </run-tck-tests>
773      </target>
774    
775    
776      <target name="4jdk8-jtreg"
777              depends="4jdk8jar"
778              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
779        <run-jtreg-tests
780           target="8"
781           workdir="${build.4jdk8.dir}"
782           classes="${4jdk8product.jar}"/>
783      </target>
784    
785    
786      <target name="4jdk8-test"
787              depends="4jdk8-tck, 4jdk8-jtreg"
788              description="Runs tck and jtreg tests for jsr166-4jdk8">
789      </target>
790    
791    
792      <target name="4jdk8docs"
793              description="Builds javadocs for src/jdk8 to dist dir">
794    
795        <delete dir="${4jdk8docs.dir}"/>
796        <mkdir dir="${4jdk8docs.dir}"/>
797    
798        <javadoc destdir="${4jdk8docs.dir}"
799                 packagenames="none"
800                 link="${java8.api.url}"
801                 overview="${4jdk8src.dir}/intro.html"
802                 access="${build.javadoc.access}"
803                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
804                 classpath=""
805                 executable="${javadoc8}"
806                 failonerror = "true">
807          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
808            <include name="**/*.java"/>
809          </fileset>
810          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
811          <arg value="-XDignore.symbol.file=true"/>
812          <arg value="-tag"/>
813          <arg value="${javadoc.jls.option}"/>
814    <!-- @apiNote currently unused -->
815    <!--       <arg value="-tag"/> -->
816    <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
817          <arg value="-tag"/>
818          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
819          <arg value="-tag"/>
820          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
821        </javadoc>
822      </target>
823    
824    
825      <target name="4jdk8dist"
826              depends="4jdk8dist-jar, 4jdk8dist-docs"
827              description="Puts all distributable products in single hierarchy"/>
828    
829    
830      <target name="4jdk8clean"
831              description="Removes all 4jdk8 build products">
832    
833        <delete dir="${build.4jdk8.dir}"/>
834    
835      </target>
836    
837    
838      <target name="4jdk8dist-jar"
839              depends="4jdk8clean, 4jdk8jar">
840        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
841      </target>
842    
843    
844      <target name="4jdk8dist-docs"
845              depends="4jdk8clean, 4jdk8docs">
846        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
847      </target>
848    
849    
850    
851    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
852    
853    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 596  Line 862 
862             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
863             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
864             source="6"             source="6"
865               target="6"
866             classpath=""             classpath=""
867             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
868             includeAntRuntime="false"             includeAntRuntime="false"
869             includeJavaRuntime="false"             includeJavaRuntime="false"
870               encoding="ASCII"
871             executable="${javac7}"             executable="${javac7}"
872             fork="true">             fork="true">
873    
# Line 625  Line 893 
893             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
894             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
895             source="6"             source="6"
896               target="6"
897             classpath=""             classpath=""
898             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
899             includeAntRuntime="false"             includeAntRuntime="false"
900             includeJavaRuntime="false"             includeJavaRuntime="false"
901               encoding="ASCII"
902             executable="${javac8}"             executable="${javac8}"
903             fork="true">             fork="true">
904    
# Line 649  Line 919 
919    
920      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
921        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
922          <manifest>
923            <attribute name="Built-By" value="${user.name}"/>
924            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
925          </manifest>
926      </jar>      </jar>
927    
928    </target>    </target>
929    
930    
931    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
932            depends="4jdk7jar"            depends="4jdk7jar"
933            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
934    
# Line 666  Line 940 
940          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
941          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
942          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
943            <exclude name="*10Test.java"/>
944          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
945          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
946          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 673  Line 948 
948          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
949          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
950          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
951            <exclude name="SubmissionPublisherTest.java"/>
952        </javac-elements>        </javac-elements>
953      </run-tck-tests>      </run-tck-tests>
954    </target>    </target>
955    
956    
957    <target name="4jdk7-test-tck-junit"    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
958            depends="4jdk7compile"    <target name="4jdk7-tck-junit"
959            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            depends="4jdk7compile">
960    
961      <junit printsummary="true"      <junit printsummary="true"
962             showoutput="true"             showoutput="true"
# Line 706  Line 982 
982      </junit>      </junit>
983    </target>    </target>
984    
985    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
986            depends="4jdk7jar"            depends="4jdk7jar"
987            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
988      <run-jtreg-tests      <run-jtreg-tests
# Line 717  Line 993 
993    
994    
995    <target name="4jdk7-test"    <target name="4jdk7-test"
996            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
997            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
998    </target>    </target>
999    
# Line 733  Line 1009 
1009               link="${java7.api.url}"               link="${java7.api.url}"
1010               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
1011               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1012               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1013               classpath=""               classpath=""
1014               executable="${javadoc7}">               executable="${javadoc7}"
1015                 failonerror = "true">
1016        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1017          <include name="**/*.java"/>          <include name="**/*.java"/>
1018        </fileset>        </fileset>
# Line 786  Line 1063 
1063             classpath=""             classpath=""
1064             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1065             source="5"             source="5"
1066               target="5"
1067             includeAntRuntime="false"             includeAntRuntime="false"
1068             includeJavaRuntime="false"             includeJavaRuntime="false"
1069               encoding="ASCII"
1070             executable="${javac7}"             executable="${javac7}"
1071             fork="true">             fork="true">
1072    
# Line 807  Line 1086 
1086    
1087      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1088        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1089          <manifest>
1090            <attribute name="Built-By" value="${user.name}"/>
1091            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1092          </manifest>
1093      </jar>      </jar>
1094    
1095    </target>    </target>
# Line 822  Line 1105 
1105               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1106               link="${java.api.url}"               link="${java.api.url}"
1107               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1108               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1109               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1110               source="5"               source="5"
1111               executable="${javadoc7}">               executable="${javadoc7}"
1112                 failonerror = "true">
1113        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1114        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1115    
# Line 871  Line 1155 
1155             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1156             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1157             source="6"             source="6"
1158               target="6"
1159             classpath=""             classpath=""
1160             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1161             includeAntRuntime="false"             includeAntRuntime="false"
1162             includeJavaRuntime="false"             includeJavaRuntime="false"
1163               encoding="ASCII"
1164             executable="${javac7}"             executable="${javac7}"
1165             fork="true">             fork="true">
1166    
# Line 894  Line 1180 
1180    
1181      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1182        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1183          <manifest>
1184            <attribute name="Built-By" value="${user.name}"/>
1185            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1186          </manifest>
1187      </jar>      </jar>
1188    
1189    </target>    </target>
# Line 909  Line 1199 
1199               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1200               link="${java.api.url}"               link="${java.api.url}"
1201               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1202               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1203               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1204               source="6"               source="6"
1205               executable="${javadoc7}">               executable="${javadoc7}"
1206                 failonerror = "true">
1207        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1208        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1209    
# Line 961  Line 1252 
1252             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1253             classpath=""             classpath=""
1254             source="6"             source="6"
1255               target="6"
1256             includeAntRuntime="false"             includeAntRuntime="false"
1257             includeJavaRuntime="false"             includeJavaRuntime="false"
1258               encoding="ASCII"
1259             executable="${javac7}"             executable="${javac7}"
1260             fork="true">             fork="true">
1261    
# Line 982  Line 1275 
1275    
1276      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1277        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1278          <manifest>
1279            <attribute name="Built-By" value="${user.name}"/>
1280            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1281          </manifest>
1282      </jar>      </jar>
1283    
1284    </target>    </target>
# Line 997  Line 1294 
1294               packagenames="extra166y.*"               packagenames="extra166y.*"
1295               link="${java.api.url}"               link="${java.api.url}"
1296               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1297               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1298               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1299               source="6"               source="6"
1300               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1048  Line 1345 
1345             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1346             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1347             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1348               target="${build.jsr166e.java.version}"
1349             classpath=""             classpath=""
1350             includeAntRuntime="false"             includeAntRuntime="false"
1351             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1074  Line 1372 
1372             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1373             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1374             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1375               target="${build.jsr166e.java.version}"
1376             classpath=""             classpath=""
1377             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1378             includeAntRuntime="false"             includeAntRuntime="false"
1379             includeJavaRuntime="false"             includeJavaRuntime="false"
1380             executable="${javac8}"             executable="${javac8}"
# Line 1097  Line 1396 
1396    
1397      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1398        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1399          <manifest>
1400            <attribute name="Built-By" value="${user.name}"/>
1401            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1402          </manifest>
1403      </jar>      </jar>
1404    
1405    </target>    </target>
# Line 1112  Line 1415 
1415               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1416               link="${java.api.url}"               link="${java.api.url}"
1417               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1418               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1419               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1420               executable="${javadoc7}">               executable="${javadoc7}"
1421                 failonerror = "true">
1422        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1423        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1424    
# Line 1122  Line 1426 
1426    </target>    </target>
1427    
1428    
1429    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1430            depends="jsr166ejar">            depends="jsr166ejar">
1431    
1432      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1134  Line 1438 
1438        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1439    </target>    </target>
1440    
1441    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1442            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1443    
1444  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1445  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1446  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1447  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1448  <!--     </antcall> -->  <!--     </antcall> -->
1449    
1450      <antcall target="clean"/>      <antcall target="clean"/>
1451      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1452        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1453        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1454      </antcall>      </antcall>
1455    
1456      <antcall target="clean"/>      <antcall target="clean"/>
1457      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1458        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1459        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1460      </antcall>      </antcall>
# Line 1158  Line 1462 
1462    
1463    
1464    <target name="jsr166e-test"    <target name="jsr166e-test"
1465            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1466            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1467    </target>    </target>
1468    

Legend:
Removed from v.1.166  
changed lines
  Added in v.1.224

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8