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.193 by jsr166, Fri Dec 11 23:58:52 2015 UTC vs.
Revision 1.317 by jsr166, Fri Jun 19 18:09:35 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 2015-11 -->
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    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
314    <mkdir dir="@{workdir}/JTreport/html"/>
315    <mkdir dir="@{workdir}/JTreport/text"/>
282      <jtreg dir="${jtreg@{target}.src.dir}"
283             jdk="${jdk@{target}.home}"
284 <           workDir="@{workdir}/JTwork"
319 <           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 336 | 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  
355    <local name="modules"/>
356    <condition property="modules">
357      <and>
358        <available file="${jdk9.home}/jmods" type="dir"/>
359        <equals arg1="9" arg2="${build.main.java.version}"/>
360      </and>
361    </condition>
362
338      <local name="destdir"/>
339 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
365 <    <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 374 | 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 393 | 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 408 | 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 446 | Line 447
447            description="Puts all distributable products in single hierarchy"/>
448  
449  
449  <target name="release"
450          depends="dist"
451          description="Puts entire CVS tree, plus distribution productions, in a jar">
452
453    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
454
455    <jar basedir="${basedir}" destfile="${release.jar}">
456      <!-- <exclude name="build/**"/> -->
457      <exclude name="${release.jar}"/>
458      <exclude name="user.properties"/>
459      <exclude name="etc/notes/**"/>
460      <exclude name="src/emulation/**"/>
461      <exclude name="**/SyntaxTest.java"/>
462      <exclude name="**/SuperfluousAbstract.java"/>
463      <manifest>
464        <attribute name="Built-By" value="${user.name}"/>
465        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
466      </manifest>
467    </jar>
468  </target>
469
470
450    <target name="clean"
451            description="Removes all build products">
473
452      <delete dir="${build.dir}"/>
475
453    </target>
454  
455  
456    <target name="dist-clean"
457            description="Removes all build and distribution products">
481
458      <delete dir="${build.dir}"/>
459      <delete dir="${dist.dir}"/>
484
460    </target>
461  
462  
# Line 496 | 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>
567 <        <not> <antversion atleast="1.9.1"/> </not>
568 <      </condition>
673 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
674      </fail>
675  
676      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 583 | Line 688
688    </target>
689  
690  
586
587  <!-- Various demos and test programs -->
588
589
590  <target name="loops" depends="configure-compiler"
591          description="Benchmark from Doug Lea's AQS paper">
592
593    <mkdir dir="${build.loops.dir}"/>
594
595    <javac srcdir="${loops.src.dir}"
596          destdir="${build.loops.dir}"
597            debug="${build.debug}"
598       debuglevel="${build.debuglevel}"
599      deprecation="${build.deprecation}"
600           source="${build.sourcelevel}"
601           target="${build.sourcelevel}"
602             fork="true">
603
604      <compilerarg line="${build.args}"/>
605      <classpath refid="loops.classpath"/>
606      <compilerarg value="-XDignore.symbol.file=true"/>
607
608    </javac>
609
610    <java classname="ALoops" fork="true">
611      <classpath refid="loops.classpath"/>
612    </java>
613
614  </target>
615
616
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 626 | 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}"/>
637
712      </javac>
639
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}"
652 <           destdir="${build.4jdk7.classes.dir}"
653 <           debug="${build.debug}"
654 <           debuglevel="${build.debuglevel}"
655 <           deprecation="${build.deprecation}"
656 <           source="6"
657 <           target="6"
658 <           classpath=""
659 <           bootclasspath="${bootclasspath6}"
660 <           includeAntRuntime="false"
661 <           includeJavaRuntime="false"
662 <           executable="${javac7}"
663 <           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"/>
670 <      <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  
675  <target name="4jdk7doclint"
676          depends="configure-compiler"
677          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:JdkObsolete:OFF
758 >                   -Xep:MissingOverride:OFF
759 >                   -Xep:MissingFail:OFF
760 >                   -Xep:ThreadPriorityCheck:OFF
761 >                   -Xep:MixedArrayDimensions:ERROR
762 >                   -Xep:RemoveUnusedImports:ERROR
763 >                   -Xep:EmptyIf:ERROR
764 >                   -Xep:MultipleTopLevelClasses:ERROR
765 >                   -Xep:ClassName:ERROR
766 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
767 >                   -Xep:RedundantThrows:ERROR
768 >                   -Xep:IdentityBinaryExpression:WARN
769 >                   -Xep:ConstructorInvokesOverridable:WARN
770 >                   -Xep:MethodCanBeStatic:WARN
771 >                   ${errorprone.jsr166.user.flags}"/>
772 >  <!-- -Xep:WildcardImport:ERROR -->
773 >  <property name="errorprone.jsr166.test.flags"
774 >            value="-Xep:StringSplitter:OFF
775 >                   -Xep:BoxedPrimitiveConstructor:OFF
776 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
777 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
778 >  <target name="errorprone"
779 >          depends="clean, configure-compiler"
780 >          description="Run errorprone over jsr166 source code (experimental)">
781 >
782 >    <local name="destdir"/>
783 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
784 >    <mkdir dir="${destdir}"/>
785  
786 <    <javac srcdir="${4jdk7src.dir}"
787 <           destdir="${build.4jdk7.classes.dir}"
786 >    <javac srcdir="${src.dir}"
787 >           destdir="${destdir}"
788             debug="${build.debug}"
789             debuglevel="${build.debuglevel}"
790             deprecation="${build.deprecation}"
686           source="6"
687           target="6"
791             classpath=""
689           bootclasspath="${bootclasspath6}"
792             includeAntRuntime="false"
793             includeJavaRuntime="false"
794 <           executable="${javac8}"
794 >           encoding="ASCII"
795 >           executable="${build.main.javac}"
796             fork="true">
797  
798        <include name="**/*.java"/>
799 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
800 +      <compilerarg value="-J--illegal-access=permit"/>
801 +      <compilerarg value="-XDcompilePolicy=simple"/>
802 +      <compilerarg value="-processorpath"/>
803 +      <compilerarg pathref="errorprone.processorpath.path"/>
804 +      <compilerarg value="-Xplugin:ErrorProne
805 +                          ${errorprone.jsr166.flags}"/>
806 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
807        <compilerarg value="-Xprefer:source"/>
808        <compilerarg value="-XDignore.symbol.file=true"/>
809        <compilerarg value="-Xlint:all"/>
810 <      <compilerarg value="-Xdoclint:all/protected"/>
810 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
811 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
812        <compilerarg line="${build.args}"/>
701
813      </javac>
703  </target>
704
814  
815 <  <target name="4jdk7jar"
816 <          depends="4jdk7compile"
708 <          description="Builds library jar from compiled sources">
709 <
710 <    <jar destfile="${4jdk7product.jar}">
711 <      <fileset dir="${build.4jdk7.classes.dir}"/>
712 <      <manifest>
713 <        <attribute name="Built-By" value="${user.name}"/>
714 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
715 <      </manifest>
815 >    <jar destfile="${product.jar}">
816 >      <fileset dir="${destdir}"/>
817      </jar>
818  
718  </target>
719
720
721  <target name="4jdk7-tck"
722          depends="4jdk7jar"
723          description="Runs tck tests for jsr166-4jdk7 directly">
724
819      <run-tck-tests
820 <      target="7"
821 <      workdir="${build.4jdk7.dir}"
822 <      classes="${4jdk7product.jar}">
820 >      target="${java.runtime.target}"
821 >      workdir="${build.dir}"
822 >      classes="${product.jar}">
823        <javac-elements>
824 <        <!-- JDK8+ test classes -->
825 <        <exclude name="*8Test.java"/>
826 <        <exclude name="*9Test.java"/>
827 <        <exclude name="*10Test.java"/>
828 <        <exclude name="DoubleAccumulatorTest.java"/>
829 <        <exclude name="DoubleAdderTest.java"/>
830 <        <exclude name="LongAccumulatorTest.java"/>
831 <        <exclude name="LongAdderTest.java"/>
738 <        <exclude name="CompletableFutureTest.java"/>
739 <        <exclude name="SplittableRandomTest.java"/>
740 <        <exclude name="StampedLockTest.java"/>
741 <        <exclude name="SubmissionPublisherTest.java"/>
824 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
825 >        <compilerarg value="-J--illegal-access=permit"/>
826 >        <compilerarg value="-XDcompilePolicy=simple"/>
827 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
828 >        <compilerarg value="-Xplugin:ErrorProne
829 >                            ${errorprone.jsr166.flags}
830 >                            ${errorprone.jsr166.test.flags}"/>
831 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
832        </javac-elements>
833      </run-tck-tests>
834    </target>
835  
836 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
837 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
838 +  <target name="errorprone-jtreg"
839 +          depends="jar"
840 +          description="Run errorprone over jtreg tests (experimental)">
841  
842 <  <target name="4jdk7-tck-junit"
843 <          depends="4jdk7compile"
844 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
845 <
846 <    <junit printsummary="true"
847 <           showoutput="true"
848 <           errorProperty="junit.failed"
849 <           failureProperty="junit.failed"
850 <           includeantruntime="true"
851 <           jvm="${java7}"
852 <           fork="true">
853 <
854 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
855 <      <jvmarg value="-server"/>
856 <
842 >    <run-jtreg-tests
843 >       target="${java.runtime.target}"
844 >       workdir="${build.dir}"
845 >       classes="${product.jar}"
846 >       verbose="all">
847 >      <jtreg-elements>
848 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
849 >        <arg value="-javacoption:-processorpath"/>
850 >        <arg value="-javacoption:${errorprone.processorpath}"/>
851 >        <arg value="-javacoption:-Xplugin:ErrorProne
852 >                            ${errorprone.jsr166.flags}
853 >                            ${errorprone.jsr166.test.flags}
854 >                            -Xep:MultipleTopLevelClasses:WARN
855 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
856 >      </jtreg-elements>
857 >    </run-jtreg-tests>
858 >  </target>
859 >
860 >
861 > <!-- ==============================================================
862 >  Running guava tests against jsr166 code
863 > =================================================================== -->
864 >
865 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
866 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
867 > <!-- <property name="guava.version" value="21.0"/> -->
868 >
869 > <!-- HOWTO debug print a path id -->
870 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
871 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
872 >
873 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
874 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
875 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
876 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
877 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
878 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
879 >
880 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
881 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
882 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
883 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
884 >
885 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
886 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
887 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
888 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
889 >
890 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
891 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
892 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
893 >
894 >  <target name="init-ivy">
895 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
896 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
897 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
898 >             classpath="${build.dir}/ivy.jar"/>
899 >  </target>
900 >
901 >  <target name="guava-tests" depends="jar, init-ivy"
902 >          description="Guava tests run against jsr166 collections">
903 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
904 >    <mkdir dir="${guava.dir}"/>
905 >    <ivy:retrieve pathid="guava.testlib.classpath"
906 >      type="jar,bundle" inline="true" conf="default,master"
907 >      pattern="${guava.dir}/[artifact].[ext]"
908 >      organisation="com.google.guava" module="guava-testlib"/>
909 >    <property name="guava.version" value="21.0"/>
910 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
911 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
912 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
913 >           jvm="${build.main.java}" fork="true">
914 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
915 >      <formatter type="brief"/>
916        <classpath>
917 <        <pathelement location="${junit.jar}"/>
918 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
917 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
918 >        <path refid="guava.testlib.classpath"/>
919        </classpath>
920  
921 <      <formatter type="brief"/>
922 <
769 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
770 <      </test>
771 <
921 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
922 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
923      </junit>
924    </target>
925  
775  <target name="4jdk7-jtreg"
776          depends="4jdk7jar"
777          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
778    <run-jtreg-tests
779       target="7"
780       workdir="${build.4jdk7.dir}"
781       classes="${4jdk7product.jar}"/>
782  </target>
783
784
785  <target name="4jdk7-test"
786          depends="4jdk7-tck, 4jdk7-jtreg"
787          description="Runs tck and jtreg tests for jsr166-4jdk7">
788  </target>
789
790
791  <target name="4jdk7docs"
792          description="Builds javadocs for src/jdk7 to dist dir">
793
794    <delete dir="${4jdk7docs.dir}"/>
795    <mkdir dir="${4jdk7docs.dir}"/>
796
797    <javadoc destdir="${4jdk7docs.dir}"
798             packagenames="none"
799             link="${java7.api.url}"
800             overview="${4jdk7src.dir}/intro.html"
801             access="${build.javadoc.access}"
802             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
803             classpath=""
804             executable="${javadoc7}">
805      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
806        <include name="**/*.java"/>
807      </fileset>
808      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
809      <arg value="-XDignore.symbol.file=true"/>
810    </javadoc>
811  </target>
812
813
814  <target name="4jdk7dist"
815          depends="4jdk7dist-jar, 4jdk7dist-docs"
816          description="Puts all distributable products in single hierarchy"/>
817
818
819  <target name="4jdk7clean"
820          description="Removes all 4jdk7 build products">
821
822    <delete dir="${build.4jdk7.dir}"/>
823
824  </target>
825
826
827  <target name="4jdk7dist-jar"
828          depends="4jdk7clean, 4jdk7jar">
829    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
830  </target>
831
832
833  <target name="4jdk7dist-docs"
834          depends="4jdk7clean, 4jdk7docs">
835    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
836  </target>
837
838
839  <!-- jsr166x -->
840
841  <target name="jsr166xcompile"
842          depends="configure-compiler"
843          description="Compiles jsr166x sources to build dir">
844
845    <mkdir dir="${build.jsr166x.classes.dir}"/>
846
847    <javac srcdir="${topsrc.dir}"
848           destdir="${build.jsr166x.classes.dir}"
849           debug="${build.debug}"
850           debuglevel="${build.debuglevel}"
851           deprecation="${build.deprecation}"
852           classpath=""
853           bootclasspath="${bootclasspath6}"
854           source="5"
855           target="5"
856           includeAntRuntime="false"
857           includeJavaRuntime="false"
858           executable="${javac7}"
859           fork="true">
860
861      <include name="jsr166x/**/*.java"/>
862      <compilerarg value="-XDignore.symbol.file=true"/>
863      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
864      <compilerarg value="-Werror"/>
865      <compilerarg line="${build.args}"/>
866
867    </javac>
868  </target>
869
870
871  <target name="jsr166xjar"
872          depends="jsr166xcompile"
873          description="Builds library jar from compiled sources">
874
875    <jar destfile="${jsr166x.jar}">
876      <fileset dir="${build.jsr166x.classes.dir}"/>
877      <manifest>
878        <attribute name="Built-By" value="${user.name}"/>
879        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
880      </manifest>
881    </jar>
882
883  </target>
884
885
886  <target name="jsr166xdocs"
887          description="Builds javadocs to dist dir">
888
889    <delete dir="${jsr166xdocs.dir}"/>
890    <mkdir dir="${jsr166xdocs.dir}"/>
891
892    <javadoc destdir="${jsr166xdocs.dir}"
893             packagenames="jsr166x.*"
894             link="${java.api.url}"
895             access="${build.javadoc.access}"
896             sourcepath="${topsrc.dir}:${jdk6src.dir}"
897             bootclasspath="${bootclasspath6}"
898             source="5"
899             executable="${javadoc7}">
900      <arg line="-Xdocrootparent ${java.docroot.url}"/>
901      <arg value="-XDignore.symbol.file=true"/>
902
903    </javadoc>
904  </target>
905
906
907  <target name="jsr166xdist"
908          depends="jsr166xdist-jar, jsr166xdist-docs"
909          description="Puts all distributable products in single hierarchy"/>
910
911
912  <target name="jsr166xclean"
913          description="Removes all jsr166x build products">
914
915    <delete dir="${build.jsr166x.dir}"/>
916
917  </target>
918
919
920  <target name="jsr166xdist-jar"
921          depends="jsr166xclean, jsr166xjar">
922    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
923  </target>
924
925  <target name="jsr166xdist-docs"
926          depends="jsr166xclean, jsr166xdocs">
927    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
928  </target>
929
930  <!-- jsr166y -->
931
932
933  <target name="jsr166ycompile"
934          depends="configure-compiler"
935          description="Compiles jsr166y sources">
936
937    <mkdir dir="${build.jsr166y.classes.dir}"/>
938
939    <javac srcdir="${topsrc.dir}"
940           destdir="${build.jsr166y.classes.dir}"
941           debug="${build.debug}"
942           debuglevel="${build.debuglevel}"
943           deprecation="${build.deprecation}"
944           source="6"
945           target="6"
946           classpath=""
947           bootclasspath="${bootclasspath6}"
948           includeAntRuntime="false"
949           includeJavaRuntime="false"
950           executable="${javac7}"
951           fork="true">
952
953      <include name="jsr166y/**/*.java"/>
954      <compilerarg value="-XDignore.symbol.file=true"/>
955      <compilerarg value="-Xlint:all"/>
956      <compilerarg value="-Werror"/>
957      <compilerarg line="${build.args}"/>
958
959    </javac>
960  </target>
961
962
963  <target name="jsr166yjar"
964          depends="jsr166ycompile"
965          description="Builds library jar from compiled sources">
966
967    <jar destfile="${jsr166y.jar}" index="true">
968      <fileset dir="${build.jsr166y.classes.dir}"/>
969      <manifest>
970        <attribute name="Built-By" value="${user.name}"/>
971        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
972      </manifest>
973    </jar>
974
975  </target>
976
977
978  <target name="jsr166ydocs"
979          description="Builds javadocs to dist dir">
980
981    <delete dir="${jsr166ydocs.dir}"/>
982    <mkdir dir="${jsr166ydocs.dir}"/>
983
984    <javadoc destdir="${jsr166ydocs.dir}"
985             packagenames="jsr166y.*"
986             link="${java.api.url}"
987             access="${build.javadoc.access}"
988             sourcepath="${topsrc.dir}:${jdk6src.dir}"
989             bootclasspath="${bootclasspath6}"
990             source="6"
991             executable="${javadoc7}">
992      <arg line="-Xdocrootparent ${java.docroot.url}"/>
993      <arg value="-XDignore.symbol.file=true"/>
994
995    </javadoc>
996  </target>
997
998
999  <target name="jsr166ydist"
1000          depends="jsr166ydist-jar, jsr166ydist-docs"
1001          description="Puts all distributable products in single hierarchy"/>
1002
1003
1004  <target name="jsr166yclean"
1005          description="Removes all jsr166y build products">
1006
1007    <delete dir="${build.jsr166y.dir}"/>
1008
1009  </target>
1010
1011
1012  <target name="jsr166ydist-jar"
1013          depends="jsr166yclean, jsr166yjar">
1014    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1015  </target>
1016
1017  <target name="jsr166ydist-docs"
1018          depends="jsr166yclean, jsr166ydocs">
1019    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1020  </target>
1021
1022
1023  <!-- extra166y -->
1024
1025
1026  <target name="extra166ycompile"
1027          depends="configure-compiler, jsr166yjar"
1028          description="Compiles extra166y sources">
1029
1030    <mkdir dir="${build.extra166y.classes.dir}"/>
1031
1032    <javac srcdir="${topsrc.dir}"
1033           destdir="${build.extra166y.classes.dir}"
1034           debug="${build.debug}"
1035           debuglevel="${build.debuglevel}"
1036           deprecation="${build.deprecation}"
1037           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1038           classpath=""
1039           source="6"
1040           target="6"
1041           includeAntRuntime="false"
1042           includeJavaRuntime="false"
1043           executable="${javac7}"
1044           fork="true">
1045
1046      <include name="extra166y/**/*.java"/>
1047      <compilerarg value="-XDignore.symbol.file=true"/>
1048      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1049      <compilerarg value="-Werror"/>
1050      <compilerarg line="${build.args}"/>
1051
1052    </javac>
1053  </target>
1054
1055
1056  <target name="extra166yjar"
1057          depends="extra166ycompile"
1058          description="Builds library jar from compiled sources">
1059
1060    <jar destfile="${extra166y.jar}" index="true">
1061      <fileset dir="${build.extra166y.classes.dir}"/>
1062      <manifest>
1063        <attribute name="Built-By" value="${user.name}"/>
1064        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1065      </manifest>
1066    </jar>
1067
1068  </target>
1069
1070
1071  <target name="extra166ydocs"
1072          description="Builds javadocs to build dir">
1073
1074    <delete dir="${extra166ydocs.dir}"/>
1075    <mkdir dir="${extra166ydocs.dir}"/>
1076
1077    <javadoc destdir="${extra166ydocs.dir}"
1078             packagenames="extra166y.*"
1079             link="${java.api.url}"
1080             access="${build.javadoc.access}"
1081             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1082             bootclasspath="${bootclasspath6}"
1083             source="6"
1084             executable="${javadoc7}">
1085      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1086      <arg value="-XDignore.symbol.file=true"/>
1087
1088    </javadoc>
1089  </target>
1090
1091
1092  <target name="extra166ydist"
1093          depends="extra166ydist-jar, extra166ydist-docs"
1094          description="Puts all distributable products in single hierarchy"/>
1095
1096
1097  <target name="extra166yclean"
1098          description="Removes all extra166y build products">
1099
1100    <delete dir="${build.extra166y.dir}"/>
1101
1102  </target>
1103
1104
1105  <target name="extra166ydist-jar"
1106          depends="extra166yclean, extra166yjar">
1107    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1108  </target>
1109
1110  <target name="extra166ydist-docs"
1111          depends="extra166yclean, extra166ydocs">
1112    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1113  </target>
1114
1115  <!-- jsr166e -->
1116
1117  <property name="build.jsr166e.java.version" value="6"/>
1118  <property name="build.jsr166e.javac" value="${javac6}"/>
1119
1120  <target name="jsr166ecompile"
1121          depends="configure-compiler"
1122          description="Compiles jsr166e sources">
1123
1124    <mkdir dir="${build.jsr166e.classes.dir}"/>
1125
1126    <javac srcdir="${topsrc.dir}"
1127           destdir="${build.jsr166e.classes.dir}"
1128           debug="${build.debug}"
1129           debuglevel="${build.debuglevel}"
1130           deprecation="${build.deprecation}"
1131           source="${build.jsr166e.java.version}"
1132           target="${build.jsr166e.java.version}"
1133           classpath=""
1134           includeAntRuntime="false"
1135           includeJavaRuntime="false"
1136           executable="${build.jsr166e.javac}"
1137           fork="true">
1138
1139      <include name="jsr166e/**/*.java"/>
1140      <compilerarg value="-XDignore.symbol.file=true"/>
1141      <compilerarg value="-Xlint:all"/>
1142      <compilerarg value="-Werror"/>
1143      <compilerarg line="${build.args}"/>
1144
1145    </javac>
1146  </target>
1147
1148  <!-- jsr166e: find doclint errors -->
1149  <target name="jsr166edoclint">
1150
1151    <mkdir dir="${build.jsr166e.classes.dir}"/>
1152
1153    <javac srcdir="${topsrc.dir}"
1154           destdir="${build.jsr166e.classes.dir}"
1155           debug="${build.debug}"
1156           debuglevel="${build.debuglevel}"
1157           deprecation="${build.deprecation}"
1158           source="${build.jsr166e.java.version}"
1159           target="${build.jsr166e.java.version}"
1160           classpath=""
1161           bootclasspath="${bootclasspath6}"
1162           includeAntRuntime="false"
1163           includeJavaRuntime="false"
1164           executable="${javac8}"
1165           fork="true">
1166
1167      <include name="jsr166e/**/*.java"/>
1168      <compilerarg value="-XDignore.symbol.file=true"/>
1169      <compilerarg value="-Xlint:all"/>
1170      <compilerarg value="-Werror"/>
1171      <compilerarg value="-Xdoclint:all/protected"/>
1172
1173    </javac>
1174  </target>
1175
1176
1177  <target name="jsr166ejar"
1178          depends="jsr166ecompile"
1179          description="Builds library jar from compiled sources">
1180
1181    <jar destfile="${jsr166e.jar}" index="true">
1182      <fileset dir="${build.jsr166e.classes.dir}"/>
1183      <manifest>
1184        <attribute name="Built-By" value="${user.name}"/>
1185        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1186      </manifest>
1187    </jar>
1188
1189  </target>
1190
1191
1192  <target name="jsr166edocs"
1193          description="Builds javadocs to build dir">
1194
1195    <delete dir="${jsr166edocs.dir}"/>
1196    <mkdir dir="${jsr166edocs.dir}"/>
1197
1198    <javadoc destdir="${jsr166edocs.dir}"
1199             packagenames="jsr166e.*"
1200             link="${java.api.url}"
1201             access="${build.javadoc.access}"
1202             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1203             source="${build.jsr166e.java.version}"
1204             executable="${javadoc7}">
1205      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1206      <arg value="-XDignore.symbol.file=true"/>
1207
1208    </javadoc>
1209  </target>
1210
1211
1212  <target name="jsr166e-tck-one-java-version"
1213          depends="jsr166ejar">
1214
1215    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1216
1217    <run-tck-tests
1218      tck.src.dir="${test.src.dir}/tck-jsr166e"
1219      target="${build.jsr166e.java.version}"
1220      workdir="${build.jsr166e.dir}"
1221      classes="${jsr166e.jar}"/>
1222  </target>
1223
1224  <target name="jsr166e-tck"
1225          description="Runs tck tests for jsr166e for multiple java versions">
1226
1227 <!--     <antcall target="clean"/> -->
1228 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1229 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1230 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1231 <!--     </antcall> -->
1232
1233    <antcall target="clean"/>
1234    <antcall target="jsr166e-tck-one-java-version">
1235      <param name="build.jsr166e.java.version" value="7"/>
1236      <param name="build.jsr166e.javac" value="${javac7}"/>
1237    </antcall>
1238
1239    <antcall target="clean"/>
1240    <antcall target="jsr166e-tck-one-java-version">
1241      <param name="build.jsr166e.java.version" value="6"/>
1242      <param name="build.jsr166e.javac" value="${javac6}"/>
1243    </antcall>
1244  </target>
1245
1246
1247  <target name="jsr166e-test"
1248          depends="jsr166e-tck"
1249          description="Runs all tests for jsr166e">
1250  </target>
1251
1252  <target name="jsr166edist"
1253          depends="jsr166edist-jar, jsr166edist-docs"
1254          description="Puts all distributable products in single hierarchy"/>
1255
1256
1257  <target name="jsr166eclean"
1258          description="Removes all jsr166e build products">
1259    <delete dir="${build.jsr166e.dir}"/>
1260  </target>
1261
1262
1263  <target name="jsr166edist-jar"
1264          depends="jsr166eclean, jsr166ejar">
1265    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1266  </target>
1267
1268  <target name="jsr166edist-docs"
1269          depends="jsr166eclean, jsr166edocs">
1270    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1271  </target>
1272
1273
1274 <!-- Find buglets that can be detected by static build tools -->
1275
1276  <target name="lint">
1277    <antcall target="dists">
1278      <param name="build.javadoc.access" value="public"/>
1279    </antcall>
1280  </target>
1281
1282 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1283  <target name="lint-private">
1284    <antcall target="dist">
1285      <param name="build.javadoc.access" value="private"/>
1286    </antcall>
1287  </target>
1288
1289
926   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines