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.311 by jsr166, Mon Mar 2 19:36:41 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    where each of the above is a JDK or a symlink to same, and
28 <  $HOME/jdk/src/jdk6
29 <  $HOME/jdk/src/jdk7
30 <  $HOME/jdk/src/jdk8
31 <  $HOME/jdk/src/jdk9
32 <  where each of the above is a complete JDK source tree
33 <  (e.g. mercurial forest) or a symlink to same.
28 >  $HOME/jdk/src/jdk11
29 >  $HOME/jdk/src/jdk12
30 >  $HOME/jdk/src/jdk13
31 >  $HOME/jdk/src/jdk14
32 >  $HOME/jdk/src/jdk15
33 >  where each of the above is a JDK source tree or a symlink to same.
34  
35    Alternatively, define ant variables thus:
36    ant -Djdk$N.home=... -Djdk$N.src.home=...
37 <  for $N in 6 7 8 9 ...
37 >  for $N in 11 .. 15 ...
38  
39 <  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
40 <  target is currently broken.
39 >  As of 2016-03, the sources in src/main are for jdk9+ only.
40 >  As of 2019-08, the sources in src/main are for jdk11+ only.
41 >  As of 2019-10, compatibility support for jdk8 is dropped entirely.
42   ------------------------------------------------------------------------------
43    </description>
44  
# Line 52 | Line 56
56  
57  
58    <!-- Compilation options -->
55  <property name="build.sourcelevel"    value="6"/>
59    <property name="build.debug"          value="true"/>
60    <property name="build.debuglevel"     value="source,lines,vars"/>
61    <property name="build.deprecation"    value="false"/>
# Line 64 | Line 67
67    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
68    <property name="build.loops.dir"             location="${build.dir}/loops"/>
69  
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
70    <!-- JDK locations -->
71    <property name="jdks.home"  location="${user.home}/jdk"/>
72  
# Line 95 | Line 78
78      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
79      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
80      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
81 <    <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"/>
81 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
82      </sequential>
83    </macrodef>
84  
# Line 129 | Line 94
94      </sequential>
95    </macrodef>
96  
97 <  <defjdklocations v="6"/>
98 <  <defjdklocations v="7"/>
99 <  <defjdklocations v="8"/>
100 <  <defjdklocations v="9"/>
97 >  <defjdklocations v="11"/>
98 >  <defjdklocations v="12"/>
99 >  <defjdklocations v="13"/>
100 >  <defjdklocations v="14"/>
101 >  <defjdklocations v="15"/>
102  
103    <!-- Source locations -->
104    <property name="src.dir"              location="${basedir}/src/main"/>
105    <property name="test.src.dir"         location="${basedir}/src/test"/>
106    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
107    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
108 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
109 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
110 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
111 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
108 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
109 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
110 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
111 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
112 >  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
113 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
114    <property name="lib.dir"              location="${basedir}/lib"/>
115    <property name="dist.dir"             location="${basedir}/dist"/>
116    <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"/>
117  
118    <!-- Javadoc locations -->
119    <property name="docs.dir"          location="${build.dir}/docs"/>
120 <  <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"/>
120 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
121  
122    <!-- Jar locations -->
123    <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"/>
124    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
125  
126    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
127 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
128 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
129 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
130 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
131 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
132 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
133 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
134 <  <!-- Default jdk doc location (latest stable release seems best) -->
135 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
127 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
128 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
129 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
130 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
131 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
132 >  <!-- The location of jdk early access docs (RIP) -->
133 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
134 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
135 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
136 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
137 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
138 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
139 >  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
140 >  <property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/docs"/>
141 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
142 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
143  
144    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
145 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
146 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
147 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
148 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
149 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
145 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
146 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
147 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
148 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
149 >  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
150    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
151  
152    <!-- Define the "jtreg" task -->
# Line 204 | Line 154
154    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
155             classpath="${lib.dir}/jtreg.jar" />
156  
157 <  <!-- Tck options; see JSR166TestCase.java
157 >  <!-- Tck configuration options; see JSR166TestCase.java
158     To profile a single tck test class:
159     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
160     To stress test a single tck test class:
# Line 227 | Line 177
177  
178      <sequential>
179  
230    <local name="modules"/>
231    <condition property="modules">
232      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233    </condition>
234
180      <mkdir dir="@{workdir}/tck-classes"/>
181  
182      <javac srcdir="@{tck.src.dir}"
# Line 251 | Line 196
196        <include name="*.java"/>
197        <compilerarg value="-XDignore.symbol.file=true"/>
198        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
199 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
200 <      <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
199 >      <compilerarg value="-Xdoclint:reference/private"/>
200 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
201        <compilerarg line="${build.args}"/>
202        <javac-elements/>
203  
# Line 262 | Line 207
207            failonerror="true"
208            jvm="${java@{target}}"
209            fork="true">
210 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
211 <        <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
212 <        <jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
213 <        <jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
214 <        <jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
215 <        <jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
216 <        <jvmarg line="@{jvmflags}"/>
217 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
218 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
219 <
220 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
221 <        <syspropertyset id="system-properties-used-by-tck">
222 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
223 <          <propertyref prefix="jsr166."/>
224 <          <propertyref name="test.timeout.factor"/>
225 <        </syspropertyset>
226 <
227 <        <classpath>
228 <          <pathelement location="${junit.jar}"/>
229 <          <pathelement location="@{workdir}/tck-classes"/>
230 <        </classpath>
210 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
211 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
212 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
213 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
214 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
215 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
216 >        <jvmarg line="@{jvmflags}"/>
217 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
218 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
219 >
220 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
221 >        <syspropertyset id="system-properties-used-by-tck">
222 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
223 >          <propertyref prefix="jsr166."/>
224 >          <propertyref name="test.timeout.factor"/>
225 >        </syspropertyset>
226 >
227 >        <classpath>
228 >          <pathelement location="${junit.jar}"/>
229 >          <pathelement location="@{workdir}/tck-classes"/>
230 >        </classpath>
231      </java>
232  
233      </sequential>
234    </macrodef>
235  
236    <!-- Define jtreg test sets for different jdk versions -->
237 <  <fileset dir="${jtreg9.src.dir}">
238 <    <patternset id="jdk9.jtreg.tests">
239 <      <include name="**/*.java"/>
240 <    </patternset>
241 <  </fileset>
242 <
243 <  <fileset dir="${jtreg8.src.dir}">
244 <    <patternset id="jdk8.jtreg.tests">
245 <      <include name="**/*.java"/>
246 <    </patternset>
247 <  </fileset>
237 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
238 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
239 >  <property name="jtreg.test.pattern" value="**/*.java"/>
240 >  <macrodef name="defjtregtests">
241 >    <attribute name="v"/>
242 >    <sequential>
243 >      <fileset dir="${jtreg@{v}.src.dir}">
244 >        <patternset id="jdk@{v}.jtreg.tests">
245 >          <include name="${jtreg.test.pattern}"/>
246 >        </patternset>
247 >      </fileset>
248 >    </sequential>
249 >  </macrodef>
250  
251 <  <fileset dir="${jtreg7.src.dir}">
252 <    <patternset id="jdk7.jtreg.tests">
253 <      <include name="**/*.java"/>
254 <    </patternset>
255 <  </fileset>
251 >  <defjtregtests v="15"/>
252 >  <defjtregtests v="14"/>
253 >  <defjtregtests v="13"/>
254 >  <defjtregtests v="12"/>
255 >  <defjtregtests v="11"/>
256  
257    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
258    <property name="jtreg.flags" value=""/>
259  
260    <macrodef name="run-jtreg-tests">
261 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
315 <    <attribute name="source" default="7"/>
261 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
262      <attribute name="target"/>
263      <attribute name="workdir"/>
264      <attribute name="classes"/>
265 +    <attribute name="verbose" default="${jtreg.verbose}"/>
266      <attribute name="jtregflags" default=""/>
267 +    <element name="jtreg-elements" optional="true"/>
268  
269      <sequential>
270  
271      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
272      <property name="jtreg.verbose" value="nopass,fail,error"/>
273  
326    <local name="modules"/>
327    <condition property="modules">
328      <available file="${jdk@{target}.home}/jmods" type="dir"/>
329    </condition>
330
274      <delete dir="@{workdir}/JTwork"   quiet="true"/>
275      <jtreg dir="${jtreg@{target}.src.dir}"
276             jdk="${jdk@{target}.home}"
277             workDir="@{workdir}/JTwork">
278        <patternset refid="jdk@{target}.jtreg.tests"/>
279 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
280 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
281 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
279 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
280 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
281 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
282        <arg value="-agentvm"/>
283        <arg value="-noreport"/>
284 <      <arg value="-verbose:${jtreg.verbose}"/>
284 >      <arg value="-verbose:@{verbose}"/>
285        <arg value="-vmoptions:-esa -ea"/>
286        <arg value="-automatic"/>
287        <arg value="-k:!ignore"/>
288        <arg line="@{jtregflags}"/>
289        <arg line="${jtreg.flags}"/>
290 +      <jtreg-elements/>
291      </jtreg>
292      </sequential>
293    </macrodef>
# Line 354 | Line 298
298    </path>
299  
300    <!-- Support @jls tag, used in jdk8+ javadoc -->
301 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
302    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
303    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
304  
305    <!-- Main targets -->
306  
307 <  <property name="build.main.java.version" value="9"/>
308 <  <property name="build.main.javac" value="${javac9}"/>
307 >  <!-- Default values: may seem strange ... -->
308 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
309 >  <!-- But at build time, target jdk9, for maximal binary portability -->
310 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
311 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
312 >    o override-methods=summary
313 >    o {@systemProperty ...}
314 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
315 >    o 8202628: javadoc generates bad links in TestModules.java
316 >    -->
317 >  <property name="java.runtime.target" value="11"/>
318 >  <property name="build.main.java" value="${java11}"/>
319 >  <property name="build.main.javac" value="${javac11}"/>
320 >  <property name="build.main.javadoc" value="${javadoc12}"/>
321 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
322  
323    <target name="dists"
324 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
324 >          depends="dist"
325            description="Builds all public jars and docs"/>
326  
327    <target name="compile"
328            depends="configure-compiler"
329            description="Compiles src/main sources to build dir">
330  
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
331      <local name="destdir"/>
332 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
383 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
332 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
333  
334      <mkdir dir="${destdir}"/>
335  
# Line 397 | Line 346
346             fork="true">
347  
348        <include name="**/*.java"/>
349 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
349 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
350        <compilerarg value="-Xprefer:source"/>
351        <compilerarg value="-XDignore.symbol.file=true"/>
352 <      <compilerarg value="-Xlint:all"/>
352 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
353 >      <compilerarg value="-Xlint:all,-removal"/>
354 >      <compilerarg line="--doclint-format html5"/>
355 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
356 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
357        <compilerarg value="-Werror"/>
405      <compilerarg value="-Xdoclint:all/protected"/>
358        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
359        <compilerarg line="${build.args}"/>
360  
# Line 428 | Line 380
380    <target name="docs"
381            description="Builds javadocs for src/main to dist dir">
382  
383 <    <delete dir="${docs.dir}"/>
383 >    <delete dir="${docs.dir}" quiet="true"/>
384      <mkdir dir="${docs.dir}"/>
385  
386 +    <!-- old school frames via docs/index.html?overview-summary.html -->
387 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
388 +    <local name="use-frames"/>
389 +    <condition property="use-frames">
390 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
391 +    </condition>
392 +
393      <!-- the packagenames="none" hack below prevents scanning the -->
394      <!-- sourcepath for packages -->
395  
# Line 441 | Line 400
400   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
401      <javadoc destdir="${docs.dir}"
402               packagenames="none"
403 <             link="${java9.api.url}"
403 >             link="${java.api.url}"
404               overview="${src.dir}/intro.html"
405               access="${build.javadoc.access}"
406               sourcepath="${src.dir}"
407               classpath=""
408 <             executable="${javadoc9}">
408 >             source="${build.main.javadoc.source}"
409 >             executable="${build.main.javadoc}">
410 > <!-- TODO: JDK-8214571 failonerror = "true" -->
411        <fileset dir="${src.dir}" defaultexcludes="yes">
412          <include name="**/*.java"/>
413        </fileset>
414 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
414 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
415        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
416 +      <arg value="-quiet"/>
417        <arg value="-XDignore.symbol.file=true"/>
418 <      <arg value="-Xmodule:java.base"/>
419 <      <arg value="-tag"/>
420 <      <arg value="${javadoc.jls.option}"/>
421 < <!-- @apiNote currently unused -->
422 < <!--       <arg value="-tag"/> -->
423 < <!--       <arg value="apiNote:a:API Note:"/> -->
424 <      <arg value="-tag"/>
425 <      <arg value="implSpec:a:Implementation Requirements:"/>
464 <      <arg value="-tag"/>
465 <      <arg value="implNote:a:Implementation Note:"/>
418 >      <arg value="-html5"/>
419 >      <arg value="--patch-module=java.base=${src.dir}"/>
420 >      <arg value="--frames" if:set="use-frames"/>
421 >      <arg value="--override-methods=summary"/>
422 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
423 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
424 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
425 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
426   <!-- tags added in jdk9: currently unused -->
427 < <!--       <arg value="-tag"/> -->
428 < <!--       <arg value="revised:X"/> -->
469 < <!--       <arg value="-tag"/> -->
470 < <!--       <arg value="spec:X"/> -->
427 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
428 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
429      </javadoc>
430    </target>
431  
# Line 477 | Line 435
435            description="Puts all distributable products in single hierarchy"/>
436  
437  
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
438    <target name="clean"
439            description="Removes all build products">
504
440      <delete dir="${build.dir}"/>
506
441    </target>
442  
443  
444    <target name="dist-clean"
445            description="Removes all build and distribution products">
512
446      <delete dir="${build.dir}"/>
447      <delete dir="${dist.dir}"/>
515
448    </target>
449  
450  
# Line 527 | Line 459
459    </target>
460  
461    <target name="tck"
462 <          depends="jar"
462 >          depends="jar"
463            description="Runs tck tests for src/main directly">
464  
465      <run-tck-tests
466 <      target="${build.main.java.version}"
466 >      target="${java.runtime.target}"
467        workdir="${build.dir}"
468 <      classes="${product.jar}"/>
468 >      classes="${product.jar}">
469 >      <javac-elements>
470 >        <compilerarg value="-Werror"/>
471 >      </javac-elements>
472 >    </run-tck-tests>
473    </target>
474  
475    <target name="tck-parallelism-1"
# Line 558 | Line 494
494    </target>
495  
496    <target name="jtreg"
497 <          depends="jar"
497 >          depends="jar"
498            description="Runs jtreg tests for src/main using the jtreg ant task">
499      <run-jtreg-tests
500 <       target="${build.main.java.version}"
500 >       target="${java.runtime.target}"
501         workdir="${build.dir}"
502         classes="${product.jar}"/>
503    </target>
504  
505    <target name="test"
506            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
507 <          description="Runs tck and jtreg tests for src/main">
507 >          description="Runs tck and jtreg tests for src/main"/>
508 >
509 >  <target name="test-version-permutations"
510 >          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
511 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
512 >
513 >  <target name="test11">
514 >    <antcall>
515 >      <param name="java.runtime.target" value="11"/>
516 >      <param name="build.main.javac" value="${javac11}"/>
517 >      <param name="build.main.javadoc" value="${javadoc12}"/>
518 >      <param name="build.main.javadoc.source" value="11"/>
519 >      <target name="clean"/>
520 >      <target name="test"/>
521 >      <target name="docs"/>
522 >    </antcall>
523    </target>
524  
525 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
525 >  <target name="test12">
526 >    <antcall>
527 >      <param name="java.runtime.target" value="12"/>
528 >      <param name="build.main.javac" value="${javac12}"/>
529 >      <param name="build.main.javadoc" value="${javadoc12}"/>
530 >      <param name="build.main.javadoc.source" value="12"/>
531 >      <target name="clean"/>
532 >      <target name="test"/>
533 >      <target name="docs"/>
534 >    </antcall>
535 >  </target>
536  
537 < <!--     <antcall target="jtreg"> -->
538 < <!--       <param name="build.main.java.version" value="8"/> -->
539 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
540 < <!--     </antcall> -->
537 >  <target name="test13">
538 >    <antcall>
539 >      <param name="java.runtime.target" value="13"/>
540 >      <param name="build.main.javac" value="${javac13}"/>
541 >      <param name="build.main.javadoc" value="${javadoc13}"/>
542 >      <param name="build.main.javadoc.source" value="13"/>
543 >      <target name="clean"/>
544 >      <target name="test"/>
545 >      <target name="docs"/>
546 >    </antcall>
547 >  </target>
548  
549 < <!--   </target> -->
549 >  <target name="test14">
550 >    <antcall>
551 >      <param name="java.runtime.target" value="14"/>
552 >      <param name="build.main.javac" value="${javac14}"/>
553 >      <param name="build.main.javadoc" value="${javadoc14}"/>
554 >      <param name="build.main.javadoc.source" value="14"/>
555 >      <target name="clean"/>
556 >      <target name="test"/>
557 >      <target name="docs"/>
558 >    </antcall>
559 >  </target>
560  
561 < <!--   <target name="test89" -->
562 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
561 >  <target name="test15">
562 >    <antcall>
563 >      <param name="java.runtime.target" value="15"/>
564 >      <param name="build.main.javac" value="${javac15}"/>
565 >      <param name="build.main.javadoc" value="${javadoc15}"/>
566 >      <param name="build.main.javadoc.source" value="15"/>
567 >      <target name="clean"/>
568 >      <target name="test"/>
569 >      <target name="docs"/>
570 >    </antcall>
571 >  </target>
572  
573 < <!--     <antcall target="clean"/> -->
574 < <!--     <antcall target="test"> -->
575 < <!--       <param name="build.main.java.version" value="8"/> -->
576 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
577 < <!--     </antcall> -->
573 >  <target name="test11-12">
574 >    <antcall>
575 >      <param name="java.runtime.target" value="12"/>
576 >      <param name="build.main.javac" value="${javac11}"/>
577 >      <param name="build.main.javadoc" value="${javadoc12}"/>
578 >      <param name="build.main.javadoc.source" value="11"/>
579 >      <target name="clean"/>
580 >      <target name="test"/>
581 >      <target name="docs"/>
582 >    </antcall>
583 >  </target>
584  
585 < <!--     <antcall target="clean"/> -->
586 < <!--     <antcall target="test"> -->
587 < <!--       <param name="build.main.java.version" value="9"/> -->
588 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
589 < <!--     </antcall> -->
585 >  <target name="test11-13">
586 >    <antcall>
587 >      <param name="java.runtime.target" value="13"/>
588 >      <param name="build.main.javac" value="${javac11}"/>
589 >      <param name="build.main.javadoc" value="${javadoc13}"/>
590 >      <param name="build.main.javadoc.source" value="11"/>
591 >      <target name="clean"/>
592 >      <target name="test"/>
593 >      <target name="docs"/>
594 >    </antcall>
595 >  </target>
596  
597 < <!--   </target> -->
597 >  <target name="test11-14">
598 >    <antcall>
599 >      <param name="java.runtime.target" value="14"/>
600 >      <param name="build.main.javac" value="${javac11}"/>
601 >      <param name="build.main.javadoc" value="${javadoc14}"/>
602 >      <param name="build.main.javadoc.source" value="11"/>
603 >      <target name="clean"/>
604 >      <target name="test"/>
605 >      <target name="docs"/>
606 >    </antcall>
607 >  </target>
608  
609 +  <target name="test11-15">
610 +    <antcall>
611 +      <param name="java.runtime.target" value="15"/>
612 +      <param name="build.main.javac" value="${javac11}"/>
613 +      <param name="build.main.javadoc" value="${javadoc15}"/>
614 +      <param name="build.main.javadoc.source" value="11"/>
615 +      <target name="clean"/>
616 +      <target name="test"/>
617 +      <target name="docs"/>
618 +    </antcall>
619 +  </target>
620  
621  
622    <target name="configure-compiler">
623      <fail message="ant version too old">
624 <      <condition>
605 <        <not> <antversion atleast="1.9.1"/> </not>
606 <      </condition>
624 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
625      </fail>
626  
627      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 621 | Line 639
639    </target>
640  
641  
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
642    <target name="compile-test-loops" depends="jar"
643 <          description="compile all the perf tests in src/test/loops">
643 >          description="Compiles all the perf tests in src/test/loops">
644  
645      <mkdir dir="${build.dir}/test/loops"/>
646  
# Line 666 | Line 652
652             includeAntRuntime="false"
653             includeJavaRuntime="false"
654             encoding="ASCII"
655 <           executable="${javac9}"
655 >           executable="${build.main.javac}"
656             fork="true">
657  
658        <include name="*.java"/>
659        <compilerarg value="-XDignore.symbol.file=true"/>
660 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
661 <      <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"/>
660 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
661 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
662        <compilerarg line="${build.args}"/>
712
663      </javac>
664    </target>
665  
716  <target name="4jdk8doclint"
717          depends="configure-compiler"
718          description="Finds doclint warnings">
719
720    <mkdir dir="${build.4jdk8.classes.dir}"/>
666  
667 <    <javac srcdir="${4jdk8src.dir}"
668 <           destdir="${build.4jdk8.classes.dir}"
669 <           debug="${build.debug}"
670 <           debuglevel="${build.debuglevel}"
671 <           deprecation="${build.deprecation}"
672 <           source="8"
673 <           target="8"
729 <           classpath=""
730 <           bootclasspath="${bootclasspath8}"
731 <           includeAntRuntime="false"
732 <           includeJavaRuntime="false"
733 <           encoding="ASCII"
734 <           executable="${javac8}"
735 <           fork="true">
667 >  <!-- old branches no longer maintained.  build support deleted -->
668 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
669 >  <!-- jsr166 4jdk7 (no longer maintained) -->
670 >  <!-- jsr166x (no longer maintained) -->
671 >  <!-- jsr166y (no longer maintained) -->
672 >  <!-- extra166y (no longer maintained) -->
673 >  <!-- jsr166e (no longer maintained) -->
674  
675 <      <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>
675 > <!-- Find buglets that can be detected by static build tools -->
676  
677 + <!--   <target name="lint"> -->
678 + <!--     <antcall target="dists"> -->
679 + <!--       <param name="build.javadoc.access" value="protected"/> -->
680 + <!--     </antcall> -->
681 + <!--   </target> -->
682  
683 <  <target name="4jdk8dist-docs"
684 <          depends="4jdk8clean, 4jdk8docs">
685 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
683 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
684 >  <target name="doclint-private">
685 >    <antcall target="dist">
686 >      <param name="build.javadoc.access" value="private"/>
687 >    </antcall>
688    </target>
689  
690  
691 + <!-- ==============================================================
692 +  Experimental errorprone support
693 +  https://errorprone.info
694 +  https://errorprone.info/docs/installation
695 +  https://github.com/google/error-prone/issues/1143
696 + =================================================================== -->
697 +  <path id="errorprone.processorpath.path">
698 +    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
699 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
700 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
701 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
702 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
703 +  </path>
704 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
705 +  <property name="errorprone.jsr166.user.flags" value=""/>
706 +  <property name="errorprone.jsr166.flags"
707 +            value="-Xep:HashtableContains:OFF
708 +                   -Xep:JdkObsolete:OFF
709 +                   -Xep:MissingOverride:OFF
710 +                   -Xep:MissingFail:OFF
711 +                   -Xep:ThreadPriorityCheck:OFF
712 +                   -Xep:MixedArrayDimensions:ERROR
713 +                   -Xep:RemoveUnusedImports:ERROR
714 +                   -Xep:EmptyIf:ERROR
715 +                   -Xep:MultipleTopLevelClasses:ERROR
716 +                   -Xep:ClassName:ERROR
717 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
718 +                   -Xep:RedundantThrows:ERROR
719 +                   -Xep:IdentityBinaryExpression:WARN
720 +                   -Xep:ConstructorInvokesOverridable:WARN
721 +                   -Xep:MethodCanBeStatic:WARN
722 +                   ${errorprone.jsr166.user.flags}"/>
723 +  <!-- -Xep:WildcardImport:ERROR -->
724 +  <property name="errorprone.jsr166.test.flags"
725 +            value="-Xep:StringSplitter:OFF
726 +                   -Xep:BoxedPrimitiveConstructor:OFF
727 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
728 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
729 +  <target name="errorprone"
730 +          depends="clean, configure-compiler"
731 +          description="Run errorprone over jsr166 source code (experimental)">
732  
733 <  <!-- jsr166 4jdk7 -->
734 <
735 <  <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}"/>
733 >    <local name="destdir"/>
734 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
735 >    <mkdir dir="${destdir}"/>
736  
737 <    <javac srcdir="${4jdk7src.dir}"
738 <           destdir="${build.4jdk7.classes.dir}"
737 >    <javac srcdir="${src.dir}"
738 >           destdir="${destdir}"
739             debug="${build.debug}"
740             debuglevel="${build.debuglevel}"
741             deprecation="${build.deprecation}"
899           source="6"
900           target="6"
742             classpath=""
902           bootclasspath="${bootclasspath6}"
743             includeAntRuntime="false"
744             includeJavaRuntime="false"
745             encoding="ASCII"
746 <           executable="${javac8}"
746 >           executable="${build.main.javac}"
747             fork="true">
748  
749        <include name="**/*.java"/>
750 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
751 +      <compilerarg value="-J--illegal-access=permit"/>
752 +      <compilerarg value="-XDcompilePolicy=simple"/>
753 +      <compilerarg value="-processorpath"/>
754 +      <compilerarg pathref="errorprone.processorpath.path"/>
755 +      <compilerarg value="-Xplugin:ErrorProne
756 +                          ${errorprone.jsr166.flags}"/>
757 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
758        <compilerarg value="-Xprefer:source"/>
759        <compilerarg value="-XDignore.symbol.file=true"/>
760        <compilerarg value="-Xlint:all"/>
761 <      <compilerarg value="-Xdoclint:all/protected"/>
761 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
762 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
763        <compilerarg line="${build.args}"/>
915
764      </javac>
917  </target>
918
765  
766 <  <target name="4jdk7jar"
767 <          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>
766 >    <jar destfile="${product.jar}">
767 >      <fileset dir="${destdir}"/>
768      </jar>
769  
932  </target>
933
934
935  <target name="4jdk7-tck"
936          depends="4jdk7jar"
937          description="Runs tck tests for jsr166-4jdk7 directly">
938
770      <run-tck-tests
771 <      target="7"
772 <      workdir="${build.4jdk7.dir}"
773 <      classes="${4jdk7product.jar}">
771 >      target="${java.runtime.target}"
772 >      workdir="${build.dir}"
773 >      classes="${product.jar}">
774        <javac-elements>
775 <        <!-- JDK8+ test classes -->
776 <        <exclude name="*8Test.java"/>
777 <        <exclude name="*9Test.java"/>
778 <        <exclude name="*10Test.java"/>
779 <        <exclude name="DoubleAccumulatorTest.java"/>
780 <        <exclude name="DoubleAdderTest.java"/>
781 <        <exclude name="LongAccumulatorTest.java"/>
782 <        <exclude name="LongAdderTest.java"/>
952 <        <exclude name="CompletableFutureTest.java"/>
953 <        <exclude name="SplittableRandomTest.java"/>
954 <        <exclude name="StampedLockTest.java"/>
955 <        <exclude name="SubmissionPublisherTest.java"/>
775 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
776 >        <compilerarg value="-J--illegal-access=permit"/>
777 >        <compilerarg value="-XDcompilePolicy=simple"/>
778 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
779 >        <compilerarg value="-Xplugin:ErrorProne
780 >                            ${errorprone.jsr166.flags}
781 >                            ${errorprone.jsr166.test.flags}"/>
782 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
783        </javac-elements>
784      </run-tck-tests>
785    </target>
786  
787 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
788 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
789 +  <target name="errorprone-jtreg"
790 +          depends="jar"
791 +          description="Run errorprone over jtreg tests (experimental)">
792  
793 <  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
794 <  <target name="4jdk7-tck-junit"
795 <          depends="4jdk7compile">
796 <
797 <    <junit printsummary="true"
798 <           showoutput="true"
799 <           errorProperty="junit.failed"
800 <           failureProperty="junit.failed"
801 <           includeantruntime="true"
802 <           jvm="${java7}"
803 <           fork="true">
804 <
805 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
806 <      <jvmarg value="-server"/>
807 <
793 >    <run-jtreg-tests
794 >       target="${java.runtime.target}"
795 >       workdir="${build.dir}"
796 >       classes="${product.jar}"
797 >       verbose="all">
798 >      <jtreg-elements>
799 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
800 >        <arg value="-javacoption:-processorpath"/>
801 >        <arg value="-javacoption:${errorprone.processorpath}"/>
802 >        <arg value="-javacoption:-Xplugin:ErrorProne
803 >                            ${errorprone.jsr166.flags}
804 >                            ${errorprone.jsr166.test.flags}
805 >                            -Xep:MultipleTopLevelClasses:WARN
806 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
807 >      </jtreg-elements>
808 >    </run-jtreg-tests>
809 >  </target>
810 >
811 >
812 > <!-- ==============================================================
813 >  Running guava tests against jsr166 code
814 > =================================================================== -->
815 >
816 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
817 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
818 > <!-- <property name="guava.version" value="21.0"/> -->
819 >
820 > <!-- HOWTO debug print a path id -->
821 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
822 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
823 >
824 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
825 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
826 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
827 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
828 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
829 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
830 >
831 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
832 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
833 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
834 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
835 >
836 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
837 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
838 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
839 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
840 >
841 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
842 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
843 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
844 >
845 >  <target name="init-ivy">
846 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
847 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
848 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
849 >             classpath="${build.dir}/ivy.jar"/>
850 >  </target>
851 >
852 >  <target name="guava-tests" depends="jar, init-ivy"
853 >          description="Guava tests run against jsr166 collections">
854 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
855 >    <mkdir dir="${guava.dir}"/>
856 >    <ivy:retrieve pathid="guava.testlib.classpath"
857 >      type="jar,bundle" inline="true" conf="default,master"
858 >      pattern="${guava.dir}/[artifact].[ext]"
859 >      organisation="com.google.guava" module="guava-testlib"/>
860 >    <property name="guava.version" value="21.0"/>
861 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
862 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
863 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
864 >           jvm="${build.main.java}" fork="true">
865 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
866 >      <formatter type="brief"/>
867        <classpath>
868 <        <pathelement location="${junit.jar}"/>
869 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
868 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
869 >        <path refid="guava.testlib.classpath"/>
870        </classpath>
871  
872 <      <formatter type="brief"/>
873 <
983 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
984 <      </test>
985 <
872 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
873 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
874      </junit>
875    </target>
876  
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
877   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines