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.201 by dl, Sat Mar 26 12:35:25 2016 UTC vs.
Revision 1.315 by jsr166, Fri Jun 5 00:59:33 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 7 | Line 9
9  
10    Usage: ant [target]
11  
12 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
13 +  more details.
14 +
15    User-specific settings are read from user.properties.
16    See user.properties.sample for an explanation of some useful settings.
17  
# Line 14 | 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 2015-09, there is incomplete hacky support for jigsaw
40 <  Build for jigsaw using something like:
41 <  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist
36 <  "docs" target is still 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  
45 <  <!-- Display main targets by running 'ant -projecthelp' -->
45 >  <!-- Run 'ant -projecthelp' (default target) -->
46    <target name="usage">
47      <java classname="org.apache.tools.ant.Main">
48        <arg value="-projecthelp" />
# Line 51 | Line 56
56  
57  
58    <!-- Compilation options -->
54  <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 62 | 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"/>
65  <property name="build.reports.dir"           location="${build.dir}/reports"/>
66
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"/>
69  
70    <!-- JDK locations -->
71    <property name="jdks.home"  location="${user.home}/jdk"/>
# 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-03 -->
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/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 244 | Line 189
189             classpath="${junit.jar}"
190             includeAntRuntime="false"
191             includeJavaRuntime="false"
192 +           encoding="ASCII"
193             executable="${javac@{compile-target}}"
194             fork="true">
195  
196        <include name="*.java"/>
197        <compilerarg value="-XDignore.symbol.file=true"/>
198        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
199 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
200 <      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
199 >      <compilerarg value="-Xdoclint:reference/private"/>
200 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
201        <compilerarg line="${build.args}"/>
202        <javac-elements/>
203  
# Line 261 | Line 207
207            failonerror="true"
208            jvm="${java@{target}}"
209            fork="true">
210 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
211 <        <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
212 <        <jvmarg line="@{jvmflags}"/>
210 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
211 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
212 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
213 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
214 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
215 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
216 >        <jvmarg line="@{jvmflags}"/>
217 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
218 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
219  
220          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
221 <        <syspropertyset id="system-properties-used-by-tck">
222 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
223 <          <propertyref prefix="jsr166."/>
224 <          <propertyref name="test.timeout.factor"/>
225 <        </syspropertyset>
226 <
227 <        <classpath>
228 <          <pathelement location="${junit.jar}"/>
229 <          <pathelement location="@{workdir}/tck-classes"/>
230 <        </classpath>
221 >        <syspropertyset id="system-properties-used-by-tck">
222 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
223 >          <propertyref prefix="jsr166."/>
224 >          <propertyref name="test.timeout.factor"/>
225 >        </syspropertyset>
226 >
227 >        <classpath>
228 >          <pathelement location="${junit.jar}"/>
229 >          <pathelement location="@{workdir}/tck-classes"/>
230 >        </classpath>
231      </java>
232  
233      </sequential>
234    </macrodef>
235  
236    <!-- Define jtreg test sets for different jdk versions -->
237 <  <fileset dir="${jtreg9.src.dir}">
238 <    <patternset id="jdk9.jtreg.tests">
239 <      <include name="**/*.java"/>
240 <    </patternset>
241 <  </fileset>
242 <
243 <  <fileset dir="${jtreg8.src.dir}">
244 <    <patternset id="jdk8.jtreg.tests">
245 <      <include name="**/*.java"/>
246 <      <exclude name="**/SpliteratorCharacteristics.java"/>
247 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
248 <      <exclude name="**/GCDuringIteration.java"/>
249 <    </patternset>
298 <  </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 -->
311 <    <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  
322    <local name="modules"/>
323    <condition property="modules">
324      <available file="${jdk@{target}.home}/jmods" type="dir"/>
325    </condition>
326
274      <delete dir="@{workdir}/JTwork"   quiet="true"/>
328    <delete dir="@{workdir}/JTreport" quiet="true"/>
329    <mkdir dir="@{workdir}/JTwork/scratch"/>
330    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
331    <mkdir dir="@{workdir}/JTreport/html"/>
332    <mkdir dir="@{workdir}/JTreport/text"/>
275      <jtreg dir="${jtreg@{target}.src.dir}"
276             jdk="${jdk@{target}.home}"
277 <           workDir="@{workdir}/JTwork"
336 <           reportDir="@{workdir}/JTreport">
277 >           workDir="@{workdir}/JTwork">
278        <patternset refid="jdk@{target}.jtreg.tests"/>
279 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
280 <      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
279 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
280 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
281 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
282        <arg value="-agentvm"/>
283 <      <arg value="-verbose:${jtreg.verbose}"/>
283 >      <arg value="-noreport"/>
284 >      <arg value="-verbose:@{verbose}"/>
285        <arg value="-vmoptions:-esa -ea"/>
286        <arg value="-automatic"/>
287        <arg value="-k:!ignore"/>
288        <arg line="@{jtregflags}"/>
289        <arg line="${jtreg.flags}"/>
290 +      <jtreg-elements/>
291      </jtreg>
292      </sequential>
293    </macrodef>
# Line 354 | Line 298
298    </path>
299  
300    <!-- Support @jls tag, used in jdk8+ javadoc -->
301 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
302    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
303    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
304  
305    <!-- Main targets -->
306  
307 <  <property name="build.main.java.version" value="9"/>
308 <  <property name="build.main.javac" value="${javac9}"/>
307 >  <!-- Default values: may seem strange ... -->
308 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
309 >  <!-- But at build time, target jdk9, for maximal binary portability -->
310 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
311 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
312 >    o override-methods=summary
313 >    o {@systemProperty ...}
314 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
315 >    o 8202628: javadoc generates bad links in TestModules.java
316 >    -->
317 >  <property name="java.runtime.target" value="11"/>
318 >  <property name="build.main.java" value="${java11}"/>
319 >  <property name="build.main.javac" value="${javac11}"/>
320 >  <property name="build.main.javadoc" value="${javadoc12}"/>
321 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
322  
323    <target name="dists"
324 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
324 >          depends="dist"
325            description="Builds all public jars and docs"/>
326  
327    <target name="compile"
328            depends="configure-compiler"
329            description="Compiles src/main sources to build dir">
330  
373    <local name="modules"/>
374    <condition property="modules">
375      <and>
376        <available file="${jdk9.home}/jmods" type="dir"/>
377        <equals arg1="9" arg2="${build.main.java.version}"/>
378      </and>
379    </condition>
380
331      <local name="destdir"/>
332 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
383 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
332 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
333  
334      <mkdir dir="${destdir}"/>
335  
# Line 392 | 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  
365      </javac>
409
410    <!-- We need jdk9's Contended annotation, but at compile time only -->
411    <!--
412        <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
413    -->
366    </target>
367  
368  
369    <target name="jar"
370            depends="compile"
371 <          description="Builds library jar from compiled sources">
372 <
371 >          description="Builds library jar for src/main from compiled sources">
372 >    <local name="subdir"/>
373 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
374      <jar destfile="${product.jar}">
375 <      <fileset dir="${build.classes.dir}"/>
375 >      <fileset dir="${build.classes.dir}${subdir}"/>
376        <manifest>
377          <attribute name="Built-By" value="${user.name}"/>
378          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 431 | 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"/>
416 >        <include name="java/**/*.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"/>
465 <      <arg value="revised:X"/>
466 <      <arg value="-tag"/>
467 <      <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 474 | Line 439
439            description="Puts all distributable products in single hierarchy"/>
440  
441  
477  <target name="release"
478          depends="dist"
479          description="Puts entire CVS tree, plus distribution productions, in a jar">
480
481    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
482
483    <jar basedir="${basedir}" destfile="${release.jar}">
484      <!-- <exclude name="build/**"/> -->
485      <exclude name="${release.jar}"/>
486      <exclude name="user.properties"/>
487      <exclude name="etc/notes/**"/>
488      <exclude name="src/emulation/**"/>
489      <exclude name="**/SyntaxTest.java"/>
490      <exclude name="**/SuperfluousAbstract.java"/>
491      <manifest>
492        <attribute name="Built-By" value="${user.name}"/>
493        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
494      </manifest>
495    </jar>
496  </target>
497
498
442    <target name="clean"
443            description="Removes all build products">
501
444      <delete dir="${build.dir}"/>
503
445    </target>
446  
447  
448    <target name="dist-clean"
449            description="Removes all build and distribution products">
509
450      <delete dir="${build.dir}"/>
451      <delete dir="${dist.dir}"/>
512
452    </target>
453  
454  
# Line 524 | Line 463
463    </target>
464  
465    <target name="tck"
466 <          depends="jar"
467 <          description="Runs tck tests for main directly">
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"
480 <          description="Runs tck with given common pool parallelism">
480 >          description="Runs tck with common pool parallelism 1">
481      <antcall target="tck">
482        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
483      </antcall>
484    </target>
485  
486    <target name="tck-parallelism-0"
487 <          description="Runs tck with given common pool parallelism">
487 >          description="Runs tck with common pool parallelism 0">
488      <antcall target="tck">
489        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
490      </antcall>
491    </target>
492  
493 +  <target name="tck-security-manager"
494 +          description="Runs tck with a security manager">
495 +    <antcall target="tck">
496 +      <param name="jsr166.useSecurityManager" value="true"/>
497 +    </antcall>
498 +  </target>
499 +
500    <target name="jtreg"
501 <          depends="jar"
502 <          description="Runs jtreg tests for main using the jtreg ant task">
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, jtreg"
511 <          description="Runs tck and jtreg tests for main">
510 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
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}"/>
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 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 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}"/>
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}"/>
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 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>
595 <        <not> <antversion atleast="1.9.1"/> </not>
596 <      </condition>
628 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
629      </fail>
630  
631      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 611 | Line 643
643    </target>
644  
645  
614
615  <!-- Various demos and test programs -->
616
617
618  <target name="loops" depends="configure-compiler"
619          description="Benchmark from Doug Lea's AQS paper">
620
621    <mkdir dir="${build.loops.dir}"/>
622
623    <javac srcdir="${loops.src.dir}"
624          destdir="${build.loops.dir}"
625            debug="${build.debug}"
626       debuglevel="${build.debuglevel}"
627      deprecation="${build.deprecation}"
628           source="${build.sourcelevel}"
629           target="${build.sourcelevel}"
630             fork="true">
631
632      <compilerarg line="${build.args}"/>
633      <classpath refid="loops.classpath"/>
634      <compilerarg value="-XDignore.symbol.file=true"/>
635
636    </javac>
637
638    <java classname="ALoops" fork="true">
639      <classpath refid="loops.classpath"/>
640    </java>
641
642  </target>
643
644
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 654 | 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}"/>
664 <      <compilerarg line="${build.args}"/>
665 <
666 <    </javac>
667 <
668 <  </target>
669 <
670 <
671 <  <!-- jsr166 4jdk8 -->
672 <
673 <  <target name="4jdk8compile"
674 <          depends="configure-compiler"
675 <          description="Compiles src/jdk8 sources, targeting jdk8">
676 <
677 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
678 <
679 <    <javac srcdir="${4jdk8src.dir}"
680 <           destdir="${build.4jdk8.classes.dir}"
681 <           debug="${build.debug}"
682 <           debuglevel="${build.debuglevel}"
683 <           deprecation="${build.deprecation}"
684 <           source="8"
685 <           target="8"
686 <           classpath=""
687 <           bootclasspath="${bootclasspath8}"
688 <           includeAntRuntime="false"
689 <           includeJavaRuntime="false"
690 <           executable="${javac8}"
691 <           fork="true">
692 <
693 <      <include name="**/*.java"/>
694 <      <compilerarg value="-Xprefer:source"/>
695 <      <compilerarg value="-XDignore.symbol.file=true"/>
696 <      <compilerarg value="-Xlint:all"/>
697 <      <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}"/>
699
667      </javac>
668    </target>
669  
703  <target name="4jdk8doclint"
704          depends="configure-compiler"
705          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}"
714 <           source="8"
715 <           target="8"
716 <           classpath=""
717 <           bootclasspath="${bootclasspath8}"
718 <           includeAntRuntime="false"
719 <           includeJavaRuntime="false"
720 <           executable="${javac8}"
721 <           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"/>
724 <      <compilerarg value="-Xprefer:source"/>
725 <      <compilerarg value="-XDignore.symbol.file=true"/>
726 <      <compilerarg value="-Xlint:all"/>
727 <      <compilerarg value="-Xdoclint:all/protected"/>
728 <      <compilerarg line="${build.args}"/>
729 <
730 <    </javac>
731 <  </target>
732 <
733 <
734 <  <target name="4jdk8jar"
735 <          depends="4jdk8compile"
736 <          description="Builds library jar from compiled sources">
737 <
738 <    <jar destfile="${4jdk8product.jar}">
739 <      <fileset dir="${build.4jdk8.classes.dir}"/>
740 <      <manifest>
741 <        <attribute name="Built-By" value="${user.name}"/>
742 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
743 <      </manifest>
744 <    </jar>
745 <
746 <  </target>
747 <
748 <
749 <  <target name="4jdk8-tck"
750 <          depends="4jdk8jar"
751 <          description="Runs tck tests for jsr166-4jdk8 directly">
752 <
753 <    <run-tck-tests
754 <      target="8"
755 <      workdir="${build.4jdk8.dir}"
756 <      classes="${4jdk8product.jar}">
757 <      <javac-elements>
758 <        <!-- JDK9+ test classes -->
759 <        <exclude name="*9Test.java"/>
760 <        <exclude name="*10Test.java"/>
761 <      </javac-elements>
762 <    </run-tck-tests>
763 <  </target>
764 <
765 <
766 <  <target name="4jdk8-jtreg"
767 <          depends="4jdk8jar"
768 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
769 <    <run-jtreg-tests
770 <       target="8"
771 <       workdir="${build.4jdk8.dir}"
772 <       classes="${4jdk8product.jar}"/>
773 <  </target>
774 <
775 <
776 <  <target name="4jdk8-test"
777 <          depends="4jdk8-tck, 4jdk8-jtreg"
778 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
779 <  </target>
780 <
781 <
782 <  <target name="4jdk8docs"
783 <          description="Builds javadocs for src/jdk8 to dist dir">
784 <
785 <    <delete dir="${4jdk8docs.dir}"/>
786 <    <mkdir dir="${4jdk8docs.dir}"/>
787 <
788 <    <javadoc destdir="${4jdk8docs.dir}"
789 <             packagenames="none"
790 <             link="${java8.api.url}"
791 <             overview="${4jdk8src.dir}/intro.html"
792 <             access="${build.javadoc.access}"
793 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
794 <             classpath=""
795 <             executable="${javadoc8}">
796 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
797 <        <include name="**/*.java"/>
798 <      </fileset>
799 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
800 <      <arg value="-XDignore.symbol.file=true"/>
801 <      <arg value="-tag"/>
802 <      <arg value="${javadoc.jls.option}"/>
803 <      <arg value="-tag"/>
804 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
805 <      <arg value="-tag"/>
806 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
807 <      <arg value="-tag"/>
808 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
809 <    </javadoc>
810 <  </target>
811 <
812 <
813 <  <target name="4jdk8dist"
814 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
815 <          description="Puts all distributable products in single hierarchy"/>
816 <
817 <
818 <  <target name="4jdk8clean"
819 <          description="Removes all 4jdk8 build products">
820 <
821 <    <delete dir="${build.4jdk8.dir}"/>
822 <
823 <  </target>
824 <
825 <
826 <  <target name="4jdk8dist-jar"
827 <          depends="4jdk8clean, 4jdk8jar">
828 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
829 <  </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"
842 <          depends="configure-compiler"
843 <          description="Compiles src/jdk7 sources, targeting jdk7">
844 <
845 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
846 <
847 <    <javac srcdir="${4jdk7src.dir}"
848 <           destdir="${build.4jdk7.classes.dir}"
849 <           debug="${build.debug}"
850 <           debuglevel="${build.debuglevel}"
851 <           deprecation="${build.deprecation}"
852 <           source="6"
853 <           target="6"
854 <           classpath=""
855 <           bootclasspath="${bootclasspath6}"
856 <           includeAntRuntime="false"
857 <           includeJavaRuntime="false"
858 <           executable="${javac7}"
859 <           fork="true">
860 <
861 <      <include name="**/*.java"/>
862 <      <compilerarg value="-Xprefer:source"/>
863 <      <compilerarg value="-XDignore.symbol.file=true"/>
864 <      <compilerarg value="-Xlint:all"/>
865 <      <compilerarg value="-Werror"/>
866 <      <compilerarg line="${build.args}"/>
867 <
868 <    </javac>
869 <  </target>
870 <
871 <  <target name="4jdk7doclint"
872 <          depends="configure-compiler"
873 <          description="Finds doclint warnings">
874 <
875 <    <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}"
882           source="6"
883           target="6"
746             classpath=""
885           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}"/>
897
768      </javac>
899  </target>
769  
770 <
771 <  <target name="4jdk7jar"
903 <          depends="4jdk7compile"
904 <          description="Builds library jar from compiled sources">
905 <
906 <    <jar destfile="${4jdk7product.jar}">
907 <      <fileset dir="${build.4jdk7.classes.dir}"/>
908 <      <manifest>
909 <        <attribute name="Built-By" value="${user.name}"/>
910 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
911 <      </manifest>
770 >    <jar destfile="${product.jar}">
771 >      <fileset dir="${destdir}"/>
772      </jar>
773  
914  </target>
915
916
917  <target name="4jdk7-tck"
918          depends="4jdk7jar"
919          description="Runs tck tests for jsr166-4jdk7 directly">
920
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"/>
934 <        <exclude name="CompletableFutureTest.java"/>
935 <        <exclude name="SplittableRandomTest.java"/>
936 <        <exclude name="StampedLockTest.java"/>
937 <        <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 <  <target name="4jdk7-tck-junit"
798 <          depends="4jdk7compile"
799 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
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 <
965 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
966 <      </test>
967 <
876 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
877 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
878      </junit>
879    </target>
880  
971  <target name="4jdk7-jtreg"
972          depends="4jdk7jar"
973          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
974    <run-jtreg-tests
975       target="7"
976       workdir="${build.4jdk7.dir}"
977       classes="${4jdk7product.jar}"/>
978  </target>
979
980
981  <target name="4jdk7-test"
982          depends="4jdk7-tck, 4jdk7-jtreg"
983          description="Runs tck and jtreg tests for jsr166-4jdk7">
984  </target>
985
986
987  <target name="4jdk7docs"
988          description="Builds javadocs for src/jdk7 to dist dir">
989
990    <delete dir="${4jdk7docs.dir}"/>
991    <mkdir dir="${4jdk7docs.dir}"/>
992
993    <javadoc destdir="${4jdk7docs.dir}"
994             packagenames="none"
995             link="${java7.api.url}"
996             overview="${4jdk7src.dir}/intro.html"
997             access="${build.javadoc.access}"
998             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
999             classpath=""
1000             executable="${javadoc7}">
1001      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1002        <include name="**/*.java"/>
1003      </fileset>
1004      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1005      <arg value="-XDignore.symbol.file=true"/>
1006    </javadoc>
1007  </target>
1008
1009
1010  <target name="4jdk7dist"
1011          depends="4jdk7dist-jar, 4jdk7dist-docs"
1012          description="Puts all distributable products in single hierarchy"/>
1013
1014
1015  <target name="4jdk7clean"
1016          description="Removes all 4jdk7 build products">
1017
1018    <delete dir="${build.4jdk7.dir}"/>
1019
1020  </target>
1021
1022
1023  <target name="4jdk7dist-jar"
1024          depends="4jdk7clean, 4jdk7jar">
1025    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1026  </target>
1027
1028
1029  <target name="4jdk7dist-docs"
1030          depends="4jdk7clean, 4jdk7docs">
1031    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1032  </target>
1033
1034
1035  <!-- jsr166x -->
1036
1037  <target name="jsr166xcompile"
1038          depends="configure-compiler"
1039          description="Compiles jsr166x sources to build dir">
1040
1041    <mkdir dir="${build.jsr166x.classes.dir}"/>
1042
1043    <javac srcdir="${topsrc.dir}"
1044           destdir="${build.jsr166x.classes.dir}"
1045           debug="${build.debug}"
1046           debuglevel="${build.debuglevel}"
1047           deprecation="${build.deprecation}"
1048           classpath=""
1049           bootclasspath="${bootclasspath6}"
1050           source="5"
1051           target="5"
1052           includeAntRuntime="false"
1053           includeJavaRuntime="false"
1054           executable="${javac7}"
1055           fork="true">
1056
1057      <include name="jsr166x/**/*.java"/>
1058      <compilerarg value="-XDignore.symbol.file=true"/>
1059      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1060      <compilerarg value="-Werror"/>
1061      <compilerarg line="${build.args}"/>
1062
1063    </javac>
1064  </target>
1065
1066
1067  <target name="jsr166xjar"
1068          depends="jsr166xcompile"
1069          description="Builds library jar from compiled sources">
1070
1071    <jar destfile="${jsr166x.jar}">
1072      <fileset dir="${build.jsr166x.classes.dir}"/>
1073      <manifest>
1074        <attribute name="Built-By" value="${user.name}"/>
1075        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1076      </manifest>
1077    </jar>
1078
1079  </target>
1080
1081
1082  <target name="jsr166xdocs"
1083          description="Builds javadocs to dist dir">
1084
1085    <delete dir="${jsr166xdocs.dir}"/>
1086    <mkdir dir="${jsr166xdocs.dir}"/>
1087
1088    <javadoc destdir="${jsr166xdocs.dir}"
1089             packagenames="jsr166x.*"
1090             link="${java.api.url}"
1091             access="${build.javadoc.access}"
1092             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1093             bootclasspath="${bootclasspath6}"
1094             source="5"
1095             executable="${javadoc7}">
1096      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1097      <arg value="-XDignore.symbol.file=true"/>
1098
1099    </javadoc>
1100  </target>
1101
1102
1103  <target name="jsr166xdist"
1104          depends="jsr166xdist-jar, jsr166xdist-docs"
1105          description="Puts all distributable products in single hierarchy"/>
1106
1107
1108  <target name="jsr166xclean"
1109          description="Removes all jsr166x build products">
1110
1111    <delete dir="${build.jsr166x.dir}"/>
1112
1113  </target>
1114
1115
1116  <target name="jsr166xdist-jar"
1117          depends="jsr166xclean, jsr166xjar">
1118    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1119  </target>
1120
1121  <target name="jsr166xdist-docs"
1122          depends="jsr166xclean, jsr166xdocs">
1123    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1124  </target>
1125
1126  <!-- jsr166y -->
1127
1128
1129  <target name="jsr166ycompile"
1130          depends="configure-compiler"
1131          description="Compiles jsr166y sources">
1132
1133    <mkdir dir="${build.jsr166y.classes.dir}"/>
1134
1135    <javac srcdir="${topsrc.dir}"
1136           destdir="${build.jsr166y.classes.dir}"
1137           debug="${build.debug}"
1138           debuglevel="${build.debuglevel}"
1139           deprecation="${build.deprecation}"
1140           source="6"
1141           target="6"
1142           classpath=""
1143           bootclasspath="${bootclasspath6}"
1144           includeAntRuntime="false"
1145           includeJavaRuntime="false"
1146           executable="${javac7}"
1147           fork="true">
1148
1149      <include name="jsr166y/**/*.java"/>
1150      <compilerarg value="-XDignore.symbol.file=true"/>
1151      <compilerarg value="-Xlint:all"/>
1152      <compilerarg value="-Werror"/>
1153      <compilerarg line="${build.args}"/>
1154
1155    </javac>
1156  </target>
1157
1158
1159  <target name="jsr166yjar"
1160          depends="jsr166ycompile"
1161          description="Builds library jar from compiled sources">
1162
1163    <jar destfile="${jsr166y.jar}" index="true">
1164      <fileset dir="${build.jsr166y.classes.dir}"/>
1165      <manifest>
1166        <attribute name="Built-By" value="${user.name}"/>
1167        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1168      </manifest>
1169    </jar>
1170
1171  </target>
1172
1173
1174  <target name="jsr166ydocs"
1175          description="Builds javadocs to dist dir">
1176
1177    <delete dir="${jsr166ydocs.dir}"/>
1178    <mkdir dir="${jsr166ydocs.dir}"/>
1179
1180    <javadoc destdir="${jsr166ydocs.dir}"
1181             packagenames="jsr166y.*"
1182             link="${java.api.url}"
1183             access="${build.javadoc.access}"
1184             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1185             bootclasspath="${bootclasspath6}"
1186             source="6"
1187             executable="${javadoc7}">
1188      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1189      <arg value="-XDignore.symbol.file=true"/>
1190
1191    </javadoc>
1192  </target>
1193
1194
1195  <target name="jsr166ydist"
1196          depends="jsr166ydist-jar, jsr166ydist-docs"
1197          description="Puts all distributable products in single hierarchy"/>
1198
1199
1200  <target name="jsr166yclean"
1201          description="Removes all jsr166y build products">
1202
1203    <delete dir="${build.jsr166y.dir}"/>
1204
1205  </target>
1206
1207
1208  <target name="jsr166ydist-jar"
1209          depends="jsr166yclean, jsr166yjar">
1210    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1211  </target>
1212
1213  <target name="jsr166ydist-docs"
1214          depends="jsr166yclean, jsr166ydocs">
1215    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1216  </target>
1217
1218
1219  <!-- extra166y -->
1220
1221
1222  <target name="extra166ycompile"
1223          depends="configure-compiler, jsr166yjar"
1224          description="Compiles extra166y sources">
1225
1226    <mkdir dir="${build.extra166y.classes.dir}"/>
1227
1228    <javac srcdir="${topsrc.dir}"
1229           destdir="${build.extra166y.classes.dir}"
1230           debug="${build.debug}"
1231           debuglevel="${build.debuglevel}"
1232           deprecation="${build.deprecation}"
1233           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1234           classpath=""
1235           source="6"
1236           target="6"
1237           includeAntRuntime="false"
1238           includeJavaRuntime="false"
1239           executable="${javac7}"
1240           fork="true">
1241
1242      <include name="extra166y/**/*.java"/>
1243      <compilerarg value="-XDignore.symbol.file=true"/>
1244      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1245      <compilerarg value="-Werror"/>
1246      <compilerarg line="${build.args}"/>
1247
1248    </javac>
1249  </target>
1250
1251
1252  <target name="extra166yjar"
1253          depends="extra166ycompile"
1254          description="Builds library jar from compiled sources">
1255
1256    <jar destfile="${extra166y.jar}" index="true">
1257      <fileset dir="${build.extra166y.classes.dir}"/>
1258      <manifest>
1259        <attribute name="Built-By" value="${user.name}"/>
1260        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1261      </manifest>
1262    </jar>
1263
1264  </target>
1265
1266
1267  <target name="extra166ydocs"
1268          description="Builds javadocs to build dir">
1269
1270    <delete dir="${extra166ydocs.dir}"/>
1271    <mkdir dir="${extra166ydocs.dir}"/>
1272
1273    <javadoc destdir="${extra166ydocs.dir}"
1274             packagenames="extra166y.*"
1275             link="${java.api.url}"
1276             access="${build.javadoc.access}"
1277             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1278             bootclasspath="${bootclasspath6}"
1279             source="6"
1280             executable="${javadoc7}">
1281      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1282      <arg value="-XDignore.symbol.file=true"/>
1283
1284    </javadoc>
1285  </target>
1286
1287
1288  <target name="extra166ydist"
1289          depends="extra166ydist-jar, extra166ydist-docs"
1290          description="Puts all distributable products in single hierarchy"/>
1291
1292
1293  <target name="extra166yclean"
1294          description="Removes all extra166y build products">
1295
1296    <delete dir="${build.extra166y.dir}"/>
1297
1298  </target>
1299
1300
1301  <target name="extra166ydist-jar"
1302          depends="extra166yclean, extra166yjar">
1303    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1304  </target>
1305
1306  <target name="extra166ydist-docs"
1307          depends="extra166yclean, extra166ydocs">
1308    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1309  </target>
1310
1311  <!-- jsr166e -->
1312
1313  <property name="build.jsr166e.java.version" value="6"/>
1314  <property name="build.jsr166e.javac" value="${javac6}"/>
1315
1316  <target name="jsr166ecompile"
1317          depends="configure-compiler"
1318          description="Compiles jsr166e sources">
1319
1320    <mkdir dir="${build.jsr166e.classes.dir}"/>
1321
1322    <javac srcdir="${topsrc.dir}"
1323           destdir="${build.jsr166e.classes.dir}"
1324           debug="${build.debug}"
1325           debuglevel="${build.debuglevel}"
1326           deprecation="${build.deprecation}"
1327           source="${build.jsr166e.java.version}"
1328           target="${build.jsr166e.java.version}"
1329           classpath=""
1330           includeAntRuntime="false"
1331           includeJavaRuntime="false"
1332           executable="${build.jsr166e.javac}"
1333           fork="true">
1334
1335      <include name="jsr166e/**/*.java"/>
1336      <compilerarg value="-XDignore.symbol.file=true"/>
1337      <compilerarg value="-Xlint:all"/>
1338      <compilerarg value="-Werror"/>
1339      <compilerarg line="${build.args}"/>
1340
1341    </javac>
1342  </target>
1343
1344  <!-- jsr166e: find doclint errors -->
1345  <target name="jsr166edoclint">
1346
1347    <mkdir dir="${build.jsr166e.classes.dir}"/>
1348
1349    <javac srcdir="${topsrc.dir}"
1350           destdir="${build.jsr166e.classes.dir}"
1351           debug="${build.debug}"
1352           debuglevel="${build.debuglevel}"
1353           deprecation="${build.deprecation}"
1354           source="${build.jsr166e.java.version}"
1355           target="${build.jsr166e.java.version}"
1356           classpath=""
1357           bootclasspath="${bootclasspath6}"
1358           includeAntRuntime="false"
1359           includeJavaRuntime="false"
1360           executable="${javac8}"
1361           fork="true">
1362
1363      <include name="jsr166e/**/*.java"/>
1364      <compilerarg value="-XDignore.symbol.file=true"/>
1365      <compilerarg value="-Xlint:all"/>
1366      <compilerarg value="-Werror"/>
1367      <compilerarg value="-Xdoclint:all/protected"/>
1368
1369    </javac>
1370  </target>
1371
1372
1373  <target name="jsr166ejar"
1374          depends="jsr166ecompile"
1375          description="Builds library jar from compiled sources">
1376
1377    <jar destfile="${jsr166e.jar}" index="true">
1378      <fileset dir="${build.jsr166e.classes.dir}"/>
1379      <manifest>
1380        <attribute name="Built-By" value="${user.name}"/>
1381        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1382      </manifest>
1383    </jar>
1384
1385  </target>
1386
1387
1388  <target name="jsr166edocs"
1389          description="Builds javadocs to build dir">
1390
1391    <delete dir="${jsr166edocs.dir}"/>
1392    <mkdir dir="${jsr166edocs.dir}"/>
1393
1394    <javadoc destdir="${jsr166edocs.dir}"
1395             packagenames="jsr166e.*"
1396             link="${java.api.url}"
1397             access="${build.javadoc.access}"
1398             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1399             source="${build.jsr166e.java.version}"
1400             executable="${javadoc7}">
1401      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1402      <arg value="-XDignore.symbol.file=true"/>
1403
1404    </javadoc>
1405  </target>
1406
1407
1408  <target name="jsr166e-tck-one-java-version"
1409          depends="jsr166ejar">
1410
1411    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1412
1413    <run-tck-tests
1414      tck.src.dir="${test.src.dir}/tck-jsr166e"
1415      target="${build.jsr166e.java.version}"
1416      workdir="${build.jsr166e.dir}"
1417      classes="${jsr166e.jar}"/>
1418  </target>
1419
1420  <target name="jsr166e-tck"
1421          description="Runs tck tests for jsr166e for multiple java versions">
1422
1423 <!--     <antcall target="clean"/> -->
1424 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1425 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1426 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1427 <!--     </antcall> -->
1428
1429    <antcall target="clean"/>
1430    <antcall target="jsr166e-tck-one-java-version">
1431      <param name="build.jsr166e.java.version" value="7"/>
1432      <param name="build.jsr166e.javac" value="${javac7}"/>
1433    </antcall>
1434
1435    <antcall target="clean"/>
1436    <antcall target="jsr166e-tck-one-java-version">
1437      <param name="build.jsr166e.java.version" value="6"/>
1438      <param name="build.jsr166e.javac" value="${javac6}"/>
1439    </antcall>
1440  </target>
1441
1442
1443  <target name="jsr166e-test"
1444          depends="jsr166e-tck"
1445          description="Runs all tests for jsr166e">
1446  </target>
1447
1448  <target name="jsr166edist"
1449          depends="jsr166edist-jar, jsr166edist-docs"
1450          description="Puts all distributable products in single hierarchy"/>
1451
1452
1453  <target name="jsr166eclean"
1454          description="Removes all jsr166e build products">
1455    <delete dir="${build.jsr166e.dir}"/>
1456  </target>
1457
1458
1459  <target name="jsr166edist-jar"
1460          depends="jsr166eclean, jsr166ejar">
1461    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1462  </target>
1463
1464  <target name="jsr166edist-docs"
1465          depends="jsr166eclean, jsr166edocs">
1466    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1467  </target>
1468
1469
1470 <!-- Find buglets that can be detected by static build tools -->
1471
1472  <target name="lint">
1473    <antcall target="dists">
1474      <param name="build.javadoc.access" value="public"/>
1475    </antcall>
1476  </target>
1477
1478 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1479  <target name="lint-private">
1480    <antcall target="dist">
1481      <param name="build.javadoc.access" value="private"/>
1482    </antcall>
1483  </target>
1484
1485
881   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines