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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines