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.202 by jsr166, Sat Mar 26 15:10:14 2016 UTC vs.
Revision 1.325 by dl, Tue Mar 22 21:28:02 2022 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines