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.299 by jsr166, Fri Jun 14 20:10:53 2019 UTC vs.
Revision 1.322 by jsr166, Sat Dec 12 22:13:53 2020 UTC

# Line 19 | 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/jdk8
23  $HOME/jdk/jdk9
24  $HOME/jdk/jdk10
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/jdk8
31  $HOME/jdk/src/jdk9
32  $HOME/jdk/src/jdk10
30    $HOME/jdk/src/jdk11
31    $HOME/jdk/src/jdk12
32    $HOME/jdk/src/jdk13
33    $HOME/jdk/src/jdk14
34 <  where each of the above is a complete JDK source tree
35 <  (e.g. mercurial forest) or a symlink to same.
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 8 .. 14 ...
41 >  for $N in 11 .. 17 ...
42  
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 70 | Line 71
71    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
72    <property name="build.loops.dir"             location="${build.dir}/loops"/>
73  
73  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
74  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
75  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
76  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
77
78  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
79  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
80  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
81  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
82
83  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
84  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
85  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
86  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
87
88  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
89  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
90  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
91  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
92
74    <!-- JDK locations -->
75    <property name="jdks.home"  location="${user.home}/jdk"/>
76  
# Line 101 | 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"/>
105 <    <available property="have.java.base"
106 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
107 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
108 <      if:set="have.java.base"/>
109 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
110 <      unless:set="have.java.base"/>
111 <    <local name="modules"/>
112 <    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
113 <    <local name="boot.jar.dir"/>
114 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
115 <    <path id="bootclasspath@{v}" unless:set="modules">
116 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
117 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
118 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
119 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
120 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
121 <    </path>
122 <    <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 135 | Line 98
98      </sequential>
99    </macrodef>
100  
138  <defjdklocations v="6"/>
139  <defjdklocations v="7"/>
140  <defjdklocations v="8"/>
141  <defjdklocations v="9"/>
142  <defjdklocations v="10"/>
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"/>
153  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
154  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
155  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
156  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
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="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
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"/>
165  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
166  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
167  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
168  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
169  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
170  <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"/>
175 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
176 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
177 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
178 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
179 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
180 <
181 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
182 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
183 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
184 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
185 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
186 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
187 <  <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"/>
191  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
192  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
193  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
194  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
195  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
196  <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    <!-- 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"/>
205 <  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
206 <  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
207 <  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
208 <  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
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) -->
210  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
211  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
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="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/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 -->
220  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
221  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
222  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
223  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
224  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
225  <property name="java10.api.url"     value="${java10.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 234 | 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 257 | Line 189
189  
190      <sequential>
191  
260    <local name="modules"/>
261    <condition property="modules">
262      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
263    </condition>
264
265    <local name="use-doclint"/>
266    <condition property="use-doclint">
267      <not> <equals arg1="@{target}" arg2="7"/> </not>
268    </condition>
269
192      <mkdir dir="@{workdir}/tck-classes"/>
193  
194      <javac srcdir="@{tck.src.dir}"
# Line 286 | 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="-Xdoclint:reference/private" if:set="use-doclint"/>
212 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
291 <      <compilerarg value="--patch-module=java.base=@{classes}" 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 298 | Line 219
219            failonerror="true"
220            jvm="${java@{target}}"
221            fork="true">
222 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
223 <        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
224 <        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
225 <        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
226 <        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
227 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
228 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
229 <        <jvmarg line="@{jvmflags}"/>
230 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
231 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
232 <
233 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
234 <        <syspropertyset id="system-properties-used-by-tck">
235 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
236 <          <propertyref prefix="jsr166."/>
237 <          <propertyref name="test.timeout.factor"/>
238 <        </syspropertyset>
239 <
240 <        <classpath>
241 <          <pathelement location="${junit.jar}"/>
242 <          <pathelement location="@{workdir}/tck-classes"/>
322 <        </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>
# Line 340 | Line 260
260      </sequential>
261    </macrodef>
262  
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"/>
347  <defjtregtests v="10"/>
348  <defjtregtests v="9"/>
349  <defjtregtests v="8"/>
350  <defjtregtests v="7"/>
270  
271    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
272    <property name="jtreg.flags" value=""/>
# Line 366 | Line 285
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}/lib/modules" type="file"/>
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=@{classes}" if:set="modules"/>
301 <      <arg value="-vmoptions:--patch-module=java.base=@{classes}" 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:@{verbose}"/>
385      <arg value="-vmoptions:-esa -ea"/>
308        <arg value="-automatic"/>
309        <arg value="-k:!ignore"/>
310        <arg line="@{jtregflags}"/>
# Line 398 | 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  
# Line 406 | Line 329
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 ...}
# Line 414 | Line 338
338      -->
339    <property name="java.runtime.target" value="11"/>
340    <property name="build.main.java" value="${java11}"/>
341 <  <property name="build.main.javac" value="${javac9}"/>
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"
346 >          depends="dist"
347            description="Builds all public jars and docs"/>
424          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
348  
349    <target name="compile"
350            depends="configure-compiler"
# Line 448 | Line 371
371        <compilerarg value="--patch-module=java.base=${src.dir}"/>
372        <compilerarg value="-Xprefer:source"/>
373        <compilerarg value="-XDignore.symbol.file=true"/>
374 + <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
375        <compilerarg value="-Xlint:all,-removal"/>
376        <compilerarg line="--doclint-format html5"/>
377 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
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"/>
# Line 478 | 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  
# Line 500 | Line 435
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 ${java.docroot.url}"/>
441        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
442 +      <arg value="-quiet"/>
443        <arg value="-XDignore.symbol.file=true"/>
444        <arg value="-html5"/>
445 +      <arg value="-Xdoclint:all,-missing"/>
446        <arg value="--patch-module=java.base=${src.dir}"/>
447 < <!-- old school frames via docs/index.html?overview-summary.html -->
511 < <!-- TODO: - -frames no longer a supported option in jdk13+ -->
512 <      <arg value="--frames"/>
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:"/>
# Line 551 | 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
# Line 586 | 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="${java.runtime.target}"
# Line 599 | Line 534
534            description="Runs tck and jtreg tests for src/main"/>
535  
536    <target name="test-version-permutations"
537 <          depends="test9, test10, test11, test12, test13, test14, test9-11, test9-12, test9-13, test9-14, clean, test, docs">
538 <  </target>
539 <
540 <  <target name="test9">
606 <    <antcall target="clean"/>
607 <    <antcall>
608 <      <param name="java.runtime.target" value="9"/>
609 <      <param name="build.main.javac" value="${javac9}"/>
610 <      <param name="build.main.javadoc" value="${javadoc12}"/>
611 <      <param name="build.main.javadoc.source" value="9"/>
612 <      <target name="test"/>
613 <      <target name="docs"/>
614 <    </antcall>
615 <  </target>
616 <
617 <  <target name="test10">
618 <    <antcall target="clean"/>
619 <    <antcall>
620 <      <param name="java.runtime.target" value="10"/>
621 <      <param name="build.main.javac" value="${javac10}"/>
622 <      <param name="build.main.javadoc" value="${javadoc12}"/>
623 <      <param name="build.main.javadoc.source" value="10"/>
624 <      <target name="test"/>
625 <      <target name="docs"/>
626 <    </antcall>
627 <  </target>
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">
630    <antcall target="clean"/>
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="test12">
642    <antcall target="clean"/>
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    <target name="test13">
654    <antcall target="clean"/>
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 name="test14">
666    <antcall target="clean"/>
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="test9-11">
678 <    <antcall target="clean"/>
590 >  <target name="test15">
591      <antcall>
592 <      <param name="java.runtime.target" value="11"/>
593 <      <param name="build.main.javac" value="${javac9}"/>
594 <      <param name="build.main.javadoc" value="${javadoc12}"/>
595 <      <param name="build.main.javadoc.source" value="9"/>
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 <  <target name="test9-12">
603 <    <antcall target="clean"/>
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 >  <target name="test11-12">
615      <antcall>
616        <param name="java.runtime.target" value="12"/>
617 <      <param name="build.main.javac" value="${javac9}"/>
617 >      <param name="build.main.javac" value="${javac11}"/>
618        <param name="build.main.javadoc" value="${javadoc12}"/>
619 <      <param name="build.main.javadoc.source" value="9"/>
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 name="test9-13">
702 <    <antcall target="clean"/>
626 >  <target name="test11-13">
627      <antcall>
628        <param name="java.runtime.target" value="13"/>
629 <      <param name="build.main.javac" value="${javac9}"/>
629 >      <param name="build.main.javac" value="${javac11}"/>
630        <param name="build.main.javadoc" value="${javadoc13}"/>
631 <      <param name="build.main.javadoc.source" value="9"/>
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="test9-14">
714 <    <antcall target="clean"/>
638 >  <target name="test11-14">
639      <antcall>
640        <param name="java.runtime.target" value="14"/>
641 <      <param name="build.main.javac" value="${javac9}"/>
641 >      <param name="build.main.javac" value="${javac11}"/>
642        <param name="build.main.javadoc" value="${javadoc14}"/>
643 <      <param name="build.main.javadoc.source" value="9"/>
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">
# Line 761 | Line 721
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}"/>
766 <      <compilerarg line="${build.args}"/>
767 <    </javac>
768 <  </target>
769 <
770 <
771 <  <!-- jsr166 4jdk8 -->
772 <
773 <  <target name="4jdk8compile"
774 <          depends="configure-compiler"
775 <          description="Compiles src/jdk8 sources, targeting jdk8">
776 <
777 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
778 <
779 <    <javac srcdir="${4jdk8src.dir}"
780 <           destdir="${build.4jdk8.classes.dir}"
781 <           debug="${build.debug}"
782 <           debuglevel="${build.debuglevel}"
783 <           deprecation="${build.deprecation}"
784 <           source="8"
785 <           target="8"
786 <           classpath=""
787 <           bootclasspath="${bootclasspath8}"
788 <           includeAntRuntime="false"
789 <           includeJavaRuntime="false"
790 <           encoding="ASCII"
791 <           executable="${javac8}"
792 <           fork="true">
793 <      <include name="**/*.java"/>
794 <      <compilerarg value="-Xprefer:source"/>
795 <      <compilerarg value="-XDignore.symbol.file=true"/>
796 <      <compilerarg value="-Xlint:all"/>
797 <      <compilerarg value="-Werror"/>
798 <      <compilerarg line="${build.args}"/>
799 <    </javac>
800 <  </target>
801 <
802 <  <target name="4jdk8doclint"
803 <          depends="configure-compiler"
804 <          description="Finds doclint warnings">
805 <
806 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
807 <
808 <    <javac srcdir="${4jdk8src.dir}"
809 <           destdir="${build.4jdk8.classes.dir}"
810 <           debug="${build.debug}"
811 <           debuglevel="${build.debuglevel}"
812 <           deprecation="${build.deprecation}"
813 <           source="8"
814 <           target="8"
815 <           classpath=""
816 <           bootclasspath="${bootclasspath8}"
817 <           includeAntRuntime="false"
818 <           includeJavaRuntime="false"
819 <           encoding="ASCII"
820 <           executable="${javac8}"
821 <           fork="true">
822 <      <include name="**/*.java"/>
823 <      <compilerarg value="-Xprefer:source"/>
824 <      <compilerarg value="-XDignore.symbol.file=true"/>
825 <      <compilerarg value="-Xlint:all"/>
826 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
724 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
725 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
726        <compilerarg line="${build.args}"/>
727      </javac>
728    </target>
729  
730  
731 <  <target name="4jdk8jar"
732 <          depends="4jdk8compile"
834 <          description="Builds library jar from compiled sources">
835 <
836 <    <jar destfile="${4jdk8product.jar}">
837 <      <fileset dir="${build.4jdk8.classes.dir}"/>
838 <      <manifest>
839 <        <attribute name="Built-By" value="${user.name}"/>
840 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
841 <      </manifest>
842 <    </jar>
843 <  </target>
844 <
845 <
846 <  <target name="4jdk8-tck"
847 <          depends="4jdk8jar"
848 <          description="Runs tck tests for jsr166-4jdk8 directly">
849 <
850 <    <run-tck-tests
851 <      target="8"
852 <      workdir="${build.4jdk8.dir}"
853 <      classes="${4jdk8product.jar}">
854 <      <javac-elements>
855 <        <!-- JDK9+ test classes -->
856 <        <exclude name="*9Test.java"/>
857 <        <exclude name="*10Test.java"/>
858 <        <compilerarg value="-Werror"/>
859 <      </javac-elements>
860 <    </run-tck-tests>
861 <  </target>
862 <
863 <
864 <  <target name="4jdk8-jtreg"
865 <          depends="4jdk8jar"
866 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
867 <    <run-jtreg-tests
868 <       target="8"
869 <       workdir="${build.4jdk8.dir}"
870 <       classes="${4jdk8product.jar}"/>
871 <  </target>
872 <
873 <
874 <  <target name="4jdk8-test"
875 <          depends="4jdk8-tck, 4jdk8-jtreg"
876 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
877 <
878 <
879 <  <target name="4jdk8docs"
880 <          description="Builds javadocs for src/jdk8 to dist dir">
881 <
882 <    <delete dir="${4jdk8docs.dir}"/>
883 <    <mkdir dir="${4jdk8docs.dir}"/>
884 <
885 <    <javadoc destdir="${4jdk8docs.dir}"
886 <             packagenames="none"
887 <             link="${java8.api.url}"
888 <             overview="${4jdk8src.dir}/intro.html"
889 <             access="${build.javadoc.access}"
890 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
891 <             classpath=""
892 <             source="8"
893 <             executable="${javadoc8}"
894 <             failonerror = "true">
895 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
896 <        <include name="**/*.java"/>
897 <      </fileset>
898 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
899 <      <arg value="-XDignore.symbol.file=true"/>
900 <      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
901 <      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
902 <      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
903 < <!-- @apiNote tag currently unused -->
904 < <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
905 <    </javadoc>
906 <  </target>
907 <
908 <
909 <  <target name="4jdk8dist"
910 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
911 <          description="Puts all distributable products in single hierarchy"/>
912 <
913 <
914 <  <target name="4jdk8clean"
915 <          description="Removes all 4jdk8 build products">
916 <    <delete dir="${build.4jdk8.dir}"/>
917 <  </target>
918 <
919 <
920 <  <target name="4jdk8dist-jar"
921 <          depends="4jdk8clean, 4jdk8jar">
922 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
923 <  </target>
924 <
925 <
926 <  <target name="4jdk8dist-docs"
927 <          depends="4jdk8clean, 4jdk8docs">
928 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
929 <  </target>
930 <
931 <
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) -->
933
934  <target name="4jdk7compile" depends="configure-compiler">
935    <mkdir dir="${build.4jdk7.classes.dir}"/>
936
937    <javac srcdir="${4jdk7src.dir}"
938           destdir="${build.4jdk7.classes.dir}"
939           debug="${build.debug}"
940           debuglevel="${build.debuglevel}"
941           deprecation="${build.deprecation}"
942           source="6"
943           target="6"
944           classpath=""
945           bootclasspath="${bootclasspath6}"
946           includeAntRuntime="false"
947           includeJavaRuntime="false"
948           encoding="ASCII"
949           executable="${javac7}"
950           fork="true">
951
952      <include name="**/*.java"/>
953      <compilerarg value="-Xprefer:source"/>
954      <compilerarg value="-XDignore.symbol.file=true"/>
955      <compilerarg value="-Xlint:all"/>
956      <compilerarg value="-Werror"/>
957      <compilerarg line="${build.args}"/>
958    </javac>
959  </target>
960
961  <target name="4jdk7doclint" depends="configure-compiler">
962    <mkdir dir="${build.4jdk7.classes.dir}"/>
963
964    <javac srcdir="${4jdk7src.dir}"
965           destdir="${build.4jdk7.classes.dir}"
966           debug="${build.debug}"
967           debuglevel="${build.debuglevel}"
968           deprecation="${build.deprecation}"
969           source="6"
970           target="6"
971           classpath=""
972           bootclasspath="${bootclasspath6}"
973           includeAntRuntime="false"
974           includeJavaRuntime="false"
975           encoding="ASCII"
976           executable="${javac8}"
977           fork="true">
978
979      <include name="**/*.java"/>
980      <compilerarg value="-Xprefer:source"/>
981      <compilerarg value="-XDignore.symbol.file=true"/>
982      <compilerarg value="-Xlint:all"/>
983      <compilerarg value="-Xdoclint:all/protected"/>
984      <compilerarg line="${build.args}"/>
985    </javac>
986  </target>
987
988  <target name="4jdk7jar" depends="4jdk7compile">
989    <jar destfile="${4jdk7product.jar}">
990      <fileset dir="${build.4jdk7.classes.dir}"/>
991      <manifest>
992        <attribute name="Built-By" value="${user.name}"/>
993        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
994      </manifest>
995    </jar>
996  </target>
997
998  <target name="4jdk7-tck" depends="4jdk7jar">
999    <run-tck-tests
1000      target="7"
1001      workdir="${build.4jdk7.dir}"
1002      classes="${4jdk7product.jar}">
1003      <javac-elements>
1004        <!-- JDK8+ test classes -->
1005        <exclude name="*8Test.java"/>
1006        <exclude name="*9Test.java"/>
1007        <exclude name="*10Test.java"/>
1008        <exclude name="DoubleAccumulatorTest.java"/>
1009        <exclude name="DoubleAdderTest.java"/>
1010        <exclude name="LongAccumulatorTest.java"/>
1011        <exclude name="LongAdderTest.java"/>
1012        <exclude name="CompletableFutureTest.java"/>
1013        <exclude name="SplittableRandomTest.java"/>
1014        <exclude name="StampedLockTest.java"/>
1015        <exclude name="SubmissionPublisherTest.java"/>
1016        <compilerarg value="-Werror"/>
1017      </javac-elements>
1018    </run-tck-tests>
1019  </target>
1020
1021  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
1022  <target name="4jdk7-tck-junit" depends="4jdk7compile">
1023
1024    <junit printsummary="true"
1025           showoutput="true"
1026           errorProperty="junit.failed"
1027           failureProperty="junit.failed"
1028           includeantruntime="true"
1029           jvm="${java7}"
1030           fork="true">
1031
1032      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
1033      <jvmarg value="-server"/>
1034
1035      <classpath>
1036        <pathelement location="${junit.jar}"/>
1037        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
1038      </classpath>
1039
1040      <formatter type="brief"/>
1041
1042      <test name="${jsr166.tckTestClass}" haltonfailure="no">
1043      </test>
1044    </junit>
1045  </target>
1046
1047  <target name="4jdk7-jtreg" depends="4jdk7jar">
1048    <run-jtreg-tests
1049       target="7"
1050       workdir="${build.4jdk7.dir}"
1051       classes="${4jdk7product.jar}"/>
1052  </target>
1053
1054  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1055
1056  <target name="4jdk7docs">
1057    <delete dir="${4jdk7docs.dir}"/>
1058    <mkdir dir="${4jdk7docs.dir}"/>
1059
1060    <javadoc destdir="${4jdk7docs.dir}"
1061             packagenames="none"
1062             link="${java7.api.url}"
1063             overview="${4jdk7src.dir}/intro.html"
1064             access="${build.javadoc.access}"
1065             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1066             classpath=""
1067             executable="${javadoc7}"
1068             failonerror = "true">
1069      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1070        <include name="**/*.java"/>
1071      </fileset>
1072      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1073      <arg value="-XDignore.symbol.file=true"/>
1074    </javadoc>
1075  </target>
1076
1077  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1078
1079  <target name="4jdk7clean">
1080    <delete dir="${build.4jdk7.dir}"/>
1081  </target>
1082
1083  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1084    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1085  </target>
1086
1087  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1088    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1089  </target>
1090
1091
734    <!-- jsr166x (no longer maintained) -->
1093
1094  <target name="jsr166xcompile" depends="configure-compiler">
1095    <mkdir dir="${build.jsr166x.classes.dir}"/>
1096
1097    <javac srcdir="${topsrc.dir}"
1098           destdir="${build.jsr166x.classes.dir}"
1099           debug="${build.debug}"
1100           debuglevel="${build.debuglevel}"
1101           deprecation="${build.deprecation}"
1102           classpath=""
1103           bootclasspath="${bootclasspath6}"
1104           source="5"
1105           target="5"
1106           includeAntRuntime="false"
1107           includeJavaRuntime="false"
1108           encoding="ASCII"
1109           executable="${javac7}"
1110           fork="true">
1111      <include name="jsr166x/**/*.java"/>
1112      <compilerarg value="-XDignore.symbol.file=true"/>
1113      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1114      <compilerarg value="-Werror"/>
1115      <compilerarg line="${build.args}"/>
1116    </javac>
1117  </target>
1118
1119  <target name="jsr166xjar" depends="jsr166xcompile">
1120    <jar destfile="${jsr166x.jar}">
1121      <fileset dir="${build.jsr166x.classes.dir}"/>
1122      <manifest>
1123        <attribute name="Built-By" value="${user.name}"/>
1124        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1125      </manifest>
1126    </jar>
1127  </target>
1128
1129  <target name="jsr166xdocs">
1130    <delete dir="${jsr166xdocs.dir}"/>
1131    <mkdir dir="${jsr166xdocs.dir}"/>
1132
1133    <javadoc destdir="${jsr166xdocs.dir}"
1134             packagenames="jsr166x.*"
1135             link="${java.api.url}"
1136             access="${build.javadoc.access}"
1137             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1138             bootclasspath="${bootclasspath6}"
1139             source="5"
1140             executable="${javadoc7}"
1141             failonerror = "true">
1142      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1143      <arg value="-XDignore.symbol.file=true"/>
1144    </javadoc>
1145  </target>
1146
1147  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1148
1149  <target name="jsr166xclean">
1150    <delete dir="${build.jsr166x.dir}"/>
1151  </target>
1152
1153  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1154    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1155  </target>
1156
1157  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1158    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1159  </target>
1160
1161
735    <!-- jsr166y (no longer maintained) -->
1163
1164  <target name="jsr166ycompile" depends="configure-compiler">
1165    <mkdir dir="${build.jsr166y.classes.dir}"/>
1166
1167    <javac srcdir="${topsrc.dir}"
1168           destdir="${build.jsr166y.classes.dir}"
1169           debug="${build.debug}"
1170           debuglevel="${build.debuglevel}"
1171           deprecation="${build.deprecation}"
1172           source="6"
1173           target="6"
1174           classpath=""
1175           bootclasspath="${bootclasspath6}"
1176           includeAntRuntime="false"
1177           includeJavaRuntime="false"
1178           encoding="ASCII"
1179           executable="${javac7}"
1180           fork="true">
1181
1182      <include name="jsr166y/**/*.java"/>
1183      <compilerarg value="-XDignore.symbol.file=true"/>
1184      <compilerarg value="-Xlint:all"/>
1185      <compilerarg value="-Werror"/>
1186      <compilerarg line="${build.args}"/>
1187    </javac>
1188  </target>
1189
1190  <target name="jsr166yjar" depends="jsr166ycompile">
1191    <jar destfile="${jsr166y.jar}" index="true">
1192      <fileset dir="${build.jsr166y.classes.dir}"/>
1193      <manifest>
1194        <attribute name="Built-By" value="${user.name}"/>
1195        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1196      </manifest>
1197    </jar>
1198  </target>
1199
1200  <target name="jsr166ydocs">
1201    <delete dir="${jsr166ydocs.dir}"/>
1202    <mkdir dir="${jsr166ydocs.dir}"/>
1203
1204    <javadoc destdir="${jsr166ydocs.dir}"
1205             packagenames="jsr166y.*"
1206             link="${java.api.url}"
1207             access="${build.javadoc.access}"
1208             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1209             bootclasspath="${bootclasspath6}"
1210             source="6"
1211             executable="${javadoc7}"
1212             failonerror = "true">
1213      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1214      <arg value="-XDignore.symbol.file=true"/>
1215    </javadoc>
1216  </target>
1217
1218  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1219
1220  <target name="jsr166yclean">
1221    <delete dir="${build.jsr166y.dir}"/>
1222  </target>
1223
1224  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1225    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1226  </target>
1227
1228  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1229    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1230  </target>
1231
1232
736    <!-- extra166y (no longer maintained) -->
1234
1235  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1236    <mkdir dir="${build.extra166y.classes.dir}"/>
1237
1238    <javac srcdir="${topsrc.dir}"
1239           destdir="${build.extra166y.classes.dir}"
1240           debug="${build.debug}"
1241           debuglevel="${build.debuglevel}"
1242           deprecation="${build.deprecation}"
1243           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1244           classpath=""
1245           source="6"
1246           target="6"
1247           includeAntRuntime="false"
1248           includeJavaRuntime="false"
1249           encoding="ASCII"
1250           executable="${javac7}"
1251           fork="true">
1252
1253      <include name="extra166y/**/*.java"/>
1254      <compilerarg value="-XDignore.symbol.file=true"/>
1255      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1256      <compilerarg value="-Werror"/>
1257      <compilerarg line="${build.args}"/>
1258    </javac>
1259  </target>
1260
1261  <target name="extra166yjar" depends="extra166ycompile">
1262    <jar destfile="${extra166y.jar}" index="true">
1263      <fileset dir="${build.extra166y.classes.dir}"/>
1264      <manifest>
1265        <attribute name="Built-By" value="${user.name}"/>
1266        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1267      </manifest>
1268    </jar>
1269  </target>
1270
1271  <target name="extra166ydocs">
1272    <delete dir="${extra166ydocs.dir}"/>
1273    <mkdir dir="${extra166ydocs.dir}"/>
1274
1275    <javadoc destdir="${extra166ydocs.dir}"
1276             packagenames="extra166y.*"
1277             link="${java.api.url}"
1278             access="${build.javadoc.access}"
1279             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1280             bootclasspath="${bootclasspath6}"
1281             source="6"
1282             executable="${javadoc7}">
1283      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1284      <arg value="-XDignore.symbol.file=true"/>
1285    </javadoc>
1286  </target>
1287
1288  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1289
1290  <target name="extra166yclean">
1291    <delete dir="${build.extra166y.dir}"/>
1292  </target>
1293
1294  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1295    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1296  </target>
1297
1298  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1299    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1300  </target>
1301
1302
737    <!-- jsr166e (no longer maintained) -->
738  
1305  <property name="build.jsr166e.java.version" value="6"/>
1306  <property name="build.jsr166e.javac" value="${javac6}"/>
1307
1308  <target name="jsr166ecompile" depends="configure-compiler">
1309    <mkdir dir="${build.jsr166e.classes.dir}"/>
1310
1311    <javac srcdir="${topsrc.dir}"
1312           destdir="${build.jsr166e.classes.dir}"
1313           debug="${build.debug}"
1314           debuglevel="${build.debuglevel}"
1315           deprecation="${build.deprecation}"
1316           source="${build.jsr166e.java.version}"
1317           target="${build.jsr166e.java.version}"
1318           classpath=""
1319           includeAntRuntime="false"
1320           includeJavaRuntime="false"
1321           executable="${build.jsr166e.javac}"
1322           fork="true">
1323
1324      <include name="jsr166e/**/*.java"/>
1325      <compilerarg value="-XDignore.symbol.file=true"/>
1326      <compilerarg value="-Xlint:all"/>
1327      <compilerarg value="-Werror"/>
1328      <compilerarg line="${build.args}"/>
1329    </javac>
1330  </target>
1331
1332  <target name="jsr166edoclint">
1333    <mkdir dir="${build.jsr166e.classes.dir}"/>
1334
1335    <javac srcdir="${topsrc.dir}"
1336           destdir="${build.jsr166e.classes.dir}"
1337           debug="${build.debug}"
1338           debuglevel="${build.debuglevel}"
1339           deprecation="${build.deprecation}"
1340           source="${build.jsr166e.java.version}"
1341           target="${build.jsr166e.java.version}"
1342           classpath=""
1343           bootclasspath="${bootclasspath6}"
1344           includeAntRuntime="false"
1345           includeJavaRuntime="false"
1346           executable="${javac8}"
1347           fork="true">
1348
1349      <include name="jsr166e/**/*.java"/>
1350      <compilerarg value="-XDignore.symbol.file=true"/>
1351      <compilerarg value="-Xlint:all"/>
1352      <compilerarg value="-Werror"/>
1353      <compilerarg value="-Xdoclint:all/protected"/>
1354    </javac>
1355  </target>
1356
1357  <target name="jsr166ejar" depends="jsr166ecompile">
1358    <jar destfile="${jsr166e.jar}" index="true">
1359      <fileset dir="${build.jsr166e.classes.dir}"/>
1360      <manifest>
1361        <attribute name="Built-By" value="${user.name}"/>
1362        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1363      </manifest>
1364    </jar>
1365  </target>
1366
1367  <target name="jsr166edocs">
1368    <delete dir="${jsr166edocs.dir}"/>
1369    <mkdir dir="${jsr166edocs.dir}"/>
1370
1371    <javadoc destdir="${jsr166edocs.dir}"
1372             packagenames="jsr166e.*"
1373             link="${java.api.url}"
1374             access="${build.javadoc.access}"
1375             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1376             source="${build.jsr166e.java.version}"
1377             executable="${javadoc7}"
1378             failonerror = "true">
1379      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1380      <arg value="-XDignore.symbol.file=true"/>
1381    </javadoc>
1382  </target>
1383
1384  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1385    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1386    <run-tck-tests
1387      tck.src.dir="${test.src.dir}/tck-jsr166e"
1388      target="${build.jsr166e.java.version}"
1389      workdir="${build.jsr166e.dir}"
1390      classes="${jsr166e.jar}"/>
1391  </target>
1392
1393  <target name="jsr166e-tck">
1394
1395 <!--     <antcall target="clean"/> -->
1396 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1397 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1398 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1399 <!--     </antcall> -->
1400
1401    <antcall target="clean"/>
1402    <antcall target="jsr166e-tck-one-java-version">
1403      <param name="build.jsr166e.java.version" value="7"/>
1404      <param name="build.jsr166e.javac" value="${javac7}"/>
1405    </antcall>
1406
1407    <antcall target="clean"/>
1408    <antcall target="jsr166e-tck-one-java-version">
1409      <param name="build.jsr166e.java.version" value="6"/>
1410      <param name="build.jsr166e.javac" value="${javac6}"/>
1411    </antcall>
1412  </target>
1413
1414  <target name="jsr166e-test" depends="jsr166e-tck"/>
1415
1416  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1417
1418  <target name="jsr166eclean">
1419    <delete dir="${build.jsr166e.dir}"/>
1420  </target>
1421
1422  <target name="jsr166edist-jar"
1423          depends="jsr166eclean, jsr166ejar">
1424    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1425  </target>
1426
1427  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1428    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1429  </target>
1430
1431
739   <!-- Find buglets that can be detected by static build tools -->
740  
741   <!--   <target name="lint"> -->
# Line 1452 | Line 759
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.2-with-dependencies.jar"/>
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
# Line 1480 | Line 789
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"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines