[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.149, Sat Jul 20 20:40:24 2013 UTC revision 1.229, Tue Dec 20 04:18:46 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      xmlns:ivy="antlib:org.apache.ivy.ant">
4    
5    <description>    <description>
6  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 6  Line 8 
8    
9    Usage: ant [target]    Usage: ant [target]
10    
11      See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
12      more details.
13    
14    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
15    See user.properties.sample for an explanation of some useful settings.    See user.properties.sample for an explanation of some useful settings.
16    
# Line 16  Line 21 
21    $HOME/jdk/jdk6    $HOME/jdk/jdk6
22    $HOME/jdk/jdk7    $HOME/jdk/jdk7
23    $HOME/jdk/jdk8    $HOME/jdk/jdk8
24      $HOME/jdk/jdk9
25    where each of the above is a JDK or a symlink to same, and    where each of the above is a JDK or a symlink to same, and
26    $HOME/jdk/src/jdk6    $HOME/jdk/src/jdk6
27    $HOME/jdk/src/jdk7    $HOME/jdk/src/jdk7
28    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
29      $HOME/jdk/src/jdk9
30    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
31    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
32  As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.  
33      Alternatively, define ant variables thus:
34      ant -Djdk$N.home=... -Djdk$N.src.home=...
35      for $N in 6 7 8 9 ...
36    
37      As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
38      target is currently broken.
39  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
40    </description>    </description>
41    
42    <!-- Display main targets by running 'ant -projecthelp' -->    <!-- Run 'ant -projecthelp' (default target) -->
43    <target name="usage">    <target name="usage">
44      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
45        <arg value="-projecthelp" />        <arg value="-projecthelp" />
46      </java>      </java>
47    </target>    </target>
48    
49      <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
50    
51    <!-- User-specific settings -->    <!-- User-specific settings -->
52    <property file="user.properties"/>    <property file="user.properties"/>
# Line 45  Line 59 
59    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
60    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
61    
   <!-- Tck options; see JSR166TestCase.java -->  
   <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->  
   <property name="jsr166.profileTests"     value="false"/>  
   <property name="jsr166.profileThreshold" value="100"/>  
   <property name="jsr166.runsPerTest"      value="1"/>  
   <!-- Allow running an individual tck test class -->  
   <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->  
   <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>  
   
62    <!-- Build locations -->    <!-- Build locations -->
63    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
64    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
65    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
66    <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"/>  
67    
68    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
69    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
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 86  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 115  Line 133 
133    <defjdklocations v="6"/>    <defjdklocations v="6"/>
134    <defjdklocations v="7"/>    <defjdklocations v="7"/>
135    <defjdklocations v="8"/>    <defjdklocations v="8"/>
136      <defjdklocations v="9"/>
137    
138    <!-- Source locations -->    <!-- Source locations -->
139    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
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 134  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 141  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 149  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"/>
181    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
182    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
183    
184    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
185    <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
186    <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
187    <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>    <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"/>
189    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <!-- The expected canonical location does not yet exist as of 2016-04 -->
190    <!-- The below does not yet exist as of 2013-01 -->    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
192      <!-- Default jdk doc location (latest stable release seems best) -->
193      <property name="java.docroot.url"       value="${java8.docroot.url}"/>
194    
195    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
196    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
197      <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
198      <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
199      <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
200      <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
201      <property name="java.api.url"       value="${java.docroot.url}/api/"/>
202    
203    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
204    <!-- See the docs in "jtreg -onlineHelp" -->    <!-- See the docs in "jtreg -onlineHelp" -->
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      <attribute name="jvmflags" default=""/>      <!--
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"/>
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 198  Line 243 
243             source="@{compile-target}"             source="@{compile-target}"
244             target="@{compile-target}"             target="@{compile-target}"
245             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{compile-target}}"  
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}" unless:set="modules"/>
256          <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
257        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
258        <javac-elements/>        <javac-elements/>
259    
# Line 216  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=@{classes}" if:set="modules"/>
268            <jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
269            <jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
270            <jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
271            <jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
272          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
273          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
274          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>          <jvmarg line="${vmoptions}" if:set="vmoptions"/>
275          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>  
276            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
277            <syspropertyset id="system-properties-used-by-tck">
278              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
279              <propertyref prefix="jsr166."/>
280              <propertyref name="test.timeout.factor"/>
281            </syspropertyset>
282    
283          <classpath>          <classpath>
284            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
285            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 230  Line 289 
289      </sequential>      </sequential>
290    </macrodef>    </macrodef>
291    
292      <!-- Define jtreg test sets for different jdk versions -->
293      <fileset dir="${jtreg9.src.dir}">
294        <patternset id="jdk9.jtreg.tests">
295          <include name="**/*.java"/>
296        </patternset>
297      </fileset>
298    
299      <fileset dir="${jtreg8.src.dir}">
300        <patternset id="jdk8.jtreg.tests">
301          <include name="**/*.java"/>
302        </patternset>
303      </fileset>
304    
305      <fileset dir="${jtreg7.src.dir}">
306        <patternset id="jdk7.jtreg.tests">
307          <include name="**/*.java"/>
308        </patternset>
309      </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      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
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">
336             reportDir="@{workdir}/JTreport">        <patternset refid="jdk@{target}.jtreg.tests"/>
337          <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
338        <arg value="-Xbootclasspath/p:@{classes}"/>        <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 269  Line 360 
360    
361    <!-- Main targets -->    <!-- Main targets -->
362    
363      <property name="build.main.java.version" value="9"/>
364      <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             executable="${javac8}"             encoding="ASCII"
397               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"/>
405          <compilerarg value="-Werror"/>
406        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
407        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
408        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 304  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 321  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="${jdkapi8docs.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}:${jdk8src.dir}"               sourcepath="${src.dir}"
449               classpath=""               classpath=""
450               executable="${javadoc8}">               executable="${javadoc9}">
451        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
452          <include name="**/*.java"/>          <include name="**/*.java"/>
453        </fileset>        </fileset>
454          <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:"/>
       <arg value="-tag"/>  
       <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>  
465        <arg value="-tag"/>        <arg value="-tag"/>
466        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>        <arg value="implNote:a:Implementation Note:"/>
467    <!-- tags added in jdk9: currently unused -->
468    <!--       <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 365  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 396  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"
   <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="8"        target="${build.main.java.version}"
536        workdir="${build.dir}"        workdir="${build.dir}"
537        classes="${product.jar}"/>        classes="${product.jar}"/>
538    </target>    </target>
539    
540    <target name="test-jtreg"    <target name="tck-parallelism-1"
541              description="Runs tck with common pool parallelism 1">
542        <antcall target="tck">
543          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
544        </antcall>
545      </target>
546    
547      <target name="tck-parallelism-0"
548              description="Runs tck with common pool parallelism 0">
549        <antcall target="tck">
550          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
551        </antcall>
552      </target>
553    
554      <target name="tck-security-manager"
555              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="8"         target="${build.main.java.version}"
566         workdir="${build.dir}"         workdir="${build.dir}"
567         classes="${product.jar}"/>         classes="${product.jar}"/>
568    </target>    </target>
569    
570    <target name="test"    <target name="test"
571            depends="test-tck, 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="jtreg8" description="Runs jtreg tests with jdk8"> -->
576    
577    <!--     <antcall target="jtreg"> -->
578    <!--       <param name="build.main.java.version" value="8"/> -->
579    <!--       <param name="build.main.javac" value="${javac8}"/> -->
580    <!--     </antcall> -->
581    
582    <!--   </target> -->
583    
584    <!--   <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 444  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 455  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 470  Line 654 
654    </target>    </target>
655    
656    
657      <target name="compile-test-loops" depends="jar"
658              description="compile all the perf tests in src/test/loops">
659    
660        <mkdir dir="${build.dir}/test/loops"/>
661    
662        <javac srcdir="${basedir}/src/test/loops"
663               destdir="${build.dir}/test/loops"
664               debug="${build.debug}"
665               debuglevel="${build.debuglevel}"
666               deprecation="${build.deprecation}"
667               includeAntRuntime="false"
668               includeJavaRuntime="false"
669               encoding="ASCII"
670               executable="${javac9}"
671               fork="true">
672    
673          <include name="*.java"/>
674          <compilerarg value="-XDignore.symbol.file=true"/>
675          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
676          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
677          <compilerarg line="${build.args}"/>
678    
679        </javac>
680    
681      </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 484  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 495  Line 880 
880        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
881        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
882        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
883          <compilerarg value="-Werror"/>
884        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
885    
886      </javac>      </javac>
# Line 512  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 536  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 552  Line 944 
944        <javac-elements>        <javac-elements>
945          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
946          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
947            <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 559  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 592  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
994         target="7"         target="7"
995         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
996         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
997    </target>    </target>
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 617  Line 1011 
1011    
1012      <javadoc destdir="${4jdk7docs.dir}"      <javadoc destdir="${4jdk7docs.dir}"
1013               packagenames="none"               packagenames="none"
1014               link="${jdkapi7docs.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>
1024          <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1025        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1026      </javadoc>      </javadoc>
1027    </target>    </target>
# Line 672  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    
1078        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
1079        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1080        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1081          <compilerarg value="-Werror"/>
1082        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1083    
1084      </javac>      </javac>
# Line 692  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 705  Line 1108 
1108    
1109      <javadoc destdir="${jsr166xdocs.dir}"      <javadoc destdir="${jsr166xdocs.dir}"
1110               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1111               link="${jdkapidocs.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}"/>
1119        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1120    
1121      </javadoc>      </javadoc>
# Line 755  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    
1172        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
1173        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1174        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1175          <compilerarg value="-Werror"/>
1176        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1177    
1178      </javac>      </javac>
# Line 777  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 790  Line 1202 
1202    
1203      <javadoc destdir="${jsr166ydocs.dir}"      <javadoc destdir="${jsr166ydocs.dir}"
1204               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1205               link="${jdkapidocs.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}"/>
1213        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1214    
1215      </javadoc>      </javadoc>
# Line 843  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    
1267        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
1268        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1269        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1270          <compilerarg value="-Werror"/>
1271        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1272    
1273      </javac>      </javac>
# Line 863  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 876  Line 1297 
1297    
1298      <javadoc destdir="${extra166ydocs.dir}"      <javadoc destdir="${extra166ydocs.dir}"
1299               packagenames="extra166y.*"               packagenames="extra166y.*"
1300               link="${jdkapidocs.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}">
1306          <arg line="-Xdocrootparent ${java.docroot.url}"/>
1307        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1308    
1309      </javadoc>      </javadoc>
# Line 928  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 937  Line 1360 
1360        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1361        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1362        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1363          <compilerarg value="-Werror"/>
1364        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1365    
1366      </javac>      </javac>
1367    </target>    </target>
1368    
1369      <!-- jsr166e: find doclint errors -->
1370      <target name="jsr166edoclint">
1371    
1372        <mkdir dir="${build.jsr166e.classes.dir}"/>
1373    
1374        <javac srcdir="${topsrc.dir}"
1375               destdir="${build.jsr166e.classes.dir}"
1376               debug="${build.debug}"
1377               debuglevel="${build.debuglevel}"
1378               deprecation="${build.deprecation}"
1379               source="${build.jsr166e.java.version}"
1380               target="${build.jsr166e.java.version}"
1381               classpath=""
1382               bootclasspath="${bootclasspath6}"
1383               includeAntRuntime="false"
1384               includeJavaRuntime="false"
1385               executable="${javac8}"
1386               fork="true">
1387    
1388          <include name="jsr166e/**/*.java"/>
1389          <compilerarg value="-XDignore.symbol.file=true"/>
1390          <compilerarg value="-Xlint:all"/>
1391          <compilerarg value="-Werror"/>
1392          <compilerarg value="-Xdoclint:all/protected"/>
1393    
1394        </javac>
1395      </target>
1396    
1397    
1398    <target name="jsr166ejar"    <target name="jsr166ejar"
1399            depends="jsr166ecompile"            depends="jsr166ecompile"
# Line 949  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 962  Line 1418 
1418    
1419      <javadoc destdir="${jsr166edocs.dir}"      <javadoc destdir="${jsr166edocs.dir}"
1420               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1421               link="${jdkapidocs.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}"/>
1428        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
1429    
1430      </javadoc>      </javadoc>
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 985  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 1009  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    
# Line 1039  Line 1497 
1497    
1498    <target name="lint">    <target name="lint">
1499      <antcall target="dists">      <antcall target="dists">
1500          <param name="build.javadoc.access" value="public"/>
1501        </antcall>
1502      </target>
1503    
1504    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1505      <target name="lint-private">
1506        <antcall target="dist">
1507        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1508      </antcall>      </antcall>
1509    </target>    </target>
1510    
1511    <!-- ==============================================================
1512      Running guava tests against jsr166 code
1513    =================================================================== -->
1514    
1515    <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1516    <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0-rc1"/> -->
1517    <!-- <property name="guava.version" value="20.0"/> -->
1518    
1519    <!-- HOWTO debug print a path id -->
1520    <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1521    <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1522    
1523    <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1524    <!--   organisation="com.google.guava" module="guava-tests"/> -->
1525    <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1526    <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1527    <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1528    <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1529    
1530    <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1531    <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1532    <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1533    <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1534    
1535    <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1536    <!--   type="*" inline="true" conf="*(private),*(public)" -->
1537    <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1538    <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1539    
1540    <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1541    <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1542    <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1543    
1544      <target name="init-ivy">
1545        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1546             dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1547        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1548                 classpath="${build.dir}/ivy.jar"/>
1549      </target>
1550    
1551      <target name="guava-tests" depends="jar, init-ivy"
1552              description="Guava tests run against jsr166 collections">
1553        <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1554        <mkdir dir="${guava.dir}"/>
1555        <ivy:retrieve pathid="guava.testlib.classpath"
1556          type="jar,bundle" inline="true" conf="default,master"
1557          pattern="${guava.dir}/[artifact].[ext]"
1558          organisation="com.google.guava" module="guava-testlib"/>
1559        <property name="guava.version" value="21.0-rc1"/>
1560        <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1561             dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1562        <junit printsummary="true" showoutput="true" haltonfailure="true"
1563               jvm="${java9}" fork="true">
1564          <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1565          <formatter type="brief"/>
1566          <classpath>
1567            <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1568            <path refid="guava.testlib.classpath"/>
1569          </classpath>
1570    
1571          <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1572          <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1573        </junit>
1574      </target>
1575    
1576  </project>  </project>

Legend:
Removed from v.1.149  
changed lines
  Added in v.1.229

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8