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.210 by jsr166, Mon Apr 18 15:30:49 2016 UTC vs.
Revision 1.310 by jsr166, Tue Dec 17 02:09:40 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 >  $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 63 | Line 66
66    <property name="build.classes.dir"           location="${build.dir}/classes"/>
67    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
68    <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"/>
69  
70    <!-- JDK locations -->
71    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 96 | 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"/>
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"/>
81 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
82      </sequential>
83    </macrodef>
84  
# Line 130 | 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"/>
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"/>
117  
118    <!-- Javadoc locations -->
119    <property name="docs.dir"          location="${build.dir}/docs"/>
120 <  <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"/>
120 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
121  
122    <!-- Jar locations -->
123    <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"/>
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://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 205 | 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 228 | Line 177
177  
178      <sequential>
179  
231    <local name="modules"/>
232    <condition property="modules">
233      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
234    </condition>
235
180      <mkdir dir="@{workdir}/tck-classes"/>
181  
182      <javac srcdir="@{tck.src.dir}"
# Line 245 | Line 189
189             classpath="${junit.jar}"
190             includeAntRuntime="false"
191             includeJavaRuntime="false"
192 +           encoding="ASCII"
193             executable="${javac@{compile-target}}"
194             fork="true">
195  
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 value="-Xpatch:${build.classes.dir}" 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 value="-Xpatch:${build.classes.dir}" if:set="modules"/>
212 <        <jvmarg line="@{jvmflags}"/>
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>
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 <      <exclude name="**/SpliteratorCharacteristics.java"/>
247 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
248 <      <exclude name="**/GCDuringIteration.java"/>
249 <    </patternset>
299 <  </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 -->
312 <    <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  
323    <local name="modules"/>
324    <condition property="modules">
325      <available file="${jdk@{target}.home}/jmods" type="dir"/>
326    </condition>
327
274      <delete dir="@{workdir}/JTwork"   quiet="true"/>
329    <delete dir="@{workdir}/JTreport" quiet="true"/>
275      <jtreg dir="${jtreg@{target}.src.dir}"
276             jdk="${jdk@{target}.home}"
277 <           workDir="@{workdir}/JTwork"
333 <           reportDir="@{workdir}/JTreport">
277 >           workDir="@{workdir}/JTwork">
278        <patternset refid="jdk@{target}.jtreg.tests"/>
279 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
280 <      <arg value="-Xpatch:${build.classes.dir}" 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="-verbose:${jtreg.verbose}"/>
283 >      <arg value="-noreport"/>
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 351 | 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  
370    <local name="modules"/>
371    <condition property="modules">
372      <and>
373        <available file="${jdk9.home}/jmods" type="dir"/>
374        <equals arg1="9" arg2="${build.main.java.version}"/>
375      </and>
376    </condition>
377
331      <local name="destdir"/>
332 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
380 <    <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 389 | Line 341
341             classpath=""
342             includeAntRuntime="false"
343             includeJavaRuntime="false"
344 +           encoding="ASCII"
345             executable="${build.main.javac}"
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"/>
401      <compilerarg value="-Xdoclint:all/protected"/>
358        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
359        <compilerarg line="${build.args}"/>
360  
# Line 409 | Line 365
365    <target name="jar"
366            depends="compile"
367            description="Builds library jar for src/main from compiled sources">
368 <
368 >    <local name="subdir"/>
369 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
370      <jar destfile="${product.jar}">
371 <      <fileset dir="${build.classes.dir}"/>
371 >      <fileset dir="${build.classes.dir}${subdir}"/>
372        <manifest>
373          <attribute name="Built-By" value="${user.name}"/>
374          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 423 | 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  
396 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
397 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
398 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
399 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
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}:${jdk9.src.dir}"
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 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
419 <      <arg value="-tag"/>
420 <      <arg value="${javadoc.jls.option}"/>
421 <      <arg value="-tag"/>
422 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
423 <      <arg value="-tag"/>
424 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
425 <      <arg value="-tag"/>
426 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
427 < <!-- tags added in jdk9 -->
428 <      <arg value="-tag"/>
457 <      <arg value="revised:X"/>
458 <      <arg value="-tag"/>
459 <      <arg value="spec:X"/>
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"/> <arg value="revised:X"/> -->
428 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
429      </javadoc>
430    </target>
431  
# Line 466 | Line 435
435            description="Puts all distributable products in single hierarchy"/>
436  
437  
469  <target name="release"
470          depends="dist"
471          description="Puts entire CVS tree, plus distribution productions, in a jar">
472
473    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
474
475    <jar basedir="${basedir}" destfile="${release.jar}">
476      <!-- <exclude name="build/**"/> -->
477      <exclude name="${release.jar}"/>
478      <exclude name="user.properties"/>
479      <exclude name="etc/notes/**"/>
480      <exclude name="src/emulation/**"/>
481      <exclude name="**/SyntaxTest.java"/>
482      <exclude name="**/SuperfluousAbstract.java"/>
483      <manifest>
484        <attribute name="Built-By" value="${user.name}"/>
485        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
486      </manifest>
487    </jar>
488  </target>
489
490
438    <target name="clean"
439            description="Removes all build products">
493
440      <delete dir="${build.dir}"/>
495
441    </target>
442  
443  
444    <target name="dist-clean"
445            description="Removes all build and distribution products">
501
446      <delete dir="${build.dir}"/>
447      <delete dir="${dist.dir}"/>
504
448    </target>
449  
450  
# Line 516 | 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 539 | Line 486
486      </antcall>
487    </target>
488  
489 +  <target name="tck-security-manager"
490 +          description="Runs tck with a security manager">
491 +    <antcall target="tck">
492 +      <param name="jsr166.useSecurityManager" value="true"/>
493 +    </antcall>
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    </target>
512  
513 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
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 < <!--     <antcall target="jtreg"> -->
526 < <!--       <param name="build.main.java.version" value="8"/> -->
527 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
528 < <!--     </antcall> -->
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 < <!--   </target> -->
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 name="test89" -->
550 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
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 < <!--     <antcall target="clean"/> -->
562 < <!--     <antcall target="test"> -->
563 < <!--       <param name="build.main.java.version" value="8"/> -->
564 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
565 < <!--     </antcall> -->
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="9"/> -->
576 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
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 < <!--   </target> -->
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 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>
587 <        <not> <antversion atleast="1.9.1"/> </not>
588 <      </condition>
624 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
625      </fail>
626  
627      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 603 | Line 639
639    </target>
640  
641  
606
607  <!-- Various demos and test programs -->
608
609
610  <!-- description="Benchmark from Doug Lea's AQS paper" -->
611  <target name="loops" depends="configure-compiler">
612
613    <mkdir dir="${build.loops.dir}"/>
614
615    <javac srcdir="${loops.src.dir}"
616          destdir="${build.loops.dir}"
617            debug="${build.debug}"
618       debuglevel="${build.debuglevel}"
619      deprecation="${build.deprecation}"
620           source="${build.sourcelevel}"
621           target="${build.sourcelevel}"
622             fork="true">
623
624      <compilerarg line="${build.args}"/>
625      <classpath refid="loops.classpath"/>
626      <compilerarg value="-XDignore.symbol.file=true"/>
627
628    </javac>
629
630    <java classname="ALoops" fork="true">
631      <classpath refid="loops.classpath"/>
632    </java>
633
634  </target>
635
636
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 646 | Line 651
651             deprecation="${build.deprecation}"
652             includeAntRuntime="false"
653             includeJavaRuntime="false"
654 <           executable="${javac9}"
654 >           encoding="ASCII"
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}"/>
656 <      <compilerarg line="${build.args}"/>
657 <
658 <    </javac>
659 <
660 <  </target>
661 <
662 <
663 <  <!-- jsr166 4jdk8 -->
664 <
665 <  <target name="4jdk8compile"
666 <          depends="configure-compiler"
667 <          description="Compiles src/jdk8 sources, targeting jdk8">
668 <
669 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
670 <
671 <    <javac srcdir="${4jdk8src.dir}"
672 <           destdir="${build.4jdk8.classes.dir}"
673 <           debug="${build.debug}"
674 <           debuglevel="${build.debuglevel}"
675 <           deprecation="${build.deprecation}"
676 <           source="8"
677 <           target="8"
678 <           classpath=""
679 <           bootclasspath="${bootclasspath8}"
680 <           includeAntRuntime="false"
681 <           includeJavaRuntime="false"
682 <           executable="${javac8}"
683 <           fork="true">
684 <
685 <      <include name="**/*.java"/>
686 <      <compilerarg value="-Xprefer:source"/>
687 <      <compilerarg value="-XDignore.symbol.file=true"/>
688 <      <compilerarg value="-Xlint:all"/>
689 <      <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}"/>
691
692    </javac>
693  </target>
694
695  <target name="4jdk8doclint"
696          depends="configure-compiler"
697          description="Finds doclint warnings">
698
699    <mkdir dir="${build.4jdk8.classes.dir}"/>
700
701    <javac srcdir="${4jdk8src.dir}"
702           destdir="${build.4jdk8.classes.dir}"
703           debug="${build.debug}"
704           debuglevel="${build.debuglevel}"
705           deprecation="${build.deprecation}"
706           source="8"
707           target="8"
708           classpath=""
709           bootclasspath="${bootclasspath8}"
710           includeAntRuntime="false"
711           includeJavaRuntime="false"
712           executable="${javac8}"
713           fork="true">
714
715      <include name="**/*.java"/>
716      <compilerarg value="-Xprefer:source"/>
717      <compilerarg value="-XDignore.symbol.file=true"/>
718      <compilerarg value="-Xlint:all"/>
719      <compilerarg value="-Xdoclint:all/protected"/>
720      <compilerarg line="${build.args}"/>
721
663      </javac>
664    </target>
665  
666  
667 <  <target name="4jdk8jar"
668 <          depends="4jdk8compile"
669 <          description="Builds library jar from compiled sources">
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 <    <jar destfile="${4jdk8product.jar}">
731 <      <fileset dir="${build.4jdk8.classes.dir}"/>
732 <      <manifest>
733 <        <attribute name="Built-By" value="${user.name}"/>
734 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
735 <      </manifest>
736 <    </jar>
737 <
738 <  </target>
739 <
740 <
741 <  <target name="4jdk8-tck"
742 <          depends="4jdk8jar"
743 <          description="Runs tck tests for jsr166-4jdk8 directly">
744 <
745 <    <run-tck-tests
746 <      target="8"
747 <      workdir="${build.4jdk8.dir}"
748 <      classes="${4jdk8product.jar}">
749 <      <javac-elements>
750 <        <!-- JDK9+ test classes -->
751 <        <exclude name="*9Test.java"/>
752 <        <exclude name="*10Test.java"/>
753 <      </javac-elements>
754 <    </run-tck-tests>
755 <  </target>
756 <
757 <
758 <  <target name="4jdk8-jtreg"
759 <          depends="4jdk8jar"
760 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
761 <    <run-jtreg-tests
762 <       target="8"
763 <       workdir="${build.4jdk8.dir}"
764 <       classes="${4jdk8product.jar}"/>
765 <  </target>
766 <
767 <
768 <  <target name="4jdk8-test"
769 <          depends="4jdk8-tck, 4jdk8-jtreg"
770 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
771 <  </target>
772 <
773 <
774 <  <target name="4jdk8docs"
775 <          description="Builds javadocs for src/jdk8 to dist dir">
776 <
777 <    <delete dir="${4jdk8docs.dir}"/>
778 <    <mkdir dir="${4jdk8docs.dir}"/>
779 <
780 <    <javadoc destdir="${4jdk8docs.dir}"
781 <             packagenames="none"
782 <             link="${java8.api.url}"
783 <             overview="${4jdk8src.dir}/intro.html"
784 <             access="${build.javadoc.access}"
785 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
786 <             classpath=""
787 <             executable="${javadoc8}"
788 <             failonerror = "true">
789 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
790 <        <include name="**/*.java"/>
791 <      </fileset>
792 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
793 <      <arg value="-XDignore.symbol.file=true"/>
794 <      <arg value="-tag"/>
795 <      <arg value="${javadoc.jls.option}"/>
796 <      <arg value="-tag"/>
797 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
798 <      <arg value="-tag"/>
799 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
800 <      <arg value="-tag"/>
801 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
802 <    </javadoc>
803 <  </target>
804 <
805 <
806 <  <target name="4jdk8dist"
807 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
808 <          description="Puts all distributable products in single hierarchy"/>
809 <
810 <
811 <  <target name="4jdk8clean"
812 <          description="Removes all 4jdk8 build products">
813 <
814 <    <delete dir="${build.4jdk8.dir}"/>
815 <
816 <  </target>
817 <
818 <
819 <  <target name="4jdk8dist-jar"
820 <          depends="4jdk8clean, 4jdk8jar">
821 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
822 <  </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"
835 <          depends="configure-compiler"
836 <          description="Compiles src/jdk7 sources, targeting jdk7">
837 <
838 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
839 <
840 <    <javac srcdir="${4jdk7src.dir}"
841 <           destdir="${build.4jdk7.classes.dir}"
842 <           debug="${build.debug}"
843 <           debuglevel="${build.debuglevel}"
844 <           deprecation="${build.deprecation}"
845 <           source="6"
846 <           target="6"
847 <           classpath=""
848 <           bootclasspath="${bootclasspath6}"
849 <           includeAntRuntime="false"
850 <           includeJavaRuntime="false"
851 <           executable="${javac7}"
852 <           fork="true">
853 <
854 <      <include name="**/*.java"/>
855 <      <compilerarg value="-Xprefer:source"/>
856 <      <compilerarg value="-XDignore.symbol.file=true"/>
857 <      <compilerarg value="-Xlint:all"/>
858 <      <compilerarg value="-Werror"/>
859 <      <compilerarg line="${build.args}"/>
860 <
861 <    </javac>
862 <  </target>
863 <
864 <  <target name="4jdk7doclint"
865 <          depends="configure-compiler"
866 <          description="Finds doclint warnings">
867 <
868 <    <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}"
875           source="6"
876           target="6"
742             classpath=""
878           bootclasspath="${bootclasspath6}"
743             includeAntRuntime="false"
744             includeJavaRuntime="false"
745 <           executable="${javac8}"
745 >           encoding="ASCII"
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}"/>
890
764      </javac>
892  </target>
765  
766 <
767 <  <target name="4jdk7jar"
896 <          depends="4jdk7compile"
897 <          description="Builds library jar from compiled sources">
898 <
899 <    <jar destfile="${4jdk7product.jar}">
900 <      <fileset dir="${build.4jdk7.classes.dir}"/>
901 <      <manifest>
902 <        <attribute name="Built-By" value="${user.name}"/>
903 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
904 <      </manifest>
766 >    <jar destfile="${product.jar}">
767 >      <fileset dir="${destdir}"/>
768      </jar>
769  
907  </target>
908
909
910  <target name="4jdk7-tck"
911          depends="4jdk7jar"
912          description="Runs tck tests for jsr166-4jdk7 directly">
913
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"/>
927 <        <exclude name="CompletableFutureTest.java"/>
928 <        <exclude name="SplittableRandomTest.java"/>
929 <        <exclude name="StampedLockTest.java"/>
930 <        <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 <
958 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
959 <      </test>
960 <
872 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
873 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
874      </junit>
875    </target>
876  
964  <target name="4jdk7-jtreg"
965          depends="4jdk7jar"
966          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
967    <run-jtreg-tests
968       target="7"
969       workdir="${build.4jdk7.dir}"
970       classes="${4jdk7product.jar}"/>
971  </target>
972
973
974  <target name="4jdk7-test"
975          depends="4jdk7-tck, 4jdk7-jtreg"
976          description="Runs tck and jtreg tests for jsr166-4jdk7">
977  </target>
978
979
980  <target name="4jdk7docs"
981          description="Builds javadocs for src/jdk7 to dist dir">
982
983    <delete dir="${4jdk7docs.dir}"/>
984    <mkdir dir="${4jdk7docs.dir}"/>
985
986    <javadoc destdir="${4jdk7docs.dir}"
987             packagenames="none"
988             link="${java7.api.url}"
989             overview="${4jdk7src.dir}/intro.html"
990             access="${build.javadoc.access}"
991             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
992             classpath=""
993             executable="${javadoc7}"
994             failonerror = "true">
995      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
996        <include name="**/*.java"/>
997      </fileset>
998      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
999      <arg value="-XDignore.symbol.file=true"/>
1000    </javadoc>
1001  </target>
1002
1003
1004  <target name="4jdk7dist"
1005          depends="4jdk7dist-jar, 4jdk7dist-docs"
1006          description="Puts all distributable products in single hierarchy"/>
1007
1008
1009  <target name="4jdk7clean"
1010          description="Removes all 4jdk7 build products">
1011
1012    <delete dir="${build.4jdk7.dir}"/>
1013
1014  </target>
1015
1016
1017  <target name="4jdk7dist-jar"
1018          depends="4jdk7clean, 4jdk7jar">
1019    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1020  </target>
1021
1022
1023  <target name="4jdk7dist-docs"
1024          depends="4jdk7clean, 4jdk7docs">
1025    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1026  </target>
1027
1028
1029  <!-- jsr166x -->
1030
1031  <target name="jsr166xcompile"
1032          depends="configure-compiler"
1033          description="Compiles jsr166x sources to build dir">
1034
1035    <mkdir dir="${build.jsr166x.classes.dir}"/>
1036
1037    <javac srcdir="${topsrc.dir}"
1038           destdir="${build.jsr166x.classes.dir}"
1039           debug="${build.debug}"
1040           debuglevel="${build.debuglevel}"
1041           deprecation="${build.deprecation}"
1042           classpath=""
1043           bootclasspath="${bootclasspath6}"
1044           source="5"
1045           target="5"
1046           includeAntRuntime="false"
1047           includeJavaRuntime="false"
1048           executable="${javac7}"
1049           fork="true">
1050
1051      <include name="jsr166x/**/*.java"/>
1052      <compilerarg value="-XDignore.symbol.file=true"/>
1053      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1054      <compilerarg value="-Werror"/>
1055      <compilerarg line="${build.args}"/>
1056
1057    </javac>
1058  </target>
1059
1060
1061  <target name="jsr166xjar"
1062          depends="jsr166xcompile"
1063          description="Builds library jar from compiled sources">
1064
1065    <jar destfile="${jsr166x.jar}">
1066      <fileset dir="${build.jsr166x.classes.dir}"/>
1067      <manifest>
1068        <attribute name="Built-By" value="${user.name}"/>
1069        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1070      </manifest>
1071    </jar>
1072
1073  </target>
1074
1075
1076  <target name="jsr166xdocs"
1077          description="Builds javadocs to dist dir">
1078
1079    <delete dir="${jsr166xdocs.dir}"/>
1080    <mkdir dir="${jsr166xdocs.dir}"/>
1081
1082    <javadoc destdir="${jsr166xdocs.dir}"
1083             packagenames="jsr166x.*"
1084             link="${java.api.url}"
1085             access="${build.javadoc.access}"
1086             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1087             bootclasspath="${bootclasspath6}"
1088             source="5"
1089             executable="${javadoc7}"
1090             failonerror = "true">
1091      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1092      <arg value="-XDignore.symbol.file=true"/>
1093
1094    </javadoc>
1095  </target>
1096
1097
1098  <target name="jsr166xdist"
1099          depends="jsr166xdist-jar, jsr166xdist-docs"
1100          description="Puts all distributable products in single hierarchy"/>
1101
1102
1103  <target name="jsr166xclean"
1104          description="Removes all jsr166x build products">
1105
1106    <delete dir="${build.jsr166x.dir}"/>
1107
1108  </target>
1109
1110
1111  <target name="jsr166xdist-jar"
1112          depends="jsr166xclean, jsr166xjar">
1113    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1114  </target>
1115
1116  <target name="jsr166xdist-docs"
1117          depends="jsr166xclean, jsr166xdocs">
1118    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1119  </target>
1120
1121  <!-- jsr166y -->
1122
1123
1124  <target name="jsr166ycompile"
1125          depends="configure-compiler"
1126          description="Compiles jsr166y sources">
1127
1128    <mkdir dir="${build.jsr166y.classes.dir}"/>
1129
1130    <javac srcdir="${topsrc.dir}"
1131           destdir="${build.jsr166y.classes.dir}"
1132           debug="${build.debug}"
1133           debuglevel="${build.debuglevel}"
1134           deprecation="${build.deprecation}"
1135           source="6"
1136           target="6"
1137           classpath=""
1138           bootclasspath="${bootclasspath6}"
1139           includeAntRuntime="false"
1140           includeJavaRuntime="false"
1141           executable="${javac7}"
1142           fork="true">
1143
1144      <include name="jsr166y/**/*.java"/>
1145      <compilerarg value="-XDignore.symbol.file=true"/>
1146      <compilerarg value="-Xlint:all"/>
1147      <compilerarg value="-Werror"/>
1148      <compilerarg line="${build.args}"/>
1149
1150    </javac>
1151  </target>
1152
1153
1154  <target name="jsr166yjar"
1155          depends="jsr166ycompile"
1156          description="Builds library jar from compiled sources">
1157
1158    <jar destfile="${jsr166y.jar}" index="true">
1159      <fileset dir="${build.jsr166y.classes.dir}"/>
1160      <manifest>
1161        <attribute name="Built-By" value="${user.name}"/>
1162        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1163      </manifest>
1164    </jar>
1165
1166  </target>
1167
1168
1169  <target name="jsr166ydocs"
1170          description="Builds javadocs to dist dir">
1171
1172    <delete dir="${jsr166ydocs.dir}"/>
1173    <mkdir dir="${jsr166ydocs.dir}"/>
1174
1175    <javadoc destdir="${jsr166ydocs.dir}"
1176             packagenames="jsr166y.*"
1177             link="${java.api.url}"
1178             access="${build.javadoc.access}"
1179             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1180             bootclasspath="${bootclasspath6}"
1181             source="6"
1182             executable="${javadoc7}"
1183             failonerror = "true">
1184      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1185      <arg value="-XDignore.symbol.file=true"/>
1186
1187    </javadoc>
1188  </target>
1189
1190
1191  <target name="jsr166ydist"
1192          depends="jsr166ydist-jar, jsr166ydist-docs"
1193          description="Puts all distributable products in single hierarchy"/>
1194
1195
1196  <target name="jsr166yclean"
1197          description="Removes all jsr166y build products">
1198
1199    <delete dir="${build.jsr166y.dir}"/>
1200
1201  </target>
1202
1203
1204  <target name="jsr166ydist-jar"
1205          depends="jsr166yclean, jsr166yjar">
1206    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1207  </target>
1208
1209  <target name="jsr166ydist-docs"
1210          depends="jsr166yclean, jsr166ydocs">
1211    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1212  </target>
1213
1214
1215  <!-- extra166y -->
1216
1217
1218  <target name="extra166ycompile"
1219          depends="configure-compiler, jsr166yjar"
1220          description="Compiles extra166y sources">
1221
1222    <mkdir dir="${build.extra166y.classes.dir}"/>
1223
1224    <javac srcdir="${topsrc.dir}"
1225           destdir="${build.extra166y.classes.dir}"
1226           debug="${build.debug}"
1227           debuglevel="${build.debuglevel}"
1228           deprecation="${build.deprecation}"
1229           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1230           classpath=""
1231           source="6"
1232           target="6"
1233           includeAntRuntime="false"
1234           includeJavaRuntime="false"
1235           executable="${javac7}"
1236           fork="true">
1237
1238      <include name="extra166y/**/*.java"/>
1239      <compilerarg value="-XDignore.symbol.file=true"/>
1240      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1241      <compilerarg value="-Werror"/>
1242      <compilerarg line="${build.args}"/>
1243
1244    </javac>
1245  </target>
1246
1247
1248  <target name="extra166yjar"
1249          depends="extra166ycompile"
1250          description="Builds library jar from compiled sources">
1251
1252    <jar destfile="${extra166y.jar}" index="true">
1253      <fileset dir="${build.extra166y.classes.dir}"/>
1254      <manifest>
1255        <attribute name="Built-By" value="${user.name}"/>
1256        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1257      </manifest>
1258    </jar>
1259
1260  </target>
1261
1262
1263  <target name="extra166ydocs"
1264          description="Builds javadocs to build dir">
1265
1266    <delete dir="${extra166ydocs.dir}"/>
1267    <mkdir dir="${extra166ydocs.dir}"/>
1268
1269    <javadoc destdir="${extra166ydocs.dir}"
1270             packagenames="extra166y.*"
1271             link="${java.api.url}"
1272             access="${build.javadoc.access}"
1273             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1274             bootclasspath="${bootclasspath6}"
1275             source="6"
1276             executable="${javadoc7}">
1277      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1278      <arg value="-XDignore.symbol.file=true"/>
1279
1280    </javadoc>
1281  </target>
1282
1283
1284  <target name="extra166ydist"
1285          depends="extra166ydist-jar, extra166ydist-docs"
1286          description="Puts all distributable products in single hierarchy"/>
1287
1288
1289  <target name="extra166yclean"
1290          description="Removes all extra166y build products">
1291
1292    <delete dir="${build.extra166y.dir}"/>
1293
1294  </target>
1295
1296
1297  <target name="extra166ydist-jar"
1298          depends="extra166yclean, extra166yjar">
1299    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1300  </target>
1301
1302  <target name="extra166ydist-docs"
1303          depends="extra166yclean, extra166ydocs">
1304    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1305  </target>
1306
1307  <!-- jsr166e -->
1308
1309  <property name="build.jsr166e.java.version" value="6"/>
1310  <property name="build.jsr166e.javac" value="${javac6}"/>
1311
1312  <target name="jsr166ecompile"
1313          depends="configure-compiler"
1314          description="Compiles jsr166e sources">
1315
1316    <mkdir dir="${build.jsr166e.classes.dir}"/>
1317
1318    <javac srcdir="${topsrc.dir}"
1319           destdir="${build.jsr166e.classes.dir}"
1320           debug="${build.debug}"
1321           debuglevel="${build.debuglevel}"
1322           deprecation="${build.deprecation}"
1323           source="${build.jsr166e.java.version}"
1324           target="${build.jsr166e.java.version}"
1325           classpath=""
1326           includeAntRuntime="false"
1327           includeJavaRuntime="false"
1328           executable="${build.jsr166e.javac}"
1329           fork="true">
1330
1331      <include name="jsr166e/**/*.java"/>
1332      <compilerarg value="-XDignore.symbol.file=true"/>
1333      <compilerarg value="-Xlint:all"/>
1334      <compilerarg value="-Werror"/>
1335      <compilerarg line="${build.args}"/>
1336
1337    </javac>
1338  </target>
1339
1340  <!-- jsr166e: find doclint errors -->
1341  <target name="jsr166edoclint">
1342
1343    <mkdir dir="${build.jsr166e.classes.dir}"/>
1344
1345    <javac srcdir="${topsrc.dir}"
1346           destdir="${build.jsr166e.classes.dir}"
1347           debug="${build.debug}"
1348           debuglevel="${build.debuglevel}"
1349           deprecation="${build.deprecation}"
1350           source="${build.jsr166e.java.version}"
1351           target="${build.jsr166e.java.version}"
1352           classpath=""
1353           bootclasspath="${bootclasspath6}"
1354           includeAntRuntime="false"
1355           includeJavaRuntime="false"
1356           executable="${javac8}"
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 value="-Xdoclint:all/protected"/>
1364
1365    </javac>
1366  </target>
1367
1368
1369  <target name="jsr166ejar"
1370          depends="jsr166ecompile"
1371          description="Builds library jar from compiled sources">
1372
1373    <jar destfile="${jsr166e.jar}" index="true">
1374      <fileset dir="${build.jsr166e.classes.dir}"/>
1375      <manifest>
1376        <attribute name="Built-By" value="${user.name}"/>
1377        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1378      </manifest>
1379    </jar>
1380
1381  </target>
1382
1383
1384  <target name="jsr166edocs"
1385          description="Builds javadocs to build dir">
1386
1387    <delete dir="${jsr166edocs.dir}"/>
1388    <mkdir dir="${jsr166edocs.dir}"/>
1389
1390    <javadoc destdir="${jsr166edocs.dir}"
1391             packagenames="jsr166e.*"
1392             link="${java.api.url}"
1393             access="${build.javadoc.access}"
1394             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1395             source="${build.jsr166e.java.version}"
1396             executable="${javadoc7}"
1397             failonerror = "true">
1398      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1399      <arg value="-XDignore.symbol.file=true"/>
1400
1401    </javadoc>
1402  </target>
1403
1404
1405  <target name="jsr166e-tck-one-java-version"
1406          depends="jsr166ejar">
1407
1408    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1409
1410    <run-tck-tests
1411      tck.src.dir="${test.src.dir}/tck-jsr166e"
1412      target="${build.jsr166e.java.version}"
1413      workdir="${build.jsr166e.dir}"
1414      classes="${jsr166e.jar}"/>
1415  </target>
1416
1417  <target name="jsr166e-tck"
1418          description="Runs tck tests for jsr166e for multiple java versions">
1419
1420 <!--     <antcall target="clean"/> -->
1421 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1422 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1423 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1424 <!--     </antcall> -->
1425
1426    <antcall target="clean"/>
1427    <antcall target="jsr166e-tck-one-java-version">
1428      <param name="build.jsr166e.java.version" value="7"/>
1429      <param name="build.jsr166e.javac" value="${javac7}"/>
1430    </antcall>
1431
1432    <antcall target="clean"/>
1433    <antcall target="jsr166e-tck-one-java-version">
1434      <param name="build.jsr166e.java.version" value="6"/>
1435      <param name="build.jsr166e.javac" value="${javac6}"/>
1436    </antcall>
1437  </target>
1438
1439
1440  <target name="jsr166e-test"
1441          depends="jsr166e-tck"
1442          description="Runs all tests for jsr166e">
1443  </target>
1444
1445  <target name="jsr166edist"
1446          depends="jsr166edist-jar, jsr166edist-docs"
1447          description="Puts all distributable products in single hierarchy"/>
1448
1449
1450  <target name="jsr166eclean"
1451          description="Removes all jsr166e build products">
1452    <delete dir="${build.jsr166e.dir}"/>
1453  </target>
1454
1455
1456  <target name="jsr166edist-jar"
1457          depends="jsr166eclean, jsr166ejar">
1458    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1459  </target>
1460
1461  <target name="jsr166edist-docs"
1462          depends="jsr166eclean, jsr166edocs">
1463    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1464  </target>
1465
1466
1467 <!-- Find buglets that can be detected by static build tools -->
1468
1469  <target name="lint">
1470    <antcall target="dists">
1471      <param name="build.javadoc.access" value="public"/>
1472    </antcall>
1473  </target>
1474
1475 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1476  <target name="lint-private">
1477    <antcall target="dist">
1478      <param name="build.javadoc.access" value="private"/>
1479    </antcall>
1480  </target>
1481
1482
877   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines