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

Diff of /jsr166/build.xml

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

revision 1.191 by jsr166, Fri Nov 6 00:12:54 2015 UTC revision 1.295 by jsr166, Sun Mar 24 00:44:14 2019 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"
3      xmlns:unless="ant:unless"
4      xmlns:ivy="antlib:org.apache.ivy.ant">
5    
6    <description>    <description>
7  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 7  Line 9 
9    
10    Usage: ant [target]    Usage: ant [target]
11    
12      See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
13      more details.
14    
15    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
16    See user.properties.sample for an explanation of some useful settings.    See user.properties.sample for an explanation of some useful settings.
17    
# Line 14  Line 19 
19    itself.  Because the JDK version matters and because different    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a    targets require different JDKs, we assume that users have created a
21    hierarchy containing:    hierarchy containing:
   $HOME/jdk/jdk6  
   $HOME/jdk/jdk7  
22    $HOME/jdk/jdk8    $HOME/jdk/jdk8
23    $HOME/jdk/jdk9    $HOME/jdk/jdk9
24      $HOME/jdk/jdk10
25      $HOME/jdk/jdk11
26      $HOME/jdk/jdk12
27      $HOME/jdk/jdk13
28    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  
29    $HOME/jdk/src/jdk8    $HOME/jdk/src/jdk8
30    $HOME/jdk/src/jdk9    $HOME/jdk/src/jdk9
31      $HOME/jdk/src/jdk10
32      $HOME/jdk/src/jdk11
33      $HOME/jdk/src/jdk12
34      $HOME/jdk/src/jdk13
35    where each of the above is a complete JDK source tree    where each of the above is a complete JDK source tree
36    (e.g. mercurial forest) or a symlink to same.    (e.g. mercurial forest) or a symlink to same.
37    
38    Alternatively, define ant variables thus:    Alternatively, define ant variables thus:
39    ant -Djdk$N.home=...    ant -Djdk$N.home=... -Djdk$N.src.home=...
40    for $N in 6 7 8 9 ...    for $N in 8 .. 13 ...
41    
42    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.  
43  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
44    </description>    </description>
45    
46    <!-- Display main targets by running 'ant -projecthelp' -->    <!-- Run 'ant -projecthelp' (default target) -->
47    <target name="usage">    <target name="usage">
48      <java classname="org.apache.tools.ant.Main">      <java classname="org.apache.tools.ant.Main">
49        <arg value="-projecthelp" />        <arg value="-projecthelp" />
# Line 51  Line 57 
57    
58    
59    <!-- Compilation options -->    <!-- Compilation options -->
   <property name="build.sourcelevel"    value="6"/>  
60    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
61    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
62    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 62  Line 67 
67    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
68    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
69    <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"/>  
70    
71    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
72    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
73    <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"/>
74    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
75    
76      <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
77      <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
78      <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
79      <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
80    
81    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
82    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
83    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
# Line 85  Line 94 
94    <macrodef name="defjdklocations">    <macrodef name="defjdklocations">
95      <attribute name="v"/>      <attribute name="v"/>
96      <sequential>      <sequential>
97      <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>      <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
98      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
99      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
100      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
101        <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
102      <local name="have.java.base"/>      <local name="have.java.base"/>
103      <available property="have.java.base"      <available property="have.java.base"
104        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"/>
105      <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"
106        if:set="have.java.base"/>        if:set="have.java.base"/>
107      <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"
108        unless:set="have.java.base"/>        unless:set="have.java.base"/>
109      <local name="modules"/>      <local name="modules"/>
110      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>      <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
111      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
112      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
113      <path id="bootclasspath@{v}" unless:set="modules">      <path id="bootclasspath@{v}" unless:set="modules">
# Line 127  Line 137 
137    <defjdklocations v="7"/>    <defjdklocations v="7"/>
138    <defjdklocations v="8"/>    <defjdklocations v="8"/>
139    <defjdklocations v="9"/>    <defjdklocations v="9"/>
140      <defjdklocations v="10"/>
141      <defjdklocations v="11"/>
142      <defjdklocations v="12"/>
143      <defjdklocations v="13"/>
144    
145    <!-- Source locations -->    <!-- Source locations -->
146    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 134  Line 148 
148    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
149    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
150    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
151    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
152    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
153      <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
154      <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
155      <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
156      <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
157    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
158    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
159    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
160    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
161    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
162      <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
163    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
164    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
165    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 149  Line 168 
168    <!-- Javadoc locations -->    <!-- Javadoc locations -->
169    <property name="docs.dir"          location="${build.dir}/docs"/>    <property name="docs.dir"          location="${build.dir}/docs"/>
170    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
171      <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
172    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
173    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
174    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
# Line 156  Line 176 
176    
177    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
178    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
179      <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
180    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
181    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
182    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 164  Line 185 
185    <!-- Jar locations -->    <!-- Jar locations -->
186    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
187    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
188      <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
189    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
190    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
191    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
# Line 171  Line 193 
193    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
194    
195    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
196    <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
197    <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"/>
198    <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"/>
199    <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"/>
200    <!-- 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"/>
201    <!-- <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"/>
202    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>    <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
203    <!-- Default jdk doc location (latest stable release seems best) -->    <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
204    <property name="java.docroot.url"       value="${java8.docroot.url}"/>    <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
205      <!-- The location of jdk early access docs (RIP) -->
206      <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
207      <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
208      <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
209    <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
210      <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
211      <!-- Default jdk doc location (latest stable LTS release seems best) -->
212      <property name="java.docroot.url"   value="${java11.docroot.url}"/>
213    
214    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
215    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 187  Line 217 
217    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
218    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
219    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
220      <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
221      <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
222      <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
223      <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
224    <property name="java.api.url"       value="${java.docroot.url}/api/"/>    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
225    
226    <!-- Define the "jtreg" task -->    <!-- Define the "jtreg" task -->
# Line 209  Line 243 
243      <attribute name="compile-target" default="@{target}"/>      <attribute name="compile-target" default="@{target}"/>
244      <attribute name="workdir"/>      <attribute name="workdir"/>
245      <attribute name="classes"/>      <attribute name="classes"/>
246      <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>      <!--
247            <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
248        -->
249            <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
250      <element name="javac-elements" optional="true"/>      <element name="javac-elements" optional="true"/>
251    
252      <sequential>      <sequential>
253    
254      <local name="modules"/>      <local name="modules"/>
255      <condition property="modules">      <condition property="modules">
256        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>        <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
257        </condition>
258    
259        <local name="use-doclint"/>
260        <condition property="use-doclint">
261          <not> <equals arg1="@{target}" arg2="7"/> </not>
262      </condition>      </condition>
263    
264      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
# Line 231  Line 273 
273             classpath="${junit.jar}"             classpath="${junit.jar}"
274             includeAntRuntime="false"             includeAntRuntime="false"
275             includeJavaRuntime="false"             includeJavaRuntime="false"
276               encoding="ASCII"
277             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
278             fork="true">             fork="true">
279    
280        <include name="*.java"/>        <include name="*.java"/>
281        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
282        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
283          <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
284        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
285        <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>        <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
286        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
287        <javac-elements/>        <javac-elements/>
288    
# Line 249  Line 293 
293            jvm="${java@{target}}"            jvm="${java@{target}}"
294            fork="true">            fork="true">
295          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
296          <jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>          <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
297            <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
298            <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
299            <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
300            <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
301            <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
302          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
303            <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
304            <jvmarg line="${vmoptions}" if:set="vmoptions"/>
305    
306          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
307          <syspropertyset id="system-properties-used-by-tck">          <syspropertyset id="system-properties-used-by-tck">
308            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
309            <propertyref prefix="jsr166."/>            <propertyref prefix="jsr166."/>
310              <propertyref name="test.timeout.factor"/>
311          </syspropertyset>          </syspropertyset>
312    
313          <classpath>          <classpath>
# Line 268  Line 320 
320    </macrodef>    </macrodef>
321    
322    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
323    <fileset dir="${jtreg9.src.dir}">    <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
324      <patternset id="jdk9.jtreg.tests">    <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
325        <include name="**/*.java"/>    <property name="jtreg.test.pattern" value="**/*.java"/>
326      </patternset>    <macrodef name="defjtregtests">
327    </fileset>      <attribute name="v"/>
328        <sequential>
329          <fileset dir="${jtreg@{v}.src.dir}">
330            <patternset id="jdk@{v}.jtreg.tests">
331              <include name="${jtreg.test.pattern}"/>
332            </patternset>
333          </fileset>
334        </sequential>
335      </macrodef>
336    
337    <fileset dir="${jtreg8.src.dir}">    <defjtregtests v="13"/>
338      <patternset id="jdk8.jtreg.tests">    <defjtregtests v="12"/>
339        <include name="**/*.java"/>    <defjtregtests v="11"/>
340        <exclude name="**/SpliteratorCharacteristics.java"/>    <defjtregtests v="10"/>
341        <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->    <defjtregtests v="9"/>
342        <exclude name="**/GCDuringIteration.java"/>    <defjtregtests v="8"/>
343      </patternset>    <defjtregtests v="7"/>
   </fileset>  
344    
345    <fileset dir="${jtreg7.src.dir}">    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
346      <patternset id="jdk7.jtreg.tests">    <property name="jtreg.flags" value=""/>
       <include name="**/*.java"/>  
     </patternset>  
   </fileset>  
347    
348    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
349      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->      <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="source" default="7"/>  
350      <attribute name="target"/>      <attribute name="target"/>
351      <attribute name="workdir"/>      <attribute name="workdir"/>
352      <attribute name="classes"/>      <attribute name="classes"/>
353        <attribute name="verbose" default="${jtreg.verbose}"/>
354      <attribute name="jtregflags" default=""/>      <attribute name="jtregflags" default=""/>
355        <element name="jtreg-elements" optional="true"/>
356    
357      <sequential>      <sequential>
358    
# Line 304  Line 361 
361    
362      <local name="modules"/>      <local name="modules"/>
363      <condition property="modules">      <condition property="modules">
364        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/lib/modules" type="file"/>
365      </condition>      </condition>
366    
367      <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"/>  
368      <jtreg dir="${jtreg@{target}.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
369             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
370             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork">
            reportDir="@{workdir}/JTreport">  
371        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
372        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
373        <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>        <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
374          <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
375        <arg value="-agentvm"/>        <arg value="-agentvm"/>
376        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-noreport"/>
377          <arg value="-verbose:@{verbose}"/>
378        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
379        <arg value="-automatic"/>        <arg value="-automatic"/>
380        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
381        <arg line="@{jtregflags}"/>        <arg line="@{jtregflags}"/>
382          <arg line="${jtreg.flags}"/>
383          <jtreg-elements/>
384      </jtreg>      </jtreg>
385      </sequential>      </sequential>
386    </macrodef>    </macrodef>
# Line 339  Line 396 
396    
397    <!-- Main targets -->    <!-- Main targets -->
398    
399    <property name="build.main.java.version" value="9"/>    <!-- Default values: may seem strange ... -->
400      <!-- At runtime, target latest LTS, i.e. jdk11 -->
401      <!-- But at build time, target jdk9, for maximal binary portability -->
402      <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
403        o override-methods=summary
404        o {@systemProperty ...}
405        o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
406        o 8202628: javadoc generates bad links in TestModules.java
407        -->
408      <property name="java.runtime.target" value="11"/>
409      <property name="build.main.java" value="${java11}"/>
410    <property name="build.main.javac" value="${javac9}"/>    <property name="build.main.javac" value="${javac9}"/>
411      <property name="build.main.javadoc" value="${javadoc12}"/>
412      <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
413    
414    <target name="dists"    <target name="dists"
415            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"            depends="dist, 4jdk8dist"
416            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
417              <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
418    
419    <target name="compile"    <target name="compile"
420            depends="configure-compiler"            depends="configure-compiler"
421            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
422    
     <local name="modules"/>  
     <condition property="modules">  
       <and>  
         <available file="${jdk9.home}/jmods" type="dir"/>  
         <equals arg1="9" arg2="${build.main.java.version}"/>  
       </and>  
     </condition>  
   
423      <local name="destdir"/>      <local name="destdir"/>
424      <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"/>  
425    
426      <mkdir dir="${destdir}"/>      <mkdir dir="${destdir}"/>
427    
# Line 372  Line 433 
433             classpath=""             classpath=""
434             includeAntRuntime="false"             includeAntRuntime="false"
435             includeJavaRuntime="false"             includeJavaRuntime="false"
436               encoding="ASCII"
437             executable="${build.main.javac}"             executable="${build.main.javac}"
438             fork="true">             fork="true">
439    
440        <include name="**/*.java"/>        <include name="**/*.java"/>
441        <compilerarg value="-Xmodule:java.base" if:set="modules"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
442        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
443        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
444        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all,-removal"/>
445          <compilerarg line="--doclint-format html5"/>
446          <compilerarg value="-Xdoclint:all/protected,reference/private"/>
447        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
       <compilerarg value="-Xdoclint:all/protected"/>  
448        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
449        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
450    
# Line 391  Line 454 
454    
455    <target name="jar"    <target name="jar"
456            depends="compile"            depends="compile"
457            description="Builds library jar from compiled sources">            description="Builds library jar for src/main from compiled sources">
458        <local name="subdir"/>
459        <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
460      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
461        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}${subdir}"/>
462        <manifest>        <manifest>
463          <attribute name="Built-By" value="${user.name}"/>          <attribute name="Built-By" value="${user.name}"/>
464          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 412  Line 476 
476      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
477      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
478    
479    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
480    <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
481    <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
482    <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
483    <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
484      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
485               packagenames="none"               packagenames="none"
486               link="${java9.api.url}"               link="${java.api.url}"
487               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
488               access="${build.javadoc.access}"               access="${build.javadoc.access}"
489               sourcepath="${src.dir}:${jdk9src.dir}"               sourcepath="${src.dir}"
490               classpath=""               classpath=""
491               executable="${javadoc9}">               source="${build.main.javadoc.source}"
492                 executable="${build.main.javadoc}">
493    <!-- TODO: JDK-8214571 failonerror = "true" -->
494        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
495          <include name="**/*.java"/>          <include name="**/*.java"/>
496        </fileset>        </fileset>
497        <arg line="-Xdocrootparent ${java9.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
498        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
499        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
500  <!--  TODO     <arg value="-Xmodule:java.base"/> -->        <arg value="-html5"/>
501        <arg value="-tag"/>        <arg value="--patch-module=java.base=${src.dir}"/>
502        <arg value="${javadoc.jls.option}"/>  <!-- old school frames via docs/index.html?overview-summary.html -->
503        <arg value="-tag"/>        <arg value="--frames"/>
504        <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>        <arg value="--override-methods=summary"/>
505        <arg value="-tag"/>        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
506        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
507        <arg value="-tag"/>        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
508        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
509    <!-- tags added in jdk9: currently unused -->
510    <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
511    <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
512      </javadoc>      </javadoc>
513    </target>    </target>
514    
# Line 444  Line 518 
518            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
519    
520    
   <target name="release"  
           depends="dist"  
           description="Puts entire CVS tree, plus distribution productions, in a jar">  
   
     <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>  
   
     <jar basedir="${basedir}" destfile="${release.jar}">  
       <!-- <exclude name="build/**"/> -->  
       <exclude name="${release.jar}"/>  
       <exclude name="user.properties"/>  
       <exclude name="etc/notes/**"/>  
       <exclude name="src/emulation/**"/>  
       <exclude name="**/SyntaxTest.java"/>  
       <exclude name="**/SuperfluousAbstract.java"/>  
       <manifest>  
         <attribute name="Built-By" value="${user.name}"/>  
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>  
       </manifest>  
     </jar>  
   </target>  
   
   
521    <target name="clean"    <target name="clean"
522            description="Removes all build products">            description="Removes all build products">
   
523      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
   
524    </target>    </target>
525    
526    
527    <target name="dist-clean"    <target name="dist-clean"
528            description="Removes all build and distribution products">            description="Removes all build and distribution products">
   
529      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
530      <delete dir="${dist.dir}"/>      <delete dir="${dist.dir}"/>
   
531    </target>    </target>
532    
533    
# Line 495  Line 543 
543    
544    <target name="tck"    <target name="tck"
545            depends="jar"            depends="jar"
546            description="Runs tck tests for main directly">            description="Runs tck tests for src/main directly">
547    
548      <run-tck-tests      <run-tck-tests
549        target="${build.main.java.version}"        target="${java.runtime.target}"
550        workdir="${build.dir}"        workdir="${build.dir}"
551        classes="${product.jar}"/>        classes="${product.jar}">
552          <javac-elements>
553            <compilerarg value="-Werror"/>
554          </javac-elements>
555        </run-tck-tests>
556    </target>    </target>
557    
558    <target name="tck-parallelism-1"    <target name="tck-parallelism-1"
559            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 1">
560      <antcall target="tck">      <antcall target="tck">
561        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
562      </antcall>      </antcall>
563    </target>    </target>
564    
565    <target name="tck-parallelism-0"    <target name="tck-parallelism-0"
566            description="Runs tck with given common pool parallelism">            description="Runs tck with common pool parallelism 0">
567      <antcall target="tck">      <antcall target="tck">
568        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
569      </antcall>      </antcall>
570    </target>    </target>
571    
572      <target name="tck-security-manager"
573              description="Runs tck with a security manager">
574        <antcall target="tck">
575          <param name="jsr166.useSecurityManager" value="true"/>
576        </antcall>
577      </target>
578    
579    <target name="jtreg"    <target name="jtreg"
580            depends="jar"            depends="jar"
581            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for src/main using the jtreg ant task">
582      <run-jtreg-tests      <run-jtreg-tests
583         target="${build.main.java.version}"         target="${java.runtime.target}"
584         workdir="${build.dir}"         workdir="${build.dir}"
585         classes="${product.jar}"/>         classes="${product.jar}"/>
586    </target>    </target>
587    
588    <target name="test"    <target name="test"
589            depends="tck, tck-parallelism-1, jtreg"            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
590            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for src/main"/>
591    
592      <target name="test-version-permutations"
593              depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
594    </target>    </target>
595    
596    <target name="jtreg8" description="Runs jtreg tests with jdk8">    <target name="test9">
597        <antcall target="clean"/>
598        <antcall>
599          <param name="java.runtime.target" value="9"/>
600          <param name="build.main.javac" value="${javac9}"/>
601          <param name="build.main.javadoc" value="${javadoc12}"/>
602          <param name="build.main.javadoc.source" value="9"/>
603          <target name="test"/>
604          <target name="docs"/>
605        </antcall>
606      </target>
607    
608      <antcall target="jtreg">    <target name="test10">
609        <param name="build.main.java.version" value="8"/>      <antcall target="clean"/>
610        <param name="build.main.javac" value="${javac8}"/>      <antcall>
611          <param name="java.runtime.target" value="10"/>
612          <param name="build.main.javac" value="${javac10}"/>
613          <param name="build.main.javadoc" value="${javadoc12}"/>
614          <param name="build.main.javadoc.source" value="10"/>
615          <target name="test"/>
616          <target name="docs"/>
617      </antcall>      </antcall>
618      </target>
619    
620      <target name="test11">
621        <antcall target="clean"/>
622        <antcall>
623          <param name="java.runtime.target" value="11"/>
624          <param name="build.main.javac" value="${javac11}"/>
625          <param name="build.main.javadoc" value="${javadoc12}"/>
626          <param name="build.main.javadoc.source" value="11"/>
627          <target name="test"/>
628          <target name="docs"/>
629        </antcall>
630    </target>    </target>
631    
632    <target name="test89"    <target name="test12">
633            description="Runs tck and jtreg tests for main for multiple java versions">      <antcall target="clean"/>
634        <antcall>
635          <param name="java.runtime.target" value="12"/>
636          <param name="build.main.javac" value="${javac12}"/>
637          <param name="build.main.javadoc" value="${javadoc12}"/>
638          <param name="build.main.javadoc.source" value="12"/>
639          <target name="test"/>
640          <target name="docs"/>
641        </antcall>
642      </target>
643    
644      <target name="test13">
645      <antcall target="clean"/>      <antcall target="clean"/>
646      <antcall target="test">      <antcall>
647        <param name="build.main.java.version" value="8"/>        <param name="java.runtime.target" value="13"/>
648        <param name="build.main.javac" value="${javac8}"/>        <param name="build.main.javac" value="${javac13}"/>
649          <param name="build.main.javadoc" value="${javadoc13}"/>
650          <param name="build.main.javadoc.source" value="13"/>
651          <target name="test"/>
652          <target name="docs"/>
653      </antcall>      </antcall>
654      </target>
655    
656      <target name="test9-11">
657      <antcall target="clean"/>      <antcall target="clean"/>
658      <antcall target="test">      <antcall>
659        <param name="build.main.java.version" value="9"/>        <param name="java.runtime.target" value="11"/>
660        <param name="build.main.javac" value="${javac9}"/>        <param name="build.main.javac" value="${javac9}"/>
661          <param name="build.main.javadoc" value="${javadoc12}"/>
662          <param name="build.main.javadoc.source" value="9"/>
663          <target name="test"/>
664          <target name="docs"/>
665      </antcall>      </antcall>
666      </target>
667    
668      <target name="test9-12">
669        <antcall target="clean"/>
670        <antcall>
671          <param name="java.runtime.target" value="12"/>
672          <param name="build.main.javac" value="${javac9}"/>
673          <param name="build.main.javadoc" value="${javadoc12}"/>
674          <param name="build.main.javadoc.source" value="9"/>
675          <target name="test"/>
676          <target name="docs"/>
677        </antcall>
678    </target>    </target>
679    
680      <target name="test9-13">
681        <antcall target="clean"/>
682        <antcall>
683          <param name="java.runtime.target" value="13"/>
684          <param name="build.main.javac" value="${javac9}"/>
685          <param name="build.main.javadoc" value="${javadoc13}"/>
686          <param name="build.main.javadoc.source" value="9"/>
687          <target name="test"/>
688          <target name="docs"/>
689        </antcall>
690      </target>
691    
692    
693    <target name="configure-compiler">    <target name="configure-compiler">
694      <fail message="ant version too old">      <fail message="ant version too old">
695        <condition>        <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
         <not> <antversion atleast="1.9.1"/> </not>  
       </condition>  
696      </fail>      </fail>
697    
698      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 581  Line 710 
710    </target>    </target>
711    
712    
713      <target name="compile-test-loops" depends="jar"
714              description="Compiles all the perf tests in src/test/loops">
715    
716    <!-- Various demos and test programs -->      <mkdir dir="${build.dir}/test/loops"/>
   
717    
718    <target name="loops" depends="configure-compiler"      <javac srcdir="${basedir}/src/test/loops"
719            description="Benchmark from Doug Lea's AQS paper">             destdir="${build.dir}/test/loops"
720               debug="${build.debug}"
721               debuglevel="${build.debuglevel}"
722               deprecation="${build.deprecation}"
723               includeAntRuntime="false"
724               includeJavaRuntime="false"
725               encoding="ASCII"
726               executable="${build.main.javac}"
727               fork="true">
728    
729      <mkdir dir="${build.loops.dir}"/>        <include name="*.java"/>
730          <compilerarg value="-XDignore.symbol.file=true"/>
731          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
732          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
733          <compilerarg line="${build.args}"/>
734        </javac>
735      </target>
736    
     <javac srcdir="${loops.src.dir}"  
           destdir="${build.loops.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
            target="${build.sourcelevel}"  
              fork="true">  
737    
738        <compilerarg line="${build.args}"/>    <!-- jsr166 4jdk8 -->
       <classpath refid="loops.classpath"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
739    
740      </javac>    <target name="4jdk8compile"
741              depends="configure-compiler"
742              description="Compiles src/jdk8 sources, targeting jdk8">
743    
744      <java classname="ALoops" fork="true">      <mkdir dir="${build.4jdk8.classes.dir}"/>
       <classpath refid="loops.classpath"/>  
     </java>  
745    
746        <javac srcdir="${4jdk8src.dir}"
747               destdir="${build.4jdk8.classes.dir}"
748               debug="${build.debug}"
749               debuglevel="${build.debuglevel}"
750               deprecation="${build.deprecation}"
751               source="8"
752               target="8"
753               classpath=""
754               bootclasspath="${bootclasspath8}"
755               includeAntRuntime="false"
756               includeJavaRuntime="false"
757               encoding="ASCII"
758               executable="${javac8}"
759               fork="true">
760          <include name="**/*.java"/>
761          <compilerarg value="-Xprefer:source"/>
762          <compilerarg value="-XDignore.symbol.file=true"/>
763          <compilerarg value="-Xlint:all"/>
764          <compilerarg value="-Werror"/>
765          <compilerarg line="${build.args}"/>
766        </javac>
767    </target>    </target>
768    
769      <target name="4jdk8doclint"
770              depends="configure-compiler"
771              description="Finds doclint warnings">
772    
773    <target name="compile-test-loops" depends="jar"      <mkdir dir="${build.4jdk8.classes.dir}"/>
           description="compile all the perf tests in src/test/loops">  
   
     <mkdir dir="${build.dir}/test/loops"/>  
774    
775      <javac srcdir="${basedir}/src/test/loops"      <javac srcdir="${4jdk8src.dir}"
776             destdir="${build.dir}/test/loops"             destdir="${build.4jdk8.classes.dir}"
777             debug="${build.debug}"             debug="${build.debug}"
778             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
779             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
780               source="8"
781               target="8"
782               classpath=""
783               bootclasspath="${bootclasspath8}"
784             includeAntRuntime="false"             includeAntRuntime="false"
785             includeJavaRuntime="false"             includeJavaRuntime="false"
786             executable="${javac9}"             encoding="ASCII"
787               executable="${javac8}"
788             fork="true">             fork="true">
789          <include name="**/*.java"/>
790        <include name="*.java"/>        <compilerarg value="-Xprefer:source"/>
791        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
792        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all"/>
793        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
794        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
795      </javac>      </javac>
796      </target>
797    
798    
799      <target name="4jdk8jar"
800              depends="4jdk8compile"
801              description="Builds library jar from compiled sources">
802    
803        <jar destfile="${4jdk8product.jar}">
804          <fileset dir="${build.4jdk8.classes.dir}"/>
805          <manifest>
806            <attribute name="Built-By" value="${user.name}"/>
807            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
808          </manifest>
809        </jar>
810    </target>    </target>
811    
812    
813    <!-- jsr166 4jdk7 -->    <target name="4jdk8-tck"
814              depends="4jdk8jar"
815              description="Runs tck tests for jsr166-4jdk8 directly">
816    
817    <target name="4jdk7compile"      <run-tck-tests
818            depends="configure-compiler"        target="8"
819            description="Compiles src/jdk7 sources, targeting jdk7">        workdir="${build.4jdk8.dir}"
820          classes="${4jdk8product.jar}">
821          <javac-elements>
822            <!-- JDK9+ test classes -->
823            <exclude name="*9Test.java"/>
824            <exclude name="*10Test.java"/>
825            <compilerarg value="-Werror"/>
826          </javac-elements>
827        </run-tck-tests>
828      </target>
829    
830    
831      <target name="4jdk8-jtreg"
832              depends="4jdk8jar"
833              description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
834        <run-jtreg-tests
835           target="8"
836           workdir="${build.4jdk8.dir}"
837           classes="${4jdk8product.jar}"/>
838      </target>
839    
840    
841      <target name="4jdk8-test"
842              depends="4jdk8-tck, 4jdk8-jtreg"
843              description="Runs tck and jtreg tests for jsr166-4jdk8"/>
844    
845    
846      <target name="4jdk8docs"
847              description="Builds javadocs for src/jdk8 to dist dir">
848    
849        <delete dir="${4jdk8docs.dir}"/>
850        <mkdir dir="${4jdk8docs.dir}"/>
851    
852        <javadoc destdir="${4jdk8docs.dir}"
853                 packagenames="none"
854                 link="${java8.api.url}"
855                 overview="${4jdk8src.dir}/intro.html"
856                 access="${build.javadoc.access}"
857                 sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
858                 classpath=""
859                 source="8"
860                 executable="${javadoc8}"
861                 failonerror = "true">
862          <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
863            <include name="**/*.java"/>
864          </fileset>
865          <arg line="-Xdocrootparent ${java8.docroot.url}"/>
866          <arg value="-XDignore.symbol.file=true"/>
867          <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
868          <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
869          <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
870    <!-- @apiNote tag currently unused -->
871    <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
872        </javadoc>
873      </target>
874    
875    
876      <target name="4jdk8dist"
877              depends="4jdk8dist-jar, 4jdk8dist-docs"
878              description="Puts all distributable products in single hierarchy"/>
879    
880    
881      <target name="4jdk8clean"
882              description="Removes all 4jdk8 build products">
883        <delete dir="${build.4jdk8.dir}"/>
884      </target>
885    
886    
887      <target name="4jdk8dist-jar"
888              depends="4jdk8clean, 4jdk8jar">
889        <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
890      </target>
891    
892    
893      <target name="4jdk8dist-docs"
894              depends="4jdk8clean, 4jdk8docs">
895        <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
896      </target>
897    
898    
899      <!-- jsr166 4jdk7 (no longer maintained) -->
900    
901      <target name="4jdk7compile" depends="configure-compiler">
902      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
903    
904      <javac srcdir="${4jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
# Line 657  Line 912 
912             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
913             includeAntRuntime="false"             includeAntRuntime="false"
914             includeJavaRuntime="false"             includeJavaRuntime="false"
915               encoding="ASCII"
916             executable="${javac7}"             executable="${javac7}"
917             fork="true">             fork="true">
918    
# Line 666  Line 922 
922        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
923        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
924        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
925      </javac>      </javac>
926    </target>    </target>
927    
928    <target name="4jdk7doclint"    <target name="4jdk7doclint" depends="configure-compiler">
           depends="configure-compiler"  
           description="Finds doclint warnings">  
   
929      <mkdir dir="${build.4jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
930    
931      <javac srcdir="${4jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
# Line 687  Line 939 
939             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
940             includeAntRuntime="false"             includeAntRuntime="false"
941             includeJavaRuntime="false"             includeJavaRuntime="false"
942               encoding="ASCII"
943             executable="${javac8}"             executable="${javac8}"
944             fork="true">             fork="true">
945    
# Line 696  Line 949 
949        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
950        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
951        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
952      </javac>      </javac>
953    </target>    </target>
954    
955      <target name="4jdk7jar" depends="4jdk7compile">
   <target name="4jdk7jar"  
           depends="4jdk7compile"  
           description="Builds library jar from compiled sources">  
   
956      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
957        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
958        <manifest>        <manifest>
# Line 712  Line 960 
960          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
961        </manifest>        </manifest>
962      </jar>      </jar>
   
963    </target>    </target>
964    
965      <target name="4jdk7-tck" depends="4jdk7jar">
   <target name="4jdk7-tck"  
           depends="4jdk7jar"  
           description="Runs tck tests for jsr166-4jdk7 directly">  
   
966      <run-tck-tests      <run-tck-tests
967        target="7"        target="7"
968        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
# Line 737  Line 980 
980          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
981          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
982          <exclude name="SubmissionPublisherTest.java"/>          <exclude name="SubmissionPublisherTest.java"/>
983            <compilerarg value="-Werror"/>
984        </javac-elements>        </javac-elements>
985      </run-tck-tests>      </run-tck-tests>
986    </target>    </target>
987    
988      <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
989    <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)">  
990    
991      <junit printsummary="true"      <junit printsummary="true"
992             showoutput="true"             showoutput="true"
# Line 766  Line 1008 
1008    
1009        <test name="${jsr166.tckTestClass}" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
1010        </test>        </test>
   
1011      </junit>      </junit>
1012    </target>    </target>
1013    
1014    <target name="4jdk7-jtreg"    <target name="4jdk7-jtreg" depends="4jdk7jar">
           depends="4jdk7jar"  
           description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">  
1015      <run-jtreg-tests      <run-jtreg-tests
1016         target="7"         target="7"
1017         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
1018         classes="${4jdk7product.jar}"/>         classes="${4jdk7product.jar}"/>
1019    </target>    </target>
1020    
1021      <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1022    
1023    <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">  
   
1024      <delete dir="${4jdk7docs.dir}"/>      <delete dir="${4jdk7docs.dir}"/>
1025      <mkdir dir="${4jdk7docs.dir}"/>      <mkdir dir="${4jdk7docs.dir}"/>
1026    
# Line 797  Line 1029 
1029               link="${java7.api.url}"               link="${java7.api.url}"
1030               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
1031               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1032               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1033               classpath=""               classpath=""
1034               executable="${javadoc7}">               executable="${javadoc7}"
1035                 failonerror = "true">
1036        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1037          <include name="**/*.java"/>          <include name="**/*.java"/>
1038        </fileset>        </fileset>
# Line 808  Line 1041 
1041      </javadoc>      </javadoc>
1042    </target>    </target>
1043    
1044      <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1045    
1046    <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">  
   
1047      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
   
1048    </target>    </target>
1049    
1050      <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
   <target name="4jdk7dist-jar"  
           depends="4jdk7clean, 4jdk7jar">  
1051      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1052    </target>    </target>
1053    
1054      <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
   <target name="4jdk7dist-docs"  
           depends="4jdk7clean, 4jdk7docs">  
1055      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1056    </target>    </target>
1057    
1058    
1059    <!-- jsr166x -->    <!-- jsr166x (no longer maintained) -->
   
   <target name="jsr166xcompile"  
           depends="configure-compiler"  
           description="Compiles jsr166x sources to build dir">  
1060    
1061      <target name="jsr166xcompile" depends="configure-compiler">
1062      <mkdir dir="${build.jsr166x.classes.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
1063    
1064      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 853  Line 1072 
1072             target="5"             target="5"
1073             includeAntRuntime="false"             includeAntRuntime="false"
1074             includeJavaRuntime="false"             includeJavaRuntime="false"
1075               encoding="ASCII"
1076             executable="${javac7}"             executable="${javac7}"
1077             fork="true">             fork="true">
   
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"/>        <compilerarg value="-Werror"/>
1082        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1083      </javac>      </javac>
1084    </target>    </target>
1085    
1086      <target name="jsr166xjar" depends="jsr166xcompile">
   <target name="jsr166xjar"  
           depends="jsr166xcompile"  
           description="Builds library jar from compiled sources">  
   
1087      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
1088        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
1089        <manifest>        <manifest>
# Line 877  Line 1091 
1091          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1092        </manifest>        </manifest>
1093      </jar>      </jar>
   
1094    </target>    </target>
1095    
1096      <target name="jsr166xdocs">
   <target name="jsr166xdocs"  
           description="Builds javadocs to dist dir">  
   
1097      <delete dir="${jsr166xdocs.dir}"/>      <delete dir="${jsr166xdocs.dir}"/>
1098      <mkdir dir="${jsr166xdocs.dir}"/>      <mkdir dir="${jsr166xdocs.dir}"/>
1099    
# Line 891  Line 1101 
1101               packagenames="jsr166x.*"               packagenames="jsr166x.*"
1102               link="${java.api.url}"               link="${java.api.url}"
1103               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1104               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1105               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1106               source="5"               source="5"
1107               executable="${javadoc7}">               executable="${javadoc7}"
1108                 failonerror = "true">
1109        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1110        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1111      </javadoc>      </javadoc>
1112    </target>    </target>
1113    
1114      <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1115    
1116    <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">  
   
1117      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
   
1118    </target>    </target>
1119    
1120      <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
   <target name="jsr166xdist-jar"  
           depends="jsr166xclean, jsr166xjar">  
1121      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1122    </target>    </target>
1123    
1124    <target name="jsr166xdist-docs"    <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
           depends="jsr166xclean, jsr166xdocs">  
1125      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1126    </target>    </target>
1127    
   <!-- jsr166y -->  
1128    
1129      <!-- jsr166y (no longer maintained) -->
1130    
1131    <target name="jsr166ycompile"    <target name="jsr166ycompile" depends="configure-compiler">
           depends="configure-compiler"  
           description="Compiles jsr166y sources">  
   
1132      <mkdir dir="${build.jsr166y.classes.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
1133    
1134      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 945  Line 1142 
1142             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
1143             includeAntRuntime="false"             includeAntRuntime="false"
1144             includeJavaRuntime="false"             includeJavaRuntime="false"
1145               encoding="ASCII"
1146             executable="${javac7}"             executable="${javac7}"
1147             fork="true">             fork="true">
1148    
# Line 953  Line 1151 
1151        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1152        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1153        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1154      </javac>      </javac>
1155    </target>    </target>
1156    
1157      <target name="jsr166yjar" depends="jsr166ycompile">
   <target name="jsr166yjar"  
           depends="jsr166ycompile"  
           description="Builds library jar from compiled sources">  
   
1158      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
1159        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
1160        <manifest>        <manifest>
# Line 969  Line 1162 
1162          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1163        </manifest>        </manifest>
1164      </jar>      </jar>
   
1165    </target>    </target>
1166    
1167      <target name="jsr166ydocs">
   <target name="jsr166ydocs"  
           description="Builds javadocs to dist dir">  
   
1168      <delete dir="${jsr166ydocs.dir}"/>      <delete dir="${jsr166ydocs.dir}"/>
1169      <mkdir dir="${jsr166ydocs.dir}"/>      <mkdir dir="${jsr166ydocs.dir}"/>
1170    
# Line 983  Line 1172 
1172               packagenames="jsr166y.*"               packagenames="jsr166y.*"
1173               link="${java.api.url}"               link="${java.api.url}"
1174               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1175               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1176               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1177               source="6"               source="6"
1178               executable="${javadoc7}">               executable="${javadoc7}"
1179                 failonerror = "true">
1180        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1181        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1182      </javadoc>      </javadoc>
1183    </target>    </target>
1184    
1185      <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1186    
1187    <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">  
   
1188      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
   
1189    </target>    </target>
1190    
1191      <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
   <target name="jsr166ydist-jar"  
           depends="jsr166yclean, jsr166yjar">  
1192      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1193    </target>    </target>
1194    
1195    <target name="jsr166ydist-docs"    <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
           depends="jsr166yclean, jsr166ydocs">  
1196      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1197    </target>    </target>
1198    
1199    
1200    <!-- extra166y -->    <!-- extra166y (no longer maintained) -->
   
   
   <target name="extra166ycompile"  
           depends="configure-compiler, jsr166yjar"  
           description="Compiles extra166y sources">  
1201    
1202      <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1203      <mkdir dir="${build.extra166y.classes.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
1204    
1205      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1038  Line 1213 
1213             target="6"             target="6"
1214             includeAntRuntime="false"             includeAntRuntime="false"
1215             includeJavaRuntime="false"             includeJavaRuntime="false"
1216               encoding="ASCII"
1217             executable="${javac7}"             executable="${javac7}"
1218             fork="true">             fork="true">
1219    
# Line 1046  Line 1222 
1222        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1223        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1224        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1225      </javac>      </javac>
1226    </target>    </target>
1227    
1228      <target name="extra166yjar" depends="extra166ycompile">
   <target name="extra166yjar"  
           depends="extra166ycompile"  
           description="Builds library jar from compiled sources">  
   
1229      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1230        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1231        <manifest>        <manifest>
# Line 1062  Line 1233 
1233          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1234        </manifest>        </manifest>
1235      </jar>      </jar>
   
1236    </target>    </target>
1237    
1238      <target name="extra166ydocs">
   <target name="extra166ydocs"  
           description="Builds javadocs to build dir">  
   
1239      <delete dir="${extra166ydocs.dir}"/>      <delete dir="${extra166ydocs.dir}"/>
1240      <mkdir dir="${extra166ydocs.dir}"/>      <mkdir dir="${extra166ydocs.dir}"/>
1241    
# Line 1076  Line 1243 
1243               packagenames="extra166y.*"               packagenames="extra166y.*"
1244               link="${java.api.url}"               link="${java.api.url}"
1245               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1246               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1247               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
1248               source="6"               source="6"
1249               executable="${javadoc7}">               executable="${javadoc7}">
1250        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1251        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1252      </javadoc>      </javadoc>
1253    </target>    </target>
1254    
1255      <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1256    
1257    <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">  
   
1258      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
   
1259    </target>    </target>
1260    
1261      <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
   <target name="extra166ydist-jar"  
           depends="extra166yclean, extra166yjar">  
1262      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1263    </target>    </target>
1264    
1265    <target name="extra166ydist-docs"    <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
           depends="extra166yclean, extra166ydocs">  
1266      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1267    </target>    </target>
1268    
1269    <!-- jsr166e -->  
1270      <!-- jsr166e (no longer maintained) -->
1271    
1272    <property name="build.jsr166e.java.version" value="6"/>    <property name="build.jsr166e.java.version" value="6"/>
1273    <property name="build.jsr166e.javac" value="${javac6}"/>    <property name="build.jsr166e.javac" value="${javac6}"/>
1274    
1275    <target name="jsr166ecompile"    <target name="jsr166ecompile" depends="configure-compiler">
           depends="configure-compiler"  
           description="Compiles jsr166e sources">  
   
1276      <mkdir dir="${build.jsr166e.classes.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1277    
1278      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1139  Line 1293 
1293        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1294        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1295        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
   
1296      </javac>      </javac>
1297    </target>    </target>
1298    
   <!-- jsr166e: find doclint errors -->  
1299    <target name="jsr166edoclint">    <target name="jsr166edoclint">
   
1300      <mkdir dir="${build.jsr166e.classes.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
1301    
1302      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
# Line 1167  Line 1318 
1318        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1319        <compilerarg value="-Werror"/>        <compilerarg value="-Werror"/>
1320        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
   
1321      </javac>      </javac>
1322    </target>    </target>
1323    
1324      <target name="jsr166ejar" depends="jsr166ecompile">
   <target name="jsr166ejar"  
           depends="jsr166ecompile"  
           description="Builds library jar from compiled sources">  
   
1325      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1326        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1327        <manifest>        <manifest>
# Line 1183  Line 1329 
1329          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1330        </manifest>        </manifest>
1331      </jar>      </jar>
   
1332    </target>    </target>
1333    
1334      <target name="jsr166edocs">
   <target name="jsr166edocs"  
           description="Builds javadocs to build dir">  
   
1335      <delete dir="${jsr166edocs.dir}"/>      <delete dir="${jsr166edocs.dir}"/>
1336      <mkdir dir="${jsr166edocs.dir}"/>      <mkdir dir="${jsr166edocs.dir}"/>
1337    
# Line 1197  Line 1339 
1339               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1340               link="${java.api.url}"               link="${java.api.url}"
1341               access="${build.javadoc.access}"               access="${build.javadoc.access}"
1342               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1343               source="${build.jsr166e.java.version}"               source="${build.jsr166e.java.version}"
1344               executable="${javadoc7}">               executable="${javadoc7}"
1345                 failonerror = "true">
1346        <arg line="-Xdocrootparent ${java.docroot.url}"/>        <arg line="-Xdocrootparent ${java.docroot.url}"/>
1347        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
   
1348      </javadoc>      </javadoc>
1349    </target>    </target>
1350    
1351      <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
   <target name="jsr166e-tck-one-java-version"  
           depends="jsr166ejar">  
   
1352      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
   
1353      <run-tck-tests      <run-tck-tests
1354        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1355        target="${build.jsr166e.java.version}"        target="${build.jsr166e.java.version}"
# Line 1219  Line 1357 
1357        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1358    </target>    </target>
1359    
1360    <target name="jsr166e-tck"    <target name="jsr166e-tck">
           description="Runs tck tests for jsr166e for multiple java versions">  
1361    
1362  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1363  <!--     <antcall target="jsr166e-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
# Line 1241  Line 1378 
1378      </antcall>      </antcall>
1379    </target>    </target>
1380    
1381      <target name="jsr166e-test" depends="jsr166e-tck"/>
1382    
1383    <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"/>  
   
1384    
1385    <target name="jsr166eclean"    <target name="jsr166eclean">
           description="Removes all jsr166e build products">  
1386      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
1387    </target>    </target>
1388    
   
1389    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1390            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1391      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1392    </target>    </target>
1393    
1394    <target name="jsr166edist-docs"    <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
           depends="jsr166eclean, jsr166edocs">  
1395      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1396    </target>    </target>
1397    
1398    
1399  <!-- Find buglets that can be detected by static build tools -->  <!-- Find buglets that can be detected by static build tools -->
1400    
1401    <target name="lint">  <!--   <target name="lint"> -->
1402      <antcall target="dists">  <!--     <antcall target="dists"> -->
1403        <param name="build.javadoc.access" value="public"/>  <!--       <param name="build.javadoc.access" value="protected"/> -->
1404      </antcall>  <!--     </antcall> -->
1405    </target>  <!--   </target> -->
1406    
1407  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->  <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1408    <target name="lint-private">    <target name="doclint-private">
1409      <antcall target="dist">      <antcall target="dist">
1410        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1411      </antcall>      </antcall>
1412    </target>    </target>
1413    
1414    
1415    <!-- ==============================================================
1416      Experimental errorprone support
1417      https://errorprone.info
1418      https://errorprone.info/docs/installation
1419      https://github.com/google/error-prone/issues/1143
1420    =================================================================== -->
1421      <path id="errorprone.processorpath.path">
1422        <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1423        <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1424        <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1425        <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1426      </path>
1427      <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1428      <property name="errorprone.jsr166.user.flags" value=""/>
1429      <property name="errorprone.jsr166.flags"
1430                value="-Xep:HashtableContains:OFF
1431                       -Xep:JdkObsolete:OFF
1432                       -Xep:MissingOverride:OFF
1433                       -Xep:MissingFail:OFF
1434                       -Xep:ThreadPriorityCheck:OFF
1435                       -Xep:MixedArrayDimensions:ERROR
1436                       -Xep:RemoveUnusedImports:ERROR
1437                       -Xep:EmptyIf:ERROR
1438                       -Xep:MultipleTopLevelClasses:ERROR
1439                       -Xep:ClassName:ERROR
1440                       -Xep:LongLiteralLowerCaseSuffix:ERROR
1441                       -Xep:RedundantThrows:ERROR
1442                       -Xep:IdentityBinaryExpression:WARN
1443                       -Xep:ConstructorInvokesOverridable:WARN
1444                       -Xep:MethodCanBeStatic:WARN
1445                       ${errorprone.jsr166.user.flags}"/>
1446      <!-- -Xep:WildcardImport:ERROR -->
1447      <property name="errorprone.jsr166.test.flags"
1448                value="-Xep:StringSplitter:OFF
1449                       -Xep:BoxedPrimitiveConstructor:OFF
1450                       -Xep:ModifyingCollectionWithItself:OFF"/>
1451      <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1452      <target name="errorprone"
1453              depends="clean, configure-compiler"
1454              description="Run errorprone over jsr166 source code (experimental)">
1455    
1456        <local name="destdir"/>
1457        <property name="destdir" value="${build.classes.dir}/java.base"/>
1458        <mkdir dir="${destdir}"/>
1459    
1460        <javac srcdir="${src.dir}"
1461               destdir="${destdir}"
1462               debug="${build.debug}"
1463               debuglevel="${build.debuglevel}"
1464               deprecation="${build.deprecation}"
1465               classpath=""
1466               includeAntRuntime="false"
1467               includeJavaRuntime="false"
1468               encoding="ASCII"
1469               executable="${build.main.javac}"
1470               fork="true">
1471    
1472          <include name="**/*.java"/>
1473          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1474          <compilerarg value="-J--illegal-access=permit"/>
1475          <compilerarg value="-XDcompilePolicy=simple"/>
1476          <compilerarg value="-processorpath"/>
1477          <compilerarg pathref="errorprone.processorpath.path"/>
1478          <compilerarg value="-Xplugin:ErrorProne
1479                              ${errorprone.jsr166.flags}"/>
1480          <compilerarg value="--patch-module=java.base=${src.dir}"/>
1481          <compilerarg value="-Xprefer:source"/>
1482          <compilerarg value="-XDignore.symbol.file=true"/>
1483          <compilerarg value="-Xlint:all"/>
1484          <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1485          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1486          <compilerarg line="${build.args}"/>
1487        </javac>
1488    
1489        <jar destfile="${product.jar}">
1490          <fileset dir="${destdir}"/>
1491        </jar>
1492    
1493        <run-tck-tests
1494          target="${java.runtime.target}"
1495          workdir="${build.dir}"
1496          classes="${product.jar}">
1497          <javac-elements>
1498            <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1499            <compilerarg value="-J--illegal-access=permit"/>
1500            <compilerarg value="-XDcompilePolicy=simple"/>
1501            <compilerarg line="-processorpath ${errorprone.processorpath}"/>
1502            <compilerarg value="-Xplugin:ErrorProne
1503                                ${errorprone.jsr166.flags}
1504                                ${errorprone.jsr166.test.flags}"/>
1505            <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1506          </javac-elements>
1507        </run-tck-tests>
1508      </target>
1509    
1510      <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1511      <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1512      <target name="errorprone-jtreg"
1513              depends="jar"
1514              description="Run errorprone over jtreg tests (experimental)">
1515    
1516        <run-jtreg-tests
1517           target="${java.runtime.target}"
1518           workdir="${build.dir}"
1519           classes="${product.jar}"
1520           verbose="all">
1521          <jtreg-elements>
1522            <arg value="-javacoption:-XDcompilePolicy=simple"/>
1523            <arg value="-javacoption:-processorpath"/>
1524            <arg value="-javacoption:${errorprone.processorpath}"/>
1525            <arg value="-javacoption:-Xplugin:ErrorProne
1526                                ${errorprone.jsr166.flags}
1527                                ${errorprone.jsr166.test.flags}
1528                                -Xep:MultipleTopLevelClasses:WARN
1529                                -Xep:NonAtomicVolatileUpdate:OFF"/>
1530          </jtreg-elements>
1531        </run-jtreg-tests>
1532      </target>
1533    
1534    
1535    <!-- ==============================================================
1536      Running guava tests against jsr166 code
1537    =================================================================== -->
1538    
1539    <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1540    <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1541    <!-- <property name="guava.version" value="21.0"/> -->
1542    
1543    <!-- HOWTO debug print a path id -->
1544    <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1545    <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1546    
1547    <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1548    <!--   organisation="com.google.guava" module="guava-tests"/> -->
1549    <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1550    <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1551    <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1552    <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1553    
1554    <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1555    <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1556    <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1557    <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1558    
1559    <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1560    <!--   type="*" inline="true" conf="*(private),*(public)" -->
1561    <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1562    <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1563    
1564    <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1565    <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1566    <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1567    
1568      <target name="init-ivy">
1569        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1570             dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1571        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1572                 classpath="${build.dir}/ivy.jar"/>
1573      </target>
1574    
1575      <target name="guava-tests" depends="jar, init-ivy"
1576              description="Guava tests run against jsr166 collections">
1577        <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1578        <mkdir dir="${guava.dir}"/>
1579        <ivy:retrieve pathid="guava.testlib.classpath"
1580          type="jar,bundle" inline="true" conf="default,master"
1581          pattern="${guava.dir}/[artifact].[ext]"
1582          organisation="com.google.guava" module="guava-testlib"/>
1583        <property name="guava.version" value="21.0"/>
1584        <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1585             dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1586        <junit printsummary="true" showoutput="true" haltonfailure="true"
1587               jvm="${build.main.java}" fork="true">
1588          <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1589          <formatter type="brief"/>
1590          <classpath>
1591            <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1592            <path refid="guava.testlib.classpath"/>
1593          </classpath>
1594    
1595          <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1596          <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1597        </junit>
1598      </target>
1599    
1600  </project>  </project>

Legend:
Removed from v.1.191  
changed lines
  Added in v.1.295

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