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.215 by jsr166, Mon Aug 29 23:38:30 2016 UTC vs.
Revision 1.314 by jsr166, Wed May 6 16:51:05 2020 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless">
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 17 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
22 <  $HOME/jdk/jdk6
23 <  $HOME/jdk/jdk7
24 <  $HOME/jdk/jdk8
25 <  $HOME/jdk/jdk9
22 >  $HOME/jdk/jdk11
23 >  $HOME/jdk/jdk12
24 >  $HOME/jdk/jdk13
25 >  $HOME/jdk/jdk14
26 >  $HOME/jdk/jdk15
27    where each of the above is a JDK or a symlink to same, and
28 <  $HOME/jdk/src/jdk6
29 <  $HOME/jdk/src/jdk7
30 <  $HOME/jdk/src/jdk8
31 <  $HOME/jdk/src/jdk9
32 <  where each of the above is a complete JDK source tree
33 <  (e.g. mercurial forest) or a symlink to same.
28 >  $HOME/jdk/src/jdk11
29 >  $HOME/jdk/src/jdk12
30 >  $HOME/jdk/src/jdk13
31 >  $HOME/jdk/src/jdk14
32 >  $HOME/jdk/src/jdk15
33 >  where each of the above is a JDK source tree or a symlink to same.
34  
35    Alternatively, define ant variables thus:
36    ant -Djdk$N.home=... -Djdk$N.src.home=...
37 <  for $N in 6 7 8 9 ...
37 >  for $N in 11 .. 15 ...
38  
39 <  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
40 <  target is currently broken.
39 >  As of 2016-03, the sources in src/main are for jdk9+ only.
40 >  As of 2019-08, the sources in src/main are for jdk11+ only.
41 >  As of 2019-10, compatibility support for jdk8 is dropped entirely.
42   ------------------------------------------------------------------------------
43    </description>
44  
# Line 52 | Line 56
56  
57  
58    <!-- Compilation options -->
55  <property name="build.sourcelevel"    value="6"/>
59    <property name="build.debug"          value="true"/>
60    <property name="build.debuglevel"     value="source,lines,vars"/>
61    <property name="build.deprecation"    value="false"/>
# Line 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://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://docs.oracle.com/en/java/javase/14/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:java.base=${build.classes.dir}/java.base" 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:java.base=${build.classes.dir}/java.base" if:set="modules"/>
212 <        <jvmarg line="@{jvmflags}"/>
213 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
214 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
215 <
216 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
217 <        <syspropertyset id="system-properties-used-by-tck">
218 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
219 <          <propertyref prefix="jsr166."/>
220 <          <propertyref name="test.timeout.factor"/>
221 <        </syspropertyset>
222 <
223 <        <classpath>
224 <          <pathelement location="${junit.jar}"/>
225 <          <pathelement location="@{workdir}/tck-classes"/>
226 <        </classpath>
210 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
211 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
212 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
213 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
214 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
215 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
216 >        <jvmarg line="@{jvmflags}"/>
217 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
218 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
219 >
220 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
221 >        <syspropertyset id="system-properties-used-by-tck">
222 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
223 >          <propertyref prefix="jsr166."/>
224 >          <propertyref name="test.timeout.factor"/>
225 >        </syspropertyset>
226 >
227 >        <classpath>
228 >          <pathelement location="${junit.jar}"/>
229 >          <pathelement location="@{workdir}/tck-classes"/>
230 >        </classpath>
231      </java>
232  
233      </sequential>
234    </macrodef>
235  
236    <!-- Define jtreg test sets for different jdk versions -->
237 <  <fileset dir="${jtreg9.src.dir}">
238 <    <patternset id="jdk9.jtreg.tests">
239 <      <include name="**/*.java"/>
240 <    </patternset>
241 <  </fileset>
242 <
243 <  <fileset dir="${jtreg8.src.dir}">
244 <    <patternset id="jdk8.jtreg.tests">
245 <      <include name="**/*.java"/>
246 <      <exclude name="**/SpliteratorCharacteristics.java"/>
247 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
248 <      <exclude name="**/GCDuringIteration.java"/>
249 <    </patternset>
301 <  </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 -->
314 <    <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  
325    <local name="modules"/>
326    <condition property="modules">
327      <available file="${jdk@{target}.home}/jmods" type="dir"/>
328    </condition>
329
274      <delete dir="@{workdir}/JTwork"   quiet="true"/>
331    <delete dir="@{workdir}/JTreport" quiet="true"/>
275      <jtreg dir="${jtreg@{target}.src.dir}"
276             jdk="${jdk@{target}.home}"
277 <           workDir="@{workdir}/JTwork"
335 <           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="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" 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 353 | 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  
372    <local name="modules"/>
373    <condition property="modules">
374      <and>
375        <available file="${jdk9.home}/jmods" type="dir"/>
376        <equals arg1="9" arg2="${build.main.java.version}"/>
377      </and>
378    </condition>
379
331      <local name="destdir"/>
332 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
382 <    <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 391 | 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"/>
353 <      <compilerarg value="-Werror"/>
352 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
353 >      <compilerarg value="-Xlint:all,-removal"/>
354 >      <compilerarg line="--doclint-format html5"/>
355 > <!--  Temporarily disable doclint for private elements, due to -->
356 > <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
357 > <!--  which is expected to be fixed in openjdk 11.0.8 -->
358 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
359        <compilerarg value="-Xdoclint:all/protected"/>
360 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
361 +      <compilerarg value="-Werror"/>
362        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
363        <compilerarg line="${build.args}"/>
364  
# Line 426 | Line 384
384    <target name="docs"
385            description="Builds javadocs for src/main to dist dir">
386  
387 <    <delete dir="${docs.dir}"/>
387 >    <delete dir="${docs.dir}" quiet="true"/>
388      <mkdir dir="${docs.dir}"/>
389  
390 +    <!-- old school frames via docs/index.html?overview-summary.html -->
391 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
392 +    <local name="use-frames"/>
393 +    <condition property="use-frames">
394 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
395 +    </condition>
396 +
397      <!-- the packagenames="none" hack below prevents scanning the -->
398      <!-- sourcepath for packages -->
399  
400 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
401 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
402 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
403 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
404 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
405      <javadoc destdir="${docs.dir}"
406               packagenames="none"
407 <             link="${java9.api.url}"
407 >             link="${java.api.url}"
408               overview="${src.dir}/intro.html"
409               access="${build.javadoc.access}"
410 <             sourcepath="${src.dir}:${jdk9.src.dir}"
410 >             sourcepath="${src.dir}"
411               classpath=""
412 <             executable="${javadoc9}">
412 >             source="${build.main.javadoc.source}"
413 >             executable="${build.main.javadoc}">
414 > <!-- TODO: JDK-8214571 failonerror = "true" -->
415        <fileset dir="${src.dir}" defaultexcludes="yes">
416          <include name="**/*.java"/>
417        </fileset>
418 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
418 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
419        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
420 +      <arg value="-quiet"/>
421        <arg value="-XDignore.symbol.file=true"/>
422 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
423 <      <arg value="-tag"/>
424 <      <arg value="${javadoc.jls.option}"/>
425 <      <arg value="-tag"/>
426 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
427 <      <arg value="-tag"/>
428 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
429 <      <arg value="-tag"/>
430 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
431 < <!-- tags added in jdk9 -->
432 <      <arg value="-tag"/>
460 <      <arg value="revised:X"/>
461 <      <arg value="-tag"/>
462 <      <arg value="spec:X"/>
422 >      <arg value="-html5"/>
423 >      <arg value="--patch-module=java.base=${src.dir}"/>
424 >      <arg value="--frames" if:set="use-frames"/>
425 >      <arg value="--override-methods=summary"/>
426 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
427 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
428 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
429 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
430 > <!-- tags added in jdk9: currently unused -->
431 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
432 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
433      </javadoc>
434    </target>
435  
# Line 469 | Line 439
439            description="Puts all distributable products in single hierarchy"/>
440  
441  
472  <target name="release"
473          depends="dist"
474          description="Puts entire CVS tree, plus distribution productions, in a jar">
475
476    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
477
478    <jar basedir="${basedir}" destfile="${release.jar}">
479      <!-- <exclude name="build/**"/> -->
480      <exclude name="${release.jar}"/>
481      <exclude name="user.properties"/>
482      <exclude name="etc/notes/**"/>
483      <exclude name="src/emulation/**"/>
484      <exclude name="**/SyntaxTest.java"/>
485      <exclude name="**/SuperfluousAbstract.java"/>
486      <manifest>
487        <attribute name="Built-By" value="${user.name}"/>
488        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
489      </manifest>
490    </jar>
491  </target>
492
493
442    <target name="clean"
443            description="Removes all build products">
496
444      <delete dir="${build.dir}"/>
498
445    </target>
446  
447  
448    <target name="dist-clean"
449            description="Removes all build and distribution products">
504
450      <delete dir="${build.dir}"/>
451      <delete dir="${dist.dir}"/>
507
452    </target>
453  
454  
# Line 519 | Line 463
463    </target>
464  
465    <target name="tck"
466 <          depends="jar"
466 >          depends="jar"
467            description="Runs tck tests for src/main directly">
468  
469      <run-tck-tests
470 <      target="${build.main.java.version}"
470 >      target="${java.runtime.target}"
471        workdir="${build.dir}"
472 <      classes="${product.jar}"/>
472 >      classes="${product.jar}">
473 >      <javac-elements>
474 >        <compilerarg value="-Werror"/>
475 >      </javac-elements>
476 >    </run-tck-tests>
477    </target>
478  
479    <target name="tck-parallelism-1"
# Line 550 | Line 498
498    </target>
499  
500    <target name="jtreg"
501 <          depends="jar"
501 >          depends="jar"
502            description="Runs jtreg tests for src/main using the jtreg ant task">
503      <run-jtreg-tests
504 <       target="${build.main.java.version}"
504 >       target="${java.runtime.target}"
505         workdir="${build.dir}"
506         classes="${product.jar}"/>
507    </target>
508  
509    <target name="test"
510            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
511 <          description="Runs tck and jtreg tests for src/main">
511 >          description="Runs tck and jtreg tests for src/main"/>
512 >
513 >  <target name="test-version-permutations"
514 >          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
515 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
516 >
517 >  <target name="test11">
518 >    <antcall>
519 >      <param name="java.runtime.target" value="11"/>
520 >      <param name="build.main.javac" value="${javac11}"/>
521 >      <param name="build.main.javadoc" value="${javadoc12}"/>
522 >      <param name="build.main.javadoc.source" value="11"/>
523 >      <target name="clean"/>
524 >      <target name="test"/>
525 >      <target name="docs"/>
526 >    </antcall>
527    </target>
528  
529 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
529 >  <target name="test12">
530 >    <antcall>
531 >      <param name="java.runtime.target" value="12"/>
532 >      <param name="build.main.javac" value="${javac12}"/>
533 >      <param name="build.main.javadoc" value="${javadoc12}"/>
534 >      <param name="build.main.javadoc.source" value="12"/>
535 >      <target name="clean"/>
536 >      <target name="test"/>
537 >      <target name="docs"/>
538 >    </antcall>
539 >  </target>
540  
541 < <!--     <antcall target="jtreg"> -->
542 < <!--       <param name="build.main.java.version" value="8"/> -->
543 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
544 < <!--     </antcall> -->
541 >  <target name="test13">
542 >    <antcall>
543 >      <param name="java.runtime.target" value="13"/>
544 >      <param name="build.main.javac" value="${javac13}"/>
545 >      <param name="build.main.javadoc" value="${javadoc13}"/>
546 >      <param name="build.main.javadoc.source" value="13"/>
547 >      <target name="clean"/>
548 >      <target name="test"/>
549 >      <target name="docs"/>
550 >    </antcall>
551 >  </target>
552  
553 < <!--   </target> -->
553 >  <target name="test14">
554 >    <antcall>
555 >      <param name="java.runtime.target" value="14"/>
556 >      <param name="build.main.javac" value="${javac14}"/>
557 >      <param name="build.main.javadoc" value="${javadoc14}"/>
558 >      <param name="build.main.javadoc.source" value="14"/>
559 >      <target name="clean"/>
560 >      <target name="test"/>
561 >      <target name="docs"/>
562 >    </antcall>
563 >  </target>
564  
565 < <!--   <target name="test89" -->
566 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
565 >  <target name="test15">
566 >    <antcall>
567 >      <param name="java.runtime.target" value="15"/>
568 >      <param name="build.main.javac" value="${javac15}"/>
569 >      <param name="build.main.javadoc" value="${javadoc15}"/>
570 >      <param name="build.main.javadoc.source" value="15"/>
571 >      <target name="clean"/>
572 >      <target name="test"/>
573 >      <target name="docs"/>
574 >    </antcall>
575 >  </target>
576  
577 < <!--     <antcall target="clean"/> -->
578 < <!--     <antcall target="test"> -->
579 < <!--       <param name="build.main.java.version" value="8"/> -->
580 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
581 < <!--     </antcall> -->
577 >  <target name="test11-12">
578 >    <antcall>
579 >      <param name="java.runtime.target" value="12"/>
580 >      <param name="build.main.javac" value="${javac11}"/>
581 >      <param name="build.main.javadoc" value="${javadoc12}"/>
582 >      <param name="build.main.javadoc.source" value="11"/>
583 >      <target name="clean"/>
584 >      <target name="test"/>
585 >      <target name="docs"/>
586 >    </antcall>
587 >  </target>
588  
589 < <!--     <antcall target="clean"/> -->
590 < <!--     <antcall target="test"> -->
591 < <!--       <param name="build.main.java.version" value="9"/> -->
592 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
593 < <!--     </antcall> -->
589 >  <target name="test11-13">
590 >    <antcall>
591 >      <param name="java.runtime.target" value="13"/>
592 >      <param name="build.main.javac" value="${javac11}"/>
593 >      <param name="build.main.javadoc" value="${javadoc13}"/>
594 >      <param name="build.main.javadoc.source" value="11"/>
595 >      <target name="clean"/>
596 >      <target name="test"/>
597 >      <target name="docs"/>
598 >    </antcall>
599 >  </target>
600  
601 < <!--   </target> -->
601 >  <target name="test11-14">
602 >    <antcall>
603 >      <param name="java.runtime.target" value="14"/>
604 >      <param name="build.main.javac" value="${javac11}"/>
605 >      <param name="build.main.javadoc" value="${javadoc14}"/>
606 >      <param name="build.main.javadoc.source" value="11"/>
607 >      <target name="clean"/>
608 >      <target name="test"/>
609 >      <target name="docs"/>
610 >    </antcall>
611 >  </target>
612  
613 +  <target name="test11-15">
614 +    <antcall>
615 +      <param name="java.runtime.target" value="15"/>
616 +      <param name="build.main.javac" value="${javac11}"/>
617 +      <param name="build.main.javadoc" value="${javadoc15}"/>
618 +      <param name="build.main.javadoc.source" value="11"/>
619 +      <target name="clean"/>
620 +      <target name="test"/>
621 +      <target name="docs"/>
622 +    </antcall>
623 +  </target>
624  
625  
626    <target name="configure-compiler">
627      <fail message="ant version too old">
628 <      <condition>
597 <        <not> <antversion atleast="1.9.1"/> </not>
598 <      </condition>
628 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
629      </fail>
630  
631      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 613 | Line 643
643    </target>
644  
645  
616
617  <!-- Various demos and test programs -->
618
619
620  <!-- description="Benchmark from Doug Lea's AQS paper" -->
621  <target name="loops" depends="configure-compiler">
622
623    <mkdir dir="${build.loops.dir}"/>
624
625    <javac srcdir="${loops.src.dir}"
626          destdir="${build.loops.dir}"
627            debug="${build.debug}"
628       debuglevel="${build.debuglevel}"
629      deprecation="${build.deprecation}"
630           source="${build.sourcelevel}"
631           target="${build.sourcelevel}"
632             fork="true">
633
634      <compilerarg line="${build.args}"/>
635      <classpath refid="loops.classpath"/>
636      <compilerarg value="-XDignore.symbol.file=true"/>
637
638    </javac>
639
640    <java classname="ALoops" fork="true">
641      <classpath refid="loops.classpath"/>
642    </java>
643
644  </target>
645
646
646    <target name="compile-test-loops" depends="jar"
647 <          description="compile all the perf tests in src/test/loops">
647 >          description="Compiles all the perf tests in src/test/loops">
648  
649      <mkdir dir="${build.dir}/test/loops"/>
650  
# Line 656 | Line 655
655             deprecation="${build.deprecation}"
656             includeAntRuntime="false"
657             includeJavaRuntime="false"
658 <           executable="${javac9}"
658 >           encoding="ASCII"
659 >           executable="${build.main.javac}"
660             fork="true">
661  
662        <include name="*.java"/>
663        <compilerarg value="-XDignore.symbol.file=true"/>
664 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
665 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
666 <      <compilerarg line="${build.args}"/>
667 <
668 <    </javac>
669 <
670 <  </target>
671 <
672 <
673 <  <!-- jsr166 4jdk8 -->
674 <
675 <  <target name="4jdk8compile"
676 <          depends="configure-compiler"
677 <          description="Compiles src/jdk8 sources, targeting jdk8">
678 <
679 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
680 <
681 <    <javac srcdir="${4jdk8src.dir}"
682 <           destdir="${build.4jdk8.classes.dir}"
683 <           debug="${build.debug}"
684 <           debuglevel="${build.debuglevel}"
685 <           deprecation="${build.deprecation}"
686 <           source="8"
687 <           target="8"
688 <           classpath=""
689 <           bootclasspath="${bootclasspath8}"
690 <           includeAntRuntime="false"
691 <           includeJavaRuntime="false"
692 <           executable="${javac8}"
693 <           fork="true">
694 <
695 <      <include name="**/*.java"/>
696 <      <compilerarg value="-Xprefer:source"/>
697 <      <compilerarg value="-XDignore.symbol.file=true"/>
698 <      <compilerarg value="-Xlint:all"/>
699 <      <compilerarg value="-Werror"/>
664 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
665 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
666        <compilerarg line="${build.args}"/>
701
667      </javac>
668    </target>
669  
705  <target name="4jdk8doclint"
706          depends="configure-compiler"
707          description="Finds doclint warnings">
670  
671 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
672 <
673 <    <javac srcdir="${4jdk8src.dir}"
674 <           destdir="${build.4jdk8.classes.dir}"
675 <           debug="${build.debug}"
676 <           debuglevel="${build.debuglevel}"
677 <           deprecation="${build.deprecation}"
716 <           source="8"
717 <           target="8"
718 <           classpath=""
719 <           bootclasspath="${bootclasspath8}"
720 <           includeAntRuntime="false"
721 <           includeJavaRuntime="false"
722 <           executable="${javac8}"
723 <           fork="true">
671 >  <!-- old branches no longer maintained.  build support deleted -->
672 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
673 >  <!-- jsr166 4jdk7 (no longer maintained) -->
674 >  <!-- jsr166x (no longer maintained) -->
675 >  <!-- jsr166y (no longer maintained) -->
676 >  <!-- extra166y (no longer maintained) -->
677 >  <!-- jsr166e (no longer maintained) -->
678  
679 <      <include name="**/*.java"/>
726 <      <compilerarg value="-Xprefer:source"/>
727 <      <compilerarg value="-XDignore.symbol.file=true"/>
728 <      <compilerarg value="-Xlint:all"/>
729 <      <compilerarg value="-Xdoclint:all/protected"/>
730 <      <compilerarg line="${build.args}"/>
731 <
732 <    </javac>
733 <  </target>
734 <
735 <
736 <  <target name="4jdk8jar"
737 <          depends="4jdk8compile"
738 <          description="Builds library jar from compiled sources">
739 <
740 <    <jar destfile="${4jdk8product.jar}">
741 <      <fileset dir="${build.4jdk8.classes.dir}"/>
742 <      <manifest>
743 <        <attribute name="Built-By" value="${user.name}"/>
744 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
745 <      </manifest>
746 <    </jar>
747 <
748 <  </target>
749 <
750 <
751 <  <target name="4jdk8-tck"
752 <          depends="4jdk8jar"
753 <          description="Runs tck tests for jsr166-4jdk8 directly">
754 <
755 <    <run-tck-tests
756 <      target="8"
757 <      workdir="${build.4jdk8.dir}"
758 <      classes="${4jdk8product.jar}">
759 <      <javac-elements>
760 <        <!-- JDK9+ test classes -->
761 <        <exclude name="*9Test.java"/>
762 <        <exclude name="*10Test.java"/>
763 <      </javac-elements>
764 <    </run-tck-tests>
765 <  </target>
766 <
767 <
768 <  <target name="4jdk8-jtreg"
769 <          depends="4jdk8jar"
770 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
771 <    <run-jtreg-tests
772 <       target="8"
773 <       workdir="${build.4jdk8.dir}"
774 <       classes="${4jdk8product.jar}"/>
775 <  </target>
776 <
777 <
778 <  <target name="4jdk8-test"
779 <          depends="4jdk8-tck, 4jdk8-jtreg"
780 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
781 <  </target>
782 <
783 <
784 <  <target name="4jdk8docs"
785 <          description="Builds javadocs for src/jdk8 to dist dir">
786 <
787 <    <delete dir="${4jdk8docs.dir}"/>
788 <    <mkdir dir="${4jdk8docs.dir}"/>
789 <
790 <    <javadoc destdir="${4jdk8docs.dir}"
791 <             packagenames="none"
792 <             link="${java8.api.url}"
793 <             overview="${4jdk8src.dir}/intro.html"
794 <             access="${build.javadoc.access}"
795 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
796 <             classpath=""
797 <             executable="${javadoc8}"
798 <             failonerror = "true">
799 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
800 <        <include name="**/*.java"/>
801 <      </fileset>
802 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
803 <      <arg value="-XDignore.symbol.file=true"/>
804 <      <arg value="-tag"/>
805 <      <arg value="${javadoc.jls.option}"/>
806 <      <arg value="-tag"/>
807 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
808 <      <arg value="-tag"/>
809 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
810 <      <arg value="-tag"/>
811 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
812 <    </javadoc>
813 <  </target>
814 <
815 <
816 <  <target name="4jdk8dist"
817 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
818 <          description="Puts all distributable products in single hierarchy"/>
819 <
820 <
821 <  <target name="4jdk8clean"
822 <          description="Removes all 4jdk8 build products">
823 <
824 <    <delete dir="${build.4jdk8.dir}"/>
825 <
826 <  </target>
827 <
828 <
829 <  <target name="4jdk8dist-jar"
830 <          depends="4jdk8clean, 4jdk8jar">
831 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
832 <  </target>
679 > <!-- Find buglets that can be detected by static build tools -->
680  
681 + <!--   <target name="lint"> -->
682 + <!--     <antcall target="dists"> -->
683 + <!--       <param name="build.javadoc.access" value="protected"/> -->
684 + <!--     </antcall> -->
685 + <!--   </target> -->
686  
687 <  <target name="4jdk8dist-docs"
688 <          depends="4jdk8clean, 4jdk8docs">
689 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
687 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
688 >  <target name="doclint-private">
689 >    <antcall target="dist">
690 >      <param name="build.javadoc.access" value="private"/>
691 >    </antcall>
692    </target>
693  
694  
695 + <!-- ==============================================================
696 +  Experimental errorprone support
697 +  https://errorprone.info
698 +  https://errorprone.info/docs/installation
699 +  https://github.com/google/error-prone/issues/1143
700 + =================================================================== -->
701 +  <path id="errorprone.processorpath.path">
702 +    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
703 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
704 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
705 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
706 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
707 +  </path>
708 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
709 +  <property name="errorprone.jsr166.user.flags" value=""/>
710 +  <property name="errorprone.jsr166.flags"
711 +            value="-Xep:HashtableContains:OFF
712 +                   -Xep:JdkObsolete:OFF
713 +                   -Xep:MissingOverride:OFF
714 +                   -Xep:MissingFail:OFF
715 +                   -Xep:ThreadPriorityCheck:OFF
716 +                   -Xep:MixedArrayDimensions:ERROR
717 +                   -Xep:RemoveUnusedImports:ERROR
718 +                   -Xep:EmptyIf:ERROR
719 +                   -Xep:MultipleTopLevelClasses:ERROR
720 +                   -Xep:ClassName:ERROR
721 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
722 +                   -Xep:RedundantThrows:ERROR
723 +                   -Xep:IdentityBinaryExpression:WARN
724 +                   -Xep:ConstructorInvokesOverridable:WARN
725 +                   -Xep:MethodCanBeStatic:WARN
726 +                   ${errorprone.jsr166.user.flags}"/>
727 +  <!-- -Xep:WildcardImport:ERROR -->
728 +  <property name="errorprone.jsr166.test.flags"
729 +            value="-Xep:StringSplitter:OFF
730 +                   -Xep:BoxedPrimitiveConstructor:OFF
731 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
732 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
733 +  <target name="errorprone"
734 +          depends="clean, configure-compiler"
735 +          description="Run errorprone over jsr166 source code (experimental)">
736  
737 <  <!-- jsr166 4jdk7 -->
738 <
739 <  <target name="4jdk7compile"
845 <          depends="configure-compiler"
846 <          description="Compiles src/jdk7 sources, targeting jdk7">
847 <
848 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
849 <
850 <    <javac srcdir="${4jdk7src.dir}"
851 <           destdir="${build.4jdk7.classes.dir}"
852 <           debug="${build.debug}"
853 <           debuglevel="${build.debuglevel}"
854 <           deprecation="${build.deprecation}"
855 <           source="6"
856 <           target="6"
857 <           classpath=""
858 <           bootclasspath="${bootclasspath6}"
859 <           includeAntRuntime="false"
860 <           includeJavaRuntime="false"
861 <           executable="${javac7}"
862 <           fork="true">
863 <
864 <      <include name="**/*.java"/>
865 <      <compilerarg value="-Xprefer:source"/>
866 <      <compilerarg value="-XDignore.symbol.file=true"/>
867 <      <compilerarg value="-Xlint:all"/>
868 <      <compilerarg value="-Werror"/>
869 <      <compilerarg line="${build.args}"/>
870 <
871 <    </javac>
872 <  </target>
873 <
874 <  <target name="4jdk7doclint"
875 <          depends="configure-compiler"
876 <          description="Finds doclint warnings">
877 <
878 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
737 >    <local name="destdir"/>
738 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
739 >    <mkdir dir="${destdir}"/>
740  
741 <    <javac srcdir="${4jdk7src.dir}"
742 <           destdir="${build.4jdk7.classes.dir}"
741 >    <javac srcdir="${src.dir}"
742 >           destdir="${destdir}"
743             debug="${build.debug}"
744             debuglevel="${build.debuglevel}"
745             deprecation="${build.deprecation}"
885           source="6"
886           target="6"
746             classpath=""
888           bootclasspath="${bootclasspath6}"
747             includeAntRuntime="false"
748             includeJavaRuntime="false"
749 <           executable="${javac8}"
749 >           encoding="ASCII"
750 >           executable="${build.main.javac}"
751             fork="true">
752  
753        <include name="**/*.java"/>
754 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
755 +      <compilerarg value="-J--illegal-access=permit"/>
756 +      <compilerarg value="-XDcompilePolicy=simple"/>
757 +      <compilerarg value="-processorpath"/>
758 +      <compilerarg pathref="errorprone.processorpath.path"/>
759 +      <compilerarg value="-Xplugin:ErrorProne
760 +                          ${errorprone.jsr166.flags}"/>
761 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
762        <compilerarg value="-Xprefer:source"/>
763        <compilerarg value="-XDignore.symbol.file=true"/>
764        <compilerarg value="-Xlint:all"/>
765 <      <compilerarg value="-Xdoclint:all/protected"/>
765 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
766 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
767        <compilerarg line="${build.args}"/>
900
768      </javac>
902  </target>
903
904
905  <target name="4jdk7jar"
906          depends="4jdk7compile"
907          description="Builds library jar from compiled sources">
769  
770 <    <jar destfile="${4jdk7product.jar}">
771 <      <fileset dir="${build.4jdk7.classes.dir}"/>
911 <      <manifest>
912 <        <attribute name="Built-By" value="${user.name}"/>
913 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
914 <      </manifest>
770 >    <jar destfile="${product.jar}">
771 >      <fileset dir="${destdir}"/>
772      </jar>
773  
917  </target>
918
919
920  <target name="4jdk7-tck"
921          depends="4jdk7jar"
922          description="Runs tck tests for jsr166-4jdk7 directly">
923
774      <run-tck-tests
775 <      target="7"
776 <      workdir="${build.4jdk7.dir}"
777 <      classes="${4jdk7product.jar}">
775 >      target="${java.runtime.target}"
776 >      workdir="${build.dir}"
777 >      classes="${product.jar}">
778        <javac-elements>
779 <        <!-- JDK8+ test classes -->
780 <        <exclude name="*8Test.java"/>
781 <        <exclude name="*9Test.java"/>
782 <        <exclude name="*10Test.java"/>
783 <        <exclude name="DoubleAccumulatorTest.java"/>
784 <        <exclude name="DoubleAdderTest.java"/>
785 <        <exclude name="LongAccumulatorTest.java"/>
786 <        <exclude name="LongAdderTest.java"/>
937 <        <exclude name="CompletableFutureTest.java"/>
938 <        <exclude name="SplittableRandomTest.java"/>
939 <        <exclude name="StampedLockTest.java"/>
940 <        <exclude name="SubmissionPublisherTest.java"/>
779 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
780 >        <compilerarg value="-J--illegal-access=permit"/>
781 >        <compilerarg value="-XDcompilePolicy=simple"/>
782 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
783 >        <compilerarg value="-Xplugin:ErrorProne
784 >                            ${errorprone.jsr166.flags}
785 >                            ${errorprone.jsr166.test.flags}"/>
786 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
787        </javac-elements>
788      </run-tck-tests>
789    </target>
790  
791 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
792 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
793 +  <target name="errorprone-jtreg"
794 +          depends="jar"
795 +          description="Run errorprone over jtreg tests (experimental)">
796  
797 <  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
798 <  <target name="4jdk7-tck-junit"
799 <          depends="4jdk7compile">
800 <
801 <    <junit printsummary="true"
802 <           showoutput="true"
803 <           errorProperty="junit.failed"
804 <           failureProperty="junit.failed"
805 <           includeantruntime="true"
806 <           jvm="${java7}"
807 <           fork="true">
808 <
809 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
810 <      <jvmarg value="-server"/>
811 <
797 >    <run-jtreg-tests
798 >       target="${java.runtime.target}"
799 >       workdir="${build.dir}"
800 >       classes="${product.jar}"
801 >       verbose="all">
802 >      <jtreg-elements>
803 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
804 >        <arg value="-javacoption:-processorpath"/>
805 >        <arg value="-javacoption:${errorprone.processorpath}"/>
806 >        <arg value="-javacoption:-Xplugin:ErrorProne
807 >                            ${errorprone.jsr166.flags}
808 >                            ${errorprone.jsr166.test.flags}
809 >                            -Xep:MultipleTopLevelClasses:WARN
810 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
811 >      </jtreg-elements>
812 >    </run-jtreg-tests>
813 >  </target>
814 >
815 >
816 > <!-- ==============================================================
817 >  Running guava tests against jsr166 code
818 > =================================================================== -->
819 >
820 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
821 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
822 > <!-- <property name="guava.version" value="21.0"/> -->
823 >
824 > <!-- HOWTO debug print a path id -->
825 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
826 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
827 >
828 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
829 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
830 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
831 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
832 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
833 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
834 >
835 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
836 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
837 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
838 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
839 >
840 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
841 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
842 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
843 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
844 >
845 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
846 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
847 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
848 >
849 >  <target name="init-ivy">
850 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
851 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
852 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
853 >             classpath="${build.dir}/ivy.jar"/>
854 >  </target>
855 >
856 >  <target name="guava-tests" depends="jar, init-ivy"
857 >          description="Guava tests run against jsr166 collections">
858 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
859 >    <mkdir dir="${guava.dir}"/>
860 >    <ivy:retrieve pathid="guava.testlib.classpath"
861 >      type="jar,bundle" inline="true" conf="default,master"
862 >      pattern="${guava.dir}/[artifact].[ext]"
863 >      organisation="com.google.guava" module="guava-testlib"/>
864 >    <property name="guava.version" value="21.0"/>
865 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
866 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
867 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
868 >           jvm="${build.main.java}" fork="true">
869 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
870 >      <formatter type="brief"/>
871        <classpath>
872 <        <pathelement location="${junit.jar}"/>
873 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
872 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
873 >        <path refid="guava.testlib.classpath"/>
874        </classpath>
875  
876 <      <formatter type="brief"/>
877 <
968 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
969 <      </test>
970 <
876 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
877 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
878      </junit>
879    </target>
880  
974  <target name="4jdk7-jtreg"
975          depends="4jdk7jar"
976          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
977    <run-jtreg-tests
978       target="7"
979       workdir="${build.4jdk7.dir}"
980       classes="${4jdk7product.jar}"/>
981  </target>
982
983
984  <target name="4jdk7-test"
985          depends="4jdk7-tck, 4jdk7-jtreg"
986          description="Runs tck and jtreg tests for jsr166-4jdk7">
987  </target>
988
989
990  <target name="4jdk7docs"
991          description="Builds javadocs for src/jdk7 to dist dir">
992
993    <delete dir="${4jdk7docs.dir}"/>
994    <mkdir dir="${4jdk7docs.dir}"/>
995
996    <javadoc destdir="${4jdk7docs.dir}"
997             packagenames="none"
998             link="${java7.api.url}"
999             overview="${4jdk7src.dir}/intro.html"
1000             access="${build.javadoc.access}"
1001             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1002             classpath=""
1003             executable="${javadoc7}"
1004             failonerror = "true">
1005      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1006        <include name="**/*.java"/>
1007      </fileset>
1008      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1009      <arg value="-XDignore.symbol.file=true"/>
1010    </javadoc>
1011  </target>
1012
1013
1014  <target name="4jdk7dist"
1015          depends="4jdk7dist-jar, 4jdk7dist-docs"
1016          description="Puts all distributable products in single hierarchy"/>
1017
1018
1019  <target name="4jdk7clean"
1020          description="Removes all 4jdk7 build products">
1021
1022    <delete dir="${build.4jdk7.dir}"/>
1023
1024  </target>
1025
1026
1027  <target name="4jdk7dist-jar"
1028          depends="4jdk7clean, 4jdk7jar">
1029    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1030  </target>
1031
1032
1033  <target name="4jdk7dist-docs"
1034          depends="4jdk7clean, 4jdk7docs">
1035    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1036  </target>
1037
1038
1039  <!-- jsr166x -->
1040
1041  <target name="jsr166xcompile"
1042          depends="configure-compiler"
1043          description="Compiles jsr166x sources to build dir">
1044
1045    <mkdir dir="${build.jsr166x.classes.dir}"/>
1046
1047    <javac srcdir="${topsrc.dir}"
1048           destdir="${build.jsr166x.classes.dir}"
1049           debug="${build.debug}"
1050           debuglevel="${build.debuglevel}"
1051           deprecation="${build.deprecation}"
1052           classpath=""
1053           bootclasspath="${bootclasspath6}"
1054           source="5"
1055           target="5"
1056           includeAntRuntime="false"
1057           includeJavaRuntime="false"
1058           executable="${javac7}"
1059           fork="true">
1060
1061      <include name="jsr166x/**/*.java"/>
1062      <compilerarg value="-XDignore.symbol.file=true"/>
1063      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1064      <compilerarg value="-Werror"/>
1065      <compilerarg line="${build.args}"/>
1066
1067    </javac>
1068  </target>
1069
1070
1071  <target name="jsr166xjar"
1072          depends="jsr166xcompile"
1073          description="Builds library jar from compiled sources">
1074
1075    <jar destfile="${jsr166x.jar}">
1076      <fileset dir="${build.jsr166x.classes.dir}"/>
1077      <manifest>
1078        <attribute name="Built-By" value="${user.name}"/>
1079        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1080      </manifest>
1081    </jar>
1082
1083  </target>
1084
1085
1086  <target name="jsr166xdocs"
1087          description="Builds javadocs to dist dir">
1088
1089    <delete dir="${jsr166xdocs.dir}"/>
1090    <mkdir dir="${jsr166xdocs.dir}"/>
1091
1092    <javadoc destdir="${jsr166xdocs.dir}"
1093             packagenames="jsr166x.*"
1094             link="${java.api.url}"
1095             access="${build.javadoc.access}"
1096             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1097             bootclasspath="${bootclasspath6}"
1098             source="5"
1099             executable="${javadoc7}"
1100             failonerror = "true">
1101      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1102      <arg value="-XDignore.symbol.file=true"/>
1103
1104    </javadoc>
1105  </target>
1106
1107
1108  <target name="jsr166xdist"
1109          depends="jsr166xdist-jar, jsr166xdist-docs"
1110          description="Puts all distributable products in single hierarchy"/>
1111
1112
1113  <target name="jsr166xclean"
1114          description="Removes all jsr166x build products">
1115
1116    <delete dir="${build.jsr166x.dir}"/>
1117
1118  </target>
1119
1120
1121  <target name="jsr166xdist-jar"
1122          depends="jsr166xclean, jsr166xjar">
1123    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1124  </target>
1125
1126  <target name="jsr166xdist-docs"
1127          depends="jsr166xclean, jsr166xdocs">
1128    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1129  </target>
1130
1131  <!-- jsr166y -->
1132
1133
1134  <target name="jsr166ycompile"
1135          depends="configure-compiler"
1136          description="Compiles jsr166y sources">
1137
1138    <mkdir dir="${build.jsr166y.classes.dir}"/>
1139
1140    <javac srcdir="${topsrc.dir}"
1141           destdir="${build.jsr166y.classes.dir}"
1142           debug="${build.debug}"
1143           debuglevel="${build.debuglevel}"
1144           deprecation="${build.deprecation}"
1145           source="6"
1146           target="6"
1147           classpath=""
1148           bootclasspath="${bootclasspath6}"
1149           includeAntRuntime="false"
1150           includeJavaRuntime="false"
1151           executable="${javac7}"
1152           fork="true">
1153
1154      <include name="jsr166y/**/*.java"/>
1155      <compilerarg value="-XDignore.symbol.file=true"/>
1156      <compilerarg value="-Xlint:all"/>
1157      <compilerarg value="-Werror"/>
1158      <compilerarg line="${build.args}"/>
1159
1160    </javac>
1161  </target>
1162
1163
1164  <target name="jsr166yjar"
1165          depends="jsr166ycompile"
1166          description="Builds library jar from compiled sources">
1167
1168    <jar destfile="${jsr166y.jar}" index="true">
1169      <fileset dir="${build.jsr166y.classes.dir}"/>
1170      <manifest>
1171        <attribute name="Built-By" value="${user.name}"/>
1172        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1173      </manifest>
1174    </jar>
1175
1176  </target>
1177
1178
1179  <target name="jsr166ydocs"
1180          description="Builds javadocs to dist dir">
1181
1182    <delete dir="${jsr166ydocs.dir}"/>
1183    <mkdir dir="${jsr166ydocs.dir}"/>
1184
1185    <javadoc destdir="${jsr166ydocs.dir}"
1186             packagenames="jsr166y.*"
1187             link="${java.api.url}"
1188             access="${build.javadoc.access}"
1189             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1190             bootclasspath="${bootclasspath6}"
1191             source="6"
1192             executable="${javadoc7}"
1193             failonerror = "true">
1194      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1195      <arg value="-XDignore.symbol.file=true"/>
1196
1197    </javadoc>
1198  </target>
1199
1200
1201  <target name="jsr166ydist"
1202          depends="jsr166ydist-jar, jsr166ydist-docs"
1203          description="Puts all distributable products in single hierarchy"/>
1204
1205
1206  <target name="jsr166yclean"
1207          description="Removes all jsr166y build products">
1208
1209    <delete dir="${build.jsr166y.dir}"/>
1210
1211  </target>
1212
1213
1214  <target name="jsr166ydist-jar"
1215          depends="jsr166yclean, jsr166yjar">
1216    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1217  </target>
1218
1219  <target name="jsr166ydist-docs"
1220          depends="jsr166yclean, jsr166ydocs">
1221    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1222  </target>
1223
1224
1225  <!-- extra166y -->
1226
1227
1228  <target name="extra166ycompile"
1229          depends="configure-compiler, jsr166yjar"
1230          description="Compiles extra166y sources">
1231
1232    <mkdir dir="${build.extra166y.classes.dir}"/>
1233
1234    <javac srcdir="${topsrc.dir}"
1235           destdir="${build.extra166y.classes.dir}"
1236           debug="${build.debug}"
1237           debuglevel="${build.debuglevel}"
1238           deprecation="${build.deprecation}"
1239           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1240           classpath=""
1241           source="6"
1242           target="6"
1243           includeAntRuntime="false"
1244           includeJavaRuntime="false"
1245           executable="${javac7}"
1246           fork="true">
1247
1248      <include name="extra166y/**/*.java"/>
1249      <compilerarg value="-XDignore.symbol.file=true"/>
1250      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1251      <compilerarg value="-Werror"/>
1252      <compilerarg line="${build.args}"/>
1253
1254    </javac>
1255  </target>
1256
1257
1258  <target name="extra166yjar"
1259          depends="extra166ycompile"
1260          description="Builds library jar from compiled sources">
1261
1262    <jar destfile="${extra166y.jar}" index="true">
1263      <fileset dir="${build.extra166y.classes.dir}"/>
1264      <manifest>
1265        <attribute name="Built-By" value="${user.name}"/>
1266        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1267      </manifest>
1268    </jar>
1269
1270  </target>
1271
1272
1273  <target name="extra166ydocs"
1274          description="Builds javadocs to build dir">
1275
1276    <delete dir="${extra166ydocs.dir}"/>
1277    <mkdir dir="${extra166ydocs.dir}"/>
1278
1279    <javadoc destdir="${extra166ydocs.dir}"
1280             packagenames="extra166y.*"
1281             link="${java.api.url}"
1282             access="${build.javadoc.access}"
1283             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1284             bootclasspath="${bootclasspath6}"
1285             source="6"
1286             executable="${javadoc7}">
1287      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1288      <arg value="-XDignore.symbol.file=true"/>
1289
1290    </javadoc>
1291  </target>
1292
1293
1294  <target name="extra166ydist"
1295          depends="extra166ydist-jar, extra166ydist-docs"
1296          description="Puts all distributable products in single hierarchy"/>
1297
1298
1299  <target name="extra166yclean"
1300          description="Removes all extra166y build products">
1301
1302    <delete dir="${build.extra166y.dir}"/>
1303
1304  </target>
1305
1306
1307  <target name="extra166ydist-jar"
1308          depends="extra166yclean, extra166yjar">
1309    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1310  </target>
1311
1312  <target name="extra166ydist-docs"
1313          depends="extra166yclean, extra166ydocs">
1314    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1315  </target>
1316
1317  <!-- jsr166e -->
1318
1319  <property name="build.jsr166e.java.version" value="6"/>
1320  <property name="build.jsr166e.javac" value="${javac6}"/>
1321
1322  <target name="jsr166ecompile"
1323          depends="configure-compiler"
1324          description="Compiles jsr166e sources">
1325
1326    <mkdir dir="${build.jsr166e.classes.dir}"/>
1327
1328    <javac srcdir="${topsrc.dir}"
1329           destdir="${build.jsr166e.classes.dir}"
1330           debug="${build.debug}"
1331           debuglevel="${build.debuglevel}"
1332           deprecation="${build.deprecation}"
1333           source="${build.jsr166e.java.version}"
1334           target="${build.jsr166e.java.version}"
1335           classpath=""
1336           includeAntRuntime="false"
1337           includeJavaRuntime="false"
1338           executable="${build.jsr166e.javac}"
1339           fork="true">
1340
1341      <include name="jsr166e/**/*.java"/>
1342      <compilerarg value="-XDignore.symbol.file=true"/>
1343      <compilerarg value="-Xlint:all"/>
1344      <compilerarg value="-Werror"/>
1345      <compilerarg line="${build.args}"/>
1346
1347    </javac>
1348  </target>
1349
1350  <!-- jsr166e: find doclint errors -->
1351  <target name="jsr166edoclint">
1352
1353    <mkdir dir="${build.jsr166e.classes.dir}"/>
1354
1355    <javac srcdir="${topsrc.dir}"
1356           destdir="${build.jsr166e.classes.dir}"
1357           debug="${build.debug}"
1358           debuglevel="${build.debuglevel}"
1359           deprecation="${build.deprecation}"
1360           source="${build.jsr166e.java.version}"
1361           target="${build.jsr166e.java.version}"
1362           classpath=""
1363           bootclasspath="${bootclasspath6}"
1364           includeAntRuntime="false"
1365           includeJavaRuntime="false"
1366           executable="${javac8}"
1367           fork="true">
1368
1369      <include name="jsr166e/**/*.java"/>
1370      <compilerarg value="-XDignore.symbol.file=true"/>
1371      <compilerarg value="-Xlint:all"/>
1372      <compilerarg value="-Werror"/>
1373      <compilerarg value="-Xdoclint:all/protected"/>
1374
1375    </javac>
1376  </target>
1377
1378
1379  <target name="jsr166ejar"
1380          depends="jsr166ecompile"
1381          description="Builds library jar from compiled sources">
1382
1383    <jar destfile="${jsr166e.jar}" index="true">
1384      <fileset dir="${build.jsr166e.classes.dir}"/>
1385      <manifest>
1386        <attribute name="Built-By" value="${user.name}"/>
1387        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1388      </manifest>
1389    </jar>
1390
1391  </target>
1392
1393
1394  <target name="jsr166edocs"
1395          description="Builds javadocs to build dir">
1396
1397    <delete dir="${jsr166edocs.dir}"/>
1398    <mkdir dir="${jsr166edocs.dir}"/>
1399
1400    <javadoc destdir="${jsr166edocs.dir}"
1401             packagenames="jsr166e.*"
1402             link="${java.api.url}"
1403             access="${build.javadoc.access}"
1404             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1405             source="${build.jsr166e.java.version}"
1406             executable="${javadoc7}"
1407             failonerror = "true">
1408      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1409      <arg value="-XDignore.symbol.file=true"/>
1410
1411    </javadoc>
1412  </target>
1413
1414
1415  <target name="jsr166e-tck-one-java-version"
1416          depends="jsr166ejar">
1417
1418    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1419
1420    <run-tck-tests
1421      tck.src.dir="${test.src.dir}/tck-jsr166e"
1422      target="${build.jsr166e.java.version}"
1423      workdir="${build.jsr166e.dir}"
1424      classes="${jsr166e.jar}"/>
1425  </target>
1426
1427  <target name="jsr166e-tck"
1428          description="Runs tck tests for jsr166e for multiple java versions">
1429
1430 <!--     <antcall target="clean"/> -->
1431 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1432 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1433 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1434 <!--     </antcall> -->
1435
1436    <antcall target="clean"/>
1437    <antcall target="jsr166e-tck-one-java-version">
1438      <param name="build.jsr166e.java.version" value="7"/>
1439      <param name="build.jsr166e.javac" value="${javac7}"/>
1440    </antcall>
1441
1442    <antcall target="clean"/>
1443    <antcall target="jsr166e-tck-one-java-version">
1444      <param name="build.jsr166e.java.version" value="6"/>
1445      <param name="build.jsr166e.javac" value="${javac6}"/>
1446    </antcall>
1447  </target>
1448
1449
1450  <target name="jsr166e-test"
1451          depends="jsr166e-tck"
1452          description="Runs all tests for jsr166e">
1453  </target>
1454
1455  <target name="jsr166edist"
1456          depends="jsr166edist-jar, jsr166edist-docs"
1457          description="Puts all distributable products in single hierarchy"/>
1458
1459
1460  <target name="jsr166eclean"
1461          description="Removes all jsr166e build products">
1462    <delete dir="${build.jsr166e.dir}"/>
1463  </target>
1464
1465
1466  <target name="jsr166edist-jar"
1467          depends="jsr166eclean, jsr166ejar">
1468    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1469  </target>
1470
1471  <target name="jsr166edist-docs"
1472          depends="jsr166eclean, jsr166edocs">
1473    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1474  </target>
1475
1476
1477 <!-- Find buglets that can be detected by static build tools -->
1478
1479  <target name="lint">
1480    <antcall target="dists">
1481      <param name="build.javadoc.access" value="public"/>
1482    </antcall>
1483  </target>
1484
1485 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1486  <target name="lint-private">
1487    <antcall target="dist">
1488      <param name="build.javadoc.access" value="private"/>
1489    </antcall>
1490  </target>
1491
1492
881   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines