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.254 by jsr166, Mon Sep 25 22:54:09 2017 UTC vs.
Revision 1.308 by jsr166, Thu Oct 17 17:28:49 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/jdk8
23 <  $HOME/jdk/jdk9
24 <  $HOME/jdk/jdk10
22 >  $HOME/jdk/jdk11
23 >  $HOME/jdk/jdk12
24 >  $HOME/jdk/jdk13
25 >  $HOME/jdk/jdk14
26    where each of the above is a JDK or a symlink to same, and
27 <  $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.
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 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 50 | Line 54
54  
55  
56    <!-- Compilation options -->
53  <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 62 | Line 65
65    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
66    <property name="build.loops.dir"             location="${build.dir}/loops"/>
67  
65  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
66  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
67  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
68  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
69
70  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
71  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
72  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
73  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
74
75  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
76  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
77  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
78  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
79
80  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
81  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
82  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
83  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
84
68    <!-- JDK locations -->
69    <property name="jdks.home"  location="${user.home}/jdk"/>
70  
# Line 93 | 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"/>
97 <    <available property="have.java.base"
98 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
99 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
100 <      if:set="have.java.base"/>
101 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
102 <      unless:set="have.java.base"/>
103 <    <local name="modules"/>
104 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
105 <    <local name="boot.jar.dir"/>
106 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
107 <    <path id="bootclasspath@{v}" unless:set="modules">
108 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
109 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
110 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
111 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
112 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
113 <    </path>
114 <    <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 127 | Line 92
92      </sequential>
93    </macrodef>
94  
95 <  <defjdklocations v="6"/>
96 <  <defjdklocations v="7"/>
97 <  <defjdklocations v="8"/>
98 <  <defjdklocations v="9"/>
134 <  <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"/>
149  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
154  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
113  
114    <!-- Javadoc locations -->
115    <property name="docs.dir"          location="${build.dir}/docs"/>
116 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
163 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
164 <
165 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
171 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
116 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
117  
118    <!-- Jar locations -->
119    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
180  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
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 <  <property name="java9.docroot.url"  value="http://docs.oracle.com/javase/9/docs"/>
128 <  <!-- The location of jdk9 early access 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="${java9.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/"/>
199 <  <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 204 | 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 227 | Line 171
171  
172      <sequential>
173  
230    <local name="modules"/>
231    <condition property="modules">
232      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233    </condition>
234
235    <local name="use-doclint"/>
236    <condition property="use-doclint">
237      <not> <equals arg1="@{target}" arg2="7"/> </not>
238    </condition>
239
174      <mkdir dir="@{workdir}/tck-classes"/>
175  
176      <javac srcdir="@{tck.src.dir}"
# Line 256 | 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="-Xdoclint:reference/private" if:set="use-doclint"/>
194 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
261 <      <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 268 | 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"/>
292 <        </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="${jtreg10.src.dir}">
232 <    <patternset id="jdk10.jtreg.tests">
233 <      <include name="**/*.java"/>
234 <    </patternset>
235 <  </fileset>
236 <
237 <  <fileset dir="${jtreg9.src.dir}">
238 <    <patternset id="jdk9.jtreg.tests">
239 <      <include name="**/*.java"/>
240 <    </patternset>
241 <  </fileset>
242 <
243 <  <fileset dir="${jtreg8.src.dir}">
312 <    <patternset id="jdk8.jtreg.tests">
313 <      <include name="**/*.java"/>
314 <    </patternset>
315 <  </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>
321 <  </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 -->
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  
338    <local name="modules"/>
339    <condition property="modules">
340      <available file="${jdk@{target}.home}/jmods" type="dir"/>
341    </condition>
342
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"/>
274 <      <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="-vmoptions:${vmoptions}" if:set="vmoptions"/>
275        <arg value="-agentvm"/>
276        <arg value="-noreport"/>
277 <      <arg value="-verbose:${jtreg.verbose}"/>
277 >      <arg value="-verbose:@{verbose}"/>
278        <arg value="-vmoptions:-esa -ea"/>
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 366 | 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 <  <!-- Workaround "no nested properties in ant" -->
302 <  <macrodef name="define-build-main-properties">
303 <    <attribute name="v"/>
304 <    <sequential>
305 <      <property name="build.main.java"    value="${java@{v}}"/>
306 <      <property name="build.main.javac"   value="${javac@{v}}"/>
307 <      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
308 <    </sequential>
309 <  </macrodef>
310 <  <define-build-main-properties v="${build.main.java.version}"/>
300 >  <!-- Default values: may seem strange ... -->
301 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
302 >  <!-- But at build time, target jdk9, for maximal binary portability -->
303 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
304 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
305 >    o override-methods=summary
306 >    o {@systemProperty ...}
307 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
308 >    o 8202628: javadoc generates bad links in TestModules.java
309 >    -->
310 >  <property name="java.runtime.target" value="11"/>
311 >  <property name="build.main.java" value="${java11}"/>
312 >  <property name="build.main.javac" value="${javac11}"/>
313 >  <property name="build.main.javadoc" value="${javadoc12}"/>
314 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
315  
316    <target name="dists"
317 <          depends="dist, 4jdk8dist"
317 >          depends="dist"
318            description="Builds all public jars and docs"/>
389          <!--
390              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
391          -->
319  
320    <target name="compile"
321            depends="configure-compiler"
# Line 415 | Line 342
342        <compilerarg value="--patch-module=java.base=${src.dir}"/>
343        <compilerarg value="-Xprefer:source"/>
344        <compilerarg value="-XDignore.symbol.file=true"/>
345 <      <compilerarg value="-Xlint:all"/>
345 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
346 >      <compilerarg value="-Xlint:all,-removal"/>
347        <compilerarg line="--doclint-format html5"/>
348        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
349 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
350        <compilerarg value="-Werror"/>
351        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
352        <compilerarg line="${build.args}"/>
# Line 444 | Line 373
373    <target name="docs"
374            description="Builds javadocs for src/main to dist dir">
375  
376 <    <delete dir="${docs.dir}"/>
376 >    <delete dir="${docs.dir}" quiet="true"/>
377      <mkdir dir="${docs.dir}"/>
378  
379 +    <!-- old school frames via docs/index.html?overview-summary.html -->
380 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
381 +    <local name="use-frames"/>
382 +    <condition property="use-frames">
383 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
384 +    </condition>
385 +
386      <!-- the packagenames="none" hack below prevents scanning the -->
387      <!-- sourcepath for packages -->
388  
# Line 457 | Line 393
393   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
394      <javadoc destdir="${docs.dir}"
395               packagenames="none"
396 <             link="${java9.api.url}"
396 >             link="${java.api.url}"
397               overview="${src.dir}/intro.html"
398               access="${build.javadoc.access}"
399               sourcepath="${src.dir}"
400               classpath=""
401 <             source="9"
401 >             source="${build.main.javadoc.source}"
402               executable="${build.main.javadoc}">
403 + <!-- TODO: JDK-8214571 failonerror = "true" -->
404        <fileset dir="${src.dir}" defaultexcludes="yes">
405          <include name="**/*.java"/>
406        </fileset>
407 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
407 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
408        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
409 +      <arg value="-quiet"/>
410        <arg value="-XDignore.symbol.file=true"/>
411        <arg value="-html5"/>
412        <arg value="--patch-module=java.base=${src.dir}"/>
413 <      <arg value="-tag"/>
414 <      <arg value="${javadoc.jls.option}"/>
415 < <!-- @apiNote currently unused -->
416 < <!--       <arg value="-tag"/> -->
417 < <!--       <arg value="apiNote:a:API Note:"/> -->
418 <      <arg value="-tag"/>
481 <      <arg value="implSpec:a:Implementation Requirements:"/>
482 <      <arg value="-tag"/>
483 <      <arg value="implNote:a:Implementation Note:"/>
413 >      <arg value="--frames" if:set="use-frames"/>
414 >      <arg value="--override-methods=summary"/>
415 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
416 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
417 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
418 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
419   <!-- tags added in jdk9: currently unused -->
420 < <!--       <arg value="-tag"/> -->
421 < <!--       <arg value="revised:X"/> -->
487 < <!--       <arg value="-tag"/> -->
488 < <!--       <arg value="spec:X"/> -->
420 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
421 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
422      </javadoc>
423    </target>
424  
# Line 495 | Line 428
428            description="Puts all distributable products in single hierarchy"/>
429  
430  
498  <target name="release"
499          depends="dist"
500          description="Puts entire CVS tree, plus distribution productions, in a jar">
501
502    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
503
504    <jar basedir="${basedir}" destfile="${release.jar}">
505      <!-- <exclude name="build/**"/> -->
506      <exclude name="${release.jar}"/>
507      <exclude name="user.properties"/>
508      <exclude name="etc/notes/**"/>
509      <exclude name="src/emulation/**"/>
510      <exclude name="**/SyntaxTest.java"/>
511      <exclude name="**/SuperfluousAbstract.java"/>
512      <manifest>
513        <attribute name="Built-By" value="${user.name}"/>
514        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
515      </manifest>
516    </jar>
517  </target>
518
519
431    <target name="clean"
432            description="Removes all build products">
433      <delete dir="${build.dir}"/>
# Line 541 | Line 452
452    </target>
453  
454    <target name="tck"
455 <          depends="jar"
455 >          depends="jar"
456            description="Runs tck tests for src/main directly">
457  
458      <run-tck-tests
459 <      target="${build.main.java.version}"
459 >      target="${java.runtime.target}"
460        workdir="${build.dir}"
461        classes="${product.jar}">
462        <javac-elements>
# Line 576 | Line 487
487    </target>
488  
489    <target name="jtreg"
490 <          depends="jar"
490 >          depends="jar"
491            description="Runs jtreg tests for src/main using the jtreg ant task">
492      <run-jtreg-tests
493 <       target="${build.main.java.version}"
493 >       target="${java.runtime.target}"
494         workdir="${build.dir}"
495         classes="${product.jar}"/>
496    </target>
# Line 588 | Line 499
499            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
500            description="Runs tck and jtreg tests for src/main"/>
501  
502 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
503 <
504 < <!--     <antcall target="jtreg"> -->
594 < <!--       <param name="build.main.java.version" value="8"/> -->
595 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
596 < <!--     </antcall> -->
502 >  <target name="test-version-permutations"
503 >          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
504 >  </target>
505  
506 < <!--   </target> -->
506 >  <target name="test11">
507 >    <antcall>
508 >      <param name="java.runtime.target" value="11"/>
509 >      <param name="build.main.javac" value="${javac11}"/>
510 >      <param name="build.main.javadoc" value="${javadoc12}"/>
511 >      <param name="build.main.javadoc.source" value="11"/>
512 >      <target name="clean"/>
513 >      <target name="test"/>
514 >      <target name="docs"/>
515 >    </antcall>
516 >  </target>
517  
518 <  <target name="test910"
519 <          description="Runs tck and jtreg tests for src/main for multiple java versions">
518 >  <target name="test12">
519 >    <antcall>
520 >      <param name="java.runtime.target" value="12"/>
521 >      <param name="build.main.javac" value="${javac12}"/>
522 >      <param name="build.main.javadoc" value="${javadoc12}"/>
523 >      <param name="build.main.javadoc.source" value="12"/>
524 >      <target name="clean"/>
525 >      <target name="test"/>
526 >      <target name="docs"/>
527 >    </antcall>
528 >  </target>
529  
530 <    <antcall target="clean"/>
531 <    <antcall target="test">
532 <      <param name="build.main.java.version" value="9"/>
530 >  <target name="test13">
531 >    <antcall>
532 >      <param name="java.runtime.target" value="13"/>
533 >      <param name="build.main.javac" value="${javac13}"/>
534 >      <param name="build.main.javadoc" value="${javadoc13}"/>
535 >      <param name="build.main.javadoc.source" value="13"/>
536 >      <target name="clean"/>
537 >      <target name="test"/>
538 >      <target name="docs"/>
539      </antcall>
540 +  </target>
541  
542 <    <antcall target="clean"/>
543 <    <antcall target="test">
544 <      <param name="build.main.java.version" value="10"/>
542 >  <target name="test14">
543 >    <antcall>
544 >      <param name="java.runtime.target" value="14"/>
545 >      <param name="build.main.javac" value="${javac14}"/>
546 >      <param name="build.main.javadoc" value="${javadoc14}"/>
547 >      <param name="build.main.javadoc.source" value="14"/>
548 >      <target name="clean"/>
549 >      <target name="test"/>
550 >      <target name="docs"/>
551      </antcall>
552 +  </target>
553  
554 <    <!-- Clean up to avoid obscure wrong class file version bugs -->
555 <    <antcall target="clean"/>
554 >  <target name="test11-12">
555 >    <antcall>
556 >      <param name="java.runtime.target" value="12"/>
557 >      <param name="build.main.javac" value="${javac11}"/>
558 >      <param name="build.main.javadoc" value="${javadoc12}"/>
559 >      <param name="build.main.javadoc.source" value="11"/>
560 >      <target name="clean"/>
561 >      <target name="test"/>
562 >      <target name="docs"/>
563 >    </antcall>
564 >  </target>
565  
566 +  <target name="test11-13">
567 +    <antcall>
568 +      <param name="java.runtime.target" value="13"/>
569 +      <param name="build.main.javac" value="${javac11}"/>
570 +      <param name="build.main.javadoc" value="${javadoc13}"/>
571 +      <param name="build.main.javadoc.source" value="11"/>
572 +      <target name="clean"/>
573 +      <target name="test"/>
574 +      <target name="docs"/>
575 +    </antcall>
576    </target>
577  
578 +  <target name="test11-14">
579 +    <antcall>
580 +      <param name="java.runtime.target" value="14"/>
581 +      <param name="build.main.javac" value="${javac11}"/>
582 +      <param name="build.main.javadoc" value="${javadoc14}"/>
583 +      <param name="build.main.javadoc.source" value="11"/>
584 +      <target name="clean"/>
585 +      <target name="test"/>
586 +      <target name="docs"/>
587 +    </antcall>
588 +  </target>
589  
590  
591    <target name="configure-compiler">
# Line 637 | Line 608
608    </target>
609  
610  
640
641  <!-- Various demos and test programs -->
642
643
644  <!-- description="Benchmark from Doug Lea's AQS paper" -->
645  <target name="loops" depends="configure-compiler">
646
647    <mkdir dir="${build.loops.dir}"/>
648
649    <javac srcdir="${loops.src.dir}"
650          destdir="${build.loops.dir}"
651            debug="${build.debug}"
652       debuglevel="${build.debuglevel}"
653      deprecation="${build.deprecation}"
654           source="${build.sourcelevel}"
655           target="${build.sourcelevel}"
656         encoding="ASCII"
657             fork="true">
658
659      <compilerarg line="${build.args}"/>
660      <classpath refid="loops.classpath"/>
661      <compilerarg value="-XDignore.symbol.file=true"/>
662
663    </javac>
664
665    <java classname="ALoops" fork="true">
666      <classpath refid="loops.classpath"/>
667    </java>
668  </target>
669
670
611    <target name="compile-test-loops" depends="jar"
612            description="Compiles all the perf tests in src/test/loops">
613  
# Line 686 | Line 626
626  
627        <include name="*.java"/>
628        <compilerarg value="-XDignore.symbol.file=true"/>
629 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
630 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
691 <      <compilerarg line="${build.args}"/>
692 <    </javac>
693 <  </target>
694 <
695 <
696 <  <!-- jsr166 4jdk8 -->
697 <
698 <  <target name="4jdk8compile"
699 <          depends="configure-compiler"
700 <          description="Compiles src/jdk8 sources, targeting jdk8">
701 <
702 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
703 <
704 <    <javac srcdir="${4jdk8src.dir}"
705 <           destdir="${build.4jdk8.classes.dir}"
706 <           debug="${build.debug}"
707 <           debuglevel="${build.debuglevel}"
708 <           deprecation="${build.deprecation}"
709 <           source="8"
710 <           target="8"
711 <           classpath=""
712 <           bootclasspath="${bootclasspath8}"
713 <           includeAntRuntime="false"
714 <           includeJavaRuntime="false"
715 <           encoding="ASCII"
716 <           executable="${javac8}"
717 <           fork="true">
718 <      <include name="**/*.java"/>
719 <      <compilerarg value="-Xprefer:source"/>
720 <      <compilerarg value="-XDignore.symbol.file=true"/>
721 <      <compilerarg value="-Xlint:all"/>
722 <      <compilerarg value="-Werror"/>
723 <      <compilerarg line="${build.args}"/>
724 <    </javac>
725 <  </target>
726 <
727 <  <target name="4jdk8doclint"
728 <          depends="configure-compiler"
729 <          description="Finds doclint warnings">
730 <
731 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
732 <
733 <    <javac srcdir="${4jdk8src.dir}"
734 <           destdir="${build.4jdk8.classes.dir}"
735 <           debug="${build.debug}"
736 <           debuglevel="${build.debuglevel}"
737 <           deprecation="${build.deprecation}"
738 <           source="8"
739 <           target="8"
740 <           classpath=""
741 <           bootclasspath="${bootclasspath8}"
742 <           includeAntRuntime="false"
743 <           includeJavaRuntime="false"
744 <           encoding="ASCII"
745 <           executable="${javac8}"
746 <           fork="true">
747 <      <include name="**/*.java"/>
748 <      <compilerarg value="-Xprefer:source"/>
749 <      <compilerarg value="-XDignore.symbol.file=true"/>
750 <      <compilerarg value="-Xlint:all"/>
751 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
629 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
630 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
631        <compilerarg line="${build.args}"/>
632      </javac>
633    </target>
634  
635  
636 <  <target name="4jdk8jar"
637 <          depends="4jdk8compile"
759 <          description="Builds library jar from compiled sources">
760 <
761 <    <jar destfile="${4jdk8product.jar}">
762 <      <fileset dir="${build.4jdk8.classes.dir}"/>
763 <      <manifest>
764 <        <attribute name="Built-By" value="${user.name}"/>
765 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
766 <      </manifest>
767 <    </jar>
768 <  </target>
769 <
770 <
771 <  <target name="4jdk8-tck"
772 <          depends="4jdk8jar"
773 <          description="Runs tck tests for jsr166-4jdk8 directly">
774 <
775 <    <run-tck-tests
776 <      target="8"
777 <      workdir="${build.4jdk8.dir}"
778 <      classes="${4jdk8product.jar}">
779 <      <javac-elements>
780 <        <!-- JDK9+ test classes -->
781 <        <exclude name="*9Test.java"/>
782 <        <exclude name="*10Test.java"/>
783 <        <compilerarg value="-Werror"/>
784 <      </javac-elements>
785 <    </run-tck-tests>
786 <  </target>
787 <
788 <
789 <  <target name="4jdk8-jtreg"
790 <          depends="4jdk8jar"
791 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
792 <    <run-jtreg-tests
793 <       target="8"
794 <       workdir="${build.4jdk8.dir}"
795 <       classes="${4jdk8product.jar}"/>
796 <  </target>
797 <
798 <
799 <  <target name="4jdk8-test"
800 <          depends="4jdk8-tck, 4jdk8-jtreg"
801 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
802 <
803 <
804 <  <target name="4jdk8docs"
805 <          description="Builds javadocs for src/jdk8 to dist dir">
806 <
807 <    <delete dir="${4jdk8docs.dir}"/>
808 <    <mkdir dir="${4jdk8docs.dir}"/>
809 <
810 <    <javadoc destdir="${4jdk8docs.dir}"
811 <             packagenames="none"
812 <             link="${java8.api.url}"
813 <             overview="${4jdk8src.dir}/intro.html"
814 <             access="${build.javadoc.access}"
815 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
816 <             classpath=""
817 <             source="8"
818 <             executable="${javadoc8}"
819 <             failonerror = "true">
820 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
821 <        <include name="**/*.java"/>
822 <      </fileset>
823 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
824 <      <arg value="-XDignore.symbol.file=true"/>
825 <      <arg value="-tag"/>
826 <      <arg value="${javadoc.jls.option}"/>
827 < <!-- @apiNote currently unused -->
828 < <!--       <arg value="-tag"/> -->
829 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
830 <      <arg value="-tag"/>
831 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
832 <      <arg value="-tag"/>
833 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
834 <    </javadoc>
835 <  </target>
836 <
837 <
838 <  <target name="4jdk8dist"
839 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
840 <          description="Puts all distributable products in single hierarchy"/>
841 <
842 <
843 <  <target name="4jdk8clean"
844 <          description="Removes all 4jdk8 build products">
845 <    <delete dir="${build.4jdk8.dir}"/>
846 <  </target>
847 <
848 <
849 <  <target name="4jdk8dist-jar"
850 <          depends="4jdk8clean, 4jdk8jar">
851 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
852 <  </target>
853 <
854 <
855 <  <target name="4jdk8dist-docs"
856 <          depends="4jdk8clean, 4jdk8docs">
857 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
858 <  </target>
859 <
860 <
636 >  <!-- old branches no longer maintained.  build support deleted -->
637 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
638    <!-- jsr166 4jdk7 (no longer maintained) -->
862
863  <target name="4jdk7compile" depends="configure-compiler">
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    </javac>
888  </target>
889
890  <target name="4jdk7doclint" depends="configure-compiler">
891    <mkdir dir="${build.4jdk7.classes.dir}"/>
892
893    <javac srcdir="${4jdk7src.dir}"
894           destdir="${build.4jdk7.classes.dir}"
895           debug="${build.debug}"
896           debuglevel="${build.debuglevel}"
897           deprecation="${build.deprecation}"
898           source="6"
899           target="6"
900           classpath=""
901           bootclasspath="${bootclasspath6}"
902           includeAntRuntime="false"
903           includeJavaRuntime="false"
904           encoding="ASCII"
905           executable="${javac8}"
906           fork="true">
907
908      <include name="**/*.java"/>
909      <compilerarg value="-Xprefer:source"/>
910      <compilerarg value="-XDignore.symbol.file=true"/>
911      <compilerarg value="-Xlint:all"/>
912      <compilerarg value="-Xdoclint:all/protected"/>
913      <compilerarg line="${build.args}"/>
914    </javac>
915  </target>
916
917  <target name="4jdk7jar" depends="4jdk7compile">
918    <jar destfile="${4jdk7product.jar}">
919      <fileset dir="${build.4jdk7.classes.dir}"/>
920      <manifest>
921        <attribute name="Built-By" value="${user.name}"/>
922        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
923      </manifest>
924    </jar>
925  </target>
926
927  <target name="4jdk7-tck" depends="4jdk7jar">
928    <run-tck-tests
929      target="7"
930      workdir="${build.4jdk7.dir}"
931      classes="${4jdk7product.jar}">
932      <javac-elements>
933        <!-- JDK8+ test classes -->
934        <exclude name="*8Test.java"/>
935        <exclude name="*9Test.java"/>
936        <exclude name="*10Test.java"/>
937        <exclude name="DoubleAccumulatorTest.java"/>
938        <exclude name="DoubleAdderTest.java"/>
939        <exclude name="LongAccumulatorTest.java"/>
940        <exclude name="LongAdderTest.java"/>
941        <exclude name="CompletableFutureTest.java"/>
942        <exclude name="SplittableRandomTest.java"/>
943        <exclude name="StampedLockTest.java"/>
944        <exclude name="SubmissionPublisherTest.java"/>
945        <compilerarg value="-Werror"/>
946      </javac-elements>
947    </run-tck-tests>
948  </target>
949
950  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
951  <target name="4jdk7-tck-junit" depends="4jdk7compile">
952
953    <junit printsummary="true"
954           showoutput="true"
955           errorProperty="junit.failed"
956           failureProperty="junit.failed"
957           includeantruntime="true"
958           jvm="${java7}"
959           fork="true">
960
961      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
962      <jvmarg value="-server"/>
963
964      <classpath>
965        <pathelement location="${junit.jar}"/>
966        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
967      </classpath>
968
969      <formatter type="brief"/>
970
971      <test name="${jsr166.tckTestClass}" haltonfailure="no">
972      </test>
973    </junit>
974  </target>
975
976  <target name="4jdk7-jtreg" depends="4jdk7jar">
977    <run-jtreg-tests
978       target="7"
979       workdir="${build.4jdk7.dir}"
980       classes="${4jdk7product.jar}"/>
981  </target>
982
983  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
984
985  <target name="4jdk7docs">
986    <delete dir="${4jdk7docs.dir}"/>
987    <mkdir dir="${4jdk7docs.dir}"/>
988
989    <javadoc destdir="${4jdk7docs.dir}"
990             packagenames="none"
991             link="${java7.api.url}"
992             overview="${4jdk7src.dir}/intro.html"
993             access="${build.javadoc.access}"
994             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
995             classpath=""
996             executable="${javadoc7}"
997             failonerror = "true">
998      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
999        <include name="**/*.java"/>
1000      </fileset>
1001      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1002      <arg value="-XDignore.symbol.file=true"/>
1003    </javadoc>
1004  </target>
1005
1006  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1007
1008  <target name="4jdk7clean">
1009    <delete dir="${build.4jdk7.dir}"/>
1010  </target>
1011
1012  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1013    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1014  </target>
1015
1016  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1017    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1018  </target>
1019
1020
639    <!-- jsr166x (no longer maintained) -->
1022
1023  <target name="jsr166xcompile" depends="configure-compiler">
1024    <mkdir dir="${build.jsr166x.classes.dir}"/>
1025
1026    <javac srcdir="${topsrc.dir}"
1027           destdir="${build.jsr166x.classes.dir}"
1028           debug="${build.debug}"
1029           debuglevel="${build.debuglevel}"
1030           deprecation="${build.deprecation}"
1031           classpath=""
1032           bootclasspath="${bootclasspath6}"
1033           source="5"
1034           target="5"
1035           includeAntRuntime="false"
1036           includeJavaRuntime="false"
1037           encoding="ASCII"
1038           executable="${javac7}"
1039           fork="true">
1040      <include name="jsr166x/**/*.java"/>
1041      <compilerarg value="-XDignore.symbol.file=true"/>
1042      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1043      <compilerarg value="-Werror"/>
1044      <compilerarg line="${build.args}"/>
1045    </javac>
1046  </target>
1047
1048  <target name="jsr166xjar" depends="jsr166xcompile">
1049    <jar destfile="${jsr166x.jar}">
1050      <fileset dir="${build.jsr166x.classes.dir}"/>
1051      <manifest>
1052        <attribute name="Built-By" value="${user.name}"/>
1053        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1054      </manifest>
1055    </jar>
1056  </target>
1057
1058  <target name="jsr166xdocs">
1059    <delete dir="${jsr166xdocs.dir}"/>
1060    <mkdir dir="${jsr166xdocs.dir}"/>
1061
1062    <javadoc destdir="${jsr166xdocs.dir}"
1063             packagenames="jsr166x.*"
1064             link="${java.api.url}"
1065             access="${build.javadoc.access}"
1066             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1067             bootclasspath="${bootclasspath6}"
1068             source="5"
1069             executable="${javadoc7}"
1070             failonerror = "true">
1071      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1072      <arg value="-XDignore.symbol.file=true"/>
1073    </javadoc>
1074  </target>
1075
1076  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1077
1078  <target name="jsr166xclean">
1079    <delete dir="${build.jsr166x.dir}"/>
1080  </target>
1081
1082  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1083    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1084  </target>
1085
1086  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1087    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1088  </target>
1089
1090
640    <!-- jsr166y (no longer maintained) -->
1092
1093  <target name="jsr166ycompile" depends="configure-compiler">
1094    <mkdir dir="${build.jsr166y.classes.dir}"/>
1095
1096    <javac srcdir="${topsrc.dir}"
1097           destdir="${build.jsr166y.classes.dir}"
1098           debug="${build.debug}"
1099           debuglevel="${build.debuglevel}"
1100           deprecation="${build.deprecation}"
1101           source="6"
1102           target="6"
1103           classpath=""
1104           bootclasspath="${bootclasspath6}"
1105           includeAntRuntime="false"
1106           includeJavaRuntime="false"
1107           encoding="ASCII"
1108           executable="${javac7}"
1109           fork="true">
1110
1111      <include name="jsr166y/**/*.java"/>
1112      <compilerarg value="-XDignore.symbol.file=true"/>
1113      <compilerarg value="-Xlint:all"/>
1114      <compilerarg value="-Werror"/>
1115      <compilerarg line="${build.args}"/>
1116    </javac>
1117  </target>
1118
1119  <target name="jsr166yjar" depends="jsr166ycompile">
1120    <jar destfile="${jsr166y.jar}" index="true">
1121      <fileset dir="${build.jsr166y.classes.dir}"/>
1122      <manifest>
1123        <attribute name="Built-By" value="${user.name}"/>
1124        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1125      </manifest>
1126    </jar>
1127  </target>
1128
1129  <target name="jsr166ydocs">
1130    <delete dir="${jsr166ydocs.dir}"/>
1131    <mkdir dir="${jsr166ydocs.dir}"/>
1132
1133    <javadoc destdir="${jsr166ydocs.dir}"
1134             packagenames="jsr166y.*"
1135             link="${java.api.url}"
1136             access="${build.javadoc.access}"
1137             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1138             bootclasspath="${bootclasspath6}"
1139             source="6"
1140             executable="${javadoc7}"
1141             failonerror = "true">
1142      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1143      <arg value="-XDignore.symbol.file=true"/>
1144    </javadoc>
1145  </target>
1146
1147  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1148
1149  <target name="jsr166yclean">
1150    <delete dir="${build.jsr166y.dir}"/>
1151  </target>
1152
1153  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1154    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1155  </target>
1156
1157  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1158    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1159  </target>
1160
1161
641    <!-- extra166y (no longer maintained) -->
1163
1164  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1165    <mkdir dir="${build.extra166y.classes.dir}"/>
1166
1167    <javac srcdir="${topsrc.dir}"
1168           destdir="${build.extra166y.classes.dir}"
1169           debug="${build.debug}"
1170           debuglevel="${build.debuglevel}"
1171           deprecation="${build.deprecation}"
1172           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1173           classpath=""
1174           source="6"
1175           target="6"
1176           includeAntRuntime="false"
1177           includeJavaRuntime="false"
1178           encoding="ASCII"
1179           executable="${javac7}"
1180           fork="true">
1181
1182      <include name="extra166y/**/*.java"/>
1183      <compilerarg value="-XDignore.symbol.file=true"/>
1184      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1185      <compilerarg value="-Werror"/>
1186      <compilerarg line="${build.args}"/>
1187    </javac>
1188  </target>
1189
1190  <target name="extra166yjar" depends="extra166ycompile">
1191    <jar destfile="${extra166y.jar}" index="true">
1192      <fileset dir="${build.extra166y.classes.dir}"/>
1193      <manifest>
1194        <attribute name="Built-By" value="${user.name}"/>
1195        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1196      </manifest>
1197    </jar>
1198  </target>
1199
1200  <target name="extra166ydocs">
1201    <delete dir="${extra166ydocs.dir}"/>
1202    <mkdir dir="${extra166ydocs.dir}"/>
1203
1204    <javadoc destdir="${extra166ydocs.dir}"
1205             packagenames="extra166y.*"
1206             link="${java.api.url}"
1207             access="${build.javadoc.access}"
1208             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1209             bootclasspath="${bootclasspath6}"
1210             source="6"
1211             executable="${javadoc7}">
1212      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1213      <arg value="-XDignore.symbol.file=true"/>
1214    </javadoc>
1215  </target>
1216
1217  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1218
1219  <target name="extra166yclean">
1220    <delete dir="${build.extra166y.dir}"/>
1221  </target>
1222
1223  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1224    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1225  </target>
1226
1227  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1228    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1229  </target>
1230
1231
642    <!-- jsr166e (no longer maintained) -->
643  
1234  <property name="build.jsr166e.java.version" value="6"/>
1235  <property name="build.jsr166e.javac" value="${javac6}"/>
1236
1237  <target name="jsr166ecompile" depends="configure-compiler">
1238    <mkdir dir="${build.jsr166e.classes.dir}"/>
1239
1240    <javac srcdir="${topsrc.dir}"
1241           destdir="${build.jsr166e.classes.dir}"
1242           debug="${build.debug}"
1243           debuglevel="${build.debuglevel}"
1244           deprecation="${build.deprecation}"
1245           source="${build.jsr166e.java.version}"
1246           target="${build.jsr166e.java.version}"
1247           classpath=""
1248           includeAntRuntime="false"
1249           includeJavaRuntime="false"
1250           executable="${build.jsr166e.javac}"
1251           fork="true">
1252
1253      <include name="jsr166e/**/*.java"/>
1254      <compilerarg value="-XDignore.symbol.file=true"/>
1255      <compilerarg value="-Xlint:all"/>
1256      <compilerarg value="-Werror"/>
1257      <compilerarg line="${build.args}"/>
1258    </javac>
1259  </target>
1260
1261  <target name="jsr166edoclint">
1262    <mkdir dir="${build.jsr166e.classes.dir}"/>
1263
1264    <javac srcdir="${topsrc.dir}"
1265           destdir="${build.jsr166e.classes.dir}"
1266           debug="${build.debug}"
1267           debuglevel="${build.debuglevel}"
1268           deprecation="${build.deprecation}"
1269           source="${build.jsr166e.java.version}"
1270           target="${build.jsr166e.java.version}"
1271           classpath=""
1272           bootclasspath="${bootclasspath6}"
1273           includeAntRuntime="false"
1274           includeJavaRuntime="false"
1275           executable="${javac8}"
1276           fork="true">
1277
1278      <include name="jsr166e/**/*.java"/>
1279      <compilerarg value="-XDignore.symbol.file=true"/>
1280      <compilerarg value="-Xlint:all"/>
1281      <compilerarg value="-Werror"/>
1282      <compilerarg value="-Xdoclint:all/protected"/>
1283    </javac>
1284  </target>
1285
1286  <target name="jsr166ejar" depends="jsr166ecompile">
1287    <jar destfile="${jsr166e.jar}" index="true">
1288      <fileset dir="${build.jsr166e.classes.dir}"/>
1289      <manifest>
1290        <attribute name="Built-By" value="${user.name}"/>
1291        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1292      </manifest>
1293    </jar>
1294  </target>
1295
1296  <target name="jsr166edocs">
1297    <delete dir="${jsr166edocs.dir}"/>
1298    <mkdir dir="${jsr166edocs.dir}"/>
1299
1300    <javadoc destdir="${jsr166edocs.dir}"
1301             packagenames="jsr166e.*"
1302             link="${java.api.url}"
1303             access="${build.javadoc.access}"
1304             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1305             source="${build.jsr166e.java.version}"
1306             executable="${javadoc7}"
1307             failonerror = "true">
1308      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1309      <arg value="-XDignore.symbol.file=true"/>
1310    </javadoc>
1311  </target>
1312
1313  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1314    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1315    <run-tck-tests
1316      tck.src.dir="${test.src.dir}/tck-jsr166e"
1317      target="${build.jsr166e.java.version}"
1318      workdir="${build.jsr166e.dir}"
1319      classes="${jsr166e.jar}"/>
1320  </target>
1321
1322  <target name="jsr166e-tck">
1323
1324 <!--     <antcall target="clean"/> -->
1325 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1326 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1327 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1328 <!--     </antcall> -->
1329
1330    <antcall target="clean"/>
1331    <antcall target="jsr166e-tck-one-java-version">
1332      <param name="build.jsr166e.java.version" value="7"/>
1333      <param name="build.jsr166e.javac" value="${javac7}"/>
1334    </antcall>
1335
1336    <antcall target="clean"/>
1337    <antcall target="jsr166e-tck-one-java-version">
1338      <param name="build.jsr166e.java.version" value="6"/>
1339      <param name="build.jsr166e.javac" value="${javac6}"/>
1340    </antcall>
1341  </target>
1342
1343  <target name="jsr166e-test" depends="jsr166e-tck"/>
1344
1345  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1346
1347  <target name="jsr166eclean">
1348    <delete dir="${build.jsr166e.dir}"/>
1349  </target>
1350
1351  <target name="jsr166edist-jar"
1352          depends="jsr166eclean, jsr166ejar">
1353    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1354  </target>
1355
1356  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1357    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1358  </target>
1359
1360
644   <!-- Find buglets that can be detected by static build tools -->
645  
646 <  <target name="lint">
647 <    <antcall target="dists">
648 <      <param name="build.javadoc.access" value="public"/>
649 <    </antcall>
650 <  </target>
646 > <!--   <target name="lint"> -->
647 > <!--     <antcall target="dists"> -->
648 > <!--       <param name="build.javadoc.access" value="protected"/> -->
649 > <!--     </antcall> -->
650 > <!--   </target> -->
651  
652   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
653 <  <target name="lint-private">
653 >  <target name="doclint-private">
654      <antcall target="dist">
655        <param name="build.javadoc.access" value="private"/>
656      </antcall>
# Line 1375 | Line 658
658  
659  
660   <!-- ==============================================================
661 <  Experimental errorprone support - http://errorprone.info
661 >  Experimental errorprone support
662 >  https://errorprone.info
663 >  https://errorprone.info/docs/installation
664 >  https://github.com/google/error-prone/issues/1143
665   =================================================================== -->
666 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.0.21.jar"/>
666 >  <path id="errorprone.processorpath.path">
667 >    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
668 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
669 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
670 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
671 >  </path>
672 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
673 >  <property name="errorprone.jsr166.user.flags" value=""/>
674 >  <property name="errorprone.jsr166.flags"
675 >            value="-Xep:HashtableContains:OFF
676 >                   -Xep:JdkObsolete:OFF
677 >                   -Xep:MissingOverride:OFF
678 >                   -Xep:MissingFail:OFF
679 >                   -Xep:ThreadPriorityCheck:OFF
680 >                   -Xep:MixedArrayDimensions:ERROR
681 >                   -Xep:RemoveUnusedImports:ERROR
682 >                   -Xep:EmptyIf:ERROR
683 >                   -Xep:MultipleTopLevelClasses:ERROR
684 >                   -Xep:ClassName:ERROR
685 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
686 >                   -Xep:RedundantThrows:ERROR
687 >                   -Xep:IdentityBinaryExpression:WARN
688 >                   -Xep:ConstructorInvokesOverridable:WARN
689 >                   -Xep:MethodCanBeStatic:WARN
690 >                   ${errorprone.jsr166.user.flags}"/>
691 >  <!-- -Xep:WildcardImport:ERROR -->
692 >  <property name="errorprone.jsr166.test.flags"
693 >            value="-Xep:StringSplitter:OFF
694 >                   -Xep:BoxedPrimitiveConstructor:OFF
695 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
696 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
697    <target name="errorprone"
698            depends="clean, configure-compiler"
699            description="Run errorprone over jsr166 source code (experimental)">
# Line 1399 | Line 715
715             fork="true">
716  
717        <include name="**/*.java"/>
718 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
718 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
719 >      <compilerarg value="-J--illegal-access=permit"/>
720 >      <compilerarg value="-XDcompilePolicy=simple"/>
721 >      <compilerarg value="-processorpath"/>
722 >      <compilerarg pathref="errorprone.processorpath.path"/>
723        <compilerarg value="-Xplugin:ErrorProne
724 <                          -Xep:IdentityBinaryExpression:WARN
1405 <                          -Xep:MissingOverride:OFF
1406 <                          -Xep:MixedArrayDimensions:WARN
1407 <                          -Xep:RemoveUnusedImports:ERROR
1408 <                          -Xep:ClassName:ERROR
1409 <                          -Xep:MultipleTopLevelClasses:ERROR
1410 <                          -Xep:EmptyIf:ERROR
1411 <                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1412 <                          -Xep:RedundantThrows:ERROR
1413 <                          -Xep:MethodCanBeStatic:WARN"/>
724 >                          ${errorprone.jsr166.flags}"/>
725        <compilerarg value="--patch-module=java.base=${src.dir}"/>
726        <compilerarg value="-Xprefer:source"/>
727        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1425 | Line 736
736      </jar>
737  
738      <run-tck-tests
739 <      target="${build.main.java.version}"
739 >      target="${java.runtime.target}"
740        workdir="${build.dir}"
741        classes="${product.jar}">
742        <javac-elements>
743 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
743 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
744 >        <compilerarg value="-J--illegal-access=permit"/>
745 >        <compilerarg value="-XDcompilePolicy=simple"/>
746 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
747          <compilerarg value="-Xplugin:ErrorProne
748 <                            -Xep:IdentityBinaryExpression:WARN
749 <                            -Xep:BoxedPrimitiveConstructor:OFF
1436 <                            -Xep:HashtableContains:OFF
1437 <                            -Xep:ModifyingCollectionWithItself:OFF
1438 <                            -Xep:MissingOverride:OFF
1439 <                            -Xep:MixedArrayDimensions:WARN
1440 <                            -Xep:RemoveUnusedImports:ERROR
1441 <                            -Xep:ClassName:ERROR
1442 <                            -Xep:MultipleTopLevelClasses:ERROR
1443 <                            -Xep:EmptyIf:ERROR
1444 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1445 <                            -Xep:RedundantThrows:ERROR
1446 <                            -Xep:MethodCanBeStatic:WARN"/>
748 >                            ${errorprone.jsr166.flags}
749 >                            ${errorprone.jsr166.test.flags}"/>
750          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
751        </javac-elements>
752      </run-tck-tests>
753    </target>
754  
755 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
756 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
757 +  <target name="errorprone-jtreg"
758 +          depends="jar"
759 +          description="Run errorprone over jtreg tests (experimental)">
760 +
761 +    <run-jtreg-tests
762 +       target="${java.runtime.target}"
763 +       workdir="${build.dir}"
764 +       classes="${product.jar}"
765 +       verbose="all">
766 +      <jtreg-elements>
767 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
768 +        <arg value="-javacoption:-processorpath"/>
769 +        <arg value="-javacoption:${errorprone.processorpath}"/>
770 +        <arg value="-javacoption:-Xplugin:ErrorProne
771 +                            ${errorprone.jsr166.flags}
772 +                            ${errorprone.jsr166.test.flags}
773 +                            -Xep:MultipleTopLevelClasses:WARN
774 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
775 +      </jtreg-elements>
776 +    </run-jtreg-tests>
777 +  </target>
778 +
779  
780   <!-- ==============================================================
781    Running guava tests against jsr166 code

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines