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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines