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.217 by jsr166, Tue Aug 30 02:41:07 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 63 | Line 60
60    <property name="build.classes.dir"           location="${build.dir}/classes"/>
61    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
62    <property name="build.loops.dir"             location="${build.dir}/loops"/>
66  <property name="build.reports.dir"           location="${build.dir}/reports"/>
67
68  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
69  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
70  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
71  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
72
73  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
74  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
75  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
76  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
77
78  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
79  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
80  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
81  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
82
83  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
84  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
85  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
86  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
63  
64    <!-- JDK locations -->
65    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 96 | 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"/>
100 <    <available property="have.java.base"
101 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
102 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
103 <      if:set="have.java.base"/>
104 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
105 <      unless:set="have.java.base"/>
106 <    <local name="modules"/>
107 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
108 <    <local name="boot.jar.dir"/>
109 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
110 <    <path id="bootclasspath@{v}" unless:set="modules">
111 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
112 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
113 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
114 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
115 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
116 <    </path>
117 <    <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 130 | 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"/>
150  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
151  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
152  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
153  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
154  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
155  <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"/>
160 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
161 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
162 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
163 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
164 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
165 <
166 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
167 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
168 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
169 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
170 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
171 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
172 <  <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"/>
176  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
177  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
178  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
179  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
180  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
181  <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"/>
192 <  <!-- Default jdk doc location (latest stable release seems best) -->
193 <  <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/"/>
200 <  <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 205 | 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 228 | Line 159
159  
160      <sequential>
161  
231    <local name="modules"/>
232    <condition property="modules">
233      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
234    </condition>
235
162      <mkdir dir="@{workdir}/tck-classes"/>
163  
164      <javac srcdir="@{tck.src.dir}"
# Line 245 | Line 171
171             classpath="${junit.jar}"
172             includeAntRuntime="false"
173             includeJavaRuntime="false"
174 +           encoding="ASCII"
175             executable="${javac@{compile-target}}"
176             fork="true">
177  
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 value="-Xpatch:java.base=${build.classes.dir}/java.base" 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 value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
194 <        <jvmarg line="@{jvmflags}"/>
195 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
196 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
197 <
198 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
199 <        <syspropertyset id="system-properties-used-by-tck">
200 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
201 <          <propertyref prefix="jsr166."/>
202 <          <propertyref name="test.timeout.factor"/>
203 <        </syspropertyset>
204 <
205 <        <classpath>
206 <          <pathelement location="${junit.jar}"/>
207 <          <pathelement location="@{workdir}/tck-classes"/>
208 <        </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>
301 <  </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>
307 <  </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">
313    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
314    <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"/>
331 <    <delete dir="@{workdir}/JTreport" 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"
335 <           reportDir="@{workdir}/JTreport">
263 >           workDir="@{workdir}/JTwork">
264        <patternset refid="jdk@{target}.jtreg.tests"/>
265 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266 <      <arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
267 <      <arg value="-agentvm"/>
268 <      <arg value="-verbose:${jtreg.verbose}"/>
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:@{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 353 | 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  
372    <local name="modules"/>
373    <condition property="modules">
374      <and>
375        <available file="${jdk9.home}/jmods" type="dir"/>
376        <equals arg1="9" arg2="${build.main.java.version}"/>
377      </and>
378    </condition>
379
311      <local name="destdir"/>
312 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
382 <    <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 391 | Line 321
321             classpath=""
322             includeAntRuntime="false"
323             includeJavaRuntime="false"
324 +           encoding="ASCII"
325             executable="${build.main.javac}"
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"/>
402      <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}"/>
406
338      </javac>
339    </target>
340  
410
341    <target name="jar"
342            depends="compile"
343            description="Builds library jar for src/main from compiled sources">
# Line 425 | Line 355
355  
356    <target name="docs"
357            description="Builds javadocs for src/main to dist dir">
358 <
429 <    <delete dir="${docs.dir}"/>
358 >    <delete dir="${docs.dir}" quiet="true"/>
359      <mkdir dir="${docs.dir}"/>
431
432    <!-- the packagenames="none" hack below prevents scanning the -->
433    <!-- sourcepath for packages -->
434
435 <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
436 <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
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 <      <arg value="-tag"/>
381 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
382 <      <arg value="-tag"/>
383 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
384 <      <arg value="-tag"/>
385 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
460 < <!-- tags added in jdk9 -->
461 <      <arg value="-tag"/>
462 <      <arg value="revised:X"/>
463 <      <arg value="-tag"/>
464 <      <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  
468
389    <target name="dist"
390            depends="dist-clean, dist-jar, dist-docs"
391            description="Puts all distributable products in single hierarchy"/>
392  
473
474  <target name="release"
475          depends="dist"
476          description="Puts entire CVS tree, plus distribution productions, in a jar">
477
478    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
479
480    <jar basedir="${basedir}" destfile="${release.jar}">
481      <!-- <exclude name="build/**"/> -->
482      <exclude name="${release.jar}"/>
483      <exclude name="user.properties"/>
484      <exclude name="etc/notes/**"/>
485      <exclude name="src/emulation/**"/>
486      <exclude name="**/SyntaxTest.java"/>
487      <exclude name="**/SuperfluousAbstract.java"/>
488      <manifest>
489        <attribute name="Built-By" value="${user.name}"/>
490        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
491      </manifest>
492    </jar>
493  </target>
494
495
393    <target name="clean"
394            description="Removes all build products">
498
395      <delete dir="${build.dir}"/>
500
396    </target>
397  
503
398    <target name="dist-clean"
399            description="Removes all build and distribution products">
506
400      <delete dir="${build.dir}"/>
401      <delete dir="${dist.dir}"/>
509
402    </target>
403  
512
404    <target name="dist-jar"
405            depends="clean, jar">
406      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 521 | Line 412
412    </target>
413  
414    <target name="tck"
415 <          depends="jar"
415 >          depends="jar"
416            description="Runs tck tests for src/main directly">
526
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 552 | 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">
566 <  </target>
567 <
568 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
569 <
570 < <!--     <antcall target="jtreg"> -->
571 < <!--       <param name="build.main.java.version" value="8"/> -->
572 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
573 < <!--     </antcall> -->
574 <
575 < <!--   </target> -->
576 <
577 < <!--   <target name="test89" -->
578 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
579 <
580 < <!--     <antcall target="clean"/> -->
581 < <!--     <antcall target="test"> -->
582 < <!--       <param name="build.main.java.version" value="8"/> -->
583 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
584 < <!--     </antcall> -->
585 <
586 < <!--     <antcall target="clean"/> -->
587 < <!--     <antcall target="test"> -->
588 < <!--       <param name="build.main.java.version" value="9"/> -->
589 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
590 < <!--     </antcall> -->
591 <
592 < <!--   </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>
599 <        <not> <antversion atleast="1.9.1"/> </not>
600 <      </condition>
492 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
493      </fail>
494  
495      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 615 | Line 507
507    </target>
508  
509  
618
619  <!-- Various demos and test programs -->
620
621
622  <!-- description="Benchmark from Doug Lea's AQS paper" -->
623  <target name="loops" depends="configure-compiler">
624
625    <mkdir dir="${build.loops.dir}"/>
626
627    <javac srcdir="${loops.src.dir}"
628          destdir="${build.loops.dir}"
629            debug="${build.debug}"
630       debuglevel="${build.debuglevel}"
631      deprecation="${build.deprecation}"
632           source="${build.sourcelevel}"
633           target="${build.sourcelevel}"
634             fork="true">
635
636      <compilerarg line="${build.args}"/>
637      <classpath refid="loops.classpath"/>
638      <compilerarg value="-XDignore.symbol.file=true"/>
639
640    </javac>
641
642    <java classname="ALoops" fork="true">
643      <classpath refid="loops.classpath"/>
644    </java>
645
646  </target>
647
648
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 658 | Line 519
519             deprecation="${build.deprecation}"
520             includeAntRuntime="false"
521             includeJavaRuntime="false"
522 <           executable="${javac9}"
522 >           encoding="ASCII"
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}"/>
668 <      <compilerarg line="${build.args}"/>
669 <
670 <    </javac>
671 <
672 <  </target>
673 <
674 <
675 <  <!-- jsr166 4jdk8 -->
676 <
677 <  <target name="4jdk8compile"
678 <          depends="configure-compiler"
679 <          description="Compiles src/jdk8 sources, targeting jdk8">
680 <
681 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
682 <
683 <    <javac srcdir="${4jdk8src.dir}"
684 <           destdir="${build.4jdk8.classes.dir}"
685 <           debug="${build.debug}"
686 <           debuglevel="${build.debuglevel}"
687 <           deprecation="${build.deprecation}"
688 <           source="8"
689 <           target="8"
690 <           classpath=""
691 <           bootclasspath="${bootclasspath8}"
692 <           includeAntRuntime="false"
693 <           includeJavaRuntime="false"
694 <           executable="${javac8}"
695 <           fork="true">
696 <
697 <      <include name="**/*.java"/>
698 <      <compilerarg value="-Xprefer:source"/>
699 <      <compilerarg value="-XDignore.symbol.file=true"/>
700 <      <compilerarg value="-Xlint:all"/>
701 <      <compilerarg value="-Werror"/>
528 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
529 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
530        <compilerarg line="${build.args}"/>
703
531      </javac>
532    </target>
533  
707  <target name="4jdk8doclint"
708          depends="configure-compiler"
709          description="Finds doclint warnings">
710
711    <mkdir dir="${build.4jdk8.classes.dir}"/>
712
713    <javac srcdir="${4jdk8src.dir}"
714           destdir="${build.4jdk8.classes.dir}"
715           debug="${build.debug}"
716           debuglevel="${build.debuglevel}"
717           deprecation="${build.deprecation}"
718           source="8"
719           target="8"
720           classpath=""
721           bootclasspath="${bootclasspath8}"
722           includeAntRuntime="false"
723           includeJavaRuntime="false"
724           executable="${javac8}"
725           fork="true">
726
727      <include name="**/*.java"/>
728      <compilerarg value="-Xprefer:source"/>
729      <compilerarg value="-XDignore.symbol.file=true"/>
730      <compilerarg value="-Xlint:all"/>
731      <compilerarg value="-Xdoclint:all/protected"/>
732      <compilerarg line="${build.args}"/>
733
734    </javac>
735  </target>
736
737
738  <target name="4jdk8jar"
739          depends="4jdk8compile"
740          description="Builds library jar from compiled sources">
741
742    <jar destfile="${4jdk8product.jar}">
743      <fileset dir="${build.4jdk8.classes.dir}"/>
744      <manifest>
745        <attribute name="Built-By" value="${user.name}"/>
746        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
747      </manifest>
748    </jar>
749
750  </target>
751
752
753  <target name="4jdk8-tck"
754          depends="4jdk8jar"
755          description="Runs tck tests for jsr166-4jdk8 directly">
756
757    <run-tck-tests
758      target="8"
759      workdir="${build.4jdk8.dir}"
760      classes="${4jdk8product.jar}">
761      <javac-elements>
762        <!-- JDK9+ test classes -->
763        <exclude name="*9Test.java"/>
764        <exclude name="*10Test.java"/>
765      </javac-elements>
766    </run-tck-tests>
767  </target>
768
769
770  <target name="4jdk8-jtreg"
771          depends="4jdk8jar"
772          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
773    <run-jtreg-tests
774       target="8"
775       workdir="${build.4jdk8.dir}"
776       classes="${4jdk8product.jar}"/>
777  </target>
778
779
780  <target name="4jdk8-test"
781          depends="4jdk8-tck, 4jdk8-jtreg"
782          description="Runs tck and jtreg tests for jsr166-4jdk8">
783  </target>
784
785
786  <target name="4jdk8docs"
787          description="Builds javadocs for src/jdk8 to dist dir">
788
789    <delete dir="${4jdk8docs.dir}"/>
790    <mkdir dir="${4jdk8docs.dir}"/>
791
792    <javadoc destdir="${4jdk8docs.dir}"
793             packagenames="none"
794             link="${java8.api.url}"
795             overview="${4jdk8src.dir}/intro.html"
796             access="${build.javadoc.access}"
797             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
798             classpath=""
799             executable="${javadoc8}"
800             failonerror = "true">
801      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
802        <include name="**/*.java"/>
803      </fileset>
804      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
805      <arg value="-XDignore.symbol.file=true"/>
806      <arg value="-tag"/>
807      <arg value="${javadoc.jls.option}"/>
808      <arg value="-tag"/>
809      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
810      <arg value="-tag"/>
811      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
812      <arg value="-tag"/>
813      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
814    </javadoc>
815  </target>
816
817
818  <target name="4jdk8dist"
819          depends="4jdk8dist-jar, 4jdk8dist-docs"
820          description="Puts all distributable products in single hierarchy"/>
821
822
823  <target name="4jdk8clean"
824          description="Removes all 4jdk8 build products">
534  
535 <    <delete dir="${build.4jdk8.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 <  </target>
829 <
830 <
831 <  <target name="4jdk8dist-jar"
832 <          depends="4jdk8clean, 4jdk8jar">
833 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
834 <  </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"
847 <          depends="configure-compiler"
848 <          description="Compiles src/jdk7 sources, targeting jdk7">
849 <
850 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
851 <
852 <    <javac srcdir="${4jdk7src.dir}"
853 <           destdir="${build.4jdk7.classes.dir}"
854 <           debug="${build.debug}"
855 <           debuglevel="${build.debuglevel}"
856 <           deprecation="${build.deprecation}"
857 <           source="6"
858 <           target="6"
859 <           classpath=""
860 <           bootclasspath="${bootclasspath6}"
861 <           includeAntRuntime="false"
862 <           includeJavaRuntime="false"
863 <           executable="${javac7}"
864 <           fork="true">
865 <
866 <      <include name="**/*.java"/>
867 <      <compilerarg value="-Xprefer:source"/>
868 <      <compilerarg value="-XDignore.symbol.file=true"/>
869 <      <compilerarg value="-Xlint:all"/>
870 <      <compilerarg value="-Werror"/>
871 <      <compilerarg line="${build.args}"/>
872 <
873 <    </javac>
874 <  </target>
875 <
876 <  <target name="4jdk7doclint"
877 <          depends="configure-compiler"
878 <          description="Finds doclint warnings">
879 <
880 <    <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}"
887           source="6"
888           target="6"
612             classpath=""
890           bootclasspath="${bootclasspath6}"
613             includeAntRuntime="false"
614             includeJavaRuntime="false"
615 <           executable="${javac8}"
615 >           encoding="ASCII"
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}"/>
902
635      </javac>
904  </target>
905
636  
637 <  <target name="4jdk7jar"
638 <          depends="4jdk7compile"
909 <          description="Builds library jar from compiled sources">
910 <
911 <    <jar destfile="${4jdk7product.jar}">
912 <      <fileset dir="${build.4jdk7.classes.dir}"/>
913 <      <manifest>
914 <        <attribute name="Built-By" value="${user.name}"/>
915 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
916 <      </manifest>
637 >    <jar destfile="${product.jar}">
638 >      <fileset dir="${destdir}"/>
639      </jar>
640  
919  </target>
920
921
922  <target name="4jdk7-tck"
923          depends="4jdk7jar"
924          description="Runs tck tests for jsr166-4jdk7 directly">
925
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"/>
940 <        <exclude name="SplittableRandomTest.java"/>
941 <        <exclude name="StampedLockTest.java"/>
942 <        <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 <
970 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
971 <      </test>
972 <
744 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
745 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
746      </junit>
747    </target>
748  
976  <target name="4jdk7-jtreg"
977          depends="4jdk7jar"
978          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
979    <run-jtreg-tests
980       target="7"
981       workdir="${build.4jdk7.dir}"
982       classes="${4jdk7product.jar}"/>
983  </target>
984
985
986  <target name="4jdk7-test"
987          depends="4jdk7-tck, 4jdk7-jtreg"
988          description="Runs tck and jtreg tests for jsr166-4jdk7">
989  </target>
990
991
992  <target name="4jdk7docs"
993          description="Builds javadocs for src/jdk7 to dist dir">
994
995    <delete dir="${4jdk7docs.dir}"/>
996    <mkdir dir="${4jdk7docs.dir}"/>
997
998    <javadoc destdir="${4jdk7docs.dir}"
999             packagenames="none"
1000             link="${java7.api.url}"
1001             overview="${4jdk7src.dir}/intro.html"
1002             access="${build.javadoc.access}"
1003             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1004             classpath=""
1005             executable="${javadoc7}"
1006             failonerror = "true">
1007      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1008        <include name="**/*.java"/>
1009      </fileset>
1010      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1011      <arg value="-XDignore.symbol.file=true"/>
1012    </javadoc>
1013  </target>
1014
1015
1016  <target name="4jdk7dist"
1017          depends="4jdk7dist-jar, 4jdk7dist-docs"
1018          description="Puts all distributable products in single hierarchy"/>
1019
1020
1021  <target name="4jdk7clean"
1022          description="Removes all 4jdk7 build products">
1023
1024    <delete dir="${build.4jdk7.dir}"/>
1025
1026  </target>
1027
1028
1029  <target name="4jdk7dist-jar"
1030          depends="4jdk7clean, 4jdk7jar">
1031    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1032  </target>
1033
1034
1035  <target name="4jdk7dist-docs"
1036          depends="4jdk7clean, 4jdk7docs">
1037    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1038  </target>
1039
1040
1041  <!-- jsr166x -->
1042
1043  <target name="jsr166xcompile"
1044          depends="configure-compiler"
1045          description="Compiles jsr166x sources to build dir">
1046
1047    <mkdir dir="${build.jsr166x.classes.dir}"/>
1048
1049    <javac srcdir="${topsrc.dir}"
1050           destdir="${build.jsr166x.classes.dir}"
1051           debug="${build.debug}"
1052           debuglevel="${build.debuglevel}"
1053           deprecation="${build.deprecation}"
1054           classpath=""
1055           bootclasspath="${bootclasspath6}"
1056           source="5"
1057           target="5"
1058           includeAntRuntime="false"
1059           includeJavaRuntime="false"
1060           executable="${javac7}"
1061           fork="true">
1062
1063      <include name="jsr166x/**/*.java"/>
1064      <compilerarg value="-XDignore.symbol.file=true"/>
1065      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1066      <compilerarg value="-Werror"/>
1067      <compilerarg line="${build.args}"/>
1068
1069    </javac>
1070  </target>
1071
1072
1073  <target name="jsr166xjar"
1074          depends="jsr166xcompile"
1075          description="Builds library jar from compiled sources">
1076
1077    <jar destfile="${jsr166x.jar}">
1078      <fileset dir="${build.jsr166x.classes.dir}"/>
1079      <manifest>
1080        <attribute name="Built-By" value="${user.name}"/>
1081        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1082      </manifest>
1083    </jar>
1084
1085  </target>
1086
1087
1088  <target name="jsr166xdocs"
1089          description="Builds javadocs to dist dir">
1090
1091    <delete dir="${jsr166xdocs.dir}"/>
1092    <mkdir dir="${jsr166xdocs.dir}"/>
1093
1094    <javadoc destdir="${jsr166xdocs.dir}"
1095             packagenames="jsr166x.*"
1096             link="${java.api.url}"
1097             access="${build.javadoc.access}"
1098             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1099             bootclasspath="${bootclasspath6}"
1100             source="5"
1101             executable="${javadoc7}"
1102             failonerror = "true">
1103      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1104      <arg value="-XDignore.symbol.file=true"/>
1105
1106    </javadoc>
1107  </target>
1108
1109
1110  <target name="jsr166xdist"
1111          depends="jsr166xdist-jar, jsr166xdist-docs"
1112          description="Puts all distributable products in single hierarchy"/>
1113
1114
1115  <target name="jsr166xclean"
1116          description="Removes all jsr166x build products">
1117
1118    <delete dir="${build.jsr166x.dir}"/>
1119
1120  </target>
1121
1122
1123  <target name="jsr166xdist-jar"
1124          depends="jsr166xclean, jsr166xjar">
1125    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1126  </target>
1127
1128  <target name="jsr166xdist-docs"
1129          depends="jsr166xclean, jsr166xdocs">
1130    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1131  </target>
1132
1133  <!-- jsr166y -->
1134
1135
1136  <target name="jsr166ycompile"
1137          depends="configure-compiler"
1138          description="Compiles jsr166y sources">
1139
1140    <mkdir dir="${build.jsr166y.classes.dir}"/>
1141
1142    <javac srcdir="${topsrc.dir}"
1143           destdir="${build.jsr166y.classes.dir}"
1144           debug="${build.debug}"
1145           debuglevel="${build.debuglevel}"
1146           deprecation="${build.deprecation}"
1147           source="6"
1148           target="6"
1149           classpath=""
1150           bootclasspath="${bootclasspath6}"
1151           includeAntRuntime="false"
1152           includeJavaRuntime="false"
1153           executable="${javac7}"
1154           fork="true">
1155
1156      <include name="jsr166y/**/*.java"/>
1157      <compilerarg value="-XDignore.symbol.file=true"/>
1158      <compilerarg value="-Xlint:all"/>
1159      <compilerarg value="-Werror"/>
1160      <compilerarg line="${build.args}"/>
1161
1162    </javac>
1163  </target>
1164
1165
1166  <target name="jsr166yjar"
1167          depends="jsr166ycompile"
1168          description="Builds library jar from compiled sources">
1169
1170    <jar destfile="${jsr166y.jar}" index="true">
1171      <fileset dir="${build.jsr166y.classes.dir}"/>
1172      <manifest>
1173        <attribute name="Built-By" value="${user.name}"/>
1174        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1175      </manifest>
1176    </jar>
1177
1178  </target>
1179
1180
1181  <target name="jsr166ydocs"
1182          description="Builds javadocs to dist dir">
1183
1184    <delete dir="${jsr166ydocs.dir}"/>
1185    <mkdir dir="${jsr166ydocs.dir}"/>
1186
1187    <javadoc destdir="${jsr166ydocs.dir}"
1188             packagenames="jsr166y.*"
1189             link="${java.api.url}"
1190             access="${build.javadoc.access}"
1191             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1192             bootclasspath="${bootclasspath6}"
1193             source="6"
1194             executable="${javadoc7}"
1195             failonerror = "true">
1196      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1197      <arg value="-XDignore.symbol.file=true"/>
1198
1199    </javadoc>
1200  </target>
1201
1202
1203  <target name="jsr166ydist"
1204          depends="jsr166ydist-jar, jsr166ydist-docs"
1205          description="Puts all distributable products in single hierarchy"/>
1206
1207
1208  <target name="jsr166yclean"
1209          description="Removes all jsr166y build products">
1210
1211    <delete dir="${build.jsr166y.dir}"/>
1212
1213  </target>
1214
1215
1216  <target name="jsr166ydist-jar"
1217          depends="jsr166yclean, jsr166yjar">
1218    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1219  </target>
1220
1221  <target name="jsr166ydist-docs"
1222          depends="jsr166yclean, jsr166ydocs">
1223    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1224  </target>
1225
1226
1227  <!-- extra166y -->
1228
1229
1230  <target name="extra166ycompile"
1231          depends="configure-compiler, jsr166yjar"
1232          description="Compiles extra166y sources">
1233
1234    <mkdir dir="${build.extra166y.classes.dir}"/>
1235
1236    <javac srcdir="${topsrc.dir}"
1237           destdir="${build.extra166y.classes.dir}"
1238           debug="${build.debug}"
1239           debuglevel="${build.debuglevel}"
1240           deprecation="${build.deprecation}"
1241           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1242           classpath=""
1243           source="6"
1244           target="6"
1245           includeAntRuntime="false"
1246           includeJavaRuntime="false"
1247           executable="${javac7}"
1248           fork="true">
1249
1250      <include name="extra166y/**/*.java"/>
1251      <compilerarg value="-XDignore.symbol.file=true"/>
1252      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1253      <compilerarg value="-Werror"/>
1254      <compilerarg line="${build.args}"/>
1255
1256    </javac>
1257  </target>
1258
1259
1260  <target name="extra166yjar"
1261          depends="extra166ycompile"
1262          description="Builds library jar from compiled sources">
1263
1264    <jar destfile="${extra166y.jar}" index="true">
1265      <fileset dir="${build.extra166y.classes.dir}"/>
1266      <manifest>
1267        <attribute name="Built-By" value="${user.name}"/>
1268        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1269      </manifest>
1270    </jar>
1271
1272  </target>
1273
1274
1275  <target name="extra166ydocs"
1276          description="Builds javadocs to build dir">
1277
1278    <delete dir="${extra166ydocs.dir}"/>
1279    <mkdir dir="${extra166ydocs.dir}"/>
1280
1281    <javadoc destdir="${extra166ydocs.dir}"
1282             packagenames="extra166y.*"
1283             link="${java.api.url}"
1284             access="${build.javadoc.access}"
1285             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1286             bootclasspath="${bootclasspath6}"
1287             source="6"
1288             executable="${javadoc7}">
1289      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1290      <arg value="-XDignore.symbol.file=true"/>
1291
1292    </javadoc>
1293  </target>
1294
1295
1296  <target name="extra166ydist"
1297          depends="extra166ydist-jar, extra166ydist-docs"
1298          description="Puts all distributable products in single hierarchy"/>
1299
1300
1301  <target name="extra166yclean"
1302          description="Removes all extra166y build products">
1303
1304    <delete dir="${build.extra166y.dir}"/>
1305
1306  </target>
1307
1308
1309  <target name="extra166ydist-jar"
1310          depends="extra166yclean, extra166yjar">
1311    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1312  </target>
1313
1314  <target name="extra166ydist-docs"
1315          depends="extra166yclean, extra166ydocs">
1316    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1317  </target>
1318
1319  <!-- jsr166e -->
1320
1321  <property name="build.jsr166e.java.version" value="6"/>
1322  <property name="build.jsr166e.javac" value="${javac6}"/>
1323
1324  <target name="jsr166ecompile"
1325          depends="configure-compiler"
1326          description="Compiles jsr166e sources">
1327
1328    <mkdir dir="${build.jsr166e.classes.dir}"/>
1329
1330    <javac srcdir="${topsrc.dir}"
1331           destdir="${build.jsr166e.classes.dir}"
1332           debug="${build.debug}"
1333           debuglevel="${build.debuglevel}"
1334           deprecation="${build.deprecation}"
1335           source="${build.jsr166e.java.version}"
1336           target="${build.jsr166e.java.version}"
1337           classpath=""
1338           includeAntRuntime="false"
1339           includeJavaRuntime="false"
1340           executable="${build.jsr166e.javac}"
1341           fork="true">
1342
1343      <include name="jsr166e/**/*.java"/>
1344      <compilerarg value="-XDignore.symbol.file=true"/>
1345      <compilerarg value="-Xlint:all"/>
1346      <compilerarg value="-Werror"/>
1347      <compilerarg line="${build.args}"/>
1348
1349    </javac>
1350  </target>
1351
1352  <!-- jsr166e: find doclint errors -->
1353  <target name="jsr166edoclint">
1354
1355    <mkdir dir="${build.jsr166e.classes.dir}"/>
1356
1357    <javac srcdir="${topsrc.dir}"
1358           destdir="${build.jsr166e.classes.dir}"
1359           debug="${build.debug}"
1360           debuglevel="${build.debuglevel}"
1361           deprecation="${build.deprecation}"
1362           source="${build.jsr166e.java.version}"
1363           target="${build.jsr166e.java.version}"
1364           classpath=""
1365           bootclasspath="${bootclasspath6}"
1366           includeAntRuntime="false"
1367           includeJavaRuntime="false"
1368           executable="${javac8}"
1369           fork="true">
1370
1371      <include name="jsr166e/**/*.java"/>
1372      <compilerarg value="-XDignore.symbol.file=true"/>
1373      <compilerarg value="-Xlint:all"/>
1374      <compilerarg value="-Werror"/>
1375      <compilerarg value="-Xdoclint:all/protected"/>
1376
1377    </javac>
1378  </target>
1379
1380
1381  <target name="jsr166ejar"
1382          depends="jsr166ecompile"
1383          description="Builds library jar from compiled sources">
1384
1385    <jar destfile="${jsr166e.jar}" index="true">
1386      <fileset dir="${build.jsr166e.classes.dir}"/>
1387      <manifest>
1388        <attribute name="Built-By" value="${user.name}"/>
1389        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1390      </manifest>
1391    </jar>
1392
1393  </target>
1394
1395
1396  <target name="jsr166edocs"
1397          description="Builds javadocs to build dir">
1398
1399    <delete dir="${jsr166edocs.dir}"/>
1400    <mkdir dir="${jsr166edocs.dir}"/>
1401
1402    <javadoc destdir="${jsr166edocs.dir}"
1403             packagenames="jsr166e.*"
1404             link="${java.api.url}"
1405             access="${build.javadoc.access}"
1406             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1407             source="${build.jsr166e.java.version}"
1408             executable="${javadoc7}"
1409             failonerror = "true">
1410      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1411      <arg value="-XDignore.symbol.file=true"/>
1412
1413    </javadoc>
1414  </target>
1415
1416
1417  <target name="jsr166e-tck-one-java-version"
1418          depends="jsr166ejar">
1419
1420    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1421
1422    <run-tck-tests
1423      tck.src.dir="${test.src.dir}/tck-jsr166e"
1424      target="${build.jsr166e.java.version}"
1425      workdir="${build.jsr166e.dir}"
1426      classes="${jsr166e.jar}"/>
1427  </target>
1428
1429  <target name="jsr166e-tck"
1430          description="Runs tck tests for jsr166e for multiple java versions">
1431
1432 <!--     <antcall target="clean"/> -->
1433 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1434 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1435 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1436 <!--     </antcall> -->
1437
1438    <antcall target="clean"/>
1439    <antcall target="jsr166e-tck-one-java-version">
1440      <param name="build.jsr166e.java.version" value="7"/>
1441      <param name="build.jsr166e.javac" value="${javac7}"/>
1442    </antcall>
1443
1444    <antcall target="clean"/>
1445    <antcall target="jsr166e-tck-one-java-version">
1446      <param name="build.jsr166e.java.version" value="6"/>
1447      <param name="build.jsr166e.javac" value="${javac6}"/>
1448    </antcall>
1449  </target>
1450
1451
1452  <target name="jsr166e-test"
1453          depends="jsr166e-tck"
1454          description="Runs all tests for jsr166e">
1455  </target>
1456
1457  <target name="jsr166edist"
1458          depends="jsr166edist-jar, jsr166edist-docs"
1459          description="Puts all distributable products in single hierarchy"/>
1460
1461
1462  <target name="jsr166eclean"
1463          description="Removes all jsr166e build products">
1464    <delete dir="${build.jsr166e.dir}"/>
1465  </target>
1466
1467
1468  <target name="jsr166edist-jar"
1469          depends="jsr166eclean, jsr166ejar">
1470    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1471  </target>
1472
1473  <target name="jsr166edist-docs"
1474          depends="jsr166eclean, jsr166edocs">
1475    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1476  </target>
1477
1478
1479 <!-- Find buglets that can be detected by static build tools -->
1480
1481  <target name="lint">
1482    <antcall target="dists">
1483      <param name="build.javadoc.access" value="public"/>
1484    </antcall>
1485  </target>
1486
1487 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1488  <target name="lint-private">
1489    <antcall target="dist">
1490      <param name="build.javadoc.access" value="private"/>
1491    </antcall>
1492  </target>
1493
1494
749   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines