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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines