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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines