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.212 by jsr166, Sat May 21 00:35:58 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://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}"/>
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>
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>
299 <  </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>
305 <  </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">
311    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
312    <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"/>
329 <    <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"
333 <           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 351 | 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  
370    <local name="modules"/>
371    <condition property="modules">
372      <and>
373        <available file="${jdk9.home}/jmods" type="dir"/>
374        <equals arg1="9" arg2="${build.main.java.version}"/>
375      </and>
376    </condition>
377
311      <local name="destdir"/>
312 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
380 <    <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 389 | 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"/>
400      <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}"/>
404
338      </javac>
339    </target>
340  
408
341    <target name="jar"
342            depends="compile"
343            description="Builds library jar for src/main from compiled sources">
# Line 423 | Line 355
355  
356    <target name="docs"
357            description="Builds javadocs for src/main to dist dir">
358 <
427 <    <delete dir="${docs.dir}"/>
358 >    <delete dir="${docs.dir}" quiet="true"/>
359      <mkdir dir="${docs.dir}"/>
429
430    <!-- the packagenames="none" hack below prevents scanning the -->
431    <!-- sourcepath for packages -->
432
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}:${jdk9.src.dir}"
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 < <!--  TODO     <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;"/>
456 < <!-- tags added in jdk9 -->
457 <      <arg value="-tag"/>
458 <      <arg value="revised:X"/>
459 <      <arg value="-tag"/>
460 <      <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  
464
389    <target name="dist"
390            depends="dist-clean, dist-jar, dist-docs"
391            description="Puts all distributable products in single hierarchy"/>
392  
469
470  <target name="release"
471          depends="dist"
472          description="Puts entire CVS tree, plus distribution productions, in a jar">
473
474    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
475
476    <jar basedir="${basedir}" destfile="${release.jar}">
477      <!-- <exclude name="build/**"/> -->
478      <exclude name="${release.jar}"/>
479      <exclude name="user.properties"/>
480      <exclude name="etc/notes/**"/>
481      <exclude name="src/emulation/**"/>
482      <exclude name="**/SyntaxTest.java"/>
483      <exclude name="**/SuperfluousAbstract.java"/>
484      <manifest>
485        <attribute name="Built-By" value="${user.name}"/>
486        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
487      </manifest>
488    </jar>
489  </target>
490
491
393    <target name="clean"
394            description="Removes all build products">
494
395      <delete dir="${build.dir}"/>
496
396    </target>
397  
499
398    <target name="dist-clean"
399            description="Removes all build and distribution products">
502
400      <delete dir="${build.dir}"/>
401      <delete dir="${dist.dir}"/>
505
402    </target>
403  
508
404    <target name="dist-jar"
405            depends="clean, jar">
406      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 517 | Line 412
412    </target>
413  
414    <target name="tck"
415 <          depends="jar"
415 >          depends="jar"
416            description="Runs tck tests for src/main directly">
522
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 540 | Line 438
438      </antcall>
439    </target>
440  
441 +  <target name="tck-security-manager"
442 +          description="Runs tck with a security manager">
443 +    <antcall target="tck">
444 +      <param name="jsr166.useSecurityManager" value="true"/>
445 +    </antcall>
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">
555 <  </target>
556 <
557 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
558 <
559 < <!--     <antcall target="jtreg"> -->
560 < <!--       <param name="build.main.java.version" value="8"/> -->
561 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
562 < <!--     </antcall> -->
563 <
564 < <!--   </target> -->
565 <
566 < <!--   <target name="test89" -->
567 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
568 <
569 < <!--     <antcall target="clean"/> -->
570 < <!--     <antcall target="test"> -->
571 < <!--       <param name="build.main.java.version" value="8"/> -->
572 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
573 < <!--     </antcall> -->
574 <
575 < <!--     <antcall target="clean"/> -->
576 < <!--     <antcall target="test"> -->
577 < <!--       <param name="build.main.java.version" value="9"/> -->
578 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
579 < <!--     </antcall> -->
580 <
581 < <!--   </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>
588 <        <not> <antversion atleast="1.9.1"/> </not>
589 <      </condition>
492 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
493      </fail>
494  
495      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 604 | Line 507
507    </target>
508  
509  
607
608  <!-- Various demos and test programs -->
609
610
611  <!-- description="Benchmark from Doug Lea's AQS paper" -->
612  <target name="loops" depends="configure-compiler">
613
614    <mkdir dir="${build.loops.dir}"/>
615
616    <javac srcdir="${loops.src.dir}"
617          destdir="${build.loops.dir}"
618            debug="${build.debug}"
619       debuglevel="${build.debuglevel}"
620      deprecation="${build.deprecation}"
621           source="${build.sourcelevel}"
622           target="${build.sourcelevel}"
623             fork="true">
624
625      <compilerarg line="${build.args}"/>
626      <classpath refid="loops.classpath"/>
627      <compilerarg value="-XDignore.symbol.file=true"/>
628
629    </javac>
630
631    <java classname="ALoops" fork="true">
632      <classpath refid="loops.classpath"/>
633    </java>
634
635  </target>
636
637
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 647 | 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}"/>
657 <      <compilerarg line="${build.args}"/>
658 <
659 <    </javac>
660 <
661 <  </target>
662 <
663 <
664 <  <!-- jsr166 4jdk8 -->
665 <
666 <  <target name="4jdk8compile"
667 <          depends="configure-compiler"
668 <          description="Compiles src/jdk8 sources, targeting jdk8">
669 <
670 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
671 <
672 <    <javac srcdir="${4jdk8src.dir}"
673 <           destdir="${build.4jdk8.classes.dir}"
674 <           debug="${build.debug}"
675 <           debuglevel="${build.debuglevel}"
676 <           deprecation="${build.deprecation}"
677 <           source="8"
678 <           target="8"
679 <           classpath=""
680 <           bootclasspath="${bootclasspath8}"
681 <           includeAntRuntime="false"
682 <           includeJavaRuntime="false"
683 <           executable="${javac8}"
684 <           fork="true">
685 <
686 <      <include name="**/*.java"/>
687 <      <compilerarg value="-Xprefer:source"/>
688 <      <compilerarg value="-XDignore.symbol.file=true"/>
689 <      <compilerarg value="-Xlint:all"/>
690 <      <compilerarg value="-Werror"/>
691 <      <compilerarg line="${build.args}"/>
692 <
693 <    </javac>
694 <  </target>
695 <
696 <  <target name="4jdk8doclint"
697 <          depends="configure-compiler"
698 <          description="Finds doclint warnings">
699 <
700 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
701 <
702 <    <javac srcdir="${4jdk8src.dir}"
703 <           destdir="${build.4jdk8.classes.dir}"
704 <           debug="${build.debug}"
705 <           debuglevel="${build.debuglevel}"
706 <           deprecation="${build.deprecation}"
707 <           source="8"
708 <           target="8"
709 <           classpath=""
710 <           bootclasspath="${bootclasspath8}"
711 <           includeAntRuntime="false"
712 <           includeJavaRuntime="false"
713 <           executable="${javac8}"
714 <           fork="true">
715 <
716 <      <include name="**/*.java"/>
717 <      <compilerarg value="-Xprefer:source"/>
718 <      <compilerarg value="-XDignore.symbol.file=true"/>
719 <      <compilerarg value="-Xlint:all"/>
720 <      <compilerarg value="-Xdoclint:all/protected"/>
528 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
529 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
530        <compilerarg line="${build.args}"/>
722
531      </javac>
532    </target>
533  
534  
535 <  <target name="4jdk8jar"
536 <          depends="4jdk8compile"
537 <          description="Builds library jar from compiled sources">
538 <
539 <    <jar destfile="${4jdk8product.jar}">
540 <      <fileset dir="${build.4jdk8.classes.dir}"/>
541 <      <manifest>
734 <        <attribute name="Built-By" value="${user.name}"/>
735 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
736 <      </manifest>
737 <    </jar>
738 <
739 <  </target>
740 <
741 <
742 <  <target name="4jdk8-tck"
743 <          depends="4jdk8jar"
744 <          description="Runs tck tests for jsr166-4jdk8 directly">
745 <
746 <    <run-tck-tests
747 <      target="8"
748 <      workdir="${build.4jdk8.dir}"
749 <      classes="${4jdk8product.jar}">
750 <      <javac-elements>
751 <        <!-- JDK9+ test classes -->
752 <        <exclude name="*9Test.java"/>
753 <        <exclude name="*10Test.java"/>
754 <      </javac-elements>
755 <    </run-tck-tests>
756 <  </target>
757 <
758 <
759 <  <target name="4jdk8-jtreg"
760 <          depends="4jdk8jar"
761 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
762 <    <run-jtreg-tests
763 <       target="8"
764 <       workdir="${build.4jdk8.dir}"
765 <       classes="${4jdk8product.jar}"/>
766 <  </target>
767 <
768 <
769 <  <target name="4jdk8-test"
770 <          depends="4jdk8-tck, 4jdk8-jtreg"
771 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
772 <  </target>
773 <
774 <
775 <  <target name="4jdk8docs"
776 <          description="Builds javadocs for src/jdk8 to dist 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 <    <delete dir="${4jdk8docs.dir}"/>
779 <    <mkdir dir="${4jdk8docs.dir}"/>
780 <
781 <    <javadoc destdir="${4jdk8docs.dir}"
782 <             packagenames="none"
783 <             link="${java8.api.url}"
784 <             overview="${4jdk8src.dir}/intro.html"
785 <             access="${build.javadoc.access}"
786 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
787 <             classpath=""
788 <             executable="${javadoc8}"
789 <             failonerror = "true">
790 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
791 <        <include name="**/*.java"/>
792 <      </fileset>
793 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
794 <      <arg value="-XDignore.symbol.file=true"/>
795 <      <arg value="-tag"/>
796 <      <arg value="${javadoc.jls.option}"/>
797 <      <arg value="-tag"/>
798 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
799 <      <arg value="-tag"/>
800 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
801 <      <arg value="-tag"/>
802 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
803 <    </javadoc>
804 <  </target>
805 <
806 <
807 <  <target name="4jdk8dist"
808 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
809 <          description="Puts all distributable products in single hierarchy"/>
810 <
811 <
812 <  <target name="4jdk8clean"
813 <          description="Removes all 4jdk8 build products">
814 <
815 <    <delete dir="${build.4jdk8.dir}"/>
816 <
817 <  </target>
818 <
819 <
820 <  <target name="4jdk8dist-jar"
821 <          depends="4jdk8clean, 4jdk8jar">
822 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
823 <  </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"
836 <          depends="configure-compiler"
837 <          description="Compiles src/jdk7 sources, targeting jdk7">
838 <
839 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
840 <
841 <    <javac srcdir="${4jdk7src.dir}"
842 <           destdir="${build.4jdk7.classes.dir}"
843 <           debug="${build.debug}"
844 <           debuglevel="${build.debuglevel}"
845 <           deprecation="${build.deprecation}"
846 <           source="6"
847 <           target="6"
848 <           classpath=""
849 <           bootclasspath="${bootclasspath6}"
850 <           includeAntRuntime="false"
851 <           includeJavaRuntime="false"
852 <           executable="${javac7}"
853 <           fork="true">
854 <
855 <      <include name="**/*.java"/>
856 <      <compilerarg value="-Xprefer:source"/>
857 <      <compilerarg value="-XDignore.symbol.file=true"/>
858 <      <compilerarg value="-Xlint:all"/>
859 <      <compilerarg value="-Werror"/>
860 <      <compilerarg line="${build.args}"/>
861 <
862 <    </javac>
863 <  </target>
864 <
865 <  <target name="4jdk7doclint"
866 <          depends="configure-compiler"
867 <          description="Finds doclint warnings">
868 <
869 <    <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}"
876           source="6"
877           target="6"
612             classpath=""
879           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}"/>
891
635      </javac>
893  </target>
894
636  
637 <  <target name="4jdk7jar"
638 <          depends="4jdk7compile"
898 <          description="Builds library jar from compiled sources">
899 <
900 <    <jar destfile="${4jdk7product.jar}">
901 <      <fileset dir="${build.4jdk7.classes.dir}"/>
902 <      <manifest>
903 <        <attribute name="Built-By" value="${user.name}"/>
904 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
905 <      </manifest>
637 >    <jar destfile="${product.jar}">
638 >      <fileset dir="${destdir}"/>
639      </jar>
640  
908  </target>
909
910
911  <target name="4jdk7-tck"
912          depends="4jdk7jar"
913          description="Runs tck tests for jsr166-4jdk7 directly">
914
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"/>
929 <        <exclude name="SplittableRandomTest.java"/>
930 <        <exclude name="StampedLockTest.java"/>
931 <        <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 <
959 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
960 <      </test>
961 <
744 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
745 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
746      </junit>
747    </target>
748  
965  <target name="4jdk7-jtreg"
966          depends="4jdk7jar"
967          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
968    <run-jtreg-tests
969       target="7"
970       workdir="${build.4jdk7.dir}"
971       classes="${4jdk7product.jar}"/>
972  </target>
973
974
975  <target name="4jdk7-test"
976          depends="4jdk7-tck, 4jdk7-jtreg"
977          description="Runs tck and jtreg tests for jsr166-4jdk7">
978  </target>
979
980
981  <target name="4jdk7docs"
982          description="Builds javadocs for src/jdk7 to dist dir">
983
984    <delete dir="${4jdk7docs.dir}"/>
985    <mkdir dir="${4jdk7docs.dir}"/>
986
987    <javadoc destdir="${4jdk7docs.dir}"
988             packagenames="none"
989             link="${java7.api.url}"
990             overview="${4jdk7src.dir}/intro.html"
991             access="${build.javadoc.access}"
992             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
993             classpath=""
994             executable="${javadoc7}"
995             failonerror = "true">
996      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
997        <include name="**/*.java"/>
998      </fileset>
999      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1000      <arg value="-XDignore.symbol.file=true"/>
1001    </javadoc>
1002  </target>
1003
1004
1005  <target name="4jdk7dist"
1006          depends="4jdk7dist-jar, 4jdk7dist-docs"
1007          description="Puts all distributable products in single hierarchy"/>
1008
1009
1010  <target name="4jdk7clean"
1011          description="Removes all 4jdk7 build products">
1012
1013    <delete dir="${build.4jdk7.dir}"/>
1014
1015  </target>
1016
1017
1018  <target name="4jdk7dist-jar"
1019          depends="4jdk7clean, 4jdk7jar">
1020    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1021  </target>
1022
1023
1024  <target name="4jdk7dist-docs"
1025          depends="4jdk7clean, 4jdk7docs">
1026    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1027  </target>
1028
1029
1030  <!-- jsr166x -->
1031
1032  <target name="jsr166xcompile"
1033          depends="configure-compiler"
1034          description="Compiles jsr166x sources to build dir">
1035
1036    <mkdir dir="${build.jsr166x.classes.dir}"/>
1037
1038    <javac srcdir="${topsrc.dir}"
1039           destdir="${build.jsr166x.classes.dir}"
1040           debug="${build.debug}"
1041           debuglevel="${build.debuglevel}"
1042           deprecation="${build.deprecation}"
1043           classpath=""
1044           bootclasspath="${bootclasspath6}"
1045           source="5"
1046           target="5"
1047           includeAntRuntime="false"
1048           includeJavaRuntime="false"
1049           executable="${javac7}"
1050           fork="true">
1051
1052      <include name="jsr166x/**/*.java"/>
1053      <compilerarg value="-XDignore.symbol.file=true"/>
1054      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1055      <compilerarg value="-Werror"/>
1056      <compilerarg line="${build.args}"/>
1057
1058    </javac>
1059  </target>
1060
1061
1062  <target name="jsr166xjar"
1063          depends="jsr166xcompile"
1064          description="Builds library jar from compiled sources">
1065
1066    <jar destfile="${jsr166x.jar}">
1067      <fileset dir="${build.jsr166x.classes.dir}"/>
1068      <manifest>
1069        <attribute name="Built-By" value="${user.name}"/>
1070        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1071      </manifest>
1072    </jar>
1073
1074  </target>
1075
1076
1077  <target name="jsr166xdocs"
1078          description="Builds javadocs to dist dir">
1079
1080    <delete dir="${jsr166xdocs.dir}"/>
1081    <mkdir dir="${jsr166xdocs.dir}"/>
1082
1083    <javadoc destdir="${jsr166xdocs.dir}"
1084             packagenames="jsr166x.*"
1085             link="${java.api.url}"
1086             access="${build.javadoc.access}"
1087             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1088             bootclasspath="${bootclasspath6}"
1089             source="5"
1090             executable="${javadoc7}"
1091             failonerror = "true">
1092      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1093      <arg value="-XDignore.symbol.file=true"/>
1094
1095    </javadoc>
1096  </target>
1097
1098
1099  <target name="jsr166xdist"
1100          depends="jsr166xdist-jar, jsr166xdist-docs"
1101          description="Puts all distributable products in single hierarchy"/>
1102
1103
1104  <target name="jsr166xclean"
1105          description="Removes all jsr166x build products">
1106
1107    <delete dir="${build.jsr166x.dir}"/>
1108
1109  </target>
1110
1111
1112  <target name="jsr166xdist-jar"
1113          depends="jsr166xclean, jsr166xjar">
1114    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1115  </target>
1116
1117  <target name="jsr166xdist-docs"
1118          depends="jsr166xclean, jsr166xdocs">
1119    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1120  </target>
1121
1122  <!-- jsr166y -->
1123
1124
1125  <target name="jsr166ycompile"
1126          depends="configure-compiler"
1127          description="Compiles jsr166y sources">
1128
1129    <mkdir dir="${build.jsr166y.classes.dir}"/>
1130
1131    <javac srcdir="${topsrc.dir}"
1132           destdir="${build.jsr166y.classes.dir}"
1133           debug="${build.debug}"
1134           debuglevel="${build.debuglevel}"
1135           deprecation="${build.deprecation}"
1136           source="6"
1137           target="6"
1138           classpath=""
1139           bootclasspath="${bootclasspath6}"
1140           includeAntRuntime="false"
1141           includeJavaRuntime="false"
1142           executable="${javac7}"
1143           fork="true">
1144
1145      <include name="jsr166y/**/*.java"/>
1146      <compilerarg value="-XDignore.symbol.file=true"/>
1147      <compilerarg value="-Xlint:all"/>
1148      <compilerarg value="-Werror"/>
1149      <compilerarg line="${build.args}"/>
1150
1151    </javac>
1152  </target>
1153
1154
1155  <target name="jsr166yjar"
1156          depends="jsr166ycompile"
1157          description="Builds library jar from compiled sources">
1158
1159    <jar destfile="${jsr166y.jar}" index="true">
1160      <fileset dir="${build.jsr166y.classes.dir}"/>
1161      <manifest>
1162        <attribute name="Built-By" value="${user.name}"/>
1163        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1164      </manifest>
1165    </jar>
1166
1167  </target>
1168
1169
1170  <target name="jsr166ydocs"
1171          description="Builds javadocs to dist dir">
1172
1173    <delete dir="${jsr166ydocs.dir}"/>
1174    <mkdir dir="${jsr166ydocs.dir}"/>
1175
1176    <javadoc destdir="${jsr166ydocs.dir}"
1177             packagenames="jsr166y.*"
1178             link="${java.api.url}"
1179             access="${build.javadoc.access}"
1180             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1181             bootclasspath="${bootclasspath6}"
1182             source="6"
1183             executable="${javadoc7}"
1184             failonerror = "true">
1185      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1186      <arg value="-XDignore.symbol.file=true"/>
1187
1188    </javadoc>
1189  </target>
1190
1191
1192  <target name="jsr166ydist"
1193          depends="jsr166ydist-jar, jsr166ydist-docs"
1194          description="Puts all distributable products in single hierarchy"/>
1195
1196
1197  <target name="jsr166yclean"
1198          description="Removes all jsr166y build products">
1199
1200    <delete dir="${build.jsr166y.dir}"/>
1201
1202  </target>
1203
1204
1205  <target name="jsr166ydist-jar"
1206          depends="jsr166yclean, jsr166yjar">
1207    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1208  </target>
1209
1210  <target name="jsr166ydist-docs"
1211          depends="jsr166yclean, jsr166ydocs">
1212    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1213  </target>
1214
1215
1216  <!-- extra166y -->
1217
1218
1219  <target name="extra166ycompile"
1220          depends="configure-compiler, jsr166yjar"
1221          description="Compiles extra166y sources">
1222
1223    <mkdir dir="${build.extra166y.classes.dir}"/>
1224
1225    <javac srcdir="${topsrc.dir}"
1226           destdir="${build.extra166y.classes.dir}"
1227           debug="${build.debug}"
1228           debuglevel="${build.debuglevel}"
1229           deprecation="${build.deprecation}"
1230           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1231           classpath=""
1232           source="6"
1233           target="6"
1234           includeAntRuntime="false"
1235           includeJavaRuntime="false"
1236           executable="${javac7}"
1237           fork="true">
1238
1239      <include name="extra166y/**/*.java"/>
1240      <compilerarg value="-XDignore.symbol.file=true"/>
1241      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1242      <compilerarg value="-Werror"/>
1243      <compilerarg line="${build.args}"/>
1244
1245    </javac>
1246  </target>
1247
1248
1249  <target name="extra166yjar"
1250          depends="extra166ycompile"
1251          description="Builds library jar from compiled sources">
1252
1253    <jar destfile="${extra166y.jar}" index="true">
1254      <fileset dir="${build.extra166y.classes.dir}"/>
1255      <manifest>
1256        <attribute name="Built-By" value="${user.name}"/>
1257        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1258      </manifest>
1259    </jar>
1260
1261  </target>
1262
1263
1264  <target name="extra166ydocs"
1265          description="Builds javadocs to build dir">
1266
1267    <delete dir="${extra166ydocs.dir}"/>
1268    <mkdir dir="${extra166ydocs.dir}"/>
1269
1270    <javadoc destdir="${extra166ydocs.dir}"
1271             packagenames="extra166y.*"
1272             link="${java.api.url}"
1273             access="${build.javadoc.access}"
1274             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1275             bootclasspath="${bootclasspath6}"
1276             source="6"
1277             executable="${javadoc7}">
1278      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1279      <arg value="-XDignore.symbol.file=true"/>
1280
1281    </javadoc>
1282  </target>
1283
1284
1285  <target name="extra166ydist"
1286          depends="extra166ydist-jar, extra166ydist-docs"
1287          description="Puts all distributable products in single hierarchy"/>
1288
1289
1290  <target name="extra166yclean"
1291          description="Removes all extra166y build products">
1292
1293    <delete dir="${build.extra166y.dir}"/>
1294
1295  </target>
1296
1297
1298  <target name="extra166ydist-jar"
1299          depends="extra166yclean, extra166yjar">
1300    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1301  </target>
1302
1303  <target name="extra166ydist-docs"
1304          depends="extra166yclean, extra166ydocs">
1305    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1306  </target>
1307
1308  <!-- jsr166e -->
1309
1310  <property name="build.jsr166e.java.version" value="6"/>
1311  <property name="build.jsr166e.javac" value="${javac6}"/>
1312
1313  <target name="jsr166ecompile"
1314          depends="configure-compiler"
1315          description="Compiles jsr166e sources">
1316
1317    <mkdir dir="${build.jsr166e.classes.dir}"/>
1318
1319    <javac srcdir="${topsrc.dir}"
1320           destdir="${build.jsr166e.classes.dir}"
1321           debug="${build.debug}"
1322           debuglevel="${build.debuglevel}"
1323           deprecation="${build.deprecation}"
1324           source="${build.jsr166e.java.version}"
1325           target="${build.jsr166e.java.version}"
1326           classpath=""
1327           includeAntRuntime="false"
1328           includeJavaRuntime="false"
1329           executable="${build.jsr166e.javac}"
1330           fork="true">
1331
1332      <include name="jsr166e/**/*.java"/>
1333      <compilerarg value="-XDignore.symbol.file=true"/>
1334      <compilerarg value="-Xlint:all"/>
1335      <compilerarg value="-Werror"/>
1336      <compilerarg line="${build.args}"/>
1337
1338    </javac>
1339  </target>
1340
1341  <!-- jsr166e: find doclint errors -->
1342  <target name="jsr166edoclint">
1343
1344    <mkdir dir="${build.jsr166e.classes.dir}"/>
1345
1346    <javac srcdir="${topsrc.dir}"
1347           destdir="${build.jsr166e.classes.dir}"
1348           debug="${build.debug}"
1349           debuglevel="${build.debuglevel}"
1350           deprecation="${build.deprecation}"
1351           source="${build.jsr166e.java.version}"
1352           target="${build.jsr166e.java.version}"
1353           classpath=""
1354           bootclasspath="${bootclasspath6}"
1355           includeAntRuntime="false"
1356           includeJavaRuntime="false"
1357           executable="${javac8}"
1358           fork="true">
1359
1360      <include name="jsr166e/**/*.java"/>
1361      <compilerarg value="-XDignore.symbol.file=true"/>
1362      <compilerarg value="-Xlint:all"/>
1363      <compilerarg value="-Werror"/>
1364      <compilerarg value="-Xdoclint:all/protected"/>
1365
1366    </javac>
1367  </target>
1368
1369
1370  <target name="jsr166ejar"
1371          depends="jsr166ecompile"
1372          description="Builds library jar from compiled sources">
1373
1374    <jar destfile="${jsr166e.jar}" index="true">
1375      <fileset dir="${build.jsr166e.classes.dir}"/>
1376      <manifest>
1377        <attribute name="Built-By" value="${user.name}"/>
1378        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1379      </manifest>
1380    </jar>
1381
1382  </target>
1383
1384
1385  <target name="jsr166edocs"
1386          description="Builds javadocs to build dir">
1387
1388    <delete dir="${jsr166edocs.dir}"/>
1389    <mkdir dir="${jsr166edocs.dir}"/>
1390
1391    <javadoc destdir="${jsr166edocs.dir}"
1392             packagenames="jsr166e.*"
1393             link="${java.api.url}"
1394             access="${build.javadoc.access}"
1395             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1396             source="${build.jsr166e.java.version}"
1397             executable="${javadoc7}"
1398             failonerror = "true">
1399      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1400      <arg value="-XDignore.symbol.file=true"/>
1401
1402    </javadoc>
1403  </target>
1404
1405
1406  <target name="jsr166e-tck-one-java-version"
1407          depends="jsr166ejar">
1408
1409    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1410
1411    <run-tck-tests
1412      tck.src.dir="${test.src.dir}/tck-jsr166e"
1413      target="${build.jsr166e.java.version}"
1414      workdir="${build.jsr166e.dir}"
1415      classes="${jsr166e.jar}"/>
1416  </target>
1417
1418  <target name="jsr166e-tck"
1419          description="Runs tck tests for jsr166e for multiple java versions">
1420
1421 <!--     <antcall target="clean"/> -->
1422 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1423 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1424 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1425 <!--     </antcall> -->
1426
1427    <antcall target="clean"/>
1428    <antcall target="jsr166e-tck-one-java-version">
1429      <param name="build.jsr166e.java.version" value="7"/>
1430      <param name="build.jsr166e.javac" value="${javac7}"/>
1431    </antcall>
1432
1433    <antcall target="clean"/>
1434    <antcall target="jsr166e-tck-one-java-version">
1435      <param name="build.jsr166e.java.version" value="6"/>
1436      <param name="build.jsr166e.javac" value="${javac6}"/>
1437    </antcall>
1438  </target>
1439
1440
1441  <target name="jsr166e-test"
1442          depends="jsr166e-tck"
1443          description="Runs all tests for jsr166e">
1444  </target>
1445
1446  <target name="jsr166edist"
1447          depends="jsr166edist-jar, jsr166edist-docs"
1448          description="Puts all distributable products in single hierarchy"/>
1449
1450
1451  <target name="jsr166eclean"
1452          description="Removes all jsr166e build products">
1453    <delete dir="${build.jsr166e.dir}"/>
1454  </target>
1455
1456
1457  <target name="jsr166edist-jar"
1458          depends="jsr166eclean, jsr166ejar">
1459    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1460  </target>
1461
1462  <target name="jsr166edist-docs"
1463          depends="jsr166eclean, jsr166edocs">
1464    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1465  </target>
1466
1467
1468 <!-- Find buglets that can be detected by static build tools -->
1469
1470  <target name="lint">
1471    <antcall target="dists">
1472      <param name="build.javadoc.access" value="public"/>
1473    </antcall>
1474  </target>
1475
1476 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1477  <target name="lint-private">
1478    <antcall target="dist">
1479      <param name="build.javadoc.access" value="private"/>
1480    </antcall>
1481  </target>
1482
1483
749   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines