[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.172, Wed Sep 2 05:00:20 2015 UTC revision 1.202, Sat Mar 26 15:10:14 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    
# Line 38  Line 45 
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"/>
# Line 73  Line 70 
70    <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"/>
71    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
72    
73      <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
74      <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
75      <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
76      <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
77    
78    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
79    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
80    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
# Line 93  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"/>      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
99        <local name="have.java.base"/>
100        <available property="have.java.base"
101          file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
102        <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
103          if:set="have.java.base"/>
104        <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
105          unless:set="have.java.base"/>
106        <local name="modules"/>
107        <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
108      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
109      <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"/>
110      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}" unless:set="modules">
111        <pathelement path="${boot.jar.dir}/resources.jar"/>        <pathelement path="${boot.jar.dir}/resources.jar"/>
112        <pathelement path="${boot.jar.dir}/rt.jar"/>        <pathelement path="${boot.jar.dir}/rt.jar"/>
113        <pathelement path="${boot.jar.dir}/jsse.jar"/>        <pathelement path="${boot.jar.dir}/jsse.jar"/>
114        <pathelement path="${boot.jar.dir}/jce.jar"/>        <pathelement path="${boot.jar.dir}/jce.jar"/>
115        <pathelement path="${boot.jar.dir}/charsets.jar"/>        <pathelement path="${boot.jar.dir}/charsets.jar"/>
116      </path>      </path>
117      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
118      </sequential>      </sequential>
119    </macrodef>    </macrodef>
120    
# Line 129  Line 140 
140    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
141    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
142    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
143    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
144      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
145      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
146      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
147    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
148    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
149    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
150    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
151      <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
152    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
153    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
154    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 142  Line 157 
157    <!-- Javadoc locations -->    <!-- Javadoc locations -->
158    <property name="docs.dir"          location="${build.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
159    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
160      <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
161    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
162    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
163    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
# Line 149  Line 165 
165    
166    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
167    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
168      <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
169    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
170    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
171    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 157  Line 174 
174    <!-- Jar locations -->    <!-- Jar locations -->
175    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
176    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
177      <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
178    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
179    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
180    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
# Line 168  Line 186 
186    <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"/>
187    <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"/>
188    <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"/>
189    <!-- The expected canonical location does not yet exist as of 2014-07 -->    <!-- The expected canonical location does not yet exist as of 2016-03 -->
190    <!-- <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"/> -->
191    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
192    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
# Line 187  Line 205 
205    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
206             classpath="${lib.dir}/jtreg.jar" />             classpath="${lib.dir}/jtreg.jar" />
207    
208    <!-- Test classpath -->    <!-- Tck options; see JSR166TestCase.java
209    <path id="test.classpath">     To profile a single tck test class:
210      <pathelement location="${build.testcases.dir}"/>     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
211      <pathelement location="${junit.jar}"/>     To stress test a single tck test class:
212    </path>     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
213       To stress test a single tck test method:
214       ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
215      -->
216      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
217    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
218      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
219      <attribute name="target"/>      <attribute name="target"/>
220      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
221      <attribute name="workdir"/>      <attribute name="workdir"/>
222      <attribute name="classes"/>      <attribute name="classes"/>
223        <!--
224            <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
225        -->
226      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
227      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
228    
229      <sequential>      <sequential>
230    
231        <local name="modules"/>
232        <condition property="modules">
233          <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
234        </condition>
235    
236      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
237    
238      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 220  Line 250 
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 value="-Xpatch:${build.classes.dir}" 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 value="-Xpatch:${build.classes.dir}" if:set="modules"/>
267          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
268    
269          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
270          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">          <syspropertyset id="system-properties-used-by-tck">
271            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
272              <propertyref prefix="jsr166."/>
273              <propertyref name="test.timeout.factor"/>
274          </syspropertyset>          </syspropertyset>
275    
         <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>  
         <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>  
         <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>  
276          <classpath>          <classpath>
277            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
278            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 252  Line 283 
283    </macrodef>    </macrodef>
284    
285    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
286    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg9.src.dir}">
287      <patternset id="jdk9.jtreg.tests">      <patternset id="jdk9.jtreg.tests">
288        <include name="**/*.java"/>        <include name="**/*.java"/>
289      </patternset>      </patternset>
290    </fileset>    </fileset>
291    
292    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg8.src.dir}">
293      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
294        <include name="**/*.java"/>        <include name="**/*.java"/>
295        <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>        <exclude name="**/SpliteratorCharacteristics.java"/>
296        <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->        <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
297        <exclude name="util/WeakHashMap/GCDuringIteration.java"/>        <exclude name="**/GCDuringIteration.java"/>
298      </patternset>      </patternset>
299    </fileset>    </fileset>
300    
301    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg7.src.dir}">
302      <patternset id="jdk7.jtreg.tests">      <patternset id="jdk7.jtreg.tests">
303        <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="**/CompletableFuture/**/*.java"/>  
       <exclude name="**/ConcurrentAssociateTest.java"/>  
       <exclude name="**/ConcurrentContainsKeyTest.java"/>  
       <exclude name="**/ConcurrentHashMap/ToArray.java"/>  
       <exclude name="**/ConcurrentRemoveIf.java"/>  
       <exclude name="**/COWSubList.java"/>  
       <exclude name="**/FutureTask/NegativeTimeout.java"/>  
       <exclude name="**/LinkedTransferQueue/SpliteratorTraverseAddRemoveTest.java"/>  
       <exclude name="**/forkjoin/SubmissionTest.java"/>  
       <exclude name="**/StampedLock/**/*.java"/>  
       <exclude name="**/AtomicReferenceTest.java"/>  
       <exclude name="util/concurrent/atomic/Serial.java"/>  
304      </patternset>      </patternset>
305    </fileset>    </fileset>
306    
307      <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
308      <property name="jtreg.flags" value=""/>
309    
310    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
311      <!-- 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}"/>  
312      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
313      <attribute name="target"/>      <attribute name="target"/>
314      <attribute name="workdir"/>      <attribute name="workdir"/>
315      <attribute name="classes"/>      <attribute name="classes"/>
316      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
317    
318      <sequential>      <sequential>
319    
320        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
321        <property name="jtreg.verbose" value="nopass,fail,error"/>
322    
323        <local name="modules"/>
324        <condition property="modules">
325          <available file="${jdk@{target}.home}/jmods" type="dir"/>
326        </condition>
327    
328      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
329      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
330      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
331      <mkdir dir="@{workdir}/JTreport"/>      <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
332      <jtreg dir="@{jtreg.src.dir}"      <mkdir dir="@{workdir}/JTreport/html"/>
333        <mkdir dir="@{workdir}/JTreport/text"/>
334        <jtreg dir="${jtreg@{target}.src.dir}"
335             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
336             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
337             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
338        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
339        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
340          <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
341        <arg value="-agentvm"/>        <arg value="-agentvm"/>
342        <arg value="-v:nopass,fail"/>        <arg value="-verbose:${jtreg.verbose}"/>
343        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
344        <arg value="-automatic"/>        <arg value="-automatic"/>
345        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
346        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
347          <arg line="${jtreg.flags}"/>
348      </jtreg>      </jtreg>
349      </sequential>      </sequential>
350    </macrodef>    </macrodef>
# Line 332  Line 364 
364    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
365    
366    <target name="dists"    <target name="dists"
367            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
368            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
369    
370    <target name="compile"    <target name="compile"
371            depends="configure-compiler"            depends="configure-compiler"
372            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
373    
374      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
375        <condition property="modules">
376          <and>
377            <available file="${jdk9.home}/jmods" type="dir"/>
378            <equals arg1="9" arg2="${build.main.java.version}"/>
379          </and>
380        </condition>
381    
382        <local name="destdir"/>
383        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
384        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
385    
386        <mkdir dir="${destdir}"/>
387    
388      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
389             destdir="${build.classes.dir}"             destdir="${destdir}"
390             debug="${build.debug}"             debug="${build.debug}"
391             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
392             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 353  Line 397 
397             fork="true">             fork="true">
398    
399        <include name="**/*.java"/>        <include name="**/*.java"/>
400          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
401        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
402        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
403        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
# Line 362  Line 407 
407        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
408    
409      </javac>      </javac>
410    
411        <!-- We need jdk9's Contended annotation, but at compile time only -->
412        <!--
413            <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
414        -->
415    </target>    </target>
416    
417    
# Line 371  Line 421 
421    
422      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
423        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
424          <manifest>
425            <attribute name="Built-By" value="${user.name}"/>
426            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
427          </manifest>
428      </jar>      </jar>
429    </target>    </target>
430    
# Line 389  Line 443 
443               link="${java9.api.url}"               link="${java9.api.url}"
444               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
445               access="${build.javadoc.access}"               access="${build.javadoc.access}"
446               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}:${jdk9.src.dir}"
447               classpath=""               classpath=""
448               executable="${javadoc9}">               executable="${javadoc9}">
449        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 398  Line 452 
452        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
453        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
454        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
455    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
456        <arg value="-tag"/>        <arg value="-tag"/>
457        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
458        <arg value="-tag"/>        <arg value="-tag"/>
# Line 406  Line 461 
461        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
462        <arg value="-tag"/>        <arg value="-tag"/>
463        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
464    <!-- tags added in jdk9 -->
465          <arg value="-tag"/>
466          <arg value="revised:X"/>
467          <arg value="-tag"/>
468          <arg value="spec:X"/>
469      </javadoc>      </javadoc>
470    </target>    </target>
471    
# Line 429  Line 489 
489        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
490        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
491        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
492          <manifest>
493            <attribute name="Built-By" value="${user.name}"/>
494            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
495          </manifest>
496      </jar>      </jar>
497    </target>    </target>
498    
# Line 460  Line 524 
524      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
525    </target>    </target>
526    
527    <target name="tck" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <target name="test-tck"  
528            depends="jar"            depends="jar"
529            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
530    
# Line 471  Line 534 
534        classes="${product.jar}"/>        classes="${product.jar}"/>
535    </target>    </target>
536    
537    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
538            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
539      <antcall target="test-tck">      <antcall target="tck">
540        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
541      </antcall>      </antcall>
542    </target>    </target>
543    
544    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
545            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
546      <antcall target="test-tck">      <antcall target="tck">
547        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
548      </antcall>      </antcall>
549    </target>    </target>
550    
551    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="jtreg"
   <target name="test-jtreg"  
552            depends="jar"            depends="jar"
553            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
554      <run-jtreg-tests      <run-jtreg-tests
# Line 496  Line 558 
558    </target>    </target>
559    
560    <target name="test"    <target name="test"
561            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, jtreg"
562            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
563    </target>    </target>
564    
# Line 529  Line 591 
591    
592    
593    <target name="configure-compiler">    <target name="configure-compiler">
594        <fail message="ant version too old">
595          <condition>
596            <not> <antversion atleast="1.9.1"/> </not>
597          </condition>
598        </fail>
599    
600      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
601    
# Line 560  Line 627 
627         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
628        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
629             source="${build.sourcelevel}"             source="${build.sourcelevel}"
630               target="${build.sourcelevel}"
631               fork="true">               fork="true">
632    
633        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 601  Line 669 
669    </target>    </target>
670    
671    
672      <!-- jsr166 4jdk8 -->
673    
674      <target name="4jdk8compile"
675              depends="configure-compiler"
676              description="Compiles src/jdk8 sources, targeting jdk8">
677    
678        <mkdir dir="${build.4jdk8.classes.dir}"/>
679    
680        <javac srcdir="${4jdk8src.dir}"
681               destdir="${build.4jdk8.classes.dir}"
682               debug="${build.debug}"
683               debuglevel="${build.debuglevel}"
684               deprecation="${build.deprecation}"
685               source="8"
686               target="8"
687               classpath=""
688               bootclasspath="${bootclasspath8}"
689               includeAntRuntime="false"
690               includeJavaRuntime="false"
691               executable="${javac8}"
692               fork="true">
693    
694          <include name="**/*.java"/>
695          <compilerarg value="-Xprefer:source"/>
696          <compilerarg value="-XDignore.symbol.file=true"/>
697          <compilerarg value="-Xlint:all"/>
698          <compilerarg value="-Werror"/>
699          <compilerarg line="${build.args}"/>
700    
701        </javac>
702      </target>
703    
704      <target name="4jdk8doclint"
705              depends="configure-compiler"
706              description="Finds doclint warnings">
707    
708        <mkdir dir="${build.4jdk8.classes.dir}"/>
709    
710        <javac srcdir="${4jdk8src.dir}"
711               destdir="${build.4jdk8.classes.dir}"
712               debug="${build.debug}"
713               debuglevel="${build.debuglevel}"
714               deprecation="${build.deprecation}"
715               source="8"
716               target="8"
717               classpath=""
718               bootclasspath="${bootclasspath8}"
719               includeAntRuntime="false"
720               includeJavaRuntime="false"
721               executable="${javac8}"
722               fork="true">
723    
724          <include name="**/*.java"/>
725          <compilerarg value="-Xprefer:source"/>
726          <compilerarg value="-XDignore.symbol.file=true"/>
727          <compilerarg value="-Xlint:all"/>
728          <compilerarg value="-Xdoclint:all/protected"/>
729          <compilerarg line="${build.args}"/>
730    
731        </javac>
732      </target>
733    
734    
735      <target name="4jdk8jar"
736              depends="4jdk8compile"
737              description="Builds library jar from compiled sources">
738    
739        <jar destfile="${4jdk8product.jar}">
740          <fileset dir="${build.4jdk8.classes.dir}"/>
741          <manifest>
742            <attribute name="Built-By" value="${user.name}"/>
743            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
744          </manifest>
745        </jar>
746    
747      </target>
748    
749    
750      <target name="4jdk8-tck"
751              depends="4jdk8jar"
752              description="Runs tck tests for jsr166-4jdk8 directly">
753    
754        <run-tck-tests
755          target="8"
756          workdir="${build.4jdk8.dir}"
757          classes="${4jdk8product.jar}">
758          <javac-elements>
759            <!-- JDK9+ test classes -->
760            <exclude name="*9Test.java"/>
761            <exclude name="*10Test.java"/>
762          </javac-elements>
763        </run-tck-tests>
764      </target>
765    
766    
767      <target name="4jdk8-jtreg"
768              depends="4jdk8jar"
769              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
770        <run-jtreg-tests
771           target="8"
772           workdir="${build.4jdk8.dir}"
773           classes="${4jdk8product.jar}"/>
774      </target>
775    
776    
777      <target name="4jdk8-test"
778              depends="4jdk8-tck, 4jdk8-jtreg"
779              description="Runs tck and jtreg tests for jsr166-4jdk8">
780      </target>
781    
782    
783      <target name="4jdk8docs"
784              description="Builds javadocs for src/jdk8 to dist dir">
785    
786        <delete dir="${4jdk8docs.dir}"/>
787        <mkdir dir="${4jdk8docs.dir}"/>
788    
789        <javadoc destdir="${4jdk8docs.dir}"
790                 packagenames="none"
791                 link="${java8.api.url}"
792                 overview="${4jdk8src.dir}/intro.html"
793                 access="${build.javadoc.access}"
794                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
795                 classpath=""
796                 executable="${javadoc8}">
797          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
798            <include name="**/*.java"/>
799          </fileset>
800          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
801          <arg value="-XDignore.symbol.file=true"/>
802          <arg value="-tag"/>
803          <arg value="${javadoc.jls.option}"/>
804          <arg value="-tag"/>
805          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
806          <arg value="-tag"/>
807          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
808          <arg value="-tag"/>
809          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
810        </javadoc>
811      </target>
812    
813    
814      <target name="4jdk8dist"
815              depends="4jdk8dist-jar, 4jdk8dist-docs"
816              description="Puts all distributable products in single hierarchy"/>
817    
818    
819      <target name="4jdk8clean"
820              description="Removes all 4jdk8 build products">
821    
822        <delete dir="${build.4jdk8.dir}"/>
823    
824      </target>
825    
826    
827      <target name="4jdk8dist-jar"
828              depends="4jdk8clean, 4jdk8jar">
829        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
830      </target>
831    
832    
833      <target name="4jdk8dist-docs"
834              depends="4jdk8clean, 4jdk8docs">
835        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
836      </target>
837    
838    
839    
840    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
841    
842    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 615  Line 851 
851             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
852             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
853             source="6"             source="6"
854               target="6"
855             classpath=""             classpath=""
856             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
857             includeAntRuntime="false"             includeAntRuntime="false"
# Line 644  Line 881 
881             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
882             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
883             source="6"             source="6"
884               target="6"
885             classpath=""             classpath=""
886             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
887             includeAntRuntime="false"             includeAntRuntime="false"
888             includeJavaRuntime="false"             includeJavaRuntime="false"
889             executable="${javac8}"             executable="${javac8}"
# Line 668  Line 906 
906    
907      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
908        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
909          <manifest>
910            <attribute name="Built-By" value="${user.name}"/>
911            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
912          </manifest>
913      </jar>      </jar>
914    
915    </target>    </target>
916    
917    
918    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
919            depends="4jdk7jar"            depends="4jdk7jar"
920            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
921    
# Line 685  Line 927 
927          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
928          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
929          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
930            <exclude name="*10Test.java"/>
931          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
932          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
933          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 692  Line 935 
935          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
936          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
937          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
938            <exclude name="SubmissionPublisherTest.java"/>
939        </javac-elements>        </javac-elements>
940      </run-tck-tests>      </run-tck-tests>
941    </target>    </target>
942    
943    
944    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
945            depends="4jdk7compile"            depends="4jdk7compile"
946            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
947    
# Line 725  Line 969 
969      </junit>      </junit>
970    </target>    </target>
971    
972    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
973            depends="4jdk7jar"            depends="4jdk7jar"
974            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
975      <run-jtreg-tests      <run-jtreg-tests
# Line 736  Line 980 
980    
981    
982    <target name="4jdk7-test"    <target name="4jdk7-test"
983            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
984            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
985    </target>    </target>
986    
# Line 752  Line 996 
996               link="${java7.api.url}"               link="${java7.api.url}"
997               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
998               access="${build.javadoc.access}"               access="${build.javadoc.access}"
999               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1000               classpath=""               classpath=""
1001               executable="${javadoc7}">               executable="${javadoc7}">
1002        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
# Line 805  Line 1049 
1049             classpath=""             classpath=""
1050             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1051             source="5"             source="5"
1052               target="5"
1053             includeAntRuntime="false"             includeAntRuntime="false"
1054             includeJavaRuntime="false"             includeJavaRuntime="false"
1055             executable="${javac7}"             executable="${javac7}"
# Line 826  Line 1071 
1071    
1072      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1073        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1074          <manifest>
1075            <attribute name="Built-By" value="${user.name}"/>
1076            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1077          </manifest>
1078      </jar>      </jar>
1079    
1080    </target>    </target>
# Line 841  Line 1090 
1090               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1091               link="${java.api.url}"               link="${java.api.url}"
1092               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1093               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1094               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1095               source="5"               source="5"
1096               executable="${javadoc7}">               executable="${javadoc7}">
# Line 890  Line 1139 
1139             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1140             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1141             source="6"             source="6"
1142               target="6"
1143             classpath=""             classpath=""
1144             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1145             includeAntRuntime="false"             includeAntRuntime="false"
# Line 913  Line 1163 
1163    
1164      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1165        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1166          <manifest>
1167            <attribute name="Built-By" value="${user.name}"/>
1168            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1169          </manifest>
1170      </jar>      </jar>
1171    
1172    </target>    </target>
# Line 928  Line 1182 
1182               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1183               link="${java.api.url}"               link="${java.api.url}"
1184               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1185               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1186               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1187               source="6"               source="6"
1188               executable="${javadoc7}">               executable="${javadoc7}">
# Line 980  Line 1234 
1234             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1235             classpath=""             classpath=""
1236             source="6"             source="6"
1237               target="6"
1238             includeAntRuntime="false"             includeAntRuntime="false"
1239             includeJavaRuntime="false"             includeJavaRuntime="false"
1240             executable="${javac7}"             executable="${javac7}"
# Line 1001  Line 1256 
1256    
1257      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1258        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1259          <manifest>
1260            <attribute name="Built-By" value="${user.name}"/>
1261            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1262          </manifest>
1263      </jar>      </jar>
1264    
1265    </target>    </target>
# Line 1016  Line 1275 
1275               packagenames="extra166y.*"               packagenames="extra166y.*"
1276               link="${java.api.url}"               link="${java.api.url}"
1277               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1278               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1279               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1280               source="6"               source="6"
1281               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1067  Line 1326 
1326             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1327             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1328             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1329               target="${build.jsr166e.java.version}"
1330             classpath=""             classpath=""
1331             includeAntRuntime="false"             includeAntRuntime="false"
1332             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1093  Line 1353 
1353             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1354             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1355             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1356               target="${build.jsr166e.java.version}"
1357             classpath=""             classpath=""
1358             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1359             includeAntRuntime="false"             includeAntRuntime="false"
1360             includeJavaRuntime="false"             includeJavaRuntime="false"
1361             executable="${javac8}"             executable="${javac8}"
# Line 1116  Line 1377 
1377    
1378      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1379        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1380          <manifest>
1381            <attribute name="Built-By" value="${user.name}"/>
1382            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1383          </manifest>
1384      </jar>      </jar>
1385    
1386    </target>    </target>
# Line 1131  Line 1396 
1396               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1397               link="${java.api.url}"               link="${java.api.url}"
1398               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1399               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1400               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1401               executable="${javadoc7}">               executable="${javadoc7}">
1402        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
# Line 1141  Line 1406 
1406    </target>    </target>
1407    
1408    
1409    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1410            depends="jsr166ejar">            depends="jsr166ejar">
1411    
1412      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1153  Line 1418 
1418        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1419    </target>    </target>
1420    
1421    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1422            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1423    
1424  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1425  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1426  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1427  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1428  <!--     </antcall> -->  <!--     </antcall> -->
1429    
1430      <antcall target="clean"/>      <antcall target="clean"/>
1431      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1432        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1433        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1434      </antcall>      </antcall>
1435    
1436      <antcall target="clean"/>      <antcall target="clean"/>
1437      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1438        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1439        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1440      </antcall>      </antcall>
# Line 1177  Line 1442 
1442    
1443    
1444    <target name="jsr166e-test"    <target name="jsr166e-test"
1445            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1446            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1447    </target>    </target>
1448    

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

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8