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.116 by jsr166, Sun Jan 20 07:24:52 2013 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
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 <  where each of the above is a complete JDK source tree
29 <  (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 <  <target name="usage" description="Advises user to run with -projecthelp">
40 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
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 -->
38  <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  
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"/>
48  <property name="build.reports.dir"           location="${build.dir}/reports"/>
49
50  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54
55  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
56  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
57  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
58  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59
60  <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61  <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62  <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63  <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
63  
64 <  <!-- JDK binary locations -->
64 >  <!-- JDK locations -->
65    <property name="jdks.home"  location="${user.home}/jdk"/>
66  
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="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
75 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
76 <    <property name="bootclasspath@{v}"
77 <     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
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 >
79 >  <macrodef name="mirror-dir">
80 >    <attribute name="src"/>
81 >    <attribute name="dst"/>
82 >    <sequential>
83 >    <delete dir="@{dst}"/>
84 >    <mkdir dir="@{dst}"/>
85 >    <copy todir="@{dst}" preservelastmodified="true">
86 >      <fileset dir="@{src}"/>
87 >    </copy>
88      </sequential>
89    </macrodef>
90  
91 <  <defjdklocations v="6"/>
92 <  <defjdklocations v="7"/>
93 <  <defjdklocations v="8"/>
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="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"/>
111 >
112 >  <!-- Javadoc locations -->
113 >  <property name="docs.dir"          location="${build.dir}/docs"/>
114 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
115 >
116 >  <!-- Jar locations -->
117 >  <property name="product.jar"      location="${build.dir}/jsr166.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 >  <!-- 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="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 -->
139 >  <!-- See the docs in "jtreg -onlineHelp" -->
140 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
141 >           classpath="${lib.dir}/jtreg.jar" />
142  
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="product.jar" default="${product.jar}"/>
158 <    <attribute name="jvmflags" default=""/>
157 >    <attribute name="classes"/>
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"/>
167  
168 <    <javac srcdir="${tck.src.dir}"
168 >    <javac srcdir="@{tck.src.dir}"
169             destdir="@{workdir}/tck-classes"
170             debug="${build.debug}"
171             debuglevel="${build.debuglevel}"
172             deprecation="${build.deprecation}"
173 <           source="6"
173 >           source="@{compile-target}"
174 >           target="@{compile-target}"
175             classpath="${junit.jar}"
102           bootclasspath="@{product.jar}:${bootclasspath6}"
176             includeAntRuntime="false"
177             includeJavaRuntime="false"
178 <           executable="${javac@{target}}"
178 >           encoding="ASCII"
179 >           executable="${javac@{compile-target}}"
180             fork="true">
181  
182 <      <include name="**/*.java"/>
182 >      <include name="*.java"/>
183        <compilerarg value="-XDignore.symbol.file=true"/>
184 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
185 <      <compilerarg line="${build.args}"/>
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 >
190      </javac>
191  
192 <    <java classname="JSR166TestCase" jvm="${java@{target}}" fork="true">
193 <        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
194 <        <jvmarg line="@{jvmflags}"/>
195 <        <classpath>
196 <          <pathelement location="${junit.jar}"/>
197 <          <pathelement location="@{workdir}/tck-classes"/>
198 <        </classpath>
192 >    <java classname="${jsr166.tckTestClass}"
193 >          failonerror="true"
194 >          jvm="${java@{target}}"
195 >          fork="true">
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 <  <!-- Source locations -->
223 <  <property name="src.dir"              location="${basedir}/src/main"/>
224 <  <property name="test.src.dir"         location="${basedir}/src/test"/>
225 <  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
226 <  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
227 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
228 <  <property name="lib.dir"              location="${basedir}/lib"/>
229 <  <property name="dist.dir"             location="${basedir}/dist"/>
230 <  <property name="topsrc.dir"           location="${basedir}/src"/>
231 <  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
232 <  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
233 <  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
234 <  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
235 <  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
140 <
141 <  <!-- Distribution locations -->
142 <  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
143 <  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
144 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
145 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
146 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
147 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
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 <  <!-- Jar locations -->
238 <  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
239 <  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
240 <  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
241 <  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
154 <  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
155 <  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
156 <  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
237 >  <defjtregtests v="17"/>
238 >  <defjtregtests v="18"/>
239 >  <defjtregtests v="19"/>
240 >  <defjtregtests v="20"/>
241 >  <defjtregtests v="21"/>
242  
243 <  <!-- Bootclasspath argument -->
244 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
243 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
244 >  <property name="jtreg.flags" value=""/>
245  
246 <  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
247 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
248 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
249 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
250 <
251 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
252 <  <!-- The below does not yet exist as of 2012-11 -->
168 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
246 >  <macrodef name="run-jtreg-tests">
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 <  <!-- Default jdk api doc location (latest stable release seems best) -->
171 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
254 >    <sequential>
255  
256 <  <!-- Define the "jtreg" task -->
257 <  <!-- See the docs in "jtreg -onlineHelp" -->
175 <  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
176 <           classpath="${lib.dir}/jtreg.jar" />
256 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
257 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
258  
259 <  <!-- Test classpath -->
260 <  <path id="test.classpath">
261 <    <pathelement location="${build.testcases.dir}"/>
262 <    <pathelement location="${junit.jar}"/>
263 <  </path>
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>
287  
288    <!-- ALoops classpath -->
289    <path id="loops.classpath">
# Line 187 | Line 291
291    </path>
292  
293    <!-- Support @jls tag, used in jdk8+ javadoc -->
294 <  <!-- TODO: How do we get &trade to work? -->
295 <  <!-- TODO: Why isn't @jls a "standard" tag? -->
192 <  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
193 <  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
294 >  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
295 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
296    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
297  
298    <!-- Main targets -->
299  
300 +  <!-- Default values: may seem strange ... -->
301 +  <!-- At runtime, target latest, 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 <           executable="${javac8}"
329 >           encoding="ASCII"
330 >           executable="${build.main.javac}"
331             fork="true">
332  
333        <include name="**/*.java"/>
334 <      <compilerarg line="${build.args}"/>
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 <
339 < <!--
340 <      <exclude name="java/lang/**"/>
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}"/>
227      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
228 -->
229
343      </javac>
231
344    </target>
345  
234
235
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>
243
358    </target>
359  
360  
247
248  <target name="test"
249          depends="configure-tests, report-tests"
250          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
251
252
253
361    <target name="docs"
362            description="Builds javadocs for src/main to dist dir">
363 <
364 <    <delete dir="${dist.javadocs.dir}"/>
365 <    <mkdir dir="${dist.javadocs.dir}"/>
259 <
260 <    <!-- the packagenames="none" hack below prevents scanning the -->
261 <    <!-- sourcepath for packages -->
262 <
263 <    <javadoc destdir="${dist.javadocs.dir}"
363 >    <delete dir="${docs.dir}" quiet="true"/>
364 >    <mkdir dir="${docs.dir}"/>
365 >    <javadoc destdir="${docs.dir}"
366               packagenames="none"
367 <             link="${jdkapi8docs.url}"
367 >             link="${java.api.url}"
368               overview="${src.dir}/intro.html"
369 <             sourcepath="${src.dir}:${jdk8src.dir}"
369 >             access="${build.javadoc.access}"
370 >             sourcepath="${src.dir}"
371               classpath=""
372 <             executable="${javadoc8}">
373 <      <arg value="-XDignore.symbol.file=true"/>
271 <      <arg value="-tag"/>
272 <      <arg value="${javadoc.jls.option}"/>
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 ${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="-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>
277
392    </target>
393  
280
281
394    <target name="dist"
395 <          depends="dist-clean, dist-jar, docs"
395 >          depends="dist-clean, dist-jar, dist-docs"
396            description="Puts all distributable products in single hierarchy"/>
397  
286
287  <target name="release"
288          depends="dist"
289          description="Puts entire CVS tree, plus distribution productions, in a jar">
290
291    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
292
293    <jar basedir="${basedir}" destfile="${release.jar}">
294      <!-- <exclude name="build/**"/> -->
295      <exclude name="${release.jar}"/>
296      <exclude name="user.properties"/>
297      <exclude name="etc/notes/**"/>
298      <exclude name="src/emulation/**"/>
299      <exclude name="**/SyntaxTest.java"/>
300      <exclude name="**/SuperfluousAbstract.java"/>
301    </jar>
302
303  </target>
304
305
306
398    <target name="clean"
399            description="Removes all build products">
309
400      <delete dir="${build.dir}"/>
311
401    </target>
402  
314
315
403    <target name="dist-clean"
404            description="Removes all build and distribution products">
405 <
405 >    <delete dir="${build.dir}"/>
406      <delete dir="${dist.dir}"/>
320
407    </target>
408  
323
324
325  <!-- Internal targets -->
326
327
409    <target name="dist-jar"
410            depends="clean, jar">
330
411      <copy file="${product.jar}" todir="${dist.dir}"/>
332
412    </target>
413  
414 <
415 <  <target name="compile-tests"
416 <          depends="jar">
338 <
339 <    <mkdir dir="${build.testcases.dir}"/>
340 <
341 <    <javac srcdir="${tck.src.dir}"
342 <           destdir="${build.testcases.dir}"
343 <           debug="${build.debug}"
344 <           debuglevel="${build.debuglevel}"
345 <           deprecation="${build.deprecation}"
346 <           source="6"
347 <           classpath="${junit.jar}"
348 <           bootclasspath="${product.jar}:${bootclasspath6}"
349 <           includeAntRuntime="false"
350 <           includeJavaRuntime="false"
351 <           executable="${javac8}"
352 <           fork="true">
353 <
354 <      <include name="**/*.java"/>
355 <      <compilerarg line="${build.args}"/>
356 <      <compilerarg value="-XDignore.symbol.file=true"/>
357 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
358 <
359 <    </javac>
360 <
361 <    <javac srcdir="${test.src.dir}"
362 <           destdir="${build.testcases.dir}"
363 <           debug="${build.debug}"
364 <           debuglevel="${build.debuglevel}"
365 <           deprecation="${build.deprecation}"
366 <           source="6"
367 <           classpath=""
368 <           bootclasspath="${product.jar}:${bootclasspath6}"
369 <           includeAntRuntime="false"
370 <           includeJavaRuntime="false"
371 <           executable="${javac8}"
372 <           fork="true">
373 <
374 <      <include name="jsr166/test/**/*.java"/>
375 <
376 <      <compilerarg line="${build.args}"/>
377 <      <compilerarg value="-XDignore.symbol.file=true"/>
378 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
379 <
380 <    </javac>
381 <
382 < <!--
383 <    <javac srcdir="${jtreg.src.dir}"
384 <          destdir="${build.testcases.dir}"
385 <            debug="${build.debug}"
386 <       debuglevel="${build.debuglevel}"
387 <      deprecation="${build.deprecation}"
388 <           source="${build.sourcelevel}"
389 <             fork="true">
390 <
391 <      <compilerarg value="${bootclasspath.args}"/>
392 <      <compilerarg line="${build.args}"/>
393 <      <compilerarg value="-XDignore.symbol.file=true"/>
394 <
395 <    </javac>
396 < -->
397 <
414 >  <target name="dist-docs"
415 >          depends="clean, docs">
416 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
417    </target>
418  
419 <
420 <  <target name="run-tests"
421 <          depends="compile-tests">
422 <
423 <    <!-- May be overridden by user.properties -->
424 <    <property name="testcase" value="*"/>
425 <
426 <    <mkdir dir="${build.reports.dir}"/>
427 <
428 <    <junit printsummary="true"
429 <             showoutput="true"
430 <          errorProperty="junit.failed"
431 <        failureProperty="junit.failed"
432 <                    dir="${build.reports.dir}"
433 <                    jvm="${java8}"
434 <                   fork="true">
435 <
436 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
437 <      <jvmarg value="-server"/>
438 <      <jvmarg value="-showversion"/>
439 <
440 <      <classpath refid="test.classpath"/>
441 <
442 <      <formatter type="xml"/>
443 <
444 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
445 <        <fileset dir="${tck.src.dir}">
446 <          <include name="**/${testcase}Test.java"/>
447 <        </fileset>
448 <      </batchtest>
449 <
450 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
451 <        <fileset dir="${test.src.dir}">
452 <          <include name="jsr166/test/**/${testcase}Test.java"/>
453 <        </fileset>
454 <      </batchtest>
455 <
456 < <!--
457 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
458 <        <fileset dir="${jtreg.src.dir}">
459 <          <include name="**/${testcase}Test.java"/>
441 <        </fileset>
442 <      </batchtest>
443 < -->
444 <
445 <    </junit>
446 <
419 >  <target name="tck"
420 >          depends="jar"
421 >          description="Runs tck tests for src/main directly">
422 >    <run-tck-tests
423 >      target="${java.runtime.target}"
424 >      workdir="${build.dir}"
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="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="${java.runtime.target}"
458 >       workdir="${build.dir}"
459 >       classes="${product.jar}"/>
460    </target>
461  
462 +  <target name="test"
463 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
464 +          description="Runs tck and jtreg tests for src/main"/>
465  
466 <  <target name="report-tests"
467 <          depends="run-tests">
468 <
469 <    <!-- Sets junit.report.format to frames if redirection is present,
470 <         otherwise sets it to noframes. -->
471 <    <available property="junit.report.format"
472 <                  value="frames"
473 <              classname="org.apache.xalan.lib.Redirect"
474 <    />
475 <    <property name="junit.report.format" value="noframes"/>
476 <
477 <    <junitreport todir="${build.reports.dir}">
478 <      <fileset dir="${build.reports.dir}">
479 <        <include name="TEST-*.xml"/>
480 <      </fileset>
481 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
482 <      />
483 <    </junitreport>
484 <
485 <    <fail message="Test Cases Failed" if="junit.failed"/>
486 <
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 >  </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>
492    </target>
493  
494  
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 488 | Line 512
512    </target>
513  
514  
515 <  <target name="configure-tests"
516 <       depends="configure-compiler">
493 <
494 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
495 <    <available property="junit.available"
496 <               classname="junit.framework.Protectable"/>
497 <
498 <    <!-- Xalan -->
499 <    <available property="xalan.available"
500 <               classname="org.apache.xalan.Version"/>
515 >  <target name="compile-test-loops" depends="jar"
516 >          description="Compiles all the perf tests in src/test/loops">
517  
518 +    <mkdir dir="${build.dir}/test/loops"/>
519  
520 <    <!-- Ant 1.6beta and later don't need or want this check -->
521 <    <!--
505 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
506 <          unless="junit.available"/>
507 <
508 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
509 <          unless="xalan.available"/>
510 <    -->
511 <
512 <  </target>
513 <
514 <
515 <  <!-- Various demos and test programs -->
516 <
517 <
518 <  <target name="loops" depends="configure-compiler"
519 <          description="Benchmark from Doug Lea's AQS paper">
520 <
521 <    <mkdir dir="${build.loops.dir}"/>
522 <
523 <    <javac srcdir="${loops.src.dir}"
524 <          destdir="${build.loops.dir}"
525 <            debug="${build.debug}"
526 <       debuglevel="${build.debuglevel}"
527 <      deprecation="${build.deprecation}"
528 <           source="${build.sourcelevel}"
529 <             fork="true">
530 <
531 <      <compilerarg line="${build.args}"/>
532 <      <classpath refid="loops.classpath"/>
533 <      <compilerarg value="-XDignore.symbol.file=true"/>
534 <
535 <    </javac>
536 <
537 <    <java classname="ALoops" fork="true">
538 <      <classpath refid="loops.classpath"/>
539 <    </java>
540 <
541 <  </target>
542 <
543 <
544 <  <!-- jsr166 4jdk7 -->
545 <
546 <
547 <  <target name="4jdk7compile"
548 <          depends="configure-compiler"
549 <          description="Compiles src/jdk7 sources, targeting jdk7">
550 <
551 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
552 <
553 <    <javac srcdir="${4jdk7src.dir}"
554 <           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}"
558           source="6"
559           classpath=""
560           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"/>
567 <      <compilerarg line="${build.args}"/>
531 >      <include name="*.java"/>
532        <compilerarg value="-XDignore.symbol.file=true"/>
533 <      <compilerarg value="-Xlint:all"/>
534 <
571 <    </javac>
572 <
573 <  </target>
574 <
575 <  <target name="4jdk7-jar"
576 <          depends="4jdk7compile"
577 <          description="Builds library jar from compiled sources">
578 <
579 <    <jar destfile="${4jdk7product.jar}">
580 <      <fileset dir="${build.4jdk7.classes.dir}"/>
581 <    </jar>
582 <
583 <  </target>
584 <
585 <
586 <  <target name="4jdk7-test-tck"
587 <          depends="4jdk7-jar"
588 <          description="Runs tck tests for jsr166-4jdk7 directly">
589 <
590 <    <run-tck-tests
591 <      target="7"
592 <      workdir="${build.4jdk7.dir}"
593 <      product.jar="${4jdk7product.jar}"/>
594 <  </target>
595 <
596 <
597 <  <target name="4jdk7-test-tck-junit"
598 <          depends="4jdk7compile"
599 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
600 <
601 <    <junit printsummary="true"
602 <           showoutput="true"
603 <           errorProperty="junit.failed"
604 <           failureProperty="junit.failed"
605 <           includeantruntime="true"
606 <           jvm="${java7}"
607 <           fork="true">
608 <
609 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
610 <      <jvmarg value="-server"/>
611 <
612 <      <classpath>
613 <        <pathelement location="${junit.jar}"/>
614 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
615 <      </classpath>
616 <
617 <      <formatter type="brief"/>
618 <
619 <      <test name="JSR166TestCase" haltonfailure="no">
620 <      </test>
621 <
622 <    </junit>
623 <  </target>
624 <
625 <  <target name="4jdk7-test-jtreg"
626 <          depends="4jdk7compile"
627 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
628 <    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
629 <    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
630 <    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
631 <    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
632 <    <jtreg dir="${jtreg.src.dir}"
633 <           jdk="${jdk7.home}"
634 <           workDir="${build.4jdk7.dir}/JTwork"
635 <           reportDir="${build.4jdk7.dir}/JTreport">
636 <
637 <      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
638 <      <arg value="-agentvm"/>
639 <      <arg value="-v:nopass,fail"/>
640 <      <arg value="-vmoptions:-esa -ea"/>
641 <      <arg value="-automatic"/>
642 <      <arg value="-k:!ignore"/>
643 <    </jtreg>
644 <  </target>
645 <
646 <
647 <  <target name="4jdk7-test"
648 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
649 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
650 <  </target>
651 <
652 <
653 <  <target name="4jdk7docs"
654 <          description="Builds javadocs for src/jdk7 to dist dir">
655 <
656 <    <delete dir="${dist.4jdk7.docs.dir}"/>
657 <    <mkdir dir="${dist.4jdk7.docs.dir}"/>
658 <
659 <    <javadoc destdir="${dist.4jdk7.docs.dir}"
660 <             packagenames="none"
661 <             link="${jdkapi7docs.url}"
662 <             overview="${4jdk7src.dir}/intro.html"
663 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
664 <             classpath=""
665 <             executable="${javadoc7}">
666 <      <arg value="-XDignore.symbol.file=true"/>
667 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
668 <        <include name="**/*.java"/>
669 <      </fileset>
670 <    </javadoc>
671 <
672 <  </target>
673 <
674 <
675 <  <target name="4jdk7dist"
676 <          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
677 <          description="Puts all distributable products in single hierarchy"/>
678 <
679 <
680 <
681 <  <target name="4jdk7clean"
682 <          description="Removes all 4jdk7 build products">
683 <
684 <    <delete dir="${build.4jdk7.dir}"/>
685 <
686 <  </target>
687 <
688 <
689 <
690 <  <target name="4jdk7dist-clean"
691 <          description="Removes all build and distribution products">
692 <
693 <  </target>
694 <
695 <  <target name="4jdk7dist-jar"
696 <          depends="4jdk7clean, 4jdk7compile">
697 <
698 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
699 <
700 <  </target>
701 <
702 <
703 <  <!-- jsr166x -->
704 <
705 <  <target name="jsr166xcompile"
706 <          depends="configure-compiler"
707 <          description="Compiles jsr166x sources to build dir">
708 <
709 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
710 <
711 <    <javac srcdir="${topsrc.dir}"
712 <           destdir="${build.jsr166x.classes.dir}"
713 <           debug="${build.debug}"
714 <           debuglevel="${build.debuglevel}"
715 <           deprecation="${build.deprecation}"
716 <           classpath=""
717 <           source="5"
718 <           bootclasspath="${bootclasspath6}"
719 <           includeAntRuntime="false"
720 <           includeJavaRuntime="false"
721 <           executable="${javac7}"
722 <           fork="true">
723 <
724 <      <include name="jsr166x/**/*.java"/>
533 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
534 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
535        <compilerarg line="${build.args}"/>
726      <compilerarg value="-XDignore.symbol.file=true"/>
727      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
728
536      </javac>
730
537    </target>
538  
539  
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 <  <target name="jsr166xjar"
736 <          depends="jsr166xcompile"
737 <          description="Builds library jar from compiled sources">
548 > <!-- Find buglets that can be detected by static build tools -->
549  
550 <    <jar destfile="${jsr166x.jar}">
551 <      <fileset dir="${build.jsr166x.classes.dir}"/>
552 <    </jar>
553 <
554 <  </target>
744 <
745 <
746 <
747 <  <target name="jsr166xdocs"
748 <          description="Builds javadocs to dist dir">
749 <
750 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
751 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
752 <
753 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
754 <             packagenames="jsr166x.*"
755 <             link="${jdkapidocs.url}"
756 <             source="5"
757 <             bootclasspath="${bootclasspath6}"
758 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
759 <             executable="${javadoc7}"
760 <             additionalparam="-XDignore.symbol.file=true"/>
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 <  <target name="jsr166xdist"
565 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
566 <          description="Puts all distributable products in single hierarchy"/>
567 <
568 <
569 <
570 <  <target name="jsr166xclean"
571 <          description="Removes all jsr166x build products">
572 <
573 <    <delete dir="${build.jsr166x.dir}"/>
574 <
575 <  </target>
576 <
577 <
578 <
579 <  <target name="jsr166xdist-clean"
580 <          description="Removes all build and distribution products">
581 <
582 <  </target>
583 <
584 <
585 <  <target name="jsr166xdist-jar"
586 <          depends="jsr166xclean, jsr166xjar">
587 <
588 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
589 <
590 <  </target>
591 <
592 <  <!-- jsr166y -->
593 <
594 <
595 <  <target name="jsr166ycompile"
596 <          depends="configure-compiler"
597 <          description="Compiles jsr166y sources">
598 <
599 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
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="${topsrc.dir}"
613 <           destdir="${build.jsr166y.classes.dir}"
612 >    <javac srcdir="${src.dir}"
613 >           destdir="${destdir}"
614             debug="${build.debug}"
615             debuglevel="${build.debuglevel}"
616             deprecation="${build.deprecation}"
807           source="6"
617             classpath=""
809           bootclasspath="${bootclasspath6}"
618             includeAntRuntime="false"
619             includeJavaRuntime="false"
620 <           executable="${javac7}"
620 >           encoding="ASCII"
621 >           executable="${build.main.javac}"
622             fork="true">
623  
624 <      <include name="jsr166y/**/*.java"/>
625 <      <compilerarg line="${build.args}"/>
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 <    </javac>
637 <  </target>
638 <
822 <
823 <  <target name="jsr166yjar"
824 <          depends="jsr166ycompile"
825 <          description="Builds library jar from compiled sources">
826 <
827 <    <jar destfile="${jsr166y.jar}" index="true">
828 <      <fileset dir="${build.jsr166y.classes.dir}"/>
829 <    </jar>
830 <
831 <  </target>
832 <
833 <
834 <
835 <  <target name="jsr166ydocs"
836 <          description="Builds javadocs to dist dir">
837 <
838 <    <delete dir="${dist.jsr166yjavadocs.dir}"/>
839 <    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
840 <
841 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
842 <             packagenames="jsr166y.*"
843 <             link="${jdkapidocs.url}"
844 <             source="6"
845 <             bootclasspath="${bootclasspath6}"
846 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
847 <             executable="${javadoc7}"
848 <             additionalparam="-XDignore.symbol.file=true"/>
849 <
850 <  </target>
851 <
852 <
853 <  <target name="jsr166ydist"
854 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
855 <          description="Puts all distributable products in single hierarchy"/>
856 <
857 <
858 <
859 <  <target name="jsr166yclean"
860 <          description="Removes all jsr166y build products">
861 <
862 <    <delete dir="${build.jsr166y.dir}"/>
863 <
864 <  </target>
865 <
866 <
867 <
868 <  <target name="jsr166ydist-clean"
869 <          description="Removes all build and distribution products">
870 <
871 <  </target>
872 <
873 <  <target name="jsr166ydist-jar"
874 <          depends="jsr166yclean, jsr166yjar">
875 <
876 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
877 <
878 <  </target>
879 <
880 <
881 <  <!-- extra166y -->
882 <
883 <
884 <  <target name="extra166ycompile"
885 <          depends="configure-compiler, jsr166yjar"
886 <          description="Compiles extra166y sources">
887 <
888 <    <mkdir dir="${build.extra166y.classes.dir}"/>
889 <
890 <    <javac srcdir="${topsrc.dir}"
891 <           destdir="${build.extra166y.classes.dir}"
892 <           debug="${build.debug}"
893 <           debuglevel="${build.debuglevel}"
894 <           deprecation="${build.deprecation}"
895 <           classpath=""
896 <           source="6"
897 <           bootclasspath="${jsr166y.jar}:${bootclasspath6}"
898 <           includeAntRuntime="false"
899 <           includeJavaRuntime="false"
900 <           executable="${javac7}"
901 <           fork="true">
902 <
903 <      <include name="extra166y/**/*.java"/>
904 <      <compilerarg line="${build.args}"/>
905 <      <compilerarg value="-XDignore.symbol.file=true"/>
906 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
907 <
908 <    </javac>
909 <
910 <  </target>
911 <
912 <
913 <
914 <  <target name="extra166yjar"
915 <          depends="extra166ycompile"
916 <          description="Builds library jar from compiled sources">
917 <
918 <    <jar destfile="${extra166y.jar}" index="true">
919 <      <fileset dir="${build.extra166y.classes.dir}"/>
920 <    </jar>
921 <
922 <  </target>
923 <
924 <
925 <
926 <  <target name="extra166ydocs"
927 <          description="Builds javadocs to build dir">
928 <
929 <    <delete dir="${dist.extra166yjavadocs.dir}"/>
930 <    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
931 <
932 <    <javadoc destdir="${dist.extra166yjavadocs.dir}"
933 <             packagenames="extra166y.*"
934 <             link="${jdkapidocs.url}"
935 <             source="6"
936 <             bootclasspath="${bootclasspath6}"
937 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
938 <             executable="${javadoc7}"
939 <             additionalparam="-XDignore.symbol.file=true"/>
940 <
941 <  </target>
942 <
943 <
944 <  <target name="extra166ydist"
945 <          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
946 <          description="Puts all distributable products in single hierarchy"/>
947 <
948 <
949 <
950 <  <target name="extra166yclean"
951 <          description="Removes all extra166y build products">
952 <
953 <    <delete dir="${build.extra166y.dir}"/>
954 <
955 <  </target>
956 <
957 <
958 <
959 <  <target name="extra166ydist-clean"
960 <          description="Removes all build and distribution products">
961 <
962 <  </target>
963 <
964 <  <target name="extra166ydist-jar"
965 <          depends="extra166yclean, extra166yjar">
966 <
967 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
968 <
969 <  </target>
970 <
971 <  <!-- jsr166e -->
972 <
973 <  <target name="jsr166ecompile"
974 <          depends="configure-compiler"
975 <          description="Compiles jsr166e sources">
976 <
977 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
978 <
979 <    <javac srcdir="${topsrc.dir}"
980 <           destdir="${build.jsr166e.classes.dir}"
981 <           debug="${build.debug}"
982 <           debuglevel="${build.debuglevel}"
983 <           deprecation="${build.deprecation}"
984 <           source="7"
985 <           classpath=""
986 <           includeAntRuntime="false"
987 <           includeJavaRuntime="false"
988 <           executable="${javac7}"
989 <           fork="true">
990 <
991 <      <include name="jsr166e/**/*.java"/>
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}"/>
993      <compilerarg value="-XDignore.symbol.file=true"/>
994      <compilerarg value="-Xlint:all"/>
995
640      </javac>
641  
642 <  </target>
643 <
1000 <
1001 <
1002 <  <target name="jsr166ejar"
1003 <          depends="jsr166ecompile"
1004 <          description="Builds library jar from compiled sources">
1005 <
1006 <    <jar destfile="${jsr166e.jar}" index="true">
1007 <      <fileset dir="${build.jsr166e.classes.dir}"/>
642 >    <jar destfile="${product.jar}">
643 >      <fileset dir="${destdir}"/>
644      </jar>
645  
646 <  </target>
647 <
648 <
649 <
650 <  <target name="jsr166edocs"
651 <          description="Builds javadocs to build dir">
652 <
653 <    <delete dir="${dist.jsr166ejavadocs.dir}"/>
654 <    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
655 <
656 <    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
657 <             packagenames="jsr166e.*"
658 <             link="${jdkapidocs.url}"
659 <             source="7"
660 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
661 <             executable="${javadoc7}"
662 <             additionalparam="-XDignore.symbol.file=true" >
663 <    </javadoc>
664 <
665 <  </target>
666 <
667 <
668 <  <target name="jsr166edist"
669 <          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
670 <          description="Puts all distributable products in single hierarchy"/>
671 <
672 <
673 <
674 <  <target name="jsr166eclean"
675 <          description="Removes all jsr166e build products">
676 <
677 <    <delete dir="${build.jsr166e.dir}"/>
678 <
679 <  </target>
680 <
681 <
682 <  <target name="jsr166edist-clean"
683 <          description="Removes all build and distribution products">
684 <
685 <  </target>
686 <
687 <  <target name="jsr166edist-jar"
688 <          depends="jsr166eclean, jsr166ejar">
689 <
690 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
646 >    <run-tck-tests
647 >      target="${java.runtime.target}"
648 >      workdir="${build.dir}"
649 >      classes="${product.jar}">
650 >      <javac-elements>
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 >    <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="${guava.dir}/guava-testlib-tests.jar"/>
746 >        <path refid="guava.testlib.classpath"/>
747 >      </classpath>
748  
749 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
750 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
751 +    </junit>
752    </target>
753  
754   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines