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.234 by jsr166, Sat Feb 18 18:33:42 2017 UTC vs.
Revision 1.307 by jsr166, Sun Oct 6 19:03:54 2019 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>
# Line 18 | 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/jdk7
23 <  $HOME/jdk/jdk8
24 <  $HOME/jdk/jdk9
25 <  $HOME/jdk/jdk10
22 >  $HOME/jdk/jdk11
23 >  $HOME/jdk/jdk12
24 >  $HOME/jdk/jdk13
25 >  $HOME/jdk/jdk14
26    where each of the above is a JDK or a symlink to same, and
27 <  $HOME/jdk/src/jdk7
28 <  $HOME/jdk/src/jdk8
29 <  $HOME/jdk/src/jdk9
30 <  $HOME/jdk/src/jdk10
31 <  where each of the above is a complete JDK source tree
31 <  (e.g. mercurial forest) or a symlink to same.
27 >  $HOME/jdk/src/jdk11
28 >  $HOME/jdk/src/jdk12
29 >  $HOME/jdk/src/jdk13
30 >  $HOME/jdk/src/jdk14
31 >  where each of the above is a JDK source tree or a symlink to same.
32  
33    Alternatively, define ant variables thus:
34    ant -Djdk$N.home=... -Djdk$N.src.home=...
35 <  for $N in 7 8 9 10 ...
35 >  for $N in 11 .. 14 ...
36  
37    As of 2016-03, the sources in src/main are for jdk9+ only.
38 +  As of 2019-08, the sources in src/main are for jdk11+ only.
39 +  As of 2019-10, compatibility support for jdk8 is dropped entirely.
40   ------------------------------------------------------------------------------
41    </description>
42  
# Line 52 | Line 54
54  
55  
56    <!-- Compilation options -->
55  <property name="build.sourcelevel"    value="6"/>
57    <property name="build.debug"          value="true"/>
58    <property name="build.debuglevel"     value="source,lines,vars"/>
59    <property name="build.deprecation"    value="false"/>
# Line 64 | Line 65
65    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
66    <property name="build.loops.dir"             location="${build.dir}/loops"/>
67  
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
68    <!-- JDK locations -->
69    <property name="jdks.home"  location="${user.home}/jdk"/>
70  
# Line 95 | Line 76
76      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
77      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
78      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
79 <    <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"/>
79 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
80      </sequential>
81    </macrodef>
82  
# Line 129 | Line 92
92      </sequential>
93    </macrodef>
94  
95 <  <defjdklocations v="6"/>
96 <  <defjdklocations v="7"/>
97 <  <defjdklocations v="8"/>
98 <  <defjdklocations v="9"/>
136 <  <defjdklocations v="10"/>
95 >  <defjdklocations v="11"/>
96 >  <defjdklocations v="12"/>
97 >  <defjdklocations v="13"/>
98 >  <defjdklocations v="14"/>
99  
100    <!-- Source locations -->
101    <property name="src.dir"              location="${basedir}/src/main"/>
102    <property name="test.src.dir"         location="${basedir}/src/test"/>
103    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
104    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
105 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
106 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
107 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
108 <  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
109 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
105 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
106 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
107 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
108 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
109 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
110    <property name="lib.dir"              location="${basedir}/lib"/>
111    <property name="dist.dir"             location="${basedir}/dist"/>
112    <property name="topsrc.dir"           location="${basedir}/src"/>
151  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
152  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
153  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
154  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
155  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
156  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
113  
114    <!-- Javadoc locations -->
115    <property name="docs.dir"          location="${build.dir}/docs"/>
116 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
161 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
162 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
163 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
164 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
165 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
166 <
167 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
168 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
169 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
170 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
171 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
172 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
173 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
116 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
117  
118    <!-- Jar locations -->
119    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
177  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
178  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
179  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
180  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
181  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
182  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
120    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
121  
122    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
123 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
124 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
125 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
126 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
127 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
128 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
129 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
130 <  <!-- Default jdk doc location (latest stable release seems best) -->
131 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
123 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
124 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
125 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
126 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
127 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
128 >  <!-- The location of jdk early access docs (RIP) -->
129 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
130 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
131 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
132 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
133 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
134 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
135 >  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
136 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
137 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
138  
139    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
140 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
141 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
142 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
143 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
201 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
140 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
141 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
142 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
143 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
144    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
145  
146    <!-- Define the "jtreg" task -->
# Line 206 | Line 148
148    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
149             classpath="${lib.dir}/jtreg.jar" />
150  
151 <  <!-- Tck options; see JSR166TestCase.java
151 >  <!-- Tck configuration options; see JSR166TestCase.java
152     To profile a single tck test class:
153     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
154     To stress test a single tck test class:
# Line 229 | Line 171
171  
172      <sequential>
173  
232    <local name="modules"/>
233    <condition property="modules">
234      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
235    </condition>
236
174      <mkdir dir="@{workdir}/tck-classes"/>
175  
176      <javac srcdir="@{tck.src.dir}"
# Line 253 | Line 190
190        <include name="*.java"/>
191        <compilerarg value="-XDignore.symbol.file=true"/>
192        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
193 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
194 <      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
193 >      <compilerarg value="-Xdoclint:reference/private"/>
194 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
195        <compilerarg line="${build.args}"/>
196        <javac-elements/>
197  
# Line 264 | Line 201
201            failonerror="true"
202            jvm="${java@{target}}"
203            fork="true">
204 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
205 <        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
206 <        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
207 <        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
208 <        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
209 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
210 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
211 <        <jvmarg line="@{jvmflags}"/>
212 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
213 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
214 <
215 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
216 <        <syspropertyset id="system-properties-used-by-tck">
217 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
218 <          <propertyref prefix="jsr166."/>
219 <          <propertyref name="test.timeout.factor"/>
220 <        </syspropertyset>
221 <
222 <        <classpath>
223 <          <pathelement location="${junit.jar}"/>
224 <          <pathelement location="@{workdir}/tck-classes"/>
288 <        </classpath>
204 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
205 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
206 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
207 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
208 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
209 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
210 >        <jvmarg line="@{jvmflags}"/>
211 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
212 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
213 >
214 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
215 >        <syspropertyset id="system-properties-used-by-tck">
216 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
217 >          <propertyref prefix="jsr166."/>
218 >          <propertyref name="test.timeout.factor"/>
219 >        </syspropertyset>
220 >
221 >        <classpath>
222 >          <pathelement location="${junit.jar}"/>
223 >          <pathelement location="@{workdir}/tck-classes"/>
224 >        </classpath>
225      </java>
226  
227      </sequential>
228    </macrodef>
229  
230    <!-- Define jtreg test sets for different jdk versions -->
231 <  <fileset dir="${jtreg9.src.dir}">
232 <    <patternset id="jdk9.jtreg.tests">
233 <      <include name="**/*.java"/>
234 <    </patternset>
235 <  </fileset>
236 <
237 <  <fileset dir="${jtreg8.src.dir}">
238 <    <patternset id="jdk8.jtreg.tests">
239 <      <include name="**/*.java"/>
240 <    </patternset>
241 <  </fileset>
231 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
232 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
233 >  <property name="jtreg.test.pattern" value="**/*.java"/>
234 >  <macrodef name="defjtregtests">
235 >    <attribute name="v"/>
236 >    <sequential>
237 >      <fileset dir="${jtreg@{v}.src.dir}">
238 >        <patternset id="jdk@{v}.jtreg.tests">
239 >          <include name="${jtreg.test.pattern}"/>
240 >        </patternset>
241 >      </fileset>
242 >    </sequential>
243 >  </macrodef>
244  
245 <  <fileset dir="${jtreg7.src.dir}">
246 <    <patternset id="jdk7.jtreg.tests">
247 <      <include name="**/*.java"/>
248 <    </patternset>
311 <  </fileset>
245 >  <defjtregtests v="14"/>
246 >  <defjtregtests v="13"/>
247 >  <defjtregtests v="12"/>
248 >  <defjtregtests v="11"/>
249  
250    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
251    <property name="jtreg.flags" value=""/>
252  
253    <macrodef name="run-jtreg-tests">
254 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
318 <    <attribute name="source" default="7"/>
254 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
255      <attribute name="target"/>
256      <attribute name="workdir"/>
257      <attribute name="classes"/>
258 +    <attribute name="verbose" default="${jtreg.verbose}"/>
259      <attribute name="jtregflags" default=""/>
260 +    <element name="jtreg-elements" optional="true"/>
261  
262      <sequential>
263  
264      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
265      <property name="jtreg.verbose" value="nopass,fail,error"/>
266  
329    <local name="modules"/>
330    <condition property="modules">
331      <available file="${jdk@{target}.home}/jmods" type="dir"/>
332    </condition>
333
267      <delete dir="@{workdir}/JTwork"   quiet="true"/>
268      <jtreg dir="${jtreg@{target}.src.dir}"
269             jdk="${jdk@{target}.home}"
270             workDir="@{workdir}/JTwork">
271        <patternset refid="jdk@{target}.jtreg.tests"/>
272 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
273 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
341 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
272 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
273 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
274        <arg value="-agentvm"/>
275        <arg value="-noreport"/>
276 <      <arg value="-verbose:${jtreg.verbose}"/>
276 >      <arg value="-verbose:@{verbose}"/>
277        <arg value="-vmoptions:-esa -ea"/>
278        <arg value="-automatic"/>
279        <arg value="-k:!ignore"/>
280        <arg line="@{jtregflags}"/>
281        <arg line="${jtreg.flags}"/>
282 +      <jtreg-elements/>
283      </jtreg>
284      </sequential>
285    </macrodef>
# Line 357 | Line 290
290    </path>
291  
292    <!-- Support @jls tag, used in jdk8+ javadoc -->
293 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
294    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
295    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
296  
297    <!-- Main targets -->
298  
299 <  <property name="build.main.java.version" value="9"/>
300 <  <property name="build.main.javac" value="${javac9}"/>
299 >  <!-- Default values: may seem strange ... -->
300 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
301 >  <!-- But at build time, target jdk9, for maximal binary portability -->
302 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
303 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
304 >    o override-methods=summary
305 >    o {@systemProperty ...}
306 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
307 >    o 8202628: javadoc generates bad links in TestModules.java
308 >    -->
309 >  <property name="java.runtime.target" value="11"/>
310 >  <property name="build.main.java" value="${java11}"/>
311 >  <property name="build.main.javac" value="${javac11}"/>
312 >  <property name="build.main.javadoc" value="${javadoc12}"/>
313 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
314  
315    <target name="dists"
316 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
316 >          depends="dist"
317            description="Builds all public jars and docs"/>
318  
319    <target name="compile"
320            depends="configure-compiler"
321            description="Compiles src/main sources to build dir">
322  
376    <local name="modules"/>
377    <condition property="modules">
378      <and>
379        <available file="${jdk9.home}/jmods" type="dir"/>
380        <equals arg1="9" arg2="${build.main.java.version}"/>
381      </and>
382    </condition>
383
323      <local name="destdir"/>
324 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
386 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
324 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
325  
326      <mkdir dir="${destdir}"/>
327  
# Line 400 | Line 338
338             fork="true">
339  
340        <include name="**/*.java"/>
341 <      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
341 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
342        <compilerarg value="-Xprefer:source"/>
343        <compilerarg value="-XDignore.symbol.file=true"/>
344 <      <compilerarg value="-Xlint:all"/>
344 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
345 >      <compilerarg value="-Xlint:all,-removal"/>
346 >      <compilerarg line="--doclint-format html5"/>
347 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
348 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
349        <compilerarg value="-Werror"/>
408      <compilerarg value="-Xdoclint:all/protected"/>
350        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351        <compilerarg line="${build.args}"/>
352  
# Line 431 | Line 372
372    <target name="docs"
373            description="Builds javadocs for src/main to dist dir">
374  
375 <    <delete dir="${docs.dir}"/>
375 >    <delete dir="${docs.dir}" quiet="true"/>
376      <mkdir dir="${docs.dir}"/>
377  
378 +    <!-- old school frames via docs/index.html?overview-summary.html -->
379 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
380 +    <local name="use-frames"/>
381 +    <condition property="use-frames">
382 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
383 +    </condition>
384 +
385      <!-- the packagenames="none" hack below prevents scanning the -->
386      <!-- sourcepath for packages -->
387  
# Line 444 | Line 392
392   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
393      <javadoc destdir="${docs.dir}"
394               packagenames="none"
395 <             link="${java9.api.url}"
395 >             link="${java.api.url}"
396               overview="${src.dir}/intro.html"
397               access="${build.javadoc.access}"
398               sourcepath="${src.dir}"
399               classpath=""
400 <             executable="${javadoc9}">
400 >             source="${build.main.javadoc.source}"
401 >             executable="${build.main.javadoc}">
402 > <!-- TODO: JDK-8214571 failonerror = "true" -->
403        <fileset dir="${src.dir}" defaultexcludes="yes">
404          <include name="**/*.java"/>
405        </fileset>
406 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
406 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
407        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
408 +      <arg value="-quiet"/>
409        <arg value="-XDignore.symbol.file=true"/>
410 +      <arg value="-html5"/>
411        <arg value="--patch-module=java.base=${src.dir}"/>
412 <      <arg value="-tag"/>
413 <      <arg value="${javadoc.jls.option}"/>
414 < <!-- @apiNote currently unused -->
415 < <!--       <arg value="-tag"/> -->
416 < <!--       <arg value="apiNote:a:API Note:"/> -->
417 <      <arg value="-tag"/>
466 <      <arg value="implSpec:a:Implementation Requirements:"/>
467 <      <arg value="-tag"/>
468 <      <arg value="implNote:a:Implementation Note:"/>
412 >      <arg value="--frames" if:set="use-frames"/>
413 >      <arg value="--override-methods=summary"/>
414 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
415 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
416 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
417 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
418   <!-- tags added in jdk9: currently unused -->
419 < <!--       <arg value="-tag"/> -->
420 < <!--       <arg value="revised:X"/> -->
472 < <!--       <arg value="-tag"/> -->
473 < <!--       <arg value="spec:X"/> -->
419 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
420 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
421      </javadoc>
422    </target>
423  
# Line 480 | Line 427
427            description="Puts all distributable products in single hierarchy"/>
428  
429  
483  <target name="release"
484          depends="dist"
485          description="Puts entire CVS tree, plus distribution productions, in a jar">
486
487    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
488
489    <jar basedir="${basedir}" destfile="${release.jar}">
490      <!-- <exclude name="build/**"/> -->
491      <exclude name="${release.jar}"/>
492      <exclude name="user.properties"/>
493      <exclude name="etc/notes/**"/>
494      <exclude name="src/emulation/**"/>
495      <exclude name="**/SyntaxTest.java"/>
496      <exclude name="**/SuperfluousAbstract.java"/>
497      <manifest>
498        <attribute name="Built-By" value="${user.name}"/>
499        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
500      </manifest>
501    </jar>
502  </target>
503
504
430    <target name="clean"
431            description="Removes all build products">
507
432      <delete dir="${build.dir}"/>
509
433    </target>
434  
435  
436    <target name="dist-clean"
437            description="Removes all build and distribution products">
515
438      <delete dir="${build.dir}"/>
439      <delete dir="${dist.dir}"/>
518
440    </target>
441  
442  
# Line 530 | Line 451
451    </target>
452  
453    <target name="tck"
454 <          depends="jar"
454 >          depends="jar"
455            description="Runs tck tests for src/main directly">
456  
457      <run-tck-tests
458 <      target="${build.main.java.version}"
458 >      target="${java.runtime.target}"
459        workdir="${build.dir}"
460 <      classes="${product.jar}"/>
460 >      classes="${product.jar}">
461 >      <javac-elements>
462 >        <compilerarg value="-Werror"/>
463 >      </javac-elements>
464 >    </run-tck-tests>
465    </target>
466  
467    <target name="tck-parallelism-1"
# Line 561 | Line 486
486    </target>
487  
488    <target name="jtreg"
489 <          depends="jar"
489 >          depends="jar"
490            description="Runs jtreg tests for src/main using the jtreg ant task">
491      <run-jtreg-tests
492 <       target="${build.main.java.version}"
492 >       target="${java.runtime.target}"
493         workdir="${build.dir}"
494         classes="${product.jar}"/>
495    </target>
496  
497    <target name="test"
498            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
499 <          description="Runs tck and jtreg tests for src/main">
575 <  </target>
499 >          description="Runs tck and jtreg tests for src/main"/>
500  
501 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
501 >  <target name="test-version-permutations"
502 >          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
503 >  </target>
504  
505 < <!--     <antcall target="jtreg"> -->
506 < <!--       <param name="build.main.java.version" value="8"/> -->
507 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
508 < <!--     </antcall> -->
505 >  <target name="test11">
506 >    <antcall>
507 >      <param name="java.runtime.target" value="11"/>
508 >      <param name="build.main.javac" value="${javac11}"/>
509 >      <param name="build.main.javadoc" value="${javadoc12}"/>
510 >      <param name="build.main.javadoc.source" value="11"/>
511 >      <target name="clean"/>
512 >      <target name="test"/>
513 >      <target name="docs"/>
514 >    </antcall>
515 >  </target>
516  
517 < <!--   </target> -->
517 >  <target name="test12">
518 >    <antcall>
519 >      <param name="java.runtime.target" value="12"/>
520 >      <param name="build.main.javac" value="${javac12}"/>
521 >      <param name="build.main.javadoc" value="${javadoc12}"/>
522 >      <param name="build.main.javadoc.source" value="12"/>
523 >      <target name="clean"/>
524 >      <target name="test"/>
525 >      <target name="docs"/>
526 >    </antcall>
527 >  </target>
528  
529 < <!--   <target name="test89" -->
530 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
529 >  <target name="test13">
530 >    <antcall>
531 >      <param name="java.runtime.target" value="13"/>
532 >      <param name="build.main.javac" value="${javac13}"/>
533 >      <param name="build.main.javadoc" value="${javadoc13}"/>
534 >      <param name="build.main.javadoc.source" value="13"/>
535 >      <target name="clean"/>
536 >      <target name="test"/>
537 >      <target name="docs"/>
538 >    </antcall>
539 >  </target>
540  
541 < <!--     <antcall target="clean"/> -->
542 < <!--     <antcall target="test"> -->
543 < <!--       <param name="build.main.java.version" value="8"/> -->
544 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
545 < <!--     </antcall> -->
541 >  <target name="test14">
542 >    <antcall>
543 >      <param name="java.runtime.target" value="14"/>
544 >      <param name="build.main.javac" value="${javac14}"/>
545 >      <param name="build.main.javadoc" value="${javadoc14}"/>
546 >      <param name="build.main.javadoc.source" value="14"/>
547 >      <target name="clean"/>
548 >      <target name="test"/>
549 >      <target name="docs"/>
550 >    </antcall>
551 >  </target>
552  
553 < <!--     <antcall target="clean"/> -->
554 < <!--     <antcall target="test"> -->
555 < <!--       <param name="build.main.java.version" value="9"/> -->
556 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
557 < <!--     </antcall> -->
553 >  <target name="test11-12">
554 >    <antcall>
555 >      <param name="java.runtime.target" value="12"/>
556 >      <param name="build.main.javac" value="${javac11}"/>
557 >      <param name="build.main.javadoc" value="${javadoc12}"/>
558 >      <param name="build.main.javadoc.source" value="11"/>
559 >      <target name="clean"/>
560 >      <target name="test"/>
561 >      <target name="docs"/>
562 >    </antcall>
563 >  </target>
564  
565 < <!--   </target> -->
565 >  <target name="test11-13">
566 >    <antcall>
567 >      <param name="java.runtime.target" value="13"/>
568 >      <param name="build.main.javac" value="${javac11}"/>
569 >      <param name="build.main.javadoc" value="${javadoc13}"/>
570 >      <param name="build.main.javadoc.source" value="11"/>
571 >      <target name="clean"/>
572 >      <target name="test"/>
573 >      <target name="docs"/>
574 >    </antcall>
575 >  </target>
576  
577 +  <target name="test11-14">
578 +    <antcall>
579 +      <param name="java.runtime.target" value="14"/>
580 +      <param name="build.main.javac" value="${javac11}"/>
581 +      <param name="build.main.javadoc" value="${javadoc14}"/>
582 +      <param name="build.main.javadoc.source" value="11"/>
583 +      <target name="clean"/>
584 +      <target name="test"/>
585 +      <target name="docs"/>
586 +    </antcall>
587 +  </target>
588  
589  
590    <target name="configure-compiler">
591      <fail message="ant version too old">
592 <      <condition>
608 <        <not> <antversion atleast="1.9.1"/> </not>
609 <      </condition>
592 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
593      </fail>
594  
595      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 624 | Line 607
607    </target>
608  
609  
627
628  <!-- Various demos and test programs -->
629
630
631  <!-- description="Benchmark from Doug Lea's AQS paper" -->
632  <target name="loops" depends="configure-compiler">
633
634    <mkdir dir="${build.loops.dir}"/>
635
636    <javac srcdir="${loops.src.dir}"
637          destdir="${build.loops.dir}"
638            debug="${build.debug}"
639       debuglevel="${build.debuglevel}"
640      deprecation="${build.deprecation}"
641           source="${build.sourcelevel}"
642           target="${build.sourcelevel}"
643         encoding="ASCII"
644             fork="true">
645
646      <compilerarg line="${build.args}"/>
647      <classpath refid="loops.classpath"/>
648      <compilerarg value="-XDignore.symbol.file=true"/>
649
650    </javac>
651
652    <java classname="ALoops" fork="true">
653      <classpath refid="loops.classpath"/>
654    </java>
655
656  </target>
657
658
610    <target name="compile-test-loops" depends="jar"
611 <          description="compile all the perf tests in src/test/loops">
611 >          description="Compiles all the perf tests in src/test/loops">
612  
613      <mkdir dir="${build.dir}/test/loops"/>
614  
# Line 669 | Line 620
620             includeAntRuntime="false"
621             includeJavaRuntime="false"
622             encoding="ASCII"
623 <           executable="${javac9}"
623 >           executable="${build.main.javac}"
624             fork="true">
625  
626        <include name="*.java"/>
627        <compilerarg value="-XDignore.symbol.file=true"/>
628 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
629 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
679 <      <compilerarg line="${build.args}"/>
680 <
681 <    </javac>
682 <
683 <  </target>
684 <
685 <
686 <  <!-- jsr166 4jdk8 -->
687 <
688 <  <target name="4jdk8compile"
689 <          depends="configure-compiler"
690 <          description="Compiles src/jdk8 sources, targeting jdk8">
691 <
692 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
693 <
694 <    <javac srcdir="${4jdk8src.dir}"
695 <           destdir="${build.4jdk8.classes.dir}"
696 <           debug="${build.debug}"
697 <           debuglevel="${build.debuglevel}"
698 <           deprecation="${build.deprecation}"
699 <           source="8"
700 <           target="8"
701 <           classpath=""
702 <           bootclasspath="${bootclasspath8}"
703 <           includeAntRuntime="false"
704 <           includeJavaRuntime="false"
705 <           encoding="ASCII"
706 <           executable="${javac8}"
707 <           fork="true">
708 <
709 <      <include name="**/*.java"/>
710 <      <compilerarg value="-Xprefer:source"/>
711 <      <compilerarg value="-XDignore.symbol.file=true"/>
712 <      <compilerarg value="-Xlint:all"/>
713 <      <compilerarg value="-Werror"/>
628 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
629 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
630        <compilerarg line="${build.args}"/>
715
631      </javac>
632    </target>
633  
719  <target name="4jdk8doclint"
720          depends="configure-compiler"
721          description="Finds doclint warnings">
722
723    <mkdir dir="${build.4jdk8.classes.dir}"/>
724
725    <javac srcdir="${4jdk8src.dir}"
726           destdir="${build.4jdk8.classes.dir}"
727           debug="${build.debug}"
728           debuglevel="${build.debuglevel}"
729           deprecation="${build.deprecation}"
730           source="8"
731           target="8"
732           classpath=""
733           bootclasspath="${bootclasspath8}"
734           includeAntRuntime="false"
735           includeJavaRuntime="false"
736           encoding="ASCII"
737           executable="${javac8}"
738           fork="true">
739
740      <include name="**/*.java"/>
741      <compilerarg value="-Xprefer:source"/>
742      <compilerarg value="-XDignore.symbol.file=true"/>
743      <compilerarg value="-Xlint:all"/>
744      <compilerarg value="-Xdoclint:all/protected"/>
745      <compilerarg line="${build.args}"/>
746
747    </javac>
748  </target>
749
750
751  <target name="4jdk8jar"
752          depends="4jdk8compile"
753          description="Builds library jar from compiled sources">
754
755    <jar destfile="${4jdk8product.jar}">
756      <fileset dir="${build.4jdk8.classes.dir}"/>
757      <manifest>
758        <attribute name="Built-By" value="${user.name}"/>
759        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
760      </manifest>
761    </jar>
762
763  </target>
764
765
766  <target name="4jdk8-tck"
767          depends="4jdk8jar"
768          description="Runs tck tests for jsr166-4jdk8 directly">
769
770    <run-tck-tests
771      target="8"
772      workdir="${build.4jdk8.dir}"
773      classes="${4jdk8product.jar}">
774      <javac-elements>
775        <!-- JDK9+ test classes -->
776        <exclude name="*9Test.java"/>
777        <exclude name="*10Test.java"/>
778      </javac-elements>
779    </run-tck-tests>
780  </target>
781
782
783  <target name="4jdk8-jtreg"
784          depends="4jdk8jar"
785          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
786    <run-jtreg-tests
787       target="8"
788       workdir="${build.4jdk8.dir}"
789       classes="${4jdk8product.jar}"/>
790  </target>
791
792
793  <target name="4jdk8-test"
794          depends="4jdk8-tck, 4jdk8-jtreg"
795          description="Runs tck and jtreg tests for jsr166-4jdk8">
796  </target>
797
798
799  <target name="4jdk8docs"
800          description="Builds javadocs for src/jdk8 to dist dir">
801
802    <delete dir="${4jdk8docs.dir}"/>
803    <mkdir dir="${4jdk8docs.dir}"/>
804
805    <javadoc destdir="${4jdk8docs.dir}"
806             packagenames="none"
807             link="${java8.api.url}"
808             overview="${4jdk8src.dir}/intro.html"
809             access="${build.javadoc.access}"
810             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
811             classpath=""
812             executable="${javadoc8}"
813             failonerror = "true">
814      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
815        <include name="**/*.java"/>
816      </fileset>
817      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
818      <arg value="-XDignore.symbol.file=true"/>
819      <arg value="-tag"/>
820      <arg value="${javadoc.jls.option}"/>
821 <!-- @apiNote currently unused -->
822 <!--       <arg value="-tag"/> -->
823 <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
824      <arg value="-tag"/>
825      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
826      <arg value="-tag"/>
827      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
828    </javadoc>
829  </target>
830
831
832  <target name="4jdk8dist"
833          depends="4jdk8dist-jar, 4jdk8dist-docs"
834          description="Puts all distributable products in single hierarchy"/>
835
836
837  <target name="4jdk8clean"
838          description="Removes all 4jdk8 build products">
839
840    <delete dir="${build.4jdk8.dir}"/>
841
842  </target>
634  
635 +  <!-- old branches no longer maintained.  build support deleted -->
636 +  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
637 +  <!-- jsr166 4jdk7 (no longer maintained) -->
638 +  <!-- jsr166x (no longer maintained) -->
639 +  <!-- jsr166y (no longer maintained) -->
640 +  <!-- extra166y (no longer maintained) -->
641 +  <!-- jsr166e (no longer maintained) -->
642  
643 <  <target name="4jdk8dist-jar"
846 <          depends="4jdk8clean, 4jdk8jar">
847 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
848 <  </target>
643 > <!-- Find buglets that can be detected by static build tools -->
644  
645 + <!--   <target name="lint"> -->
646 + <!--     <antcall target="dists"> -->
647 + <!--       <param name="build.javadoc.access" value="protected"/> -->
648 + <!--     </antcall> -->
649 + <!--   </target> -->
650  
651 <  <target name="4jdk8dist-docs"
652 <          depends="4jdk8clean, 4jdk8docs">
653 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
651 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
652 >  <target name="doclint-private">
653 >    <antcall target="dist">
654 >      <param name="build.javadoc.access" value="private"/>
655 >    </antcall>
656    </target>
657  
658  
659 + <!-- ==============================================================
660 +  Experimental errorprone support
661 +  https://errorprone.info
662 +  https://errorprone.info/docs/installation
663 +  https://github.com/google/error-prone/issues/1143
664 + =================================================================== -->
665 +  <path id="errorprone.processorpath.path">
666 +    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
667 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
668 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
669 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
670 +  </path>
671 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
672 +  <property name="errorprone.jsr166.user.flags" value=""/>
673 +  <property name="errorprone.jsr166.flags"
674 +            value="-Xep:HashtableContains:OFF
675 +                   -Xep:JdkObsolete:OFF
676 +                   -Xep:MissingOverride:OFF
677 +                   -Xep:MissingFail:OFF
678 +                   -Xep:ThreadPriorityCheck:OFF
679 +                   -Xep:MixedArrayDimensions:ERROR
680 +                   -Xep:RemoveUnusedImports:ERROR
681 +                   -Xep:EmptyIf:ERROR
682 +                   -Xep:MultipleTopLevelClasses:ERROR
683 +                   -Xep:ClassName:ERROR
684 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
685 +                   -Xep:RedundantThrows:ERROR
686 +                   -Xep:IdentityBinaryExpression:WARN
687 +                   -Xep:ConstructorInvokesOverridable:WARN
688 +                   -Xep:MethodCanBeStatic:WARN
689 +                   ${errorprone.jsr166.user.flags}"/>
690 +  <!-- -Xep:WildcardImport:ERROR -->
691 +  <property name="errorprone.jsr166.test.flags"
692 +            value="-Xep:StringSplitter:OFF
693 +                   -Xep:BoxedPrimitiveConstructor:OFF
694 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
695 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
696 +  <target name="errorprone"
697 +          depends="clean, configure-compiler"
698 +          description="Run errorprone over jsr166 source code (experimental)">
699  
700 <  <!-- jsr166 4jdk7 -->
701 <
702 <  <target name="4jdk7compile"
861 <          depends="configure-compiler"
862 <          description="Compiles src/jdk7 sources, targeting jdk7">
863 <
864 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
865 <
866 <    <javac srcdir="${4jdk7src.dir}"
867 <           destdir="${build.4jdk7.classes.dir}"
868 <           debug="${build.debug}"
869 <           debuglevel="${build.debuglevel}"
870 <           deprecation="${build.deprecation}"
871 <           source="6"
872 <           target="6"
873 <           classpath=""
874 <           bootclasspath="${bootclasspath6}"
875 <           includeAntRuntime="false"
876 <           includeJavaRuntime="false"
877 <           encoding="ASCII"
878 <           executable="${javac7}"
879 <           fork="true">
880 <
881 <      <include name="**/*.java"/>
882 <      <compilerarg value="-Xprefer:source"/>
883 <      <compilerarg value="-XDignore.symbol.file=true"/>
884 <      <compilerarg value="-Xlint:all"/>
885 <      <compilerarg value="-Werror"/>
886 <      <compilerarg line="${build.args}"/>
887 <
888 <    </javac>
889 <  </target>
890 <
891 <  <target name="4jdk7doclint"
892 <          depends="configure-compiler"
893 <          description="Finds doclint warnings">
894 <
895 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
700 >    <local name="destdir"/>
701 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
702 >    <mkdir dir="${destdir}"/>
703  
704 <    <javac srcdir="${4jdk7src.dir}"
705 <           destdir="${build.4jdk7.classes.dir}"
704 >    <javac srcdir="${src.dir}"
705 >           destdir="${destdir}"
706             debug="${build.debug}"
707             debuglevel="${build.debuglevel}"
708             deprecation="${build.deprecation}"
902           source="6"
903           target="6"
709             classpath=""
905           bootclasspath="${bootclasspath6}"
710             includeAntRuntime="false"
711             includeJavaRuntime="false"
712             encoding="ASCII"
713 <           executable="${javac8}"
713 >           executable="${build.main.javac}"
714             fork="true">
715  
716        <include name="**/*.java"/>
717 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
718 +      <compilerarg value="-J--illegal-access=permit"/>
719 +      <compilerarg value="-XDcompilePolicy=simple"/>
720 +      <compilerarg value="-processorpath"/>
721 +      <compilerarg pathref="errorprone.processorpath.path"/>
722 +      <compilerarg value="-Xplugin:ErrorProne
723 +                          ${errorprone.jsr166.flags}"/>
724 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
725        <compilerarg value="-Xprefer:source"/>
726        <compilerarg value="-XDignore.symbol.file=true"/>
727        <compilerarg value="-Xlint:all"/>
728 <      <compilerarg value="-Xdoclint:all/protected"/>
728 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
729 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
730        <compilerarg line="${build.args}"/>
918
731      </javac>
920  </target>
921
922
923  <target name="4jdk7jar"
924          depends="4jdk7compile"
925          description="Builds library jar from compiled sources">
732  
733 <    <jar destfile="${4jdk7product.jar}">
734 <      <fileset dir="${build.4jdk7.classes.dir}"/>
929 <      <manifest>
930 <        <attribute name="Built-By" value="${user.name}"/>
931 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
932 <      </manifest>
733 >    <jar destfile="${product.jar}">
734 >      <fileset dir="${destdir}"/>
735      </jar>
736  
935  </target>
936
937
938  <target name="4jdk7-tck"
939          depends="4jdk7jar"
940          description="Runs tck tests for jsr166-4jdk7 directly">
941
737      <run-tck-tests
738 <      target="7"
739 <      workdir="${build.4jdk7.dir}"
740 <      classes="${4jdk7product.jar}">
738 >      target="${java.runtime.target}"
739 >      workdir="${build.dir}"
740 >      classes="${product.jar}">
741        <javac-elements>
742 <        <!-- JDK8+ test classes -->
743 <        <exclude name="*8Test.java"/>
744 <        <exclude name="*9Test.java"/>
745 <        <exclude name="*10Test.java"/>
746 <        <exclude name="DoubleAccumulatorTest.java"/>
747 <        <exclude name="DoubleAdderTest.java"/>
748 <        <exclude name="LongAccumulatorTest.java"/>
749 <        <exclude name="LongAdderTest.java"/>
955 <        <exclude name="CompletableFutureTest.java"/>
956 <        <exclude name="SplittableRandomTest.java"/>
957 <        <exclude name="StampedLockTest.java"/>
958 <        <exclude name="SubmissionPublisherTest.java"/>
742 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
743 >        <compilerarg value="-J--illegal-access=permit"/>
744 >        <compilerarg value="-XDcompilePolicy=simple"/>
745 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
746 >        <compilerarg value="-Xplugin:ErrorProne
747 >                            ${errorprone.jsr166.flags}
748 >                            ${errorprone.jsr166.test.flags}"/>
749 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
750        </javac-elements>
751      </run-tck-tests>
752    </target>
753  
754 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
755 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
756 +  <target name="errorprone-jtreg"
757 +          depends="jar"
758 +          description="Run errorprone over jtreg tests (experimental)">
759  
964  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
965  <target name="4jdk7-tck-junit"
966          depends="4jdk7compile">
967
968    <junit printsummary="true"
969           showoutput="true"
970           errorProperty="junit.failed"
971           failureProperty="junit.failed"
972           includeantruntime="true"
973           jvm="${java7}"
974           fork="true">
975
976      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
977      <jvmarg value="-server"/>
978
979      <classpath>
980        <pathelement location="${junit.jar}"/>
981        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
982      </classpath>
983
984      <formatter type="brief"/>
985
986      <test name="${jsr166.tckTestClass}" haltonfailure="no">
987      </test>
988
989    </junit>
990  </target>
991
992  <target name="4jdk7-jtreg"
993          depends="4jdk7jar"
994          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
760      <run-jtreg-tests
761 <       target="7"
762 <       workdir="${build.4jdk7.dir}"
763 <       classes="${4jdk7product.jar}"/>
764 <  </target>
765 <
766 <
767 <  <target name="4jdk7-test"
768 <          depends="4jdk7-tck, 4jdk7-jtreg"
769 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
770 <  </target>
771 <
772 <
773 <  <target name="4jdk7docs"
774 <          description="Builds javadocs for src/jdk7 to dist dir">
775 <
1011 <    <delete dir="${4jdk7docs.dir}"/>
1012 <    <mkdir dir="${4jdk7docs.dir}"/>
1013 <
1014 <    <javadoc destdir="${4jdk7docs.dir}"
1015 <             packagenames="none"
1016 <             link="${java7.api.url}"
1017 <             overview="${4jdk7src.dir}/intro.html"
1018 <             access="${build.javadoc.access}"
1019 <             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1020 <             classpath=""
1021 <             executable="${javadoc7}"
1022 <             failonerror = "true">
1023 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1024 <        <include name="**/*.java"/>
1025 <      </fileset>
1026 <      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1027 <      <arg value="-XDignore.symbol.file=true"/>
1028 <    </javadoc>
1029 <  </target>
1030 <
1031 <
1032 <  <target name="4jdk7dist"
1033 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1034 <          description="Puts all distributable products in single hierarchy"/>
1035 <
1036 <
1037 <  <target name="4jdk7clean"
1038 <          description="Removes all 4jdk7 build products">
1039 <
1040 <    <delete dir="${build.4jdk7.dir}"/>
1041 <
1042 <  </target>
1043 <
1044 <
1045 <  <target name="4jdk7dist-jar"
1046 <          depends="4jdk7clean, 4jdk7jar">
1047 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1048 <  </target>
1049 <
1050 <
1051 <  <target name="4jdk7dist-docs"
1052 <          depends="4jdk7clean, 4jdk7docs">
1053 <    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1054 <  </target>
1055 <
1056 <
1057 <  <!-- jsr166x -->
1058 <
1059 <  <target name="jsr166xcompile"
1060 <          depends="configure-compiler"
1061 <          description="Compiles jsr166x sources to build dir">
1062 <
1063 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
1064 <
1065 <    <javac srcdir="${topsrc.dir}"
1066 <           destdir="${build.jsr166x.classes.dir}"
1067 <           debug="${build.debug}"
1068 <           debuglevel="${build.debuglevel}"
1069 <           deprecation="${build.deprecation}"
1070 <           classpath=""
1071 <           bootclasspath="${bootclasspath6}"
1072 <           source="5"
1073 <           target="5"
1074 <           includeAntRuntime="false"
1075 <           includeJavaRuntime="false"
1076 <           encoding="ASCII"
1077 <           executable="${javac7}"
1078 <           fork="true">
1079 <
1080 <      <include name="jsr166x/**/*.java"/>
1081 <      <compilerarg value="-XDignore.symbol.file=true"/>
1082 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1083 <      <compilerarg value="-Werror"/>
1084 <      <compilerarg line="${build.args}"/>
1085 <
1086 <    </javac>
1087 <  </target>
1088 <
1089 <
1090 <  <target name="jsr166xjar"
1091 <          depends="jsr166xcompile"
1092 <          description="Builds library jar from compiled sources">
1093 <
1094 <    <jar destfile="${jsr166x.jar}">
1095 <      <fileset dir="${build.jsr166x.classes.dir}"/>
1096 <      <manifest>
1097 <        <attribute name="Built-By" value="${user.name}"/>
1098 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1099 <      </manifest>
1100 <    </jar>
1101 <
1102 <  </target>
1103 <
1104 <
1105 <  <target name="jsr166xdocs"
1106 <          description="Builds javadocs to dist dir">
1107 <
1108 <    <delete dir="${jsr166xdocs.dir}"/>
1109 <    <mkdir dir="${jsr166xdocs.dir}"/>
1110 <
1111 <    <javadoc destdir="${jsr166xdocs.dir}"
1112 <             packagenames="jsr166x.*"
1113 <             link="${java.api.url}"
1114 <             access="${build.javadoc.access}"
1115 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1116 <             bootclasspath="${bootclasspath6}"
1117 <             source="5"
1118 <             executable="${javadoc7}"
1119 <             failonerror = "true">
1120 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1121 <      <arg value="-XDignore.symbol.file=true"/>
1122 <
1123 <    </javadoc>
1124 <  </target>
1125 <
1126 <
1127 <  <target name="jsr166xdist"
1128 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1129 <          description="Puts all distributable products in single hierarchy"/>
1130 <
1131 <
1132 <  <target name="jsr166xclean"
1133 <          description="Removes all jsr166x build products">
1134 <
1135 <    <delete dir="${build.jsr166x.dir}"/>
1136 <
1137 <  </target>
1138 <
1139 <
1140 <  <target name="jsr166xdist-jar"
1141 <          depends="jsr166xclean, jsr166xjar">
1142 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1143 <  </target>
1144 <
1145 <  <target name="jsr166xdist-docs"
1146 <          depends="jsr166xclean, jsr166xdocs">
1147 <    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1148 <  </target>
1149 <
1150 <  <!-- jsr166y -->
1151 <
1152 <
1153 <  <target name="jsr166ycompile"
1154 <          depends="configure-compiler"
1155 <          description="Compiles jsr166y sources">
1156 <
1157 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
1158 <
1159 <    <javac srcdir="${topsrc.dir}"
1160 <           destdir="${build.jsr166y.classes.dir}"
1161 <           debug="${build.debug}"
1162 <           debuglevel="${build.debuglevel}"
1163 <           deprecation="${build.deprecation}"
1164 <           source="6"
1165 <           target="6"
1166 <           classpath=""
1167 <           bootclasspath="${bootclasspath6}"
1168 <           includeAntRuntime="false"
1169 <           includeJavaRuntime="false"
1170 <           encoding="ASCII"
1171 <           executable="${javac7}"
1172 <           fork="true">
1173 <
1174 <      <include name="jsr166y/**/*.java"/>
1175 <      <compilerarg value="-XDignore.symbol.file=true"/>
1176 <      <compilerarg value="-Xlint:all"/>
1177 <      <compilerarg value="-Werror"/>
1178 <      <compilerarg line="${build.args}"/>
1179 <
1180 <    </javac>
1181 <  </target>
1182 <
1183 <
1184 <  <target name="jsr166yjar"
1185 <          depends="jsr166ycompile"
1186 <          description="Builds library jar from compiled sources">
1187 <
1188 <    <jar destfile="${jsr166y.jar}" index="true">
1189 <      <fileset dir="${build.jsr166y.classes.dir}"/>
1190 <      <manifest>
1191 <        <attribute name="Built-By" value="${user.name}"/>
1192 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1193 <      </manifest>
1194 <    </jar>
1195 <
1196 <  </target>
1197 <
1198 <
1199 <  <target name="jsr166ydocs"
1200 <          description="Builds javadocs to dist dir">
1201 <
1202 <    <delete dir="${jsr166ydocs.dir}"/>
1203 <    <mkdir dir="${jsr166ydocs.dir}"/>
1204 <
1205 <    <javadoc destdir="${jsr166ydocs.dir}"
1206 <             packagenames="jsr166y.*"
1207 <             link="${java.api.url}"
1208 <             access="${build.javadoc.access}"
1209 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1210 <             bootclasspath="${bootclasspath6}"
1211 <             source="6"
1212 <             executable="${javadoc7}"
1213 <             failonerror = "true">
1214 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1215 <      <arg value="-XDignore.symbol.file=true"/>
1216 <
1217 <    </javadoc>
1218 <  </target>
1219 <
1220 <
1221 <  <target name="jsr166ydist"
1222 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1223 <          description="Puts all distributable products in single hierarchy"/>
1224 <
1225 <
1226 <  <target name="jsr166yclean"
1227 <          description="Removes all jsr166y build products">
1228 <
1229 <    <delete dir="${build.jsr166y.dir}"/>
1230 <
1231 <  </target>
1232 <
1233 <
1234 <  <target name="jsr166ydist-jar"
1235 <          depends="jsr166yclean, jsr166yjar">
1236 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1237 <  </target>
1238 <
1239 <  <target name="jsr166ydist-docs"
1240 <          depends="jsr166yclean, jsr166ydocs">
1241 <    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1242 <  </target>
1243 <
1244 <
1245 <  <!-- extra166y -->
1246 <
1247 <
1248 <  <target name="extra166ycompile"
1249 <          depends="configure-compiler, jsr166yjar"
1250 <          description="Compiles extra166y sources">
1251 <
1252 <    <mkdir dir="${build.extra166y.classes.dir}"/>
1253 <
1254 <    <javac srcdir="${topsrc.dir}"
1255 <           destdir="${build.extra166y.classes.dir}"
1256 <           debug="${build.debug}"
1257 <           debuglevel="${build.debuglevel}"
1258 <           deprecation="${build.deprecation}"
1259 <           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1260 <           classpath=""
1261 <           source="6"
1262 <           target="6"
1263 <           includeAntRuntime="false"
1264 <           includeJavaRuntime="false"
1265 <           encoding="ASCII"
1266 <           executable="${javac7}"
1267 <           fork="true">
1268 <
1269 <      <include name="extra166y/**/*.java"/>
1270 <      <compilerarg value="-XDignore.symbol.file=true"/>
1271 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1272 <      <compilerarg value="-Werror"/>
1273 <      <compilerarg line="${build.args}"/>
1274 <
1275 <    </javac>
1276 <  </target>
1277 <
1278 <
1279 <  <target name="extra166yjar"
1280 <          depends="extra166ycompile"
1281 <          description="Builds library jar from compiled sources">
1282 <
1283 <    <jar destfile="${extra166y.jar}" index="true">
1284 <      <fileset dir="${build.extra166y.classes.dir}"/>
1285 <      <manifest>
1286 <        <attribute name="Built-By" value="${user.name}"/>
1287 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1288 <      </manifest>
1289 <    </jar>
1290 <
1291 <  </target>
1292 <
1293 <
1294 <  <target name="extra166ydocs"
1295 <          description="Builds javadocs to build dir">
1296 <
1297 <    <delete dir="${extra166ydocs.dir}"/>
1298 <    <mkdir dir="${extra166ydocs.dir}"/>
1299 <
1300 <    <javadoc destdir="${extra166ydocs.dir}"
1301 <             packagenames="extra166y.*"
1302 <             link="${java.api.url}"
1303 <             access="${build.javadoc.access}"
1304 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1305 <             bootclasspath="${bootclasspath6}"
1306 <             source="6"
1307 <             executable="${javadoc7}">
1308 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1309 <      <arg value="-XDignore.symbol.file=true"/>
1310 <
1311 <    </javadoc>
1312 <  </target>
1313 <
1314 <
1315 <  <target name="extra166ydist"
1316 <          depends="extra166ydist-jar, extra166ydist-docs"
1317 <          description="Puts all distributable products in single hierarchy"/>
1318 <
1319 <
1320 <  <target name="extra166yclean"
1321 <          description="Removes all extra166y build products">
1322 <
1323 <    <delete dir="${build.extra166y.dir}"/>
1324 <
1325 <  </target>
1326 <
1327 <
1328 <  <target name="extra166ydist-jar"
1329 <          depends="extra166yclean, extra166yjar">
1330 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1331 <  </target>
1332 <
1333 <  <target name="extra166ydist-docs"
1334 <          depends="extra166yclean, extra166ydocs">
1335 <    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1336 <  </target>
1337 <
1338 <  <!-- jsr166e -->
1339 <
1340 <  <property name="build.jsr166e.java.version" value="6"/>
1341 <  <property name="build.jsr166e.javac" value="${javac6}"/>
1342 <
1343 <  <target name="jsr166ecompile"
1344 <          depends="configure-compiler"
1345 <          description="Compiles jsr166e sources">
1346 <
1347 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
1348 <
1349 <    <javac srcdir="${topsrc.dir}"
1350 <           destdir="${build.jsr166e.classes.dir}"
1351 <           debug="${build.debug}"
1352 <           debuglevel="${build.debuglevel}"
1353 <           deprecation="${build.deprecation}"
1354 <           source="${build.jsr166e.java.version}"
1355 <           target="${build.jsr166e.java.version}"
1356 <           classpath=""
1357 <           includeAntRuntime="false"
1358 <           includeJavaRuntime="false"
1359 <           executable="${build.jsr166e.javac}"
1360 <           fork="true">
1361 <
1362 <      <include name="jsr166e/**/*.java"/>
1363 <      <compilerarg value="-XDignore.symbol.file=true"/>
1364 <      <compilerarg value="-Xlint:all"/>
1365 <      <compilerarg value="-Werror"/>
1366 <      <compilerarg line="${build.args}"/>
1367 <
1368 <    </javac>
1369 <  </target>
1370 <
1371 <  <!-- jsr166e: find doclint errors -->
1372 <  <target name="jsr166edoclint">
1373 <
1374 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
1375 <
1376 <    <javac srcdir="${topsrc.dir}"
1377 <           destdir="${build.jsr166e.classes.dir}"
1378 <           debug="${build.debug}"
1379 <           debuglevel="${build.debuglevel}"
1380 <           deprecation="${build.deprecation}"
1381 <           source="${build.jsr166e.java.version}"
1382 <           target="${build.jsr166e.java.version}"
1383 <           classpath=""
1384 <           bootclasspath="${bootclasspath6}"
1385 <           includeAntRuntime="false"
1386 <           includeJavaRuntime="false"
1387 <           executable="${javac8}"
1388 <           fork="true">
1389 <
1390 <      <include name="jsr166e/**/*.java"/>
1391 <      <compilerarg value="-XDignore.symbol.file=true"/>
1392 <      <compilerarg value="-Xlint:all"/>
1393 <      <compilerarg value="-Werror"/>
1394 <      <compilerarg value="-Xdoclint:all/protected"/>
1395 <
1396 <    </javac>
1397 <  </target>
1398 <
1399 <
1400 <  <target name="jsr166ejar"
1401 <          depends="jsr166ecompile"
1402 <          description="Builds library jar from compiled sources">
1403 <
1404 <    <jar destfile="${jsr166e.jar}" index="true">
1405 <      <fileset dir="${build.jsr166e.classes.dir}"/>
1406 <      <manifest>
1407 <        <attribute name="Built-By" value="${user.name}"/>
1408 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1409 <      </manifest>
1410 <    </jar>
1411 <
1412 <  </target>
1413 <
1414 <
1415 <  <target name="jsr166edocs"
1416 <          description="Builds javadocs to build dir">
1417 <
1418 <    <delete dir="${jsr166edocs.dir}"/>
1419 <    <mkdir dir="${jsr166edocs.dir}"/>
1420 <
1421 <    <javadoc destdir="${jsr166edocs.dir}"
1422 <             packagenames="jsr166e.*"
1423 <             link="${java.api.url}"
1424 <             access="${build.javadoc.access}"
1425 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1426 <             source="${build.jsr166e.java.version}"
1427 <             executable="${javadoc7}"
1428 <             failonerror = "true">
1429 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1430 <      <arg value="-XDignore.symbol.file=true"/>
1431 <
1432 <    </javadoc>
1433 <  </target>
1434 <
1435 <
1436 <  <target name="jsr166e-tck-one-java-version"
1437 <          depends="jsr166ejar">
1438 <
1439 <    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1440 <
1441 <    <run-tck-tests
1442 <      tck.src.dir="${test.src.dir}/tck-jsr166e"
1443 <      target="${build.jsr166e.java.version}"
1444 <      workdir="${build.jsr166e.dir}"
1445 <      classes="${jsr166e.jar}"/>
1446 <  </target>
1447 <
1448 <  <target name="jsr166e-tck"
1449 <          description="Runs tck tests for jsr166e for multiple java versions">
1450 <
1451 < <!--     <antcall target="clean"/> -->
1452 < <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1453 < <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1454 < <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1455 < <!--     </antcall> -->
1456 <
1457 <    <antcall target="clean"/>
1458 <    <antcall target="jsr166e-tck-one-java-version">
1459 <      <param name="build.jsr166e.java.version" value="7"/>
1460 <      <param name="build.jsr166e.javac" value="${javac7}"/>
1461 <    </antcall>
1462 <
1463 <    <antcall target="clean"/>
1464 <    <antcall target="jsr166e-tck-one-java-version">
1465 <      <param name="build.jsr166e.java.version" value="6"/>
1466 <      <param name="build.jsr166e.javac" value="${javac6}"/>
1467 <    </antcall>
1468 <  </target>
1469 <
1470 <
1471 <  <target name="jsr166e-test"
1472 <          depends="jsr166e-tck"
1473 <          description="Runs all tests for jsr166e">
1474 <  </target>
1475 <
1476 <  <target name="jsr166edist"
1477 <          depends="jsr166edist-jar, jsr166edist-docs"
1478 <          description="Puts all distributable products in single hierarchy"/>
1479 <
1480 <
1481 <  <target name="jsr166eclean"
1482 <          description="Removes all jsr166e build products">
1483 <    <delete dir="${build.jsr166e.dir}"/>
1484 <  </target>
1485 <
1486 <
1487 <  <target name="jsr166edist-jar"
1488 <          depends="jsr166eclean, jsr166ejar">
1489 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1490 <  </target>
1491 <
1492 <  <target name="jsr166edist-docs"
1493 <          depends="jsr166eclean, jsr166edocs">
1494 <    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1495 <  </target>
1496 <
1497 <
1498 < <!-- Find buglets that can be detected by static build tools -->
1499 <
1500 <  <target name="lint">
1501 <    <antcall target="dists">
1502 <      <param name="build.javadoc.access" value="public"/>
1503 <    </antcall>
761 >       target="${java.runtime.target}"
762 >       workdir="${build.dir}"
763 >       classes="${product.jar}"
764 >       verbose="all">
765 >      <jtreg-elements>
766 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
767 >        <arg value="-javacoption:-processorpath"/>
768 >        <arg value="-javacoption:${errorprone.processorpath}"/>
769 >        <arg value="-javacoption:-Xplugin:ErrorProne
770 >                            ${errorprone.jsr166.flags}
771 >                            ${errorprone.jsr166.test.flags}
772 >                            -Xep:MultipleTopLevelClasses:WARN
773 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
774 >      </jtreg-elements>
775 >    </run-jtreg-tests>
776    </target>
777  
1506 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1507  <target name="lint-private">
1508    <antcall target="dist">
1509      <param name="build.javadoc.access" value="private"/>
1510    </antcall>
1511  </target>
778  
779   <!-- ==============================================================
780    Running guava tests against jsr166 code
# Line 1562 | Line 828
828      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
829           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
830      <junit printsummary="true" showoutput="true" haltonfailure="true"
831 <           jvm="${java9}" fork="true">
832 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
831 >           jvm="${build.main.java}" fork="true">
832 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
833        <formatter type="brief"/>
834        <classpath>
835          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines