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

Diff of /jsr166/build.xml

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

revision 1.187 by jsr166, Sun Oct 4 05:22:26 2015 UTC revision 1.263 by jsr166, Tue Jan 23 06:09:53 2018 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">    xmlns:if="ant:if" xmlns:unless="ant:unless"
3      xmlns:ivy="antlib:org.apache.ivy.ant">
4    
5    <description>    <description>
6  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 7  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 14  Line 18 
18    itself.  Because the JDK version matters and because different    itself.  Because the JDK version matters and because different
19    targets require different JDKs, we assume that users have created a    targets require different JDKs, we assume that users have created a
20    hierarchy containing:    hierarchy containing:
   $HOME/jdk/jdk6  
   $HOME/jdk/jdk7  
21    $HOME/jdk/jdk8    $HOME/jdk/jdk8
22    $HOME/jdk/jdk9    $HOME/jdk/jdk9
23      $HOME/jdk/jdk10
24      $HOME/jdk/jdk11
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
   $HOME/jdk/src/jdk6  
   $HOME/jdk/src/jdk7  
26    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
27    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk9
28      $HOME/jdk/src/jdk10
29      $HOME/jdk/src/jdk11
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    
33    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
34    ant -Djdk$N.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
35    for $N in 6 7 8 9 ...    for $N in 8 9 10 ...
36    
37    As of 2015-09, there is incomplete hacky support for jigsaw    As of 2016-03, the sources in src/main are for jdk9+ only.
   Build for jigsaw using something like:  
   ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist  
   "docs" target is still 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" />
# Line 62  Line 63 
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 85  Line 90 
90    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
91      <attribute name="v"/>      <attribute name="v"/>
92      <sequential>      <sequential>
93      <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>      <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
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.home" location="${jdks.home}/src/jdk@{v}"/>
98      <local name="have.java.base"/>      <local name="have.java.base"/>
99      <available property="have.java.base"      <available property="have.java.base"
100        file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>        file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
101      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
102        if:set="have.java.base"/>        if:set="have.java.base"/>
103      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
104        unless:set="have.java.base"/>        unless:set="have.java.base"/>
105      <local name="modules"/>      <local name="modules"/>
106      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
# Line 127  Line 133 
133    <defjdklocations v="7"/>    <defjdklocations v="7"/>
134    <defjdklocations v="8"/>    <defjdklocations v="8"/>
135    <defjdklocations v="9"/>    <defjdklocations v="9"/>
136      <defjdklocations v="10"/>
137      <defjdklocations v="11"/>
138    
139    <!-- Source locations -->    <!-- Source locations -->
140    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 134  Line 142 
142    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
143    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
144    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
145    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
146    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
147      <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
148      <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
149    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
150    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
151    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
152    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
153    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
154      <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
155    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
156    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
157    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 149  Line 160 
160    <!-- Javadoc locations -->    <!-- Javadoc locations -->
161    <property name="docs.dir"          location="${build.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
162    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
163      <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
164    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
165    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
166    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
# Line 156  Line 168 
168    
169    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
170    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
171      <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
172    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
173    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
174    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 164  Line 177 
177    <!-- Jar locations -->    <!-- Jar locations -->
178    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
179    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
180      <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
181    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
182    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
183    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
# Line 171  Line 185 
185    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
186    
187    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
188    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
189    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>    <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
190    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>    <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
191    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>    <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
192    <!-- The expected canonical location does not yet exist as of 2014-07 -->    <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
193    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->    <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
194    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>    <!-- The location of jdk9 early access docs (RIP) -->
195      <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
196    <!-- Default jdk doc location (latest stable release seems best) -->    <!-- Default jdk doc location (latest stable release seems best) -->
197    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
198      <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
199      <property name="java.docroot.url"   value="${java9.docroot.url}"/>
200    
201    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
202    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 187  Line 204 
204    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
205    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
206    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
207      <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
208      <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
209    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
210    
211    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 209  Line 228 
228      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
229      <attribute name="workdir"/>      <attribute name="workdir"/>
230      <attribute name="classes"/>      <attribute name="classes"/>
231      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>      <!--
232            <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
233        -->
234            <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
235      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
236    
237      <sequential>      <sequential>
# Line 219  Line 241 
241        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
242      </condition>      </condition>
243    
244        <local name="use-doclint"/>
245        <condition property="use-doclint">
246          <not> <equals arg1="@{target}" arg2="7"/> </not>
247        </condition>
248    
249      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
250    
251      <javac srcdir="@{tck.src.dir}"      <javac srcdir="@{tck.src.dir}"
# Line 231  Line 258 
258             classpath="${junit.jar}"             classpath="${junit.jar}"
259             includeAntRuntime="false"             includeAntRuntime="false"
260             includeJavaRuntime="false"             includeJavaRuntime="false"
261               encoding="ASCII"
262             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
263             fork="true">             fork="true">
264    
265        <include name="*.java"/>        <include name="*.java"/>
266        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
267        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
268          <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
269        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
270        <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>        <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
271        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
272        <javac-elements/>        <javac-elements/>
273    
# Line 249  Line 278 
278            jvm="${java@{target}}"            jvm="${java@{target}}"
279            fork="true">            fork="true">
280          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
281          <jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>          <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
282            <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
283            <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
284            <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
285            <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
286            <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
287          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
288            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
289            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
290    
291          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
292          <syspropertyset id="system-properties-used-by-tck">          <syspropertyset id="system-properties-used-by-tck">
293            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
294            <propertyref prefix="jsr166."/>            <propertyref prefix="jsr166."/>
295              <propertyref name="test.timeout.factor"/>
296          </syspropertyset>          </syspropertyset>
297    
298          <classpath>          <classpath>
# Line 268  Line 305 
305    </macrodef>    </macrodef>
306    
307    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
308      <fileset dir="${jtreg11.src.dir}">
309        <patternset id="jdk11.jtreg.tests">
310          <include name="**/*.java"/>
311        </patternset>
312      </fileset>
313    
314      <fileset dir="${jtreg10.src.dir}">
315        <patternset id="jdk10.jtreg.tests">
316          <include name="**/*.java"/>
317        </patternset>
318      </fileset>
319    
320    <fileset dir="${jtreg9.src.dir}">    <fileset dir="${jtreg9.src.dir}">
321      <patternset id="jdk9.jtreg.tests">      <patternset id="jdk9.jtreg.tests">
322        <include name="**/*.java"/>        <include name="**/*.java"/>
# Line 277  Line 326 
326    <fileset dir="${jtreg8.src.dir}">    <fileset dir="${jtreg8.src.dir}">
327      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
328        <include name="**/*.java"/>        <include name="**/*.java"/>
       <exclude name="**/SpliteratorCharacteristics.java"/>  
       <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->  
       <exclude name="**/GCDuringIteration.java"/>  
329      </patternset>      </patternset>
330    </fileset>    </fileset>
331    
# Line 289  Line 335 
335      </patternset>      </patternset>
336    </fileset>    </fileset>
337    
338      <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
339      <property name="jtreg.flags" value=""/>
340    
341    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
342      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="source" default="7"/>  
343      <attribute name="target"/>      <attribute name="target"/>
344      <attribute name="workdir"/>      <attribute name="workdir"/>
345      <attribute name="classes"/>      <attribute name="classes"/>
346        <attribute name="verbose" default="${jtreg.verbose}"/>
347      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
348        <element name="jtreg-elements" optional="true"/>
349    
350      <sequential>      <sequential>
351    
352        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
353        <property name="jtreg.verbose" value="nopass,fail,error"/>
354    
355      <local name="modules"/>      <local name="modules"/>
356      <condition property="modules">      <condition property="modules">
357        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/jmods" type="dir"/>
358      </condition>      </condition>
359    
360      <delete dir="@{workdir}/JTwork"   quiet="true"/>      <delete dir="@{workdir}/JTwork"   quiet="true"/>
     <delete dir="@{workdir}/JTreport" quiet="true"/>  
     <mkdir dir="@{workdir}/JTwork/scratch"/>  
     <mkdir dir="@{workdir}/JTreport"/>  
361      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
362             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
363             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork">
            reportDir="@{workdir}/JTreport">  
364        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
365        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
366        <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>        <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
367          <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
368        <arg value="-agentvm"/>        <arg value="-agentvm"/>
369        <arg value="-verbose:nopass,fail,error"/>        <arg value="-noreport"/>
370          <arg value="-verbose:@{verbose}"/>
371        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
372        <arg value="-automatic"/>        <arg value="-automatic"/>
373        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
374        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
375          <arg line="${jtreg.flags}"/>
376          <jtreg-elements/>
377      </jtreg>      </jtreg>
378      </sequential>      </sequential>
379    </macrodef>    </macrodef>
# Line 337  Line 390 
390    <!-- Main targets -->    <!-- Main targets -->
391    
392    <property name="build.main.java.version" value="9"/>    <property name="build.main.java.version" value="9"/>
393    <property name="build.main.javac" value="${javac9}"/>    <!-- Workaround "no nested properties in ant" -->
394      <macrodef name="define-build-main-properties">
395        <attribute name="v"/>
396        <sequential>
397          <property name="build.main.java"    value="${java@{v}}"/>
398          <property name="build.main.javac"   value="${javac@{v}}"/>
399          <property name="build.main.javadoc" value="${javadoc@{v}}"/>
400        </sequential>
401      </macrodef>
402      <define-build-main-properties v="${build.main.java.version}"/>
403    
404    <target name="dists"    <target name="dists"
405            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist"
406            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
407              <!--
408                  depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
409              -->
410    
411    <target name="compile"    <target name="compile"
412            depends="configure-compiler"            depends="configure-compiler"
413            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
414    
     <local name="modules"/>  
     <condition property="modules">  
       <and>  
         <available file="${jdk9.home}/jmods" type="dir"/>  
         <equals arg1="9" arg2="${build.main.java.version}"/>  
       </and>  
     </condition>  
   
415      <local name="destdir"/>      <local name="destdir"/>
416      <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>      <property name="destdir" value="${build.classes.dir}/java.base"/>
     <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>  
417    
418      <mkdir dir="${destdir}"/>      <mkdir dir="${destdir}"/>
419    
# Line 369  Line 425 
425             classpath=""             classpath=""
426             includeAntRuntime="false"             includeAntRuntime="false"
427             includeJavaRuntime="false"             includeJavaRuntime="false"
428               encoding="ASCII"
429             executable="${build.main.javac}"             executable="${build.main.javac}"
430             fork="true">             fork="true">
431    
432        <include name="**/*.java"/>        <include name="**/*.java"/>
433        <compilerarg value="-Xmodule:java.base" if:set="modules"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
434        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
435        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
436        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
437          <compilerarg line="--doclint-format html5"/>
438          <compilerarg value="-Xdoclint:all/protected,reference/private"/>
439        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
       <compilerarg value="-Xdoclint:all/protected"/>  
440        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
441        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
442    
# Line 388  Line 446 
446    
447    <target name="jar"    <target name="jar"
448            depends="compile"            depends="compile"
449            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
450        <local name="subdir"/>
451        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
452      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
453        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
454        <manifest>        <manifest>
455          <attribute name="Built-By" value="${user.name}"/>          <attribute name="Built-By" value="${user.name}"/>
456          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 409  Line 468 
468      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
469      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
470    
471    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
472    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
473    <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
474    <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
475    <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
476      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
477               packagenames="none"               packagenames="none"
478               link="${java9.api.url}"               link="${java9.api.url}"
479               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
480               access="${build.javadoc.access}"               access="${build.javadoc.access}"
481               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}"
482               classpath=""               classpath=""
483               executable="${javadoc9}">               source="9"
484                 executable="${build.main.javadoc}">
485        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
486          <include name="**/*.java"/>          <include name="**/*.java"/>
487        </fileset>        </fileset>
488        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
489        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
490        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
491  <!--  TODO     <arg value="-Xmodule:java.base"/> -->        <arg value="-html5"/>
492          <arg value="--patch-module=java.base=${src.dir}"/>
493        <arg value="-tag"/>        <arg value="-tag"/>
494        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
495    <!-- @apiNote currently unused -->
496    <!--       <arg value="-tag"/> -->
497    <!--       <arg value="apiNote:a:API Note:"/> -->
498        <arg value="-tag"/>        <arg value="-tag"/>
499        <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;"/>  
500        <arg value="-tag"/>        <arg value="-tag"/>
501        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>        <arg value="implNote:a:Implementation Note:"/>
502    <!-- tags added in jdk9: currently unused -->
503    <!--       <arg value="-tag"/> -->
504    <!--       <arg value="revised:X"/> -->
505    <!--       <arg value="-tag"/> -->
506    <!--       <arg value="spec:X"/> -->
507      </javadoc>      </javadoc>
508    </target>    </target>
509    
# Line 465  Line 537 
537    
538    <target name="clean"    <target name="clean"
539            description="Removes all build products">            description="Removes all build products">
   
540      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
   
541    </target>    </target>
542    
543    
544    <target name="dist-clean"    <target name="dist-clean"
545            description="Removes all build and distribution products">            description="Removes all build and distribution products">
   
546      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
547      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
   
548    </target>    </target>
549    
550    
# Line 492  Line 560 
560    
561    <target name="tck"    <target name="tck"
562            depends="jar"            depends="jar"
563            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
564    
565      <run-tck-tests      <run-tck-tests
566        target="${build.main.java.version}"        target="${build.main.java.version}"
567        workdir="${build.dir}"        workdir="${build.dir}"
568        classes="${product.jar}"/>        classes="${product.jar}">
569          <javac-elements>
570            <compilerarg value="-Werror"/>
571          </javac-elements>
572        </run-tck-tests>
573    </target>    </target>
574    
575    <target name="tck-parallelism-1"    <target name="tck-parallelism-1"
576            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
577      <antcall target="tck">      <antcall target="tck">
578        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
579      </antcall>      </antcall>
580    </target>    </target>
581    
582    <target name="tck-parallelism-0"    <target name="tck-parallelism-0"
583            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
584      <antcall target="tck">      <antcall target="tck">
585        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
586      </antcall>      </antcall>
587    </target>    </target>
588    
589      <target name="tck-security-manager"
590              description="Runs tck with a security manager">
591        <antcall target="tck">
592          <param name="jsr166.useSecurityManager" value="true"/>
593        </antcall>
594      </target>
595    
596    <target name="jtreg"    <target name="jtreg"
597            depends="jar"            depends="jar"
598            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
599      <run-jtreg-tests      <run-jtreg-tests
600         target="${build.main.java.version}"         target="${build.main.java.version}"
601         workdir="${build.dir}"         workdir="${build.dir}"
# Line 524  Line 603 
603    </target>    </target>
604    
605    <target name="test"    <target name="test"
606            depends="tck, tck-parallelism-1, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
607            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main"/>
   </target>  
608    
609    <target name="jtreg8" description="Runs jtreg tests with jdk8">  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
610    
611      <antcall target="jtreg">  <!--     <antcall target="jtreg"> -->
612        <param name="build.main.java.version" value="8"/>  <!--       <param name="build.main.java.version" value="8"/> -->
613        <param name="build.main.javac" value="${javac8}"/>  <!--       <param name="build.main.javac" value="${javac8}"/> -->
614      </antcall>  <!--     </antcall> -->
615    
616    </target>  <!--   </target> -->
617    
618    <target name="test89"    <target name="test91011"
619            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for src/main for multiple java versions">
620    
621      <antcall target="clean"/>      <antcall target="clean"/>
622      <antcall target="test">      <antcall target="test">
623        <param name="build.main.java.version" value="8"/>        <param name="build.main.java.version" value="9"/>
       <param name="build.main.javac" value="${javac8}"/>  
624      </antcall>      </antcall>
625    
626      <antcall target="clean"/>      <antcall target="clean"/>
627      <antcall target="test">      <antcall target="test">
628        <param name="build.main.java.version" value="9"/>        <param name="build.main.java.version" value="10"/>
       <param name="build.main.javac" value="${javac9}"/>  
629      </antcall>      </antcall>
630    
631        <antcall target="clean"/>
632        <antcall target="test">
633          <param name="build.main.java.version" value="11"/>
634        </antcall>
635    
636        <!-- Clean up to avoid obscure wrong class file version bugs -->
637        <antcall target="clean"/>
638    
639    </target>    </target>
640    
641    
642    
643    <target name="configure-compiler">    <target name="configure-compiler">
644      <fail message="ant version too old">      <fail message="ant version too old">
645        <condition>        <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
         <not> <antversion atleast="1.9.1"/> </not>  
       </condition>  
646      </fail>      </fail>
647    
648      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 582  Line 664 
664    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
665    
666    
667    <target name="loops" depends="configure-compiler"    <!-- description="Benchmark from Doug Lea's AQS paper" -->
668            description="Benchmark from Doug Lea's AQS paper">    <target name="loops" depends="configure-compiler">
669    
670      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
671    
# Line 593  Line 675 
675         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
676        deprecation="${build.deprecation}"        deprecation="${build.deprecation}"
677             source="${build.sourcelevel}"             source="${build.sourcelevel}"
678               target="${build.sourcelevel}"
679             encoding="ASCII"
680               fork="true">               fork="true">
681    
682        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 604  Line 688 
688      <java classname="ALoops" fork="true">      <java classname="ALoops" fork="true">
689        <classpath refid="loops.classpath"/>        <classpath refid="loops.classpath"/>
690      </java>      </java>
   
691    </target>    </target>
692    
693    
694    <target name="compile-test-loops" depends="jar"    <target name="compile-test-loops" depends="jar"
695            description="compile all the perf tests in src/test/loops">            description="Compiles all the perf tests in src/test/loops">
696    
697      <mkdir dir="${build.dir}/test/loops"/>      <mkdir dir="${build.dir}/test/loops"/>
698    
# Line 620  Line 703 
703             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
704             includeAntRuntime="false"             includeAntRuntime="false"
705             includeJavaRuntime="false"             includeJavaRuntime="false"
706             executable="${javac9}"             encoding="ASCII"
707               executable="${build.main.javac}"
708             fork="true">             fork="true">
709    
710        <include name="*.java"/>        <include name="*.java"/>
# Line 628  Line 712 
712        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
713        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
714        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
715        </javac>
716      </target>
717    
718    
719      <!-- jsr166 4jdk8 -->
720    
721      <target name="4jdk8compile"
722              depends="configure-compiler"
723              description="Compiles src/jdk8 sources, targeting jdk8">
724    
725        <mkdir dir="${build.4jdk8.classes.dir}"/>
726    
727        <javac srcdir="${4jdk8src.dir}"
728               destdir="${build.4jdk8.classes.dir}"
729               debug="${build.debug}"
730               debuglevel="${build.debuglevel}"
731               deprecation="${build.deprecation}"
732               source="8"
733               target="8"
734               classpath=""
735               bootclasspath="${bootclasspath8}"
736               includeAntRuntime="false"
737               includeJavaRuntime="false"
738               encoding="ASCII"
739               executable="${javac8}"
740               fork="true">
741          <include name="**/*.java"/>
742          <compilerarg value="-Xprefer:source"/>
743          <compilerarg value="-XDignore.symbol.file=true"/>
744          <compilerarg value="-Xlint:all"/>
745          <compilerarg value="-Werror"/>
746          <compilerarg line="${build.args}"/>
747      </javac>      </javac>
748      </target>
749    
750      <target name="4jdk8doclint"
751              depends="configure-compiler"
752              description="Finds doclint warnings">
753    
754        <mkdir dir="${build.4jdk8.classes.dir}"/>
755    
756        <javac srcdir="${4jdk8src.dir}"
757               destdir="${build.4jdk8.classes.dir}"
758               debug="${build.debug}"
759               debuglevel="${build.debuglevel}"
760               deprecation="${build.deprecation}"
761               source="8"
762               target="8"
763               classpath=""
764               bootclasspath="${bootclasspath8}"
765               includeAntRuntime="false"
766               includeJavaRuntime="false"
767               encoding="ASCII"
768               executable="${javac8}"
769               fork="true">
770          <include name="**/*.java"/>
771          <compilerarg value="-Xprefer:source"/>
772          <compilerarg value="-XDignore.symbol.file=true"/>
773          <compilerarg value="-Xlint:all"/>
774          <compilerarg value="-Xdoclint:all/protected,reference/private"/>
775          <compilerarg line="${build.args}"/>
776        </javac>
777    </target>    </target>
778    
779    
780    <!-- jsr166 4jdk7 -->    <target name="4jdk8jar"
781              depends="4jdk8compile"
782              description="Builds library jar from compiled sources">
783    
784    <target name="4jdk7compile"      <jar destfile="${4jdk8product.jar}">
785            depends="configure-compiler"        <fileset dir="${build.4jdk8.classes.dir}"/>
786            description="Compiles src/jdk7 sources, targeting jdk7">        <manifest>
787            <attribute name="Built-By" value="${user.name}"/>
788            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
789          </manifest>
790        </jar>
791      </target>
792    
793    
794      <target name="4jdk8-tck"
795              depends="4jdk8jar"
796              description="Runs tck tests for jsr166-4jdk8 directly">
797    
798        <run-tck-tests
799          target="8"
800          workdir="${build.4jdk8.dir}"
801          classes="${4jdk8product.jar}">
802          <javac-elements>
803            <!-- JDK9+ test classes -->
804            <exclude name="*9Test.java"/>
805            <exclude name="*10Test.java"/>
806            <compilerarg value="-Werror"/>
807          </javac-elements>
808        </run-tck-tests>
809      </target>
810    
811    
812      <target name="4jdk8-jtreg"
813              depends="4jdk8jar"
814              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
815        <run-jtreg-tests
816           target="8"
817           workdir="${build.4jdk8.dir}"
818           classes="${4jdk8product.jar}"/>
819      </target>
820    
821    
822      <target name="4jdk8-test"
823              depends="4jdk8-tck, 4jdk8-jtreg"
824              description="Runs tck and jtreg tests for jsr166-4jdk8"/>
825    
826    
827      <target name="4jdk8docs"
828              description="Builds javadocs for src/jdk8 to dist dir">
829    
830        <delete dir="${4jdk8docs.dir}"/>
831        <mkdir dir="${4jdk8docs.dir}"/>
832    
833        <javadoc destdir="${4jdk8docs.dir}"
834                 packagenames="none"
835                 link="${java8.api.url}"
836                 overview="${4jdk8src.dir}/intro.html"
837                 access="${build.javadoc.access}"
838                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
839                 classpath=""
840                 source="8"
841                 executable="${javadoc8}"
842                 failonerror = "true">
843          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
844            <include name="**/*.java"/>
845          </fileset>
846          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
847          <arg value="-XDignore.symbol.file=true"/>
848          <arg value="-tag"/>
849          <arg value="${javadoc.jls.option}"/>
850    <!-- @apiNote currently unused -->
851    <!--       <arg value="-tag"/> -->
852    <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
853          <arg value="-tag"/>
854          <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
855          <arg value="-tag"/>
856          <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
857        </javadoc>
858      </target>
859    
860    
861      <target name="4jdk8dist"
862              depends="4jdk8dist-jar, 4jdk8dist-docs"
863              description="Puts all distributable products in single hierarchy"/>
864    
865    
866      <target name="4jdk8clean"
867              description="Removes all 4jdk8 build products">
868        <delete dir="${build.4jdk8.dir}"/>
869      </target>
870    
871    
872      <target name="4jdk8dist-jar"
873              depends="4jdk8clean, 4jdk8jar">
874        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
875      </target>
876    
877    
878      <target name="4jdk8dist-docs"
879              depends="4jdk8clean, 4jdk8docs">
880        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
881      </target>
882    
883    
884      <!-- jsr166 4jdk7 (no longer maintained) -->
885    
886      <target name="4jdk7compile" depends="configure-compiler">
887      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
888    
889      <javac srcdir="${4jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
# Line 648  Line 892 
892             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
893             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
894             source="6"             source="6"
895               target="6"
896             classpath=""             classpath=""
897             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
898             includeAntRuntime="false"             includeAntRuntime="false"
899             includeJavaRuntime="false"             includeJavaRuntime="false"
900               encoding="ASCII"
901             executable="${javac7}"             executable="${javac7}"
902             fork="true">             fork="true">
903    
# Line 661  Line 907 
907        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
908        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
909        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
910      </javac>      </javac>
911    </target>    </target>
912    
913    <target name="4jdk7doclint"    <target name="4jdk7doclint" depends="configure-compiler">
           depends="configure-compiler"  
           description="Finds doclint warnings">  
   
914      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
915    
916      <javac srcdir="${4jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
# Line 677  Line 919 
919             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
920             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
921             source="6"             source="6"
922               target="6"
923             classpath=""             classpath=""
924             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
925             includeAntRuntime="false"             includeAntRuntime="false"
926             includeJavaRuntime="false"             includeJavaRuntime="false"
927               encoding="ASCII"
928             executable="${javac8}"             executable="${javac8}"
929             fork="true">             fork="true">
930    
# Line 690  Line 934 
934        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
935        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
936        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
937      </javac>      </javac>
938    </target>    </target>
939    
940      <target name="4jdk7jar" depends="4jdk7compile">
   <target name="4jdk7jar"  
           depends="4jdk7compile"  
           description="Builds library jar from compiled sources">  
   
941      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
942        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
943        <manifest>        <manifest>
# Line 706  Line 945 
945          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
946        </manifest>        </manifest>
947      </jar>      </jar>
   
948    </target>    </target>
949    
950      <target name="4jdk7-tck" depends="4jdk7jar">
   <target name="4jdk7-tck"  
           depends="4jdk7jar"  
           description="Runs tck tests for jsr166-4jdk7 directly">  
   
951      <run-tck-tests      <run-tck-tests
952        target="7"        target="7"
953        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
# Line 731  Line 965 
965          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
966          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
967          <exclude name="SubmissionPublisherTest.java"/>          <exclude name="SubmissionPublisherTest.java"/>
968            <compilerarg value="-Werror"/>
969        </javac-elements>        </javac-elements>
970      </run-tck-tests>      </run-tck-tests>
971    </target>    </target>
972    
973      <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
974    <target name="4jdk7-tck-junit"    <target name="4jdk7-tck-junit" depends="4jdk7compile">
           depends="4jdk7compile"  
           description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">  
975    
976      <junit printsummary="true"      <junit printsummary="true"
977             showoutput="true"             showoutput="true"
# Line 760  Line 993 
993    
994        <test name="${jsr166.tckTestClass}" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
995        </test>        </test>
   
996      </junit>      </junit>
997    </target>    </target>
998    
999    <target name="4jdk7-jtreg"    <target name="4jdk7-jtreg" depends="4jdk7jar">
           depends="4jdk7jar"  
           description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">  
1000      <run-jtreg-tests      <run-jtreg-tests
1001         target="7"         target="7"
1002         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
1003         classes="${4jdk7product.jar}"/>         classes="${4jdk7product.jar}"/>
1004    </target>    </target>
1005    
1006      <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1007    
1008    <target name="4jdk7-test"    <target name="4jdk7docs">
           depends="4jdk7-tck, 4jdk7-jtreg"  
           description="Runs tck and jtreg tests for jsr166-4jdk7">  
   </target>  
   
   
   <target name="4jdk7docs"  
           description="Builds javadocs for src/jdk7 to dist dir">  
   
1009      <delete dir="${4jdk7docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
1010      <mkdir dir="${4jdk7docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
1011    
# Line 791  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 802  Line 1026 
1026      </javadoc>      </javadoc>
1027    </target>    </target>
1028    
1029      <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1030    
1031    <target name="4jdk7dist"    <target name="4jdk7clean">
           depends="4jdk7dist-jar, 4jdk7dist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="4jdk7clean"  
           description="Removes all 4jdk7 build products">  
   
1032      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
   
1033    </target>    </target>
1034    
1035      <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
   <target name="4jdk7dist-jar"  
           depends="4jdk7clean, 4jdk7jar">  
1036      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1037    </target>    </target>
1038    
1039      <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
   <target name="4jdk7dist-docs"  
           depends="4jdk7clean, 4jdk7docs">  
1040      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1041    </target>    </target>
1042    
1043    
1044    <!-- jsr166x -->    <!-- jsr166x (no longer maintained) -->
   
   <target name="jsr166xcompile"  
           depends="configure-compiler"  
           description="Compiles jsr166x sources to build dir">  
1045    
1046      <target name="jsr166xcompile" depends="configure-compiler">
1047      <mkdir dir="${build.jsr166x.classes.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
1048    
1049      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 844  Line 1054 
1054             classpath=""             classpath=""
1055             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1056             source="5"             source="5"
1057               target="5"
1058             includeAntRuntime="false"             includeAntRuntime="false"
1059             includeJavaRuntime="false"             includeJavaRuntime="false"
1060               encoding="ASCII"
1061             executable="${javac7}"             executable="${javac7}"
1062             fork="true">             fork="true">
   
1063        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
1064        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1065        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1066        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1067        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1068      </javac>      </javac>
1069    </target>    </target>
1070    
1071      <target name="jsr166xjar" depends="jsr166xcompile">
   <target name="jsr166xjar"  
           depends="jsr166xcompile"  
           description="Builds library jar from compiled sources">  
   
1072      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1073        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1074        <manifest>        <manifest>
# Line 870  Line 1076 
1076          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1077        </manifest>        </manifest>
1078      </jar>      </jar>
   
1079    </target>    </target>
1080    
1081      <target name="jsr166xdocs">
   <target name="jsr166xdocs"  
           description="Builds javadocs to dist dir">  
   
1082      <delete dir="${jsr166xdocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
1083      <mkdir dir="${jsr166xdocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
1084    
# Line 884  Line 1086 
1086               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1087               link="${java.api.url}"               link="${java.api.url}"
1088               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1089               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1090               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1091               source="5"               source="5"
1092               executable="${javadoc7}">               executable="${javadoc7}"
1093                 failonerror = "true">
1094        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1095        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1096      </javadoc>      </javadoc>
1097    </target>    </target>
1098    
1099      <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1100    
1101    <target name="jsr166xdist"    <target name="jsr166xclean">
           depends="jsr166xdist-jar, jsr166xdist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="jsr166xclean"  
           description="Removes all jsr166x build products">  
   
1102      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
   
1103    </target>    </target>
1104    
1105      <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
   <target name="jsr166xdist-jar"  
           depends="jsr166xclean, jsr166xjar">  
1106      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1107    </target>    </target>
1108    
1109    <target name="jsr166xdist-docs"    <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
           depends="jsr166xclean, jsr166xdocs">  
1110      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1111    </target>    </target>
1112    
   <!-- jsr166y -->  
1113    
1114      <!-- jsr166y (no longer maintained) -->
1115    
1116    <target name="jsr166ycompile"    <target name="jsr166ycompile" depends="configure-compiler">
           depends="configure-compiler"  
           description="Compiles jsr166y sources">  
   
1117      <mkdir dir="${build.jsr166y.classes.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
1118    
1119      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 933  Line 1122 
1122             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1123             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1124             source="6"             source="6"
1125               target="6"
1126             classpath=""             classpath=""
1127             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1128             includeAntRuntime="false"             includeAntRuntime="false"
1129             includeJavaRuntime="false"             includeJavaRuntime="false"
1130               encoding="ASCII"
1131             executable="${javac7}"             executable="${javac7}"
1132             fork="true">             fork="true">
1133    
# Line 945  Line 1136 
1136        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1137        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1138        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1139      </javac>      </javac>
1140    </target>    </target>
1141    
1142      <target name="jsr166yjar" depends="jsr166ycompile">
   <target name="jsr166yjar"  
           depends="jsr166ycompile"  
           description="Builds library jar from compiled sources">  
   
1143      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1144        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1145        <manifest>        <manifest>
# Line 961  Line 1147 
1147          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1148        </manifest>        </manifest>
1149      </jar>      </jar>
   
1150    </target>    </target>
1151    
1152      <target name="jsr166ydocs">
   <target name="jsr166ydocs"  
           description="Builds javadocs to dist dir">  
   
1153      <delete dir="${jsr166ydocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
1154      <mkdir dir="${jsr166ydocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
1155    
# Line 975  Line 1157 
1157               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1158               link="${java.api.url}"               link="${java.api.url}"
1159               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1160               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1161               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1162               source="6"               source="6"
1163               executable="${javadoc7}">               executable="${javadoc7}"
1164                 failonerror = "true">
1165        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1166        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1167      </javadoc>      </javadoc>
1168    </target>    </target>
1169    
1170      <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1171    
1172    <target name="jsr166ydist"    <target name="jsr166yclean">
           depends="jsr166ydist-jar, jsr166ydist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="jsr166yclean"  
           description="Removes all jsr166y build products">  
   
1173      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
   
1174    </target>    </target>
1175    
1176      <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
   <target name="jsr166ydist-jar"  
           depends="jsr166yclean, jsr166yjar">  
1177      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1178    </target>    </target>
1179    
1180    <target name="jsr166ydist-docs"    <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
           depends="jsr166yclean, jsr166ydocs">  
1181      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1182    </target>    </target>
1183    
1184    
1185    <!-- extra166y -->    <!-- extra166y (no longer maintained) -->
   
   
   <target name="extra166ycompile"  
           depends="configure-compiler, jsr166yjar"  
           description="Compiles extra166y sources">  
1186    
1187      <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1188      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
1189    
1190      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1027  Line 1195 
1195             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1196             classpath=""             classpath=""
1197             source="6"             source="6"
1198               target="6"
1199             includeAntRuntime="false"             includeAntRuntime="false"
1200             includeJavaRuntime="false"             includeJavaRuntime="false"
1201               encoding="ASCII"
1202             executable="${javac7}"             executable="${javac7}"
1203             fork="true">             fork="true">
1204    
# Line 1037  Line 1207 
1207        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1208        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1209        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1210      </javac>      </javac>
1211    </target>    </target>
1212    
1213      <target name="extra166yjar" depends="extra166ycompile">
   <target name="extra166yjar"  
           depends="extra166ycompile"  
           description="Builds library jar from compiled sources">  
   
1214      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1215        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1216        <manifest>        <manifest>
# Line 1053  Line 1218 
1218          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1219        </manifest>        </manifest>
1220      </jar>      </jar>
   
1221    </target>    </target>
1222    
1223      <target name="extra166ydocs">
   <target name="extra166ydocs"  
           description="Builds javadocs to build dir">  
   
1224      <delete dir="${extra166ydocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1225      <mkdir dir="${extra166ydocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1226    
# Line 1067  Line 1228 
1228               packagenames="extra166y.*"               packagenames="extra166y.*"
1229               link="${java.api.url}"               link="${java.api.url}"
1230               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1231               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1232               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1233               source="6"               source="6"
1234               executable="${javadoc7}">               executable="${javadoc7}">
1235        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1236        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1237      </javadoc>      </javadoc>
1238    </target>    </target>
1239    
1240      <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1241    
1242    <target name="extra166ydist"    <target name="extra166yclean">
           depends="extra166ydist-jar, extra166ydist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
   
   <target name="extra166yclean"  
           description="Removes all extra166y build products">  
   
1243      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
   
1244    </target>    </target>
1245    
1246      <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
   <target name="extra166ydist-jar"  
           depends="extra166yclean, extra166yjar">  
1247      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1248    </target>    </target>
1249    
1250    <target name="extra166ydist-docs"    <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
           depends="extra166yclean, extra166ydocs">  
1251      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1252    </target>    </target>
1253    
1254    <!-- jsr166e -->  
1255      <!-- jsr166e (no longer maintained) -->
1256    
1257    <property name="build.jsr166e.java.version" value="6"/>    <property name="build.jsr166e.java.version" value="6"/>
1258    <property name="build.jsr166e.javac" value="${javac6}"/>    <property name="build.jsr166e.javac" value="${javac6}"/>
1259    
1260    <target name="jsr166ecompile"    <target name="jsr166ecompile" depends="configure-compiler">
           depends="configure-compiler"  
           description="Compiles jsr166e sources">  
   
1261      <mkdir dir="${build.jsr166e.classes.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1262    
1263      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1118  Line 1266 
1266             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1267             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1268             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1269               target="${build.jsr166e.java.version}"
1270             classpath=""             classpath=""
1271             includeAntRuntime="false"             includeAntRuntime="false"
1272             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1129  Line 1278 
1278        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1279        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1280        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1281      </javac>      </javac>
1282    </target>    </target>
1283    
   <!-- jsr166e: find doclint errors -->  
1284    <target name="jsr166edoclint">    <target name="jsr166edoclint">
   
1285      <mkdir dir="${build.jsr166e.classes.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1286    
1287      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1144  Line 1290 
1290             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1291             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1292             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1293               target="${build.jsr166e.java.version}"
1294             classpath=""             classpath=""
1295             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1296             includeAntRuntime="false"             includeAntRuntime="false"
1297             includeJavaRuntime="false"             includeJavaRuntime="false"
1298             executable="${javac8}"             executable="${javac8}"
# Line 1156  Line 1303 
1303        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1304        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1305        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
   
1306      </javac>      </javac>
1307    </target>    </target>
1308    
1309      <target name="jsr166ejar" depends="jsr166ecompile">
   <target name="jsr166ejar"  
           depends="jsr166ecompile"  
           description="Builds library jar from compiled sources">  
   
1310      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1311        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1312        <manifest>        <manifest>
# Line 1172  Line 1314 
1314          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1315        </manifest>        </manifest>
1316      </jar>      </jar>
   
1317    </target>    </target>
1318    
1319      <target name="jsr166edocs">
   <target name="jsr166edocs"  
           description="Builds javadocs to build dir">  
   
1320      <delete dir="${jsr166edocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1321      <mkdir dir="${jsr166edocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1322    
# Line 1186  Line 1324 
1324               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1325               link="${java.api.url}"               link="${java.api.url}"
1326               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1327               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1328               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1329               executable="${javadoc7}">               executable="${javadoc7}"
1330                 failonerror = "true">
1331        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1332        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1333      </javadoc>      </javadoc>
1334    </target>    </target>
1335    
1336      <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
   <target name="jsr166e-tck-one-java-version"  
           depends="jsr166ejar">  
   
1337      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
   
1338      <run-tck-tests      <run-tck-tests
1339        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1340        target="${build.jsr166e.java.version}"        target="${build.jsr166e.java.version}"
# Line 1208  Line 1342 
1342        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1343    </target>    </target>
1344    
1345    <target name="jsr166e-tck"    <target name="jsr166e-tck">
           description="Runs tck tests for jsr166e for multiple java versions">  
1346    
1347  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1348  <!--     <antcall target="jsr166e-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1230  Line 1363 
1363      </antcall>      </antcall>
1364    </target>    </target>
1365    
1366      <target name="jsr166e-test" depends="jsr166e-tck"/>
1367    
1368    <target name="jsr166e-test"    <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
           depends="jsr166e-tck"  
           description="Runs all tests for jsr166e">  
   </target>  
   
   <target name="jsr166edist"  
           depends="jsr166edist-jar, jsr166edist-docs"  
           description="Puts all distributable products in single hierarchy"/>  
   
1369    
1370    <target name="jsr166eclean"    <target name="jsr166eclean">
           description="Removes all jsr166e build products">  
1371      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
1372    </target>    </target>
1373    
   
1374    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1375            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1376      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1377    </target>    </target>
1378    
1379    <target name="jsr166edist-docs"    <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
           depends="jsr166eclean, jsr166edocs">  
1380      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1381    </target>    </target>
1382    
# Line 1274  Line 1397 
1397    </target>    </target>
1398    
1399    
1400    <!-- ==============================================================
1401      Experimental errorprone support - http://errorprone.info
1402    =================================================================== -->
1403      <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1404      <property name="errorprone.jsr166.flags"
1405                value="-Xep:HashtableContains:OFF
1406                       -Xep:JdkObsolete:OFF
1407                       -Xep:MissingOverride:OFF
1408                       -Xep:MissingFail:OFF
1409                       -Xep:MixedArrayDimensions:ERROR
1410                       -Xep:RemoveUnusedImports:ERROR
1411                       -Xep:EmptyIf:ERROR
1412                       -Xep:MultipleTopLevelClasses:ERROR
1413                       -Xep:ClassName:ERROR
1414                       -Xep:LongLiteralLowerCaseSuffix:ERROR
1415                       -Xep:RedundantThrows:ERROR
1416                       -Xep:IdentityBinaryExpression:WARN
1417                       -Xep:MethodCanBeStatic:WARN"/>
1418      <!-- -Xep:WildcardImport:ERROR -->
1419      <property name="errorprone.jsr166.test.flags"
1420                value="-Xep:StringSplitter:OFF
1421                       -Xep:BoxedPrimitiveConstructor:OFF
1422                       -Xep:ModifyingCollectionWithItself:OFF"/>
1423      <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1424      <target name="errorprone"
1425              depends="clean, configure-compiler"
1426              description="Run errorprone over jsr166 source code (experimental)">
1427    
1428        <local name="destdir"/>
1429        <property name="destdir" value="${build.classes.dir}/java.base"/>
1430        <mkdir dir="${destdir}"/>
1431    
1432        <javac srcdir="${src.dir}"
1433               destdir="${destdir}"
1434               debug="${build.debug}"
1435               debuglevel="${build.debuglevel}"
1436               deprecation="${build.deprecation}"
1437               classpath=""
1438               includeAntRuntime="false"
1439               includeJavaRuntime="false"
1440               encoding="ASCII"
1441               executable="${build.main.javac}"
1442               fork="true">
1443    
1444          <include name="**/*.java"/>
1445          <compilerarg line="-processorpath ${errorprone.jar}"/>
1446          <compilerarg value="-Xplugin:ErrorProne
1447                              ${errorprone.jsr166.flags}"/>
1448          <compilerarg value="--patch-module=java.base=${src.dir}"/>
1449          <compilerarg value="-Xprefer:source"/>
1450          <compilerarg value="-XDignore.symbol.file=true"/>
1451          <compilerarg value="-Xlint:all"/>
1452          <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1453          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1454          <compilerarg line="${build.args}"/>
1455        </javac>
1456    
1457        <jar destfile="${product.jar}">
1458          <fileset dir="${destdir}"/>
1459        </jar>
1460    
1461        <run-tck-tests
1462          target="${build.main.java.version}"
1463          workdir="${build.dir}"
1464          classes="${product.jar}">
1465          <javac-elements>
1466            <compilerarg line="-processorpath ${errorprone.jar}"/>
1467            <compilerarg value="-Xplugin:ErrorProne
1468                                ${errorprone.jsr166.flags}
1469                                ${errorprone.jsr166.test.flags}"/>
1470            <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1471          </javac-elements>
1472        </run-tck-tests>
1473      </target>
1474    
1475      <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1476      <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1477      <target name="errorprone-jtreg"
1478              depends="jar"
1479              description="Run errorprone over jtreg tests (experimental)">
1480    
1481        <run-jtreg-tests
1482           target="${build.main.java.version}"
1483           workdir="${build.dir}"
1484           classes="${product.jar}"
1485           verbose="all">
1486          <jtreg-elements>
1487            <arg value="-javacoption:-XDcompilePolicy=byfile"/>
1488            <arg value="-javacoption:-processorpath"/>
1489            <arg value="-javacoption:${errorprone.jar}"/>
1490            <arg value="-javacoption:-Xplugin:ErrorProne
1491                                ${errorprone.jsr166.flags}
1492                                ${errorprone.jsr166.test.flags}
1493                                -Xep:NonAtomicVolatileUpdate:OFF"/>
1494          </jtreg-elements>
1495        </run-jtreg-tests>
1496      </target>
1497    
1498    
1499    <!-- ==============================================================
1500      Running guava tests against jsr166 code
1501    =================================================================== -->
1502    
1503    <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1504    <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1505    <!-- <property name="guava.version" value="21.0"/> -->
1506    
1507    <!-- HOWTO debug print a path id -->
1508    <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1509    <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1510    
1511    <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1512    <!--   organisation="com.google.guava" module="guava-tests"/> -->
1513    <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1514    <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1515    <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1516    <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1517    
1518    <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1519    <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1520    <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1521    <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1522    
1523    <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1524    <!--   type="*" inline="true" conf="*(private),*(public)" -->
1525    <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1526    <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1527    
1528    <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1529    <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1530    <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1531    
1532      <target name="init-ivy">
1533        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1534             dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1535        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1536                 classpath="${build.dir}/ivy.jar"/>
1537      </target>
1538    
1539      <target name="guava-tests" depends="jar, init-ivy"
1540              description="Guava tests run against jsr166 collections">
1541        <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1542        <mkdir dir="${guava.dir}"/>
1543        <ivy:retrieve pathid="guava.testlib.classpath"
1544          type="jar,bundle" inline="true" conf="default,master"
1545          pattern="${guava.dir}/[artifact].[ext]"
1546          organisation="com.google.guava" module="guava-testlib"/>
1547        <property name="guava.version" value="21.0"/>
1548        <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1549             dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1550        <junit printsummary="true" showoutput="true" haltonfailure="true"
1551               jvm="${build.main.java}" fork="true">
1552          <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1553          <formatter type="brief"/>
1554          <classpath>
1555            <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1556            <path refid="guava.testlib.classpath"/>
1557          </classpath>
1558    
1559          <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1560          <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1561        </junit>
1562      </target>
1563    
1564  </project>  </project>

Legend:
Removed from v.1.187  
changed lines
  Added in v.1.263

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27