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.143 by dl, Wed Jul 10 17:09:45 2013 UTC vs.
Revision 1.308 by jsr166, Thu Oct 17 17:28:49 2019 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
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
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 <  where each of the above is a complete JDK source tree
31 <  (e.g. mercurial forest) or a symlink to same.
32 < As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
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 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 <  <target name="usage" description="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 -->
41  <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  
47  <!-- Tck options; see JSR166TestCase.java -->
48  <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49  <property name="jsr166.profileTests"     value="false"/>
50  <property name="jsr166.profileThreshold" value="100"/>
51  <property name="jsr166.runsPerTest"      value="1"/>
52  <!-- Allow running an individual tck test class -->
53  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
54  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
55
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"/>
61  <property name="build.reports.dir"           location="${build.dir}/reports"/>
62
63  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
64  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
65  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
66  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
67
68  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
69  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
70  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
71  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
72
73  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
74  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
75  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
76  <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 81 | Line 71 | As of 2013-02, the very latest lambda 8
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"/>
90 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
91 <    <path id="bootclasspath@{v}">
92 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
93 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
94 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
95 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
96 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
97 <    </path>
98 <    <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 111 | Line 92 | As of 2013-02, the very latest lambda 8
92      </sequential>
93    </macrodef>
94  
95 <  <defjdklocations v="6"/>
96 <  <defjdklocations v="7"/>
97 <  <defjdklocations v="8"/>
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"/>
127  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
128  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
129  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
130  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
131  <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"/>
136 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
137 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
138 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
139 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
140 <
141 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
142 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
143 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
144 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
145 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
146 <  <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"/>
150  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
151  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
152  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
153  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
154  <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 API docs, to use with javadoc link attribute -->
123 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
124 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
125 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
126 <
127 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
128 <  <!-- The below does not yet exist as of 2013-01 -->
129 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
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 >  <!-- 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 <  <!-- Default jdk api doc location (latest stable release seems best) -->
140 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
139 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
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 -->
147    <!-- See the docs in "jtreg -onlineHelp" -->
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=""/>
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 197 | Line 181 | As of 2013-02, the very latest lambda 8
181             source="@{compile-target}"
182             target="@{compile-target}"
183             classpath="${junit.jar}"
200           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
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"/>
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 215 | Line 201 | As of 2013-02, the very latest lambda 8
201            failonerror="true"
202            jvm="${java@{target}}"
203            fork="true">
204 <        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
205 <        <jvmarg line="@{jvmflags}"/>
206 <        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
207 <        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
208 <        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
209 <        <classpath>
210 <          <pathelement location="${junit.jar}"/>
211 <          <pathelement location="@{workdir}/tck-classes"/>
212 <        </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 <    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
234 <    <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"/>
242 <    <mkdir dir="@{workdir}/JTwork/scratch"/>
243 <    <mkdir dir="@{workdir}/JTreport"/>
244 <    <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="-vmoptions:${vmoptions}" if:set="vmoptions"/>
275        <arg value="-agentvm"/>
276 <      <arg value="-v:nopass,fail"/>
276 >      <arg value="-noreport"/>
277 >      <arg value="-verbose:@{verbose}"/>
278        <arg value="-vmoptions:-esa -ea"/>
279        <arg value="-automatic"/>
280        <arg value="-k:!ignore"/>
281        <arg line="@{jtregflags}"/>
282 +      <arg line="${jtreg.flags}"/>
283 +      <jtreg-elements/>
284      </jtreg>
285      </sequential>
286    </macrodef>
# Line 263 | Line 291 | As of 2013-02, the very latest lambda 8
291    </path>
292  
293    <!-- Support @jls tag, used in jdk8+ javadoc -->
294 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
295    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
296    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
297  
298    <!-- Main targets -->
299  
300 +  <!-- Default values: may seem strange ... -->
301 +  <!-- At runtime, target latest LTS, i.e. jdk11 -->
302 +  <!-- But at build time, target jdk9, for maximal binary portability -->
303 +  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
304 +  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
305 +    o override-methods=summary
306 +    o {@systemProperty ...}
307 +    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
308 +    o 8202628: javadoc generates bad links in TestModules.java
309 +    -->
310 +  <property name="java.runtime.target" value="11"/>
311 +  <property name="build.main.java" value="${java11}"/>
312 +  <property name="build.main.javac" value="${javac11}"/>
313 +  <property name="build.main.javadoc" value="${javadoc12}"/>
314 +  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
315 +
316    <target name="dists"
317 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
317 >          depends="dist"
318            description="Builds all public jars and docs"/>
319  
320    <target name="compile"
321            depends="configure-compiler"
322            description="Compiles src/main sources to build dir">
323  
324 <    <mkdir dir="${build.classes.dir}"/>
324 >    <local name="destdir"/>
325 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
326 >
327 >    <mkdir dir="${destdir}"/>
328  
329      <javac srcdir="${src.dir}"
330 <           destdir="${build.classes.dir}"
330 >           destdir="${destdir}"
331             debug="${build.debug}"
332             debuglevel="${build.debuglevel}"
333             deprecation="${build.deprecation}"
334             classpath=""
335             includeAntRuntime="false"
336             includeJavaRuntime="false"
337 <           executable="${javac8}"
337 >           encoding="ASCII"
338 >           executable="${build.main.javac}"
339             fork="true">
340  
341        <include name="**/*.java"/>
342 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
343        <compilerarg value="-Xprefer:source"/>
344        <compilerarg value="-XDignore.symbol.file=true"/>
345 <      <compilerarg value="-Xlint:all"/>
345 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
346 >      <compilerarg value="-Xlint:all,-removal"/>
347 >      <compilerarg line="--doclint-format html5"/>
348 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
349 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
350 >      <compilerarg value="-Werror"/>
351 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
352        <compilerarg line="${build.args}"/>
353  
354      </javac>
# Line 301 | Line 357 | As of 2013-02, the very latest lambda 8
357  
358    <target name="jar"
359            depends="compile"
360 <          description="Builds library jar from compiled sources">
361 <
360 >          description="Builds library jar for src/main from compiled sources">
361 >    <local name="subdir"/>
362 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
363      <jar destfile="${product.jar}">
364 <      <fileset dir="${build.classes.dir}"/>
364 >      <fileset dir="${build.classes.dir}${subdir}"/>
365 >      <manifest>
366 >        <attribute name="Built-By" value="${user.name}"/>
367 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
368 >      </manifest>
369      </jar>
370    </target>
371  
# Line 312 | Line 373 | As of 2013-02, the very latest lambda 8
373    <target name="docs"
374            description="Builds javadocs for src/main to dist dir">
375  
376 <    <delete dir="${docs.dir}"/>
376 >    <delete dir="${docs.dir}" quiet="true"/>
377      <mkdir dir="${docs.dir}"/>
378  
379 +    <!-- old school frames via docs/index.html?overview-summary.html -->
380 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
381 +    <local name="use-frames"/>
382 +    <condition property="use-frames">
383 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
384 +    </condition>
385 +
386      <!-- the packagenames="none" hack below prevents scanning the -->
387      <!-- sourcepath for packages -->
388  
389 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
390 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
391 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
392 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
393 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
394      <javadoc destdir="${docs.dir}"
395               packagenames="none"
396 <             link="${jdkapi8docs.url}"
396 >             link="${java.api.url}"
397               overview="${src.dir}/intro.html"
398               access="${build.javadoc.access}"
399 <             sourcepath="${src.dir}:${jdk8src.dir}"
399 >             sourcepath="${src.dir}"
400               classpath=""
401 <             executable="${javadoc8}">
401 >             source="${build.main.javadoc.source}"
402 >             executable="${build.main.javadoc}">
403 > <!-- TODO: JDK-8214571 failonerror = "true" -->
404        <fileset dir="${src.dir}" defaultexcludes="yes">
405          <include name="**/*.java"/>
406        </fileset>
407 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
408 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
409 +      <arg value="-quiet"/>
410        <arg value="-XDignore.symbol.file=true"/>
411 <      <arg value="-tag"/>
412 <      <arg value="${javadoc.jls.option}"/>
413 <      <arg value="-tag"/>
414 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
415 <      <arg value="-tag"/>
416 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
417 <      <arg value="-tag"/>
418 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
411 >      <arg value="-html5"/>
412 >      <arg value="--patch-module=java.base=${src.dir}"/>
413 >      <arg value="--frames" if:set="use-frames"/>
414 >      <arg value="--override-methods=summary"/>
415 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
416 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
417 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
418 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
419 > <!-- tags added in jdk9: currently unused -->
420 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
421 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
422      </javadoc>
423    </target>
424  
# Line 347 | Line 428 | As of 2013-02, the very latest lambda 8
428            description="Puts all distributable products in single hierarchy"/>
429  
430  
350  <target name="release"
351          depends="dist"
352          description="Puts entire CVS tree, plus distribution productions, in a jar">
353
354    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
355
356    <jar basedir="${basedir}" destfile="${release.jar}">
357      <!-- <exclude name="build/**"/> -->
358      <exclude name="${release.jar}"/>
359      <exclude name="user.properties"/>
360      <exclude name="etc/notes/**"/>
361      <exclude name="src/emulation/**"/>
362      <exclude name="**/SyntaxTest.java"/>
363      <exclude name="**/SuperfluousAbstract.java"/>
364    </jar>
365  </target>
366
367
431    <target name="clean"
432            description="Removes all build products">
370
433      <delete dir="${build.dir}"/>
372
434    </target>
435  
436  
437    <target name="dist-clean"
438            description="Removes all build and distribution products">
439 <
439 >    <delete dir="${build.dir}"/>
440      <delete dir="${dist.dir}"/>
380
441    </target>
442  
443  
# Line 391 | Line 451 | As of 2013-02, the very latest lambda 8
451      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
452    </target>
453  
454 <
455 <  <target name="test-tck"
456 <          depends="jar"
397 <          description="Runs tck tests for main directly">
454 >  <target name="tck"
455 >          depends="jar"
456 >          description="Runs tck tests for src/main directly">
457  
458      <run-tck-tests
459 <      target="8"
459 >      target="${java.runtime.target}"
460        workdir="${build.dir}"
461 <      classes="${product.jar}"/>
403 <  </target>
404 <
405 <  <target name="test-jtreg"
406 <          depends="jar"
407 <          description="Runs jtreg tests for main using the jtreg ant task">
408 <    <run-jtreg-tests
409 <       target="8"
410 <       workdir="${build.dir}"
411 <       classes="${product.jar}"/>
412 <  </target>
413 <
414 <  <target name="test"
415 <          depends="test-tck, test-jtreg"
416 <          description="Runs tck and jtreg tests for main">
417 <  </target>
418 <
419 <
420 <
421 <  <target name="configure-compiler">
422 <
423 <    <property name="unchecked.option" value="-Xlint:unchecked"/>
424 <
425 <    <condition property="warnunchecked.arg" value="${unchecked.option}">
426 <      <istrue value="${build.warnunchecked}"/>
427 <    </condition>
428 <
429 <    <property name="warnunchecked.arg" value=""/>
430 <
431 <
432 <    <!-- Common options in javac invocations -->
433 <    <property name="build.args" value="${warnunchecked.arg}"/>
434 <
435 <  </target>
436 <
437 <
438 <
439 <  <!-- Various demos and test programs -->
440 <
441 <
442 <  <target name="loops" depends="configure-compiler"
443 <          description="Benchmark from Doug Lea's AQS paper">
444 <
445 <    <mkdir dir="${build.loops.dir}"/>
446 <
447 <    <javac srcdir="${loops.src.dir}"
448 <          destdir="${build.loops.dir}"
449 <            debug="${build.debug}"
450 <       debuglevel="${build.debuglevel}"
451 <      deprecation="${build.deprecation}"
452 <           source="${build.sourcelevel}"
453 <             fork="true">
454 <
455 <      <compilerarg line="${build.args}"/>
456 <      <classpath refid="loops.classpath"/>
457 <      <compilerarg value="-XDignore.symbol.file=true"/>
458 <
459 <    </javac>
460 <
461 <    <java classname="ALoops" fork="true">
462 <      <classpath refid="loops.classpath"/>
463 <    </java>
464 <
465 <  </target>
466 <
467 <
468 <  <!-- jsr166 4jdk7 -->
469 <
470 <  <target name="4jdk7compile"
471 <          depends="configure-compiler"
472 <          description="Compiles src/jdk7 sources, targeting jdk7">
473 <
474 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
475 <
476 <    <javac srcdir="${4jdk7src.dir}"
477 <           destdir="${build.4jdk7.classes.dir}"
478 <           debug="${build.debug}"
479 <           debuglevel="${build.debuglevel}"
480 <           deprecation="${build.deprecation}"
481 <           source="6"
482 <           classpath=""
483 <           bootclasspath="${bootclasspath6}"
484 <           includeAntRuntime="false"
485 <           includeJavaRuntime="false"
486 <           executable="${javac7}"
487 <           fork="true">
488 <
489 <      <include name="**/*.java"/>
490 <      <compilerarg value="-Xprefer:source"/>
491 <      <compilerarg value="-XDignore.symbol.file=true"/>
492 <      <compilerarg value="-Xlint:all"/>
493 <      <compilerarg line="${build.args}"/>
494 <
495 <    </javac>
496 <  </target>
497 <
498 <
499 <  <target name="4jdk7jar"
500 <          depends="4jdk7compile"
501 <          description="Builds library jar from compiled sources">
502 <
503 <    <jar destfile="${4jdk7product.jar}">
504 <      <fileset dir="${build.4jdk7.classes.dir}"/>
505 <    </jar>
506 <
507 <  </target>
508 <
509 <
510 <  <target name="4jdk7-test-tck"
511 <          depends="4jdk7jar"
512 <          description="Runs tck tests for jsr166-4jdk7 directly">
513 <
514 <    <run-tck-tests
515 <      target="7"
516 <      workdir="${build.4jdk7.dir}"
517 <      classes="${4jdk7product.jar}">
461 >      classes="${product.jar}">
462        <javac-elements>
463 <        <!-- JDK8+ test classes -->
520 <        <exclude name="*8Test.java"/>
521 <        <exclude name="DoubleAccumulatorTest.java"/>
522 <        <exclude name="DoubleAdderTest.java"/>
523 <        <exclude name="LongAccumulatorTest.java"/>
524 <        <exclude name="LongAdderTest.java"/>
525 <        <exclude name="CompletableFutureTest.java"/>
526 <        <exclude name="StampedLockTest.java"/>
463 >        <compilerarg value="-Werror"/>
464        </javac-elements>
465      </run-tck-tests>
466    </target>
467  
468 <
469 <  <target name="4jdk7-test-tck-junit"
470 <          depends="4jdk7compile"
471 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
472 <
536 <    <junit printsummary="true"
537 <           showoutput="true"
538 <           errorProperty="junit.failed"
539 <           failureProperty="junit.failed"
540 <           includeantruntime="true"
541 <           jvm="${java7}"
542 <           fork="true">
543 <
544 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
545 <      <jvmarg value="-server"/>
546 <
547 <      <classpath>
548 <        <pathelement location="${junit.jar}"/>
549 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
550 <      </classpath>
551 <
552 <      <formatter type="brief"/>
553 <
554 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
555 <      </test>
556 <
557 <    </junit>
558 <  </target>
559 <
560 <  <target name="4jdk7-test-jtreg"
561 <          depends="4jdk7jar"
562 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
563 <    <run-jtreg-tests
564 <       target="7"
565 <       workdir="${build.4jdk7.dir}"
566 <       classes="${4jdk7product.jar}"
567 <       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
568 <  </target>
569 <
570 <
571 <  <target name="4jdk7-test"
572 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
573 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
574 <  </target>
575 <
576 <
577 <  <target name="4jdk7docs"
578 <          description="Builds javadocs for src/jdk7 to dist dir">
579 <
580 <    <delete dir="${4jdk7docs.dir}"/>
581 <    <mkdir dir="${4jdk7docs.dir}"/>
582 <
583 <    <javadoc destdir="${4jdk7docs.dir}"
584 <             packagenames="none"
585 <             link="${jdkapi7docs.url}"
586 <             overview="${4jdk7src.dir}/intro.html"
587 <             access="${build.javadoc.access}"
588 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
589 <             classpath=""
590 <             executable="${javadoc7}">
591 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
592 <        <include name="**/*.java"/>
593 <      </fileset>
594 <      <arg value="-XDignore.symbol.file=true"/>
595 <    </javadoc>
596 <  </target>
597 <
598 <
599 <  <target name="4jdk7dist"
600 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
601 <          description="Puts all distributable products in single hierarchy"/>
602 <
603 <
604 <  <target name="4jdk7clean"
605 <          description="Removes all 4jdk7 build products">
606 <
607 <    <delete dir="${build.4jdk7.dir}"/>
608 <
609 <  </target>
610 <
611 <
612 <  <target name="4jdk7dist-clean"
613 <          description="Removes all build and distribution products">
614 <
615 <  </target>
616 <
617 <  <target name="4jdk7dist-jar"
618 <          depends="4jdk7clean, 4jdk7jar">
619 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
468 >  <target name="tck-parallelism-1"
469 >          description="Runs tck with common pool parallelism 1">
470 >    <antcall target="tck">
471 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
472 >    </antcall>
473    </target>
474  
475 <
476 <  <target name="4jdk7dist-docs"
477 <          depends="4jdk7clean, 4jdk7docs">
478 <    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
475 >  <target name="tck-parallelism-0"
476 >          description="Runs tck with common pool parallelism 0">
477 >    <antcall target="tck">
478 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
479 >    </antcall>
480    </target>
481  
482 <
483 <  <!-- jsr166x -->
484 <
485 <  <target name="jsr166xcompile"
486 <          depends="configure-compiler"
633 <          description="Compiles jsr166x sources to build dir">
634 <
635 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
636 <
637 <    <javac srcdir="${topsrc.dir}"
638 <           destdir="${build.jsr166x.classes.dir}"
639 <           debug="${build.debug}"
640 <           debuglevel="${build.debuglevel}"
641 <           deprecation="${build.deprecation}"
642 <           classpath=""
643 <           bootclasspath="${bootclasspath6}"
644 <           source="5"
645 <           includeAntRuntime="false"
646 <           includeJavaRuntime="false"
647 <           executable="${javac7}"
648 <           fork="true">
649 <
650 <      <include name="jsr166x/**/*.java"/>
651 <      <compilerarg value="-XDignore.symbol.file=true"/>
652 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
653 <      <compilerarg line="${build.args}"/>
654 <
655 <    </javac>
482 >  <target name="tck-security-manager"
483 >          description="Runs tck with a security manager">
484 >    <antcall target="tck">
485 >      <param name="jsr166.useSecurityManager" value="true"/>
486 >    </antcall>
487    </target>
488  
489 <
490 <  <target name="jsr166xjar"
491 <          depends="jsr166xcompile"
492 <          description="Builds library jar from compiled sources">
493 <
494 <    <jar destfile="${jsr166x.jar}">
495 <      <fileset dir="${build.jsr166x.classes.dir}"/>
665 <    </jar>
666 <
489 >  <target name="jtreg"
490 >          depends="jar"
491 >          description="Runs jtreg tests for src/main using the jtreg ant task">
492 >    <run-jtreg-tests
493 >       target="${java.runtime.target}"
494 >       workdir="${build.dir}"
495 >       classes="${product.jar}"/>
496    </target>
497  
498 +  <target name="test"
499 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
500 +          description="Runs tck and jtreg tests for src/main"/>
501  
502 <  <target name="jsr166xdocs"
503 <          description="Builds javadocs to dist dir">
672 <
673 <    <delete dir="${jsr166xdocs.dir}"/>
674 <    <mkdir dir="${jsr166xdocs.dir}"/>
675 <
676 <    <javadoc destdir="${jsr166xdocs.dir}"
677 <             packagenames="jsr166x.*"
678 <             link="${jdkapidocs.url}"
679 <             access="${build.javadoc.access}"
680 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
681 <             bootclasspath="${bootclasspath6}"
682 <             source="5"
683 <             executable="${javadoc7}">
684 <      <arg value="-XDignore.symbol.file=true"/>
685 <
686 <    </javadoc>
502 >  <target name="test-version-permutations"
503 >          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
504    </target>
505  
506 <
507 <  <target name="jsr166xdist"
508 <          depends="jsr166xdist-jar, jsr166xdist-docs"
509 <          description="Puts all distributable products in single hierarchy"/>
510 <
511 <
512 <  <target name="jsr166xclean"
513 <          description="Removes all jsr166x build products">
514 <
515 <    <delete dir="${build.jsr166x.dir}"/>
699 <
506 >  <target name="test11">
507 >    <antcall>
508 >      <param name="java.runtime.target" value="11"/>
509 >      <param name="build.main.javac" value="${javac11}"/>
510 >      <param name="build.main.javadoc" value="${javadoc12}"/>
511 >      <param name="build.main.javadoc.source" value="11"/>
512 >      <target name="clean"/>
513 >      <target name="test"/>
514 >      <target name="docs"/>
515 >    </antcall>
516    </target>
517  
518 <
519 <  <target name="jsr166xdist-clean"
520 <          description="Removes all build and distribution products">
521 <
518 >  <target name="test12">
519 >    <antcall>
520 >      <param name="java.runtime.target" value="12"/>
521 >      <param name="build.main.javac" value="${javac12}"/>
522 >      <param name="build.main.javadoc" value="${javadoc12}"/>
523 >      <param name="build.main.javadoc.source" value="12"/>
524 >      <target name="clean"/>
525 >      <target name="test"/>
526 >      <target name="docs"/>
527 >    </antcall>
528    </target>
529  
530 <
531 <  <target name="jsr166xdist-jar"
532 <          depends="jsr166xclean, jsr166xjar">
533 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
530 >  <target name="test13">
531 >    <antcall>
532 >      <param name="java.runtime.target" value="13"/>
533 >      <param name="build.main.javac" value="${javac13}"/>
534 >      <param name="build.main.javadoc" value="${javadoc13}"/>
535 >      <param name="build.main.javadoc.source" value="13"/>
536 >      <target name="clean"/>
537 >      <target name="test"/>
538 >      <target name="docs"/>
539 >    </antcall>
540    </target>
541  
542 <  <target name="jsr166xdist-docs"
543 <          depends="jsr166xclean, jsr166xdocs">
544 <    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
542 >  <target name="test14">
543 >    <antcall>
544 >      <param name="java.runtime.target" value="14"/>
545 >      <param name="build.main.javac" value="${javac14}"/>
546 >      <param name="build.main.javadoc" value="${javadoc14}"/>
547 >      <param name="build.main.javadoc.source" value="14"/>
548 >      <target name="clean"/>
549 >      <target name="test"/>
550 >      <target name="docs"/>
551 >    </antcall>
552    </target>
553  
554 <  <!-- jsr166y -->
555 <
556 <
557 <  <target name="jsr166ycompile"
558 <          depends="configure-compiler"
559 <          description="Compiles jsr166y sources">
560 <
561 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
562 <
563 <    <javac srcdir="${topsrc.dir}"
729 <           destdir="${build.jsr166y.classes.dir}"
730 <           debug="${build.debug}"
731 <           debuglevel="${build.debuglevel}"
732 <           deprecation="${build.deprecation}"
733 <           source="6"
734 <           classpath=""
735 <           bootclasspath="${bootclasspath6}"
736 <           includeAntRuntime="false"
737 <           includeJavaRuntime="false"
738 <           executable="${javac7}"
739 <           fork="true">
740 <
741 <      <include name="jsr166y/**/*.java"/>
742 <      <compilerarg value="-XDignore.symbol.file=true"/>
743 <      <compilerarg value="-Xlint:all"/>
744 <      <compilerarg line="${build.args}"/>
745 <
746 <    </javac>
554 >  <target name="test11-12">
555 >    <antcall>
556 >      <param name="java.runtime.target" value="12"/>
557 >      <param name="build.main.javac" value="${javac11}"/>
558 >      <param name="build.main.javadoc" value="${javadoc12}"/>
559 >      <param name="build.main.javadoc.source" value="11"/>
560 >      <target name="clean"/>
561 >      <target name="test"/>
562 >      <target name="docs"/>
563 >    </antcall>
564    </target>
565  
566 <
567 <  <target name="jsr166yjar"
568 <          depends="jsr166ycompile"
569 <          description="Builds library jar from compiled sources">
570 <
571 <    <jar destfile="${jsr166y.jar}" index="true">
572 <      <fileset dir="${build.jsr166y.classes.dir}"/>
573 <    </jar>
574 <
566 >  <target name="test11-13">
567 >    <antcall>
568 >      <param name="java.runtime.target" value="13"/>
569 >      <param name="build.main.javac" value="${javac11}"/>
570 >      <param name="build.main.javadoc" value="${javadoc13}"/>
571 >      <param name="build.main.javadoc.source" value="11"/>
572 >      <target name="clean"/>
573 >      <target name="test"/>
574 >      <target name="docs"/>
575 >    </antcall>
576    </target>
577  
578 <
579 <  <target name="jsr166ydocs"
580 <          description="Builds javadocs to dist dir">
581 <
582 <    <delete dir="${jsr166ydocs.dir}"/>
583 <    <mkdir dir="${jsr166ydocs.dir}"/>
584 <
585 <    <javadoc destdir="${jsr166ydocs.dir}"
586 <             packagenames="jsr166y.*"
587 <             link="${jdkapidocs.url}"
770 <             access="${build.javadoc.access}"
771 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
772 <             bootclasspath="${bootclasspath6}"
773 <             source="6"
774 <             executable="${javadoc7}">
775 <      <arg value="-XDignore.symbol.file=true"/>
776 <
777 <    </javadoc>
578 >  <target name="test11-14">
579 >    <antcall>
580 >      <param name="java.runtime.target" value="14"/>
581 >      <param name="build.main.javac" value="${javac11}"/>
582 >      <param name="build.main.javadoc" value="${javadoc14}"/>
583 >      <param name="build.main.javadoc.source" value="11"/>
584 >      <target name="clean"/>
585 >      <target name="test"/>
586 >      <target name="docs"/>
587 >    </antcall>
588    </target>
589  
590  
591 <  <target name="jsr166ydist"
592 <          depends="jsr166ydist-jar, jsr166ydist-docs"
593 <          description="Puts all distributable products in single hierarchy"/>
594 <
785 <
786 <  <target name="jsr166yclean"
787 <          description="Removes all jsr166y build products">
788 <
789 <    <delete dir="${build.jsr166y.dir}"/>
591 >  <target name="configure-compiler">
592 >    <fail message="ant version too old">
593 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
594 >    </fail>
595  
596 <  </target>
596 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
597  
598 +    <condition property="warnunchecked.arg" value="${unchecked.option}">
599 +      <istrue value="${build.warnunchecked}"/>
600 +    </condition>
601  
602 <  <target name="jsr166ydist-clean"
795 <          description="Removes all build and distribution products">
602 >    <property name="warnunchecked.arg" value=""/>
603  
797  </target>
604  
605 <  <target name="jsr166ydist-jar"
606 <          depends="jsr166yclean, jsr166yjar">
801 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
802 <  </target>
605 >    <!-- Common options in javac invocations -->
606 >    <property name="build.args" value="${warnunchecked.arg}"/>
607  
804  <target name="jsr166ydist-docs"
805          depends="jsr166yclean, jsr166ydocs">
806    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
608    </target>
609  
610  
611 <  <!-- extra166y -->
612 <
812 <
813 <  <target name="extra166ycompile"
814 <          depends="configure-compiler, jsr166yjar"
815 <          description="Compiles extra166y sources">
611 >  <target name="compile-test-loops" depends="jar"
612 >          description="Compiles all the perf tests in src/test/loops">
613  
614 <    <mkdir dir="${build.extra166y.classes.dir}"/>
614 >    <mkdir dir="${build.dir}/test/loops"/>
615  
616 <    <javac srcdir="${topsrc.dir}"
617 <           destdir="${build.extra166y.classes.dir}"
616 >    <javac srcdir="${basedir}/src/test/loops"
617 >           destdir="${build.dir}/test/loops"
618             debug="${build.debug}"
619             debuglevel="${build.debuglevel}"
620             deprecation="${build.deprecation}"
824           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
825           classpath=""
826           source="6"
621             includeAntRuntime="false"
622             includeJavaRuntime="false"
623 <           executable="${javac7}"
623 >           encoding="ASCII"
624 >           executable="${build.main.javac}"
625             fork="true">
626  
627 <      <include name="extra166y/**/*.java"/>
627 >      <include name="*.java"/>
628        <compilerarg value="-XDignore.symbol.file=true"/>
629 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
629 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
630 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
631        <compilerarg line="${build.args}"/>
836
632      </javac>
633    </target>
634  
635  
636 <  <target name="extra166yjar"
637 <          depends="extra166ycompile"
638 <          description="Builds library jar from compiled sources">
639 <
640 <    <jar destfile="${extra166y.jar}" index="true">
641 <      <fileset dir="${build.extra166y.classes.dir}"/>
642 <    </jar>
848 <
849 <  </target>
850 <
851 <
852 <  <target name="extra166ydocs"
853 <          description="Builds javadocs to build dir">
854 <
855 <    <delete dir="${extra166ydocs.dir}"/>
856 <    <mkdir dir="${extra166ydocs.dir}"/>
857 <
858 <    <javadoc destdir="${extra166ydocs.dir}"
859 <             packagenames="extra166y.*"
860 <             link="${jdkapidocs.url}"
861 <             access="${build.javadoc.access}"
862 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
863 <             bootclasspath="${bootclasspath6}"
864 <             source="6"
865 <             executable="${javadoc7}">
866 <      <arg value="-XDignore.symbol.file=true"/>
867 <
868 <    </javadoc>
869 <  </target>
870 <
871 <
872 <  <target name="extra166ydist"
873 <          depends="extra166ydist-jar, extra166ydist-docs"
874 <          description="Puts all distributable products in single hierarchy"/>
875 <
876 <
877 <  <target name="extra166yclean"
878 <          description="Removes all extra166y build products">
879 <
880 <    <delete dir="${build.extra166y.dir}"/>
881 <
882 <  </target>
883 <
884 <
885 <  <target name="extra166ydist-clean"
886 <          description="Removes all build and distribution products">
636 >  <!-- old branches no longer maintained.  build support deleted -->
637 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
638 >  <!-- jsr166 4jdk7 (no longer maintained) -->
639 >  <!-- jsr166x (no longer maintained) -->
640 >  <!-- jsr166y (no longer maintained) -->
641 >  <!-- extra166y (no longer maintained) -->
642 >  <!-- jsr166e (no longer maintained) -->
643  
644 <  </target>
889 <
890 <  <target name="extra166ydist-jar"
891 <          depends="extra166yclean, extra166yjar">
892 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
893 <  </target>
644 > <!-- Find buglets that can be detected by static build tools -->
645  
646 <  <target name="extra166ydist-docs"
647 <          depends="extra166yclean, extra166ydocs">
648 <    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
646 > <!--   <target name="lint"> -->
647 > <!--     <antcall target="dists"> -->
648 > <!--       <param name="build.javadoc.access" value="protected"/> -->
649 > <!--     </antcall> -->
650 > <!--   </target> -->
651 >
652 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
653 >  <target name="doclint-private">
654 >    <antcall target="dist">
655 >      <param name="build.javadoc.access" value="private"/>
656 >    </antcall>
657    </target>
658  
900  <!-- jsr166e -->
901
902  <target name="jsr166ecompile"
903          depends="configure-compiler"
904          description="Compiles jsr166e sources">
659  
660 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
660 > <!-- ==============================================================
661 >  Experimental errorprone support
662 >  https://errorprone.info
663 >  https://errorprone.info/docs/installation
664 >  https://github.com/google/error-prone/issues/1143
665 > =================================================================== -->
666 >  <path id="errorprone.processorpath.path">
667 >    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
668 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
669 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
670 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
671 >  </path>
672 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
673 >  <property name="errorprone.jsr166.user.flags" value=""/>
674 >  <property name="errorprone.jsr166.flags"
675 >            value="-Xep:HashtableContains:OFF
676 >                   -Xep:JdkObsolete:OFF
677 >                   -Xep:MissingOverride:OFF
678 >                   -Xep:MissingFail:OFF
679 >                   -Xep:ThreadPriorityCheck:OFF
680 >                   -Xep:MixedArrayDimensions:ERROR
681 >                   -Xep:RemoveUnusedImports:ERROR
682 >                   -Xep:EmptyIf:ERROR
683 >                   -Xep:MultipleTopLevelClasses:ERROR
684 >                   -Xep:ClassName:ERROR
685 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
686 >                   -Xep:RedundantThrows:ERROR
687 >                   -Xep:IdentityBinaryExpression:WARN
688 >                   -Xep:ConstructorInvokesOverridable:WARN
689 >                   -Xep:MethodCanBeStatic:WARN
690 >                   ${errorprone.jsr166.user.flags}"/>
691 >  <!-- -Xep:WildcardImport:ERROR -->
692 >  <property name="errorprone.jsr166.test.flags"
693 >            value="-Xep:StringSplitter:OFF
694 >                   -Xep:BoxedPrimitiveConstructor:OFF
695 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
696 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
697 >  <target name="errorprone"
698 >          depends="clean, configure-compiler"
699 >          description="Run errorprone over jsr166 source code (experimental)">
700 >
701 >    <local name="destdir"/>
702 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
703 >    <mkdir dir="${destdir}"/>
704  
705 <    <javac srcdir="${topsrc.dir}"
706 <           destdir="${build.jsr166e.classes.dir}"
705 >    <javac srcdir="${src.dir}"
706 >           destdir="${destdir}"
707             debug="${build.debug}"
708             debuglevel="${build.debuglevel}"
709             deprecation="${build.deprecation}"
913           source="7"
710             classpath=""
711             includeAntRuntime="false"
712             includeJavaRuntime="false"
713 <           executable="${javac7}"
713 >           encoding="ASCII"
714 >           executable="${build.main.javac}"
715             fork="true">
716  
717 <      <include name="jsr166e/**/*.java"/>
717 >      <include name="**/*.java"/>
718 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
719 >      <compilerarg value="-J--illegal-access=permit"/>
720 >      <compilerarg value="-XDcompilePolicy=simple"/>
721 >      <compilerarg value="-processorpath"/>
722 >      <compilerarg pathref="errorprone.processorpath.path"/>
723 >      <compilerarg value="-Xplugin:ErrorProne
724 >                          ${errorprone.jsr166.flags}"/>
725 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
726 >      <compilerarg value="-Xprefer:source"/>
727        <compilerarg value="-XDignore.symbol.file=true"/>
728        <compilerarg value="-Xlint:all"/>
729 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
730 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
731        <compilerarg line="${build.args}"/>
924
732      </javac>
926  </target>
927
928
929  <target name="jsr166ejar"
930          depends="jsr166ecompile"
931          description="Builds library jar from compiled sources">
733  
734 <    <jar destfile="${jsr166e.jar}" index="true">
735 <      <fileset dir="${build.jsr166e.classes.dir}"/>
734 >    <jar destfile="${product.jar}">
735 >      <fileset dir="${destdir}"/>
736      </jar>
737  
937  </target>
938
939
940  <target name="jsr166edocs"
941          description="Builds javadocs to build dir">
942
943    <delete dir="${jsr166edocs.dir}"/>
944    <mkdir dir="${jsr166edocs.dir}"/>
945
946    <javadoc destdir="${jsr166edocs.dir}"
947             packagenames="jsr166e.*"
948             link="${jdkapidocs.url}"
949             access="${build.javadoc.access}"
950             sourcepath="${topsrc.dir}:${jdk7src.dir}"
951             source="7"
952             executable="${javadoc7}">
953      <arg value="-XDignore.symbol.file=true"/>
954
955    </javadoc>
956  </target>
957
958
959  <target name="jsr166e-test-tck"
960          depends="jsr166ejar"
961          description="Runs tck tests for jsr166e">
962
738      <run-tck-tests
739 <      tck.src.dir="${test.src.dir}/tck-jsr166e"
740 <      target="7"
741 <      workdir="${build.jsr166e.dir}"
742 <      classes="${jsr166e.jar}"/>
743 <  </target>
744 <
745 <
746 <  <target name="jsr166edist"
747 <          depends="jsr166edist-jar, jsr166edist-docs"
748 <          description="Puts all distributable products in single hierarchy"/>
749 <
750 <
751 <  <target name="jsr166eclean"
752 <          description="Removes all jsr166e build products">
978 <    <delete dir="${build.jsr166e.dir}"/>
979 <  </target>
980 <
981 <
982 <  <target name="jsr166edist-clean"
983 <          description="Removes all build and distribution products">
984 <
985 <  </target>
986 <
987 <  <target name="jsr166edist-jar"
988 <          depends="jsr166eclean, jsr166ejar">
989 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
990 <  </target>
991 <
992 <  <target name="jsr166edist-docs"
993 <          depends="jsr166eclean, jsr166edocs">
994 <    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
739 >      target="${java.runtime.target}"
740 >      workdir="${build.dir}"
741 >      classes="${product.jar}">
742 >      <javac-elements>
743 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
744 >        <compilerarg value="-J--illegal-access=permit"/>
745 >        <compilerarg value="-XDcompilePolicy=simple"/>
746 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
747 >        <compilerarg value="-Xplugin:ErrorProne
748 >                            ${errorprone.jsr166.flags}
749 >                            ${errorprone.jsr166.test.flags}"/>
750 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
751 >      </javac-elements>
752 >    </run-tck-tests>
753    </target>
754  
755 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
756 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
757 +  <target name="errorprone-jtreg"
758 +          depends="jar"
759 +          description="Run errorprone over jtreg tests (experimental)">
760  
761 < <!-- Find buglets that can be detected by static build tools -->
761 >    <run-jtreg-tests
762 >       target="${java.runtime.target}"
763 >       workdir="${build.dir}"
764 >       classes="${product.jar}"
765 >       verbose="all">
766 >      <jtreg-elements>
767 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
768 >        <arg value="-javacoption:-processorpath"/>
769 >        <arg value="-javacoption:${errorprone.processorpath}"/>
770 >        <arg value="-javacoption:-Xplugin:ErrorProne
771 >                            ${errorprone.jsr166.flags}
772 >                            ${errorprone.jsr166.test.flags}
773 >                            -Xep:MultipleTopLevelClasses:WARN
774 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
775 >      </jtreg-elements>
776 >    </run-jtreg-tests>
777 >  </target>
778 >
779 >
780 > <!-- ==============================================================
781 >  Running guava tests against jsr166 code
782 > =================================================================== -->
783 >
784 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
785 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
786 > <!-- <property name="guava.version" value="21.0"/> -->
787 >
788 > <!-- HOWTO debug print a path id -->
789 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
790 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
791 >
792 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
793 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
794 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
795 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
796 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
797 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
798 >
799 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
800 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
801 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
802 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
803 >
804 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
805 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
806 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
807 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
808 >
809 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
810 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
811 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
812 >
813 >  <target name="init-ivy">
814 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
815 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
816 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
817 >             classpath="${build.dir}/ivy.jar"/>
818 >  </target>
819 >
820 >  <target name="guava-tests" depends="jar, init-ivy"
821 >          description="Guava tests run against jsr166 collections">
822 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
823 >    <mkdir dir="${guava.dir}"/>
824 >    <ivy:retrieve pathid="guava.testlib.classpath"
825 >      type="jar,bundle" inline="true" conf="default,master"
826 >      pattern="${guava.dir}/[artifact].[ext]"
827 >      organisation="com.google.guava" module="guava-testlib"/>
828 >    <property name="guava.version" value="21.0"/>
829 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
830 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
831 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
832 >           jvm="${build.main.java}" fork="true">
833 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
834 >      <formatter type="brief"/>
835 >      <classpath>
836 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
837 >        <path refid="guava.testlib.classpath"/>
838 >      </classpath>
839  
840 <  <target name="lint">
841 <    <antcall target="dists">
842 <      <param name="build.javadoc.access" value="private"/>
1003 <    </antcall>
840 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
841 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
842 >    </junit>
843    </target>
844  
1006
845   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines