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.311 by jsr166, Mon Mar 2 19:36:41 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    where each of the above is a JDK or a symlink to same, and
28 <  $HOME/jdk/src/jdk6
29 <  $HOME/jdk/src/jdk7
30 <  $HOME/jdk/src/jdk8
31 <  $HOME/jdk/src/jdk9
32 <  where each of the above is a complete JDK source tree
33 <  (e.g. mercurial forest) or a symlink to same.
28 >  $HOME/jdk/src/jdk11
29 >  $HOME/jdk/src/jdk12
30 >  $HOME/jdk/src/jdk13
31 >  $HOME/jdk/src/jdk14
32 >  $HOME/jdk/src/jdk15
33 >  where each of the above is a JDK source tree or a symlink to same.
34  
35    Alternatively, define ant variables thus:
36 <  ant -Djdk$N.home=...
37 <  for $N in 6 7 8 9 ...
36 >  ant -Djdk$N.home=... -Djdk$N.src.home=...
37 >  for $N in 11 .. 15 ...
38  
39 <  As of 2015-09, there is incomplete hacky support for jigsaw
40 <  Build for jigsaw using something like:
41 <  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
36 <  "docs" target is still broken.
39 >  As of 2016-03, the sources in src/main are for jdk9+ only.
40 >  As of 2019-08, the sources in src/main are for jdk11+ only.
41 >  As of 2019-10, compatibility support for jdk8 is dropped entirely.
42   ------------------------------------------------------------------------------
43    </description>
44  
45 <  <!-- Display main targets by running 'ant -projecthelp' -->
45 >  <!-- Run 'ant -projecthelp' (default target) -->
46    <target name="usage">
47      <java classname="org.apache.tools.ant.Main">
48        <arg value="-projecthelp" />
# Line 51 | Line 56
56  
57  
58    <!-- Compilation options -->
54  <property name="build.sourcelevel"    value="6"/>
59    <property name="build.debug"          value="true"/>
60    <property name="build.debuglevel"     value="source,lines,vars"/>
61    <property name="build.deprecation"    value="false"/>
# Line 62 | Line 66
66    <property name="build.classes.dir"           location="${build.dir}/classes"/>
67    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
68    <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"/>
69  
70    <!-- JDK locations -->
71    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 85 | Line 73
73    <macrodef name="defjdklocations">
74      <attribute name="v"/>
75      <sequential>
76 <    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
77 <    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
78 <    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
79 <    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
80 <    <local name="have.java.base"/>
81 <    <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"/>
76 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
77 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
78 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
79 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
80 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
81 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
82      </sequential>
83    </macrodef>
84  
# Line 123 | Line 94
94      </sequential>
95    </macrodef>
96  
97 <  <defjdklocations v="6"/>
98 <  <defjdklocations v="7"/>
99 <  <defjdklocations v="8"/>
100 <  <defjdklocations v="9"/>
97 >  <defjdklocations v="11"/>
98 >  <defjdklocations v="12"/>
99 >  <defjdklocations v="13"/>
100 >  <defjdklocations v="14"/>
101 >  <defjdklocations v="15"/>
102  
103    <!-- Source locations -->
104    <property name="src.dir"              location="${basedir}/src/main"/>
105    <property name="test.src.dir"         location="${basedir}/src/test"/>
106    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
107    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
108 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
109 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
110 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
111 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
108 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
109 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
110 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
111 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
112 >  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
113 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
114    <property name="lib.dir"              location="${basedir}/lib"/>
115    <property name="dist.dir"             location="${basedir}/dist"/>
116    <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"/>
117  
118    <!-- Javadoc locations -->
119    <property name="docs.dir"          location="${build.dir}/docs"/>
120 <  <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"/>
120 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
121  
122    <!-- Jar locations -->
123    <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"/>
124    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
125  
126    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
127 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
128 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
129 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
130 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
131 <  <!-- The expected canonical location does not yet exist as of 2014-07 -->
132 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
133 <  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
134 <  <!-- Default jdk doc location (latest stable release seems best) -->
135 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
127 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
128 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
129 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
130 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
131 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
132 >  <!-- The location of jdk early access docs (RIP) -->
133 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
134 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
135 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
136 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
137 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
138 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
139 >  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
140 >  <property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/docs"/>
141 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
142 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
143  
144    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
145 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
146 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
147 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
148 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
149 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
145 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
146 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
147 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
148 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
149 >  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
150    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
151  
152    <!-- Define the "jtreg" task -->
# Line 194 | Line 154
154    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
155             classpath="${lib.dir}/jtreg.jar" />
156  
157 <  <!-- Tck options; see JSR166TestCase.java
157 >  <!-- Tck configuration options; see JSR166TestCase.java
158     To profile a single tck test class:
159     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
160     To stress test a single tck test class:
# Line 209 | Line 169
169      <attribute name="compile-target" default="@{target}"/>
170      <attribute name="workdir"/>
171      <attribute name="classes"/>
172 <    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
172 >    <!--
173 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
174 >    -->
175 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
176      <element name="javac-elements" optional="true"/>
177  
178      <sequential>
179  
217    <local name="modules"/>
218    <condition property="modules">
219      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
220    </condition>
221
180      <mkdir dir="@{workdir}/tck-classes"/>
181  
182      <javac srcdir="@{tck.src.dir}"
# Line 231 | Line 189
189             classpath="${junit.jar}"
190             includeAntRuntime="false"
191             includeJavaRuntime="false"
192 +           encoding="ASCII"
193             executable="${javac@{compile-target}}"
194             fork="true">
195  
196        <include name="*.java"/>
197        <compilerarg value="-XDignore.symbol.file=true"/>
198        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
199 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
200 <      <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
199 >      <compilerarg value="-Xdoclint:reference/private"/>
200 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
201        <compilerarg line="${build.args}"/>
202        <javac-elements/>
203  
# Line 248 | Line 207
207            failonerror="true"
208            jvm="${java@{target}}"
209            fork="true">
210 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
211 <        <jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
212 <        <jvmarg line="@{jvmflags}"/>
210 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
211 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
212 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
213 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
214 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
215 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
216 >        <jvmarg line="@{jvmflags}"/>
217 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
218 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
219  
220          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
221 <        <syspropertyset id="system-properties-used-by-tck">
222 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
223 <          <propertyref prefix="jsr166."/>
224 <        </syspropertyset>
225 <
226 <        <classpath>
227 <          <pathelement location="${junit.jar}"/>
228 <          <pathelement location="@{workdir}/tck-classes"/>
229 <        </classpath>
221 >        <syspropertyset id="system-properties-used-by-tck">
222 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
223 >          <propertyref prefix="jsr166."/>
224 >          <propertyref name="test.timeout.factor"/>
225 >        </syspropertyset>
226 >
227 >        <classpath>
228 >          <pathelement location="${junit.jar}"/>
229 >          <pathelement location="@{workdir}/tck-classes"/>
230 >        </classpath>
231      </java>
232  
233      </sequential>
234    </macrodef>
235  
236    <!-- Define jtreg test sets for different jdk versions -->
237 <  <fileset dir="${jtreg9.src.dir}">
238 <    <patternset id="jdk9.jtreg.tests">
239 <      <include name="**/*.java"/>
240 <    </patternset>
241 <  </fileset>
237 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
238 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
239 >  <property name="jtreg.test.pattern" value="**/*.java"/>
240 >  <macrodef name="defjtregtests">
241 >    <attribute name="v"/>
242 >    <sequential>
243 >      <fileset dir="${jtreg@{v}.src.dir}">
244 >        <patternset id="jdk@{v}.jtreg.tests">
245 >          <include name="${jtreg.test.pattern}"/>
246 >        </patternset>
247 >      </fileset>
248 >    </sequential>
249 >  </macrodef>
250  
251 <  <fileset dir="${jtreg8.src.dir}">
252 <    <patternset id="jdk8.jtreg.tests">
253 <      <include name="**/*.java"/>
254 <      <exclude name="**/SpliteratorCharacteristics.java"/>
255 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
282 <      <exclude name="**/GCDuringIteration.java"/>
283 <    </patternset>
284 <  </fileset>
251 >  <defjtregtests v="15"/>
252 >  <defjtregtests v="14"/>
253 >  <defjtregtests v="13"/>
254 >  <defjtregtests v="12"/>
255 >  <defjtregtests v="11"/>
256  
257 <  <fileset dir="${jtreg7.src.dir}">
258 <    <patternset id="jdk7.jtreg.tests">
288 <      <include name="**/*.java"/>
289 <    </patternset>
290 <  </fileset>
257 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
258 >  <property name="jtreg.flags" value=""/>
259  
260    <macrodef name="run-jtreg-tests">
261 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
294 <    <attribute name="source" default="7"/>
261 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
262      <attribute name="target"/>
263      <attribute name="workdir"/>
264      <attribute name="classes"/>
265 +    <attribute name="verbose" default="${jtreg.verbose}"/>
266      <attribute name="jtregflags" default=""/>
267 +    <element name="jtreg-elements" optional="true"/>
268  
269      <sequential>
270  
271      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
272      <property name="jtreg.verbose" value="nopass,fail,error"/>
273  
305    <local name="modules"/>
306    <condition property="modules">
307      <available file="${jdk@{target}.home}/jmods" type="dir"/>
308    </condition>
309
274      <delete dir="@{workdir}/JTwork"   quiet="true"/>
311    <delete dir="@{workdir}/JTreport" quiet="true"/>
312    <mkdir dir="@{workdir}/JTwork/scratch"/>
313    <mkdir dir="@{workdir}/JTreport"/>
275      <jtreg dir="${jtreg@{target}.src.dir}"
276             jdk="${jdk@{target}.home}"
277 <           workDir="@{workdir}/JTwork"
317 <           reportDir="@{workdir}/JTreport">
277 >           workDir="@{workdir}/JTwork">
278        <patternset refid="jdk@{target}.jtreg.tests"/>
279 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
280 <      <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
279 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
280 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
281 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
282        <arg value="-agentvm"/>
283 <      <arg value="-verbose:${jtreg.verbose}"/>
283 >      <arg value="-noreport"/>
284 >      <arg value="-verbose:@{verbose}"/>
285        <arg value="-vmoptions:-esa -ea"/>
286        <arg value="-automatic"/>
287        <arg value="-k:!ignore"/>
288        <arg line="@{jtregflags}"/>
289 +      <arg line="${jtreg.flags}"/>
290 +      <jtreg-elements/>
291      </jtreg>
292      </sequential>
293    </macrodef>
# Line 334 | Line 298
298    </path>
299  
300    <!-- Support @jls tag, used in jdk8+ javadoc -->
301 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
302    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
303    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
304  
305    <!-- Main targets -->
306  
307 <  <property name="build.main.java.version" value="9"/>
308 <  <property name="build.main.javac" value="${javac9}"/>
307 >  <!-- Default values: may seem strange ... -->
308 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
309 >  <!-- But at build time, target jdk9, for maximal binary portability -->
310 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
311 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
312 >    o override-methods=summary
313 >    o {@systemProperty ...}
314 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
315 >    o 8202628: javadoc generates bad links in TestModules.java
316 >    -->
317 >  <property name="java.runtime.target" value="11"/>
318 >  <property name="build.main.java" value="${java11}"/>
319 >  <property name="build.main.javac" value="${javac11}"/>
320 >  <property name="build.main.javadoc" value="${javadoc12}"/>
321 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
322  
323    <target name="dists"
324 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
324 >          depends="dist"
325            description="Builds all public jars and docs"/>
326  
327    <target name="compile"
328            depends="configure-compiler"
329            description="Compiles src/main sources to build dir">
330  
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
331      <local name="destdir"/>
332 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
363 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
332 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
333  
334      <mkdir dir="${destdir}"/>
335  
# Line 372 | Line 341
341             classpath=""
342             includeAntRuntime="false"
343             includeJavaRuntime="false"
344 +           encoding="ASCII"
345             executable="${build.main.javac}"
346             fork="true">
347  
348        <include name="**/*.java"/>
349 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
349 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
350        <compilerarg value="-Xprefer:source"/>
351        <compilerarg value="-XDignore.symbol.file=true"/>
352 <      <compilerarg value="-Xlint:all"/>
352 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
353 >      <compilerarg value="-Xlint:all,-removal"/>
354 >      <compilerarg line="--doclint-format html5"/>
355 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
356 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
357        <compilerarg value="-Werror"/>
384      <compilerarg value="-Xdoclint:all/protected"/>
358        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
359        <compilerarg line="${build.args}"/>
360  
# Line 391 | Line 364
364  
365    <target name="jar"
366            depends="compile"
367 <          description="Builds library jar from compiled sources">
368 <
367 >          description="Builds library jar for src/main from compiled sources">
368 >    <local name="subdir"/>
369 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
370      <jar destfile="${product.jar}">
371 <      <fileset dir="${build.classes.dir}"/>
371 >      <fileset dir="${build.classes.dir}${subdir}"/>
372        <manifest>
373          <attribute name="Built-By" value="${user.name}"/>
374          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 406 | Line 380
380    <target name="docs"
381            description="Builds javadocs for src/main to dist dir">
382  
383 <    <delete dir="${docs.dir}"/>
383 >    <delete dir="${docs.dir}" quiet="true"/>
384      <mkdir dir="${docs.dir}"/>
385  
386 +    <!-- old school frames via docs/index.html?overview-summary.html -->
387 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
388 +    <local name="use-frames"/>
389 +    <condition property="use-frames">
390 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
391 +    </condition>
392 +
393      <!-- the packagenames="none" hack below prevents scanning the -->
394      <!-- sourcepath for packages -->
395  
396 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
397 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
398 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
399 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
400 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
401      <javadoc destdir="${docs.dir}"
402               packagenames="none"
403 <             link="${java9.api.url}"
403 >             link="${java.api.url}"
404               overview="${src.dir}/intro.html"
405               access="${build.javadoc.access}"
406 <             sourcepath="${src.dir}:${jdk9src.dir}"
406 >             sourcepath="${src.dir}"
407               classpath=""
408 <             executable="${javadoc9}">
408 >             source="${build.main.javadoc.source}"
409 >             executable="${build.main.javadoc}">
410 > <!-- TODO: JDK-8214571 failonerror = "true" -->
411        <fileset dir="${src.dir}" defaultexcludes="yes">
412          <include name="**/*.java"/>
413        </fileset>
414 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
414 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
415        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
416 +      <arg value="-quiet"/>
417        <arg value="-XDignore.symbol.file=true"/>
418 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
419 <      <arg value="-tag"/>
420 <      <arg value="${javadoc.jls.option}"/>
421 <      <arg value="-tag"/>
422 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
423 <      <arg value="-tag"/>
424 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
425 <      <arg value="-tag"/>
426 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
418 >      <arg value="-html5"/>
419 >      <arg value="--patch-module=java.base=${src.dir}"/>
420 >      <arg value="--frames" if:set="use-frames"/>
421 >      <arg value="--override-methods=summary"/>
422 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
423 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
424 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
425 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
426 > <!-- tags added in jdk9: currently unused -->
427 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
428 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
429      </javadoc>
430    </target>
431  
# Line 444 | Line 435
435            description="Puts all distributable products in single hierarchy"/>
436  
437  
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
438    <target name="clean"
439            description="Removes all build products">
471
440      <delete dir="${build.dir}"/>
473
441    </target>
442  
443  
444    <target name="dist-clean"
445            description="Removes all build and distribution products">
479
446      <delete dir="${build.dir}"/>
447      <delete dir="${dist.dir}"/>
482
448    </target>
449  
450  
# Line 494 | Line 459
459    </target>
460  
461    <target name="tck"
462 <          depends="jar"
463 <          description="Runs tck tests for main directly">
462 >          depends="jar"
463 >          description="Runs tck tests for src/main directly">
464  
465      <run-tck-tests
466 <      target="${build.main.java.version}"
466 >      target="${java.runtime.target}"
467        workdir="${build.dir}"
468 <      classes="${product.jar}"/>
468 >      classes="${product.jar}">
469 >      <javac-elements>
470 >        <compilerarg value="-Werror"/>
471 >      </javac-elements>
472 >    </run-tck-tests>
473    </target>
474  
475    <target name="tck-parallelism-1"
476 <          description="Runs tck with given common pool parallelism">
476 >          description="Runs tck with common pool parallelism 1">
477      <antcall target="tck">
478        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
479      </antcall>
480    </target>
481  
482    <target name="tck-parallelism-0"
483 <          description="Runs tck with given common pool parallelism">
483 >          description="Runs tck with common pool parallelism 0">
484      <antcall target="tck">
485        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
486      </antcall>
487    </target>
488  
489 +  <target name="tck-security-manager"
490 +          description="Runs tck with a security manager">
491 +    <antcall target="tck">
492 +      <param name="jsr166.useSecurityManager" value="true"/>
493 +    </antcall>
494 +  </target>
495 +
496    <target name="jtreg"
497 <          depends="jar"
498 <          description="Runs jtreg tests for main using the jtreg ant task">
497 >          depends="jar"
498 >          description="Runs jtreg tests for src/main using the jtreg ant task">
499      <run-jtreg-tests
500 <       target="${build.main.java.version}"
500 >       target="${java.runtime.target}"
501         workdir="${build.dir}"
502         classes="${product.jar}"/>
503    </target>
504  
505    <target name="test"
506 <          depends="tck, tck-parallelism-1, jtreg"
507 <          description="Runs tck and jtreg tests for main">
506 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
507 >          description="Runs tck and jtreg tests for src/main"/>
508 >
509 >  <target name="test-version-permutations"
510 >          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
511 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
512 >
513 >  <target name="test11">
514 >    <antcall>
515 >      <param name="java.runtime.target" value="11"/>
516 >      <param name="build.main.javac" value="${javac11}"/>
517 >      <param name="build.main.javadoc" value="${javadoc12}"/>
518 >      <param name="build.main.javadoc.source" value="11"/>
519 >      <target name="clean"/>
520 >      <target name="test"/>
521 >      <target name="docs"/>
522 >    </antcall>
523    </target>
524  
525 <  <target name="jtreg8" description="Runs jtreg tests with jdk8">
525 >  <target name="test12">
526 >    <antcall>
527 >      <param name="java.runtime.target" value="12"/>
528 >      <param name="build.main.javac" value="${javac12}"/>
529 >      <param name="build.main.javadoc" value="${javadoc12}"/>
530 >      <param name="build.main.javadoc.source" value="12"/>
531 >      <target name="clean"/>
532 >      <target name="test"/>
533 >      <target name="docs"/>
534 >    </antcall>
535 >  </target>
536  
537 <    <antcall target="jtreg">
538 <      <param name="build.main.java.version" value="8"/>
539 <      <param name="build.main.javac" value="${javac8}"/>
537 >  <target name="test13">
538 >    <antcall>
539 >      <param name="java.runtime.target" value="13"/>
540 >      <param name="build.main.javac" value="${javac13}"/>
541 >      <param name="build.main.javadoc" value="${javadoc13}"/>
542 >      <param name="build.main.javadoc.source" value="13"/>
543 >      <target name="clean"/>
544 >      <target name="test"/>
545 >      <target name="docs"/>
546      </antcall>
547 +  </target>
548  
549 +  <target name="test14">
550 +    <antcall>
551 +      <param name="java.runtime.target" value="14"/>
552 +      <param name="build.main.javac" value="${javac14}"/>
553 +      <param name="build.main.javadoc" value="${javadoc14}"/>
554 +      <param name="build.main.javadoc.source" value="14"/>
555 +      <target name="clean"/>
556 +      <target name="test"/>
557 +      <target name="docs"/>
558 +    </antcall>
559    </target>
560  
561 <  <target name="test89"
562 <          description="Runs tck and jtreg tests for main for multiple java versions">
561 >  <target name="test15">
562 >    <antcall>
563 >      <param name="java.runtime.target" value="15"/>
564 >      <param name="build.main.javac" value="${javac15}"/>
565 >      <param name="build.main.javadoc" value="${javadoc15}"/>
566 >      <param name="build.main.javadoc.source" value="15"/>
567 >      <target name="clean"/>
568 >      <target name="test"/>
569 >      <target name="docs"/>
570 >    </antcall>
571 >  </target>
572  
573 <    <antcall target="clean"/>
574 <    <antcall target="test">
575 <      <param name="build.main.java.version" value="8"/>
576 <      <param name="build.main.javac" value="${javac8}"/>
573 >  <target name="test11-12">
574 >    <antcall>
575 >      <param name="java.runtime.target" value="12"/>
576 >      <param name="build.main.javac" value="${javac11}"/>
577 >      <param name="build.main.javadoc" value="${javadoc12}"/>
578 >      <param name="build.main.javadoc.source" value="11"/>
579 >      <target name="clean"/>
580 >      <target name="test"/>
581 >      <target name="docs"/>
582      </antcall>
583 +  </target>
584  
585 <    <antcall target="clean"/>
586 <    <antcall target="test">
587 <      <param name="build.main.java.version" value="9"/>
588 <      <param name="build.main.javac" value="${javac9}"/>
585 >  <target name="test11-13">
586 >    <antcall>
587 >      <param name="java.runtime.target" value="13"/>
588 >      <param name="build.main.javac" value="${javac11}"/>
589 >      <param name="build.main.javadoc" value="${javadoc13}"/>
590 >      <param name="build.main.javadoc.source" value="11"/>
591 >      <target name="clean"/>
592 >      <target name="test"/>
593 >      <target name="docs"/>
594      </antcall>
595 +  </target>
596  
597 +  <target name="test11-14">
598 +    <antcall>
599 +      <param name="java.runtime.target" value="14"/>
600 +      <param name="build.main.javac" value="${javac11}"/>
601 +      <param name="build.main.javadoc" value="${javadoc14}"/>
602 +      <param name="build.main.javadoc.source" value="11"/>
603 +      <target name="clean"/>
604 +      <target name="test"/>
605 +      <target name="docs"/>
606 +    </antcall>
607    </target>
608  
609 +  <target name="test11-15">
610 +    <antcall>
611 +      <param name="java.runtime.target" value="15"/>
612 +      <param name="build.main.javac" value="${javac11}"/>
613 +      <param name="build.main.javadoc" value="${javadoc15}"/>
614 +      <param name="build.main.javadoc.source" value="11"/>
615 +      <target name="clean"/>
616 +      <target name="test"/>
617 +      <target name="docs"/>
618 +    </antcall>
619 +  </target>
620  
621  
622    <target name="configure-compiler">
623      <fail message="ant version too old">
624 <      <condition>
565 <        <not> <antversion atleast="1.9.1"/> </not>
566 <      </condition>
624 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
625      </fail>
626  
627      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 581 | Line 639
639    </target>
640  
641  
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
642    <target name="compile-test-loops" depends="jar"
643 <          description="compile all the perf tests in src/test/loops">
643 >          description="Compiles all the perf tests in src/test/loops">
644  
645      <mkdir dir="${build.dir}/test/loops"/>
646  
# Line 623 | Line 651
651             deprecation="${build.deprecation}"
652             includeAntRuntime="false"
653             includeJavaRuntime="false"
654 <           executable="${javac9}"
654 >           encoding="ASCII"
655 >           executable="${build.main.javac}"
656             fork="true">
657  
658        <include name="*.java"/>
659        <compilerarg value="-XDignore.symbol.file=true"/>
660 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
661 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
660 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
661 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
662        <compilerarg line="${build.args}"/>
634
663      </javac>
636
664    </target>
665  
666  
667 <  <!-- jsr166 4jdk7 -->
668 <
669 <  <target name="4jdk7compile"
670 <          depends="configure-compiler"
671 <          description="Compiles src/jdk7 sources, targeting jdk7">
672 <
673 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
667 >  <!-- old branches no longer maintained.  build support deleted -->
668 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
669 >  <!-- jsr166 4jdk7 (no longer maintained) -->
670 >  <!-- jsr166x (no longer maintained) -->
671 >  <!-- jsr166y (no longer maintained) -->
672 >  <!-- extra166y (no longer maintained) -->
673 >  <!-- jsr166e (no longer maintained) -->
674  
675 <    <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">
675 > <!-- Find buglets that can be detected by static build tools -->
676  
677 <      <include name="**/*.java"/>
678 <      <compilerarg value="-Xprefer:source"/>
679 <      <compilerarg value="-XDignore.symbol.file=true"/>
680 <      <compilerarg value="-Xlint:all"/>
681 <      <compilerarg value="-Werror"/>
666 <      <compilerarg line="${build.args}"/>
677 > <!--   <target name="lint"> -->
678 > <!--     <antcall target="dists"> -->
679 > <!--       <param name="build.javadoc.access" value="protected"/> -->
680 > <!--     </antcall> -->
681 > <!--   </target> -->
682  
683 <    </javac>
683 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
684 >  <target name="doclint-private">
685 >    <antcall target="dist">
686 >      <param name="build.javadoc.access" value="private"/>
687 >    </antcall>
688    </target>
689  
671  <target name="4jdk7doclint"
672          depends="configure-compiler"
673          description="Finds doclint warnings">
690  
691 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
691 > <!-- ==============================================================
692 >  Experimental errorprone support
693 >  https://errorprone.info
694 >  https://errorprone.info/docs/installation
695 >  https://github.com/google/error-prone/issues/1143
696 > =================================================================== -->
697 >  <path id="errorprone.processorpath.path">
698 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
699 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
700 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
701 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
702 >    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
703 >  </path>
704 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
705 >  <property name="errorprone.jsr166.user.flags" value=""/>
706 >  <property name="errorprone.jsr166.flags"
707 >            value="-Xep:HashtableContains:OFF
708 >                   -Xep:JdkObsolete:OFF
709 >                   -Xep:MissingOverride:OFF
710 >                   -Xep:MissingFail:OFF
711 >                   -Xep:ThreadPriorityCheck:OFF
712 >                   -Xep:MixedArrayDimensions:ERROR
713 >                   -Xep:RemoveUnusedImports:ERROR
714 >                   -Xep:EmptyIf:ERROR
715 >                   -Xep:MultipleTopLevelClasses:ERROR
716 >                   -Xep:ClassName:ERROR
717 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
718 >                   -Xep:RedundantThrows:ERROR
719 >                   -Xep:IdentityBinaryExpression:WARN
720 >                   -Xep:ConstructorInvokesOverridable:WARN
721 >                   -Xep:MethodCanBeStatic:WARN
722 >                   ${errorprone.jsr166.user.flags}"/>
723 >  <!-- -Xep:WildcardImport:ERROR -->
724 >  <property name="errorprone.jsr166.test.flags"
725 >            value="-Xep:StringSplitter:OFF
726 >                   -Xep:BoxedPrimitiveConstructor:OFF
727 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
728 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
729 >  <target name="errorprone"
730 >          depends="clean, configure-compiler"
731 >          description="Run errorprone over jsr166 source code (experimental)">
732 >
733 >    <local name="destdir"/>
734 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
735 >    <mkdir dir="${destdir}"/>
736  
737 <    <javac srcdir="${4jdk7src.dir}"
738 <           destdir="${build.4jdk7.classes.dir}"
737 >    <javac srcdir="${src.dir}"
738 >           destdir="${destdir}"
739             debug="${build.debug}"
740             debuglevel="${build.debuglevel}"
741             deprecation="${build.deprecation}"
682           source="6"
742             classpath=""
684           bootclasspath="${bootclasspath7}"
743             includeAntRuntime="false"
744             includeJavaRuntime="false"
745 <           executable="${javac8}"
745 >           encoding="ASCII"
746 >           executable="${build.main.javac}"
747             fork="true">
748  
749        <include name="**/*.java"/>
750 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
751 +      <compilerarg value="-J--illegal-access=permit"/>
752 +      <compilerarg value="-XDcompilePolicy=simple"/>
753 +      <compilerarg value="-processorpath"/>
754 +      <compilerarg pathref="errorprone.processorpath.path"/>
755 +      <compilerarg value="-Xplugin:ErrorProne
756 +                          ${errorprone.jsr166.flags}"/>
757 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
758        <compilerarg value="-Xprefer:source"/>
759        <compilerarg value="-XDignore.symbol.file=true"/>
760        <compilerarg value="-Xlint:all"/>
761 <      <compilerarg value="-Xdoclint:all/protected"/>
761 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
762 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
763        <compilerarg line="${build.args}"/>
696
764      </javac>
698  </target>
765  
766 <
767 <  <target name="4jdk7jar"
702 <          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>
766 >    <jar destfile="${product.jar}">
767 >      <fileset dir="${destdir}"/>
768      </jar>
769  
713  </target>
714
715
716  <target name="4jdk7-tck"
717          depends="4jdk7jar"
718          description="Runs tck tests for jsr166-4jdk7 directly">
719
770      <run-tck-tests
771 <      target="7"
772 <      workdir="${build.4jdk7.dir}"
773 <      classes="${4jdk7product.jar}">
771 >      target="${java.runtime.target}"
772 >      workdir="${build.dir}"
773 >      classes="${product.jar}">
774        <javac-elements>
775 <        <!-- JDK8+ test classes -->
776 <        <exclude name="*8Test.java"/>
777 <        <exclude name="*9Test.java"/>
778 <        <exclude name="*10Test.java"/>
779 <        <exclude name="DoubleAccumulatorTest.java"/>
780 <        <exclude name="DoubleAdderTest.java"/>
781 <        <exclude name="LongAccumulatorTest.java"/>
782 <        <exclude name="LongAdderTest.java"/>
733 <        <exclude name="CompletableFutureTest.java"/>
734 <        <exclude name="SplittableRandomTest.java"/>
735 <        <exclude name="StampedLockTest.java"/>
736 <        <exclude name="SubmissionPublisherTest.java"/>
775 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
776 >        <compilerarg value="-J--illegal-access=permit"/>
777 >        <compilerarg value="-XDcompilePolicy=simple"/>
778 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
779 >        <compilerarg value="-Xplugin:ErrorProne
780 >                            ${errorprone.jsr166.flags}
781 >                            ${errorprone.jsr166.test.flags}"/>
782 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
783        </javac-elements>
784      </run-tck-tests>
785    </target>
786  
787 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
788 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
789 +  <target name="errorprone-jtreg"
790 +          depends="jar"
791 +          description="Run errorprone over jtreg tests (experimental)">
792  
793 <  <target name="4jdk7-tck-junit"
794 <          depends="4jdk7compile"
795 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
796 <
797 <    <junit printsummary="true"
798 <           showoutput="true"
799 <           errorProperty="junit.failed"
800 <           failureProperty="junit.failed"
801 <           includeantruntime="true"
802 <           jvm="${java7}"
803 <           fork="true">
804 <
805 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
806 <      <jvmarg value="-server"/>
807 <
793 >    <run-jtreg-tests
794 >       target="${java.runtime.target}"
795 >       workdir="${build.dir}"
796 >       classes="${product.jar}"
797 >       verbose="all">
798 >      <jtreg-elements>
799 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
800 >        <arg value="-javacoption:-processorpath"/>
801 >        <arg value="-javacoption:${errorprone.processorpath}"/>
802 >        <arg value="-javacoption:-Xplugin:ErrorProne
803 >                            ${errorprone.jsr166.flags}
804 >                            ${errorprone.jsr166.test.flags}
805 >                            -Xep:MultipleTopLevelClasses:WARN
806 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
807 >      </jtreg-elements>
808 >    </run-jtreg-tests>
809 >  </target>
810 >
811 >
812 > <!-- ==============================================================
813 >  Running guava tests against jsr166 code
814 > =================================================================== -->
815 >
816 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
817 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
818 > <!-- <property name="guava.version" value="21.0"/> -->
819 >
820 > <!-- HOWTO debug print a path id -->
821 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
822 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
823 >
824 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
825 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
826 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
827 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
828 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
829 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
830 >
831 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
832 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
833 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
834 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
835 >
836 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
837 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
838 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
839 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
840 >
841 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
842 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
843 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
844 >
845 >  <target name="init-ivy">
846 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
847 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
848 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
849 >             classpath="${build.dir}/ivy.jar"/>
850 >  </target>
851 >
852 >  <target name="guava-tests" depends="jar, init-ivy"
853 >          description="Guava tests run against jsr166 collections">
854 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
855 >    <mkdir dir="${guava.dir}"/>
856 >    <ivy:retrieve pathid="guava.testlib.classpath"
857 >      type="jar,bundle" inline="true" conf="default,master"
858 >      pattern="${guava.dir}/[artifact].[ext]"
859 >      organisation="com.google.guava" module="guava-testlib"/>
860 >    <property name="guava.version" value="21.0"/>
861 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
862 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
863 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
864 >           jvm="${build.main.java}" fork="true">
865 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
866 >      <formatter type="brief"/>
867        <classpath>
868 <        <pathelement location="${junit.jar}"/>
869 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
868 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
869 >        <path refid="guava.testlib.classpath"/>
870        </classpath>
871  
872 <      <formatter type="brief"/>
873 <
764 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
765 <      </test>
766 <
872 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
873 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
874      </junit>
875    </target>
876  
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
877   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines