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.225 by jsr166, Thu Nov 24 16:14:59 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 64 | Line 67
67    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
68    <property name="build.loops.dir"             location="${build.dir}/loops"/>
69  
67  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
69  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71
72  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
73  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
74  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
75  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
76
77  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
78  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
79  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
80  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
81
82  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
83  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
84  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
85  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
86
70    <!-- JDK locations -->
71    <property name="jdks.home"  location="${user.home}/jdk"/>
72  
# Line 95 | Line 78
78      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
79      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
80      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
81 <    <local name="have.java.base"/>
99 <    <available property="have.java.base"
100 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
101 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
102 <      if:set="have.java.base"/>
103 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
104 <      unless:set="have.java.base"/>
105 <    <local name="modules"/>
106 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
107 <    <local name="boot.jar.dir"/>
108 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
109 <    <path id="bootclasspath@{v}" unless:set="modules">
110 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
111 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
112 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
113 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
114 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
115 <    </path>
116 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
81 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
82      </sequential>
83    </macrodef>
84  
# Line 129 | Line 94
94      </sequential>
95    </macrodef>
96  
97 <  <defjdklocations v="6"/>
98 <  <defjdklocations v="7"/>
99 <  <defjdklocations v="8"/>
100 <  <defjdklocations v="9"/>
97 >  <defjdklocations v="11"/>
98 >  <defjdklocations v="12"/>
99 >  <defjdklocations v="13"/>
100 >  <defjdklocations v="14"/>
101 >  <defjdklocations v="15"/>
102  
103    <!-- Source locations -->
104    <property name="src.dir"              location="${basedir}/src/main"/>
105    <property name="test.src.dir"         location="${basedir}/src/test"/>
106    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
107    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
108 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
109 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
110 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
111 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
108 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
109 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
110 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
111 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
112 >  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
113 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
114    <property name="lib.dir"              location="${basedir}/lib"/>
115    <property name="dist.dir"             location="${basedir}/dist"/>
116    <property name="topsrc.dir"           location="${basedir}/src"/>
149  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
154  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
117  
118    <!-- Javadoc locations -->
119    <property name="docs.dir"          location="${build.dir}/docs"/>
120 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
163 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
164 <
165 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
171 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
120 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
121  
122    <!-- Jar locations -->
123    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
180  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
124    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
125  
126    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
127 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
128 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
129 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
130 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
131 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
132 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
133 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
134 <  <!-- Default jdk doc location (latest stable release seems best) -->
135 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
127 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
128 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
129 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
130 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
131 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
132 >  <!-- The location of jdk early access docs (RIP) -->
133 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
134 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
135 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
136 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
137 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
138 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
139 >  <property name="java14.docroot.url" value="https://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 204 | Line 154
154    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
155             classpath="${lib.dir}/jtreg.jar" />
156  
157 <  <!-- Tck options; see JSR166TestCase.java
157 >  <!-- Tck configuration options; see JSR166TestCase.java
158     To profile a single tck test class:
159     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
160     To stress test a single tck test class:
# Line 227 | Line 177
177  
178      <sequential>
179  
230    <local name="modules"/>
231    <condition property="modules">
232      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233    </condition>
234
180      <mkdir dir="@{workdir}/tck-classes"/>
181  
182      <javac srcdir="@{tck.src.dir}"
# Line 251 | Line 196
196        <include name="*.java"/>
197        <compilerarg value="-XDignore.symbol.file=true"/>
198        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
199 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
200 <      <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
199 >      <compilerarg value="-Xdoclint:reference/private"/>
200 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
201        <compilerarg line="${build.args}"/>
202        <javac-elements/>
203  
# Line 262 | Line 207
207            failonerror="true"
208            jvm="${java@{target}}"
209            fork="true">
210 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
211 <        <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
212 <        <jvmarg line="@{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"/>
275      <jtreg dir="${jtreg@{target}.src.dir}"
276             jdk="${jdk@{target}.home}"
277             workDir="@{workdir}/JTwork">
278        <patternset refid="jdk@{target}.jtreg.tests"/>
279 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
280 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
281 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
279 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
280 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
281 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
282        <arg value="-agentvm"/>
283        <arg value="-noreport"/>
284 <      <arg value="-verbose:${jtreg.verbose}"/>
284 >      <arg value="-verbose:@{verbose}"/>
285        <arg value="-vmoptions:-esa -ea"/>
286        <arg value="-automatic"/>
287        <arg value="-k:!ignore"/>
288        <arg line="@{jtregflags}"/>
289        <arg line="${jtreg.flags}"/>
290 +      <jtreg-elements/>
291      </jtreg>
292      </sequential>
293    </macrodef>
# Line 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 396 | Line 346
346             fork="true">
347  
348        <include name="**/*.java"/>
349 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
349 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
350        <compilerarg value="-Xprefer:source"/>
351        <compilerarg value="-XDignore.symbol.file=true"/>
352 <      <compilerarg value="-Xlint:all"/>
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 427 | 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" -->
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}"
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 <      <arg value="-Xmodule:java.base"/>
423 <      <arg value="-tag"/>
424 <      <arg value="${javadoc.jls.option}"/>
425 < <!-- @apiNote currently unused -->
426 < <!--       <arg value="-tag"/> -->
427 < <!--       <arg value="apiNote:a:API Note:"/> -->
428 <      <arg value="-tag"/>
429 <      <arg value="implSpec:a:Implementation Requirements:"/>
460 <      <arg value="-tag"/>
461 <      <arg value="implNote:a:Implementation Note:"/>
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"/> -->
432 < <!--       <arg value="revised:X"/> -->
465 < <!--       <arg value="-tag"/> -->
466 < <!--       <arg value="spec:X"/> -->
431 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
432 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
433      </javadoc>
434    </target>
435  
# Line 473 | Line 439
439            description="Puts all distributable products in single hierarchy"/>
440  
441  
476  <target name="release"
477          depends="dist"
478          description="Puts entire CVS tree, plus distribution productions, in a jar">
479
480    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
481
482    <jar basedir="${basedir}" destfile="${release.jar}">
483      <!-- <exclude name="build/**"/> -->
484      <exclude name="${release.jar}"/>
485      <exclude name="user.properties"/>
486      <exclude name="etc/notes/**"/>
487      <exclude name="src/emulation/**"/>
488      <exclude name="**/SyntaxTest.java"/>
489      <exclude name="**/SuperfluousAbstract.java"/>
490      <manifest>
491        <attribute name="Built-By" value="${user.name}"/>
492        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
493      </manifest>
494    </jar>
495  </target>
496
497
442    <target name="clean"
443            description="Removes all build products">
500
444      <delete dir="${build.dir}"/>
502
445    </target>
446  
447  
448    <target name="dist-clean"
449            description="Removes all build and distribution products">
508
450      <delete dir="${build.dir}"/>
451      <delete dir="${dist.dir}"/>
511
452    </target>
453  
454  
# Line 523 | 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 554 | 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>
601 <        <not> <antversion atleast="1.9.1"/> </not>
602 <      </condition>
628 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
629      </fail>
630  
631      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 617 | Line 643
643    </target>
644  
645  
620
621  <!-- Various demos and test programs -->
622
623
624  <!-- description="Benchmark from Doug Lea's AQS paper" -->
625  <target name="loops" depends="configure-compiler">
626
627    <mkdir dir="${build.loops.dir}"/>
628
629    <javac srcdir="${loops.src.dir}"
630          destdir="${build.loops.dir}"
631            debug="${build.debug}"
632       debuglevel="${build.debuglevel}"
633      deprecation="${build.deprecation}"
634           source="${build.sourcelevel}"
635           target="${build.sourcelevel}"
636         encoding="ASCII"
637             fork="true">
638
639      <compilerarg line="${build.args}"/>
640      <classpath refid="loops.classpath"/>
641      <compilerarg value="-XDignore.symbol.file=true"/>
642
643    </javac>
644
645    <java classname="ALoops" fork="true">
646      <classpath refid="loops.classpath"/>
647    </java>
648
649  </target>
650
651
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 662 | Line 656
656             includeAntRuntime="false"
657             includeJavaRuntime="false"
658             encoding="ASCII"
659 <           executable="${javac9}"
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}"/>
664 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
665 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
666        <compilerarg line="${build.args}"/>
673
667      </javac>
675
676  </target>
677
678
679  <!-- jsr166 4jdk8 -->
680
681  <target name="4jdk8compile"
682          depends="configure-compiler"
683          description="Compiles src/jdk8 sources, targeting jdk8">
684
685    <mkdir dir="${build.4jdk8.classes.dir}"/>
686
687    <javac srcdir="${4jdk8src.dir}"
688           destdir="${build.4jdk8.classes.dir}"
689           debug="${build.debug}"
690           debuglevel="${build.debuglevel}"
691           deprecation="${build.deprecation}"
692           source="8"
693           target="8"
694           classpath=""
695           bootclasspath="${bootclasspath8}"
696           includeAntRuntime="false"
697           includeJavaRuntime="false"
698           encoding="ASCII"
699           executable="${javac8}"
700           fork="true">
701
702      <include name="**/*.java"/>
703      <compilerarg value="-Xprefer:source"/>
704      <compilerarg value="-XDignore.symbol.file=true"/>
705      <compilerarg value="-Xlint:all"/>
706      <compilerarg value="-Werror"/>
707      <compilerarg line="${build.args}"/>
708
709    </javac>
710  </target>
711
712  <target name="4jdk8doclint"
713          depends="configure-compiler"
714          description="Finds doclint warnings">
715
716    <mkdir dir="${build.4jdk8.classes.dir}"/>
717
718    <javac srcdir="${4jdk8src.dir}"
719           destdir="${build.4jdk8.classes.dir}"
720           debug="${build.debug}"
721           debuglevel="${build.debuglevel}"
722           deprecation="${build.deprecation}"
723           source="8"
724           target="8"
725           classpath=""
726           bootclasspath="${bootclasspath8}"
727           includeAntRuntime="false"
728           includeJavaRuntime="false"
729           encoding="ASCII"
730           executable="${javac8}"
731           fork="true">
732
733      <include name="**/*.java"/>
734      <compilerarg value="-Xprefer:source"/>
735      <compilerarg value="-XDignore.symbol.file=true"/>
736      <compilerarg value="-Xlint:all"/>
737      <compilerarg value="-Xdoclint:all/protected"/>
738      <compilerarg line="${build.args}"/>
739
740    </javac>
741  </target>
742
743
744  <target name="4jdk8jar"
745          depends="4jdk8compile"
746          description="Builds library jar from compiled sources">
747
748    <jar destfile="${4jdk8product.jar}">
749      <fileset dir="${build.4jdk8.classes.dir}"/>
750      <manifest>
751        <attribute name="Built-By" value="${user.name}"/>
752        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
753      </manifest>
754    </jar>
755
756  </target>
757
758
759  <target name="4jdk8-tck"
760          depends="4jdk8jar"
761          description="Runs tck tests for jsr166-4jdk8 directly">
762
763    <run-tck-tests
764      target="8"
765      workdir="${build.4jdk8.dir}"
766      classes="${4jdk8product.jar}">
767      <javac-elements>
768        <!-- JDK9+ test classes -->
769        <exclude name="*9Test.java"/>
770        <exclude name="*10Test.java"/>
771      </javac-elements>
772    </run-tck-tests>
773  </target>
774
775
776  <target name="4jdk8-jtreg"
777          depends="4jdk8jar"
778          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
779    <run-jtreg-tests
780       target="8"
781       workdir="${build.4jdk8.dir}"
782       classes="${4jdk8product.jar}"/>
783  </target>
784
785
786  <target name="4jdk8-test"
787          depends="4jdk8-tck, 4jdk8-jtreg"
788          description="Runs tck and jtreg tests for jsr166-4jdk8">
668    </target>
669  
670  
671 <  <target name="4jdk8docs"
672 <          description="Builds javadocs for src/jdk8 to dist dir">
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 <    <delete dir="${4jdk8docs.dir}"/>
796 <    <mkdir dir="${4jdk8docs.dir}"/>
797 <
798 <    <javadoc destdir="${4jdk8docs.dir}"
799 <             packagenames="none"
800 <             link="${java8.api.url}"
801 <             overview="${4jdk8src.dir}/intro.html"
802 <             access="${build.javadoc.access}"
803 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
804 <             classpath=""
805 <             executable="${javadoc8}"
806 <             failonerror = "true">
807 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
808 <        <include name="**/*.java"/>
809 <      </fileset>
810 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
811 <      <arg value="-XDignore.symbol.file=true"/>
812 <      <arg value="-tag"/>
813 <      <arg value="${javadoc.jls.option}"/>
814 < <!-- @apiNote currently unused -->
815 < <!--       <arg value="-tag"/> -->
816 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
817 <      <arg value="-tag"/>
818 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
819 <      <arg value="-tag"/>
820 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
821 <    </javadoc>
822 <  </target>
823 <
824 <
825 <  <target name="4jdk8dist"
826 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
827 <          description="Puts all distributable products in single hierarchy"/>
828 <
829 <
830 <  <target name="4jdk8clean"
831 <          description="Removes all 4jdk8 build products">
832 <
833 <    <delete dir="${build.4jdk8.dir}"/>
834 <
835 <  </target>
836 <
837 <
838 <  <target name="4jdk8dist-jar"
839 <          depends="4jdk8clean, 4jdk8jar">
840 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
841 <  </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"
854 <          depends="configure-compiler"
855 <          description="Compiles src/jdk7 sources, targeting jdk7">
856 <
857 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
858 <
859 <    <javac srcdir="${4jdk7src.dir}"
860 <           destdir="${build.4jdk7.classes.dir}"
861 <           debug="${build.debug}"
862 <           debuglevel="${build.debuglevel}"
863 <           deprecation="${build.deprecation}"
864 <           source="6"
865 <           target="6"
866 <           classpath=""
867 <           bootclasspath="${bootclasspath6}"
868 <           includeAntRuntime="false"
869 <           includeJavaRuntime="false"
870 <           encoding="ASCII"
871 <           executable="${javac7}"
872 <           fork="true">
873 <
874 <      <include name="**/*.java"/>
875 <      <compilerarg value="-Xprefer:source"/>
876 <      <compilerarg value="-XDignore.symbol.file=true"/>
877 <      <compilerarg value="-Xlint:all"/>
878 <      <compilerarg value="-Werror"/>
879 <      <compilerarg line="${build.args}"/>
880 <
881 <    </javac>
882 <  </target>
883 <
884 <  <target name="4jdk7doclint"
885 <          depends="configure-compiler"
886 <          description="Finds doclint warnings">
887 <
888 <    <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}"
895           source="6"
896           target="6"
746             classpath=""
898           bootclasspath="${bootclasspath6}"
747             includeAntRuntime="false"
748             includeJavaRuntime="false"
749             encoding="ASCII"
750 <           executable="${javac8}"
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}"/>
911
768      </javac>
913  </target>
914
769  
770 <  <target name="4jdk7jar"
771 <          depends="4jdk7compile"
918 <          description="Builds library jar from compiled sources">
919 <
920 <    <jar destfile="${4jdk7product.jar}">
921 <      <fileset dir="${build.4jdk7.classes.dir}"/>
922 <      <manifest>
923 <        <attribute name="Built-By" value="${user.name}"/>
924 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
925 <      </manifest>
770 >    <jar destfile="${product.jar}">
771 >      <fileset dir="${destdir}"/>
772      </jar>
773  
928  </target>
929
930
931  <target name="4jdk7-tck"
932          depends="4jdk7jar"
933          description="Runs tck tests for jsr166-4jdk7 directly">
934
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"/>
948 <        <exclude name="CompletableFutureTest.java"/>
949 <        <exclude name="SplittableRandomTest.java"/>
950 <        <exclude name="StampedLockTest.java"/>
951 <        <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 <
979 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
980 <      </test>
981 <
876 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
877 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
878      </junit>
879    </target>
880  
985  <target name="4jdk7-jtreg"
986          depends="4jdk7jar"
987          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
988    <run-jtreg-tests
989       target="7"
990       workdir="${build.4jdk7.dir}"
991       classes="${4jdk7product.jar}"/>
992  </target>
993
994
995  <target name="4jdk7-test"
996          depends="4jdk7-tck, 4jdk7-jtreg"
997          description="Runs tck and jtreg tests for jsr166-4jdk7">
998  </target>
999
1000
1001  <target name="4jdk7docs"
1002          description="Builds javadocs for src/jdk7 to dist dir">
1003
1004    <delete dir="${4jdk7docs.dir}"/>
1005    <mkdir dir="${4jdk7docs.dir}"/>
1006
1007    <javadoc destdir="${4jdk7docs.dir}"
1008             packagenames="none"
1009             link="${java7.api.url}"
1010             overview="${4jdk7src.dir}/intro.html"
1011             access="${build.javadoc.access}"
1012             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1013             classpath=""
1014             executable="${javadoc7}"
1015             failonerror = "true">
1016      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1017        <include name="**/*.java"/>
1018      </fileset>
1019      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1020      <arg value="-XDignore.symbol.file=true"/>
1021    </javadoc>
1022  </target>
1023
1024
1025  <target name="4jdk7dist"
1026          depends="4jdk7dist-jar, 4jdk7dist-docs"
1027          description="Puts all distributable products in single hierarchy"/>
1028
1029
1030  <target name="4jdk7clean"
1031          description="Removes all 4jdk7 build products">
1032
1033    <delete dir="${build.4jdk7.dir}"/>
1034
1035  </target>
1036
1037
1038  <target name="4jdk7dist-jar"
1039          depends="4jdk7clean, 4jdk7jar">
1040    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1041  </target>
1042
1043
1044  <target name="4jdk7dist-docs"
1045          depends="4jdk7clean, 4jdk7docs">
1046    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1047  </target>
1048
1049
1050  <!-- jsr166x -->
1051
1052  <target name="jsr166xcompile"
1053          depends="configure-compiler"
1054          description="Compiles jsr166x sources to build dir">
1055
1056    <mkdir dir="${build.jsr166x.classes.dir}"/>
1057
1058    <javac srcdir="${topsrc.dir}"
1059           destdir="${build.jsr166x.classes.dir}"
1060           debug="${build.debug}"
1061           debuglevel="${build.debuglevel}"
1062           deprecation="${build.deprecation}"
1063           classpath=""
1064           bootclasspath="${bootclasspath6}"
1065           source="5"
1066           target="5"
1067           includeAntRuntime="false"
1068           includeJavaRuntime="false"
1069           encoding="ASCII"
1070           executable="${javac7}"
1071           fork="true">
1072
1073      <include name="jsr166x/**/*.java"/>
1074      <compilerarg value="-XDignore.symbol.file=true"/>
1075      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1076      <compilerarg value="-Werror"/>
1077      <compilerarg line="${build.args}"/>
1078
1079    </javac>
1080  </target>
1081
1082
1083  <target name="jsr166xjar"
1084          depends="jsr166xcompile"
1085          description="Builds library jar from compiled sources">
1086
1087    <jar destfile="${jsr166x.jar}">
1088      <fileset dir="${build.jsr166x.classes.dir}"/>
1089      <manifest>
1090        <attribute name="Built-By" value="${user.name}"/>
1091        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1092      </manifest>
1093    </jar>
1094
1095  </target>
1096
1097
1098  <target name="jsr166xdocs"
1099          description="Builds javadocs to dist dir">
1100
1101    <delete dir="${jsr166xdocs.dir}"/>
1102    <mkdir dir="${jsr166xdocs.dir}"/>
1103
1104    <javadoc destdir="${jsr166xdocs.dir}"
1105             packagenames="jsr166x.*"
1106             link="${java.api.url}"
1107             access="${build.javadoc.access}"
1108             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1109             bootclasspath="${bootclasspath6}"
1110             source="5"
1111             executable="${javadoc7}"
1112             failonerror = "true">
1113      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1114      <arg value="-XDignore.symbol.file=true"/>
1115
1116    </javadoc>
1117  </target>
1118
1119
1120  <target name="jsr166xdist"
1121          depends="jsr166xdist-jar, jsr166xdist-docs"
1122          description="Puts all distributable products in single hierarchy"/>
1123
1124
1125  <target name="jsr166xclean"
1126          description="Removes all jsr166x build products">
1127
1128    <delete dir="${build.jsr166x.dir}"/>
1129
1130  </target>
1131
1132
1133  <target name="jsr166xdist-jar"
1134          depends="jsr166xclean, jsr166xjar">
1135    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1136  </target>
1137
1138  <target name="jsr166xdist-docs"
1139          depends="jsr166xclean, jsr166xdocs">
1140    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1141  </target>
1142
1143  <!-- jsr166y -->
1144
1145
1146  <target name="jsr166ycompile"
1147          depends="configure-compiler"
1148          description="Compiles jsr166y sources">
1149
1150    <mkdir dir="${build.jsr166y.classes.dir}"/>
1151
1152    <javac srcdir="${topsrc.dir}"
1153           destdir="${build.jsr166y.classes.dir}"
1154           debug="${build.debug}"
1155           debuglevel="${build.debuglevel}"
1156           deprecation="${build.deprecation}"
1157           source="6"
1158           target="6"
1159           classpath=""
1160           bootclasspath="${bootclasspath6}"
1161           includeAntRuntime="false"
1162           includeJavaRuntime="false"
1163           encoding="ASCII"
1164           executable="${javac7}"
1165           fork="true">
1166
1167      <include name="jsr166y/**/*.java"/>
1168      <compilerarg value="-XDignore.symbol.file=true"/>
1169      <compilerarg value="-Xlint:all"/>
1170      <compilerarg value="-Werror"/>
1171      <compilerarg line="${build.args}"/>
1172
1173    </javac>
1174  </target>
1175
1176
1177  <target name="jsr166yjar"
1178          depends="jsr166ycompile"
1179          description="Builds library jar from compiled sources">
1180
1181    <jar destfile="${jsr166y.jar}" index="true">
1182      <fileset dir="${build.jsr166y.classes.dir}"/>
1183      <manifest>
1184        <attribute name="Built-By" value="${user.name}"/>
1185        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1186      </manifest>
1187    </jar>
1188
1189  </target>
1190
1191
1192  <target name="jsr166ydocs"
1193          description="Builds javadocs to dist dir">
1194
1195    <delete dir="${jsr166ydocs.dir}"/>
1196    <mkdir dir="${jsr166ydocs.dir}"/>
1197
1198    <javadoc destdir="${jsr166ydocs.dir}"
1199             packagenames="jsr166y.*"
1200             link="${java.api.url}"
1201             access="${build.javadoc.access}"
1202             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1203             bootclasspath="${bootclasspath6}"
1204             source="6"
1205             executable="${javadoc7}"
1206             failonerror = "true">
1207      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1208      <arg value="-XDignore.symbol.file=true"/>
1209
1210    </javadoc>
1211  </target>
1212
1213
1214  <target name="jsr166ydist"
1215          depends="jsr166ydist-jar, jsr166ydist-docs"
1216          description="Puts all distributable products in single hierarchy"/>
1217
1218
1219  <target name="jsr166yclean"
1220          description="Removes all jsr166y build products">
1221
1222    <delete dir="${build.jsr166y.dir}"/>
1223
1224  </target>
1225
1226
1227  <target name="jsr166ydist-jar"
1228          depends="jsr166yclean, jsr166yjar">
1229    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1230  </target>
1231
1232  <target name="jsr166ydist-docs"
1233          depends="jsr166yclean, jsr166ydocs">
1234    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1235  </target>
1236
1237
1238  <!-- extra166y -->
1239
1240
1241  <target name="extra166ycompile"
1242          depends="configure-compiler, jsr166yjar"
1243          description="Compiles extra166y sources">
1244
1245    <mkdir dir="${build.extra166y.classes.dir}"/>
1246
1247    <javac srcdir="${topsrc.dir}"
1248           destdir="${build.extra166y.classes.dir}"
1249           debug="${build.debug}"
1250           debuglevel="${build.debuglevel}"
1251           deprecation="${build.deprecation}"
1252           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1253           classpath=""
1254           source="6"
1255           target="6"
1256           includeAntRuntime="false"
1257           includeJavaRuntime="false"
1258           encoding="ASCII"
1259           executable="${javac7}"
1260           fork="true">
1261
1262      <include name="extra166y/**/*.java"/>
1263      <compilerarg value="-XDignore.symbol.file=true"/>
1264      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1265      <compilerarg value="-Werror"/>
1266      <compilerarg line="${build.args}"/>
1267
1268    </javac>
1269  </target>
1270
1271
1272  <target name="extra166yjar"
1273          depends="extra166ycompile"
1274          description="Builds library jar from compiled sources">
1275
1276    <jar destfile="${extra166y.jar}" index="true">
1277      <fileset dir="${build.extra166y.classes.dir}"/>
1278      <manifest>
1279        <attribute name="Built-By" value="${user.name}"/>
1280        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1281      </manifest>
1282    </jar>
1283
1284  </target>
1285
1286
1287  <target name="extra166ydocs"
1288          description="Builds javadocs to build dir">
1289
1290    <delete dir="${extra166ydocs.dir}"/>
1291    <mkdir dir="${extra166ydocs.dir}"/>
1292
1293    <javadoc destdir="${extra166ydocs.dir}"
1294             packagenames="extra166y.*"
1295             link="${java.api.url}"
1296             access="${build.javadoc.access}"
1297             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1298             bootclasspath="${bootclasspath6}"
1299             source="6"
1300             executable="${javadoc7}">
1301      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1302      <arg value="-XDignore.symbol.file=true"/>
1303
1304    </javadoc>
1305  </target>
1306
1307
1308  <target name="extra166ydist"
1309          depends="extra166ydist-jar, extra166ydist-docs"
1310          description="Puts all distributable products in single hierarchy"/>
1311
1312
1313  <target name="extra166yclean"
1314          description="Removes all extra166y build products">
1315
1316    <delete dir="${build.extra166y.dir}"/>
1317
1318  </target>
1319
1320
1321  <target name="extra166ydist-jar"
1322          depends="extra166yclean, extra166yjar">
1323    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1324  </target>
1325
1326  <target name="extra166ydist-docs"
1327          depends="extra166yclean, extra166ydocs">
1328    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1329  </target>
1330
1331  <!-- jsr166e -->
1332
1333  <property name="build.jsr166e.java.version" value="6"/>
1334  <property name="build.jsr166e.javac" value="${javac6}"/>
1335
1336  <target name="jsr166ecompile"
1337          depends="configure-compiler"
1338          description="Compiles jsr166e sources">
1339
1340    <mkdir dir="${build.jsr166e.classes.dir}"/>
1341
1342    <javac srcdir="${topsrc.dir}"
1343           destdir="${build.jsr166e.classes.dir}"
1344           debug="${build.debug}"
1345           debuglevel="${build.debuglevel}"
1346           deprecation="${build.deprecation}"
1347           source="${build.jsr166e.java.version}"
1348           target="${build.jsr166e.java.version}"
1349           classpath=""
1350           includeAntRuntime="false"
1351           includeJavaRuntime="false"
1352           executable="${build.jsr166e.javac}"
1353           fork="true">
1354
1355      <include name="jsr166e/**/*.java"/>
1356      <compilerarg value="-XDignore.symbol.file=true"/>
1357      <compilerarg value="-Xlint:all"/>
1358      <compilerarg value="-Werror"/>
1359      <compilerarg line="${build.args}"/>
1360
1361    </javac>
1362  </target>
1363
1364  <!-- jsr166e: find doclint errors -->
1365  <target name="jsr166edoclint">
1366
1367    <mkdir dir="${build.jsr166e.classes.dir}"/>
1368
1369    <javac srcdir="${topsrc.dir}"
1370           destdir="${build.jsr166e.classes.dir}"
1371           debug="${build.debug}"
1372           debuglevel="${build.debuglevel}"
1373           deprecation="${build.deprecation}"
1374           source="${build.jsr166e.java.version}"
1375           target="${build.jsr166e.java.version}"
1376           classpath=""
1377           bootclasspath="${bootclasspath6}"
1378           includeAntRuntime="false"
1379           includeJavaRuntime="false"
1380           executable="${javac8}"
1381           fork="true">
1382
1383      <include name="jsr166e/**/*.java"/>
1384      <compilerarg value="-XDignore.symbol.file=true"/>
1385      <compilerarg value="-Xlint:all"/>
1386      <compilerarg value="-Werror"/>
1387      <compilerarg value="-Xdoclint:all/protected"/>
1388
1389    </javac>
1390  </target>
1391
1392
1393  <target name="jsr166ejar"
1394          depends="jsr166ecompile"
1395          description="Builds library jar from compiled sources">
1396
1397    <jar destfile="${jsr166e.jar}" index="true">
1398      <fileset dir="${build.jsr166e.classes.dir}"/>
1399      <manifest>
1400        <attribute name="Built-By" value="${user.name}"/>
1401        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1402      </manifest>
1403    </jar>
1404
1405  </target>
1406
1407
1408  <target name="jsr166edocs"
1409          description="Builds javadocs to build dir">
1410
1411    <delete dir="${jsr166edocs.dir}"/>
1412    <mkdir dir="${jsr166edocs.dir}"/>
1413
1414    <javadoc destdir="${jsr166edocs.dir}"
1415             packagenames="jsr166e.*"
1416             link="${java.api.url}"
1417             access="${build.javadoc.access}"
1418             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1419             source="${build.jsr166e.java.version}"
1420             executable="${javadoc7}"
1421             failonerror = "true">
1422      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1423      <arg value="-XDignore.symbol.file=true"/>
1424
1425    </javadoc>
1426  </target>
1427
1428
1429  <target name="jsr166e-tck-one-java-version"
1430          depends="jsr166ejar">
1431
1432    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1433
1434    <run-tck-tests
1435      tck.src.dir="${test.src.dir}/tck-jsr166e"
1436      target="${build.jsr166e.java.version}"
1437      workdir="${build.jsr166e.dir}"
1438      classes="${jsr166e.jar}"/>
1439  </target>
1440
1441  <target name="jsr166e-tck"
1442          description="Runs tck tests for jsr166e for multiple java versions">
1443
1444 <!--     <antcall target="clean"/> -->
1445 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1446 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1447 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1448 <!--     </antcall> -->
1449
1450    <antcall target="clean"/>
1451    <antcall target="jsr166e-tck-one-java-version">
1452      <param name="build.jsr166e.java.version" value="7"/>
1453      <param name="build.jsr166e.javac" value="${javac7}"/>
1454    </antcall>
1455
1456    <antcall target="clean"/>
1457    <antcall target="jsr166e-tck-one-java-version">
1458      <param name="build.jsr166e.java.version" value="6"/>
1459      <param name="build.jsr166e.javac" value="${javac6}"/>
1460    </antcall>
1461  </target>
1462
1463
1464  <target name="jsr166e-test"
1465          depends="jsr166e-tck"
1466          description="Runs all tests for jsr166e">
1467  </target>
1468
1469  <target name="jsr166edist"
1470          depends="jsr166edist-jar, jsr166edist-docs"
1471          description="Puts all distributable products in single hierarchy"/>
1472
1473
1474  <target name="jsr166eclean"
1475          description="Removes all jsr166e build products">
1476    <delete dir="${build.jsr166e.dir}"/>
1477  </target>
1478
1479
1480  <target name="jsr166edist-jar"
1481          depends="jsr166eclean, jsr166ejar">
1482    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1483  </target>
1484
1485  <target name="jsr166edist-docs"
1486          depends="jsr166eclean, jsr166edocs">
1487    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1488  </target>
1489
1490
1491 <!-- Find buglets that can be detected by static build tools -->
1492
1493  <target name="lint">
1494    <antcall target="dists">
1495      <param name="build.javadoc.access" value="public"/>
1496    </antcall>
1497  </target>
1498
1499 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1500  <target name="lint-private">
1501    <antcall target="dist">
1502      <param name="build.javadoc.access" value="private"/>
1503    </antcall>
1504  </target>
1505
1506
881   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines