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.163 by jsr166, Fri Feb 20 22:33:13 2015 UTC vs.
Revision 1.307 by jsr166, Sun Oct 6 19:03:54 2019 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 6 | Line 9
9  
10    Usage: ant [target]
11  
12 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
13 +  more details.
14 +
15    User-specific settings are read from user.properties.
16    See user.properties.sample for an explanation of some useful settings.
17  
# Line 13 | 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/jdk6
23 <  $HOME/jdk/jdk7
24 <  $HOME/jdk/jdk8
25 <  $HOME/jdk/jdk9
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/jdk6
28 <  $HOME/jdk/src/jdk7
29 <  $HOME/jdk/src/jdk8
30 <  $HOME/jdk/src/jdk9
31 <  where each of the above is a complete JDK source tree
26 <  (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=...
35 <  for $N in 6 7 8 9 ...
34 >  ant -Djdk$N.home=... -Djdk$N.src.home=...
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  
43 <  <!-- Display main targets by running 'ant -projecthelp' -->
43 >  <!-- Run 'ant -projecthelp' (default target) -->
44    <target name="usage">
45      <java classname="org.apache.tools.ant.Main">
46        <arg value="-projecthelp" />
47      </java>
48    </target>
49  
50 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
51  
52    <!-- User-specific settings -->
53    <property file="user.properties"/>
54  
55  
56    <!-- Compilation options -->
47  <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"/>
60    <property name="build.javadoc.access" value="protected"/>
61  
53  <!-- Tck options; see JSR166TestCase.java
54   To profile a single tck test class:
55   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
56   To stress test a single tck test class:
57   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
58  -->
59  <property name="jsr166.profileTests"     value="false"/>
60  <property name="jsr166.profileThreshold" value="100"/>
61  <property name="jsr166.runsPerTest"      value="1"/>
62  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63
62    <!-- Build locations -->
63    <property name="build.dir"                   location="build"/>
64    <property name="build.classes.dir"           location="${build.dir}/classes"/>
65    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
66    <property name="build.loops.dir"             location="${build.dir}/loops"/>
69  <property name="build.reports.dir"           location="${build.dir}/reports"/>
70
71  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
72  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
73  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
74  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
75
76  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
77  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
78  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
79  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
80
81  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
82  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
83  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
84  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
67  
68    <!-- JDK locations -->
69    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 89 | Line 71
71    <macrodef name="defjdklocations">
72      <attribute name="v"/>
73      <sequential>
74 <    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
75 <    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
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.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
79 <    <local name="boot.jar.dir"/>
98 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
99 <    <path id="bootclasspath@{v}">
100 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
101 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
102 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
103 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
104 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
105 <    </path>
106 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
74 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
75 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
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 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
80      </sequential>
81    </macrodef>
82  
# Line 119 | Line 92
92      </sequential>
93    </macrodef>
94  
95 <  <defjdklocations v="6"/>
96 <  <defjdklocations v="7"/>
97 <  <defjdklocations v="8"/>
98 <  <defjdklocations v="9"/>
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="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
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"/>
136  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
137  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
138  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
139  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
140  <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"/>
145 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
146 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
147 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
148 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
149 <
150 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
151 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
152 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
153 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
154 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
155 <  <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"/>
159  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
160  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
161  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
162  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
163  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
120    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
121  
122    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
123 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
124 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
125 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
126 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
127 <  <!-- The expected canonical location does not yet exist as of 2014-07 -->
128 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
129 <  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
130 <  <!-- Default jdk doc location (latest stable release seems best) -->
131 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
123 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
124 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
125 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
126 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
127 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
128 >  <!-- The location of jdk early access docs (RIP) -->
129 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
130 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
131 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
132 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
133 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
134 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
135 >  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
136 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
137 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
138  
139    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
140 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
141 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
142 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
143 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
182 <  <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 187 | Line 148
148    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
149             classpath="${lib.dir}/jtreg.jar" />
150  
151 <  <!-- Test classpath -->
152 <  <path id="test.classpath">
153 <    <pathelement location="${build.testcases.dir}"/>
154 <    <pathelement location="${junit.jar}"/>
155 <  </path>
156 <
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:
155 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
156 >   To stress test a single tck test method:
157 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
158 >  -->
159 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
160    <macrodef name="run-tck-tests">
161      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
162      <attribute name="target"/>
163      <attribute name="compile-target" default="@{target}"/>
164      <attribute name="workdir"/>
165      <attribute name="classes"/>
166 <    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
166 >    <!--
167 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
168 >    -->
169 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
170      <element name="javac-elements" optional="true"/>
171 +
172      <sequential>
173  
174      <mkdir dir="@{workdir}/tck-classes"/>
# Line 215 | Line 183
183             classpath="${junit.jar}"
184             includeAntRuntime="false"
185             includeJavaRuntime="false"
186 +           encoding="ASCII"
187             executable="${javac@{compile-target}}"
188             fork="true">
189  
190        <include name="*.java"/>
191        <compilerarg value="-XDignore.symbol.file=true"/>
192 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
193 <      <compilerarg value="-Xbootclasspath/p:@{classes}"/>
192 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
193 >      <compilerarg value="-Xdoclint:reference/private"/>
194 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
195        <compilerarg line="${build.args}"/>
196        <javac-elements/>
197  
# Line 231 | Line 201
201            failonerror="true"
202            jvm="${java@{target}}"
203            fork="true">
204 <        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
205 <        <jvmarg line="@{jvmflags}"/>
206 <
207 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
208 <        <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
209 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
210 <        </syspropertyset>
211 <
212 <        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
213 <        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
214 <        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
215 <        <classpath>
216 <          <pathelement location="${junit.jar}"/>
217 <          <pathelement location="@{workdir}/tck-classes"/>
218 <        </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 +  <!-- 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 +  <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 -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
256 <    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
257 <    <attribute name="source" default="7"/>
254 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
255      <attribute name="target"/>
256      <attribute name="workdir"/>
257      <attribute name="classes"/>
258 +    <attribute name="verbose" default="${jtreg.verbose}"/>
259      <attribute name="jtregflags" default=""/>
260 +    <element name="jtreg-elements" optional="true"/>
261 +
262      <sequential>
263 +
264 +    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
265 +    <property name="jtreg.verbose" value="nopass,fail,error"/>
266 +
267      <delete dir="@{workdir}/JTwork"   quiet="true"/>
268 <    <delete dir="@{workdir}/JTreport" quiet="true"/>
265 <    <mkdir dir="@{workdir}/JTwork/scratch"/>
266 <    <mkdir dir="@{workdir}/JTreport"/>
267 <    <jtreg dir="@{jtreg.src.dir}"
268 >    <jtreg dir="${jtreg@{target}.src.dir}"
269             jdk="${jdk@{target}.home}"
270 <           workDir="@{workdir}/JTwork"
271 <           reportDir="@{workdir}/JTreport">
272 <
273 <      <arg value="-Xbootclasspath/p:@{classes}"/>
270 >           workDir="@{workdir}/JTwork">
271 >      <patternset refid="jdk@{target}.jtreg.tests"/>
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="-v:nopass,fail"/>
275 >      <arg value="-noreport"/>
276 >      <arg value="-verbose:@{verbose}"/>
277        <arg value="-vmoptions:-esa -ea"/>
278        <arg value="-automatic"/>
279        <arg value="-k:!ignore"/>
280        <arg line="@{jtregflags}"/>
281 +      <arg line="${jtreg.flags}"/>
282 +      <jtreg-elements/>
283      </jtreg>
284      </sequential>
285    </macrodef>
# Line 286 | Line 290
290    </path>
291  
292    <!-- Support @jls tag, used in jdk8+ javadoc -->
293 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
294    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
295    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
296  
297    <!-- Main targets -->
298  
299 <  <property name="build.main.java.version" value="9"/>
300 <  <property name="build.main.javac" value="${javac9}"/>
299 >  <!-- Default values: may seem strange ... -->
300 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
301 >  <!-- But at build time, target jdk9, for maximal binary portability -->
302 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
303 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
304 >    o override-methods=summary
305 >    o {@systemProperty ...}
306 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
307 >    o 8202628: javadoc generates bad links in TestModules.java
308 >    -->
309 >  <property name="java.runtime.target" value="11"/>
310 >  <property name="build.main.java" value="${java11}"/>
311 >  <property name="build.main.javac" value="${javac11}"/>
312 >  <property name="build.main.javadoc" value="${javadoc12}"/>
313 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
314  
315    <target name="dists"
316 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
316 >          depends="dist"
317            description="Builds all public jars and docs"/>
318  
319    <target name="compile"
320            depends="configure-compiler"
321            description="Compiles src/main sources to build dir">
322  
323 <    <mkdir dir="${build.classes.dir}"/>
323 >    <local name="destdir"/>
324 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
325 >
326 >    <mkdir dir="${destdir}"/>
327  
328      <javac srcdir="${src.dir}"
329 <           destdir="${build.classes.dir}"
329 >           destdir="${destdir}"
330             debug="${build.debug}"
331             debuglevel="${build.debuglevel}"
332             deprecation="${build.deprecation}"
333             classpath=""
334             includeAntRuntime="false"
335             includeJavaRuntime="false"
336 +           encoding="ASCII"
337             executable="${build.main.javac}"
338             fork="true">
339  
340        <include name="**/*.java"/>
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"/>
345 <      <compilerarg value="-Xdoclint:all/protected"/>
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}"/>
352  
# Line 329 | Line 356
356  
357    <target name="jar"
358            depends="compile"
359 <          description="Builds library jar from compiled sources">
360 <
359 >          description="Builds library jar for src/main from compiled sources">
360 >    <local name="subdir"/>
361 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
362      <jar destfile="${product.jar}">
363 <      <fileset dir="${build.classes.dir}"/>
363 >      <fileset dir="${build.classes.dir}${subdir}"/>
364 >      <manifest>
365 >        <attribute name="Built-By" value="${user.name}"/>
366 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
367 >      </manifest>
368      </jar>
369    </target>
370  
# Line 340 | Line 372
372    <target name="docs"
373            description="Builds javadocs for src/main to dist dir">
374  
375 <    <delete dir="${docs.dir}"/>
375 >    <delete dir="${docs.dir}" quiet="true"/>
376      <mkdir dir="${docs.dir}"/>
377  
378 +    <!-- old school frames via docs/index.html?overview-summary.html -->
379 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
380 +    <local name="use-frames"/>
381 +    <condition property="use-frames">
382 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
383 +    </condition>
384 +
385      <!-- the packagenames="none" hack below prevents scanning the -->
386      <!-- sourcepath for packages -->
387  
388 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
389 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
390 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
391 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
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}:${jdk9src.dir}"
398 >             sourcepath="${src.dir}"
399               classpath=""
400 <             executable="${javadoc9}">
400 >             source="${build.main.javadoc.source}"
401 >             executable="${build.main.javadoc}">
402 > <!-- TODO: JDK-8214571 failonerror = "true" -->
403        <fileset dir="${src.dir}" defaultexcludes="yes">
404          <include name="**/*.java"/>
405        </fileset>
406 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
406 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
407        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
408 +      <arg value="-quiet"/>
409        <arg value="-XDignore.symbol.file=true"/>
410 <      <arg value="-tag"/>
411 <      <arg value="${javadoc.jls.option}"/>
412 <      <arg value="-tag"/>
413 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
414 <      <arg value="-tag"/>
415 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
416 <      <arg value="-tag"/>
417 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
410 >      <arg value="-html5"/>
411 >      <arg value="--patch-module=java.base=${src.dir}"/>
412 >      <arg value="--frames" if:set="use-frames"/>
413 >      <arg value="--override-methods=summary"/>
414 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
415 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
416 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
417 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
418 > <!-- tags added in jdk9: currently unused -->
419 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
420 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
421      </javadoc>
422    </target>
423  
# Line 377 | Line 427
427            description="Puts all distributable products in single hierarchy"/>
428  
429  
380  <target name="release"
381          depends="dist"
382          description="Puts entire CVS tree, plus distribution productions, in a jar">
383
384    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
385
386    <jar basedir="${basedir}" destfile="${release.jar}">
387      <!-- <exclude name="build/**"/> -->
388      <exclude name="${release.jar}"/>
389      <exclude name="user.properties"/>
390      <exclude name="etc/notes/**"/>
391      <exclude name="src/emulation/**"/>
392      <exclude name="**/SyntaxTest.java"/>
393      <exclude name="**/SuperfluousAbstract.java"/>
394    </jar>
395  </target>
396
397
430    <target name="clean"
431            description="Removes all build products">
400
432      <delete dir="${build.dir}"/>
402
433    </target>
434  
435  
436    <target name="dist-clean"
437            description="Removes all build and distribution products">
408
438      <delete dir="${build.dir}"/>
439      <delete dir="${dist.dir}"/>
411
440    </target>
441  
442  
# Line 422 | Line 450
450      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
451    </target>
452  
453 <  <target name="tck" depends="test-tck" description="alias for test-tck"/>
454 <  <target name="test-tck"
455 <          depends="jar"
428 <          description="Runs tck tests for main directly">
453 >  <target name="tck"
454 >          depends="jar"
455 >          description="Runs tck tests for src/main directly">
456  
457      <run-tck-tests
458 <      target="${build.main.java.version}"
458 >      target="${java.runtime.target}"
459        workdir="${build.dir}"
460 <      classes="${product.jar}"/>
460 >      classes="${product.jar}">
461 >      <javac-elements>
462 >        <compilerarg value="-Werror"/>
463 >      </javac-elements>
464 >    </run-tck-tests>
465    </target>
466  
467 <  <target name="test-tck-parallelism-1"
468 <          description="Runs test-tck with given common pool parallelism">
469 <    <antcall target="test-tck">
467 >  <target name="tck-parallelism-1"
468 >          description="Runs tck with common pool parallelism 1">
469 >    <antcall target="tck">
470        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
471      </antcall>
472    </target>
473  
474 <  <target name="test-tck-parallelism-0"
475 <          description="Runs test-tck with given common pool parallelism">
476 <    <antcall target="test-tck">
474 >  <target name="tck-parallelism-0"
475 >          description="Runs tck with common pool parallelism 0">
476 >    <antcall target="tck">
477        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
478      </antcall>
479    </target>
480  
481 <  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
482 <  <target name="test-jtreg"
483 <          depends="jar"
484 <          description="Runs jtreg tests for main using the jtreg ant task">
481 >  <target name="tck-security-manager"
482 >          description="Runs tck with a security manager">
483 >    <antcall target="tck">
484 >      <param name="jsr166.useSecurityManager" value="true"/>
485 >    </antcall>
486 >  </target>
487 >
488 >  <target name="jtreg"
489 >          depends="jar"
490 >          description="Runs jtreg tests for src/main using the jtreg ant task">
491      <run-jtreg-tests
492 <       target="${build.main.java.version}"
492 >       target="${java.runtime.target}"
493         workdir="${build.dir}"
494         classes="${product.jar}"/>
495    </target>
496  
497    <target name="test"
498 <          depends="test-tck, test-tck-parallelism-1, test-jtreg"
499 <          description="Runs tck and jtreg tests for main">
498 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
499 >          description="Runs tck and jtreg tests for src/main"/>
500 >
501 >  <target name="test-version-permutations"
502 >          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
503    </target>
504  
505 <  <target name="test89"
506 <          description="Runs tck and jtreg tests for main for multiple java versions">
505 >  <target name="test11">
506 >    <antcall>
507 >      <param name="java.runtime.target" value="11"/>
508 >      <param name="build.main.javac" value="${javac11}"/>
509 >      <param name="build.main.javadoc" value="${javadoc12}"/>
510 >      <param name="build.main.javadoc.source" value="11"/>
511 >      <target name="clean"/>
512 >      <target name="test"/>
513 >      <target name="docs"/>
514 >    </antcall>
515 >  </target>
516  
517 <    <antcall target="clean"/>
518 <    <antcall target="test">
519 <      <param name="build.main.java.version" value="8"/>
520 <      <param name="build.main.javac" value="${javac8}"/>
517 >  <target name="test12">
518 >    <antcall>
519 >      <param name="java.runtime.target" value="12"/>
520 >      <param name="build.main.javac" value="${javac12}"/>
521 >      <param name="build.main.javadoc" value="${javadoc12}"/>
522 >      <param name="build.main.javadoc.source" value="12"/>
523 >      <target name="clean"/>
524 >      <target name="test"/>
525 >      <target name="docs"/>
526      </antcall>
527 +  </target>
528  
529 <    <antcall target="clean"/>
530 <    <antcall target="test">
531 <      <param name="build.main.java.version" value="9"/>
532 <      <param name="build.main.javac" value="${javac9}"/>
529 >  <target name="test13">
530 >    <antcall>
531 >      <param name="java.runtime.target" value="13"/>
532 >      <param name="build.main.javac" value="${javac13}"/>
533 >      <param name="build.main.javadoc" value="${javadoc13}"/>
534 >      <param name="build.main.javadoc.source" value="13"/>
535 >      <target name="clean"/>
536 >      <target name="test"/>
537 >      <target name="docs"/>
538      </antcall>
539 +  </target>
540  
541 +  <target name="test14">
542 +    <antcall>
543 +      <param name="java.runtime.target" value="14"/>
544 +      <param name="build.main.javac" value="${javac14}"/>
545 +      <param name="build.main.javadoc" value="${javadoc14}"/>
546 +      <param name="build.main.javadoc.source" value="14"/>
547 +      <target name="clean"/>
548 +      <target name="test"/>
549 +      <target name="docs"/>
550 +    </antcall>
551    </target>
552  
553 +  <target name="test11-12">
554 +    <antcall>
555 +      <param name="java.runtime.target" value="12"/>
556 +      <param name="build.main.javac" value="${javac11}"/>
557 +      <param name="build.main.javadoc" value="${javadoc12}"/>
558 +      <param name="build.main.javadoc.source" value="11"/>
559 +      <target name="clean"/>
560 +      <target name="test"/>
561 +      <target name="docs"/>
562 +    </antcall>
563 +  </target>
564 +
565 +  <target name="test11-13">
566 +    <antcall>
567 +      <param name="java.runtime.target" value="13"/>
568 +      <param name="build.main.javac" value="${javac11}"/>
569 +      <param name="build.main.javadoc" value="${javadoc13}"/>
570 +      <param name="build.main.javadoc.source" value="11"/>
571 +      <target name="clean"/>
572 +      <target name="test"/>
573 +      <target name="docs"/>
574 +    </antcall>
575 +  </target>
576 +
577 +  <target name="test11-14">
578 +    <antcall>
579 +      <param name="java.runtime.target" value="14"/>
580 +      <param name="build.main.javac" value="${javac11}"/>
581 +      <param name="build.main.javadoc" value="${javadoc14}"/>
582 +      <param name="build.main.javadoc.source" value="11"/>
583 +      <target name="clean"/>
584 +      <target name="test"/>
585 +      <target name="docs"/>
586 +    </antcall>
587 +  </target>
588  
589  
590    <target name="configure-compiler">
591 +    <fail message="ant version too old">
592 +      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
593 +    </fail>
594  
595      <property name="unchecked.option" value="-Xlint:unchecked"/>
596  
# Line 498 | Line 607
607    </target>
608  
609  
610 +  <target name="compile-test-loops" depends="jar"
611 +          description="Compiles all the perf tests in src/test/loops">
612  
613 <  <!-- Various demos and test programs -->
503 <
504 <
505 <  <target name="loops" depends="configure-compiler"
506 <          description="Benchmark from Doug Lea's AQS paper">
507 <
508 <    <mkdir dir="${build.loops.dir}"/>
509 <
510 <    <javac srcdir="${loops.src.dir}"
511 <          destdir="${build.loops.dir}"
512 <            debug="${build.debug}"
513 <       debuglevel="${build.debuglevel}"
514 <      deprecation="${build.deprecation}"
515 <           source="${build.sourcelevel}"
516 <             fork="true">
517 <
518 <      <compilerarg line="${build.args}"/>
519 <      <classpath refid="loops.classpath"/>
520 <      <compilerarg value="-XDignore.symbol.file=true"/>
521 <
522 <    </javac>
523 <
524 <    <java classname="ALoops" fork="true">
525 <      <classpath refid="loops.classpath"/>
526 <    </java>
527 <
528 <  </target>
529 <
530 <
531 <  <!-- jsr166 4jdk7 -->
532 <
533 <  <target name="4jdk7compile"
534 <          depends="configure-compiler"
535 <          description="Compiles src/jdk7 sources, targeting jdk7">
536 <
537 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
613 >    <mkdir dir="${build.dir}/test/loops"/>
614  
615 <    <javac srcdir="${4jdk7src.dir}"
616 <           destdir="${build.4jdk7.classes.dir}"
615 >    <javac srcdir="${basedir}/src/test/loops"
616 >           destdir="${build.dir}/test/loops"
617             debug="${build.debug}"
618             debuglevel="${build.debuglevel}"
619             deprecation="${build.deprecation}"
544           source="6"
545           classpath=""
546           bootclasspath="${bootclasspath6}"
620             includeAntRuntime="false"
621             includeJavaRuntime="false"
622 <           executable="${javac7}"
622 >           encoding="ASCII"
623 >           executable="${build.main.javac}"
624             fork="true">
625  
626 <      <include name="**/*.java"/>
553 <      <compilerarg value="-Xprefer:source"/>
626 >      <include name="*.java"/>
627        <compilerarg value="-XDignore.symbol.file=true"/>
628 <      <compilerarg value="-Xlint:all"/>
628 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
629 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
630        <compilerarg line="${build.args}"/>
557
631      </javac>
632    </target>
633  
561  <target name="4jdk7doclint"
562          depends="configure-compiler"
563          description="Finds doclint warnings">
634  
635 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
635 >  <!-- old branches no longer maintained.  build support deleted -->
636 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
637 >  <!-- jsr166 4jdk7 (no longer maintained) -->
638 >  <!-- jsr166x (no longer maintained) -->
639 >  <!-- jsr166y (no longer maintained) -->
640 >  <!-- extra166y (no longer maintained) -->
641 >  <!-- jsr166e (no longer maintained) -->
642  
643 <    <javac srcdir="${4jdk7src.dir}"
644 <           destdir="${build.4jdk7.classes.dir}"
643 > <!-- Find buglets that can be detected by static build tools -->
644 >
645 > <!--   <target name="lint"> -->
646 > <!--     <antcall target="dists"> -->
647 > <!--       <param name="build.javadoc.access" value="protected"/> -->
648 > <!--     </antcall> -->
649 > <!--   </target> -->
650 >
651 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
652 >  <target name="doclint-private">
653 >    <antcall target="dist">
654 >      <param name="build.javadoc.access" value="private"/>
655 >    </antcall>
656 >  </target>
657 >
658 >
659 > <!-- ==============================================================
660 >  Experimental errorprone support
661 >  https://errorprone.info
662 >  https://errorprone.info/docs/installation
663 >  https://github.com/google/error-prone/issues/1143
664 > =================================================================== -->
665 >  <path id="errorprone.processorpath.path">
666 >    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
667 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
668 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
669 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
670 >  </path>
671 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
672 >  <property name="errorprone.jsr166.user.flags" value=""/>
673 >  <property name="errorprone.jsr166.flags"
674 >            value="-Xep:HashtableContains:OFF
675 >                   -Xep:JdkObsolete:OFF
676 >                   -Xep:MissingOverride:OFF
677 >                   -Xep:MissingFail:OFF
678 >                   -Xep:ThreadPriorityCheck:OFF
679 >                   -Xep:MixedArrayDimensions:ERROR
680 >                   -Xep:RemoveUnusedImports:ERROR
681 >                   -Xep:EmptyIf:ERROR
682 >                   -Xep:MultipleTopLevelClasses:ERROR
683 >                   -Xep:ClassName:ERROR
684 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
685 >                   -Xep:RedundantThrows:ERROR
686 >                   -Xep:IdentityBinaryExpression:WARN
687 >                   -Xep:ConstructorInvokesOverridable:WARN
688 >                   -Xep:MethodCanBeStatic:WARN
689 >                   ${errorprone.jsr166.user.flags}"/>
690 >  <!-- -Xep:WildcardImport:ERROR -->
691 >  <property name="errorprone.jsr166.test.flags"
692 >            value="-Xep:StringSplitter:OFF
693 >                   -Xep:BoxedPrimitiveConstructor:OFF
694 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
695 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
696 >  <target name="errorprone"
697 >          depends="clean, configure-compiler"
698 >          description="Run errorprone over jsr166 source code (experimental)">
699 >
700 >    <local name="destdir"/>
701 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
702 >    <mkdir dir="${destdir}"/>
703 >
704 >    <javac srcdir="${src.dir}"
705 >           destdir="${destdir}"
706             debug="${build.debug}"
707             debuglevel="${build.debuglevel}"
708             deprecation="${build.deprecation}"
572           source="6"
709             classpath=""
574           bootclasspath="${bootclasspath7}"
710             includeAntRuntime="false"
711             includeJavaRuntime="false"
712 <           executable="${javac8}"
712 >           encoding="ASCII"
713 >           executable="${build.main.javac}"
714             fork="true">
715  
716        <include name="**/*.java"/>
717 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
718 +      <compilerarg value="-J--illegal-access=permit"/>
719 +      <compilerarg value="-XDcompilePolicy=simple"/>
720 +      <compilerarg value="-processorpath"/>
721 +      <compilerarg pathref="errorprone.processorpath.path"/>
722 +      <compilerarg value="-Xplugin:ErrorProne
723 +                          ${errorprone.jsr166.flags}"/>
724 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
725        <compilerarg value="-Xprefer:source"/>
726        <compilerarg value="-XDignore.symbol.file=true"/>
727        <compilerarg value="-Xlint:all"/>
728 <      <compilerarg value="-Xdoclint:all/protected"/>
728 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
729 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
730        <compilerarg line="${build.args}"/>
586
731      </javac>
588  </target>
589
590
591  <target name="4jdk7jar"
592          depends="4jdk7compile"
593          description="Builds library jar from compiled sources">
732  
733 <    <jar destfile="${4jdk7product.jar}">
734 <      <fileset dir="${build.4jdk7.classes.dir}"/>
733 >    <jar destfile="${product.jar}">
734 >      <fileset dir="${destdir}"/>
735      </jar>
736  
599  </target>
600
601
602  <target name="4jdk7-test-tck"
603          depends="4jdk7jar"
604          description="Runs tck tests for jsr166-4jdk7 directly">
605
737      <run-tck-tests
738 <      target="7"
739 <      workdir="${build.4jdk7.dir}"
740 <      classes="${4jdk7product.jar}">
738 >      target="${java.runtime.target}"
739 >      workdir="${build.dir}"
740 >      classes="${product.jar}">
741        <javac-elements>
742 <        <!-- JDK8+ test classes -->
743 <        <exclude name="*8Test.java"/>
744 <        <exclude name="*9Test.java"/>
745 <        <exclude name="DoubleAccumulatorTest.java"/>
746 <        <exclude name="DoubleAdderTest.java"/>
747 <        <exclude name="LongAccumulatorTest.java"/>
748 <        <exclude name="LongAdderTest.java"/>
749 <        <exclude name="CompletableFutureTest.java"/>
619 <        <exclude name="SplittableRandomTest.java"/>
620 <        <exclude name="StampedLockTest.java"/>
742 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
743 >        <compilerarg value="-J--illegal-access=permit"/>
744 >        <compilerarg value="-XDcompilePolicy=simple"/>
745 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
746 >        <compilerarg value="-Xplugin:ErrorProne
747 >                            ${errorprone.jsr166.flags}
748 >                            ${errorprone.jsr166.test.flags}"/>
749 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
750        </javac-elements>
751      </run-tck-tests>
752    </target>
753  
754 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
755 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
756 +  <target name="errorprone-jtreg"
757 +          depends="jar"
758 +          description="Run errorprone over jtreg tests (experimental)">
759  
760 <  <target name="4jdk7-test-tck-junit"
761 <          depends="4jdk7compile"
762 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
763 <
764 <    <junit printsummary="true"
765 <           showoutput="true"
766 <           errorProperty="junit.failed"
767 <           failureProperty="junit.failed"
768 <           includeantruntime="true"
769 <           jvm="${java7}"
770 <           fork="true">
771 <
772 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
773 <      <jvmarg value="-server"/>
774 <
760 >    <run-jtreg-tests
761 >       target="${java.runtime.target}"
762 >       workdir="${build.dir}"
763 >       classes="${product.jar}"
764 >       verbose="all">
765 >      <jtreg-elements>
766 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
767 >        <arg value="-javacoption:-processorpath"/>
768 >        <arg value="-javacoption:${errorprone.processorpath}"/>
769 >        <arg value="-javacoption:-Xplugin:ErrorProne
770 >                            ${errorprone.jsr166.flags}
771 >                            ${errorprone.jsr166.test.flags}
772 >                            -Xep:MultipleTopLevelClasses:WARN
773 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
774 >      </jtreg-elements>
775 >    </run-jtreg-tests>
776 >  </target>
777 >
778 >
779 > <!-- ==============================================================
780 >  Running guava tests against jsr166 code
781 > =================================================================== -->
782 >
783 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
784 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
785 > <!-- <property name="guava.version" value="21.0"/> -->
786 >
787 > <!-- HOWTO debug print a path id -->
788 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
789 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
790 >
791 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
792 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
793 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
794 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
795 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
796 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
797 >
798 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
799 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
800 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
801 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
802 >
803 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
804 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
805 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
806 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
807 >
808 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
809 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
810 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
811 >
812 >  <target name="init-ivy">
813 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
814 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
815 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
816 >             classpath="${build.dir}/ivy.jar"/>
817 >  </target>
818 >
819 >  <target name="guava-tests" depends="jar, init-ivy"
820 >          description="Guava tests run against jsr166 collections">
821 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
822 >    <mkdir dir="${guava.dir}"/>
823 >    <ivy:retrieve pathid="guava.testlib.classpath"
824 >      type="jar,bundle" inline="true" conf="default,master"
825 >      pattern="${guava.dir}/[artifact].[ext]"
826 >      organisation="com.google.guava" module="guava-testlib"/>
827 >    <property name="guava.version" value="21.0"/>
828 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
829 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
830 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
831 >           jvm="${build.main.java}" fork="true">
832 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
833 >      <formatter type="brief"/>
834        <classpath>
835 <        <pathelement location="${junit.jar}"/>
836 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
835 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
836 >        <path refid="guava.testlib.classpath"/>
837        </classpath>
838  
839 <      <formatter type="brief"/>
840 <
648 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
649 <      </test>
650 <
839 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
840 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
841      </junit>
842    </target>
843  
654  <target name="4jdk7-test-jtreg"
655          depends="4jdk7jar"
656          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
657    <run-jtreg-tests
658       target="7"
659       workdir="${build.4jdk7.dir}"
660       classes="${4jdk7product.jar}"
661       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
662  </target>
663
664
665  <target name="4jdk7-test"
666          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
667          description="Runs tck and jtreg tests for jsr166-4jdk7">
668  </target>
669
670
671  <target name="4jdk7docs"
672          description="Builds javadocs for src/jdk7 to dist dir">
673
674    <delete dir="${4jdk7docs.dir}"/>
675    <mkdir dir="${4jdk7docs.dir}"/>
676
677    <javadoc destdir="${4jdk7docs.dir}"
678             packagenames="none"
679             link="${java7.api.url}"
680             overview="${4jdk7src.dir}/intro.html"
681             access="${build.javadoc.access}"
682             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
683             classpath=""
684             executable="${javadoc7}">
685      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
686        <include name="**/*.java"/>
687      </fileset>
688      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
689      <arg value="-XDignore.symbol.file=true"/>
690    </javadoc>
691  </target>
692
693
694  <target name="4jdk7dist"
695          depends="4jdk7dist-jar, 4jdk7dist-docs"
696          description="Puts all distributable products in single hierarchy"/>
697
698
699  <target name="4jdk7clean"
700          description="Removes all 4jdk7 build products">
701
702    <delete dir="${build.4jdk7.dir}"/>
703
704  </target>
705
706
707  <target name="4jdk7dist-jar"
708          depends="4jdk7clean, 4jdk7jar">
709    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
710  </target>
711
712
713  <target name="4jdk7dist-docs"
714          depends="4jdk7clean, 4jdk7docs">
715    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
716  </target>
717
718
719  <!-- jsr166x -->
720
721  <target name="jsr166xcompile"
722          depends="configure-compiler"
723          description="Compiles jsr166x sources to build dir">
724
725    <mkdir dir="${build.jsr166x.classes.dir}"/>
726
727    <javac srcdir="${topsrc.dir}"
728           destdir="${build.jsr166x.classes.dir}"
729           debug="${build.debug}"
730           debuglevel="${build.debuglevel}"
731           deprecation="${build.deprecation}"
732           classpath=""
733           bootclasspath="${bootclasspath6}"
734           source="5"
735           includeAntRuntime="false"
736           includeJavaRuntime="false"
737           executable="${javac7}"
738           fork="true">
739
740      <include name="jsr166x/**/*.java"/>
741      <compilerarg value="-XDignore.symbol.file=true"/>
742      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
743      <compilerarg line="${build.args}"/>
744
745    </javac>
746  </target>
747
748
749  <target name="jsr166xjar"
750          depends="jsr166xcompile"
751          description="Builds library jar from compiled sources">
752
753    <jar destfile="${jsr166x.jar}">
754      <fileset dir="${build.jsr166x.classes.dir}"/>
755    </jar>
756
757  </target>
758
759
760  <target name="jsr166xdocs"
761          description="Builds javadocs to dist dir">
762
763    <delete dir="${jsr166xdocs.dir}"/>
764    <mkdir dir="${jsr166xdocs.dir}"/>
765
766    <javadoc destdir="${jsr166xdocs.dir}"
767             packagenames="jsr166x.*"
768             link="${java.api.url}"
769             access="${build.javadoc.access}"
770             sourcepath="${topsrc.dir}:${jdk6src.dir}"
771             bootclasspath="${bootclasspath6}"
772             source="5"
773             executable="${javadoc7}">
774      <arg line="-Xdocrootparent ${java.docroot.url}"/>
775      <arg value="-XDignore.symbol.file=true"/>
776
777    </javadoc>
778  </target>
779
780
781  <target name="jsr166xdist"
782          depends="jsr166xdist-jar, jsr166xdist-docs"
783          description="Puts all distributable products in single hierarchy"/>
784
785
786  <target name="jsr166xclean"
787          description="Removes all jsr166x build products">
788
789    <delete dir="${build.jsr166x.dir}"/>
790
791  </target>
792
793
794  <target name="jsr166xdist-jar"
795          depends="jsr166xclean, jsr166xjar">
796    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
797  </target>
798
799  <target name="jsr166xdist-docs"
800          depends="jsr166xclean, jsr166xdocs">
801    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
802  </target>
803
804  <!-- jsr166y -->
805
806
807  <target name="jsr166ycompile"
808          depends="configure-compiler"
809          description="Compiles jsr166y sources">
810
811    <mkdir dir="${build.jsr166y.classes.dir}"/>
812
813    <javac srcdir="${topsrc.dir}"
814           destdir="${build.jsr166y.classes.dir}"
815           debug="${build.debug}"
816           debuglevel="${build.debuglevel}"
817           deprecation="${build.deprecation}"
818           source="6"
819           classpath=""
820           bootclasspath="${bootclasspath6}"
821           includeAntRuntime="false"
822           includeJavaRuntime="false"
823           executable="${javac7}"
824           fork="true">
825
826      <include name="jsr166y/**/*.java"/>
827      <compilerarg value="-XDignore.symbol.file=true"/>
828      <compilerarg value="-Xlint:all"/>
829      <compilerarg line="${build.args}"/>
830
831    </javac>
832  </target>
833
834
835  <target name="jsr166yjar"
836          depends="jsr166ycompile"
837          description="Builds library jar from compiled sources">
838
839    <jar destfile="${jsr166y.jar}" index="true">
840      <fileset dir="${build.jsr166y.classes.dir}"/>
841    </jar>
842
843  </target>
844
845
846  <target name="jsr166ydocs"
847          description="Builds javadocs to dist dir">
848
849    <delete dir="${jsr166ydocs.dir}"/>
850    <mkdir dir="${jsr166ydocs.dir}"/>
851
852    <javadoc destdir="${jsr166ydocs.dir}"
853             packagenames="jsr166y.*"
854             link="${java.api.url}"
855             access="${build.javadoc.access}"
856             sourcepath="${topsrc.dir}:${jdk6src.dir}"
857             bootclasspath="${bootclasspath6}"
858             source="6"
859             executable="${javadoc7}">
860      <arg line="-Xdocrootparent ${java.docroot.url}"/>
861      <arg value="-XDignore.symbol.file=true"/>
862
863    </javadoc>
864  </target>
865
866
867  <target name="jsr166ydist"
868          depends="jsr166ydist-jar, jsr166ydist-docs"
869          description="Puts all distributable products in single hierarchy"/>
870
871
872  <target name="jsr166yclean"
873          description="Removes all jsr166y build products">
874
875    <delete dir="${build.jsr166y.dir}"/>
876
877  </target>
878
879
880  <target name="jsr166ydist-jar"
881          depends="jsr166yclean, jsr166yjar">
882    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
883  </target>
884
885  <target name="jsr166ydist-docs"
886          depends="jsr166yclean, jsr166ydocs">
887    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
888  </target>
889
890
891  <!-- extra166y -->
892
893
894  <target name="extra166ycompile"
895          depends="configure-compiler, jsr166yjar"
896          description="Compiles extra166y sources">
897
898    <mkdir dir="${build.extra166y.classes.dir}"/>
899
900    <javac srcdir="${topsrc.dir}"
901           destdir="${build.extra166y.classes.dir}"
902           debug="${build.debug}"
903           debuglevel="${build.debuglevel}"
904           deprecation="${build.deprecation}"
905           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
906           classpath=""
907           source="6"
908           includeAntRuntime="false"
909           includeJavaRuntime="false"
910           executable="${javac7}"
911           fork="true">
912
913      <include name="extra166y/**/*.java"/>
914      <compilerarg value="-XDignore.symbol.file=true"/>
915      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
916      <compilerarg line="${build.args}"/>
917
918    </javac>
919  </target>
920
921
922  <target name="extra166yjar"
923          depends="extra166ycompile"
924          description="Builds library jar from compiled sources">
925
926    <jar destfile="${extra166y.jar}" index="true">
927      <fileset dir="${build.extra166y.classes.dir}"/>
928    </jar>
929
930  </target>
931
932
933  <target name="extra166ydocs"
934          description="Builds javadocs to build dir">
935
936    <delete dir="${extra166ydocs.dir}"/>
937    <mkdir dir="${extra166ydocs.dir}"/>
938
939    <javadoc destdir="${extra166ydocs.dir}"
940             packagenames="extra166y.*"
941             link="${java.api.url}"
942             access="${build.javadoc.access}"
943             sourcepath="${topsrc.dir}:${jdk6src.dir}"
944             bootclasspath="${bootclasspath6}"
945             source="6"
946             executable="${javadoc7}">
947      <arg line="-Xdocrootparent ${java.docroot.url}"/>
948      <arg value="-XDignore.symbol.file=true"/>
949
950    </javadoc>
951  </target>
952
953
954  <target name="extra166ydist"
955          depends="extra166ydist-jar, extra166ydist-docs"
956          description="Puts all distributable products in single hierarchy"/>
957
958
959  <target name="extra166yclean"
960          description="Removes all extra166y build products">
961
962    <delete dir="${build.extra166y.dir}"/>
963
964  </target>
965
966
967  <target name="extra166ydist-jar"
968          depends="extra166yclean, extra166yjar">
969    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
970  </target>
971
972  <target name="extra166ydist-docs"
973          depends="extra166yclean, extra166ydocs">
974    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
975  </target>
976
977  <!-- jsr166e -->
978
979  <property name="build.jsr166e.java.version" value="6"/>
980  <property name="build.jsr166e.javac" value="${javac6}"/>
981
982  <target name="jsr166ecompile"
983          depends="configure-compiler"
984          description="Compiles jsr166e sources">
985
986    <mkdir dir="${build.jsr166e.classes.dir}"/>
987
988    <javac srcdir="${topsrc.dir}"
989           destdir="${build.jsr166e.classes.dir}"
990           debug="${build.debug}"
991           debuglevel="${build.debuglevel}"
992           deprecation="${build.deprecation}"
993           source="${build.jsr166e.java.version}"
994           classpath=""
995           includeAntRuntime="false"
996           includeJavaRuntime="false"
997           executable="${build.jsr166e.javac}"
998           fork="true">
999
1000      <include name="jsr166e/**/*.java"/>
1001      <compilerarg value="-XDignore.symbol.file=true"/>
1002      <compilerarg value="-Xlint:all"/>
1003      <compilerarg line="${build.args}"/>
1004
1005    </javac>
1006  </target>
1007
1008  <!-- jsr166e: find doclint errors -->
1009  <target name="jsr166edoclint">
1010
1011    <mkdir dir="${build.jsr166e.classes.dir}"/>
1012
1013    <javac srcdir="${topsrc.dir}"
1014           destdir="${build.jsr166e.classes.dir}"
1015           debug="${build.debug}"
1016           debuglevel="${build.debuglevel}"
1017           deprecation="${build.deprecation}"
1018           source="${build.jsr166e.java.version}"
1019           classpath=""
1020           bootclasspath="${bootclasspath7}"
1021           includeAntRuntime="false"
1022           includeJavaRuntime="false"
1023           executable="${javac8}"
1024           fork="true">
1025
1026      <include name="jsr166e/**/*.java"/>
1027      <compilerarg value="-XDignore.symbol.file=true"/>
1028      <compilerarg value="-Xlint:all"/>
1029      <compilerarg value="-Xdoclint:all/protected"/>
1030
1031    </javac>
1032  </target>
1033
1034
1035  <target name="jsr166ejar"
1036          depends="jsr166ecompile"
1037          description="Builds library jar from compiled sources">
1038
1039    <jar destfile="${jsr166e.jar}" index="true">
1040      <fileset dir="${build.jsr166e.classes.dir}"/>
1041    </jar>
1042
1043  </target>
1044
1045
1046  <target name="jsr166edocs"
1047          description="Builds javadocs to build dir">
1048
1049    <delete dir="${jsr166edocs.dir}"/>
1050    <mkdir dir="${jsr166edocs.dir}"/>
1051
1052    <javadoc destdir="${jsr166edocs.dir}"
1053             packagenames="jsr166e.*"
1054             link="${java.api.url}"
1055             access="${build.javadoc.access}"
1056             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1057             source="${build.jsr166e.java.version}"
1058             executable="${javadoc7}">
1059      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1060      <arg value="-XDignore.symbol.file=true"/>
1061
1062    </javadoc>
1063  </target>
1064
1065
1066  <target name="jsr166e-test-tck-one-java-version"
1067          depends="jsr166ejar">
1068
1069    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1070
1071    <run-tck-tests
1072      tck.src.dir="${test.src.dir}/tck-jsr166e"
1073      target="${build.jsr166e.java.version}"
1074      workdir="${build.jsr166e.dir}"
1075      classes="${jsr166e.jar}"/>
1076  </target>
1077
1078  <target name="jsr166e-test-tck"
1079          description="Runs tck tests for jsr166e for multiple java versions">
1080
1081 <!--     <antcall target="clean"/> -->
1082 <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1083 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1084 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1085 <!--     </antcall> -->
1086
1087    <antcall target="clean"/>
1088    <antcall target="jsr166e-test-tck-one-java-version">
1089      <param name="build.jsr166e.java.version" value="7"/>
1090      <param name="build.jsr166e.javac" value="${javac7}"/>
1091    </antcall>
1092
1093    <antcall target="clean"/>
1094    <antcall target="jsr166e-test-tck-one-java-version">
1095      <param name="build.jsr166e.java.version" value="6"/>
1096      <param name="build.jsr166e.javac" value="${javac6}"/>
1097    </antcall>
1098  </target>
1099
1100
1101  <target name="jsr166e-test"
1102          depends="jsr166e-test-tck"
1103          description="Runs all tests for jsr166e">
1104  </target>
1105
1106  <target name="jsr166edist"
1107          depends="jsr166edist-jar, jsr166edist-docs"
1108          description="Puts all distributable products in single hierarchy"/>
1109
1110
1111  <target name="jsr166eclean"
1112          description="Removes all jsr166e build products">
1113    <delete dir="${build.jsr166e.dir}"/>
1114  </target>
1115
1116
1117  <target name="jsr166edist-jar"
1118          depends="jsr166eclean, jsr166ejar">
1119    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1120  </target>
1121
1122  <target name="jsr166edist-docs"
1123          depends="jsr166eclean, jsr166edocs">
1124    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1125  </target>
1126
1127
1128 <!-- Find buglets that can be detected by static build tools -->
1129
1130  <target name="lint">
1131    <antcall target="dists">
1132      <param name="build.javadoc.access" value="public"/>
1133    </antcall>
1134  </target>
1135
1136 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1137  <target name="lint-private">
1138    <antcall target="dist">
1139      <param name="build.javadoc.access" value="private"/>
1140    </antcall>
1141  </target>
1142
1143
844   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines