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.224 by jsr166, Thu Nov 24 01:58:04 2016 UTC vs.
Revision 1.322 by jsr166, Sat Dec 12 22:13:53 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 >  $HOME/jdk/jdk16
28 >  $HOME/jdk/jdk17
29    where each of the above is a JDK or a symlink to same, and
30 <  $HOME/jdk/src/jdk6
31 <  $HOME/jdk/src/jdk7
32 <  $HOME/jdk/src/jdk8
33 <  $HOME/jdk/src/jdk9
34 <  where each of the above is a complete JDK source tree
35 <  (e.g. mercurial forest) or a symlink to same.
30 >  $HOME/jdk/src/jdk11
31 >  $HOME/jdk/src/jdk12
32 >  $HOME/jdk/src/jdk13
33 >  $HOME/jdk/src/jdk14
34 >  $HOME/jdk/src/jdk15
35 >  $HOME/jdk/src/jdk16
36 >  $HOME/jdk/src/jdk17
37 >  where each of the above is a JDK source tree or a symlink to same.
38  
39    Alternatively, define ant variables thus:
40    ant -Djdk$N.home=... -Djdk$N.src.home=...
41 <  for $N in 6 7 8 9 ...
41 >  for $N in 11 .. 17 ...
42  
43 <  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
44 <  target is currently broken.
43 >  As of 2016-03, the sources in src/main are for jdk9+ only.
44 >  As of 2019-08, the sources in src/main are for jdk11+ only.
45 >  As of 2019-10, compatibility support for jdk8 is dropped entirely.
46   ------------------------------------------------------------------------------
47    </description>
48  
# Line 52 | Line 60
60  
61  
62    <!-- Compilation options -->
55  <property name="build.sourcelevel"    value="6"/>
63    <property name="build.debug"          value="true"/>
64    <property name="build.debuglevel"     value="source,lines,vars"/>
65    <property name="build.deprecation"    value="false"/>
# Line 64 | Line 71
71    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
72    <property name="build.loops.dir"             location="${build.dir}/loops"/>
73  
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
74    <!-- JDK locations -->
75    <property name="jdks.home"  location="${user.home}/jdk"/>
76  
# Line 95 | Line 82
82      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
83      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
84      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
85 <    <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"/>
85 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
86      </sequential>
87    </macrodef>
88  
# Line 129 | Line 98
98      </sequential>
99    </macrodef>
100  
101 <  <defjdklocations v="6"/>
102 <  <defjdklocations v="7"/>
103 <  <defjdklocations v="8"/>
104 <  <defjdklocations v="9"/>
101 >  <defjdklocations v="11"/>
102 >  <defjdklocations v="12"/>
103 >  <defjdklocations v="13"/>
104 >  <defjdklocations v="14"/>
105 >  <defjdklocations v="15"/>
106 >  <defjdklocations v="16"/>
107 >  <defjdklocations v="17"/>
108  
109    <!-- Source locations -->
110    <property name="src.dir"              location="${basedir}/src/main"/>
111    <property name="test.src.dir"         location="${basedir}/src/test"/>
112    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
113    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
114 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
115 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
116 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
117 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
114 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
115 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
116 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
117 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
118 >  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
119 >  <property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
120 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
121 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
122    <property name="lib.dir"              location="${basedir}/lib"/>
123    <property name="dist.dir"             location="${basedir}/dist"/>
124    <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"/>
125  
126    <!-- Javadoc locations -->
127    <property name="docs.dir"          location="${build.dir}/docs"/>
128 <  <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"/>
128 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
129  
130    <!-- Jar locations -->
131    <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"/>
132    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
133  
134    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
135 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
136 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
137 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
138 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
139 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
140 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
141 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
142 <  <!-- Default jdk doc location (latest stable release seems best) -->
143 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
135 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
136 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
137 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
138 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
139 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
140 >  <!-- The location of jdk early access docs (RIP) -->
141 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
142 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
143 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
144 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
145 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
146 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
147 >  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
148 >  <property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/>
149 >  <property name="java16.docroot.url" value="https://download.java.net/java/early_access/jdk16/docs"/>
150 >  <property name="java17.docroot.url" value="https://download.java.net/java/early_access/jdk17/docs"/>
151 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
152 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
153  
154    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
155 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
156 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
157 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
158 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
159 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
155 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
156 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
157 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
158 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
159 >  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
160 >  <property name="java16.api.url"     value="${java16.docroot.url}/api/"/>
161 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
162    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
163  
164    <!-- Define the "jtreg" task -->
# Line 204 | Line 166
166    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
167             classpath="${lib.dir}/jtreg.jar" />
168  
169 <  <!-- Tck options; see JSR166TestCase.java
169 >  <!-- Tck configuration options; see JSR166TestCase.java
170     To profile a single tck test class:
171     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
172     To stress test a single tck test class:
# Line 227 | Line 189
189  
190      <sequential>
191  
230    <local name="modules"/>
231    <condition property="modules">
232      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233    </condition>
234
192      <mkdir dir="@{workdir}/tck-classes"/>
193  
194      <javac srcdir="@{tck.src.dir}"
# Line 251 | Line 208
208        <include name="*.java"/>
209        <compilerarg value="-XDignore.symbol.file=true"/>
210        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
211 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
212 <      <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
211 >      <compilerarg value="-Xdoclint:reference/private"/>
212 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
213        <compilerarg line="${build.args}"/>
214        <javac-elements/>
215  
# Line 262 | Line 219
219            failonerror="true"
220            jvm="${java@{target}}"
221            fork="true">
222 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
223 <        <jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
224 <        <jvmarg line="@{jvmflags}"/>
225 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
226 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
227 <
228 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
229 <        <syspropertyset id="system-properties-used-by-tck">
230 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
231 <          <propertyref prefix="jsr166."/>
232 <          <propertyref name="test.timeout.factor"/>
233 <        </syspropertyset>
234 <
235 <        <classpath>
236 <          <pathelement location="${junit.jar}"/>
237 <          <pathelement location="@{workdir}/tck-classes"/>
238 <        </classpath>
222 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
223 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
224 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
225 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
226 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
227 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
228 >        <jvmarg line="@{jvmflags}"/>
229 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
230 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
231 >
232 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
233 >        <syspropertyset id="system-properties-used-by-tck">
234 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
235 >          <propertyref prefix="jsr166."/>
236 >          <propertyref name="test.timeout.factor"/>
237 >        </syspropertyset>
238 >
239 >        <classpath>
240 >          <pathelement location="${junit.jar}"/>
241 >          <pathelement location="@{workdir}/tck-classes"/>
242 >        </classpath>
243      </java>
244  
245      </sequential>
246    </macrodef>
247  
248    <!-- Define jtreg test sets for different jdk versions -->
249 <  <fileset dir="${jtreg9.src.dir}">
250 <    <patternset id="jdk9.jtreg.tests">
251 <      <include name="**/*.java"/>
252 <    </patternset>
253 <  </fileset>
254 <
255 <  <fileset dir="${jtreg8.src.dir}">
256 <    <patternset id="jdk8.jtreg.tests">
257 <      <include name="**/*.java"/>
258 <      <exclude name="**/SpliteratorCharacteristics.java"/>
259 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
260 <      <exclude name="**/GCDuringIteration.java"/>
261 <    </patternset>
301 <  </fileset>
249 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
250 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
251 >  <property name="jtreg.test.pattern" value="**/*.java"/>
252 >  <macrodef name="defjtregtests">
253 >    <attribute name="v"/>
254 >    <sequential>
255 >      <fileset dir="${jtreg@{v}.src.dir}">
256 >        <patternset id="jdk@{v}.jtreg.tests">
257 >          <include name="${jtreg.test.pattern}"/>
258 >        </patternset>
259 >      </fileset>
260 >    </sequential>
261 >  </macrodef>
262  
263 <  <fileset dir="${jtreg7.src.dir}">
264 <    <patternset id="jdk7.jtreg.tests">
265 <      <include name="**/*.java"/>
266 <    </patternset>
267 <  </fileset>
263 >  <defjtregtests v="17"/>
264 >  <defjtregtests v="16"/>
265 >  <defjtregtests v="15"/>
266 >  <defjtregtests v="14"/>
267 >  <defjtregtests v="13"/>
268 >  <defjtregtests v="12"/>
269 >  <defjtregtests v="11"/>
270  
271    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
272    <property name="jtreg.flags" value=""/>
273  
274    <macrodef name="run-jtreg-tests">
275 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
314 <    <attribute name="source" default="7"/>
275 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
276      <attribute name="target"/>
277      <attribute name="workdir"/>
278      <attribute name="classes"/>
279 +    <attribute name="verbose" default="${jtreg.verbose}"/>
280      <attribute name="jtregflags" default=""/>
281 +    <element name="jtreg-elements" optional="true"/>
282  
283      <sequential>
284  
285      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
286      <property name="jtreg.verbose" value="nopass,fail,error"/>
287  
288 <    <local name="modules"/>
289 <    <condition property="modules">
290 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
291 <    </condition>
288 >    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
289 >    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
290 >    <!-- In 2020 concurrency:3 seems like a sweet spot -->
291 >    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
292 >    <property name="jtreg.concurrency" value="3"/>
293  
294 <    <delete dir="@{workdir}/JTwork"   quiet="true"/>
294 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
295      <jtreg dir="${jtreg@{target}.src.dir}"
296             jdk="${jdk@{target}.home}"
297             workDir="@{workdir}/JTwork">
298        <patternset refid="jdk@{target}.jtreg.tests"/>
299 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
300 <      <arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
301 <      <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
299 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
300 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
301 >      <arg value="-vmoption:-Xmx256m"/>
302 >      <arg value="-concurrency:${jtreg.concurrency}"/>
303 >      <arg value="-vmoptions:-esa -ea"/>
304 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
305        <arg value="-agentvm"/>
306        <arg value="-noreport"/>
307 <      <arg value="-verbose:${jtreg.verbose}"/>
341 <      <arg value="-vmoptions:-esa -ea"/>
307 >      <arg value="-verbose:@{verbose}"/>
308        <arg value="-automatic"/>
309        <arg value="-k:!ignore"/>
310        <arg line="@{jtregflags}"/>
311        <arg line="${jtreg.flags}"/>
312 +      <jtreg-elements/>
313      </jtreg>
314      </sequential>
315    </macrodef>
# Line 353 | Line 320
320    </path>
321  
322    <!-- Support @jls tag, used in jdk8+ javadoc -->
323 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
324    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
325    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
326  
327    <!-- Main targets -->
328  
329 <  <property name="build.main.java.version" value="9"/>
330 <  <property name="build.main.javac" value="${javac9}"/>
329 >  <!-- Default values: may seem strange ... -->
330 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
331 >  <!-- But at build time, target jdk9, for maximal binary portability -->
332 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
333 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
334 >    o override-methods=summary
335 >    o {@systemProperty ...}
336 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
337 >    o 8202628: javadoc generates bad links in TestModules.java
338 >    -->
339 >  <property name="java.runtime.target" value="11"/>
340 >  <property name="build.main.java" value="${java11}"/>
341 >  <property name="build.main.javac" value="${javac11}"/>
342 >  <property name="build.main.javadoc" value="${javadoc12}"/>
343 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
344  
345    <target name="dists"
346 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
346 >          depends="dist"
347            description="Builds all public jars and docs"/>
348  
349    <target name="compile"
350            depends="configure-compiler"
351            description="Compiles src/main sources to build dir">
352  
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
353      <local name="destdir"/>
354 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
382 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
354 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
355  
356      <mkdir dir="${destdir}"/>
357  
# Line 396 | Line 368
368             fork="true">
369  
370        <include name="**/*.java"/>
371 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
371 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
372        <compilerarg value="-Xprefer:source"/>
373        <compilerarg value="-XDignore.symbol.file=true"/>
374 <      <compilerarg value="-Xlint:all"/>
375 <      <compilerarg value="-Werror"/>
374 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
375 >      <compilerarg value="-Xlint:all,-removal"/>
376 >      <compilerarg line="--doclint-format html5"/>
377 > <!--  Temporarily disable doclint for private elements, due to -->
378 > <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
379 > <!--  which is expected to be fixed in openjdk 11.0.8 -->
380 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
381        <compilerarg value="-Xdoclint:all/protected"/>
382 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
383 +      <compilerarg value="-Werror"/>
384        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
385        <compilerarg line="${build.args}"/>
386  
# Line 427 | Line 406
406    <target name="docs"
407            description="Builds javadocs for src/main to dist dir">
408  
409 <    <delete dir="${docs.dir}"/>
409 >    <delete dir="${docs.dir}" quiet="true"/>
410      <mkdir dir="${docs.dir}"/>
411  
412 +    <!-- old school frames via docs/index.html?overview-summary.html -->
413 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
414 +    <local name="use-frames"/>
415 +    <condition property="use-frames">
416 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
417 +    </condition>
418 +
419      <!-- the packagenames="none" hack below prevents scanning the -->
420      <!-- sourcepath for packages -->
421  
422 < <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
423 < <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
422 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
423 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
424 > <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
425 > <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
426 > <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
427      <javadoc destdir="${docs.dir}"
428               packagenames="none"
429 <             link="${java9.api.url}"
429 >             link="${java.api.url}"
430               overview="${src.dir}/intro.html"
431               access="${build.javadoc.access}"
432               sourcepath="${src.dir}"
433               classpath=""
434 <             executable="${javadoc9}">
434 >             source="${build.main.javadoc.source}"
435 >             executable="${build.main.javadoc}">
436 > <!-- TODO: JDK-8214571 failonerror = "true" -->
437        <fileset dir="${src.dir}" defaultexcludes="yes">
438 <        <include name="**/*.java"/>
438 >        <include name="java/**/*.java"/>
439        </fileset>
440 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
440 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
441        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
442 +      <arg value="-quiet"/>
443        <arg value="-XDignore.symbol.file=true"/>
444 <      <arg value="-Xmodule:java.base"/>
445 <      <arg value="-tag"/>
446 <      <arg value="${javadoc.jls.option}"/>
447 < <!-- @apiNote currently unused -->
448 < <!--       <arg value="-tag"/> -->
449 < <!--       <arg value="apiNote:a:API Note:"/> -->
450 <      <arg value="-tag"/>
451 <      <arg value="implSpec:a:Implementation Requirements:"/>
452 <      <arg value="-tag"/>
461 <      <arg value="implNote:a:Implementation Note:"/>
444 >      <arg value="-html5"/>
445 >      <arg value="-Xdoclint:all,-missing"/>
446 >      <arg value="--patch-module=java.base=${src.dir}"/>
447 >      <arg value="--frames" if:set="use-frames"/>
448 >      <arg value="--override-methods=summary"/>
449 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
450 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
451 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
452 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
453   <!-- tags added in jdk9: currently unused -->
454 < <!--       <arg value="-tag"/> -->
455 < <!--       <arg value="revised:X"/> -->
465 < <!--       <arg value="-tag"/> -->
466 < <!--       <arg value="spec:X"/> -->
454 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
455 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
456      </javadoc>
457    </target>
458  
# Line 473 | Line 462
462            description="Puts all distributable products in single hierarchy"/>
463  
464  
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
465    <target name="clean"
466            description="Removes all build products">
500
467      <delete dir="${build.dir}"/>
502
468    </target>
469  
470  
471    <target name="dist-clean"
472            description="Removes all build and distribution products">
508
473      <delete dir="${build.dir}"/>
474      <delete dir="${dist.dir}"/>
511
475    </target>
476  
477  
# Line 523 | Line 486
486    </target>
487  
488    <target name="tck"
489 <          depends="jar"
489 >          depends="jar"
490            description="Runs tck tests for src/main directly">
491  
492      <run-tck-tests
493 <      target="${build.main.java.version}"
493 >      target="${java.runtime.target}"
494        workdir="${build.dir}"
495 <      classes="${product.jar}"/>
495 >      classes="${product.jar}">
496 >      <javac-elements>
497 >        <compilerarg value="-Werror"/>
498 >      </javac-elements>
499 >    </run-tck-tests>
500    </target>
501  
502    <target name="tck-parallelism-1"
# Line 554 | Line 521
521    </target>
522  
523    <target name="jtreg"
524 <          depends="jar"
524 >          depends="jar"
525            description="Runs jtreg tests for src/main using the jtreg ant task">
526      <run-jtreg-tests
527 <       target="${build.main.java.version}"
527 >       target="${java.runtime.target}"
528         workdir="${build.dir}"
529         classes="${product.jar}"/>
530    </target>
531  
532    <target name="test"
533            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
534 <          description="Runs tck and jtreg tests for src/main">
534 >          description="Runs tck and jtreg tests for src/main"/>
535 >
536 >  <target name="test-version-permutations"
537 >          depends="test11, test12, test13, test14, test15, test16,
538 >          test11-12, test11-13, test11-14, test11-15, test11-16,
539 >          clean, test, docs"
540 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
541 >
542 >  <target name="test11">
543 >    <antcall>
544 >      <param name="java.runtime.target" value="11"/>
545 >      <param name="build.main.javac" value="${javac11}"/>
546 >      <param name="build.main.javadoc" value="${javadoc12}"/>
547 >      <param name="build.main.javadoc.source" value="11"/>
548 >      <target name="clean"/>
549 >      <target name="test"/>
550 >      <target name="docs"/>
551 >    </antcall>
552    </target>
553  
554 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
554 >  <target name="test12">
555 >    <antcall>
556 >      <param name="java.runtime.target" value="12"/>
557 >      <param name="build.main.javac" value="${javac12}"/>
558 >      <param name="build.main.javadoc" value="${javadoc12}"/>
559 >      <param name="build.main.javadoc.source" value="12"/>
560 >      <target name="clean"/>
561 >      <target name="test"/>
562 >      <target name="docs"/>
563 >    </antcall>
564 >  </target>
565  
566 < <!--     <antcall target="jtreg"> -->
567 < <!--       <param name="build.main.java.version" value="8"/> -->
568 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
569 < <!--     </antcall> -->
566 >  <target name="test13">
567 >    <antcall>
568 >      <param name="java.runtime.target" value="13"/>
569 >      <param name="build.main.javac" value="${javac13}"/>
570 >      <param name="build.main.javadoc" value="${javadoc13}"/>
571 >      <param name="build.main.javadoc.source" value="13"/>
572 >      <target name="clean"/>
573 >      <target name="test"/>
574 >      <target name="docs"/>
575 >    </antcall>
576 >  </target>
577  
578 < <!--   </target> -->
578 >  <target name="test14">
579 >    <antcall>
580 >      <param name="java.runtime.target" value="14"/>
581 >      <param name="build.main.javac" value="${javac14}"/>
582 >      <param name="build.main.javadoc" value="${javadoc14}"/>
583 >      <param name="build.main.javadoc.source" value="14"/>
584 >      <target name="clean"/>
585 >      <target name="test"/>
586 >      <target name="docs"/>
587 >    </antcall>
588 >  </target>
589  
590 < <!--   <target name="test89" -->
591 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
590 >  <target name="test15">
591 >    <antcall>
592 >      <param name="java.runtime.target" value="15"/>
593 >      <param name="build.main.javac" value="${javac15}"/>
594 >      <param name="build.main.javadoc" value="${javadoc15}"/>
595 >      <param name="build.main.javadoc.source" value="15"/>
596 >      <target name="clean"/>
597 >      <target name="test"/>
598 >      <target name="docs"/>
599 >    </antcall>
600 >  </target>
601  
602 < <!--     <antcall target="clean"/> -->
603 < <!--     <antcall target="test"> -->
604 < <!--       <param name="build.main.java.version" value="8"/> -->
605 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
606 < <!--     </antcall> -->
602 >  <target name="test16">
603 >    <antcall>
604 >      <param name="java.runtime.target" value="16"/>
605 >      <param name="build.main.javac" value="${javac16}"/>
606 >      <param name="build.main.javadoc" value="${javadoc16}"/>
607 >      <param name="build.main.javadoc.source" value="16"/>
608 >      <target name="clean"/>
609 >      <target name="test"/>
610 >      <target name="docs"/>
611 >    </antcall>
612 >  </target>
613  
614 < <!--     <antcall target="clean"/> -->
615 < <!--     <antcall target="test"> -->
616 < <!--       <param name="build.main.java.version" value="9"/> -->
617 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
618 < <!--     </antcall> -->
614 >  <target name="test11-12">
615 >    <antcall>
616 >      <param name="java.runtime.target" value="12"/>
617 >      <param name="build.main.javac" value="${javac11}"/>
618 >      <param name="build.main.javadoc" value="${javadoc12}"/>
619 >      <param name="build.main.javadoc.source" value="11"/>
620 >      <target name="clean"/>
621 >      <target name="test"/>
622 >      <target name="docs"/>
623 >    </antcall>
624 >  </target>
625  
626 < <!--   </target> -->
626 >  <target name="test11-13">
627 >    <antcall>
628 >      <param name="java.runtime.target" value="13"/>
629 >      <param name="build.main.javac" value="${javac11}"/>
630 >      <param name="build.main.javadoc" value="${javadoc13}"/>
631 >      <param name="build.main.javadoc.source" value="11"/>
632 >      <target name="clean"/>
633 >      <target name="test"/>
634 >      <target name="docs"/>
635 >    </antcall>
636 >  </target>
637 >
638 >  <target name="test11-14">
639 >    <antcall>
640 >      <param name="java.runtime.target" value="14"/>
641 >      <param name="build.main.javac" value="${javac11}"/>
642 >      <param name="build.main.javadoc" value="${javadoc14}"/>
643 >      <param name="build.main.javadoc.source" value="11"/>
644 >      <target name="clean"/>
645 >      <target name="test"/>
646 >      <target name="docs"/>
647 >    </antcall>
648 >  </target>
649  
650 +  <target name="test11-15">
651 +    <antcall>
652 +      <param name="java.runtime.target" value="15"/>
653 +      <param name="build.main.javac" value="${javac11}"/>
654 +      <param name="build.main.javadoc" value="${javadoc15}"/>
655 +      <param name="build.main.javadoc.source" value="11"/>
656 +      <target name="clean"/>
657 +      <target name="test"/>
658 +      <target name="docs"/>
659 +    </antcall>
660 +  </target>
661 +
662 +  <target name="test11-16">
663 +    <antcall>
664 +      <param name="java.runtime.target" value="16"/>
665 +      <param name="build.main.javac" value="${javac11}"/>
666 +      <param name="build.main.javadoc" value="${javadoc16}"/>
667 +      <param name="build.main.javadoc.source" value="11"/>
668 +      <target name="clean"/>
669 +      <target name="test"/>
670 +      <target name="docs"/>
671 +    </antcall>
672 +  </target>
673 +
674 +  <target name="docs16">
675 +    <antcall>
676 +      <param name="java.runtime.target" value="16"/>
677 +      <param name="build.main.javac" value="${javac16}"/>
678 +      <param name="build.main.javadoc" value="${javadoc16}"/>
679 +      <param name="build.main.javadoc.source" value="16"/>
680 +      <target name="clean"/>
681 +      <target name="docs"/>
682 +    </antcall>
683 +  </target>
684  
685  
686    <target name="configure-compiler">
687      <fail message="ant version too old">
688 <      <condition>
601 <        <not> <antversion atleast="1.9.1"/> </not>
602 <      </condition>
688 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
689      </fail>
690  
691      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 617 | Line 703
703    </target>
704  
705  
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
706    <target name="compile-test-loops" depends="jar"
707 <          description="compile all the perf tests in src/test/loops">
707 >          description="Compiles all the perf tests in src/test/loops">
708  
709      <mkdir dir="${build.dir}/test/loops"/>
710  
# Line 662 | Line 716
716             includeAntRuntime="false"
717             includeJavaRuntime="false"
718             encoding="ASCII"
719 <           executable="${javac9}"
719 >           executable="${build.main.javac}"
720             fork="true">
721  
722        <include name="*.java"/>
723        <compilerarg value="-XDignore.symbol.file=true"/>
724 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
725 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
672 <      <compilerarg line="${build.args}"/>
673 <
674 <    </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"/>
724 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
725 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
726        <compilerarg line="${build.args}"/>
739
727      </javac>
728    </target>
729  
730  
731 <  <target name="4jdk8jar"
732 <          depends="4jdk8compile"
733 <          description="Builds library jar from compiled sources">
734 <
735 <    <jar destfile="${4jdk8product.jar}">
736 <      <fileset dir="${build.4jdk8.classes.dir}"/>
737 <      <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">
789 <  </target>
790 <
791 <
792 <  <target name="4jdk8docs"
793 <          description="Builds javadocs for src/jdk8 to dist dir">
794 <
795 <    <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 <
731 >  <!-- old branches no longer maintained.  build support deleted -->
732 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
733 >  <!-- jsr166 4jdk7 (no longer maintained) -->
734 >  <!-- jsr166x (no longer maintained) -->
735 >  <!-- jsr166y (no longer maintained) -->
736 >  <!-- extra166y (no longer maintained) -->
737 >  <!-- jsr166e (no longer maintained) -->
738  
739 <  <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>
739 > <!-- Find buglets that can be detected by static build tools -->
740  
741 + <!--   <target name="lint"> -->
742 + <!--     <antcall target="dists"> -->
743 + <!--       <param name="build.javadoc.access" value="protected"/> -->
744 + <!--     </antcall> -->
745 + <!--   </target> -->
746  
747 <  <target name="4jdk8dist-docs"
748 <          depends="4jdk8clean, 4jdk8docs">
749 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
747 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
748 >  <target name="doclint-private">
749 >    <antcall target="dist">
750 >      <param name="build.javadoc.access" value="private"/>
751 >    </antcall>
752    </target>
753  
754  
755 + <!-- ==============================================================
756 +  Experimental errorprone support
757 +  https://errorprone.info
758 +  https://errorprone.info/docs/installation
759 +  https://github.com/google/error-prone/issues/1143
760 + =================================================================== -->
761 +  <path id="errorprone.processorpath.path">
762 +    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
763 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
764 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
765 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
766 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
767 +  </path>
768 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
769 +  <property name="errorprone.jsr166.user.flags" value=""/>
770 +  <property name="errorprone.jsr166.flags"
771 +            value="-Xep:HashtableContains:OFF
772 +                   -Xep:PreferJavaTimeOverload:OFF
773 +                   -Xep:JdkObsolete:OFF
774 +                   -Xep:MissingOverride:OFF
775 +                   -Xep:MissingFail:OFF
776 +                   -Xep:ThreadPriorityCheck:OFF
777 +                   -Xep:MixedArrayDimensions:ERROR
778 +                   -Xep:RemoveUnusedImports:ERROR
779 +                   -Xep:EmptyIf:ERROR
780 +                   -Xep:MultipleTopLevelClasses:ERROR
781 +                   -Xep:ClassName:ERROR
782 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
783 +                   -Xep:RedundantThrows:ERROR
784 +                   -Xep:IdentityBinaryExpression:WARN
785 +                   -Xep:ConstructorInvokesOverridable:WARN
786 +                   -Xep:MethodCanBeStatic:WARN
787 +                   ${errorprone.jsr166.user.flags}"/>
788 +  <!-- -Xep:WildcardImport:ERROR -->
789 +  <property name="errorprone.jsr166.test.flags"
790 +            value="-Xep:StringSplitter:OFF
791 +                   -Xep:BoxedPrimitiveConstructor:OFF
792 +                   -Xep:UnnecessaryParentheses:OFF
793 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
794 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
795 +  <target name="errorprone"
796 +          depends="clean, configure-compiler"
797 +          description="Run errorprone over jsr166 source code (experimental)">
798  
799 <  <!-- jsr166 4jdk7 -->
800 <
801 <  <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}"/>
799 >    <local name="destdir"/>
800 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
801 >    <mkdir dir="${destdir}"/>
802  
803 <    <javac srcdir="${4jdk7src.dir}"
804 <           destdir="${build.4jdk7.classes.dir}"
803 >    <javac srcdir="${src.dir}"
804 >           destdir="${destdir}"
805             debug="${build.debug}"
806             debuglevel="${build.debuglevel}"
807             deprecation="${build.deprecation}"
895           source="6"
896           target="6"
808             classpath=""
898           bootclasspath="${bootclasspath6}"
809             includeAntRuntime="false"
810             includeJavaRuntime="false"
811             encoding="ASCII"
812 <           executable="${javac8}"
812 >           executable="${build.main.javac}"
813             fork="true">
814  
815        <include name="**/*.java"/>
816 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
817 +      <compilerarg value="-J--illegal-access=permit"/>
818 +      <compilerarg value="-XDcompilePolicy=simple"/>
819 +      <compilerarg value="-processorpath"/>
820 +      <compilerarg pathref="errorprone.processorpath.path"/>
821 +      <compilerarg value="-Xplugin:ErrorProne
822 +                          ${errorprone.jsr166.flags}"/>
823 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
824        <compilerarg value="-Xprefer:source"/>
825        <compilerarg value="-XDignore.symbol.file=true"/>
826        <compilerarg value="-Xlint:all"/>
827 <      <compilerarg value="-Xdoclint:all/protected"/>
827 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
828 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
829        <compilerarg line="${build.args}"/>
911
830      </javac>
913  </target>
831  
832 <
833 <  <target name="4jdk7jar"
917 <          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>
832 >    <jar destfile="${product.jar}">
833 >      <fileset dir="${destdir}"/>
834      </jar>
835  
928  </target>
929
930
931  <target name="4jdk7-tck"
932          depends="4jdk7jar"
933          description="Runs tck tests for jsr166-4jdk7 directly">
934
836      <run-tck-tests
837 <      target="7"
838 <      workdir="${build.4jdk7.dir}"
839 <      classes="${4jdk7product.jar}">
837 >      target="${java.runtime.target}"
838 >      workdir="${build.dir}"
839 >      classes="${product.jar}">
840        <javac-elements>
841 <        <!-- JDK8+ test classes -->
842 <        <exclude name="*8Test.java"/>
843 <        <exclude name="*9Test.java"/>
844 <        <exclude name="*10Test.java"/>
845 <        <exclude name="DoubleAccumulatorTest.java"/>
846 <        <exclude name="DoubleAdderTest.java"/>
847 <        <exclude name="LongAccumulatorTest.java"/>
848 <        <exclude name="LongAdderTest.java"/>
948 <        <exclude name="CompletableFutureTest.java"/>
949 <        <exclude name="SplittableRandomTest.java"/>
950 <        <exclude name="StampedLockTest.java"/>
951 <        <exclude name="SubmissionPublisherTest.java"/>
841 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
842 >        <compilerarg value="-J--illegal-access=permit"/>
843 >        <compilerarg value="-XDcompilePolicy=simple"/>
844 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
845 >        <compilerarg value="-Xplugin:ErrorProne
846 >                            ${errorprone.jsr166.flags}
847 >                            ${errorprone.jsr166.test.flags}"/>
848 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
849        </javac-elements>
850      </run-tck-tests>
851    </target>
852  
853 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
854 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
855 +  <target name="errorprone-jtreg"
856 +          depends="jar"
857 +          description="Run errorprone over jtreg tests (experimental)">
858  
859 <  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
860 <  <target name="4jdk7-tck-junit"
861 <          depends="4jdk7compile">
862 <
863 <    <junit printsummary="true"
864 <           showoutput="true"
865 <           errorProperty="junit.failed"
866 <           failureProperty="junit.failed"
867 <           includeantruntime="true"
868 <           jvm="${java7}"
869 <           fork="true">
870 <
871 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
872 <      <jvmarg value="-server"/>
873 <
859 >    <run-jtreg-tests
860 >       target="${java.runtime.target}"
861 >       workdir="${build.dir}"
862 >       classes="${product.jar}"
863 >       verbose="all">
864 >      <jtreg-elements>
865 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
866 >        <arg value="-javacoption:-processorpath"/>
867 >        <arg value="-javacoption:${errorprone.processorpath}"/>
868 >        <arg value="-javacoption:-Xplugin:ErrorProne
869 >                            ${errorprone.jsr166.flags}
870 >                            ${errorprone.jsr166.test.flags}
871 >                            -Xep:MultipleTopLevelClasses:WARN
872 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
873 >      </jtreg-elements>
874 >    </run-jtreg-tests>
875 >  </target>
876 >
877 >
878 > <!-- ==============================================================
879 >  Running guava tests against jsr166 code
880 > =================================================================== -->
881 >
882 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
883 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
884 > <!-- <property name="guava.version" value="21.0"/> -->
885 >
886 > <!-- HOWTO debug print a path id -->
887 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
888 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
889 >
890 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
891 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
892 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
893 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
894 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
895 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
896 >
897 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
898 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
899 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
900 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
901 >
902 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
903 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
904 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
905 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
906 >
907 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
908 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
909 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
910 >
911 >  <target name="init-ivy">
912 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
913 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
914 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
915 >             classpath="${build.dir}/ivy.jar"/>
916 >  </target>
917 >
918 >  <target name="guava-tests" depends="jar, init-ivy"
919 >          description="Guava tests run against jsr166 collections">
920 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
921 >    <mkdir dir="${guava.dir}"/>
922 >    <ivy:retrieve pathid="guava.testlib.classpath"
923 >      type="jar,bundle" inline="true" conf="default,master"
924 >      pattern="${guava.dir}/[artifact].[ext]"
925 >      organisation="com.google.guava" module="guava-testlib"/>
926 >    <property name="guava.version" value="21.0"/>
927 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
928 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
929 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
930 >           jvm="${build.main.java}" fork="true">
931 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
932 >      <formatter type="brief"/>
933        <classpath>
934 <        <pathelement location="${junit.jar}"/>
935 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
934 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
935 >        <path refid="guava.testlib.classpath"/>
936        </classpath>
937  
938 <      <formatter type="brief"/>
939 <
979 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
980 <      </test>
981 <
938 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
939 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
940      </junit>
941    </target>
942  
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
943   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines