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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines