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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines