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.201 by dl, Sat Mar 26 12:35:25 2016 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"
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.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
73  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
74  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
75  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
76
77  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
78  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
79  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
80  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
81
82  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
83  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
84  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
85  <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 95 | 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"/>
99 <    <available property="have.java.base"
100 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
101 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
102 <      if:set="have.java.base"/>
103 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
104 <      unless:set="have.java.base"/>
105 <    <local name="modules"/>
106 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
107 <    <local name="boot.jar.dir"/>
108 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
109 <    <path id="bootclasspath@{v}" unless:set="modules">
110 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
111 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
112 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
113 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
114 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
115 <    </path>
116 <    <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 129 | Line 88
88      </sequential>
89    </macrodef>
90  
91 <  <defjdklocations v="6"/>
92 <  <defjdklocations v="7"/>
93 <  <defjdklocations v="8"/>
94 <  <defjdklocations v="9"/>
91 >  <defjdklocations v="17"/>
92 >  <defjdklocations v="18"/>
93 >  <defjdklocations v="19"/>
94 >  <defjdklocations v="20"/>
95 >  <defjdklocations v="21"/>
96  
97    <!-- Source locations -->
98    <property name="src.dir"              location="${basedir}/src/main"/>
99    <property name="test.src.dir"         location="${basedir}/src/test"/>
100    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
101    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
102 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
103 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
104 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
105 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
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"/>
149  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
154  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
111  
112    <!-- Javadoc locations -->
113    <property name="docs.dir"          location="${build.dir}/docs"/>
114 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
163 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
164 <
165 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
171 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
114 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
115  
116    <!-- Jar locations -->
117    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
180  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
118    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
119  
120    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
121 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
122 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
123 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
124 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
125 <  <!-- The expected canonical location does not yet exist as of 2016-03 -->
126 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
127 <  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
128 <  <!-- Default jdk doc location (latest stable release seems best) -->
192 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
121 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
122 >  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
123 >  <property name="java18.docroot.url" value="https://docs.oracle.com/en/java/javase/18/docs"/>
124 >  <property name="java19.docroot.url" value="https://docs.oracle.com/en/java/javase/19/docs"/>
125 >  <property name="java20.docroot.url" value="https://download.java.net/java/early_access/jdk20/docs"/>
126 >  <property name="java21.docroot.url" value="https://download.java.net/java/early_access/jdk21/docs"/>
127 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
128 >  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
129  
130    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
131 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
132 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
133 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
134 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
135 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
131 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
132 >  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
133 >  <property name="java19.api.url"     value="${java19.docroot.url}/api/"/>
134 >  <property name="java20.api.url"     value="${java20.docroot.url}/api/"/>
135 >  <property name="java21.api.url"     value="${java21.docroot.url}/api/"/>
136    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
137  
138    <!-- Define the "jtreg" task -->
# Line 204 | Line 140
140    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
141             classpath="${lib.dir}/jtreg.jar" />
142  
143 <  <!-- Tck options; see JSR166TestCase.java
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:
# Line 227 | Line 163
163  
164      <sequential>
165  
230    <local name="modules"/>
231    <condition property="modules">
232      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233    </condition>
234
166      <mkdir dir="@{workdir}/tck-classes"/>
167  
168      <javac srcdir="@{tck.src.dir}"
# Line 244 | Line 175
175             classpath="${junit.jar}"
176             includeAntRuntime="false"
177             includeJavaRuntime="false"
178 +           encoding="ASCII"
179             executable="${javac@{compile-target}}"
180             fork="true">
181  
182        <include name="*.java"/>
183        <compilerarg value="-XDignore.symbol.file=true"/>
184        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
185 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
186 <      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
185 >      <compilerarg value="-Xdoclint:reference/private"/>
186 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
187        <compilerarg line="${build.args}"/>
188        <javac-elements/>
189  
# Line 261 | Line 193
193            failonerror="true"
194            jvm="${java@{target}}"
195            fork="true">
196 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
197 <        <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
198 <        <jvmarg line="@{jvmflags}"/>
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>
207 >        <syspropertyset id="system-properties-used-by-tck">
208 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
209 >          <propertyref prefix="jsr166."/>
210 >          <propertyref name="test.timeout.factor"/>
211 >        </syspropertyset>
212 >
213 >        <classpath>
214 >          <pathelement location="${junit.jar}"/>
215 >          <pathelement location="@{workdir}/tck-classes"/>
216 >        </classpath>
217      </java>
218  
219      </sequential>
220    </macrodef>
221  
222    <!-- Define jtreg test sets for different jdk versions -->
223 <  <fileset dir="${jtreg9.src.dir}">
224 <    <patternset id="jdk9.jtreg.tests">
225 <      <include name="**/*.java"/>
226 <    </patternset>
227 <  </fileset>
228 <
229 <  <fileset dir="${jtreg8.src.dir}">
230 <    <patternset id="jdk8.jtreg.tests">
231 <      <include name="**/*.java"/>
232 <      <exclude name="**/SpliteratorCharacteristics.java"/>
233 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
234 <      <exclude name="**/GCDuringIteration.java"/>
235 <    </patternset>
298 <  </fileset>
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 <  <fileset dir="${jtreg7.src.dir}">
238 <    <patternset id="jdk7.jtreg.tests">
239 <      <include name="**/*.java"/>
240 <    </patternset>
241 <  </fileset>
237 >  <defjtregtests v="17"/>
238 >  <defjtregtests v="18"/>
239 >  <defjtregtests v="19"/>
240 >  <defjtregtests v="20"/>
241 >  <defjtregtests v="21"/>
242  
243    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
244    <property name="jtreg.flags" value=""/>
245  
246    <macrodef name="run-jtreg-tests">
310    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
311    <attribute name="source" default="7"/>
247      <attribute name="target"/>
248      <attribute name="workdir"/>
249      <attribute name="classes"/>
250 +    <attribute name="verbose" default="${jtreg.verbose}"/>
251      <attribute name="jtregflags" default=""/>
252 +    <element name="jtreg-elements" optional="true"/>
253  
254      <sequential>
255  
256      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
257      <property name="jtreg.verbose" value="nopass,fail,error"/>
258  
259 <    <local name="modules"/>
260 <    <condition property="modules">
261 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
262 <    </condition>
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"/>
328 <    <delete dir="@{workdir}/JTreport" quiet="true"/>
329 <    <mkdir dir="@{workdir}/JTwork/scratch"/>
330 <    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
331 <    <mkdir dir="@{workdir}/JTreport/html"/>
332 <    <mkdir dir="@{workdir}/JTreport/text"/>
265 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
266      <jtreg dir="${jtreg@{target}.src.dir}"
267             jdk="${jdk@{target}.home}"
268 <           workDir="@{workdir}/JTwork"
336 <           reportDir="@{workdir}/JTreport">
268 >           workDir="@{workdir}/JTwork">
269        <patternset refid="jdk@{target}.jtreg.tests"/>
270 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
271 <      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
272 <      <arg value="-agentvm"/>
273 <      <arg value="-verbose:${jtreg.verbose}"/>
270 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
271 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
272 >      <arg value="-vmoption:-Xmx256m"/>
273 >      <arg value="-concurrency:${jtreg.concurrency}"/>
274        <arg value="-vmoptions:-esa -ea"/>
275 +      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
276 +      <arg value="-agentvm"/>
277 +      <arg value="-noreport"/>
278 +      <arg value="-verbose:@{verbose}"/>
279        <arg value="-automatic"/>
280        <arg value="-k:!ignore"/>
281        <arg line="@{jtregflags}"/>
282        <arg line="${jtreg.flags}"/>
283 +      <jtreg-elements/>
284      </jtreg>
285      </sequential>
286    </macrodef>
# Line 354 | Line 291
291    </path>
292  
293    <!-- Support @jls tag, used in jdk8+ javadoc -->
294 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
295    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
296    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
297  
298    <!-- Main targets -->
299  
300 <  <property name="build.main.java.version" value="9"/>
301 <  <property name="build.main.javac" value="${javac9}"/>
300 >  <!-- Default values: may seem strange ... -->
301 >  <!-- At runtime, target latest, but build for current LTS -->
302 >  <property name="java.runtime.target" value="19"/>
303 >  <property name="build.main.java" value="${java17}"/>
304 >  <property name="build.main.javac" value="${javac17}"/>
305 >  <property name="build.main.javadoc" value="${javadoc19}"/>
306 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
307  
308    <target name="dists"
309 <          depends="dist, 4jdk8dist, 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  
373    <local name="modules"/>
374    <condition property="modules">
375      <and>
376        <available file="${jdk9.home}/jmods" type="dir"/>
377        <equals arg1="9" arg2="${build.main.java.version}"/>
378      </and>
379    </condition>
380
316      <local name="destdir"/>
317 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
383 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
317 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
318  
319      <mkdir dir="${destdir}"/>
320  
# Line 392 | Line 326
326             classpath=""
327             includeAntRuntime="false"
328             includeJavaRuntime="false"
329 +           encoding="ASCII"
330             executable="${build.main.javac}"
331             fork="true">
332  
333        <include name="**/*.java"/>
334 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
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"/>
403      <compilerarg value="-Werror"/>
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}"/>
407
343      </javac>
409
410    <!-- We need jdk9's Contended annotation, but at compile time only -->
411    <!--
412        <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
413    -->
344    </target>
345  
416
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."/>
# Line 430 | Line 360
360  
361    <target name="docs"
362            description="Builds javadocs for src/main to dist dir">
363 <
434 <    <delete dir="${docs.dir}"/>
363 >    <delete dir="${docs.dir}" quiet="true"/>
364      <mkdir dir="${docs.dir}"/>
436
437    <!-- the packagenames="none" hack below prevents scanning the -->
438    <!-- sourcepath for packages -->
439
365      <javadoc destdir="${docs.dir}"
366               packagenames="none"
367 <             link="${java9.api.url}"
367 >             link="${java.api.url}"
368               overview="${src.dir}/intro.html"
369               access="${build.javadoc.access}"
370 <             sourcepath="${src.dir}:${jdk9.src.dir}"
370 >             sourcepath="${src.dir}"
371               classpath=""
372 <             executable="${javadoc9}">
372 >             source="${build.main.javadoc.source}"
373 >             executable="${build.main.javadoc}">
374        <fileset dir="${src.dir}" defaultexcludes="yes">
375 <        <include name="**/*.java"/>
375 >        <include name="java/**/*.java"/>
376        </fileset>
377 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
377 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
378        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
379 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1"/>
380 +      <arg value="-quiet"/>
381        <arg value="-XDignore.symbol.file=true"/>
382 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
383 <      <arg value="-tag"/>
384 <      <arg value="${javadoc.jls.option}"/>
385 <      <arg value="-tag"/>
386 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
387 <      <arg value="-tag"/>
388 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
389 <      <arg value="-tag"/>
390 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
463 < <!-- tags added in jdk9 -->
464 <      <arg value="-tag"/>
465 <      <arg value="revised:X"/>
466 <      <arg value="-tag"/>
467 <      <arg value="spec:X"/>
382 >      <arg value="-html5"/>
383 >      <arg value="-Xdoclint:all,-missing"/>
384 >      <arg value="--patch-module=java.base=${src.dir}"/>
385 >      <arg value="--frames" if:set="use-frames"/>
386 >      <arg value="--override-methods=summary"/>
387 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
388 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
389 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
390 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
391      </javadoc>
392    </target>
393  
471
394    <target name="dist"
395            depends="dist-clean, dist-jar, dist-docs"
396            description="Puts all distributable products in single hierarchy"/>
397  
476
477  <target name="release"
478          depends="dist"
479          description="Puts entire CVS tree, plus distribution productions, in a jar">
480
481    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
482
483    <jar basedir="${basedir}" destfile="${release.jar}">
484      <!-- <exclude name="build/**"/> -->
485      <exclude name="${release.jar}"/>
486      <exclude name="user.properties"/>
487      <exclude name="etc/notes/**"/>
488      <exclude name="src/emulation/**"/>
489      <exclude name="**/SyntaxTest.java"/>
490      <exclude name="**/SuperfluousAbstract.java"/>
491      <manifest>
492        <attribute name="Built-By" value="${user.name}"/>
493        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
494      </manifest>
495    </jar>
496  </target>
497
498
398    <target name="clean"
399            description="Removes all build products">
501
400      <delete dir="${build.dir}"/>
503
401    </target>
402  
506
403    <target name="dist-clean"
404            description="Removes all build and distribution products">
509
405      <delete dir="${build.dir}"/>
406      <delete dir="${dist.dir}"/>
512
407    </target>
408  
515
409    <target name="dist-jar"
410            depends="clean, jar">
411      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 524 | Line 417
417    </target>
418  
419    <target name="tck"
420 <          depends="jar"
421 <          description="Runs tck tests for main directly">
529 <
420 >          depends="jar"
421 >          description="Runs tck tests for src/main directly">
422      <run-tck-tests
423 <      target="${build.main.java.version}"
423 >      target="${java.runtime.target}"
424        workdir="${build.dir}"
425 <      classes="${product.jar}"/>
425 >      classes="${product.jar}">
426 >      <javac-elements>
427 >        <!-- <compilerarg value="-Werror"/> -->
428 >      </javac-elements>
429 >    </run-tck-tests>
430    </target>
431  
432    <target name="tck-parallelism-1"
433 <          description="Runs tck with given common pool parallelism">
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 given common pool parallelism">
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 main using the jtreg ant task">
454 >          depends="jar"
455 >          description="Runs jtreg tests for src/main using the jtreg ant task">
456      <run-jtreg-tests
457 <       target="${build.main.java.version}"
457 >       target="${java.runtime.target}"
458         workdir="${build.dir}"
459         classes="${product.jar}"/>
460    </target>
461  
462    <target name="test"
463 <          depends="tck, tck-parallelism-1, jtreg"
464 <          description="Runs tck and jtreg tests for main">
562 <  </target>
463 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
464 >          description="Runs tck and jtreg tests for src/main"/>
465  
466 <  <target name="jtreg8" description="Runs jtreg tests with jdk8">
467 <
468 <    <antcall target="jtreg">
469 <      <param name="build.main.java.version" value="8"/>
470 <      <param name="build.main.javac" value="${javac8}"/>
466 >  <target name="test-version-permutations"
467 >          depends="test17, test19, clean, test, docs"
468 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
469 >
470 >
471 >  <target name="test17">
472 >    <antcall>
473 >      <param name="java.runtime.target" value="17"/>
474 >      <param name="build.main.javac" value="${javac17}"/>
475 >      <param name="build.main.javadoc" value="${javadoc17}"/>
476 >      <param name="build.main.javadoc.source" value="17"/>
477 >      <target name="clean"/>
478 >      <target name="test"/>
479 >      <target name="docs"/>
480      </antcall>
570
481    </target>
482 <
483 <  <target name="test89"
484 <          description="Runs tck and jtreg tests for main for multiple java versions">
485 <
486 <    <antcall target="clean"/>
487 <    <antcall target="test">
488 <      <param name="build.main.java.version" value="8"/>
489 <      <param name="build.main.javac" value="${javac8}"/>
490 <    </antcall>
581 <
582 <    <antcall target="clean"/>
583 <    <antcall target="test">
584 <      <param name="build.main.java.version" value="9"/>
585 <      <param name="build.main.javac" value="${javac9}"/>
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>
587
492    </target>
493  
494  
591
495    <target name="configure-compiler">
496      <fail message="ant version too old">
497 <      <condition>
595 <        <not> <antversion atleast="1.9.1"/> </not>
596 <      </condition>
497 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
498      </fail>
499  
500      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 611 | Line 512
512    </target>
513  
514  
614
615  <!-- Various demos and test programs -->
616
617
618  <target name="loops" depends="configure-compiler"
619          description="Benchmark from Doug Lea's AQS paper">
620
621    <mkdir dir="${build.loops.dir}"/>
622
623    <javac srcdir="${loops.src.dir}"
624          destdir="${build.loops.dir}"
625            debug="${build.debug}"
626       debuglevel="${build.debuglevel}"
627      deprecation="${build.deprecation}"
628           source="${build.sourcelevel}"
629           target="${build.sourcelevel}"
630             fork="true">
631
632      <compilerarg line="${build.args}"/>
633      <classpath refid="loops.classpath"/>
634      <compilerarg value="-XDignore.symbol.file=true"/>
635
636    </javac>
637
638    <java classname="ALoops" fork="true">
639      <classpath refid="loops.classpath"/>
640    </java>
641
642  </target>
643
644
515    <target name="compile-test-loops" depends="jar"
516 <          description="compile all the perf tests in src/test/loops">
516 >          description="Compiles all the perf tests in src/test/loops">
517  
518      <mkdir dir="${build.dir}/test/loops"/>
519  
# Line 654 | Line 524
524             deprecation="${build.deprecation}"
525             includeAntRuntime="false"
526             includeJavaRuntime="false"
527 <           executable="${javac9}"
527 >           encoding="ASCII"
528 >           executable="${build.main.javac}"
529             fork="true">
530  
531        <include name="*.java"/>
532        <compilerarg value="-XDignore.symbol.file=true"/>
533 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
534 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
664 <      <compilerarg line="${build.args}"/>
665 <
666 <    </javac>
667 <
668 <  </target>
669 <
670 <
671 <  <!-- jsr166 4jdk8 -->
672 <
673 <  <target name="4jdk8compile"
674 <          depends="configure-compiler"
675 <          description="Compiles src/jdk8 sources, targeting jdk8">
676 <
677 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
678 <
679 <    <javac srcdir="${4jdk8src.dir}"
680 <           destdir="${build.4jdk8.classes.dir}"
681 <           debug="${build.debug}"
682 <           debuglevel="${build.debuglevel}"
683 <           deprecation="${build.deprecation}"
684 <           source="8"
685 <           target="8"
686 <           classpath=""
687 <           bootclasspath="${bootclasspath8}"
688 <           includeAntRuntime="false"
689 <           includeJavaRuntime="false"
690 <           executable="${javac8}"
691 <           fork="true">
692 <
693 <      <include name="**/*.java"/>
694 <      <compilerarg value="-Xprefer:source"/>
695 <      <compilerarg value="-XDignore.symbol.file=true"/>
696 <      <compilerarg value="-Xlint:all"/>
697 <      <compilerarg value="-Werror"/>
533 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
534 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
535        <compilerarg line="${build.args}"/>
699
536      </javac>
537    </target>
538  
703  <target name="4jdk8doclint"
704          depends="configure-compiler"
705          description="Finds doclint warnings">
706
707    <mkdir dir="${build.4jdk8.classes.dir}"/>
708
709    <javac srcdir="${4jdk8src.dir}"
710           destdir="${build.4jdk8.classes.dir}"
711           debug="${build.debug}"
712           debuglevel="${build.debuglevel}"
713           deprecation="${build.deprecation}"
714           source="8"
715           target="8"
716           classpath=""
717           bootclasspath="${bootclasspath8}"
718           includeAntRuntime="false"
719           includeJavaRuntime="false"
720           executable="${javac8}"
721           fork="true">
722
723      <include name="**/*.java"/>
724      <compilerarg value="-Xprefer:source"/>
725      <compilerarg value="-XDignore.symbol.file=true"/>
726      <compilerarg value="-Xlint:all"/>
727      <compilerarg value="-Xdoclint:all/protected"/>
728      <compilerarg line="${build.args}"/>
729
730    </javac>
731  </target>
732
733
734  <target name="4jdk8jar"
735          depends="4jdk8compile"
736          description="Builds library jar from compiled sources">
737
738    <jar destfile="${4jdk8product.jar}">
739      <fileset dir="${build.4jdk8.classes.dir}"/>
740      <manifest>
741        <attribute name="Built-By" value="${user.name}"/>
742        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
743      </manifest>
744    </jar>
745
746  </target>
747
748
749  <target name="4jdk8-tck"
750          depends="4jdk8jar"
751          description="Runs tck tests for jsr166-4jdk8 directly">
752
753    <run-tck-tests
754      target="8"
755      workdir="${build.4jdk8.dir}"
756      classes="${4jdk8product.jar}">
757      <javac-elements>
758        <!-- JDK9+ test classes -->
759        <exclude name="*9Test.java"/>
760        <exclude name="*10Test.java"/>
761      </javac-elements>
762    </run-tck-tests>
763  </target>
764
765
766  <target name="4jdk8-jtreg"
767          depends="4jdk8jar"
768          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
769    <run-jtreg-tests
770       target="8"
771       workdir="${build.4jdk8.dir}"
772       classes="${4jdk8product.jar}"/>
773  </target>
774
775
776  <target name="4jdk8-test"
777          depends="4jdk8-tck, 4jdk8-jtreg"
778          description="Runs tck and jtreg tests for jsr166-4jdk8">
779  </target>
780
781
782  <target name="4jdk8docs"
783          description="Builds javadocs for src/jdk8 to dist dir">
784
785    <delete dir="${4jdk8docs.dir}"/>
786    <mkdir dir="${4jdk8docs.dir}"/>
787
788    <javadoc destdir="${4jdk8docs.dir}"
789             packagenames="none"
790             link="${java8.api.url}"
791             overview="${4jdk8src.dir}/intro.html"
792             access="${build.javadoc.access}"
793             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
794             classpath=""
795             executable="${javadoc8}">
796      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
797        <include name="**/*.java"/>
798      </fileset>
799      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
800      <arg value="-XDignore.symbol.file=true"/>
801      <arg value="-tag"/>
802      <arg value="${javadoc.jls.option}"/>
803      <arg value="-tag"/>
804      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
805      <arg value="-tag"/>
806      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
807      <arg value="-tag"/>
808      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
809    </javadoc>
810  </target>
811
812
813  <target name="4jdk8dist"
814          depends="4jdk8dist-jar, 4jdk8dist-docs"
815          description="Puts all distributable products in single hierarchy"/>
816
817
818  <target name="4jdk8clean"
819          description="Removes all 4jdk8 build products">
820
821    <delete dir="${build.4jdk8.dir}"/>
822
823  </target>
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="4jdk8dist-jar"
827 <          depends="4jdk8clean, 4jdk8jar">
828 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
829 <  </target>
548 > <!-- Find buglets that can be detected by static build tools -->
549  
550 + <!--   <target name="lint"> -->
551 + <!--     <antcall target="dists"> -->
552 + <!--       <param name="build.javadoc.access" value="protected"/> -->
553 + <!--     </antcall> -->
554 + <!--   </target> -->
555  
556 <  <target name="4jdk8dist-docs"
557 <          depends="4jdk8clean, 4jdk8docs">
558 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
556 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
557 >  <target name="doclint-private">
558 >    <antcall target="dist">
559 >      <param name="build.javadoc.access" value="private"/>
560 >    </antcall>
561    </target>
562  
563  
564 + <!-- ==============================================================
565 +  Experimental errorprone support
566 +  https://errorprone.info
567 +  https://errorprone.info/docs/installation
568 +  https://github.com/google/error-prone/issues/1143
569 + =================================================================== -->
570 +  <path id="errorprone.processorpath.path">
571 +    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
572 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
573 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
574 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
575 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
576 +  </path>
577 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
578 +  <property name="errorprone.jsr166.user.flags" value=""/>
579 +  <property name="errorprone.jsr166.flags"
580 +            value="-Xep:HashtableContains:OFF
581 +                   -Xep:PreferJavaTimeOverload:OFF
582 +                   -Xep:JdkObsolete:OFF
583 +                   -Xep:MissingOverride:OFF
584 +                   -Xep:MissingFail:OFF
585 +                   -Xep:ThreadPriorityCheck:OFF
586 +                   -Xep:MixedArrayDimensions:ERROR
587 +                   -Xep:RemoveUnusedImports:ERROR
588 +                   -Xep:EmptyIf:ERROR
589 +                   -Xep:MultipleTopLevelClasses:ERROR
590 +                   -Xep:ClassName:ERROR
591 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
592 +                   -Xep:RedundantThrows:ERROR
593 +                   -Xep:IdentityBinaryExpression:WARN
594 +                   -Xep:ConstructorInvokesOverridable:WARN
595 +                   -Xep:MethodCanBeStatic:WARN
596 +                   ${errorprone.jsr166.user.flags}"/>
597 +  <!-- -Xep:WildcardImport:ERROR -->
598 +  <property name="errorprone.jsr166.test.flags"
599 +            value="-Xep:StringSplitter:OFF
600 +                   -Xep:BoxedPrimitiveConstructor:OFF
601 +                   -Xep:UnnecessaryParentheses:OFF
602 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
603 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
604 +  <target name="errorprone"
605 +          depends="clean, configure-compiler"
606 +          description="Run errorprone over jsr166 source code (experimental)">
607  
608 <  <!-- jsr166 4jdk7 -->
609 <
610 <  <target name="4jdk7compile"
842 <          depends="configure-compiler"
843 <          description="Compiles src/jdk7 sources, targeting jdk7">
844 <
845 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
846 <
847 <    <javac srcdir="${4jdk7src.dir}"
848 <           destdir="${build.4jdk7.classes.dir}"
849 <           debug="${build.debug}"
850 <           debuglevel="${build.debuglevel}"
851 <           deprecation="${build.deprecation}"
852 <           source="6"
853 <           target="6"
854 <           classpath=""
855 <           bootclasspath="${bootclasspath6}"
856 <           includeAntRuntime="false"
857 <           includeJavaRuntime="false"
858 <           executable="${javac7}"
859 <           fork="true">
860 <
861 <      <include name="**/*.java"/>
862 <      <compilerarg value="-Xprefer:source"/>
863 <      <compilerarg value="-XDignore.symbol.file=true"/>
864 <      <compilerarg value="-Xlint:all"/>
865 <      <compilerarg value="-Werror"/>
866 <      <compilerarg line="${build.args}"/>
867 <
868 <    </javac>
869 <  </target>
870 <
871 <  <target name="4jdk7doclint"
872 <          depends="configure-compiler"
873 <          description="Finds doclint warnings">
874 <
875 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
608 >    <local name="destdir"/>
609 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
610 >    <mkdir dir="${destdir}"/>
611  
612 <    <javac srcdir="${4jdk7src.dir}"
613 <           destdir="${build.4jdk7.classes.dir}"
612 >    <javac srcdir="${src.dir}"
613 >           destdir="${destdir}"
614             debug="${build.debug}"
615             debuglevel="${build.debuglevel}"
616             deprecation="${build.deprecation}"
882           source="6"
883           target="6"
617             classpath=""
885           bootclasspath="${bootclasspath6}"
618             includeAntRuntime="false"
619             includeJavaRuntime="false"
620 <           executable="${javac8}"
620 >           encoding="ASCII"
621 >           executable="${build.main.javac}"
622             fork="true">
623  
624        <include name="**/*.java"/>
625 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
626 +      <compilerarg value="-J--illegal-access=permit"/>
627 +      <compilerarg value="-XDcompilePolicy=simple"/>
628 +      <compilerarg value="-processorpath"/>
629 +      <compilerarg pathref="errorprone.processorpath.path"/>
630 +      <compilerarg value="-Xplugin:ErrorProne
631 +                          ${errorprone.jsr166.flags}"/>
632 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
633        <compilerarg value="-Xprefer:source"/>
634        <compilerarg value="-XDignore.symbol.file=true"/>
635        <compilerarg value="-Xlint:all"/>
636 <      <compilerarg value="-Xdoclint:all/protected"/>
636 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
637 >      <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
638 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
639        <compilerarg line="${build.args}"/>
897
640      </javac>
899  </target>
900
641  
642 <  <target name="4jdk7jar"
643 <          depends="4jdk7compile"
904 <          description="Builds library jar from compiled sources">
905 <
906 <    <jar destfile="${4jdk7product.jar}">
907 <      <fileset dir="${build.4jdk7.classes.dir}"/>
908 <      <manifest>
909 <        <attribute name="Built-By" value="${user.name}"/>
910 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
911 <      </manifest>
642 >    <jar destfile="${product.jar}">
643 >      <fileset dir="${destdir}"/>
644      </jar>
645  
914  </target>
915
916
917  <target name="4jdk7-tck"
918          depends="4jdk7jar"
919          description="Runs tck tests for jsr166-4jdk7 directly">
920
646      <run-tck-tests
647 <      target="7"
648 <      workdir="${build.4jdk7.dir}"
649 <      classes="${4jdk7product.jar}">
647 >      target="${java.runtime.target}"
648 >      workdir="${build.dir}"
649 >      classes="${product.jar}">
650        <javac-elements>
651 <        <!-- JDK8+ test classes -->
652 <        <exclude name="*8Test.java"/>
653 <        <exclude name="*9Test.java"/>
654 <        <exclude name="*10Test.java"/>
655 <        <exclude name="DoubleAccumulatorTest.java"/>
656 <        <exclude name="DoubleAdderTest.java"/>
657 <        <exclude name="LongAccumulatorTest.java"/>
658 <        <exclude name="LongAdderTest.java"/>
659 <        <exclude name="CompletableFutureTest.java"/>
935 <        <exclude name="SplittableRandomTest.java"/>
936 <        <exclude name="StampedLockTest.java"/>
937 <        <exclude name="SubmissionPublisherTest.java"/>
651 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
652 >        <compilerarg value="-J--illegal-access=permit"/>
653 >        <compilerarg value="-XDcompilePolicy=simple"/>
654 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
655 >        <compilerarg value="-Xplugin:ErrorProne
656 >                            ${errorprone.jsr166.flags}
657 >                            ${errorprone.jsr166.test.flags}"/>
658 >        <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
659 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
660        </javac-elements>
661      </run-tck-tests>
662    </target>
663  
664 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
665 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
666 +  <target name="errorprone-jtreg"
667 +          depends="jar"
668 +          description="Run errorprone over jtreg tests (experimental)">
669  
670 <  <target name="4jdk7-tck-junit"
671 <          depends="4jdk7compile"
672 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
673 <
674 <    <junit printsummary="true"
675 <           showoutput="true"
676 <           errorProperty="junit.failed"
677 <           failureProperty="junit.failed"
678 <           includeantruntime="true"
679 <           jvm="${java7}"
680 <           fork="true">
681 <
682 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
683 <      <jvmarg value="-server"/>
684 <
670 >    <run-jtreg-tests
671 >       target="${java.runtime.target}"
672 >       workdir="${build.dir}"
673 >       classes="${product.jar}"
674 >       verbose="all">
675 >      <jtreg-elements>
676 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
677 >        <arg value="-javacoption:-processorpath"/>
678 >        <arg value="-javacoption:${errorprone.processorpath}"/>
679 >        <arg value="-javacoption:-Xplugin:ErrorProne
680 >                            ${errorprone.jsr166.flags}
681 >                            ${errorprone.jsr166.test.flags}
682 >                            -Xep:MultipleTopLevelClasses:WARN
683 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
684 >      </jtreg-elements>
685 >    </run-jtreg-tests>
686 >  </target>
687 >
688 >
689 > <!-- ==============================================================
690 >  Running guava tests against jsr166 code
691 > =================================================================== -->
692 >
693 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
694 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
695 > <!-- <property name="guava.version" value="21.0"/> -->
696 >
697 > <!-- HOWTO debug print a path id -->
698 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
699 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
700 >
701 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
702 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
703 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
704 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
705 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
706 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
707 >
708 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
709 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
710 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
711 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
712 >
713 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
714 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
715 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
716 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
717 >
718 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
719 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
720 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
721 >
722 >  <target name="init-ivy">
723 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
724 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
725 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
726 >             classpath="${build.dir}/ivy.jar"/>
727 >  </target>
728 >
729 >  <target name="guava-tests" depends="jar, init-ivy"
730 >          description="Guava tests run against jsr166 collections">
731 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
732 >    <mkdir dir="${guava.dir}"/>
733 >    <ivy:retrieve pathid="guava.testlib.classpath"
734 >      type="jar,bundle" inline="true" conf="default,master"
735 >      pattern="${guava.dir}/[artifact].[ext]"
736 >      organisation="com.google.guava" module="guava-testlib"/>
737 >    <property name="guava.version" value="21.0"/>
738 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
739 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
740 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
741 >           jvm="${build.main.java}" fork="true">
742 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
743 >      <formatter type="brief"/>
744        <classpath>
745 <        <pathelement location="${junit.jar}"/>
746 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
745 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
746 >        <path refid="guava.testlib.classpath"/>
747        </classpath>
748  
749 <      <formatter type="brief"/>
750 <
965 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
966 <      </test>
967 <
749 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
750 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
751      </junit>
752    </target>
753  
971  <target name="4jdk7-jtreg"
972          depends="4jdk7jar"
973          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
974    <run-jtreg-tests
975       target="7"
976       workdir="${build.4jdk7.dir}"
977       classes="${4jdk7product.jar}"/>
978  </target>
979
980
981  <target name="4jdk7-test"
982          depends="4jdk7-tck, 4jdk7-jtreg"
983          description="Runs tck and jtreg tests for jsr166-4jdk7">
984  </target>
985
986
987  <target name="4jdk7docs"
988          description="Builds javadocs for src/jdk7 to dist dir">
989
990    <delete dir="${4jdk7docs.dir}"/>
991    <mkdir dir="${4jdk7docs.dir}"/>
992
993    <javadoc destdir="${4jdk7docs.dir}"
994             packagenames="none"
995             link="${java7.api.url}"
996             overview="${4jdk7src.dir}/intro.html"
997             access="${build.javadoc.access}"
998             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
999             classpath=""
1000             executable="${javadoc7}">
1001      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1002        <include name="**/*.java"/>
1003      </fileset>
1004      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1005      <arg value="-XDignore.symbol.file=true"/>
1006    </javadoc>
1007  </target>
1008
1009
1010  <target name="4jdk7dist"
1011          depends="4jdk7dist-jar, 4jdk7dist-docs"
1012          description="Puts all distributable products in single hierarchy"/>
1013
1014
1015  <target name="4jdk7clean"
1016          description="Removes all 4jdk7 build products">
1017
1018    <delete dir="${build.4jdk7.dir}"/>
1019
1020  </target>
1021
1022
1023  <target name="4jdk7dist-jar"
1024          depends="4jdk7clean, 4jdk7jar">
1025    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1026  </target>
1027
1028
1029  <target name="4jdk7dist-docs"
1030          depends="4jdk7clean, 4jdk7docs">
1031    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1032  </target>
1033
1034
1035  <!-- jsr166x -->
1036
1037  <target name="jsr166xcompile"
1038          depends="configure-compiler"
1039          description="Compiles jsr166x sources to build dir">
1040
1041    <mkdir dir="${build.jsr166x.classes.dir}"/>
1042
1043    <javac srcdir="${topsrc.dir}"
1044           destdir="${build.jsr166x.classes.dir}"
1045           debug="${build.debug}"
1046           debuglevel="${build.debuglevel}"
1047           deprecation="${build.deprecation}"
1048           classpath=""
1049           bootclasspath="${bootclasspath6}"
1050           source="5"
1051           target="5"
1052           includeAntRuntime="false"
1053           includeJavaRuntime="false"
1054           executable="${javac7}"
1055           fork="true">
1056
1057      <include name="jsr166x/**/*.java"/>
1058      <compilerarg value="-XDignore.symbol.file=true"/>
1059      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1060      <compilerarg value="-Werror"/>
1061      <compilerarg line="${build.args}"/>
1062
1063    </javac>
1064  </target>
1065
1066
1067  <target name="jsr166xjar"
1068          depends="jsr166xcompile"
1069          description="Builds library jar from compiled sources">
1070
1071    <jar destfile="${jsr166x.jar}">
1072      <fileset dir="${build.jsr166x.classes.dir}"/>
1073      <manifest>
1074        <attribute name="Built-By" value="${user.name}"/>
1075        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1076      </manifest>
1077    </jar>
1078
1079  </target>
1080
1081
1082  <target name="jsr166xdocs"
1083          description="Builds javadocs to dist dir">
1084
1085    <delete dir="${jsr166xdocs.dir}"/>
1086    <mkdir dir="${jsr166xdocs.dir}"/>
1087
1088    <javadoc destdir="${jsr166xdocs.dir}"
1089             packagenames="jsr166x.*"
1090             link="${java.api.url}"
1091             access="${build.javadoc.access}"
1092             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1093             bootclasspath="${bootclasspath6}"
1094             source="5"
1095             executable="${javadoc7}">
1096      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1097      <arg value="-XDignore.symbol.file=true"/>
1098
1099    </javadoc>
1100  </target>
1101
1102
1103  <target name="jsr166xdist"
1104          depends="jsr166xdist-jar, jsr166xdist-docs"
1105          description="Puts all distributable products in single hierarchy"/>
1106
1107
1108  <target name="jsr166xclean"
1109          description="Removes all jsr166x build products">
1110
1111    <delete dir="${build.jsr166x.dir}"/>
1112
1113  </target>
1114
1115
1116  <target name="jsr166xdist-jar"
1117          depends="jsr166xclean, jsr166xjar">
1118    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1119  </target>
1120
1121  <target name="jsr166xdist-docs"
1122          depends="jsr166xclean, jsr166xdocs">
1123    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1124  </target>
1125
1126  <!-- jsr166y -->
1127
1128
1129  <target name="jsr166ycompile"
1130          depends="configure-compiler"
1131          description="Compiles jsr166y sources">
1132
1133    <mkdir dir="${build.jsr166y.classes.dir}"/>
1134
1135    <javac srcdir="${topsrc.dir}"
1136           destdir="${build.jsr166y.classes.dir}"
1137           debug="${build.debug}"
1138           debuglevel="${build.debuglevel}"
1139           deprecation="${build.deprecation}"
1140           source="6"
1141           target="6"
1142           classpath=""
1143           bootclasspath="${bootclasspath6}"
1144           includeAntRuntime="false"
1145           includeJavaRuntime="false"
1146           executable="${javac7}"
1147           fork="true">
1148
1149      <include name="jsr166y/**/*.java"/>
1150      <compilerarg value="-XDignore.symbol.file=true"/>
1151      <compilerarg value="-Xlint:all"/>
1152      <compilerarg value="-Werror"/>
1153      <compilerarg line="${build.args}"/>
1154
1155    </javac>
1156  </target>
1157
1158
1159  <target name="jsr166yjar"
1160          depends="jsr166ycompile"
1161          description="Builds library jar from compiled sources">
1162
1163    <jar destfile="${jsr166y.jar}" index="true">
1164      <fileset dir="${build.jsr166y.classes.dir}"/>
1165      <manifest>
1166        <attribute name="Built-By" value="${user.name}"/>
1167        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1168      </manifest>
1169    </jar>
1170
1171  </target>
1172
1173
1174  <target name="jsr166ydocs"
1175          description="Builds javadocs to dist dir">
1176
1177    <delete dir="${jsr166ydocs.dir}"/>
1178    <mkdir dir="${jsr166ydocs.dir}"/>
1179
1180    <javadoc destdir="${jsr166ydocs.dir}"
1181             packagenames="jsr166y.*"
1182             link="${java.api.url}"
1183             access="${build.javadoc.access}"
1184             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1185             bootclasspath="${bootclasspath6}"
1186             source="6"
1187             executable="${javadoc7}">
1188      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1189      <arg value="-XDignore.symbol.file=true"/>
1190
1191    </javadoc>
1192  </target>
1193
1194
1195  <target name="jsr166ydist"
1196          depends="jsr166ydist-jar, jsr166ydist-docs"
1197          description="Puts all distributable products in single hierarchy"/>
1198
1199
1200  <target name="jsr166yclean"
1201          description="Removes all jsr166y build products">
1202
1203    <delete dir="${build.jsr166y.dir}"/>
1204
1205  </target>
1206
1207
1208  <target name="jsr166ydist-jar"
1209          depends="jsr166yclean, jsr166yjar">
1210    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1211  </target>
1212
1213  <target name="jsr166ydist-docs"
1214          depends="jsr166yclean, jsr166ydocs">
1215    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1216  </target>
1217
1218
1219  <!-- extra166y -->
1220
1221
1222  <target name="extra166ycompile"
1223          depends="configure-compiler, jsr166yjar"
1224          description="Compiles extra166y sources">
1225
1226    <mkdir dir="${build.extra166y.classes.dir}"/>
1227
1228    <javac srcdir="${topsrc.dir}"
1229           destdir="${build.extra166y.classes.dir}"
1230           debug="${build.debug}"
1231           debuglevel="${build.debuglevel}"
1232           deprecation="${build.deprecation}"
1233           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1234           classpath=""
1235           source="6"
1236           target="6"
1237           includeAntRuntime="false"
1238           includeJavaRuntime="false"
1239           executable="${javac7}"
1240           fork="true">
1241
1242      <include name="extra166y/**/*.java"/>
1243      <compilerarg value="-XDignore.symbol.file=true"/>
1244      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1245      <compilerarg value="-Werror"/>
1246      <compilerarg line="${build.args}"/>
1247
1248    </javac>
1249  </target>
1250
1251
1252  <target name="extra166yjar"
1253          depends="extra166ycompile"
1254          description="Builds library jar from compiled sources">
1255
1256    <jar destfile="${extra166y.jar}" index="true">
1257      <fileset dir="${build.extra166y.classes.dir}"/>
1258      <manifest>
1259        <attribute name="Built-By" value="${user.name}"/>
1260        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1261      </manifest>
1262    </jar>
1263
1264  </target>
1265
1266
1267  <target name="extra166ydocs"
1268          description="Builds javadocs to build dir">
1269
1270    <delete dir="${extra166ydocs.dir}"/>
1271    <mkdir dir="${extra166ydocs.dir}"/>
1272
1273    <javadoc destdir="${extra166ydocs.dir}"
1274             packagenames="extra166y.*"
1275             link="${java.api.url}"
1276             access="${build.javadoc.access}"
1277             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1278             bootclasspath="${bootclasspath6}"
1279             source="6"
1280             executable="${javadoc7}">
1281      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1282      <arg value="-XDignore.symbol.file=true"/>
1283
1284    </javadoc>
1285  </target>
1286
1287
1288  <target name="extra166ydist"
1289          depends="extra166ydist-jar, extra166ydist-docs"
1290          description="Puts all distributable products in single hierarchy"/>
1291
1292
1293  <target name="extra166yclean"
1294          description="Removes all extra166y build products">
1295
1296    <delete dir="${build.extra166y.dir}"/>
1297
1298  </target>
1299
1300
1301  <target name="extra166ydist-jar"
1302          depends="extra166yclean, extra166yjar">
1303    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1304  </target>
1305
1306  <target name="extra166ydist-docs"
1307          depends="extra166yclean, extra166ydocs">
1308    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1309  </target>
1310
1311  <!-- jsr166e -->
1312
1313  <property name="build.jsr166e.java.version" value="6"/>
1314  <property name="build.jsr166e.javac" value="${javac6}"/>
1315
1316  <target name="jsr166ecompile"
1317          depends="configure-compiler"
1318          description="Compiles jsr166e sources">
1319
1320    <mkdir dir="${build.jsr166e.classes.dir}"/>
1321
1322    <javac srcdir="${topsrc.dir}"
1323           destdir="${build.jsr166e.classes.dir}"
1324           debug="${build.debug}"
1325           debuglevel="${build.debuglevel}"
1326           deprecation="${build.deprecation}"
1327           source="${build.jsr166e.java.version}"
1328           target="${build.jsr166e.java.version}"
1329           classpath=""
1330           includeAntRuntime="false"
1331           includeJavaRuntime="false"
1332           executable="${build.jsr166e.javac}"
1333           fork="true">
1334
1335      <include name="jsr166e/**/*.java"/>
1336      <compilerarg value="-XDignore.symbol.file=true"/>
1337      <compilerarg value="-Xlint:all"/>
1338      <compilerarg value="-Werror"/>
1339      <compilerarg line="${build.args}"/>
1340
1341    </javac>
1342  </target>
1343
1344  <!-- jsr166e: find doclint errors -->
1345  <target name="jsr166edoclint">
1346
1347    <mkdir dir="${build.jsr166e.classes.dir}"/>
1348
1349    <javac srcdir="${topsrc.dir}"
1350           destdir="${build.jsr166e.classes.dir}"
1351           debug="${build.debug}"
1352           debuglevel="${build.debuglevel}"
1353           deprecation="${build.deprecation}"
1354           source="${build.jsr166e.java.version}"
1355           target="${build.jsr166e.java.version}"
1356           classpath=""
1357           bootclasspath="${bootclasspath6}"
1358           includeAntRuntime="false"
1359           includeJavaRuntime="false"
1360           executable="${javac8}"
1361           fork="true">
1362
1363      <include name="jsr166e/**/*.java"/>
1364      <compilerarg value="-XDignore.symbol.file=true"/>
1365      <compilerarg value="-Xlint:all"/>
1366      <compilerarg value="-Werror"/>
1367      <compilerarg value="-Xdoclint:all/protected"/>
1368
1369    </javac>
1370  </target>
1371
1372
1373  <target name="jsr166ejar"
1374          depends="jsr166ecompile"
1375          description="Builds library jar from compiled sources">
1376
1377    <jar destfile="${jsr166e.jar}" index="true">
1378      <fileset dir="${build.jsr166e.classes.dir}"/>
1379      <manifest>
1380        <attribute name="Built-By" value="${user.name}"/>
1381        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1382      </manifest>
1383    </jar>
1384
1385  </target>
1386
1387
1388  <target name="jsr166edocs"
1389          description="Builds javadocs to build dir">
1390
1391    <delete dir="${jsr166edocs.dir}"/>
1392    <mkdir dir="${jsr166edocs.dir}"/>
1393
1394    <javadoc destdir="${jsr166edocs.dir}"
1395             packagenames="jsr166e.*"
1396             link="${java.api.url}"
1397             access="${build.javadoc.access}"
1398             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1399             source="${build.jsr166e.java.version}"
1400             executable="${javadoc7}">
1401      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1402      <arg value="-XDignore.symbol.file=true"/>
1403
1404    </javadoc>
1405  </target>
1406
1407
1408  <target name="jsr166e-tck-one-java-version"
1409          depends="jsr166ejar">
1410
1411    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1412
1413    <run-tck-tests
1414      tck.src.dir="${test.src.dir}/tck-jsr166e"
1415      target="${build.jsr166e.java.version}"
1416      workdir="${build.jsr166e.dir}"
1417      classes="${jsr166e.jar}"/>
1418  </target>
1419
1420  <target name="jsr166e-tck"
1421          description="Runs tck tests for jsr166e for multiple java versions">
1422
1423 <!--     <antcall target="clean"/> -->
1424 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1425 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1426 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1427 <!--     </antcall> -->
1428
1429    <antcall target="clean"/>
1430    <antcall target="jsr166e-tck-one-java-version">
1431      <param name="build.jsr166e.java.version" value="7"/>
1432      <param name="build.jsr166e.javac" value="${javac7}"/>
1433    </antcall>
1434
1435    <antcall target="clean"/>
1436    <antcall target="jsr166e-tck-one-java-version">
1437      <param name="build.jsr166e.java.version" value="6"/>
1438      <param name="build.jsr166e.javac" value="${javac6}"/>
1439    </antcall>
1440  </target>
1441
1442
1443  <target name="jsr166e-test"
1444          depends="jsr166e-tck"
1445          description="Runs all tests for jsr166e">
1446  </target>
1447
1448  <target name="jsr166edist"
1449          depends="jsr166edist-jar, jsr166edist-docs"
1450          description="Puts all distributable products in single hierarchy"/>
1451
1452
1453  <target name="jsr166eclean"
1454          description="Removes all jsr166e build products">
1455    <delete dir="${build.jsr166e.dir}"/>
1456  </target>
1457
1458
1459  <target name="jsr166edist-jar"
1460          depends="jsr166eclean, jsr166ejar">
1461    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1462  </target>
1463
1464  <target name="jsr166edist-docs"
1465          depends="jsr166eclean, jsr166edocs">
1466    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1467  </target>
1468
1469
1470 <!-- Find buglets that can be detected by static build tools -->
1471
1472  <target name="lint">
1473    <antcall target="dists">
1474      <param name="build.javadoc.access" value="public"/>
1475    </antcall>
1476  </target>
1477
1478 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1479  <target name="lint-private">
1480    <antcall target="dist">
1481      <param name="build.javadoc.access" value="private"/>
1482    </antcall>
1483  </target>
1484
1485
754   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines