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.200 by jsr166, Sat Mar 26 06:22:49 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 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"/>
135 <  <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"/>
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"/>
107  
108    <!-- Javadoc locations -->
109    <property name="docs.dir"          location="${build.dir}/docs"/>
110 <  <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"/>
110 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
111  
112    <!-- Jar locations -->
113    <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"/>
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"/> -->
190 <  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
191 <  <!-- Default jdk doc location (latest stable release seems best) -->
192 <  <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/"/>
198 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
199 <  <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 204 | 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 219 | Line 147
147      <attribute name="compile-target" default="@{target}"/>
148      <attribute name="workdir"/>
149      <attribute name="classes"/>
150 <    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
150 >    <!--
151 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
152 >    -->
153 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
154      <element name="javac-elements" optional="true"/>
155  
156      <sequential>
157  
227    <local name="modules"/>
228    <condition property="modules">
229      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
230    </condition>
231
158      <mkdir dir="@{workdir}/tck-classes"/>
159  
160      <javac srcdir="@{tck.src.dir}"
# Line 241 | 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 258 | 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>
295 <  </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"/>
300 <    </patternset>
301 <  </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">
307    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
308    <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"/>
325 <    <delete dir="@{workdir}/JTreport" quiet="true"/>
326 <    <mkdir dir="@{workdir}/JTwork/scratch"/>
327 <    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
328 <    <mkdir dir="@{workdir}/JTreport/html"/>
329 <    <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"
333 <           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 351 | 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  
370    <local name="modules"/>
371    <condition property="modules">
372      <and>
373        <available file="${jdk9.home}/jmods" type="dir"/>
374        <equals arg1="9" arg2="${build.main.java.version}"/>
375      </and>
376    </condition>
377
306      <local name="destdir"/>
307 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
380 <    <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 389 | 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"/>
400      <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}"/>
404
333      </javac>
406
407    <!-- We need jdk9's Contended annotation, but at compile time only -->
408    <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
334    </target>
335  
411
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 425 | Line 350
350  
351    <target name="docs"
352            description="Builds javadocs for src/main to dist dir">
353 <
429 <    <delete dir="${docs.dir}"/>
353 >    <delete dir="${docs.dir}" quiet="true"/>
354      <mkdir dir="${docs.dir}"/>
431
432    <!-- the packagenames="none" hack below prevents scanning the -->
433    <!-- sourcepath for packages -->
434
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;"/>
458 < <!-- tags added in jdk9 -->
459 <      <arg value="-tag"/>
460 <      <arg value="revised:X"/>
461 <      <arg value="-tag"/>
462 <      <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  
466
384    <target name="dist"
385            depends="dist-clean, dist-jar, dist-docs"
386            description="Puts all distributable products in single hierarchy"/>
387  
471
472  <target name="release"
473          depends="dist"
474          description="Puts entire CVS tree, plus distribution productions, in a jar">
475
476    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
477
478    <jar basedir="${basedir}" destfile="${release.jar}">
479      <!-- <exclude name="build/**"/> -->
480      <exclude name="${release.jar}"/>
481      <exclude name="user.properties"/>
482      <exclude name="etc/notes/**"/>
483      <exclude name="src/emulation/**"/>
484      <exclude name="**/SyntaxTest.java"/>
485      <exclude name="**/SuperfluousAbstract.java"/>
486      <manifest>
487        <attribute name="Built-By" value="${user.name}"/>
488        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
489      </manifest>
490    </jar>
491  </target>
492
493
388    <target name="clean"
389            description="Removes all build products">
496
390      <delete dir="${build.dir}"/>
498
391    </target>
392  
501
393    <target name="dist-clean"
394            description="Removes all build and distribution products">
504
395      <delete dir="${build.dir}"/>
396      <delete dir="${dist.dir}"/>
507
397    </target>
398  
510
399    <target name="dist-jar"
400            depends="clean, jar">
401      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 519 | Line 407
407    </target>
408  
409    <target name="tck"
410 <          depends="jar"
411 <          description="Runs tck tests for main directly">
524 <
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">
557 <  </target>
453 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
454 >          description="Runs tck and jtreg tests for src/main"/>
455  
456 <  <target name="jtreg8" description="Runs jtreg tests with jdk8">
457 <
458 <    <antcall target="jtreg">
459 <      <param name="build.main.java.version" value="8"/>
460 <      <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>
565
471    </target>
472 <
473 <  <target name="test89"
474 <          description="Runs tck and jtreg tests for main for multiple java versions">
475 <
476 <    <antcall target="clean"/>
477 <    <antcall target="test">
478 <      <param name="build.main.java.version" value="8"/>
479 <      <param name="build.main.javac" value="${javac8}"/>
472 >  <target name="test19">
473 >    <antcall>
474 >      <param name="java.runtime.target" value="19"/>
475 >      <param name="build.main.javac" value="${javac19}"/>
476 >      <param name="build.main.javadoc" value="${javadoc19}"/>
477 >      <param name="build.main.javadoc.source" value="19"/>
478 >      <target name="clean"/>
479 >      <target name="test"/>
480 >      <target name="docs"/>
481      </antcall>
576
577    <antcall target="clean"/>
578    <antcall target="test">
579      <param name="build.main.java.version" value="9"/>
580      <param name="build.main.javac" value="${javac9}"/>
581    </antcall>
582
482    </target>
483  
484  
586
485    <target name="configure-compiler">
486      <fail message="ant version too old">
487 <      <condition>
590 <        <not> <antversion atleast="1.9.1"/> </not>
591 <      </condition>
487 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
488      </fail>
489  
490      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 606 | Line 502
502    </target>
503  
504  
609
610  <!-- Various demos and test programs -->
611
612
613  <target name="loops" depends="configure-compiler"
614          description="Benchmark from Doug Lea's AQS paper">
615
616    <mkdir dir="${build.loops.dir}"/>
617
618    <javac srcdir="${loops.src.dir}"
619          destdir="${build.loops.dir}"
620            debug="${build.debug}"
621       debuglevel="${build.debuglevel}"
622      deprecation="${build.deprecation}"
623           source="${build.sourcelevel}"
624           target="${build.sourcelevel}"
625             fork="true">
626
627      <compilerarg line="${build.args}"/>
628      <classpath refid="loops.classpath"/>
629      <compilerarg value="-XDignore.symbol.file=true"/>
630
631    </javac>
632
633    <java classname="ALoops" fork="true">
634      <classpath refid="loops.classpath"/>
635    </java>
636
637  </target>
638
639
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 649 | 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}"/>
659 <      <compilerarg line="${build.args}"/>
660 <
661 <    </javac>
662 <
663 <  </target>
664 <
665 <
666 <  <!-- jsr166 4jdk8 -->
667 <
668 <  <target name="4jdk8compile"
669 <          depends="configure-compiler"
670 <          description="Compiles src/jdk8 sources, targeting jdk8">
671 <
672 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
673 <
674 <    <javac srcdir="${4jdk8src.dir}"
675 <           destdir="${build.4jdk8.classes.dir}"
676 <           debug="${build.debug}"
677 <           debuglevel="${build.debuglevel}"
678 <           deprecation="${build.deprecation}"
679 <           source="8"
680 <           target="8"
681 <           classpath=""
682 <           bootclasspath="${bootclasspath8}"
683 <           includeAntRuntime="false"
684 <           includeJavaRuntime="false"
685 <           executable="${javac8}"
686 <           fork="true">
687 <
688 <      <include name="**/*.java"/>
689 <      <compilerarg value="-Xprefer:source"/>
690 <      <compilerarg value="-XDignore.symbol.file=true"/>
691 <      <compilerarg value="-Xlint:all"/>
692 <      <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}"/>
694
526      </javac>
527    </target>
528  
698  <target name="4jdk8doclint"
699          depends="configure-compiler"
700          description="Finds doclint warnings">
529  
530 <    <mkdir dir="${build.4jdk8.classes.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 <    <javac srcdir="${4jdk8src.dir}"
705 <           destdir="${build.4jdk8.classes.dir}"
706 <           debug="${build.debug}"
707 <           debuglevel="${build.debuglevel}"
708 <           deprecation="${build.deprecation}"
709 <           source="8"
710 <           target="8"
711 <           classpath=""
712 <           bootclasspath="${bootclasspath8}"
713 <           includeAntRuntime="false"
714 <           includeJavaRuntime="false"
715 <           executable="${javac8}"
716 <           fork="true">
717 <
718 <      <include name="**/*.java"/>
719 <      <compilerarg value="-Xprefer:source"/>
720 <      <compilerarg value="-XDignore.symbol.file=true"/>
721 <      <compilerarg value="-Xlint:all"/>
722 <      <compilerarg value="-Xdoclint:all/protected"/>
723 <      <compilerarg line="${build.args}"/>
724 <
725 <    </javac>
726 <  </target>
727 <
728 <
729 <  <target name="4jdk8jar"
730 <          depends="4jdk8compile"
731 <          description="Builds library jar from compiled sources">
732 <
733 <    <jar destfile="${4jdk8product.jar}">
734 <      <fileset dir="${build.4jdk8.classes.dir}"/>
735 <      <manifest>
736 <        <attribute name="Built-By" value="${user.name}"/>
737 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
738 <      </manifest>
739 <    </jar>
740 <
741 <  </target>
742 <
743 <
744 <  <target name="4jdk8-tck"
745 <          depends="4jdk8jar"
746 <          description="Runs tck tests for jsr166-4jdk8 directly">
747 <
748 <    <run-tck-tests
749 <      target="8"
750 <      workdir="${build.4jdk8.dir}"
751 <      classes="${4jdk8product.jar}">
752 <      <javac-elements>
753 <        <!-- JDK9+ test classes -->
754 <        <exclude name="*9Test.java"/>
755 <        <exclude name="*10Test.java"/>
756 <      </javac-elements>
757 <    </run-tck-tests>
758 <  </target>
759 <
760 <
761 <  <target name="4jdk8-jtreg"
762 <          depends="4jdk8jar"
763 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
764 <    <run-jtreg-tests
765 <       target="8"
766 <       workdir="${build.4jdk8.dir}"
767 <       classes="${4jdk8product.jar}"/>
768 <  </target>
769 <
770 <
771 <  <target name="4jdk8-test"
772 <          depends="4jdk8-tck, 4jdk8-jtreg"
773 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
774 <  </target>
775 <
776 <
777 <  <target name="4jdk8docs"
778 <          description="Builds javadocs for src/jdk8 to dist dir">
779 <
780 <    <delete dir="${4jdk8docs.dir}"/>
781 <    <mkdir dir="${4jdk8docs.dir}"/>
782 <
783 <    <javadoc destdir="${4jdk8docs.dir}"
784 <             packagenames="none"
785 <             link="${java8.api.url}"
786 <             overview="${4jdk8src.dir}/intro.html"
787 <             access="${build.javadoc.access}"
788 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
789 <             classpath=""
790 <             executable="${javadoc8}">
791 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
792 <        <include name="**/*.java"/>
793 <      </fileset>
794 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
795 <      <arg value="-XDignore.symbol.file=true"/>
796 <      <arg value="-tag"/>
797 <      <arg value="${javadoc.jls.option}"/>
798 <      <arg value="-tag"/>
799 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
800 <      <arg value="-tag"/>
801 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
802 <      <arg value="-tag"/>
803 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
804 <    </javadoc>
805 <  </target>
806 <
807 <
808 <  <target name="4jdk8dist"
809 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
810 <          description="Puts all distributable products in single hierarchy"/>
811 <
812 <
813 <  <target name="4jdk8clean"
814 <          description="Removes all 4jdk8 build products">
815 <
816 <    <delete dir="${build.4jdk8.dir}"/>
817 <
818 <  </target>
819 <
820 <
821 <  <target name="4jdk8dist-jar"
822 <          depends="4jdk8clean, 4jdk8jar">
823 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
824 <  </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"
837 <          depends="configure-compiler"
838 <          description="Compiles src/jdk7 sources, targeting jdk7">
839 <
840 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
841 <
842 <    <javac srcdir="${4jdk7src.dir}"
843 <           destdir="${build.4jdk7.classes.dir}"
844 <           debug="${build.debug}"
845 <           debuglevel="${build.debuglevel}"
846 <           deprecation="${build.deprecation}"
847 <           source="6"
848 <           target="6"
849 <           classpath=""
850 <           bootclasspath="${bootclasspath6}"
851 <           includeAntRuntime="false"
852 <           includeJavaRuntime="false"
853 <           executable="${javac7}"
854 <           fork="true">
855 <
856 <      <include name="**/*.java"/>
857 <      <compilerarg value="-Xprefer:source"/>
858 <      <compilerarg value="-XDignore.symbol.file=true"/>
859 <      <compilerarg value="-Xlint:all"/>
860 <      <compilerarg value="-Werror"/>
861 <      <compilerarg line="${build.args}"/>
862 <
863 <    </javac>
864 <  </target>
865 <
866 <  <target name="4jdk7doclint"
867 <          depends="configure-compiler"
868 <          description="Finds doclint warnings">
869 <
870 <    <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}"
877           source="6"
878           target="6"
607             classpath=""
880           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}"/>
892
630      </javac>
894  </target>
895
631  
632 <  <target name="4jdk7jar"
633 <          depends="4jdk7compile"
899 <          description="Builds library jar from compiled sources">
900 <
901 <    <jar destfile="${4jdk7product.jar}">
902 <      <fileset dir="${build.4jdk7.classes.dir}"/>
903 <      <manifest>
904 <        <attribute name="Built-By" value="${user.name}"/>
905 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
906 <      </manifest>
632 >    <jar destfile="${product.jar}">
633 >      <fileset dir="${destdir}"/>
634      </jar>
635  
909  </target>
910
911
912  <target name="4jdk7-tck"
913          depends="4jdk7jar"
914          description="Runs tck tests for jsr166-4jdk7 directly">
915
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"/>
930 <        <exclude name="SplittableRandomTest.java"/>
931 <        <exclude name="StampedLockTest.java"/>
932 <        <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 <
960 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
961 <      </test>
962 <
739 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
740 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
741      </junit>
742    </target>
743  
966  <target name="4jdk7-jtreg"
967          depends="4jdk7jar"
968          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
969    <run-jtreg-tests
970       target="7"
971       workdir="${build.4jdk7.dir}"
972       classes="${4jdk7product.jar}"/>
973  </target>
974
975
976  <target name="4jdk7-test"
977          depends="4jdk7-tck, 4jdk7-jtreg"
978          description="Runs tck and jtreg tests for jsr166-4jdk7">
979  </target>
980
981
982  <target name="4jdk7docs"
983          description="Builds javadocs for src/jdk7 to dist dir">
984
985    <delete dir="${4jdk7docs.dir}"/>
986    <mkdir dir="${4jdk7docs.dir}"/>
987
988    <javadoc destdir="${4jdk7docs.dir}"
989             packagenames="none"
990             link="${java7.api.url}"
991             overview="${4jdk7src.dir}/intro.html"
992             access="${build.javadoc.access}"
993             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
994             classpath=""
995             executable="${javadoc7}">
996      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
997        <include name="**/*.java"/>
998      </fileset>
999      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1000      <arg value="-XDignore.symbol.file=true"/>
1001    </javadoc>
1002  </target>
1003
1004
1005  <target name="4jdk7dist"
1006          depends="4jdk7dist-jar, 4jdk7dist-docs"
1007          description="Puts all distributable products in single hierarchy"/>
1008
1009
1010  <target name="4jdk7clean"
1011          description="Removes all 4jdk7 build products">
1012
1013    <delete dir="${build.4jdk7.dir}"/>
1014
1015  </target>
1016
1017
1018  <target name="4jdk7dist-jar"
1019          depends="4jdk7clean, 4jdk7jar">
1020    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1021  </target>
1022
1023
1024  <target name="4jdk7dist-docs"
1025          depends="4jdk7clean, 4jdk7docs">
1026    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1027  </target>
1028
1029
1030  <!-- jsr166x -->
1031
1032  <target name="jsr166xcompile"
1033          depends="configure-compiler"
1034          description="Compiles jsr166x sources to build dir">
1035
1036    <mkdir dir="${build.jsr166x.classes.dir}"/>
1037
1038    <javac srcdir="${topsrc.dir}"
1039           destdir="${build.jsr166x.classes.dir}"
1040           debug="${build.debug}"
1041           debuglevel="${build.debuglevel}"
1042           deprecation="${build.deprecation}"
1043           classpath=""
1044           bootclasspath="${bootclasspath6}"
1045           source="5"
1046           target="5"
1047           includeAntRuntime="false"
1048           includeJavaRuntime="false"
1049           executable="${javac7}"
1050           fork="true">
1051
1052      <include name="jsr166x/**/*.java"/>
1053      <compilerarg value="-XDignore.symbol.file=true"/>
1054      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1055      <compilerarg value="-Werror"/>
1056      <compilerarg line="${build.args}"/>
1057
1058    </javac>
1059  </target>
1060
1061
1062  <target name="jsr166xjar"
1063          depends="jsr166xcompile"
1064          description="Builds library jar from compiled sources">
1065
1066    <jar destfile="${jsr166x.jar}">
1067      <fileset dir="${build.jsr166x.classes.dir}"/>
1068      <manifest>
1069        <attribute name="Built-By" value="${user.name}"/>
1070        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1071      </manifest>
1072    </jar>
1073
1074  </target>
1075
1076
1077  <target name="jsr166xdocs"
1078          description="Builds javadocs to dist dir">
1079
1080    <delete dir="${jsr166xdocs.dir}"/>
1081    <mkdir dir="${jsr166xdocs.dir}"/>
1082
1083    <javadoc destdir="${jsr166xdocs.dir}"
1084             packagenames="jsr166x.*"
1085             link="${java.api.url}"
1086             access="${build.javadoc.access}"
1087             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1088             bootclasspath="${bootclasspath6}"
1089             source="5"
1090             executable="${javadoc7}">
1091      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1092      <arg value="-XDignore.symbol.file=true"/>
1093
1094    </javadoc>
1095  </target>
1096
1097
1098  <target name="jsr166xdist"
1099          depends="jsr166xdist-jar, jsr166xdist-docs"
1100          description="Puts all distributable products in single hierarchy"/>
1101
1102
1103  <target name="jsr166xclean"
1104          description="Removes all jsr166x build products">
1105
1106    <delete dir="${build.jsr166x.dir}"/>
1107
1108  </target>
1109
1110
1111  <target name="jsr166xdist-jar"
1112          depends="jsr166xclean, jsr166xjar">
1113    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1114  </target>
1115
1116  <target name="jsr166xdist-docs"
1117          depends="jsr166xclean, jsr166xdocs">
1118    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1119  </target>
1120
1121  <!-- jsr166y -->
1122
1123
1124  <target name="jsr166ycompile"
1125          depends="configure-compiler"
1126          description="Compiles jsr166y sources">
1127
1128    <mkdir dir="${build.jsr166y.classes.dir}"/>
1129
1130    <javac srcdir="${topsrc.dir}"
1131           destdir="${build.jsr166y.classes.dir}"
1132           debug="${build.debug}"
1133           debuglevel="${build.debuglevel}"
1134           deprecation="${build.deprecation}"
1135           source="6"
1136           target="6"
1137           classpath=""
1138           bootclasspath="${bootclasspath6}"
1139           includeAntRuntime="false"
1140           includeJavaRuntime="false"
1141           executable="${javac7}"
1142           fork="true">
1143
1144      <include name="jsr166y/**/*.java"/>
1145      <compilerarg value="-XDignore.symbol.file=true"/>
1146      <compilerarg value="-Xlint:all"/>
1147      <compilerarg value="-Werror"/>
1148      <compilerarg line="${build.args}"/>
1149
1150    </javac>
1151  </target>
1152
1153
1154  <target name="jsr166yjar"
1155          depends="jsr166ycompile"
1156          description="Builds library jar from compiled sources">
1157
1158    <jar destfile="${jsr166y.jar}" index="true">
1159      <fileset dir="${build.jsr166y.classes.dir}"/>
1160      <manifest>
1161        <attribute name="Built-By" value="${user.name}"/>
1162        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1163      </manifest>
1164    </jar>
1165
1166  </target>
1167
1168
1169  <target name="jsr166ydocs"
1170          description="Builds javadocs to dist dir">
1171
1172    <delete dir="${jsr166ydocs.dir}"/>
1173    <mkdir dir="${jsr166ydocs.dir}"/>
1174
1175    <javadoc destdir="${jsr166ydocs.dir}"
1176             packagenames="jsr166y.*"
1177             link="${java.api.url}"
1178             access="${build.javadoc.access}"
1179             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1180             bootclasspath="${bootclasspath6}"
1181             source="6"
1182             executable="${javadoc7}">
1183      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1184      <arg value="-XDignore.symbol.file=true"/>
1185
1186    </javadoc>
1187  </target>
1188
1189
1190  <target name="jsr166ydist"
1191          depends="jsr166ydist-jar, jsr166ydist-docs"
1192          description="Puts all distributable products in single hierarchy"/>
1193
1194
1195  <target name="jsr166yclean"
1196          description="Removes all jsr166y build products">
1197
1198    <delete dir="${build.jsr166y.dir}"/>
1199
1200  </target>
1201
1202
1203  <target name="jsr166ydist-jar"
1204          depends="jsr166yclean, jsr166yjar">
1205    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1206  </target>
1207
1208  <target name="jsr166ydist-docs"
1209          depends="jsr166yclean, jsr166ydocs">
1210    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1211  </target>
1212
1213
1214  <!-- extra166y -->
1215
1216
1217  <target name="extra166ycompile"
1218          depends="configure-compiler, jsr166yjar"
1219          description="Compiles extra166y sources">
1220
1221    <mkdir dir="${build.extra166y.classes.dir}"/>
1222
1223    <javac srcdir="${topsrc.dir}"
1224           destdir="${build.extra166y.classes.dir}"
1225           debug="${build.debug}"
1226           debuglevel="${build.debuglevel}"
1227           deprecation="${build.deprecation}"
1228           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1229           classpath=""
1230           source="6"
1231           target="6"
1232           includeAntRuntime="false"
1233           includeJavaRuntime="false"
1234           executable="${javac7}"
1235           fork="true">
1236
1237      <include name="extra166y/**/*.java"/>
1238      <compilerarg value="-XDignore.symbol.file=true"/>
1239      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1240      <compilerarg value="-Werror"/>
1241      <compilerarg line="${build.args}"/>
1242
1243    </javac>
1244  </target>
1245
1246
1247  <target name="extra166yjar"
1248          depends="extra166ycompile"
1249          description="Builds library jar from compiled sources">
1250
1251    <jar destfile="${extra166y.jar}" index="true">
1252      <fileset dir="${build.extra166y.classes.dir}"/>
1253      <manifest>
1254        <attribute name="Built-By" value="${user.name}"/>
1255        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1256      </manifest>
1257    </jar>
1258
1259  </target>
1260
1261
1262  <target name="extra166ydocs"
1263          description="Builds javadocs to build dir">
1264
1265    <delete dir="${extra166ydocs.dir}"/>
1266    <mkdir dir="${extra166ydocs.dir}"/>
1267
1268    <javadoc destdir="${extra166ydocs.dir}"
1269             packagenames="extra166y.*"
1270             link="${java.api.url}"
1271             access="${build.javadoc.access}"
1272             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1273             bootclasspath="${bootclasspath6}"
1274             source="6"
1275             executable="${javadoc7}">
1276      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1277      <arg value="-XDignore.symbol.file=true"/>
1278
1279    </javadoc>
1280  </target>
1281
1282
1283  <target name="extra166ydist"
1284          depends="extra166ydist-jar, extra166ydist-docs"
1285          description="Puts all distributable products in single hierarchy"/>
1286
1287
1288  <target name="extra166yclean"
1289          description="Removes all extra166y build products">
1290
1291    <delete dir="${build.extra166y.dir}"/>
1292
1293  </target>
1294
1295
1296  <target name="extra166ydist-jar"
1297          depends="extra166yclean, extra166yjar">
1298    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1299  </target>
1300
1301  <target name="extra166ydist-docs"
1302          depends="extra166yclean, extra166ydocs">
1303    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1304  </target>
1305
1306  <!-- jsr166e -->
1307
1308  <property name="build.jsr166e.java.version" value="6"/>
1309  <property name="build.jsr166e.javac" value="${javac6}"/>
1310
1311  <target name="jsr166ecompile"
1312          depends="configure-compiler"
1313          description="Compiles jsr166e sources">
1314
1315    <mkdir dir="${build.jsr166e.classes.dir}"/>
1316
1317    <javac srcdir="${topsrc.dir}"
1318           destdir="${build.jsr166e.classes.dir}"
1319           debug="${build.debug}"
1320           debuglevel="${build.debuglevel}"
1321           deprecation="${build.deprecation}"
1322           source="${build.jsr166e.java.version}"
1323           target="${build.jsr166e.java.version}"
1324           classpath=""
1325           includeAntRuntime="false"
1326           includeJavaRuntime="false"
1327           executable="${build.jsr166e.javac}"
1328           fork="true">
1329
1330      <include name="jsr166e/**/*.java"/>
1331      <compilerarg value="-XDignore.symbol.file=true"/>
1332      <compilerarg value="-Xlint:all"/>
1333      <compilerarg value="-Werror"/>
1334      <compilerarg line="${build.args}"/>
1335
1336    </javac>
1337  </target>
1338
1339  <!-- jsr166e: find doclint errors -->
1340  <target name="jsr166edoclint">
1341
1342    <mkdir dir="${build.jsr166e.classes.dir}"/>
1343
1344    <javac srcdir="${topsrc.dir}"
1345           destdir="${build.jsr166e.classes.dir}"
1346           debug="${build.debug}"
1347           debuglevel="${build.debuglevel}"
1348           deprecation="${build.deprecation}"
1349           source="${build.jsr166e.java.version}"
1350           target="${build.jsr166e.java.version}"
1351           classpath=""
1352           bootclasspath="${bootclasspath6}"
1353           includeAntRuntime="false"
1354           includeJavaRuntime="false"
1355           executable="${javac8}"
1356           fork="true">
1357
1358      <include name="jsr166e/**/*.java"/>
1359      <compilerarg value="-XDignore.symbol.file=true"/>
1360      <compilerarg value="-Xlint:all"/>
1361      <compilerarg value="-Werror"/>
1362      <compilerarg value="-Xdoclint:all/protected"/>
1363
1364    </javac>
1365  </target>
1366
1367
1368  <target name="jsr166ejar"
1369          depends="jsr166ecompile"
1370          description="Builds library jar from compiled sources">
1371
1372    <jar destfile="${jsr166e.jar}" index="true">
1373      <fileset dir="${build.jsr166e.classes.dir}"/>
1374      <manifest>
1375        <attribute name="Built-By" value="${user.name}"/>
1376        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1377      </manifest>
1378    </jar>
1379
1380  </target>
1381
1382
1383  <target name="jsr166edocs"
1384          description="Builds javadocs to build dir">
1385
1386    <delete dir="${jsr166edocs.dir}"/>
1387    <mkdir dir="${jsr166edocs.dir}"/>
1388
1389    <javadoc destdir="${jsr166edocs.dir}"
1390             packagenames="jsr166e.*"
1391             link="${java.api.url}"
1392             access="${build.javadoc.access}"
1393             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1394             source="${build.jsr166e.java.version}"
1395             executable="${javadoc7}">
1396      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1397      <arg value="-XDignore.symbol.file=true"/>
1398
1399    </javadoc>
1400  </target>
1401
1402
1403  <target name="jsr166e-tck-one-java-version"
1404          depends="jsr166ejar">
1405
1406    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1407
1408    <run-tck-tests
1409      tck.src.dir="${test.src.dir}/tck-jsr166e"
1410      target="${build.jsr166e.java.version}"
1411      workdir="${build.jsr166e.dir}"
1412      classes="${jsr166e.jar}"/>
1413  </target>
1414
1415  <target name="jsr166e-tck"
1416          description="Runs tck tests for jsr166e for multiple java versions">
1417
1418 <!--     <antcall target="clean"/> -->
1419 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1420 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1421 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1422 <!--     </antcall> -->
1423
1424    <antcall target="clean"/>
1425    <antcall target="jsr166e-tck-one-java-version">
1426      <param name="build.jsr166e.java.version" value="7"/>
1427      <param name="build.jsr166e.javac" value="${javac7}"/>
1428    </antcall>
1429
1430    <antcall target="clean"/>
1431    <antcall target="jsr166e-tck-one-java-version">
1432      <param name="build.jsr166e.java.version" value="6"/>
1433      <param name="build.jsr166e.javac" value="${javac6}"/>
1434    </antcall>
1435  </target>
1436
1437
1438  <target name="jsr166e-test"
1439          depends="jsr166e-tck"
1440          description="Runs all tests for jsr166e">
1441  </target>
1442
1443  <target name="jsr166edist"
1444          depends="jsr166edist-jar, jsr166edist-docs"
1445          description="Puts all distributable products in single hierarchy"/>
1446
1447
1448  <target name="jsr166eclean"
1449          description="Removes all jsr166e build products">
1450    <delete dir="${build.jsr166e.dir}"/>
1451  </target>
1452
1453
1454  <target name="jsr166edist-jar"
1455          depends="jsr166eclean, jsr166ejar">
1456    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1457  </target>
1458
1459  <target name="jsr166edist-docs"
1460          depends="jsr166eclean, jsr166edocs">
1461    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1462  </target>
1463
1464
1465 <!-- Find buglets that can be detected by static build tools -->
1466
1467  <target name="lint">
1468    <antcall target="dists">
1469      <param name="build.javadoc.access" value="public"/>
1470    </antcall>
1471  </target>
1472
1473 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1474  <target name="lint-private">
1475    <antcall target="dist">
1476      <param name="build.javadoc.access" value="private"/>
1477    </antcall>
1478  </target>
1479
1480
744   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines