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.199 by jsr166, Fri Mar 25 03:36:15 2016 UTC vs.
Revision 1.326 by jsr166, Fri Nov 25 19:33:39 2022 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless">
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 7 | 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 14 | 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
19 <  $HOME/jdk/jdk8
20 <  $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
24 <  $HOME/jdk/src/jdk8
25 <  $HOME/jdk/src/jdk9
26 <  where each of the above is a complete JDK source tree
27 <  (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 6 7 8 9 ...
30 >  for $N in 17 .. 19 ...
31  
32 <  As of 2015-09, there is incomplete hacky support for jigsaw
33 <  Build for jigsaw using something like:
34 <  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist
35 <  "docs" target is still broken.
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" />
# Line 51 | Line 50
50  
51  
52    <!-- Compilation options -->
54  <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"/>
# Line 62 | Line 60
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"/>
65  <property name="build.reports.dir"           location="${build.dir}/reports"/>
66
67  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
69  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71
72  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
73  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
74  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
75  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
76
77  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
78  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
79  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
80  <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 90 | Line 72
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 <    <local name="have.java.base"/>
94 <    <available property="have.java.base"
95 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
96 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
97 <      if:set="have.java.base"/>
98 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
99 <      unless:set="have.java.base"/>
100 <    <local name="modules"/>
101 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
102 <    <local name="boot.jar.dir"/>
103 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
104 <    <path id="bootclasspath@{v}" unless:set="modules">
105 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
106 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
107 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
108 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
109 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
110 <    </path>
111 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
75 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
76      </sequential>
77    </macrodef>
78  
# Line 124 | Line 88
88      </sequential>
89    </macrodef>
90  
91 <  <defjdklocations v="6"/>
92 <  <defjdklocations v="7"/>
93 <  <defjdklocations v="8"/>
130 <  <defjdklocations v="9"/>
91 >  <defjdklocations v="17"/>
92 >  <defjdklocations v="18"/>
93 >  <defjdklocations v="19"/>
94  
95    <!-- Source locations -->
96    <property name="src.dir"              location="${basedir}/src/main"/>
97    <property name="test.src.dir"         location="${basedir}/src/test"/>
98    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
99    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
100 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
101 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
102 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
103 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
100 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
101 >  <property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
102 >  <property name="jtreg19.src.dir"      location="${test.src.dir}/jtreg"/>
103 >  <property name="jtreg.src.dir"        location="${jtreg17.src.dir}"/>
104    <property name="lib.dir"              location="${basedir}/lib"/>
105    <property name="dist.dir"             location="${basedir}/dist"/>
106    <property name="topsrc.dir"           location="${basedir}/src"/>
144  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
145  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
146  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
147  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
148  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
107  
108    <!-- Javadoc locations -->
109    <property name="docs.dir"          location="${build.dir}/docs"/>
110 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
153 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
154 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
155 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
156 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
157 <
158 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
159 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
160 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
161 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
162 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
163 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
110 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
111  
112    <!-- Jar locations -->
113    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
167  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
168  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
169  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
170  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
171  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
114    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
115  
116    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
117 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
118 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
119 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
120 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
121 <  <!-- The expected canonical location does not yet exist as of 2015-11 -->
122 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
181 <  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
182 <  <!-- Default jdk doc location (latest stable release seems best) -->
183 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
117 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
118 >  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
119 >  <property name="java18.docroot.url" value="https://download.java.net/java/early_access/jdk18/docs"/>
120 >  <property name="java19.docroot.url" value="https://download.java.net/java/early_access/jdk19/docs"/>
121 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
122 >  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
123  
124    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
125 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
126 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
127 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
189 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
190 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
125 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
126 >  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
127 >  <property name="java19.api.url"     value="${java19.docroot.url}/api/"/>
128    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
129  
130    <!-- Define the "jtreg" task -->
# Line 195 | Line 132
132    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
133             classpath="${lib.dir}/jtreg.jar" />
134  
135 <  <!-- Tck options; see JSR166TestCase.java
135 >  <!-- Tck configuration options; see JSR166TestCase.java
136     To profile a single tck test class:
137     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
138     To stress test a single tck test class:
# Line 210 | Line 147
147      <attribute name="compile-target" default="@{target}"/>
148      <attribute name="workdir"/>
149      <attribute name="classes"/>
150 <    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
150 >    <!--
151 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
152 >    -->
153 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
154      <element name="javac-elements" optional="true"/>
155  
156      <sequential>
157  
218    <local name="modules"/>
219    <condition property="modules">
220      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
221    </condition>
222
158      <mkdir dir="@{workdir}/tck-classes"/>
159  
160      <javac srcdir="@{tck.src.dir}"
# Line 232 | Line 167
167             classpath="${junit.jar}"
168             includeAntRuntime="false"
169             includeJavaRuntime="false"
170 +           encoding="ASCII"
171             executable="${javac@{compile-target}}"
172             fork="true">
173  
174        <include name="*.java"/>
175        <compilerarg value="-XDignore.symbol.file=true"/>
176        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
177 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
178 <      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
177 >      <compilerarg value="-Xdoclint:reference/private"/>
178 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
179        <compilerarg line="${build.args}"/>
180        <javac-elements/>
181  
# Line 249 | Line 185
185            failonerror="true"
186            jvm="${java@{target}}"
187            fork="true">
188 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
189 <        <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
190 <        <jvmarg line="@{jvmflags}"/>
188 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
189 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
190 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
191 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
192 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
193 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
194 >        <jvmarg line="@{jvmflags}"/>
195 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
196 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
197  
198          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
199 <        <syspropertyset id="system-properties-used-by-tck">
200 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
201 <          <propertyref prefix="jsr166."/>
202 <          <propertyref name="test.timeout.factor"/>
203 <        </syspropertyset>
204 <
205 <        <classpath>
206 <          <pathelement location="${junit.jar}"/>
207 <          <pathelement location="@{workdir}/tck-classes"/>
208 <        </classpath>
199 >        <syspropertyset id="system-properties-used-by-tck">
200 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
201 >          <propertyref prefix="jsr166."/>
202 >          <propertyref name="test.timeout.factor"/>
203 >        </syspropertyset>
204 >
205 >        <classpath>
206 >          <pathelement location="${junit.jar}"/>
207 >          <pathelement location="@{workdir}/tck-classes"/>
208 >        </classpath>
209      </java>
210  
211      </sequential>
212    </macrodef>
213  
214    <!-- Define jtreg test sets for different jdk versions -->
215 <  <fileset dir="${jtreg9.src.dir}">
216 <    <patternset id="jdk9.jtreg.tests">
217 <      <include name="**/*.java"/>
218 <    </patternset>
219 <  </fileset>
220 <
221 <  <fileset dir="${jtreg8.src.dir}">
222 <    <patternset id="jdk8.jtreg.tests">
223 <      <include name="**/*.java"/>
224 <      <exclude name="**/SpliteratorCharacteristics.java"/>
225 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
226 <      <exclude name="**/GCDuringIteration.java"/>
227 <    </patternset>
286 <  </fileset>
215 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
216 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
217 >  <property name="jtreg.test.pattern" value="**/*.java"/>
218 >  <macrodef name="defjtregtests">
219 >    <attribute name="v"/>
220 >    <sequential>
221 >      <fileset dir="${jtreg@{v}.src.dir}">
222 >        <patternset id="jdk@{v}.jtreg.tests">
223 >          <include name="${jtreg.test.pattern}"/>
224 >        </patternset>
225 >      </fileset>
226 >    </sequential>
227 >  </macrodef>
228  
229 <  <fileset dir="${jtreg7.src.dir}">
230 <    <patternset id="jdk7.jtreg.tests">
231 <      <include name="**/*.java"/>
291 <    </patternset>
292 <  </fileset>
229 >  <defjtregtests v="17"/>
230 >  <defjtregtests v="18"/>
231 >  <defjtregtests v="19"/>
232  
233    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
234    <property name="jtreg.flags" value=""/>
235  
236    <macrodef name="run-jtreg-tests">
298    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
299    <attribute name="source" default="7"/>
237      <attribute name="target"/>
238      <attribute name="workdir"/>
239      <attribute name="classes"/>
240 +    <attribute name="verbose" default="${jtreg.verbose}"/>
241      <attribute name="jtregflags" default=""/>
242 +    <element name="jtreg-elements" optional="true"/>
243  
244      <sequential>
245  
246      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
247      <property name="jtreg.verbose" value="nopass,fail,error"/>
248  
249 <    <local name="modules"/>
250 <    <condition property="modules">
251 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
252 <    </condition>
249 >    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
250 >    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
251 >    <!-- In 2020 concurrency:3 seems like a sweet spot -->
252 >    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
253 >    <property name="jtreg.concurrency" value="3"/>
254  
255 <    <delete dir="@{workdir}/JTwork"   quiet="true"/>
316 <    <delete dir="@{workdir}/JTreport" quiet="true"/>
317 <    <mkdir dir="@{workdir}/JTwork/scratch"/>
318 <    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
319 <    <mkdir dir="@{workdir}/JTreport/html"/>
320 <    <mkdir dir="@{workdir}/JTreport/text"/>
255 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
256      <jtreg dir="${jtreg@{target}.src.dir}"
257             jdk="${jdk@{target}.home}"
258 <           workDir="@{workdir}/JTwork"
324 <           reportDir="@{workdir}/JTreport">
258 >           workDir="@{workdir}/JTwork">
259        <patternset refid="jdk@{target}.jtreg.tests"/>
260 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
261 <      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
262 <      <arg value="-agentvm"/>
263 <      <arg value="-verbose:${jtreg.verbose}"/>
260 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
261 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
262 >      <arg value="-vmoption:-Xmx256m"/>
263 >      <arg value="-concurrency:${jtreg.concurrency}"/>
264        <arg value="-vmoptions:-esa -ea"/>
265 +      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
266 +      <arg value="-agentvm"/>
267 +      <arg value="-noreport"/>
268 +      <arg value="-verbose:@{verbose}"/>
269        <arg value="-automatic"/>
270        <arg value="-k:!ignore"/>
271        <arg line="@{jtregflags}"/>
272        <arg line="${jtreg.flags}"/>
273 +      <jtreg-elements/>
274      </jtreg>
275      </sequential>
276    </macrodef>
# Line 342 | Line 281
281    </path>
282  
283    <!-- Support @jls tag, used in jdk8+ javadoc -->
284 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
285    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
286    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
287  
288    <!-- Main targets -->
289  
290 <  <property name="build.main.java.version" value="9"/>
291 <  <property name="build.main.javac" value="${javac9}"/>
290 >  <!-- Default values: may seem strange ... -->
291 >  <!-- At runtime, target latest, but build for current LTS -->
292 >  <property name="java.runtime.target" value="19"/>
293 >  <property name="build.main.java" value="${java17}"/>
294 >  <property name="build.main.javac" value="${javac17}"/>
295 >  <property name="build.main.javadoc" value="${javadoc19}"/>
296 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
297  
298    <target name="dists"
299 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
299 >          depends="dist"
300            description="Builds all public jars and docs"/>
301  
302    <target name="compile"
303            depends="configure-compiler"
304            description="Compiles src/main sources to build dir">
305  
361    <local name="modules"/>
362    <condition property="modules">
363      <and>
364        <available file="${jdk9.home}/jmods" type="dir"/>
365        <equals arg1="9" arg2="${build.main.java.version}"/>
366      </and>
367    </condition>
368
306      <local name="destdir"/>
307 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
371 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
307 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
308  
309      <mkdir dir="${destdir}"/>
310  
# Line 380 | Line 316
316             classpath=""
317             includeAntRuntime="false"
318             includeJavaRuntime="false"
319 +           encoding="ASCII"
320             executable="${build.main.javac}"
321             fork="true">
322  
323        <include name="**/*.java"/>
324 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
324 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
325        <compilerarg value="-Xprefer:source"/>
326        <compilerarg value="-XDignore.symbol.file=true"/>
327        <compilerarg value="-Xlint:all"/>
391      <compilerarg value="-Werror"/>
328        <compilerarg value="-Xdoclint:all/protected"/>
329 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
330 +      <compilerarg value="-Werror"/>
331        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
332        <compilerarg line="${build.args}"/>
395
333      </javac>
397
398    <!-- We need jdk9's Contended annotation, but at compile time only -->
399    <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
334    </target>
335  
402
336    <target name="jar"
337            depends="compile"
338 <          description="Builds library jar from compiled sources">
339 <
338 >          description="Builds library jar for src/main from compiled sources">
339 >    <local name="subdir"/>
340 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
341      <jar destfile="${product.jar}">
342 <      <fileset dir="${build.classes.dir}"/>
342 >      <fileset dir="${build.classes.dir}${subdir}"/>
343        <manifest>
344          <attribute name="Built-By" value="${user.name}"/>
345          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 416 | Line 350
350  
351    <target name="docs"
352            description="Builds javadocs for src/main to dist dir">
353 <
420 <    <delete dir="${docs.dir}"/>
353 >    <delete dir="${docs.dir}" quiet="true"/>
354      <mkdir dir="${docs.dir}"/>
422
423    <!-- the packagenames="none" hack below prevents scanning the -->
424    <!-- sourcepath for packages -->
425
355      <javadoc destdir="${docs.dir}"
356               packagenames="none"
357 <             link="${java9.api.url}"
357 >             link="${java.api.url}"
358               overview="${src.dir}/intro.html"
359               access="${build.javadoc.access}"
360 <             sourcepath="${src.dir}:${jdk9.src.dir}"
360 >             sourcepath="${src.dir}"
361               classpath=""
362 <             executable="${javadoc9}">
362 >             source="${build.main.javadoc.source}"
363 >             executable="${build.main.javadoc}">
364        <fileset dir="${src.dir}" defaultexcludes="yes">
365 <        <include name="**/*.java"/>
365 >        <include name="java/**/*.java"/>
366        </fileset>
367 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
367 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
368        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
369 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1"/>
370 +      <arg value="-quiet"/>
371        <arg value="-XDignore.symbol.file=true"/>
372 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
373 <      <arg value="-tag"/>
374 <      <arg value="${javadoc.jls.option}"/>
375 <      <arg value="-tag"/>
376 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
377 <      <arg value="-tag"/>
378 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
379 <      <arg value="-tag"/>
380 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
449 < <!-- tags added in jdk9 -->
450 <      <arg value="-tag"/>
451 <      <arg value="revised:X"/>
452 <      <arg value="-tag"/>
453 <      <arg value="spec:X"/>
372 >      <arg value="-html5"/>
373 >      <arg value="-Xdoclint:all,-missing"/>
374 >      <arg value="--patch-module=java.base=${src.dir}"/>
375 >      <arg value="--frames" if:set="use-frames"/>
376 >      <arg value="--override-methods=summary"/>
377 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
378 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
379 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
380 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
381      </javadoc>
382    </target>
383  
457
384    <target name="dist"
385            depends="dist-clean, dist-jar, dist-docs"
386            description="Puts all distributable products in single hierarchy"/>
387  
462
463  <target name="release"
464          depends="dist"
465          description="Puts entire CVS tree, plus distribution productions, in a jar">
466
467    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
468
469    <jar basedir="${basedir}" destfile="${release.jar}">
470      <!-- <exclude name="build/**"/> -->
471      <exclude name="${release.jar}"/>
472      <exclude name="user.properties"/>
473      <exclude name="etc/notes/**"/>
474      <exclude name="src/emulation/**"/>
475      <exclude name="**/SyntaxTest.java"/>
476      <exclude name="**/SuperfluousAbstract.java"/>
477      <manifest>
478        <attribute name="Built-By" value="${user.name}"/>
479        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
480      </manifest>
481    </jar>
482  </target>
483
484
388    <target name="clean"
389            description="Removes all build products">
487
390      <delete dir="${build.dir}"/>
489
391    </target>
392  
492
393    <target name="dist-clean"
394            description="Removes all build and distribution products">
495
395      <delete dir="${build.dir}"/>
396      <delete dir="${dist.dir}"/>
498
397    </target>
398  
501
399    <target name="dist-jar"
400            depends="clean, jar">
401      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 510 | Line 407
407    </target>
408  
409    <target name="tck"
410 <          depends="jar"
411 <          description="Runs tck tests for main directly">
515 <
410 >          depends="jar"
411 >          description="Runs tck tests for src/main directly">
412      <run-tck-tests
413 <      target="${build.main.java.version}"
413 >      target="${java.runtime.target}"
414        workdir="${build.dir}"
415 <      classes="${product.jar}"/>
415 >      classes="${product.jar}">
416 >      <javac-elements>
417 >        <!-- <compilerarg value="-Werror"/> -->
418 >      </javac-elements>
419 >    </run-tck-tests>
420    </target>
421  
422    <target name="tck-parallelism-1"
423 <          description="Runs tck with given common pool parallelism">
423 >          description="Runs tck with common pool parallelism 1">
424      <antcall target="tck">
425        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
426      </antcall>
427    </target>
428  
429    <target name="tck-parallelism-0"
430 <          description="Runs tck with given common pool parallelism">
430 >          description="Runs tck with common pool parallelism 0">
431      <antcall target="tck">
432        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
433      </antcall>
434    </target>
435  
436 +  <target name="tck-security-manager"
437 +          description="Runs tck with a security manager">
438 +    <antcall target="tck">
439 +      <param name="jsr166.useSecurityManager" value="true"/>
440 +    </antcall>
441 +  </target>
442 +
443    <target name="jtreg"
444 <          depends="jar"
445 <          description="Runs jtreg tests for main using the jtreg ant task">
444 >          depends="jar"
445 >          description="Runs jtreg tests for src/main using the jtreg ant task">
446      <run-jtreg-tests
447 <       target="${build.main.java.version}"
447 >       target="${java.runtime.target}"
448         workdir="${build.dir}"
449         classes="${product.jar}"/>
450    </target>
451  
452    <target name="test"
453 <          depends="tck, tck-parallelism-1, jtreg"
454 <          description="Runs tck and jtreg tests for main">
548 <  </target>
549 <
550 <  <target name="jtreg8" description="Runs jtreg tests with jdk8">
453 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
454 >          description="Runs tck and jtreg tests for src/main"/>
455  
456 <    <antcall target="jtreg">
457 <      <param name="build.main.java.version" value="8"/>
458 <      <param name="build.main.javac" value="${javac8}"/>
456 >  <target name="test-version-permutations"
457 >          depends="test17, test19, clean, test, docs"
458 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
459 >
460 >
461 >  <target name="test17">
462 >    <antcall>
463 >      <param name="java.runtime.target" value="17"/>
464 >      <param name="build.main.javac" value="${javac17}"/>
465 >      <param name="build.main.javadoc" value="${javadoc17}"/>
466 >      <param name="build.main.javadoc.source" value="17"/>
467 >      <target name="clean"/>
468 >      <target name="test"/>
469 >      <target name="docs"/>
470      </antcall>
556
471    </target>
472 <
473 <  <target name="test89"
474 <          description="Runs tck and jtreg tests for main for multiple java versions">
475 <
476 <    <antcall target="clean"/>
477 <    <antcall target="test">
478 <      <param name="build.main.java.version" value="8"/>
479 <      <param name="build.main.javac" value="${javac8}"/>
472 >  <target name="test19">
473 >    <antcall>
474 >      <param name="java.runtime.target" value="19"/>
475 >      <param name="build.main.javac" value="${javac19}"/>
476 >      <param name="build.main.javadoc" value="${javadoc19}"/>
477 >      <param name="build.main.javadoc.source" value="19"/>
478 >      <target name="clean"/>
479 >      <target name="test"/>
480 >      <target name="docs"/>
481      </antcall>
567
568    <antcall target="clean"/>
569    <antcall target="test">
570      <param name="build.main.java.version" value="9"/>
571      <param name="build.main.javac" value="${javac9}"/>
572    </antcall>
573
482    </target>
483  
484  
577
485    <target name="configure-compiler">
486      <fail message="ant version too old">
487 <      <condition>
581 <        <not> <antversion atleast="1.9.1"/> </not>
582 <      </condition>
487 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
488      </fail>
489  
490      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 597 | Line 502
502    </target>
503  
504  
600
601  <!-- Various demos and test programs -->
602
603
604  <target name="loops" depends="configure-compiler"
605          description="Benchmark from Doug Lea's AQS paper">
606
607    <mkdir dir="${build.loops.dir}"/>
608
609    <javac srcdir="${loops.src.dir}"
610          destdir="${build.loops.dir}"
611            debug="${build.debug}"
612       debuglevel="${build.debuglevel}"
613      deprecation="${build.deprecation}"
614           source="${build.sourcelevel}"
615           target="${build.sourcelevel}"
616             fork="true">
617
618      <compilerarg line="${build.args}"/>
619      <classpath refid="loops.classpath"/>
620      <compilerarg value="-XDignore.symbol.file=true"/>
621
622    </javac>
623
624    <java classname="ALoops" fork="true">
625      <classpath refid="loops.classpath"/>
626    </java>
627
628  </target>
629
630
505    <target name="compile-test-loops" depends="jar"
506 <          description="compile all the perf tests in src/test/loops">
506 >          description="Compiles all the perf tests in src/test/loops">
507  
508      <mkdir dir="${build.dir}/test/loops"/>
509  
# Line 640 | Line 514
514             deprecation="${build.deprecation}"
515             includeAntRuntime="false"
516             includeJavaRuntime="false"
517 <           executable="${javac9}"
517 >           encoding="ASCII"
518 >           executable="${build.main.javac}"
519             fork="true">
520  
521        <include name="*.java"/>
522        <compilerarg value="-XDignore.symbol.file=true"/>
523 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
524 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
523 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
524 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
525        <compilerarg line="${build.args}"/>
651
526      </javac>
653
527    </target>
528  
529  
530 <  <!-- jsr166 4jdk7 -->
530 >  <!-- old branches no longer maintained.  build support deleted -->
531 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
532 >  <!-- jsr166 4jdk7 (no longer maintained) -->
533 >  <!-- jsr166x (no longer maintained) -->
534 >  <!-- jsr166y (no longer maintained) -->
535 >  <!-- extra166y (no longer maintained) -->
536 >  <!-- jsr166e (no longer maintained) -->
537  
538 <  <target name="4jdk7compile"
660 <          depends="configure-compiler"
661 <          description="Compiles src/jdk7 sources, targeting jdk7">
662 <
663 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
664 <
665 <    <javac srcdir="${4jdk7src.dir}"
666 <           destdir="${build.4jdk7.classes.dir}"
667 <           debug="${build.debug}"
668 <           debuglevel="${build.debuglevel}"
669 <           deprecation="${build.deprecation}"
670 <           source="6"
671 <           target="6"
672 <           classpath=""
673 <           bootclasspath="${bootclasspath6}"
674 <           includeAntRuntime="false"
675 <           includeJavaRuntime="false"
676 <           executable="${javac7}"
677 <           fork="true">
538 > <!-- Find buglets that can be detected by static build tools -->
539  
540 <      <include name="**/*.java"/>
541 <      <compilerarg value="-Xprefer:source"/>
542 <      <compilerarg value="-XDignore.symbol.file=true"/>
543 <      <compilerarg value="-Xlint:all"/>
544 <      <compilerarg value="-Werror"/>
684 <      <compilerarg line="${build.args}"/>
540 > <!--   <target name="lint"> -->
541 > <!--     <antcall target="dists"> -->
542 > <!--       <param name="build.javadoc.access" value="protected"/> -->
543 > <!--     </antcall> -->
544 > <!--   </target> -->
545  
546 <    </javac>
546 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
547 >  <target name="doclint-private">
548 >    <antcall target="dist">
549 >      <param name="build.javadoc.access" value="private"/>
550 >    </antcall>
551    </target>
552  
689  <target name="4jdk7doclint"
690          depends="configure-compiler"
691          description="Finds doclint warnings">
553  
554 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
554 > <!-- ==============================================================
555 >  Experimental errorprone support
556 >  https://errorprone.info
557 >  https://errorprone.info/docs/installation
558 >  https://github.com/google/error-prone/issues/1143
559 > =================================================================== -->
560 >  <path id="errorprone.processorpath.path">
561 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
562 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
563 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
564 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
565 >    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
566 >  </path>
567 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
568 >  <property name="errorprone.jsr166.user.flags" value=""/>
569 >  <property name="errorprone.jsr166.flags"
570 >            value="-Xep:HashtableContains:OFF
571 >                   -Xep:PreferJavaTimeOverload:OFF
572 >                   -Xep:JdkObsolete:OFF
573 >                   -Xep:MissingOverride:OFF
574 >                   -Xep:MissingFail:OFF
575 >                   -Xep:ThreadPriorityCheck:OFF
576 >                   -Xep:MixedArrayDimensions:ERROR
577 >                   -Xep:RemoveUnusedImports:ERROR
578 >                   -Xep:EmptyIf:ERROR
579 >                   -Xep:MultipleTopLevelClasses:ERROR
580 >                   -Xep:ClassName:ERROR
581 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
582 >                   -Xep:RedundantThrows:ERROR
583 >                   -Xep:IdentityBinaryExpression:WARN
584 >                   -Xep:ConstructorInvokesOverridable:WARN
585 >                   -Xep:MethodCanBeStatic:WARN
586 >                   ${errorprone.jsr166.user.flags}"/>
587 >  <!-- -Xep:WildcardImport:ERROR -->
588 >  <property name="errorprone.jsr166.test.flags"
589 >            value="-Xep:StringSplitter:OFF
590 >                   -Xep:BoxedPrimitiveConstructor:OFF
591 >                   -Xep:UnnecessaryParentheses:OFF
592 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
593 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
594 >  <target name="errorprone"
595 >          depends="clean, configure-compiler"
596 >          description="Run errorprone over jsr166 source code (experimental)">
597 >
598 >    <local name="destdir"/>
599 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
600 >    <mkdir dir="${destdir}"/>
601  
602 <    <javac srcdir="${4jdk7src.dir}"
603 <           destdir="${build.4jdk7.classes.dir}"
602 >    <javac srcdir="${src.dir}"
603 >           destdir="${destdir}"
604             debug="${build.debug}"
605             debuglevel="${build.debuglevel}"
606             deprecation="${build.deprecation}"
700           source="6"
701           target="6"
607             classpath=""
703           bootclasspath="${bootclasspath6}"
608             includeAntRuntime="false"
609             includeJavaRuntime="false"
610 <           executable="${javac8}"
610 >           encoding="ASCII"
611 >           executable="${build.main.javac}"
612             fork="true">
613  
614        <include name="**/*.java"/>
615 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
616 +      <compilerarg value="-J--illegal-access=permit"/>
617 +      <compilerarg value="-XDcompilePolicy=simple"/>
618 +      <compilerarg value="-processorpath"/>
619 +      <compilerarg pathref="errorprone.processorpath.path"/>
620 +      <compilerarg value="-Xplugin:ErrorProne
621 +                          ${errorprone.jsr166.flags}"/>
622 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
623        <compilerarg value="-Xprefer:source"/>
624        <compilerarg value="-XDignore.symbol.file=true"/>
625        <compilerarg value="-Xlint:all"/>
626 <      <compilerarg value="-Xdoclint:all/protected"/>
626 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
627 >      <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
628 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
629        <compilerarg line="${build.args}"/>
715
630      </javac>
717  </target>
718
631  
632 <  <target name="4jdk7jar"
633 <          depends="4jdk7compile"
722 <          description="Builds library jar from compiled sources">
723 <
724 <    <jar destfile="${4jdk7product.jar}">
725 <      <fileset dir="${build.4jdk7.classes.dir}"/>
726 <      <manifest>
727 <        <attribute name="Built-By" value="${user.name}"/>
728 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
729 <      </manifest>
632 >    <jar destfile="${product.jar}">
633 >      <fileset dir="${destdir}"/>
634      </jar>
635  
732  </target>
733
734
735  <target name="4jdk7-tck"
736          depends="4jdk7jar"
737          description="Runs tck tests for jsr166-4jdk7 directly">
738
636      <run-tck-tests
637 <      target="7"
638 <      workdir="${build.4jdk7.dir}"
639 <      classes="${4jdk7product.jar}">
637 >      target="${java.runtime.target}"
638 >      workdir="${build.dir}"
639 >      classes="${product.jar}">
640        <javac-elements>
641 <        <!-- JDK8+ test classes -->
642 <        <exclude name="*8Test.java"/>
643 <        <exclude name="*9Test.java"/>
644 <        <exclude name="*10Test.java"/>
645 <        <exclude name="DoubleAccumulatorTest.java"/>
646 <        <exclude name="DoubleAdderTest.java"/>
647 <        <exclude name="LongAccumulatorTest.java"/>
648 <        <exclude name="LongAdderTest.java"/>
649 <        <exclude name="CompletableFutureTest.java"/>
753 <        <exclude name="SplittableRandomTest.java"/>
754 <        <exclude name="StampedLockTest.java"/>
755 <        <exclude name="SubmissionPublisherTest.java"/>
641 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
642 >        <compilerarg value="-J--illegal-access=permit"/>
643 >        <compilerarg value="-XDcompilePolicy=simple"/>
644 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
645 >        <compilerarg value="-Xplugin:ErrorProne
646 >                            ${errorprone.jsr166.flags}
647 >                            ${errorprone.jsr166.test.flags}"/>
648 >        <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
649 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
650        </javac-elements>
651      </run-tck-tests>
652    </target>
653  
654 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
655 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
656 +  <target name="errorprone-jtreg"
657 +          depends="jar"
658 +          description="Run errorprone over jtreg tests (experimental)">
659  
660 <  <target name="4jdk7-tck-junit"
661 <          depends="4jdk7compile"
662 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
663 <
664 <    <junit printsummary="true"
665 <           showoutput="true"
666 <           errorProperty="junit.failed"
667 <           failureProperty="junit.failed"
668 <           includeantruntime="true"
669 <           jvm="${java7}"
670 <           fork="true">
671 <
672 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
673 <      <jvmarg value="-server"/>
674 <
660 >    <run-jtreg-tests
661 >       target="${java.runtime.target}"
662 >       workdir="${build.dir}"
663 >       classes="${product.jar}"
664 >       verbose="all">
665 >      <jtreg-elements>
666 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
667 >        <arg value="-javacoption:-processorpath"/>
668 >        <arg value="-javacoption:${errorprone.processorpath}"/>
669 >        <arg value="-javacoption:-Xplugin:ErrorProne
670 >                            ${errorprone.jsr166.flags}
671 >                            ${errorprone.jsr166.test.flags}
672 >                            -Xep:MultipleTopLevelClasses:WARN
673 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
674 >      </jtreg-elements>
675 >    </run-jtreg-tests>
676 >  </target>
677 >
678 >
679 > <!-- ==============================================================
680 >  Running guava tests against jsr166 code
681 > =================================================================== -->
682 >
683 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
684 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
685 > <!-- <property name="guava.version" value="21.0"/> -->
686 >
687 > <!-- HOWTO debug print a path id -->
688 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
689 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
690 >
691 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
692 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
693 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
694 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
695 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
696 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
697 >
698 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
699 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
700 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
701 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
702 >
703 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
704 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
705 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
706 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
707 >
708 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
709 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
710 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
711 >
712 >  <target name="init-ivy">
713 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
714 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
715 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
716 >             classpath="${build.dir}/ivy.jar"/>
717 >  </target>
718 >
719 >  <target name="guava-tests" depends="jar, init-ivy"
720 >          description="Guava tests run against jsr166 collections">
721 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
722 >    <mkdir dir="${guava.dir}"/>
723 >    <ivy:retrieve pathid="guava.testlib.classpath"
724 >      type="jar,bundle" inline="true" conf="default,master"
725 >      pattern="${guava.dir}/[artifact].[ext]"
726 >      organisation="com.google.guava" module="guava-testlib"/>
727 >    <property name="guava.version" value="21.0"/>
728 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
729 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
730 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
731 >           jvm="${build.main.java}" fork="true">
732 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
733 >      <formatter type="brief"/>
734        <classpath>
735 <        <pathelement location="${junit.jar}"/>
736 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
735 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
736 >        <path refid="guava.testlib.classpath"/>
737        </classpath>
738  
739 <      <formatter type="brief"/>
740 <
783 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
784 <      </test>
785 <
739 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
740 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
741      </junit>
742    </target>
743  
789  <target name="4jdk7-jtreg"
790          depends="4jdk7jar"
791          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
792    <run-jtreg-tests
793       target="7"
794       workdir="${build.4jdk7.dir}"
795       classes="${4jdk7product.jar}"/>
796  </target>
797
798
799  <target name="4jdk7-test"
800          depends="4jdk7-tck, 4jdk7-jtreg"
801          description="Runs tck and jtreg tests for jsr166-4jdk7">
802  </target>
803
804
805  <target name="4jdk7docs"
806          description="Builds javadocs for src/jdk7 to dist dir">
807
808    <delete dir="${4jdk7docs.dir}"/>
809    <mkdir dir="${4jdk7docs.dir}"/>
810
811    <javadoc destdir="${4jdk7docs.dir}"
812             packagenames="none"
813             link="${java7.api.url}"
814             overview="${4jdk7src.dir}/intro.html"
815             access="${build.javadoc.access}"
816             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
817             classpath=""
818             executable="${javadoc7}">
819      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
820        <include name="**/*.java"/>
821      </fileset>
822      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
823      <arg value="-XDignore.symbol.file=true"/>
824    </javadoc>
825  </target>
826
827
828  <target name="4jdk7dist"
829          depends="4jdk7dist-jar, 4jdk7dist-docs"
830          description="Puts all distributable products in single hierarchy"/>
831
832
833  <target name="4jdk7clean"
834          description="Removes all 4jdk7 build products">
835
836    <delete dir="${build.4jdk7.dir}"/>
837
838  </target>
839
840
841  <target name="4jdk7dist-jar"
842          depends="4jdk7clean, 4jdk7jar">
843    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
844  </target>
845
846
847  <target name="4jdk7dist-docs"
848          depends="4jdk7clean, 4jdk7docs">
849    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
850  </target>
851
852
853  <!-- jsr166x -->
854
855  <target name="jsr166xcompile"
856          depends="configure-compiler"
857          description="Compiles jsr166x sources to build dir">
858
859    <mkdir dir="${build.jsr166x.classes.dir}"/>
860
861    <javac srcdir="${topsrc.dir}"
862           destdir="${build.jsr166x.classes.dir}"
863           debug="${build.debug}"
864           debuglevel="${build.debuglevel}"
865           deprecation="${build.deprecation}"
866           classpath=""
867           bootclasspath="${bootclasspath6}"
868           source="5"
869           target="5"
870           includeAntRuntime="false"
871           includeJavaRuntime="false"
872           executable="${javac7}"
873           fork="true">
874
875      <include name="jsr166x/**/*.java"/>
876      <compilerarg value="-XDignore.symbol.file=true"/>
877      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
878      <compilerarg value="-Werror"/>
879      <compilerarg line="${build.args}"/>
880
881    </javac>
882  </target>
883
884
885  <target name="jsr166xjar"
886          depends="jsr166xcompile"
887          description="Builds library jar from compiled sources">
888
889    <jar destfile="${jsr166x.jar}">
890      <fileset dir="${build.jsr166x.classes.dir}"/>
891      <manifest>
892        <attribute name="Built-By" value="${user.name}"/>
893        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
894      </manifest>
895    </jar>
896
897  </target>
898
899
900  <target name="jsr166xdocs"
901          description="Builds javadocs to dist dir">
902
903    <delete dir="${jsr166xdocs.dir}"/>
904    <mkdir dir="${jsr166xdocs.dir}"/>
905
906    <javadoc destdir="${jsr166xdocs.dir}"
907             packagenames="jsr166x.*"
908             link="${java.api.url}"
909             access="${build.javadoc.access}"
910             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
911             bootclasspath="${bootclasspath6}"
912             source="5"
913             executable="${javadoc7}">
914      <arg line="-Xdocrootparent ${java.docroot.url}"/>
915      <arg value="-XDignore.symbol.file=true"/>
916
917    </javadoc>
918  </target>
919
920
921  <target name="jsr166xdist"
922          depends="jsr166xdist-jar, jsr166xdist-docs"
923          description="Puts all distributable products in single hierarchy"/>
924
925
926  <target name="jsr166xclean"
927          description="Removes all jsr166x build products">
928
929    <delete dir="${build.jsr166x.dir}"/>
930
931  </target>
932
933
934  <target name="jsr166xdist-jar"
935          depends="jsr166xclean, jsr166xjar">
936    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
937  </target>
938
939  <target name="jsr166xdist-docs"
940          depends="jsr166xclean, jsr166xdocs">
941    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
942  </target>
943
944  <!-- jsr166y -->
945
946
947  <target name="jsr166ycompile"
948          depends="configure-compiler"
949          description="Compiles jsr166y sources">
950
951    <mkdir dir="${build.jsr166y.classes.dir}"/>
952
953    <javac srcdir="${topsrc.dir}"
954           destdir="${build.jsr166y.classes.dir}"
955           debug="${build.debug}"
956           debuglevel="${build.debuglevel}"
957           deprecation="${build.deprecation}"
958           source="6"
959           target="6"
960           classpath=""
961           bootclasspath="${bootclasspath6}"
962           includeAntRuntime="false"
963           includeJavaRuntime="false"
964           executable="${javac7}"
965           fork="true">
966
967      <include name="jsr166y/**/*.java"/>
968      <compilerarg value="-XDignore.symbol.file=true"/>
969      <compilerarg value="-Xlint:all"/>
970      <compilerarg value="-Werror"/>
971      <compilerarg line="${build.args}"/>
972
973    </javac>
974  </target>
975
976
977  <target name="jsr166yjar"
978          depends="jsr166ycompile"
979          description="Builds library jar from compiled sources">
980
981    <jar destfile="${jsr166y.jar}" index="true">
982      <fileset dir="${build.jsr166y.classes.dir}"/>
983      <manifest>
984        <attribute name="Built-By" value="${user.name}"/>
985        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
986      </manifest>
987    </jar>
988
989  </target>
990
991
992  <target name="jsr166ydocs"
993          description="Builds javadocs to dist dir">
994
995    <delete dir="${jsr166ydocs.dir}"/>
996    <mkdir dir="${jsr166ydocs.dir}"/>
997
998    <javadoc destdir="${jsr166ydocs.dir}"
999             packagenames="jsr166y.*"
1000             link="${java.api.url}"
1001             access="${build.javadoc.access}"
1002             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1003             bootclasspath="${bootclasspath6}"
1004             source="6"
1005             executable="${javadoc7}">
1006      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1007      <arg value="-XDignore.symbol.file=true"/>
1008
1009    </javadoc>
1010  </target>
1011
1012
1013  <target name="jsr166ydist"
1014          depends="jsr166ydist-jar, jsr166ydist-docs"
1015          description="Puts all distributable products in single hierarchy"/>
1016
1017
1018  <target name="jsr166yclean"
1019          description="Removes all jsr166y build products">
1020
1021    <delete dir="${build.jsr166y.dir}"/>
1022
1023  </target>
1024
1025
1026  <target name="jsr166ydist-jar"
1027          depends="jsr166yclean, jsr166yjar">
1028    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1029  </target>
1030
1031  <target name="jsr166ydist-docs"
1032          depends="jsr166yclean, jsr166ydocs">
1033    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1034  </target>
1035
1036
1037  <!-- extra166y -->
1038
1039
1040  <target name="extra166ycompile"
1041          depends="configure-compiler, jsr166yjar"
1042          description="Compiles extra166y sources">
1043
1044    <mkdir dir="${build.extra166y.classes.dir}"/>
1045
1046    <javac srcdir="${topsrc.dir}"
1047           destdir="${build.extra166y.classes.dir}"
1048           debug="${build.debug}"
1049           debuglevel="${build.debuglevel}"
1050           deprecation="${build.deprecation}"
1051           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1052           classpath=""
1053           source="6"
1054           target="6"
1055           includeAntRuntime="false"
1056           includeJavaRuntime="false"
1057           executable="${javac7}"
1058           fork="true">
1059
1060      <include name="extra166y/**/*.java"/>
1061      <compilerarg value="-XDignore.symbol.file=true"/>
1062      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1063      <compilerarg value="-Werror"/>
1064      <compilerarg line="${build.args}"/>
1065
1066    </javac>
1067  </target>
1068
1069
1070  <target name="extra166yjar"
1071          depends="extra166ycompile"
1072          description="Builds library jar from compiled sources">
1073
1074    <jar destfile="${extra166y.jar}" index="true">
1075      <fileset dir="${build.extra166y.classes.dir}"/>
1076      <manifest>
1077        <attribute name="Built-By" value="${user.name}"/>
1078        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1079      </manifest>
1080    </jar>
1081
1082  </target>
1083
1084
1085  <target name="extra166ydocs"
1086          description="Builds javadocs to build dir">
1087
1088    <delete dir="${extra166ydocs.dir}"/>
1089    <mkdir dir="${extra166ydocs.dir}"/>
1090
1091    <javadoc destdir="${extra166ydocs.dir}"
1092             packagenames="extra166y.*"
1093             link="${java.api.url}"
1094             access="${build.javadoc.access}"
1095             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1096             bootclasspath="${bootclasspath6}"
1097             source="6"
1098             executable="${javadoc7}">
1099      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1100      <arg value="-XDignore.symbol.file=true"/>
1101
1102    </javadoc>
1103  </target>
1104
1105
1106  <target name="extra166ydist"
1107          depends="extra166ydist-jar, extra166ydist-docs"
1108          description="Puts all distributable products in single hierarchy"/>
1109
1110
1111  <target name="extra166yclean"
1112          description="Removes all extra166y build products">
1113
1114    <delete dir="${build.extra166y.dir}"/>
1115
1116  </target>
1117
1118
1119  <target name="extra166ydist-jar"
1120          depends="extra166yclean, extra166yjar">
1121    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1122  </target>
1123
1124  <target name="extra166ydist-docs"
1125          depends="extra166yclean, extra166ydocs">
1126    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1127  </target>
1128
1129  <!-- jsr166e -->
1130
1131  <property name="build.jsr166e.java.version" value="6"/>
1132  <property name="build.jsr166e.javac" value="${javac6}"/>
1133
1134  <target name="jsr166ecompile"
1135          depends="configure-compiler"
1136          description="Compiles jsr166e sources">
1137
1138    <mkdir dir="${build.jsr166e.classes.dir}"/>
1139
1140    <javac srcdir="${topsrc.dir}"
1141           destdir="${build.jsr166e.classes.dir}"
1142           debug="${build.debug}"
1143           debuglevel="${build.debuglevel}"
1144           deprecation="${build.deprecation}"
1145           source="${build.jsr166e.java.version}"
1146           target="${build.jsr166e.java.version}"
1147           classpath=""
1148           includeAntRuntime="false"
1149           includeJavaRuntime="false"
1150           executable="${build.jsr166e.javac}"
1151           fork="true">
1152
1153      <include name="jsr166e/**/*.java"/>
1154      <compilerarg value="-XDignore.symbol.file=true"/>
1155      <compilerarg value="-Xlint:all"/>
1156      <compilerarg value="-Werror"/>
1157      <compilerarg line="${build.args}"/>
1158
1159    </javac>
1160  </target>
1161
1162  <!-- jsr166e: find doclint errors -->
1163  <target name="jsr166edoclint">
1164
1165    <mkdir dir="${build.jsr166e.classes.dir}"/>
1166
1167    <javac srcdir="${topsrc.dir}"
1168           destdir="${build.jsr166e.classes.dir}"
1169           debug="${build.debug}"
1170           debuglevel="${build.debuglevel}"
1171           deprecation="${build.deprecation}"
1172           source="${build.jsr166e.java.version}"
1173           target="${build.jsr166e.java.version}"
1174           classpath=""
1175           bootclasspath="${bootclasspath6}"
1176           includeAntRuntime="false"
1177           includeJavaRuntime="false"
1178           executable="${javac8}"
1179           fork="true">
1180
1181      <include name="jsr166e/**/*.java"/>
1182      <compilerarg value="-XDignore.symbol.file=true"/>
1183      <compilerarg value="-Xlint:all"/>
1184      <compilerarg value="-Werror"/>
1185      <compilerarg value="-Xdoclint:all/protected"/>
1186
1187    </javac>
1188  </target>
1189
1190
1191  <target name="jsr166ejar"
1192          depends="jsr166ecompile"
1193          description="Builds library jar from compiled sources">
1194
1195    <jar destfile="${jsr166e.jar}" index="true">
1196      <fileset dir="${build.jsr166e.classes.dir}"/>
1197      <manifest>
1198        <attribute name="Built-By" value="${user.name}"/>
1199        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1200      </manifest>
1201    </jar>
1202
1203  </target>
1204
1205
1206  <target name="jsr166edocs"
1207          description="Builds javadocs to build dir">
1208
1209    <delete dir="${jsr166edocs.dir}"/>
1210    <mkdir dir="${jsr166edocs.dir}"/>
1211
1212    <javadoc destdir="${jsr166edocs.dir}"
1213             packagenames="jsr166e.*"
1214             link="${java.api.url}"
1215             access="${build.javadoc.access}"
1216             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1217             source="${build.jsr166e.java.version}"
1218             executable="${javadoc7}">
1219      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1220      <arg value="-XDignore.symbol.file=true"/>
1221
1222    </javadoc>
1223  </target>
1224
1225
1226  <target name="jsr166e-tck-one-java-version"
1227          depends="jsr166ejar">
1228
1229    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1230
1231    <run-tck-tests
1232      tck.src.dir="${test.src.dir}/tck-jsr166e"
1233      target="${build.jsr166e.java.version}"
1234      workdir="${build.jsr166e.dir}"
1235      classes="${jsr166e.jar}"/>
1236  </target>
1237
1238  <target name="jsr166e-tck"
1239          description="Runs tck tests for jsr166e for multiple java versions">
1240
1241 <!--     <antcall target="clean"/> -->
1242 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1243 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1244 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1245 <!--     </antcall> -->
1246
1247    <antcall target="clean"/>
1248    <antcall target="jsr166e-tck-one-java-version">
1249      <param name="build.jsr166e.java.version" value="7"/>
1250      <param name="build.jsr166e.javac" value="${javac7}"/>
1251    </antcall>
1252
1253    <antcall target="clean"/>
1254    <antcall target="jsr166e-tck-one-java-version">
1255      <param name="build.jsr166e.java.version" value="6"/>
1256      <param name="build.jsr166e.javac" value="${javac6}"/>
1257    </antcall>
1258  </target>
1259
1260
1261  <target name="jsr166e-test"
1262          depends="jsr166e-tck"
1263          description="Runs all tests for jsr166e">
1264  </target>
1265
1266  <target name="jsr166edist"
1267          depends="jsr166edist-jar, jsr166edist-docs"
1268          description="Puts all distributable products in single hierarchy"/>
1269
1270
1271  <target name="jsr166eclean"
1272          description="Removes all jsr166e build products">
1273    <delete dir="${build.jsr166e.dir}"/>
1274  </target>
1275
1276
1277  <target name="jsr166edist-jar"
1278          depends="jsr166eclean, jsr166ejar">
1279    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1280  </target>
1281
1282  <target name="jsr166edist-docs"
1283          depends="jsr166eclean, jsr166edocs">
1284    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1285  </target>
1286
1287
1288 <!-- Find buglets that can be detected by static build tools -->
1289
1290  <target name="lint">
1291    <antcall target="dists">
1292      <param name="build.javadoc.access" value="public"/>
1293    </antcall>
1294  </target>
1295
1296 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1297  <target name="lint-private">
1298    <antcall target="dist">
1299      <param name="build.javadoc.access" value="private"/>
1300    </antcall>
1301  </target>
1302
1303
744   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines