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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines