ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.227 by jsr166, Sat Dec 17 22:18:25 2016 UTC vs.
Revision 1.327 by jsr166, Fri Nov 25 20:33:50 2022 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless">
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 17 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
22 <  $HOME/jdk/jdk6
23 <  $HOME/jdk/jdk7
22 <  $HOME/jdk/jdk8
23 <  $HOME/jdk/jdk9
22 >  $HOME/jdk/jdk17
23 >  $HOME/jdk/jdk19
24    where each of the above is a JDK or a symlink to same, and
25 <  $HOME/jdk/src/jdk6
26 <  $HOME/jdk/src/jdk7
27 <  $HOME/jdk/src/jdk8
28 <  $HOME/jdk/src/jdk9
29 <  where each of the above is a complete JDK source tree
30 <  (e.g. mercurial forest) or a symlink to same.
25 >  $HOME/jdk/src/jdk17
26 >  where each of the above is a JDK source tree or a symlink to same.
27  
28    Alternatively, define ant variables thus:
29    ant -Djdk$N.home=... -Djdk$N.src.home=...
30 <  for $N in 6 7 8 9 ...
30 >  for $N in 17 .. 19 ...
31  
32 <  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
33 <  target is currently broken.
32 >  As of 2016-03, the sources in src/main are for jdk9+ only.
33 >  As of 2019-08, the sources in src/main are for jdk11+ only.
34 >  As of 2019-10, compatibility support for jdk8 is dropped entirely.
35 >  As of 2022-02, the sources in src/main are for jdk17+ only.
36   ------------------------------------------------------------------------------
37    </description>
38  
# Line 52 | Line 50
50  
51  
52    <!-- Compilation options -->
55  <property name="build.sourcelevel"    value="6"/>
53    <property name="build.debug"          value="true"/>
54    <property name="build.debuglevel"     value="source,lines,vars"/>
55    <property name="build.deprecation"    value="false"/>
# Line 64 | Line 61
61    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
62    <property name="build.loops.dir"             location="${build.dir}/loops"/>
63  
67  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
69  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71
72  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
73  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
74  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
75  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
76
77  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
78  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
79  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
80  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
81
82  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
83  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
84  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
85  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
86
64    <!-- JDK locations -->
65    <property name="jdks.home"  location="${user.home}/jdk"/>
66  
# Line 95 | Line 72
72      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
73      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
74      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
75 <    <local name="have.java.base"/>
99 <    <available property="have.java.base"
100 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
101 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
102 <      if:set="have.java.base"/>
103 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
104 <      unless:set="have.java.base"/>
105 <    <local name="modules"/>
106 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
107 <    <local name="boot.jar.dir"/>
108 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
109 <    <path id="bootclasspath@{v}" unless:set="modules">
110 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
111 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
112 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
113 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
114 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
115 <    </path>
116 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
75 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
76      </sequential>
77    </macrodef>
78  
# Line 129 | Line 88
88      </sequential>
89    </macrodef>
90  
91 <  <defjdklocations v="6"/>
92 <  <defjdklocations v="7"/>
93 <  <defjdklocations v="8"/>
94 <  <defjdklocations v="9"/>
91 >  <defjdklocations v="17"/>
92 >  <defjdklocations v="18"/>
93 >  <defjdklocations v="19"/>
94 >  <defjdklocations v="20"/>
95  
96    <!-- Source locations -->
97    <property name="src.dir"              location="${basedir}/src/main"/>
98    <property name="test.src.dir"         location="${basedir}/src/test"/>
99    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
100    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
101 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
102 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
103 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
104 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
101 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
102 >  <property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
103 >  <property name="jtreg19.src.dir"      location="${test.src.dir}/jtreg"/>
104 >  <property name="jtreg20.src.dir"      location="${test.src.dir}/jtreg"/>
105 >  <property name="jtreg.src.dir"        location="${jtreg17.src.dir}"/>
106    <property name="lib.dir"              location="${basedir}/lib"/>
107    <property name="dist.dir"             location="${basedir}/dist"/>
108    <property name="topsrc.dir"           location="${basedir}/src"/>
149  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
154  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
109  
110    <!-- Javadoc locations -->
111    <property name="docs.dir"          location="${build.dir}/docs"/>
112 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
163 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
164 <
165 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
171 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
112 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
113  
114    <!-- Jar locations -->
115    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
180  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
116    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
117  
118    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
119 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
120 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
121 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
122 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
123 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
124 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
125 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
191 <  <!-- Default jdk doc location (latest stable release seems best) -->
192 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
119 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
120 >  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
121 >  <property name="java18.docroot.url" value="https://docs.oracle.com/en/java/javase/18/docs"/>
122 >  <property name="java19.docroot.url" value="https://docs.oracle.com/en/java/javase/19/docs"/>
123 >  <property name="java20.docroot.url" value="https://download.java.net/java/early_access/jdk20/docs"/>
124 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
125 >  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
126  
127    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
128 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
129 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
130 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
131 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
199 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
128 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
129 >  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
130 >  <property name="java19.api.url"     value="${java19.docroot.url}/api/"/>
131 >  <property name="java20.api.url"     value="${java20.docroot.url}/api/"/>
132    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
133  
134    <!-- Define the "jtreg" task -->
# Line 204 | Line 136
136    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
137             classpath="${lib.dir}/jtreg.jar" />
138  
139 <  <!-- Tck options; see JSR166TestCase.java
139 >  <!-- Tck configuration options; see JSR166TestCase.java
140     To profile a single tck test class:
141     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
142     To stress test a single tck test class:
# Line 227 | Line 159
159  
160      <sequential>
161  
230    <local name="modules"/>
231    <condition property="modules">
232      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233    </condition>
234
162      <mkdir dir="@{workdir}/tck-classes"/>
163  
164      <javac srcdir="@{tck.src.dir}"
# Line 251 | Line 178
178        <include name="*.java"/>
179        <compilerarg value="-XDignore.symbol.file=true"/>
180        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
181 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
182 <      <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
181 >      <compilerarg value="-Xdoclint:reference/private"/>
182 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
183        <compilerarg line="${build.args}"/>
184        <javac-elements/>
185  
# Line 262 | Line 189
189            failonerror="true"
190            jvm="${java@{target}}"
191            fork="true">
192 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
193 <        <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
194 <        <jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
195 <        <jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
196 <        <jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
197 <        <jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
198 <        <jvmarg line="@{jvmflags}"/>
199 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
200 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
201 <
202 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
203 <        <syspropertyset id="system-properties-used-by-tck">
204 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
205 <          <propertyref prefix="jsr166."/>
206 <          <propertyref name="test.timeout.factor"/>
207 <        </syspropertyset>
208 <
209 <        <classpath>
210 <          <pathelement location="${junit.jar}"/>
211 <          <pathelement location="@{workdir}/tck-classes"/>
212 <        </classpath>
192 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
193 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
194 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
195 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
196 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
197 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
198 >        <jvmarg line="@{jvmflags}"/>
199 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
200 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
201 >
202 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
203 >        <syspropertyset id="system-properties-used-by-tck">
204 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
205 >          <propertyref prefix="jsr166."/>
206 >          <propertyref name="test.timeout.factor"/>
207 >        </syspropertyset>
208 >
209 >        <classpath>
210 >          <pathelement location="${junit.jar}"/>
211 >          <pathelement location="@{workdir}/tck-classes"/>
212 >        </classpath>
213      </java>
214  
215      </sequential>
216    </macrodef>
217  
218    <!-- Define jtreg test sets for different jdk versions -->
219 <  <fileset dir="${jtreg9.src.dir}">
220 <    <patternset id="jdk9.jtreg.tests">
221 <      <include name="**/*.java"/>
222 <    </patternset>
223 <  </fileset>
224 <
225 <  <fileset dir="${jtreg8.src.dir}">
226 <    <patternset id="jdk8.jtreg.tests">
227 <      <include name="**/*.java"/>
228 <      <exclude name="**/SpliteratorCharacteristics.java"/>
229 <    </patternset>
230 <  </fileset>
219 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
220 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
221 >  <property name="jtreg.test.pattern" value="**/*.java"/>
222 >  <macrodef name="defjtregtests">
223 >    <attribute name="v"/>
224 >    <sequential>
225 >      <fileset dir="${jtreg@{v}.src.dir}">
226 >        <patternset id="jdk@{v}.jtreg.tests">
227 >          <include name="${jtreg.test.pattern}"/>
228 >        </patternset>
229 >      </fileset>
230 >    </sequential>
231 >  </macrodef>
232  
233 <  <fileset dir="${jtreg7.src.dir}">
234 <    <patternset id="jdk7.jtreg.tests">
235 <      <include name="**/*.java"/>
236 <    </patternset>
309 <  </fileset>
233 >  <defjtregtests v="17"/>
234 >  <defjtregtests v="18"/>
235 >  <defjtregtests v="19"/>
236 >  <defjtregtests v="20"/>
237  
238    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
239    <property name="jtreg.flags" value=""/>
240  
241    <macrodef name="run-jtreg-tests">
315    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
316    <attribute name="source" default="7"/>
242      <attribute name="target"/>
243      <attribute name="workdir"/>
244      <attribute name="classes"/>
245 +    <attribute name="verbose" default="${jtreg.verbose}"/>
246      <attribute name="jtregflags" default=""/>
247 +    <element name="jtreg-elements" optional="true"/>
248  
249      <sequential>
250  
251      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
252      <property name="jtreg.verbose" value="nopass,fail,error"/>
253  
254 <    <local name="modules"/>
255 <    <condition property="modules">
256 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
257 <    </condition>
254 >    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
255 >    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
256 >    <!-- In 2020 concurrency:3 seems like a sweet spot -->
257 >    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
258 >    <property name="jtreg.concurrency" value="3"/>
259  
260 <    <delete dir="@{workdir}/JTwork"   quiet="true"/>
260 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
261      <jtreg dir="${jtreg@{target}.src.dir}"
262             jdk="${jdk@{target}.home}"
263             workDir="@{workdir}/JTwork">
264        <patternset refid="jdk@{target}.jtreg.tests"/>
265 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
267 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
265 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
266 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
267 >      <arg value="-vmoption:-Xmx256m"/>
268 >      <arg value="-concurrency:${jtreg.concurrency}"/>
269 >      <arg value="-vmoptions:-esa -ea"/>
270 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
271        <arg value="-agentvm"/>
272        <arg value="-noreport"/>
273 <      <arg value="-verbose:${jtreg.verbose}"/>
343 <      <arg value="-vmoptions:-esa -ea"/>
273 >      <arg value="-verbose:@{verbose}"/>
274        <arg value="-automatic"/>
275        <arg value="-k:!ignore"/>
276        <arg line="@{jtregflags}"/>
277        <arg line="${jtreg.flags}"/>
278 +      <jtreg-elements/>
279      </jtreg>
280      </sequential>
281    </macrodef>
# Line 355 | Line 286
286    </path>
287  
288    <!-- Support @jls tag, used in jdk8+ javadoc -->
289 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
290    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
291    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
292  
293    <!-- Main targets -->
294  
295 <  <property name="build.main.java.version" value="9"/>
296 <  <property name="build.main.javac" value="${javac9}"/>
295 >  <!-- Default values: may seem strange ... -->
296 >  <!-- At runtime, target latest, but build for current LTS -->
297 >  <property name="java.runtime.target" value="19"/>
298 >  <property name="build.main.java" value="${java17}"/>
299 >  <property name="build.main.javac" value="${javac17}"/>
300 >  <property name="build.main.javadoc" value="${javadoc19}"/>
301 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
302  
303    <target name="dists"
304 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
304 >          depends="dist"
305            description="Builds all public jars and docs"/>
306  
307    <target name="compile"
308            depends="configure-compiler"
309            description="Compiles src/main sources to build dir">
310  
374    <local name="modules"/>
375    <condition property="modules">
376      <and>
377        <available file="${jdk9.home}/jmods" type="dir"/>
378        <equals arg1="9" arg2="${build.main.java.version}"/>
379      </and>
380    </condition>
381
311      <local name="destdir"/>
312 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
384 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
312 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
313  
314      <mkdir dir="${destdir}"/>
315  
# Line 398 | Line 326
326             fork="true">
327  
328        <include name="**/*.java"/>
329 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
329 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
330        <compilerarg value="-Xprefer:source"/>
331        <compilerarg value="-XDignore.symbol.file=true"/>
332        <compilerarg value="-Xlint:all"/>
405      <compilerarg value="-Werror"/>
333        <compilerarg value="-Xdoclint:all/protected"/>
334 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
335 +      <compilerarg value="-Werror"/>
336        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
337        <compilerarg line="${build.args}"/>
409
338      </javac>
339    </target>
340  
413
341    <target name="jar"
342            depends="compile"
343            description="Builds library jar for src/main from compiled sources">
# Line 428 | Line 355
355  
356    <target name="docs"
357            description="Builds javadocs for src/main to dist dir">
358 <
432 <    <delete dir="${docs.dir}"/>
358 >    <delete dir="${docs.dir}" quiet="true"/>
359      <mkdir dir="${docs.dir}"/>
434
435    <!-- the packagenames="none" hack below prevents scanning the -->
436    <!-- sourcepath for packages -->
437
438 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
439 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
440 <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
441 <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
442 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
360      <javadoc destdir="${docs.dir}"
361               packagenames="none"
362 <             link="${java9.api.url}"
362 >             link="${java.api.url}"
363               overview="${src.dir}/intro.html"
364               access="${build.javadoc.access}"
365               sourcepath="${src.dir}"
366               classpath=""
367 <             executable="${javadoc9}">
367 >             source="${build.main.javadoc.source}"
368 >             executable="${build.main.javadoc}">
369        <fileset dir="${src.dir}" defaultexcludes="yes">
370 <        <include name="**/*.java"/>
370 >        <include name="java/**/*.java"/>
371        </fileset>
372 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
372 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
373        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
374 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1"/>
375 +      <arg value="-quiet"/>
376        <arg value="-XDignore.symbol.file=true"/>
377 <      <arg value="-Xmodule:java.base"/>
378 <      <arg value="-tag"/>
379 <      <arg value="${javadoc.jls.option}"/>
380 < <!-- @apiNote currently unused -->
381 < <!--       <arg value="-tag"/> -->
382 < <!--       <arg value="apiNote:a:API Note:"/> -->
383 <      <arg value="-tag"/>
384 <      <arg value="implSpec:a:Implementation Requirements:"/>
385 <      <arg value="-tag"/>
466 <      <arg value="implNote:a:Implementation Note:"/>
467 < <!-- tags added in jdk9: currently unused -->
468 < <!--       <arg value="-tag"/> -->
469 < <!--       <arg value="revised:X"/> -->
470 < <!--       <arg value="-tag"/> -->
471 < <!--       <arg value="spec:X"/> -->
377 >      <arg value="-html5"/>
378 >      <arg value="-Xdoclint:all,-missing"/>
379 >      <arg value="--patch-module=java.base=${src.dir}"/>
380 >      <arg value="--frames" if:set="use-frames"/>
381 >      <arg value="--override-methods=summary"/>
382 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
383 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
384 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
385 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
386      </javadoc>
387    </target>
388  
475
389    <target name="dist"
390            depends="dist-clean, dist-jar, dist-docs"
391            description="Puts all distributable products in single hierarchy"/>
392  
480
481  <target name="release"
482          depends="dist"
483          description="Puts entire CVS tree, plus distribution productions, in a jar">
484
485    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
486
487    <jar basedir="${basedir}" destfile="${release.jar}">
488      <!-- <exclude name="build/**"/> -->
489      <exclude name="${release.jar}"/>
490      <exclude name="user.properties"/>
491      <exclude name="etc/notes/**"/>
492      <exclude name="src/emulation/**"/>
493      <exclude name="**/SyntaxTest.java"/>
494      <exclude name="**/SuperfluousAbstract.java"/>
495      <manifest>
496        <attribute name="Built-By" value="${user.name}"/>
497        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
498      </manifest>
499    </jar>
500  </target>
501
502
393    <target name="clean"
394            description="Removes all build products">
505
395      <delete dir="${build.dir}"/>
507
396    </target>
397  
510
398    <target name="dist-clean"
399            description="Removes all build and distribution products">
513
400      <delete dir="${build.dir}"/>
401      <delete dir="${dist.dir}"/>
516
402    </target>
403  
519
404    <target name="dist-jar"
405            depends="clean, jar">
406      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 528 | Line 412
412    </target>
413  
414    <target name="tck"
415 <          depends="jar"
415 >          depends="jar"
416            description="Runs tck tests for src/main directly">
533
417      <run-tck-tests
418 <      target="${build.main.java.version}"
418 >      target="${java.runtime.target}"
419        workdir="${build.dir}"
420 <      classes="${product.jar}"/>
420 >      classes="${product.jar}">
421 >      <javac-elements>
422 >        <!-- <compilerarg value="-Werror"/> -->
423 >      </javac-elements>
424 >    </run-tck-tests>
425    </target>
426  
427    <target name="tck-parallelism-1"
# Line 559 | Line 446
446    </target>
447  
448    <target name="jtreg"
449 <          depends="jar"
449 >          depends="jar"
450            description="Runs jtreg tests for src/main using the jtreg ant task">
451      <run-jtreg-tests
452 <       target="${build.main.java.version}"
452 >       target="${java.runtime.target}"
453         workdir="${build.dir}"
454         classes="${product.jar}"/>
455    </target>
456  
457    <target name="test"
458            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
459 <          description="Runs tck and jtreg tests for src/main">
573 <  </target>
574 <
575 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
576 <
577 < <!--     <antcall target="jtreg"> -->
578 < <!--       <param name="build.main.java.version" value="8"/> -->
579 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
580 < <!--     </antcall> -->
581 <
582 < <!--   </target> -->
583 <
584 < <!--   <target name="test89" -->
585 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
586 <
587 < <!--     <antcall target="clean"/> -->
588 < <!--     <antcall target="test"> -->
589 < <!--       <param name="build.main.java.version" value="8"/> -->
590 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
591 < <!--     </antcall> -->
592 <
593 < <!--     <antcall target="clean"/> -->
594 < <!--     <antcall target="test"> -->
595 < <!--       <param name="build.main.java.version" value="9"/> -->
596 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
597 < <!--     </antcall> -->
598 <
599 < <!--   </target> -->
459 >          description="Runs tck and jtreg tests for src/main"/>
460  
461 +  <target name="test-version-permutations"
462 +          depends="test17, test19, clean, test, docs"
463 +          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
464 +
465 +
466 +  <target name="test17">
467 +    <antcall>
468 +      <param name="java.runtime.target" value="17"/>
469 +      <param name="build.main.javac" value="${javac17}"/>
470 +      <param name="build.main.javadoc" value="${javadoc17}"/>
471 +      <param name="build.main.javadoc.source" value="17"/>
472 +      <target name="clean"/>
473 +      <target name="test"/>
474 +      <target name="docs"/>
475 +    </antcall>
476 +  </target>
477 +  <target name="test19">
478 +    <antcall>
479 +      <param name="java.runtime.target" value="19"/>
480 +      <param name="build.main.javac" value="${javac19}"/>
481 +      <param name="build.main.javadoc" value="${javadoc19}"/>
482 +      <param name="build.main.javadoc.source" value="19"/>
483 +      <target name="clean"/>
484 +      <target name="test"/>
485 +      <target name="docs"/>
486 +    </antcall>
487 +  </target>
488  
489  
490    <target name="configure-compiler">
491      <fail message="ant version too old">
492 <      <condition>
606 <        <not> <antversion atleast="1.9.1"/> </not>
607 <      </condition>
492 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
493      </fail>
494  
495      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 622 | Line 507
507    </target>
508  
509  
625
626  <!-- Various demos and test programs -->
627
628
629  <!-- description="Benchmark from Doug Lea's AQS paper" -->
630  <target name="loops" depends="configure-compiler">
631
632    <mkdir dir="${build.loops.dir}"/>
633
634    <javac srcdir="${loops.src.dir}"
635          destdir="${build.loops.dir}"
636            debug="${build.debug}"
637       debuglevel="${build.debuglevel}"
638      deprecation="${build.deprecation}"
639           source="${build.sourcelevel}"
640           target="${build.sourcelevel}"
641         encoding="ASCII"
642             fork="true">
643
644      <compilerarg line="${build.args}"/>
645      <classpath refid="loops.classpath"/>
646      <compilerarg value="-XDignore.symbol.file=true"/>
647
648    </javac>
649
650    <java classname="ALoops" fork="true">
651      <classpath refid="loops.classpath"/>
652    </java>
653
654  </target>
655
656
510    <target name="compile-test-loops" depends="jar"
511 <          description="compile all the perf tests in src/test/loops">
511 >          description="Compiles all the perf tests in src/test/loops">
512  
513      <mkdir dir="${build.dir}/test/loops"/>
514  
# Line 667 | Line 520
520             includeAntRuntime="false"
521             includeJavaRuntime="false"
522             encoding="ASCII"
523 <           executable="${javac9}"
523 >           executable="${build.main.javac}"
524             fork="true">
525  
526        <include name="*.java"/>
527        <compilerarg value="-XDignore.symbol.file=true"/>
528 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
529 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
528 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
529 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
530        <compilerarg line="${build.args}"/>
678
531      </javac>
680
532    </target>
533  
534  
535 <  <!-- jsr166 4jdk8 -->
536 <
537 <  <target name="4jdk8compile"
538 <          depends="configure-compiler"
539 <          description="Compiles src/jdk8 sources, targeting jdk8">
540 <
541 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
535 >  <!-- old branches no longer maintained.  build support deleted -->
536 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
537 >  <!-- jsr166 4jdk7 (no longer maintained) -->
538 >  <!-- jsr166x (no longer maintained) -->
539 >  <!-- jsr166y (no longer maintained) -->
540 >  <!-- extra166y (no longer maintained) -->
541 >  <!-- jsr166e (no longer maintained) -->
542  
543 <    <javac srcdir="${4jdk8src.dir}"
693 <           destdir="${build.4jdk8.classes.dir}"
694 <           debug="${build.debug}"
695 <           debuglevel="${build.debuglevel}"
696 <           deprecation="${build.deprecation}"
697 <           source="8"
698 <           target="8"
699 <           classpath=""
700 <           bootclasspath="${bootclasspath8}"
701 <           includeAntRuntime="false"
702 <           includeJavaRuntime="false"
703 <           encoding="ASCII"
704 <           executable="${javac8}"
705 <           fork="true">
706 <
707 <      <include name="**/*.java"/>
708 <      <compilerarg value="-Xprefer:source"/>
709 <      <compilerarg value="-XDignore.symbol.file=true"/>
710 <      <compilerarg value="-Xlint:all"/>
711 <      <compilerarg value="-Werror"/>
712 <      <compilerarg line="${build.args}"/>
713 <
714 <    </javac>
715 <  </target>
716 <
717 <  <target name="4jdk8doclint"
718 <          depends="configure-compiler"
719 <          description="Finds doclint warnings">
720 <
721 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
722 <
723 <    <javac srcdir="${4jdk8src.dir}"
724 <           destdir="${build.4jdk8.classes.dir}"
725 <           debug="${build.debug}"
726 <           debuglevel="${build.debuglevel}"
727 <           deprecation="${build.deprecation}"
728 <           source="8"
729 <           target="8"
730 <           classpath=""
731 <           bootclasspath="${bootclasspath8}"
732 <           includeAntRuntime="false"
733 <           includeJavaRuntime="false"
734 <           encoding="ASCII"
735 <           executable="${javac8}"
736 <           fork="true">
737 <
738 <      <include name="**/*.java"/>
739 <      <compilerarg value="-Xprefer:source"/>
740 <      <compilerarg value="-XDignore.symbol.file=true"/>
741 <      <compilerarg value="-Xlint:all"/>
742 <      <compilerarg value="-Xdoclint:all/protected"/>
743 <      <compilerarg line="${build.args}"/>
744 <
745 <    </javac>
746 <  </target>
747 <
748 <
749 <  <target name="4jdk8jar"
750 <          depends="4jdk8compile"
751 <          description="Builds library jar from compiled sources">
752 <
753 <    <jar destfile="${4jdk8product.jar}">
754 <      <fileset dir="${build.4jdk8.classes.dir}"/>
755 <      <manifest>
756 <        <attribute name="Built-By" value="${user.name}"/>
757 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
758 <      </manifest>
759 <    </jar>
760 <
761 <  </target>
762 <
763 <
764 <  <target name="4jdk8-tck"
765 <          depends="4jdk8jar"
766 <          description="Runs tck tests for jsr166-4jdk8 directly">
767 <
768 <    <run-tck-tests
769 <      target="8"
770 <      workdir="${build.4jdk8.dir}"
771 <      classes="${4jdk8product.jar}">
772 <      <javac-elements>
773 <        <!-- JDK9+ test classes -->
774 <        <exclude name="*9Test.java"/>
775 <        <exclude name="*10Test.java"/>
776 <      </javac-elements>
777 <    </run-tck-tests>
778 <  </target>
779 <
780 <
781 <  <target name="4jdk8-jtreg"
782 <          depends="4jdk8jar"
783 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
784 <    <run-jtreg-tests
785 <       target="8"
786 <       workdir="${build.4jdk8.dir}"
787 <       classes="${4jdk8product.jar}"/>
788 <  </target>
789 <
790 <
791 <  <target name="4jdk8-test"
792 <          depends="4jdk8-tck, 4jdk8-jtreg"
793 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
794 <  </target>
795 <
796 <
797 <  <target name="4jdk8docs"
798 <          description="Builds javadocs for src/jdk8 to dist dir">
799 <
800 <    <delete dir="${4jdk8docs.dir}"/>
801 <    <mkdir dir="${4jdk8docs.dir}"/>
802 <
803 <    <javadoc destdir="${4jdk8docs.dir}"
804 <             packagenames="none"
805 <             link="${java8.api.url}"
806 <             overview="${4jdk8src.dir}/intro.html"
807 <             access="${build.javadoc.access}"
808 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
809 <             classpath=""
810 <             executable="${javadoc8}"
811 <             failonerror = "true">
812 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
813 <        <include name="**/*.java"/>
814 <      </fileset>
815 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
816 <      <arg value="-XDignore.symbol.file=true"/>
817 <      <arg value="-tag"/>
818 <      <arg value="${javadoc.jls.option}"/>
819 < <!-- @apiNote currently unused -->
820 < <!--       <arg value="-tag"/> -->
821 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
822 <      <arg value="-tag"/>
823 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
824 <      <arg value="-tag"/>
825 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
826 <    </javadoc>
827 <  </target>
828 <
829 <
830 <  <target name="4jdk8dist"
831 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
832 <          description="Puts all distributable products in single hierarchy"/>
833 <
834 <
835 <  <target name="4jdk8clean"
836 <          description="Removes all 4jdk8 build products">
837 <
838 <    <delete dir="${build.4jdk8.dir}"/>
839 <
840 <  </target>
841 <
842 <
843 <  <target name="4jdk8dist-jar"
844 <          depends="4jdk8clean, 4jdk8jar">
845 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
846 <  </target>
543 > <!-- Find buglets that can be detected by static build tools -->
544  
545 + <!--   <target name="lint"> -->
546 + <!--     <antcall target="dists"> -->
547 + <!--       <param name="build.javadoc.access" value="protected"/> -->
548 + <!--     </antcall> -->
549 + <!--   </target> -->
550  
551 <  <target name="4jdk8dist-docs"
552 <          depends="4jdk8clean, 4jdk8docs">
553 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
551 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
552 >  <target name="doclint-private">
553 >    <antcall target="dist">
554 >      <param name="build.javadoc.access" value="private"/>
555 >    </antcall>
556    </target>
557  
558  
559 + <!-- ==============================================================
560 +  Experimental errorprone support
561 +  https://errorprone.info
562 +  https://errorprone.info/docs/installation
563 +  https://github.com/google/error-prone/issues/1143
564 + =================================================================== -->
565 +  <path id="errorprone.processorpath.path">
566 +    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
567 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
568 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
569 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
570 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
571 +  </path>
572 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
573 +  <property name="errorprone.jsr166.user.flags" value=""/>
574 +  <property name="errorprone.jsr166.flags"
575 +            value="-Xep:HashtableContains:OFF
576 +                   -Xep:PreferJavaTimeOverload:OFF
577 +                   -Xep:JdkObsolete:OFF
578 +                   -Xep:MissingOverride:OFF
579 +                   -Xep:MissingFail:OFF
580 +                   -Xep:ThreadPriorityCheck:OFF
581 +                   -Xep:MixedArrayDimensions:ERROR
582 +                   -Xep:RemoveUnusedImports:ERROR
583 +                   -Xep:EmptyIf:ERROR
584 +                   -Xep:MultipleTopLevelClasses:ERROR
585 +                   -Xep:ClassName:ERROR
586 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
587 +                   -Xep:RedundantThrows:ERROR
588 +                   -Xep:IdentityBinaryExpression:WARN
589 +                   -Xep:ConstructorInvokesOverridable:WARN
590 +                   -Xep:MethodCanBeStatic:WARN
591 +                   ${errorprone.jsr166.user.flags}"/>
592 +  <!-- -Xep:WildcardImport:ERROR -->
593 +  <property name="errorprone.jsr166.test.flags"
594 +            value="-Xep:StringSplitter:OFF
595 +                   -Xep:BoxedPrimitiveConstructor:OFF
596 +                   -Xep:UnnecessaryParentheses:OFF
597 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
598 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
599 +  <target name="errorprone"
600 +          depends="clean, configure-compiler"
601 +          description="Run errorprone over jsr166 source code (experimental)">
602  
603 <  <!-- jsr166 4jdk7 -->
604 <
605 <  <target name="4jdk7compile"
859 <          depends="configure-compiler"
860 <          description="Compiles src/jdk7 sources, targeting jdk7">
861 <
862 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
863 <
864 <    <javac srcdir="${4jdk7src.dir}"
865 <           destdir="${build.4jdk7.classes.dir}"
866 <           debug="${build.debug}"
867 <           debuglevel="${build.debuglevel}"
868 <           deprecation="${build.deprecation}"
869 <           source="6"
870 <           target="6"
871 <           classpath=""
872 <           bootclasspath="${bootclasspath6}"
873 <           includeAntRuntime="false"
874 <           includeJavaRuntime="false"
875 <           encoding="ASCII"
876 <           executable="${javac7}"
877 <           fork="true">
878 <
879 <      <include name="**/*.java"/>
880 <      <compilerarg value="-Xprefer:source"/>
881 <      <compilerarg value="-XDignore.symbol.file=true"/>
882 <      <compilerarg value="-Xlint:all"/>
883 <      <compilerarg value="-Werror"/>
884 <      <compilerarg line="${build.args}"/>
885 <
886 <    </javac>
887 <  </target>
888 <
889 <  <target name="4jdk7doclint"
890 <          depends="configure-compiler"
891 <          description="Finds doclint warnings">
892 <
893 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
603 >    <local name="destdir"/>
604 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
605 >    <mkdir dir="${destdir}"/>
606  
607 <    <javac srcdir="${4jdk7src.dir}"
608 <           destdir="${build.4jdk7.classes.dir}"
607 >    <javac srcdir="${src.dir}"
608 >           destdir="${destdir}"
609             debug="${build.debug}"
610             debuglevel="${build.debuglevel}"
611             deprecation="${build.deprecation}"
900           source="6"
901           target="6"
612             classpath=""
903           bootclasspath="${bootclasspath6}"
613             includeAntRuntime="false"
614             includeJavaRuntime="false"
615             encoding="ASCII"
616 <           executable="${javac8}"
616 >           executable="${build.main.javac}"
617             fork="true">
618  
619        <include name="**/*.java"/>
620 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
621 +      <compilerarg value="-J--illegal-access=permit"/>
622 +      <compilerarg value="-XDcompilePolicy=simple"/>
623 +      <compilerarg value="-processorpath"/>
624 +      <compilerarg pathref="errorprone.processorpath.path"/>
625 +      <compilerarg value="-Xplugin:ErrorProne
626 +                          ${errorprone.jsr166.flags}"/>
627 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
628        <compilerarg value="-Xprefer:source"/>
629        <compilerarg value="-XDignore.symbol.file=true"/>
630        <compilerarg value="-Xlint:all"/>
631 <      <compilerarg value="-Xdoclint:all/protected"/>
631 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
632 >      <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
633 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
634        <compilerarg line="${build.args}"/>
916
635      </javac>
918  </target>
919
636  
637 <  <target name="4jdk7jar"
638 <          depends="4jdk7compile"
923 <          description="Builds library jar from compiled sources">
924 <
925 <    <jar destfile="${4jdk7product.jar}">
926 <      <fileset dir="${build.4jdk7.classes.dir}"/>
927 <      <manifest>
928 <        <attribute name="Built-By" value="${user.name}"/>
929 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
930 <      </manifest>
637 >    <jar destfile="${product.jar}">
638 >      <fileset dir="${destdir}"/>
639      </jar>
640  
933  </target>
934
935
936  <target name="4jdk7-tck"
937          depends="4jdk7jar"
938          description="Runs tck tests for jsr166-4jdk7 directly">
939
641      <run-tck-tests
642 <      target="7"
643 <      workdir="${build.4jdk7.dir}"
644 <      classes="${4jdk7product.jar}">
642 >      target="${java.runtime.target}"
643 >      workdir="${build.dir}"
644 >      classes="${product.jar}">
645        <javac-elements>
646 <        <!-- JDK8+ test classes -->
647 <        <exclude name="*8Test.java"/>
648 <        <exclude name="*9Test.java"/>
649 <        <exclude name="*10Test.java"/>
650 <        <exclude name="DoubleAccumulatorTest.java"/>
651 <        <exclude name="DoubleAdderTest.java"/>
652 <        <exclude name="LongAccumulatorTest.java"/>
653 <        <exclude name="LongAdderTest.java"/>
654 <        <exclude name="CompletableFutureTest.java"/>
954 <        <exclude name="SplittableRandomTest.java"/>
955 <        <exclude name="StampedLockTest.java"/>
956 <        <exclude name="SubmissionPublisherTest.java"/>
646 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
647 >        <compilerarg value="-J--illegal-access=permit"/>
648 >        <compilerarg value="-XDcompilePolicy=simple"/>
649 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
650 >        <compilerarg value="-Xplugin:ErrorProne
651 >                            ${errorprone.jsr166.flags}
652 >                            ${errorprone.jsr166.test.flags}"/>
653 >        <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
654 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
655        </javac-elements>
656      </run-tck-tests>
657    </target>
658  
659 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
660 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
661 +  <target name="errorprone-jtreg"
662 +          depends="jar"
663 +          description="Run errorprone over jtreg tests (experimental)">
664  
665 <  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
666 <  <target name="4jdk7-tck-junit"
667 <          depends="4jdk7compile">
668 <
669 <    <junit printsummary="true"
670 <           showoutput="true"
671 <           errorProperty="junit.failed"
672 <           failureProperty="junit.failed"
673 <           includeantruntime="true"
674 <           jvm="${java7}"
675 <           fork="true">
676 <
677 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
678 <      <jvmarg value="-server"/>
679 <
665 >    <run-jtreg-tests
666 >       target="${java.runtime.target}"
667 >       workdir="${build.dir}"
668 >       classes="${product.jar}"
669 >       verbose="all">
670 >      <jtreg-elements>
671 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
672 >        <arg value="-javacoption:-processorpath"/>
673 >        <arg value="-javacoption:${errorprone.processorpath}"/>
674 >        <arg value="-javacoption:-Xplugin:ErrorProne
675 >                            ${errorprone.jsr166.flags}
676 >                            ${errorprone.jsr166.test.flags}
677 >                            -Xep:MultipleTopLevelClasses:WARN
678 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
679 >      </jtreg-elements>
680 >    </run-jtreg-tests>
681 >  </target>
682 >
683 >
684 > <!-- ==============================================================
685 >  Running guava tests against jsr166 code
686 > =================================================================== -->
687 >
688 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
689 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
690 > <!-- <property name="guava.version" value="21.0"/> -->
691 >
692 > <!-- HOWTO debug print a path id -->
693 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
694 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
695 >
696 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
697 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
698 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
699 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
700 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
701 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
702 >
703 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
704 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
705 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
706 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
707 >
708 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
709 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
710 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
711 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
712 >
713 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
714 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
715 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
716 >
717 >  <target name="init-ivy">
718 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
719 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
720 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
721 >             classpath="${build.dir}/ivy.jar"/>
722 >  </target>
723 >
724 >  <target name="guava-tests" depends="jar, init-ivy"
725 >          description="Guava tests run against jsr166 collections">
726 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
727 >    <mkdir dir="${guava.dir}"/>
728 >    <ivy:retrieve pathid="guava.testlib.classpath"
729 >      type="jar,bundle" inline="true" conf="default,master"
730 >      pattern="${guava.dir}/[artifact].[ext]"
731 >      organisation="com.google.guava" module="guava-testlib"/>
732 >    <property name="guava.version" value="21.0"/>
733 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
734 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
735 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
736 >           jvm="${build.main.java}" fork="true">
737 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
738 >      <formatter type="brief"/>
739        <classpath>
740 <        <pathelement location="${junit.jar}"/>
741 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
740 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
741 >        <path refid="guava.testlib.classpath"/>
742        </classpath>
743  
744 <      <formatter type="brief"/>
745 <
984 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
985 <      </test>
986 <
744 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
745 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
746      </junit>
747    </target>
748  
990  <target name="4jdk7-jtreg"
991          depends="4jdk7jar"
992          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
993    <run-jtreg-tests
994       target="7"
995       workdir="${build.4jdk7.dir}"
996       classes="${4jdk7product.jar}"/>
997  </target>
998
999
1000  <target name="4jdk7-test"
1001          depends="4jdk7-tck, 4jdk7-jtreg"
1002          description="Runs tck and jtreg tests for jsr166-4jdk7">
1003  </target>
1004
1005
1006  <target name="4jdk7docs"
1007          description="Builds javadocs for src/jdk7 to dist dir">
1008
1009    <delete dir="${4jdk7docs.dir}"/>
1010    <mkdir dir="${4jdk7docs.dir}"/>
1011
1012    <javadoc destdir="${4jdk7docs.dir}"
1013             packagenames="none"
1014             link="${java7.api.url}"
1015             overview="${4jdk7src.dir}/intro.html"
1016             access="${build.javadoc.access}"
1017             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1018             classpath=""
1019             executable="${javadoc7}"
1020             failonerror = "true">
1021      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1022        <include name="**/*.java"/>
1023      </fileset>
1024      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1025      <arg value="-XDignore.symbol.file=true"/>
1026    </javadoc>
1027  </target>
1028
1029
1030  <target name="4jdk7dist"
1031          depends="4jdk7dist-jar, 4jdk7dist-docs"
1032          description="Puts all distributable products in single hierarchy"/>
1033
1034
1035  <target name="4jdk7clean"
1036          description="Removes all 4jdk7 build products">
1037
1038    <delete dir="${build.4jdk7.dir}"/>
1039
1040  </target>
1041
1042
1043  <target name="4jdk7dist-jar"
1044          depends="4jdk7clean, 4jdk7jar">
1045    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1046  </target>
1047
1048
1049  <target name="4jdk7dist-docs"
1050          depends="4jdk7clean, 4jdk7docs">
1051    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1052  </target>
1053
1054
1055  <!-- jsr166x -->
1056
1057  <target name="jsr166xcompile"
1058          depends="configure-compiler"
1059          description="Compiles jsr166x sources to build dir">
1060
1061    <mkdir dir="${build.jsr166x.classes.dir}"/>
1062
1063    <javac srcdir="${topsrc.dir}"
1064           destdir="${build.jsr166x.classes.dir}"
1065           debug="${build.debug}"
1066           debuglevel="${build.debuglevel}"
1067           deprecation="${build.deprecation}"
1068           classpath=""
1069           bootclasspath="${bootclasspath6}"
1070           source="5"
1071           target="5"
1072           includeAntRuntime="false"
1073           includeJavaRuntime="false"
1074           encoding="ASCII"
1075           executable="${javac7}"
1076           fork="true">
1077
1078      <include name="jsr166x/**/*.java"/>
1079      <compilerarg value="-XDignore.symbol.file=true"/>
1080      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1081      <compilerarg value="-Werror"/>
1082      <compilerarg line="${build.args}"/>
1083
1084    </javac>
1085  </target>
1086
1087
1088  <target name="jsr166xjar"
1089          depends="jsr166xcompile"
1090          description="Builds library jar from compiled sources">
1091
1092    <jar destfile="${jsr166x.jar}">
1093      <fileset dir="${build.jsr166x.classes.dir}"/>
1094      <manifest>
1095        <attribute name="Built-By" value="${user.name}"/>
1096        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1097      </manifest>
1098    </jar>
1099
1100  </target>
1101
1102
1103  <target name="jsr166xdocs"
1104          description="Builds javadocs to dist dir">
1105
1106    <delete dir="${jsr166xdocs.dir}"/>
1107    <mkdir dir="${jsr166xdocs.dir}"/>
1108
1109    <javadoc destdir="${jsr166xdocs.dir}"
1110             packagenames="jsr166x.*"
1111             link="${java.api.url}"
1112             access="${build.javadoc.access}"
1113             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1114             bootclasspath="${bootclasspath6}"
1115             source="5"
1116             executable="${javadoc7}"
1117             failonerror = "true">
1118      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1119      <arg value="-XDignore.symbol.file=true"/>
1120
1121    </javadoc>
1122  </target>
1123
1124
1125  <target name="jsr166xdist"
1126          depends="jsr166xdist-jar, jsr166xdist-docs"
1127          description="Puts all distributable products in single hierarchy"/>
1128
1129
1130  <target name="jsr166xclean"
1131          description="Removes all jsr166x build products">
1132
1133    <delete dir="${build.jsr166x.dir}"/>
1134
1135  </target>
1136
1137
1138  <target name="jsr166xdist-jar"
1139          depends="jsr166xclean, jsr166xjar">
1140    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1141  </target>
1142
1143  <target name="jsr166xdist-docs"
1144          depends="jsr166xclean, jsr166xdocs">
1145    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1146  </target>
1147
1148  <!-- jsr166y -->
1149
1150
1151  <target name="jsr166ycompile"
1152          depends="configure-compiler"
1153          description="Compiles jsr166y sources">
1154
1155    <mkdir dir="${build.jsr166y.classes.dir}"/>
1156
1157    <javac srcdir="${topsrc.dir}"
1158           destdir="${build.jsr166y.classes.dir}"
1159           debug="${build.debug}"
1160           debuglevel="${build.debuglevel}"
1161           deprecation="${build.deprecation}"
1162           source="6"
1163           target="6"
1164           classpath=""
1165           bootclasspath="${bootclasspath6}"
1166           includeAntRuntime="false"
1167           includeJavaRuntime="false"
1168           encoding="ASCII"
1169           executable="${javac7}"
1170           fork="true">
1171
1172      <include name="jsr166y/**/*.java"/>
1173      <compilerarg value="-XDignore.symbol.file=true"/>
1174      <compilerarg value="-Xlint:all"/>
1175      <compilerarg value="-Werror"/>
1176      <compilerarg line="${build.args}"/>
1177
1178    </javac>
1179  </target>
1180
1181
1182  <target name="jsr166yjar"
1183          depends="jsr166ycompile"
1184          description="Builds library jar from compiled sources">
1185
1186    <jar destfile="${jsr166y.jar}" index="true">
1187      <fileset dir="${build.jsr166y.classes.dir}"/>
1188      <manifest>
1189        <attribute name="Built-By" value="${user.name}"/>
1190        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1191      </manifest>
1192    </jar>
1193
1194  </target>
1195
1196
1197  <target name="jsr166ydocs"
1198          description="Builds javadocs to dist dir">
1199
1200    <delete dir="${jsr166ydocs.dir}"/>
1201    <mkdir dir="${jsr166ydocs.dir}"/>
1202
1203    <javadoc destdir="${jsr166ydocs.dir}"
1204             packagenames="jsr166y.*"
1205             link="${java.api.url}"
1206             access="${build.javadoc.access}"
1207             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1208             bootclasspath="${bootclasspath6}"
1209             source="6"
1210             executable="${javadoc7}"
1211             failonerror = "true">
1212      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1213      <arg value="-XDignore.symbol.file=true"/>
1214
1215    </javadoc>
1216  </target>
1217
1218
1219  <target name="jsr166ydist"
1220          depends="jsr166ydist-jar, jsr166ydist-docs"
1221          description="Puts all distributable products in single hierarchy"/>
1222
1223
1224  <target name="jsr166yclean"
1225          description="Removes all jsr166y build products">
1226
1227    <delete dir="${build.jsr166y.dir}"/>
1228
1229  </target>
1230
1231
1232  <target name="jsr166ydist-jar"
1233          depends="jsr166yclean, jsr166yjar">
1234    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1235  </target>
1236
1237  <target name="jsr166ydist-docs"
1238          depends="jsr166yclean, jsr166ydocs">
1239    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1240  </target>
1241
1242
1243  <!-- extra166y -->
1244
1245
1246  <target name="extra166ycompile"
1247          depends="configure-compiler, jsr166yjar"
1248          description="Compiles extra166y sources">
1249
1250    <mkdir dir="${build.extra166y.classes.dir}"/>
1251
1252    <javac srcdir="${topsrc.dir}"
1253           destdir="${build.extra166y.classes.dir}"
1254           debug="${build.debug}"
1255           debuglevel="${build.debuglevel}"
1256           deprecation="${build.deprecation}"
1257           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1258           classpath=""
1259           source="6"
1260           target="6"
1261           includeAntRuntime="false"
1262           includeJavaRuntime="false"
1263           encoding="ASCII"
1264           executable="${javac7}"
1265           fork="true">
1266
1267      <include name="extra166y/**/*.java"/>
1268      <compilerarg value="-XDignore.symbol.file=true"/>
1269      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1270      <compilerarg value="-Werror"/>
1271      <compilerarg line="${build.args}"/>
1272
1273    </javac>
1274  </target>
1275
1276
1277  <target name="extra166yjar"
1278          depends="extra166ycompile"
1279          description="Builds library jar from compiled sources">
1280
1281    <jar destfile="${extra166y.jar}" index="true">
1282      <fileset dir="${build.extra166y.classes.dir}"/>
1283      <manifest>
1284        <attribute name="Built-By" value="${user.name}"/>
1285        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1286      </manifest>
1287    </jar>
1288
1289  </target>
1290
1291
1292  <target name="extra166ydocs"
1293          description="Builds javadocs to build dir">
1294
1295    <delete dir="${extra166ydocs.dir}"/>
1296    <mkdir dir="${extra166ydocs.dir}"/>
1297
1298    <javadoc destdir="${extra166ydocs.dir}"
1299             packagenames="extra166y.*"
1300             link="${java.api.url}"
1301             access="${build.javadoc.access}"
1302             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1303             bootclasspath="${bootclasspath6}"
1304             source="6"
1305             executable="${javadoc7}">
1306      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1307      <arg value="-XDignore.symbol.file=true"/>
1308
1309    </javadoc>
1310  </target>
1311
1312
1313  <target name="extra166ydist"
1314          depends="extra166ydist-jar, extra166ydist-docs"
1315          description="Puts all distributable products in single hierarchy"/>
1316
1317
1318  <target name="extra166yclean"
1319          description="Removes all extra166y build products">
1320
1321    <delete dir="${build.extra166y.dir}"/>
1322
1323  </target>
1324
1325
1326  <target name="extra166ydist-jar"
1327          depends="extra166yclean, extra166yjar">
1328    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1329  </target>
1330
1331  <target name="extra166ydist-docs"
1332          depends="extra166yclean, extra166ydocs">
1333    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1334  </target>
1335
1336  <!-- jsr166e -->
1337
1338  <property name="build.jsr166e.java.version" value="6"/>
1339  <property name="build.jsr166e.javac" value="${javac6}"/>
1340
1341  <target name="jsr166ecompile"
1342          depends="configure-compiler"
1343          description="Compiles jsr166e sources">
1344
1345    <mkdir dir="${build.jsr166e.classes.dir}"/>
1346
1347    <javac srcdir="${topsrc.dir}"
1348           destdir="${build.jsr166e.classes.dir}"
1349           debug="${build.debug}"
1350           debuglevel="${build.debuglevel}"
1351           deprecation="${build.deprecation}"
1352           source="${build.jsr166e.java.version}"
1353           target="${build.jsr166e.java.version}"
1354           classpath=""
1355           includeAntRuntime="false"
1356           includeJavaRuntime="false"
1357           executable="${build.jsr166e.javac}"
1358           fork="true">
1359
1360      <include name="jsr166e/**/*.java"/>
1361      <compilerarg value="-XDignore.symbol.file=true"/>
1362      <compilerarg value="-Xlint:all"/>
1363      <compilerarg value="-Werror"/>
1364      <compilerarg line="${build.args}"/>
1365
1366    </javac>
1367  </target>
1368
1369  <!-- jsr166e: find doclint errors -->
1370  <target name="jsr166edoclint">
1371
1372    <mkdir dir="${build.jsr166e.classes.dir}"/>
1373
1374    <javac srcdir="${topsrc.dir}"
1375           destdir="${build.jsr166e.classes.dir}"
1376           debug="${build.debug}"
1377           debuglevel="${build.debuglevel}"
1378           deprecation="${build.deprecation}"
1379           source="${build.jsr166e.java.version}"
1380           target="${build.jsr166e.java.version}"
1381           classpath=""
1382           bootclasspath="${bootclasspath6}"
1383           includeAntRuntime="false"
1384           includeJavaRuntime="false"
1385           executable="${javac8}"
1386           fork="true">
1387
1388      <include name="jsr166e/**/*.java"/>
1389      <compilerarg value="-XDignore.symbol.file=true"/>
1390      <compilerarg value="-Xlint:all"/>
1391      <compilerarg value="-Werror"/>
1392      <compilerarg value="-Xdoclint:all/protected"/>
1393
1394    </javac>
1395  </target>
1396
1397
1398  <target name="jsr166ejar"
1399          depends="jsr166ecompile"
1400          description="Builds library jar from compiled sources">
1401
1402    <jar destfile="${jsr166e.jar}" index="true">
1403      <fileset dir="${build.jsr166e.classes.dir}"/>
1404      <manifest>
1405        <attribute name="Built-By" value="${user.name}"/>
1406        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1407      </manifest>
1408    </jar>
1409
1410  </target>
1411
1412
1413  <target name="jsr166edocs"
1414          description="Builds javadocs to build dir">
1415
1416    <delete dir="${jsr166edocs.dir}"/>
1417    <mkdir dir="${jsr166edocs.dir}"/>
1418
1419    <javadoc destdir="${jsr166edocs.dir}"
1420             packagenames="jsr166e.*"
1421             link="${java.api.url}"
1422             access="${build.javadoc.access}"
1423             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1424             source="${build.jsr166e.java.version}"
1425             executable="${javadoc7}"
1426             failonerror = "true">
1427      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1428      <arg value="-XDignore.symbol.file=true"/>
1429
1430    </javadoc>
1431  </target>
1432
1433
1434  <target name="jsr166e-tck-one-java-version"
1435          depends="jsr166ejar">
1436
1437    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1438
1439    <run-tck-tests
1440      tck.src.dir="${test.src.dir}/tck-jsr166e"
1441      target="${build.jsr166e.java.version}"
1442      workdir="${build.jsr166e.dir}"
1443      classes="${jsr166e.jar}"/>
1444  </target>
1445
1446  <target name="jsr166e-tck"
1447          description="Runs tck tests for jsr166e for multiple java versions">
1448
1449 <!--     <antcall target="clean"/> -->
1450 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1451 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1452 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1453 <!--     </antcall> -->
1454
1455    <antcall target="clean"/>
1456    <antcall target="jsr166e-tck-one-java-version">
1457      <param name="build.jsr166e.java.version" value="7"/>
1458      <param name="build.jsr166e.javac" value="${javac7}"/>
1459    </antcall>
1460
1461    <antcall target="clean"/>
1462    <antcall target="jsr166e-tck-one-java-version">
1463      <param name="build.jsr166e.java.version" value="6"/>
1464      <param name="build.jsr166e.javac" value="${javac6}"/>
1465    </antcall>
1466  </target>
1467
1468
1469  <target name="jsr166e-test"
1470          depends="jsr166e-tck"
1471          description="Runs all tests for jsr166e">
1472  </target>
1473
1474  <target name="jsr166edist"
1475          depends="jsr166edist-jar, jsr166edist-docs"
1476          description="Puts all distributable products in single hierarchy"/>
1477
1478
1479  <target name="jsr166eclean"
1480          description="Removes all jsr166e build products">
1481    <delete dir="${build.jsr166e.dir}"/>
1482  </target>
1483
1484
1485  <target name="jsr166edist-jar"
1486          depends="jsr166eclean, jsr166ejar">
1487    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1488  </target>
1489
1490  <target name="jsr166edist-docs"
1491          depends="jsr166eclean, jsr166edocs">
1492    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1493  </target>
1494
1495
1496 <!-- Find buglets that can be detected by static build tools -->
1497
1498  <target name="lint">
1499    <antcall target="dists">
1500      <param name="build.javadoc.access" value="public"/>
1501    </antcall>
1502  </target>
1503
1504 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1505  <target name="lint-private">
1506    <antcall target="dist">
1507      <param name="build.javadoc.access" value="private"/>
1508    </antcall>
1509  </target>
1510
1511
749   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines