[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.227, Sat Dec 17 22:18:25 2016 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage">  <project name="jsr166" default="usage"
2      xmlns:if="ant:if" xmlns:unless="ant:unless">
3    
4    <description>    <description>
5  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 6  Line 7 
7    
8    Usage: ant [target]    Usage: ant [target]
9    
10      See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
11      more details.
12    
13    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
14    See user.properties.sample for an explanation of some useful settings.    See user.properties.sample for an explanation of some useful settings.
15    
# Line 26  Line 30 
30    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
31    
32    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
33    ant -Djdk$N.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
34    for $N in 6 7 8 9 ...    for $N in 6 7 8 9 ...
35    
36      As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37      target is currently broken.
38  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
39    </description>    </description>
40    
41    <!-- Display main targets by running 'ant -projecthelp' -->    <!-- Run 'ant -projecthelp' (default target) -->
42    <target name="usage">    <target name="usage">
43      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
44        <arg value="-projecthelp" />        <arg value="-projecthelp" />
45      </java>      </java>
46    </target>    </target>
47    
48      <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
49    
50    <!-- User-specific settings -->    <!-- User-specific settings -->
51    <property file="user.properties"/>    <property file="user.properties"/>
# Line 50  Line 58 
58    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
59    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
60    
   <!-- Tck options; see JSR166TestCase.java  
    To profile a single tck test class:  
    ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck  
    To stress test a single tck test class:  
    ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck  
   -->  
   <property name="jsr166.profileTests"     value="false"/>  
   <property name="jsr166.profileThreshold" value="100"/>  
   <property name="jsr166.runsPerTest"      value="1"/>  
   <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>  
   
61    <!-- Build locations -->    <!-- Build locations -->
62    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
63    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
64    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
65    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.reports.dir"           location="${build.dir}/reports"/>  
66    
67    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
69    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71    
72      <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
73      <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
74      <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
75      <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
76    
77    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
78    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
79    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
# Line 93  Line 94 
94      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
95      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
96      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
97      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
98        <local name="have.java.base"/>
99        <available property="have.java.base"
100          file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
101        <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
102          if:set="have.java.base"/>
103        <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
104          unless:set="have.java.base"/>
105        <local name="modules"/>
106        <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
107      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
108      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
109      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}" unless:set="modules">
110        <pathelement path="${boot.jar.dir}/resources.jar"/>        <pathelement path="${boot.jar.dir}/resources.jar"/>
111        <pathelement path="${boot.jar.dir}/rt.jar"/>        <pathelement path="${boot.jar.dir}/rt.jar"/>
112        <pathelement path="${boot.jar.dir}/jsse.jar"/>        <pathelement path="${boot.jar.dir}/jsse.jar"/>
113        <pathelement path="${boot.jar.dir}/jce.jar"/>        <pathelement path="${boot.jar.dir}/jce.jar"/>
114        <pathelement path="${boot.jar.dir}/charsets.jar"/>        <pathelement path="${boot.jar.dir}/charsets.jar"/>
115      </path>      </path>
116      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>      <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
117      </sequential>      </sequential>
118    </macrodef>    </macrodef>
119    
# Line 129  Line 139 
139    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
140    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
141    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
142    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
143      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
144      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
145      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
146    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
147    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
148    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
149    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150      <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 142  Line 156 
156    <!-- Javadoc locations -->    <!-- Javadoc locations -->
157    <property name="docs.dir"          location="${build.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
158    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159      <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
# Line 149  Line 164 
164    
165    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167      <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 157  Line 173 
173    <!-- Jar locations -->    <!-- Jar locations -->
174    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176      <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
# Line 168  Line 185 
185    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
186    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
187    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
188    <!-- The expected canonical location does not yet exist as of 2014-07 -->    <!-- The expected canonical location does not yet exist as of 2016-04 -->
189    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
190    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>    <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
191    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
192    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
193    
# Line 187  Line 204 
204    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
205             classpath="${lib.dir}/jtreg.jar" />             classpath="${lib.dir}/jtreg.jar" />
206    
207    <!-- Test classpath -->    <!-- Tck options; see JSR166TestCase.java
208    <path id="test.classpath">     To profile a single tck test class:
209      <pathelement location="${build.testcases.dir}"/>     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
210      <pathelement location="${junit.jar}"/>     To stress test a single tck test class:
211    </path>     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
212       To stress test a single tck test method:
213       ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
214      -->
215      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
216    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
217      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
218      <attribute name="target"/>      <attribute name="target"/>
219      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
220      <attribute name="workdir"/>      <attribute name="workdir"/>
221      <attribute name="classes"/>      <attribute name="classes"/>
222        <!--
223            <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
224        -->
225      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
226      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
227    
228      <sequential>      <sequential>
229    
230        <local name="modules"/>
231        <condition property="modules">
232          <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233        </condition>
234    
235      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
236    
237      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 215  Line 244 
244             classpath="${junit.jar}"             classpath="${junit.jar}"
245             includeAntRuntime="false"             includeAntRuntime="false"
246             includeJavaRuntime="false"             includeJavaRuntime="false"
247               encoding="ASCII"
248             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
249             fork="true">             fork="true">
250    
251        <include name="*.java"/>        <include name="*.java"/>
252        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
253        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
254        <compilerarg value="-Xbootclasspath/p:@{classes}"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
255          <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
256        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
257        <javac-elements/>        <javac-elements/>
258    
# Line 231  Line 262 
262            failonerror="true"            failonerror="true"
263            jvm="${java@{target}}"            jvm="${java@{target}}"
264            fork="true">            fork="true">
265          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266            <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
267            <jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
268            <jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
269            <jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
270            <jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
271          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
272            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
273            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
274    
275          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
276          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">          <syspropertyset id="system-properties-used-by-tck">
277            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
278              <propertyref prefix="jsr166."/>
279              <propertyref name="test.timeout.factor"/>
280          </syspropertyset>          </syspropertyset>
281    
         <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>  
         <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>  
         <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>  
282          <classpath>          <classpath>
283            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
284            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 252  Line 289 
289    </macrodef>    </macrodef>
290    
291    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
292    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg9.src.dir}">
293      <patternset id="jdk9.jtreg.tests">      <patternset id="jdk9.jtreg.tests">
294        <include name="**/*.java"/>        <include name="**/*.java"/>
295      </patternset>      </patternset>
296    </fileset>    </fileset>
297    
298    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg8.src.dir}">
299      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
300        <include name="**/*.java"/>        <include name="**/*.java"/>
301        <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>        <exclude name="**/SpliteratorCharacteristics.java"/>
302      </patternset>      </patternset>
303    </fileset>    </fileset>
304    
305    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg7.src.dir}">
306      <patternset id="jdk7.jtreg.tests">      <patternset id="jdk7.jtreg.tests">
307        <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"/>  
308      </patternset>      </patternset>
309    </fileset>    </fileset>
310    
311      <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
312      <property name="jtreg.flags" value=""/>
313    
314    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
315      <!-- 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}"/>  
316      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
317      <attribute name="target"/>      <attribute name="target"/>
318      <attribute name="workdir"/>      <attribute name="workdir"/>
319      <attribute name="classes"/>      <attribute name="classes"/>
320      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
321    
322      <sequential>      <sequential>
323    
324        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
325        <property name="jtreg.verbose" value="nopass,fail,error"/>
326    
327        <local name="modules"/>
328        <condition property="modules">
329          <available file="${jdk@{target}.home}/jmods" type="dir"/>
330        </condition>
331    
332      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
333      <delete dir="@{workdir}/JTreport" quiet="true"/>      <jtreg dir="${jtreg@{target}.src.dir}"
     <mkdir dir="@{workdir}/JTwork/scratch"/>  
     <mkdir dir="@{workdir}/JTreport"/>  
     <jtreg dir="@{jtreg.src.dir}"  
334             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
335             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork">
            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="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
339          <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
340        <arg value="-agentvm"/>        <arg value="-agentvm"/>
341        <arg value="-v:nopass,fail"/>        <arg value="-noreport"/>
342          <arg value="-verbose:${jtreg.verbose}"/>
343        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
344        <arg value="-automatic"/>        <arg value="-automatic"/>
345        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
346        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
347          <arg line="${jtreg.flags}"/>
348      </jtreg>      </jtreg>
349      </sequential>      </sequential>
350    </macrodef>    </macrodef>
# Line 321  Line 364 
364    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
365    
366    <target name="dists"    <target name="dists"
367            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
368            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
369    
370    <target name="compile"    <target name="compile"
371            depends="configure-compiler"            depends="configure-compiler"
372            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
373    
374      <mkdir dir="${build.classes.dir}"/>      <local name="modules"/>
375        <condition property="modules">
376          <and>
377            <available file="${jdk9.home}/jmods" type="dir"/>
378            <equals arg1="9" arg2="${build.main.java.version}"/>
379          </and>
380        </condition>
381    
382        <local name="destdir"/>
383        <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
384        <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
385    
386        <mkdir dir="${destdir}"/>
387    
388      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
389             destdir="${build.classes.dir}"             destdir="${destdir}"
390             debug="${build.debug}"             debug="${build.debug}"
391             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
392             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
393             classpath=""             classpath=""
394             includeAntRuntime="false"             includeAntRuntime="false"
395             includeJavaRuntime="false"             includeJavaRuntime="false"
396               encoding="ASCII"
397             executable="${build.main.javac}"             executable="${build.main.javac}"
398             fork="true">             fork="true">
399    
400        <include name="**/*.java"/>        <include name="**/*.java"/>
401          <compilerarg value="-Xmodule:java.base" if:set="modules"/>
402        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
403        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
404        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
# Line 356  Line 413 
413    
414    <target name="jar"    <target name="jar"
415            depends="compile"            depends="compile"
416            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
417        <local name="subdir"/>
418        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
419      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
420        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
421          <manifest>
422            <attribute name="Built-By" value="${user.name}"/>
423            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
424          </manifest>
425      </jar>      </jar>
426    </target>    </target>
427    
# Line 373  Line 435 
435      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
436      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
437    
438    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
439    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
440    <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
441    <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
442    <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
443      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
444               packagenames="none"               packagenames="none"
445               link="${java9.api.url}"               link="${java9.api.url}"
446               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
447               access="${build.javadoc.access}"               access="${build.javadoc.access}"
448               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}"
449               classpath=""               classpath=""
450               executable="${javadoc9}">               executable="${javadoc9}">
451        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 387  Line 454 
454        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
455        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
456        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
457          <arg value="-Xmodule:java.base"/>
458        <arg value="-tag"/>        <arg value="-tag"/>
459        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
460    <!-- @apiNote currently unused -->
461    <!--       <arg value="-tag"/> -->
462    <!--       <arg value="apiNote:a:API Note:"/> -->
463        <arg value="-tag"/>        <arg value="-tag"/>
464        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>        <arg value="implSpec:a:Implementation Requirements:"/>
465        <arg value="-tag"/>        <arg value="-tag"/>
466        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="implNote:a:Implementation Note:"/>
467        <arg value="-tag"/>  <!-- tags added in jdk9: currently unused -->
468        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>  <!--       <arg value="-tag"/> -->
469    <!--       <arg value="revised:X"/> -->
470    <!--       <arg value="-tag"/> -->
471    <!--       <arg value="spec:X"/> -->
472      </javadoc>      </javadoc>
473    </target>    </target>
474    
# Line 418  Line 492 
492        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
493        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
494        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
495          <manifest>
496            <attribute name="Built-By" value="${user.name}"/>
497            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
498          </manifest>
499      </jar>      </jar>
500    </target>    </target>
501    
# Line 449  Line 527 
527      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
528    </target>    </target>
529    
530    <target name="tck" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <target name="test-tck"  
531            depends="jar"            depends="jar"
532            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
533    
534      <run-tck-tests      <run-tck-tests
535        target="${build.main.java.version}"        target="${build.main.java.version}"
# Line 460  Line 537 
537        classes="${product.jar}"/>        classes="${product.jar}"/>
538    </target>    </target>
539    
540    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
541            description="Runs test-tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
542      <antcall target="test-tck">      <antcall target="tck">
543        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
544      </antcall>      </antcall>
545    </target>    </target>
546    
547    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
548            description="Runs test-tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
549      <antcall target="test-tck">      <antcall target="tck">
550        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
551      </antcall>      </antcall>
552    </target>    </target>
553    
554    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="tck-security-manager"
555    <target name="test-jtreg"            description="Runs tck with a security manager">
556        <antcall target="tck">
557          <param name="jsr166.useSecurityManager" value="true"/>
558        </antcall>
559      </target>
560    
561      <target name="jtreg"
562            depends="jar"            depends="jar"
563            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
564      <run-jtreg-tests      <run-jtreg-tests
565         target="${build.main.java.version}"         target="${build.main.java.version}"
566         workdir="${build.dir}"         workdir="${build.dir}"
# Line 485  Line 568 
568    </target>    </target>
569    
570    <target name="test"    <target name="test"
571            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
572            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main">
573    </target>    </target>
574    
575    <target name="test89"  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
           description="Runs tck and jtreg tests for main for multiple java versions">  
576    
577      <antcall target="clean"/>  <!--     <antcall target="jtreg"> -->
578      <antcall target="test">  <!--       <param name="build.main.java.version" value="8"/> -->
579        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
580        <param name="build.main.javac" value="${javac8}"/>  <!--     </antcall> -->
       <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>  
     </antcall>  
581    
582      <antcall target="clean"/>  <!--   </target> -->
     <antcall target="test">  
       <param name="build.main.java.version" value="9"/>  
       <param name="build.main.javac" value="${javac9}"/>  
     </antcall>  
583    
584    </target>  <!--   <target name="test89" -->
585    <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
586    
587    <!--     <antcall target="clean"/> -->
588    <!--     <antcall target="test"> -->
589    <!--       <param name="build.main.java.version" value="8"/> -->
590    <!--       <param name="build.main.javac" value="${javac8}"/> -->
591    <!--     </antcall> -->
592    
593    <!--     <antcall target="clean"/> -->
594    <!--     <antcall target="test"> -->
595    <!--       <param name="build.main.java.version" value="9"/> -->
596    <!--       <param name="build.main.javac" value="${javac9}"/> -->
597    <!--     </antcall> -->
598    
599    <!--   </target> -->
600    
601    
602    
603    <target name="configure-compiler">    <target name="configure-compiler">
604        <fail message="ant version too old">
605          <condition>
606            <not> <antversion atleast="1.9.1"/> </not>
607          </condition>
608        </fail>
609    
610      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
611    
# Line 530  Line 626 
626    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
627    
628    
629    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
630            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
631    
632      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
633    
# Line 541  Line 637 
637         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
638        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
639             source="${build.sourcelevel}"             source="${build.sourcelevel}"
640               target="${build.sourcelevel}"
641             encoding="ASCII"
642               fork="true">               fork="true">
643    
644        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 568  Line 666 
666             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
667             includeAntRuntime="false"             includeAntRuntime="false"
668             includeJavaRuntime="false"             includeJavaRuntime="false"
669               encoding="ASCII"
670             executable="${javac9}"             executable="${javac9}"
671             fork="true">             fork="true">
672    
673        <include name="*.java"/>        <include name="*.java"/>
674        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
675        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
676        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
677        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
678    
# Line 582  Line 681 
681    </target>    </target>
682    
683    
684      <!-- jsr166 4jdk8 -->
685    
686      <target name="4jdk8compile"
687              depends="configure-compiler"
688              description="Compiles src/jdk8 sources, targeting jdk8">
689    
690        <mkdir dir="${build.4jdk8.classes.dir}"/>
691    
692        <javac srcdir="${4jdk8src.dir}"
693               destdir="${build.4jdk8.classes.dir}"
694               debug="${build.debug}"
695               debuglevel="${build.debuglevel}"
696               deprecation="${build.deprecation}"
697               source="8"
698               target="8"
699               classpath=""
700               bootclasspath="${bootclasspath8}"
701               includeAntRuntime="false"
702               includeJavaRuntime="false"
703               encoding="ASCII"
704               executable="${javac8}"
705               fork="true">
706    
707          <include name="**/*.java"/>
708          <compilerarg value="-Xprefer:source"/>
709          <compilerarg value="-XDignore.symbol.file=true"/>
710          <compilerarg value="-Xlint:all"/>
711          <compilerarg value="-Werror"/>
712          <compilerarg line="${build.args}"/>
713    
714        </javac>
715      </target>
716    
717      <target name="4jdk8doclint"
718              depends="configure-compiler"
719              description="Finds doclint warnings">
720    
721        <mkdir dir="${build.4jdk8.classes.dir}"/>
722    
723        <javac srcdir="${4jdk8src.dir}"
724               destdir="${build.4jdk8.classes.dir}"
725               debug="${build.debug}"
726               debuglevel="${build.debuglevel}"
727               deprecation="${build.deprecation}"
728               source="8"
729               target="8"
730               classpath=""
731               bootclasspath="${bootclasspath8}"
732               includeAntRuntime="false"
733               includeJavaRuntime="false"
734               encoding="ASCII"
735               executable="${javac8}"
736               fork="true">
737    
738          <include name="**/*.java"/>
739          <compilerarg value="-Xprefer:source"/>
740          <compilerarg value="-XDignore.symbol.file=true"/>
741          <compilerarg value="-Xlint:all"/>
742          <compilerarg value="-Xdoclint:all/protected"/>
743          <compilerarg line="${build.args}"/>
744    
745        </javac>
746      </target>
747    
748    
749      <target name="4jdk8jar"
750              depends="4jdk8compile"
751              description="Builds library jar from compiled sources">
752    
753        <jar destfile="${4jdk8product.jar}">
754          <fileset dir="${build.4jdk8.classes.dir}"/>
755          <manifest>
756            <attribute name="Built-By" value="${user.name}"/>
757            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
758          </manifest>
759        </jar>
760    
761      </target>
762    
763    
764      <target name="4jdk8-tck"
765              depends="4jdk8jar"
766              description="Runs tck tests for jsr166-4jdk8 directly">
767    
768        <run-tck-tests
769          target="8"
770          workdir="${build.4jdk8.dir}"
771          classes="${4jdk8product.jar}">
772          <javac-elements>
773            <!-- JDK9+ test classes -->
774            <exclude name="*9Test.java"/>
775            <exclude name="*10Test.java"/>
776          </javac-elements>
777        </run-tck-tests>
778      </target>
779    
780    
781      <target name="4jdk8-jtreg"
782              depends="4jdk8jar"
783              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
784        <run-jtreg-tests
785           target="8"
786           workdir="${build.4jdk8.dir}"
787           classes="${4jdk8product.jar}"/>
788      </target>
789    
790    
791      <target name="4jdk8-test"
792              depends="4jdk8-tck, 4jdk8-jtreg"
793              description="Runs tck and jtreg tests for jsr166-4jdk8">
794      </target>
795    
796    
797      <target name="4jdk8docs"
798              description="Builds javadocs for src/jdk8 to dist dir">
799    
800        <delete dir="${4jdk8docs.dir}"/>
801        <mkdir dir="${4jdk8docs.dir}"/>
802    
803        <javadoc destdir="${4jdk8docs.dir}"
804                 packagenames="none"
805                 link="${java8.api.url}"
806                 overview="${4jdk8src.dir}/intro.html"
807                 access="${build.javadoc.access}"
808                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
809                 classpath=""
810                 executable="${javadoc8}"
811                 failonerror = "true">
812          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
813            <include name="**/*.java"/>
814          </fileset>
815          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
816          <arg value="-XDignore.symbol.file=true"/>
817          <arg value="-tag"/>
818          <arg value="${javadoc.jls.option}"/>
819    <!-- @apiNote currently unused -->
820    <!--       <arg value="-tag"/> -->
821    <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
822          <arg value="-tag"/>
823          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
824          <arg value="-tag"/>
825          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
826        </javadoc>
827      </target>
828    
829    
830      <target name="4jdk8dist"
831              depends="4jdk8dist-jar, 4jdk8dist-docs"
832              description="Puts all distributable products in single hierarchy"/>
833    
834    
835      <target name="4jdk8clean"
836              description="Removes all 4jdk8 build products">
837    
838        <delete dir="${build.4jdk8.dir}"/>
839    
840      </target>
841    
842    
843      <target name="4jdk8dist-jar"
844              depends="4jdk8clean, 4jdk8jar">
845        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
846      </target>
847    
848    
849      <target name="4jdk8dist-docs"
850              depends="4jdk8clean, 4jdk8docs">
851        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
852      </target>
853    
854    
855    
856    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
857    
858    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 596  Line 867 
867             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
868             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
869             source="6"             source="6"
870               target="6"
871             classpath=""             classpath=""
872             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
873             includeAntRuntime="false"             includeAntRuntime="false"
874             includeJavaRuntime="false"             includeJavaRuntime="false"
875               encoding="ASCII"
876             executable="${javac7}"             executable="${javac7}"
877             fork="true">             fork="true">
878    
# Line 625  Line 898 
898             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
899             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
900             source="6"             source="6"
901               target="6"
902             classpath=""             classpath=""
903             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
904             includeAntRuntime="false"             includeAntRuntime="false"
905             includeJavaRuntime="false"             includeJavaRuntime="false"
906               encoding="ASCII"
907             executable="${javac8}"             executable="${javac8}"
908             fork="true">             fork="true">
909    
# Line 649  Line 924 
924    
925      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
926        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
927          <manifest>
928            <attribute name="Built-By" value="${user.name}"/>
929            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
930          </manifest>
931      </jar>      </jar>
932    
933    </target>    </target>
934    
935    
936    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
937            depends="4jdk7jar"            depends="4jdk7jar"
938            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
939    
# Line 666  Line 945 
945          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
946          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
947          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
948            <exclude name="*10Test.java"/>
949          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
950          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
951          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 673  Line 953 
953          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
954          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
955          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
956            <exclude name="SubmissionPublisherTest.java"/>
957        </javac-elements>        </javac-elements>
958      </run-tck-tests>      </run-tck-tests>
959    </target>    </target>
960    
961    
962    <target name="4jdk7-test-tck-junit"    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
963            depends="4jdk7compile"    <target name="4jdk7-tck-junit"
964            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            depends="4jdk7compile">
965    
966      <junit printsummary="true"      <junit printsummary="true"
967             showoutput="true"             showoutput="true"
# Line 706  Line 987 
987      </junit>      </junit>
988    </target>    </target>
989    
990    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
991            depends="4jdk7jar"            depends="4jdk7jar"
992            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
993      <run-jtreg-tests      <run-jtreg-tests
# Line 717  Line 998 
998    
999    
1000    <target name="4jdk7-test"    <target name="4jdk7-test"
1001            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
1002            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
1003    </target>    </target>
1004    
# Line 733  Line 1014 
1014               link="${java7.api.url}"               link="${java7.api.url}"
1015               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
1016               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1017               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1018               classpath=""               classpath=""
1019               executable="${javadoc7}">               executable="${javadoc7}"
1020                 failonerror = "true">
1021        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1022          <include name="**/*.java"/>          <include name="**/*.java"/>
1023        </fileset>        </fileset>
# Line 786  Line 1068 
1068             classpath=""             classpath=""
1069             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1070             source="5"             source="5"
1071               target="5"
1072             includeAntRuntime="false"             includeAntRuntime="false"
1073             includeJavaRuntime="false"             includeJavaRuntime="false"
1074               encoding="ASCII"
1075             executable="${javac7}"             executable="${javac7}"
1076             fork="true">             fork="true">
1077    
# Line 807  Line 1091 
1091    
1092      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1093        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1094          <manifest>
1095            <attribute name="Built-By" value="${user.name}"/>
1096            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1097          </manifest>
1098      </jar>      </jar>
1099    
1100    </target>    </target>
# Line 822  Line 1110 
1110               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1111               link="${java.api.url}"               link="${java.api.url}"
1112               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1113               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1114               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1115               source="5"               source="5"
1116               executable="${javadoc7}">               executable="${javadoc7}"
1117                 failonerror = "true">
1118        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1119        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1120    
# Line 871  Line 1160 
1160             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1161             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1162             source="6"             source="6"
1163               target="6"
1164             classpath=""             classpath=""
1165             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1166             includeAntRuntime="false"             includeAntRuntime="false"
1167             includeJavaRuntime="false"             includeJavaRuntime="false"
1168               encoding="ASCII"
1169             executable="${javac7}"             executable="${javac7}"
1170             fork="true">             fork="true">
1171    
# Line 894  Line 1185 
1185    
1186      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1187        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1188          <manifest>
1189            <attribute name="Built-By" value="${user.name}"/>
1190            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1191          </manifest>
1192      </jar>      </jar>
1193    
1194    </target>    </target>
# Line 909  Line 1204 
1204               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1205               link="${java.api.url}"               link="${java.api.url}"
1206               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1207               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1208               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1209               source="6"               source="6"
1210               executable="${javadoc7}">               executable="${javadoc7}"
1211                 failonerror = "true">
1212        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1213        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1214    
# Line 961  Line 1257 
1257             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1258             classpath=""             classpath=""
1259             source="6"             source="6"
1260               target="6"
1261             includeAntRuntime="false"             includeAntRuntime="false"
1262             includeJavaRuntime="false"             includeJavaRuntime="false"
1263               encoding="ASCII"
1264             executable="${javac7}"             executable="${javac7}"
1265             fork="true">             fork="true">
1266    
# Line 982  Line 1280 
1280    
1281      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1282        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1283          <manifest>
1284            <attribute name="Built-By" value="${user.name}"/>
1285            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1286          </manifest>
1287      </jar>      </jar>
1288    
1289    </target>    </target>
# Line 997  Line 1299 
1299               packagenames="extra166y.*"               packagenames="extra166y.*"
1300               link="${java.api.url}"               link="${java.api.url}"
1301               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1302               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1303               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1304               source="6"               source="6"
1305               executable="${javadoc7}">               executable="${javadoc7}">
# Line 1048  Line 1350 
1350             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1351             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1352             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1353               target="${build.jsr166e.java.version}"
1354             classpath=""             classpath=""
1355             includeAntRuntime="false"             includeAntRuntime="false"
1356             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1074  Line 1377 
1377             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1378             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1379             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1380               target="${build.jsr166e.java.version}"
1381             classpath=""             classpath=""
1382             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1383             includeAntRuntime="false"             includeAntRuntime="false"
1384             includeJavaRuntime="false"             includeJavaRuntime="false"
1385             executable="${javac8}"             executable="${javac8}"
# Line 1097  Line 1401 
1401    
1402      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1403        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1404          <manifest>
1405            <attribute name="Built-By" value="${user.name}"/>
1406            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1407          </manifest>
1408      </jar>      </jar>
1409    
1410    </target>    </target>
# Line 1112  Line 1420 
1420               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1421               link="${java.api.url}"               link="${java.api.url}"
1422               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1423               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1424               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1425               executable="${javadoc7}">               executable="${javadoc7}"
1426                 failonerror = "true">
1427        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1428        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1429    
# Line 1122  Line 1431 
1431    </target>    </target>
1432    
1433    
1434    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1435            depends="jsr166ejar">            depends="jsr166ejar">
1436    
1437      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1134  Line 1443 
1443        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1444    </target>    </target>
1445    
1446    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1447            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1448    
1449  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1450  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1451  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1452  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1453  <!--     </antcall> -->  <!--     </antcall> -->
1454    
1455      <antcall target="clean"/>      <antcall target="clean"/>
1456      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1457        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1458        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1459      </antcall>      </antcall>
1460    
1461      <antcall target="clean"/>      <antcall target="clean"/>
1462      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1463        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1464        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1465      </antcall>      </antcall>
# Line 1158  Line 1467 
1467    
1468    
1469    <target name="jsr166e-test"    <target name="jsr166e-test"
1470            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1471            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1472    </target>    </target>
1473    

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

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8