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.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 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
230 <      <exclude name="**/GCDuringIteration.java"/>
231 <    </patternset>
305 <  </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>
311 <  </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">
317    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
318    <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}"/>
345 <      <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 357 | 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  
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
311      <local name="destdir"/>
312 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
386 <    <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 400 | 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"/>
407      <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}"/>
411
338      </javac>
339    </target>
340  
415
341    <target name="jar"
342            depends="compile"
343            description="Builds library jar for src/main from compiled sources">
# Line 430 | Line 355
355  
356    <target name="docs"
357            description="Builds javadocs for src/main to dist dir">
358 <
434 <    <delete dir="${docs.dir}"/>
358 >    <delete dir="${docs.dir}" quiet="true"/>
359      <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"/> -->
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"/>
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"/> -->
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  
477
389    <target name="dist"
390            depends="dist-clean, dist-jar, dist-docs"
391            description="Puts all distributable products in single hierarchy"/>
392  
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
393    <target name="clean"
394            description="Removes all build products">
507
395      <delete dir="${build.dir}"/>
509
396    </target>
397  
512
398    <target name="dist-clean"
399            description="Removes all build and distribution products">
515
400      <delete dir="${build.dir}"/>
401      <delete dir="${dist.dir}"/>
518
402    </target>
403  
521
404    <target name="dist-jar"
405            depends="clean, jar">
406      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 530 | Line 412
412    </target>
413  
414    <target name="tck"
415 <          depends="jar"
415 >          depends="jar"
416            description="Runs tck tests for src/main directly">
535
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 561 | 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">
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> -->
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>
608 <        <not> <antversion atleast="1.9.1"/> </not>
609 <      </condition>
492 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
493      </fail>
494  
495      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 624 | Line 507
507    </target>
508  
509  
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
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 669 | 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}"/>
680
531      </javac>
682
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}"
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>
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"
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}"/>
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}"
902           source="6"
903           target="6"
612             classpath=""
905           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}"/>
918
635      </javac>
920  </target>
921
636  
637 <  <target name="4jdk7jar"
638 <          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>
637 >    <jar destfile="${product.jar}">
638 >      <fileset dir="${destdir}"/>
639      </jar>
640  
935  </target>
936
937
938  <target name="4jdk7-tck"
939          depends="4jdk7jar"
940          description="Runs tck tests for jsr166-4jdk7 directly">
941
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"/>
956 <        <exclude name="SplittableRandomTest.java"/>
957 <        <exclude name="StampedLockTest.java"/>
958 <        <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 <
986 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
987 <      </test>
988 <
744 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
745 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
746      </junit>
747    </target>
748  
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
749   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines