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

Diff of /jsr166/build.xml

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

revision 1.166, Mon Aug 10 06:32:23 2015 UTC revision 1.221, Sat Oct 8 21:39:24 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 215  Line 245 
245             classpath="${junit.jar}"             classpath="${junit.jar}"
246             includeAntRuntime="false"             includeAntRuntime="false"
247             includeJavaRuntime="false"             includeJavaRuntime="false"
248               encoding="ASCII"
249             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
250             fork="true">             fork="true">
251    
252        <include name="*.java"/>        <include name="*.java"/>
253        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
254        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
255        <compilerarg value="-Xbootclasspath/p:@{classes}"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
256          <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
257        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
258        <javac-elements/>        <javac-elements/>
259    
# Line 231  Line 263 
263            failonerror="true"            failonerror="true"
264            jvm="${java@{target}}"            jvm="${java@{target}}"
265            fork="true">            fork="true">
266          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
267            <jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
268          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
269            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
270            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
271    
272          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
273          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">          <syspropertyset id="system-properties-used-by-tck">
274            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
275              <propertyref prefix="jsr166."/>
276              <propertyref name="test.timeout.factor"/>
277          </syspropertyset>          </syspropertyset>
278    
         <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>  
         <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>  
         <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>  
279          <classpath>          <classpath>
280            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
281            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 252  Line 286 
286    </macrodef>    </macrodef>
287    
288    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
289    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg9.src.dir}">
290      <patternset id="jdk9.jtreg.tests">      <patternset id="jdk9.jtreg.tests">
291        <include name="**/*.java"/>        <include name="**/*.java"/>
292      </patternset>      </patternset>
293    </fileset>    </fileset>
294    
295    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg8.src.dir}">
296      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
297        <include name="**/*.java"/>        <include name="**/*.java"/>
298        <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>        <exclude name="**/SpliteratorCharacteristics.java"/>
299          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
300          <exclude name="**/GCDuringIteration.java"/>
301      </patternset>      </patternset>
302    </fileset>    </fileset>
303    
304    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg7.src.dir}">
305      <patternset id="jdk7.jtreg.tests">      <patternset id="jdk7.jtreg.tests">
306        <include name="**/*.java"/>        <include name="**/*.java"/>
       <exclude name="util/Collection/CollectionDefaults.java"/>  
       <exclude name="util/List/ListDefaults.java"/>  
       <exclude name="util/Spliterator/**/*.java"/>  
       <exclude name="util/concurrent/CompletableFuture/**/*.java"/>  
       <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>  
       <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>  
307      </patternset>      </patternset>
308    </fileset>    </fileset>
309    
310      <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
311      <property name="jtreg.flags" value=""/>
312    
313    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
314      <!-- 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}"/>  
315      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
316      <attribute name="target"/>      <attribute name="target"/>
317      <attribute name="workdir"/>      <attribute name="workdir"/>
318      <attribute name="classes"/>      <attribute name="classes"/>
319      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
320    
321      <sequential>      <sequential>
322    
323        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
324        <property name="jtreg.verbose" value="nopass,fail,error"/>
325    
326        <local name="modules"/>
327        <condition property="modules">
328          <available file="${jdk@{target}.home}/jmods" type="dir"/>
329        </condition>
330    
331      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
332      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
333      <mkdir dir="@{workdir}/JTwork/scratch"/>      <jtreg dir="${jtreg@{target}.src.dir}"
     <mkdir dir="@{workdir}/JTreport"/>  
     <jtreg dir="@{jtreg.src.dir}"  
334             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
335             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
336             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
337        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
338        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
339          <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
340        <arg value="-agentvm"/>        <arg value="-agentvm"/>
341        <arg value="-v:nopass,fail"/>        <arg value="-verbose:${jtreg.verbose}"/>
342        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
343        <arg value="-automatic"/>        <arg value="-automatic"/>
344        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
345        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
346          <arg line="${jtreg.flags}"/>
347      </jtreg>      </jtreg>
348      </sequential>      </sequential>
349    </macrodef>    </macrodef>
# Line 321  Line 363 
363    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
364    
365    <target name="dists"    <target name="dists"
366            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
367            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
368    
369    <target name="compile"    <target name="compile"
370            depends="configure-compiler"            depends="configure-compiler"
371            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
372    
373      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
374        <condition property="modules">
375          <and>
376            <available file="${jdk9.home}/jmods" type="dir"/>
377            <equals arg1="9" arg2="${build.main.java.version}"/>
378          </and>
379        </condition>
380    
381        <local name="destdir"/>
382        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
383        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
384    
385        <mkdir dir="${destdir}"/>
386    
387      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
388             destdir="${build.classes.dir}"             destdir="${destdir}"
389             debug="${build.debug}"             debug="${build.debug}"
390             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
391             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
392             classpath=""             classpath=""
393             includeAntRuntime="false"             includeAntRuntime="false"
394             includeJavaRuntime="false"             includeJavaRuntime="false"
395               encoding="ASCII"
396             executable="${build.main.javac}"             executable="${build.main.javac}"
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 356  Line 412 
412    
413    <target name="jar"    <target name="jar"
414            depends="compile"            depends="compile"
415            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
416        <local name="subdir"/>
417        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
418      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
419        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
420          <manifest>
421            <attribute name="Built-By" value="${user.name}"/>
422            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
423          </manifest>
424      </jar>      </jar>
425    </target>    </target>
426    
# Line 373  Line 434 
434      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
435      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
436    
437    <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
438    <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
439      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
440               packagenames="none"               packagenames="none"
441               link="${java9.api.url}"               link="${java9.api.url}"
442               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
443               access="${build.javadoc.access}"               access="${build.javadoc.access}"
444               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}"
445               classpath=""               classpath=""
446               executable="${javadoc9}">               executable="${javadoc9}">
447        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 387  Line 450 
450        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
451        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
452        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
453          <arg value="-Xmodule:java.base"/>
454        <arg value="-tag"/>        <arg value="-tag"/>
455        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
456    <!-- @apiNote currently unused -->
457    <!--       <arg value="-tag"/> -->
458    <!--       <arg value="apiNote:a:API Note:"/> -->
459        <arg value="-tag"/>        <arg value="-tag"/>
460        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>        <arg value="implSpec:a:Implementation Requirements:"/>
461        <arg value="-tag"/>        <arg value="-tag"/>
462        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implNote:a:Implementation Note:"/>
463        <arg value="-tag"/>  <!-- tags added in jdk9: currently unused -->
464        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>  <!--       <arg value="-tag"/> -->
465    <!--       <arg value="revised:X"/> -->
466    <!--       <arg value="-tag"/> -->
467    <!--       <arg value="spec:X"/> -->
468      </javadoc>      </javadoc>
469    </target>    </target>
470    
# Line 418  Line 488 
488        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
489        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
490        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
491          <manifest>
492            <attribute name="Built-By" value="${user.name}"/>
493            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
494          </manifest>
495      </jar>      </jar>
496    </target>    </target>
497    
# Line 449  Line 523 
523      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
524    </target>    </target>
525    
526    <target name="tck" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <target name="test-tck"  
527            depends="jar"            depends="jar"
528            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
529    
530      <run-tck-tests      <run-tck-tests
531        target="${build.main.java.version}"        target="${build.main.java.version}"
# Line 460  Line 533 
533        classes="${product.jar}"/>        classes="${product.jar}"/>
534    </target>    </target>
535    
536    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
537            description="Runs test-tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
538      <antcall target="test-tck">      <antcall target="tck">
539        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
540      </antcall>      </antcall>
541    </target>    </target>
542    
543    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
544            description="Runs test-tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
545      <antcall target="test-tck">      <antcall target="tck">
546        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
547      </antcall>      </antcall>
548    </target>    </target>
549    
550    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="tck-security-manager"
551    <target name="test-jtreg"            description="Runs tck with a security manager">
552        <antcall target="tck">
553          <param name="jsr166.useSecurityManager" value="true"/>
554        </antcall>
555      </target>
556    
557      <target name="jtreg"
558            depends="jar"            depends="jar"
559            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
560      <run-jtreg-tests      <run-jtreg-tests
561         target="${build.main.java.version}"         target="${build.main.java.version}"
562         workdir="${build.dir}"         workdir="${build.dir}"
# Line 485  Line 564 
564    </target>    </target>
565    
566    <target name="test"    <target name="test"
567            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
568            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main">
569    </target>    </target>
570    
571    <target name="test89"  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
           description="Runs tck and jtreg tests for main for multiple java versions">  
572    
573      <antcall target="clean"/>  <!--     <antcall target="jtreg"> -->
574      <antcall target="test">  <!--       <param name="build.main.java.version" value="8"/> -->
575        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
576        <param name="build.main.javac" value="${javac8}"/>  <!--     </antcall> -->
       <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>  
     </antcall>  
577    
578      <antcall target="clean"/>  <!--   </target> -->
     <antcall target="test">  
       <param name="build.main.java.version" value="9"/>  
       <param name="build.main.javac" value="${javac9}"/>  
     </antcall>  
579    
580    </target>  <!--   <target name="test89" -->
581    <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
582    
583    <!--     <antcall target="clean"/> -->
584    <!--     <antcall target="test"> -->
585    <!--       <param name="build.main.java.version" value="8"/> -->
586    <!--       <param name="build.main.javac" value="${javac8}"/> -->
587    <!--     </antcall> -->
588    
589    <!--     <antcall target="clean"/> -->
590    <!--     <antcall target="test"> -->
591    <!--       <param name="build.main.java.version" value="9"/> -->
592    <!--       <param name="build.main.javac" value="${javac9}"/> -->
593    <!--     </antcall> -->
594    
595    <!--   </target> -->
596    
597    
598    
599    <target name="configure-compiler">    <target name="configure-compiler">
600        <fail message="ant version too old">
601          <condition>
602            <not> <antversion atleast="1.9.1"/> </not>
603          </condition>
604        </fail>
605    
606      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
607    
# Line 530  Line 622 
622    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
623    
624    
625    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
626            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
627    
628      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
629    
# Line 541  Line 633 
633         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
634        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
635             source="${build.sourcelevel}"             source="${build.sourcelevel}"
636               target="${build.sourcelevel}"
637             encoding="ASCII"
638               fork="true">               fork="true">
639    
640        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 568  Line 662 
662             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
663             includeAntRuntime="false"             includeAntRuntime="false"
664             includeJavaRuntime="false"             includeJavaRuntime="false"
665               encoding="ASCII"
666             executable="${javac9}"             executable="${javac9}"
667             fork="true">             fork="true">
668    
669        <include name="*.java"/>        <include name="*.java"/>
670        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
671        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
672        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
673        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
674    
# Line 582  Line 677 
677    </target>    </target>
678    
679    
680      <!-- jsr166 4jdk8 -->
681    
682      <target name="4jdk8compile"
683              depends="configure-compiler"
684              description="Compiles src/jdk8 sources, targeting jdk8">
685    
686        <mkdir dir="${build.4jdk8.classes.dir}"/>
687    
688        <javac srcdir="${4jdk8src.dir}"
689               destdir="${build.4jdk8.classes.dir}"
690               debug="${build.debug}"
691               debuglevel="${build.debuglevel}"
692               deprecation="${build.deprecation}"
693               source="8"
694               target="8"
695               classpath=""
696               bootclasspath="${bootclasspath8}"
697               includeAntRuntime="false"
698               includeJavaRuntime="false"
699               encoding="ASCII"
700               executable="${javac8}"
701               fork="true">
702    
703          <include name="**/*.java"/>
704          <compilerarg value="-Xprefer:source"/>
705          <compilerarg value="-XDignore.symbol.file=true"/>
706          <compilerarg value="-Xlint:all"/>
707          <compilerarg value="-Werror"/>
708          <compilerarg line="${build.args}"/>
709    
710        </javac>
711      </target>
712    
713      <target name="4jdk8doclint"
714              depends="configure-compiler"
715              description="Finds doclint warnings">
716    
717        <mkdir dir="${build.4jdk8.classes.dir}"/>
718    
719        <javac srcdir="${4jdk8src.dir}"
720               destdir="${build.4jdk8.classes.dir}"
721               debug="${build.debug}"
722               debuglevel="${build.debuglevel}"
723               deprecation="${build.deprecation}"
724               source="8"
725               target="8"
726               classpath=""
727               bootclasspath="${bootclasspath8}"
728               includeAntRuntime="false"
729               includeJavaRuntime="false"
730               encoding="ASCII"
731               executable="${javac8}"
732               fork="true">
733    
734          <include name="**/*.java"/>
735          <compilerarg value="-Xprefer:source"/>
736          <compilerarg value="-XDignore.symbol.file=true"/>
737          <compilerarg value="-Xlint:all"/>
738          <compilerarg value="-Xdoclint:all/protected"/>
739          <compilerarg line="${build.args}"/>
740    
741        </javac>
742      </target>
743    
744    
745      <target name="4jdk8jar"
746              depends="4jdk8compile"
747              description="Builds library jar from compiled sources">
748    
749        <jar destfile="${4jdk8product.jar}">
750          <fileset dir="${build.4jdk8.classes.dir}"/>
751          <manifest>
752            <attribute name="Built-By" value="${user.name}"/>
753            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
754          </manifest>
755        </jar>
756    
757      </target>
758    
759    
760      <target name="4jdk8-tck"
761              depends="4jdk8jar"
762              description="Runs tck tests for jsr166-4jdk8 directly">
763    
764        <run-tck-tests
765          target="8"
766          workdir="${build.4jdk8.dir}"
767          classes="${4jdk8product.jar}">
768          <javac-elements>
769            <!-- JDK9+ test classes -->
770            <exclude name="*9Test.java"/>
771            <exclude name="*10Test.java"/>
772          </javac-elements>
773        </run-tck-tests>
774      </target>
775    
776    
777      <target name="4jdk8-jtreg"
778              depends="4jdk8jar"
779              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
780        <run-jtreg-tests
781           target="8"
782           workdir="${build.4jdk8.dir}"
783           classes="${4jdk8product.jar}"/>
784      </target>
785    
786    
787      <target name="4jdk8-test"
788              depends="4jdk8-tck, 4jdk8-jtreg"
789              description="Runs tck and jtreg tests for jsr166-4jdk8">
790      </target>
791    
792    
793      <target name="4jdk8docs"
794              description="Builds javadocs for src/jdk8 to dist dir">
795    
796        <delete dir="${4jdk8docs.dir}"/>
797        <mkdir dir="${4jdk8docs.dir}"/>
798    
799        <javadoc destdir="${4jdk8docs.dir}"
800                 packagenames="none"
801                 link="${java8.api.url}"
802                 overview="${4jdk8src.dir}/intro.html"
803                 access="${build.javadoc.access}"
804                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
805                 classpath=""
806                 executable="${javadoc8}"
807                 failonerror = "true">
808          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
809            <include name="**/*.java"/>
810          </fileset>
811          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
812          <arg value="-XDignore.symbol.file=true"/>
813          <arg value="-tag"/>
814          <arg value="${javadoc.jls.option}"/>
815    <!-- @apiNote currently unused -->
816    <!--       <arg value="-tag"/> -->
817    <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
818          <arg value="-tag"/>
819          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
820          <arg value="-tag"/>
821          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
822        </javadoc>
823      </target>
824    
825    
826      <target name="4jdk8dist"
827              depends="4jdk8dist-jar, 4jdk8dist-docs"
828              description="Puts all distributable products in single hierarchy"/>
829    
830    
831      <target name="4jdk8clean"
832              description="Removes all 4jdk8 build products">
833    
834        <delete dir="${build.4jdk8.dir}"/>
835    
836      </target>
837    
838    
839      <target name="4jdk8dist-jar"
840              depends="4jdk8clean, 4jdk8jar">
841        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
842      </target>
843    
844    
845      <target name="4jdk8dist-docs"
846              depends="4jdk8clean, 4jdk8docs">
847        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
848      </target>
849    
850    
851    
852    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
853    
854    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 596  Line 863 
863             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
864             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
865             source="6"             source="6"
866               target="6"
867             classpath=""             classpath=""
868             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
869             includeAntRuntime="false"             includeAntRuntime="false"
870             includeJavaRuntime="false"             includeJavaRuntime="false"
871               encoding="ASCII"
872             executable="${javac7}"             executable="${javac7}"
873             fork="true">             fork="true">
874    
# Line 625  Line 894 
894             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
895             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
896             source="6"             source="6"
897               target="6"
898             classpath=""             classpath=""
899             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
900             includeAntRuntime="false"             includeAntRuntime="false"
901             includeJavaRuntime="false"             includeJavaRuntime="false"
902               encoding="ASCII"
903             executable="${javac8}"             executable="${javac8}"
904             fork="true">             fork="true">
905    
# Line 649  Line 920 
920    
921      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
922        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
923          <manifest>
924            <attribute name="Built-By" value="${user.name}"/>
925            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
926          </manifest>
927      </jar>      </jar>
928    
929    </target>    </target>
930    
931    
932    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
933            depends="4jdk7jar"            depends="4jdk7jar"
934            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
935    
# Line 666  Line 941 
941          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
942          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
943          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
944            <exclude name="*10Test.java"/>
945          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
946          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
947          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 673  Line 949 
949          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
950          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
951          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
952            <exclude name="SubmissionPublisherTest.java"/>
953        </javac-elements>        </javac-elements>
954      </run-tck-tests>      </run-tck-tests>
955    </target>    </target>
956    
957    
958    <target name="4jdk7-test-tck-junit"    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
959            depends="4jdk7compile"    <target name="4jdk7-tck-junit"
960            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            depends="4jdk7compile">
961    
962      <junit printsummary="true"      <junit printsummary="true"
963             showoutput="true"             showoutput="true"
# Line 706  Line 983 
983      </junit>      </junit>
984    </target>    </target>
985    
986    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
987            depends="4jdk7jar"            depends="4jdk7jar"
988            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
989      <run-jtreg-tests      <run-jtreg-tests
# Line 717  Line 994 
994    
995    
996    <target name="4jdk7-test"    <target name="4jdk7-test"
997            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
998            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
999    </target>    </target>
1000    
# Line 733  Line 1010 
1010               link="${java7.api.url}"               link="${java7.api.url}"
1011               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
1012               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1013               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1014               classpath=""               classpath=""
1015               executable="${javadoc7}">               executable="${javadoc7}"
1016                 failonerror = "true">
1017        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1018          <include name="**/*.java"/>          <include name="**/*.java"/>
1019        </fileset>        </fileset>
# Line 786  Line 1064 
1064             classpath=""             classpath=""
1065             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1066             source="5"             source="5"
1067               target="5"
1068             includeAntRuntime="false"             includeAntRuntime="false"
1069             includeJavaRuntime="false"             includeJavaRuntime="false"
1070               encoding="ASCII"
1071             executable="${javac7}"             executable="${javac7}"
1072             fork="true">             fork="true">
1073    
# Line 807  Line 1087 
1087    
1088      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1089        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1090          <manifest>
1091            <attribute name="Built-By" value="${user.name}"/>
1092            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1093          </manifest>
1094      </jar>      </jar>
1095    
1096    </target>    </target>
# Line 822  Line 1106 
1106               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1107               link="${java.api.url}"               link="${java.api.url}"
1108               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1109               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1110               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1111               source="5"               source="5"
1112               executable="${javadoc7}">               executable="${javadoc7}"
1113                 failonerror = "true">
1114        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1115        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1116    
# Line 871  Line 1156 
1156             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1157             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1158             source="6"             source="6"
1159               target="6"
1160             classpath=""             classpath=""
1161             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1162             includeAntRuntime="false"             includeAntRuntime="false"
1163             includeJavaRuntime="false"             includeJavaRuntime="false"
1164               encoding="ASCII"
1165             executable="${javac7}"             executable="${javac7}"
1166             fork="true">             fork="true">
1167    
# Line 894  Line 1181 
1181    
1182      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1183        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1184          <manifest>
1185            <attribute name="Built-By" value="${user.name}"/>
1186            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1187          </manifest>
1188      </jar>      </jar>
1189    
1190    </target>    </target>
# Line 909  Line 1200 
1200               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1201               link="${java.api.url}"               link="${java.api.url}"
1202               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1203               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1204               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1205               source="6"               source="6"
1206               executable="${javadoc7}">               executable="${javadoc7}"
1207                 failonerror = "true">
1208        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1209        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1210    
# Line 961  Line 1253 
1253             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1254             classpath=""             classpath=""
1255             source="6"             source="6"
1256               target="6"
1257             includeAntRuntime="false"             includeAntRuntime="false"
1258             includeJavaRuntime="false"             includeJavaRuntime="false"
1259               encoding="ASCII"
1260             executable="${javac7}"             executable="${javac7}"
1261             fork="true">             fork="true">
1262    
# Line 982  Line 1276 
1276    
1277      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1278        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1279          <manifest>
1280            <attribute name="Built-By" value="${user.name}"/>
1281            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1282          </manifest>
1283      </jar>      </jar>
1284    
1285    </target>    </target>
# Line 997  Line 1295 
1295               packagenames="extra166y.*"               packagenames="extra166y.*"
1296               link="${java.api.url}"               link="${java.api.url}"
1297               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1298               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1299               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1300               source="6"               source="6"
1301               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1048  Line 1346 
1346             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1347             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1348             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1349               target="${build.jsr166e.java.version}"
1350             classpath=""             classpath=""
1351             includeAntRuntime="false"             includeAntRuntime="false"
1352             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1074  Line 1373 
1373             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1374             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1375             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1376               target="${build.jsr166e.java.version}"
1377             classpath=""             classpath=""
1378             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1379             includeAntRuntime="false"             includeAntRuntime="false"
1380             includeJavaRuntime="false"             includeJavaRuntime="false"
1381             executable="${javac8}"             executable="${javac8}"
# Line 1097  Line 1397 
1397    
1398      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1399        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1400          <manifest>
1401            <attribute name="Built-By" value="${user.name}"/>
1402            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1403          </manifest>
1404      </jar>      </jar>
1405    
1406    </target>    </target>
# Line 1112  Line 1416 
1416               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1417               link="${java.api.url}"               link="${java.api.url}"
1418               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1419               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1420               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1421               executable="${javadoc7}">               executable="${javadoc7}"
1422                 failonerror = "true">
1423        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1424        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1425    
# Line 1122  Line 1427 
1427    </target>    </target>
1428    
1429    
1430    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1431            depends="jsr166ejar">            depends="jsr166ejar">
1432    
1433      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1134  Line 1439 
1439        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1440    </target>    </target>
1441    
1442    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1443            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1444    
1445  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1446  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1447  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1448  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1449  <!--     </antcall> -->  <!--     </antcall> -->
1450    
1451      <antcall target="clean"/>      <antcall target="clean"/>
1452      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1453        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1454        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1455      </antcall>      </antcall>
1456    
1457      <antcall target="clean"/>      <antcall target="clean"/>
1458      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1459        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1460        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1461      </antcall>      </antcall>
# Line 1158  Line 1463 
1463    
1464    
1465    <target name="jsr166e-test"    <target name="jsr166e-test"
1466            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1467            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1468    </target>    </target>
1469    

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

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8