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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines