[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.215, Mon Aug 29 23:38:30 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"/>
# 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-04 -->
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/java/jdk9/docs"/>
192    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
193    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
194    
# 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: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 value="-Xpatch: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 -->        <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
299        <exclude name="util/WeakHashMap/GCDuringIteration.java"/>        <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="**/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"/>  
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"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
332      <mkdir dir="@{workdir}/JTwork/scratch"/>      <jtreg dir="${jtreg@{target}.src.dir}"
     <mkdir dir="@{workdir}/JTreport"/>  
     <jtreg dir="@{jtreg.src.dir}"  
333             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
334             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
335             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
336        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
337        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
338          <arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
339        <arg value="-agentvm"/>        <arg value="-agentvm"/>
340        <arg value="-v:nopass,fail"/>        <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 332  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}"
# Line 353  Line 395 
395             fork="true">             fork="true">
396    
397        <include name="**/*.java"/>        <include name="**/*.java"/>
398          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
399        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
400        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
401        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
# Line 367  Line 410 
410    
411    <target name="jar"    <target name="jar"
412            depends="compile"            depends="compile"
413            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
414        <local name="subdir"/>
415        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
416      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
417        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
418          <manifest>
419            <attribute name="Built-By" value="${user.name}"/>
420            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
421          </manifest>
422      </jar>      </jar>
423    </target>    </target>
424    
# Line 389  Line 437 
437               link="${java9.api.url}"               link="${java9.api.url}"
438               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
439               access="${build.javadoc.access}"               access="${build.javadoc.access}"
440               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}:${jdk9.src.dir}"
441               classpath=""               classpath=""
442               executable="${javadoc9}">               executable="${javadoc9}">
443        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 398  Line 446 
446        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
447        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
448        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
449    <!--  TODO     <arg value="-Xmodule:java.base"/> -->
450        <arg value="-tag"/>        <arg value="-tag"/>
451        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
452        <arg value="-tag"/>        <arg value="-tag"/>
# Line 406  Line 455 
455        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
456        <arg value="-tag"/>        <arg value="-tag"/>
457        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
458    <!-- tags added in jdk9 -->
459          <arg value="-tag"/>
460          <arg value="revised:X"/>
461          <arg value="-tag"/>
462          <arg value="spec:X"/>
463      </javadoc>      </javadoc>
464    </target>    </target>
465    
# Line 429  Line 483 
483        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
484        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
485        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
486          <manifest>
487            <attribute name="Built-By" value="${user.name}"/>
488            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
489          </manifest>
490      </jar>      </jar>
491    </target>    </target>
492    
# Line 460  Line 518 
518      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
519    </target>    </target>
520    
521    <target name="tck" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <target name="test-tck"  
522            depends="jar"            depends="jar"
523            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
524    
525      <run-tck-tests      <run-tck-tests
526        target="${build.main.java.version}"        target="${build.main.java.version}"
# Line 471  Line 528 
528        classes="${product.jar}"/>        classes="${product.jar}"/>
529    </target>    </target>
530    
531    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
532            description="Runs test-tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
533      <antcall target="test-tck">      <antcall target="tck">
534        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
535      </antcall>      </antcall>
536    </target>    </target>
537    
538    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
539            description="Runs test-tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
540      <antcall target="test-tck">      <antcall target="tck">
541        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
542      </antcall>      </antcall>
543    </target>    </target>
544    
545    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="tck-security-manager"
546    <target name="test-jtreg"            description="Runs tck with a security manager">
547        <antcall target="tck">
548          <param name="jsr166.useSecurityManager" value="true"/>
549        </antcall>
550      </target>
551    
552      <target name="jtreg"
553            depends="jar"            depends="jar"
554            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
555      <run-jtreg-tests      <run-jtreg-tests
556         target="${build.main.java.version}"         target="${build.main.java.version}"
557         workdir="${build.dir}"         workdir="${build.dir}"
# Line 496  Line 559 
559    </target>    </target>
560    
561    <target name="test"    <target name="test"
562            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
563            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main">
564    </target>    </target>
565    
566    <target name="jtreg8" description="Runs jtreg tests with jdk8">  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
567    
568      <antcall target="jtreg">  <!--     <antcall target="jtreg"> -->
569        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
570        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
571      </antcall>  <!--     </antcall> -->
572    
573    </target>  <!--   </target> -->
574    
575    <target name="test89"  <!--   <target name="test89" -->
576            description="Runs tck and jtreg tests for main for multiple java versions">  <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
577    
578      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
579      <antcall target="test">  <!--     <antcall target="test"> -->
580        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
581        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
582      </antcall>  <!--     </antcall> -->
583    
584      <antcall target="clean"/>  <!--     <antcall target="clean"/> -->
585      <antcall target="test">  <!--     <antcall target="test"> -->
586        <param name="build.main.java.version" value="9"/>  <!--       <param name="build.main.java.version" value="9"/> -->
587        <param name="build.main.javac" value="${javac9}"/>  <!--       <param name="build.main.javac" value="${javac9}"/> -->
588      </antcall>  <!--     </antcall> -->
589    
590    </target>  <!--   </target> -->
591    
592    
593    
594    <target name="configure-compiler">    <target name="configure-compiler">
595        <fail message="ant version too old">
596          <condition>
597            <not> <antversion atleast="1.9.1"/> </not>
598          </condition>
599        </fail>
600    
601      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
602    
# Line 549  Line 617 
617    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
618    
619    
620    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
621            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
622    
623      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
624    
# Line 560  Line 628 
628         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
629        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
630             source="${build.sourcelevel}"             source="${build.sourcelevel}"
631               target="${build.sourcelevel}"
632               fork="true">               fork="true">
633    
634        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 601  Line 670 
670    </target>    </target>
671    
672    
673      <!-- jsr166 4jdk8 -->
674    
675      <target name="4jdk8compile"
676              depends="configure-compiler"
677              description="Compiles src/jdk8 sources, targeting jdk8">
678    
679        <mkdir dir="${build.4jdk8.classes.dir}"/>
680    
681        <javac srcdir="${4jdk8src.dir}"
682               destdir="${build.4jdk8.classes.dir}"
683               debug="${build.debug}"
684               debuglevel="${build.debuglevel}"
685               deprecation="${build.deprecation}"
686               source="8"
687               target="8"
688               classpath=""
689               bootclasspath="${bootclasspath8}"
690               includeAntRuntime="false"
691               includeJavaRuntime="false"
692               executable="${javac8}"
693               fork="true">
694    
695          <include name="**/*.java"/>
696          <compilerarg value="-Xprefer:source"/>
697          <compilerarg value="-XDignore.symbol.file=true"/>
698          <compilerarg value="-Xlint:all"/>
699          <compilerarg value="-Werror"/>
700          <compilerarg line="${build.args}"/>
701    
702        </javac>
703      </target>
704    
705      <target name="4jdk8doclint"
706              depends="configure-compiler"
707              description="Finds doclint warnings">
708    
709        <mkdir dir="${build.4jdk8.classes.dir}"/>
710    
711        <javac srcdir="${4jdk8src.dir}"
712               destdir="${build.4jdk8.classes.dir}"
713               debug="${build.debug}"
714               debuglevel="${build.debuglevel}"
715               deprecation="${build.deprecation}"
716               source="8"
717               target="8"
718               classpath=""
719               bootclasspath="${bootclasspath8}"
720               includeAntRuntime="false"
721               includeJavaRuntime="false"
722               executable="${javac8}"
723               fork="true">
724    
725          <include name="**/*.java"/>
726          <compilerarg value="-Xprefer:source"/>
727          <compilerarg value="-XDignore.symbol.file=true"/>
728          <compilerarg value="-Xlint:all"/>
729          <compilerarg value="-Xdoclint:all/protected"/>
730          <compilerarg line="${build.args}"/>
731    
732        </javac>
733      </target>
734    
735    
736      <target name="4jdk8jar"
737              depends="4jdk8compile"
738              description="Builds library jar from compiled sources">
739    
740        <jar destfile="${4jdk8product.jar}">
741          <fileset dir="${build.4jdk8.classes.dir}"/>
742          <manifest>
743            <attribute name="Built-By" value="${user.name}"/>
744            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
745          </manifest>
746        </jar>
747    
748      </target>
749    
750    
751      <target name="4jdk8-tck"
752              depends="4jdk8jar"
753              description="Runs tck tests for jsr166-4jdk8 directly">
754    
755        <run-tck-tests
756          target="8"
757          workdir="${build.4jdk8.dir}"
758          classes="${4jdk8product.jar}">
759          <javac-elements>
760            <!-- JDK9+ test classes -->
761            <exclude name="*9Test.java"/>
762            <exclude name="*10Test.java"/>
763          </javac-elements>
764        </run-tck-tests>
765      </target>
766    
767    
768      <target name="4jdk8-jtreg"
769              depends="4jdk8jar"
770              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
771        <run-jtreg-tests
772           target="8"
773           workdir="${build.4jdk8.dir}"
774           classes="${4jdk8product.jar}"/>
775      </target>
776    
777    
778      <target name="4jdk8-test"
779              depends="4jdk8-tck, 4jdk8-jtreg"
780              description="Runs tck and jtreg tests for jsr166-4jdk8">
781      </target>
782    
783    
784      <target name="4jdk8docs"
785              description="Builds javadocs for src/jdk8 to dist dir">
786    
787        <delete dir="${4jdk8docs.dir}"/>
788        <mkdir dir="${4jdk8docs.dir}"/>
789    
790        <javadoc destdir="${4jdk8docs.dir}"
791                 packagenames="none"
792                 link="${java8.api.url}"
793                 overview="${4jdk8src.dir}/intro.html"
794                 access="${build.javadoc.access}"
795                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
796                 classpath=""
797                 executable="${javadoc8}"
798                 failonerror = "true">
799          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
800            <include name="**/*.java"/>
801          </fileset>
802          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
803          <arg value="-XDignore.symbol.file=true"/>
804          <arg value="-tag"/>
805          <arg value="${javadoc.jls.option}"/>
806          <arg value="-tag"/>
807          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
808          <arg value="-tag"/>
809          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
810          <arg value="-tag"/>
811          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
812        </javadoc>
813      </target>
814    
815    
816      <target name="4jdk8dist"
817              depends="4jdk8dist-jar, 4jdk8dist-docs"
818              description="Puts all distributable products in single hierarchy"/>
819    
820    
821      <target name="4jdk8clean"
822              description="Removes all 4jdk8 build products">
823    
824        <delete dir="${build.4jdk8.dir}"/>
825    
826      </target>
827    
828    
829      <target name="4jdk8dist-jar"
830              depends="4jdk8clean, 4jdk8jar">
831        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
832      </target>
833    
834    
835      <target name="4jdk8dist-docs"
836              depends="4jdk8clean, 4jdk8docs">
837        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
838      </target>
839    
840    
841    
842    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
843    
844    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 615  Line 853 
853             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
854             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
855             source="6"             source="6"
856               target="6"
857             classpath=""             classpath=""
858             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
859             includeAntRuntime="false"             includeAntRuntime="false"
# Line 644  Line 883 
883             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
884             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
885             source="6"             source="6"
886               target="6"
887             classpath=""             classpath=""
888             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
889             includeAntRuntime="false"             includeAntRuntime="false"
890             includeJavaRuntime="false"             includeJavaRuntime="false"
891             executable="${javac8}"             executable="${javac8}"
# Line 668  Line 908 
908    
909      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
910        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
911          <manifest>
912            <attribute name="Built-By" value="${user.name}"/>
913            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
914          </manifest>
915      </jar>      </jar>
916    
917    </target>    </target>
918    
919    
920    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
921            depends="4jdk7jar"            depends="4jdk7jar"
922            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
923    
# Line 685  Line 929 
929          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
930          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
931          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
932            <exclude name="*10Test.java"/>
933          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
934          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
935          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 692  Line 937 
937          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
938          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
939          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
940            <exclude name="SubmissionPublisherTest.java"/>
941        </javac-elements>        </javac-elements>
942      </run-tck-tests>      </run-tck-tests>
943    </target>    </target>
944    
945    
946    <target name="4jdk7-test-tck-junit"    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
947            depends="4jdk7compile"    <target name="4jdk7-tck-junit"
948            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            depends="4jdk7compile">
949    
950      <junit printsummary="true"      <junit printsummary="true"
951             showoutput="true"             showoutput="true"
# Line 725  Line 971 
971      </junit>      </junit>
972    </target>    </target>
973    
974    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
975            depends="4jdk7jar"            depends="4jdk7jar"
976            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
977      <run-jtreg-tests      <run-jtreg-tests
# Line 736  Line 982 
982    
983    
984    <target name="4jdk7-test"    <target name="4jdk7-test"
985            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
986            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
987    </target>    </target>
988    
# Line 752  Line 998 
998               link="${java7.api.url}"               link="${java7.api.url}"
999               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
1000               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1001               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1002               classpath=""               classpath=""
1003               executable="${javadoc7}">               executable="${javadoc7}"
1004                 failonerror = "true">
1005        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1006          <include name="**/*.java"/>          <include name="**/*.java"/>
1007        </fileset>        </fileset>
# Line 805  Line 1052 
1052             classpath=""             classpath=""
1053             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1054             source="5"             source="5"
1055               target="5"
1056             includeAntRuntime="false"             includeAntRuntime="false"
1057             includeJavaRuntime="false"             includeJavaRuntime="false"
1058             executable="${javac7}"             executable="${javac7}"
# Line 826  Line 1074 
1074    
1075      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1076        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1077          <manifest>
1078            <attribute name="Built-By" value="${user.name}"/>
1079            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1080          </manifest>
1081      </jar>      </jar>
1082    
1083    </target>    </target>
# Line 841  Line 1093 
1093               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1094               link="${java.api.url}"               link="${java.api.url}"
1095               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1096               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1097               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1098               source="5"               source="5"
1099               executable="${javadoc7}">               executable="${javadoc7}"
1100                 failonerror = "true">
1101        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1102        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1103    
# Line 890  Line 1143 
1143             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1144             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1145             source="6"             source="6"
1146               target="6"
1147             classpath=""             classpath=""
1148             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1149             includeAntRuntime="false"             includeAntRuntime="false"
# Line 913  Line 1167 
1167    
1168      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1169        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1170          <manifest>
1171            <attribute name="Built-By" value="${user.name}"/>
1172            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1173          </manifest>
1174      </jar>      </jar>
1175    
1176    </target>    </target>
# Line 928  Line 1186 
1186               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1187               link="${java.api.url}"               link="${java.api.url}"
1188               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1189               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1190               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1191               source="6"               source="6"
1192               executable="${javadoc7}">               executable="${javadoc7}"
1193                 failonerror = "true">
1194        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1195        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1196    
# Line 980  Line 1239 
1239             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1240             classpath=""             classpath=""
1241             source="6"             source="6"
1242               target="6"
1243             includeAntRuntime="false"             includeAntRuntime="false"
1244             includeJavaRuntime="false"             includeJavaRuntime="false"
1245             executable="${javac7}"             executable="${javac7}"
# Line 1001  Line 1261 
1261    
1262      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1263        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1264          <manifest>
1265            <attribute name="Built-By" value="${user.name}"/>
1266            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1267          </manifest>
1268      </jar>      </jar>
1269    
1270    </target>    </target>
# Line 1016  Line 1280 
1280               packagenames="extra166y.*"               packagenames="extra166y.*"
1281               link="${java.api.url}"               link="${java.api.url}"
1282               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1283               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1284               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1285               source="6"               source="6"
1286               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1067  Line 1331 
1331             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1332             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1333             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1334               target="${build.jsr166e.java.version}"
1335             classpath=""             classpath=""
1336             includeAntRuntime="false"             includeAntRuntime="false"
1337             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1093  Line 1358 
1358             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1359             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1360             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1361               target="${build.jsr166e.java.version}"
1362             classpath=""             classpath=""
1363             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1364             includeAntRuntime="false"             includeAntRuntime="false"
1365             includeJavaRuntime="false"             includeJavaRuntime="false"
1366             executable="${javac8}"             executable="${javac8}"
# Line 1116  Line 1382 
1382    
1383      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1384        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1385          <manifest>
1386            <attribute name="Built-By" value="${user.name}"/>
1387            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1388          </manifest>
1389      </jar>      </jar>
1390    
1391    </target>    </target>
# Line 1131  Line 1401 
1401               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1402               link="${java.api.url}"               link="${java.api.url}"
1403               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1404               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1405               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1406               executable="${javadoc7}">               executable="${javadoc7}"
1407                 failonerror = "true">
1408        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1409        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1410    
# Line 1141  Line 1412 
1412    </target>    </target>
1413    
1414    
1415    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1416            depends="jsr166ejar">            depends="jsr166ejar">
1417    
1418      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1153  Line 1424 
1424        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1425    </target>    </target>
1426    
1427    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1428            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
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="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1433  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
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="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1439        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1440      </antcall>      </antcall>
1441    
1442      <antcall target="clean"/>      <antcall target="clean"/>
1443      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1444        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1445        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1446      </antcall>      </antcall>
# Line 1177  Line 1448 
1448    
1449    
1450    <target name="jsr166e-test"    <target name="jsr166e-test"
1451            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1452            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1453    </target>    </target>
1454    

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

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8