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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines