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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines