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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines