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.205 by jsr166, Sat Mar 26 17:35:47 2016 UTC vs.
Revision 1.320 by jsr166, Tue Sep 15 19:09:50 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  
47 <  <!-- Display main targets by running 'ant -projecthelp' -->
47 >  <!-- Run 'ant -projecthelp' (default target) -->
48    <target name="usage">
49      <java classname="org.apache.tools.ant.Main">
50        <arg value="-projecthelp" />
# Line 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-03 -->
136 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
137 <  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
138 <  <!-- Default jdk doc location (latest stable release seems best) -->
139 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
131 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
132 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
133 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
134 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
135 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
136 >  <!-- The location of jdk early access docs (RIP) -->
137 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
138 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
139 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
140 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
141 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
142 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
143 >  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
144 >  <property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/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:${build.classes.dir}" if:set="modules"/>
205 >      <compilerarg value="-Xdoclint:reference/private"/>
206 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
207        <compilerarg line="${build.args}"/>
208        <javac-elements/>
209  
# Line 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:${build.classes.dir}" if:set="modules"/>
218 <        <jvmarg line="@{jvmflags}"/>
216 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
217 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
218 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
219 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
220 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
221 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
222 >        <jvmarg line="@{jvmflags}"/>
223 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
224 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
225  
226          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
227 <        <syspropertyset id="system-properties-used-by-tck">
228 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
229 <          <propertyref prefix="jsr166."/>
230 <          <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"/>
330    <mkdir dir="@{workdir}/JTwork/scratch"/>
331    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
332    <mkdir dir="@{workdir}/JTreport/html"/>
333    <mkdir dir="@{workdir}/JTreport/text"/>
282      <jtreg dir="${jtreg@{target}.src.dir}"
283             jdk="${jdk@{target}.home}"
284 <           workDir="@{workdir}/JTwork"
337 <           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="-Xpatch:${build.classes.dir}" if:set="modules"/>
286 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
287 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
288 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
289        <arg value="-agentvm"/>
290 <      <arg value="-verbose:${jtreg.verbose}"/>
290 >      <arg value="-noreport"/>
291 >      <arg value="-verbose:@{verbose}"/>
292        <arg value="-vmoptions:-esa -ea"/>
293        <arg value="-automatic"/>
294        <arg value="-k:!ignore"/>
295        <arg line="@{jtregflags}"/>
296        <arg line="${jtreg.flags}"/>
297 +      <jtreg-elements/>
298      </jtreg>
299      </sequential>
300    </macrodef>
# Line 355 | 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  
374    <local name="modules"/>
375    <condition property="modules">
376      <and>
377        <available file="${jdk9.home}/jmods" type="dir"/>
378        <equals arg1="9" arg2="${build.main.java.version}"/>
379      </and>
380    </condition>
381
338      <local name="destdir"/>
339 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
384 <    <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 393 | 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 413 | Line 376
376    <target name="jar"
377            depends="compile"
378            description="Builds library jar for src/main from compiled sources">
379 <
379 >    <local name="subdir"/>
380 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
381      <jar destfile="${product.jar}">
382 <      <fileset dir="${build.classes.dir}"/>
382 >      <fileset dir="${build.classes.dir}${subdir}"/>
383        <manifest>
384          <attribute name="Built-By" value="${user.name}"/>
385          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 427 | 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"/>
440 <      <arg value="revised:X"/>
462 <      <arg value="-tag"/>
463 <      <arg value="spec:X"/>
429 >      <arg value="-html5"/>
430 >      <arg value="-Xdoclint:all,-missing"/>
431 >      <arg value="--patch-module=java.base=${src.dir}"/>
432 >      <arg value="--frames" if:set="use-frames"/>
433 >      <arg value="--override-methods=summary"/>
434 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
435 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
436 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
437 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
438 > <!-- tags added in jdk9: currently unused -->
439 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
440 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
441      </javadoc>
442    </target>
443  
# Line 470 | Line 447
447            description="Puts all distributable products in single hierarchy"/>
448  
449  
473  <target name="release"
474          depends="dist"
475          description="Puts entire CVS tree, plus distribution productions, in a jar">
476
477    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
478
479    <jar basedir="${basedir}" destfile="${release.jar}">
480      <!-- <exclude name="build/**"/> -->
481      <exclude name="${release.jar}"/>
482      <exclude name="user.properties"/>
483      <exclude name="etc/notes/**"/>
484      <exclude name="src/emulation/**"/>
485      <exclude name="**/SyntaxTest.java"/>
486      <exclude name="**/SuperfluousAbstract.java"/>
487      <manifest>
488        <attribute name="Built-By" value="${user.name}"/>
489        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
490      </manifest>
491    </jar>
492  </target>
493
494
450    <target name="clean"
451            description="Removes all build products">
497
452      <delete dir="${build.dir}"/>
499
453    </target>
454  
455  
456    <target name="dist-clean"
457            description="Removes all build and distribution products">
505
458      <delete dir="${build.dir}"/>
459      <delete dir="${dist.dir}"/>
508
460    </target>
461  
462  
# Line 520 | Line 471
471    </target>
472  
473    <target name="tck"
474 <          depends="jar"
474 >          depends="jar"
475            description="Runs tck tests for src/main directly">
476  
477      <run-tck-tests
478 <      target="${build.main.java.version}"
478 >      target="${java.runtime.target}"
479        workdir="${build.dir}"
480 <      classes="${product.jar}"/>
480 >      classes="${product.jar}">
481 >      <javac-elements>
482 >        <compilerarg value="-Werror"/>
483 >      </javac-elements>
484 >    </run-tck-tests>
485    </target>
486  
487    <target name="tck-parallelism-1"
488 <          description="Runs tck with given common pool parallelism">
488 >          description="Runs tck with common pool parallelism 1">
489      <antcall target="tck">
490        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
491      </antcall>
492    </target>
493  
494    <target name="tck-parallelism-0"
495 <          description="Runs tck with given common pool parallelism">
495 >          description="Runs tck with common pool parallelism 0">
496      <antcall target="tck">
497        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
498      </antcall>
499    </target>
500  
501 +  <target name="tck-security-manager"
502 +          description="Runs tck with a security manager">
503 +    <antcall target="tck">
504 +      <param name="jsr166.useSecurityManager" value="true"/>
505 +    </antcall>
506 +  </target>
507 +
508    <target name="jtreg"
509 <          depends="jar"
509 >          depends="jar"
510            description="Runs jtreg tests for src/main using the jtreg ant task">
511      <run-jtreg-tests
512 <       target="${build.main.java.version}"
512 >       target="${java.runtime.target}"
513         workdir="${build.dir}"
514         classes="${product.jar}"/>
515    </target>
516  
517    <target name="test"
518 <          depends="tck, tck-parallelism-1, jtreg"
519 <          description="Runs tck and jtreg tests for src/main">
518 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
519 >          description="Runs tck and jtreg tests for src/main"/>
520 >
521 >  <target name="test-version-permutations"
522 >          depends="test11, test12, test13, test14, test15, test16,
523 >          test11-12, test11-13, test11-14, test11-15, test11-16,
524 >          clean, test, docs"
525 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
526 >
527 >  <target name="test11">
528 >    <antcall>
529 >      <param name="java.runtime.target" value="11"/>
530 >      <param name="build.main.javac" value="${javac11}"/>
531 >      <param name="build.main.javadoc" value="${javadoc12}"/>
532 >      <param name="build.main.javadoc.source" value="11"/>
533 >      <target name="clean"/>
534 >      <target name="test"/>
535 >      <target name="docs"/>
536 >    </antcall>
537    </target>
538  
539 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
539 >  <target name="test12">
540 >    <antcall>
541 >      <param name="java.runtime.target" value="12"/>
542 >      <param name="build.main.javac" value="${javac12}"/>
543 >      <param name="build.main.javadoc" value="${javadoc12}"/>
544 >      <param name="build.main.javadoc.source" value="12"/>
545 >      <target name="clean"/>
546 >      <target name="test"/>
547 >      <target name="docs"/>
548 >    </antcall>
549 >  </target>
550  
551 < <!--     <antcall target="jtreg"> -->
552 < <!--       <param name="build.main.java.version" value="8"/> -->
553 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
554 < <!--     </antcall> -->
551 >  <target name="test13">
552 >    <antcall>
553 >      <param name="java.runtime.target" value="13"/>
554 >      <param name="build.main.javac" value="${javac13}"/>
555 >      <param name="build.main.javadoc" value="${javadoc13}"/>
556 >      <param name="build.main.javadoc.source" value="13"/>
557 >      <target name="clean"/>
558 >      <target name="test"/>
559 >      <target name="docs"/>
560 >    </antcall>
561 >  </target>
562  
563 < <!--   </target> -->
563 >  <target name="test14">
564 >    <antcall>
565 >      <param name="java.runtime.target" value="14"/>
566 >      <param name="build.main.javac" value="${javac14}"/>
567 >      <param name="build.main.javadoc" value="${javadoc14}"/>
568 >      <param name="build.main.javadoc.source" value="14"/>
569 >      <target name="clean"/>
570 >      <target name="test"/>
571 >      <target name="docs"/>
572 >    </antcall>
573 >  </target>
574  
575 < <!--   <target name="test89" -->
576 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
575 >  <target name="test15">
576 >    <antcall>
577 >      <param name="java.runtime.target" value="15"/>
578 >      <param name="build.main.javac" value="${javac15}"/>
579 >      <param name="build.main.javadoc" value="${javadoc15}"/>
580 >      <param name="build.main.javadoc.source" value="15"/>
581 >      <target name="clean"/>
582 >      <target name="test"/>
583 >      <target name="docs"/>
584 >    </antcall>
585 >  </target>
586  
587 < <!--     <antcall target="clean"/> -->
588 < <!--     <antcall target="test"> -->
589 < <!--       <param name="build.main.java.version" value="8"/> -->
590 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
591 < <!--     </antcall> -->
587 >  <target name="test16">
588 >    <antcall>
589 >      <param name="java.runtime.target" value="16"/>
590 >      <param name="build.main.javac" value="${javac16}"/>
591 >      <param name="build.main.javadoc" value="${javadoc16}"/>
592 >      <param name="build.main.javadoc.source" value="16"/>
593 >      <target name="clean"/>
594 >      <target name="test"/>
595 >      <target name="docs"/>
596 >    </antcall>
597 >  </target>
598  
599 < <!--     <antcall target="clean"/> -->
600 < <!--     <antcall target="test"> -->
601 < <!--       <param name="build.main.java.version" value="9"/> -->
602 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
603 < <!--     </antcall> -->
599 >  <target name="test11-12">
600 >    <antcall>
601 >      <param name="java.runtime.target" value="12"/>
602 >      <param name="build.main.javac" value="${javac11}"/>
603 >      <param name="build.main.javadoc" value="${javadoc12}"/>
604 >      <param name="build.main.javadoc.source" value="11"/>
605 >      <target name="clean"/>
606 >      <target name="test"/>
607 >      <target name="docs"/>
608 >    </antcall>
609 >  </target>
610  
611 < <!--   </target> -->
611 >  <target name="test11-13">
612 >    <antcall>
613 >      <param name="java.runtime.target" value="13"/>
614 >      <param name="build.main.javac" value="${javac11}"/>
615 >      <param name="build.main.javadoc" value="${javadoc13}"/>
616 >      <param name="build.main.javadoc.source" value="11"/>
617 >      <target name="clean"/>
618 >      <target name="test"/>
619 >      <target name="docs"/>
620 >    </antcall>
621 >  </target>
622  
623 +  <target name="test11-14">
624 +    <antcall>
625 +      <param name="java.runtime.target" value="14"/>
626 +      <param name="build.main.javac" value="${javac11}"/>
627 +      <param name="build.main.javadoc" value="${javadoc14}"/>
628 +      <param name="build.main.javadoc.source" value="11"/>
629 +      <target name="clean"/>
630 +      <target name="test"/>
631 +      <target name="docs"/>
632 +    </antcall>
633 +  </target>
634 +
635 +  <target name="test11-15">
636 +    <antcall>
637 +      <param name="java.runtime.target" value="15"/>
638 +      <param name="build.main.javac" value="${javac11}"/>
639 +      <param name="build.main.javadoc" value="${javadoc15}"/>
640 +      <param name="build.main.javadoc.source" value="11"/>
641 +      <target name="clean"/>
642 +      <target name="test"/>
643 +      <target name="docs"/>
644 +    </antcall>
645 +  </target>
646 +
647 +  <target name="test11-16">
648 +    <antcall>
649 +      <param name="java.runtime.target" value="16"/>
650 +      <param name="build.main.javac" value="${javac11}"/>
651 +      <param name="build.main.javadoc" value="${javadoc16}"/>
652 +      <param name="build.main.javadoc.source" value="11"/>
653 +      <target name="clean"/>
654 +      <target name="test"/>
655 +      <target name="docs"/>
656 +    </antcall>
657 +  </target>
658 +
659 +  <target name="docs16">
660 +    <antcall>
661 +      <param name="java.runtime.target" value="16"/>
662 +      <param name="build.main.javac" value="${javac16}"/>
663 +      <param name="build.main.javadoc" value="${javadoc16}"/>
664 +      <param name="build.main.javadoc.source" value="16"/>
665 +      <target name="clean"/>
666 +      <target name="docs"/>
667 +    </antcall>
668 +  </target>
669  
670  
671    <target name="configure-compiler">
672      <fail message="ant version too old">
673 <      <condition>
591 <        <not> <antversion atleast="1.9.1"/> </not>
592 <      </condition>
673 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
674      </fail>
675  
676      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 607 | Line 688
688    </target>
689  
690  
610
611  <!-- Various demos and test programs -->
612
613
614  <!-- description="Benchmark from Doug Lea's AQS paper" -->
615  <target name="loops" depends="configure-compiler">
616
617    <mkdir dir="${build.loops.dir}"/>
618
619    <javac srcdir="${loops.src.dir}"
620          destdir="${build.loops.dir}"
621            debug="${build.debug}"
622       debuglevel="${build.debuglevel}"
623      deprecation="${build.deprecation}"
624           source="${build.sourcelevel}"
625           target="${build.sourcelevel}"
626             fork="true">
627
628      <compilerarg line="${build.args}"/>
629      <classpath refid="loops.classpath"/>
630      <compilerarg value="-XDignore.symbol.file=true"/>
631
632    </javac>
633
634    <java classname="ALoops" fork="true">
635      <classpath refid="loops.classpath"/>
636    </java>
637
638  </target>
639
640
691    <target name="compile-test-loops" depends="jar"
692 <          description="compile all the perf tests in src/test/loops">
692 >          description="Compiles all the perf tests in src/test/loops">
693  
694      <mkdir dir="${build.dir}/test/loops"/>
695  
# Line 650 | Line 700
700             deprecation="${build.deprecation}"
701             includeAntRuntime="false"
702             includeJavaRuntime="false"
703 <           executable="${javac9}"
703 >           encoding="ASCII"
704 >           executable="${build.main.javac}"
705             fork="true">
706  
707        <include name="*.java"/>
708        <compilerarg value="-XDignore.symbol.file=true"/>
709 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
710 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
660 <      <compilerarg line="${build.args}"/>
661 <
662 <    </javac>
663 <
664 <  </target>
665 <
666 <
667 <  <!-- jsr166 4jdk8 -->
668 <
669 <  <target name="4jdk8compile"
670 <          depends="configure-compiler"
671 <          description="Compiles src/jdk8 sources, targeting jdk8">
672 <
673 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
674 <
675 <    <javac srcdir="${4jdk8src.dir}"
676 <           destdir="${build.4jdk8.classes.dir}"
677 <           debug="${build.debug}"
678 <           debuglevel="${build.debuglevel}"
679 <           deprecation="${build.deprecation}"
680 <           source="8"
681 <           target="8"
682 <           classpath=""
683 <           bootclasspath="${bootclasspath8}"
684 <           includeAntRuntime="false"
685 <           includeJavaRuntime="false"
686 <           executable="${javac8}"
687 <           fork="true">
688 <
689 <      <include name="**/*.java"/>
690 <      <compilerarg value="-Xprefer:source"/>
691 <      <compilerarg value="-XDignore.symbol.file=true"/>
692 <      <compilerarg value="-Xlint:all"/>
693 <      <compilerarg value="-Werror"/>
709 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
710 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
711        <compilerarg line="${build.args}"/>
695
712      </javac>
713    </target>
714  
699  <target name="4jdk8doclint"
700          depends="configure-compiler"
701          description="Finds doclint warnings">
715  
716 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
716 >  <!-- old branches no longer maintained.  build support deleted -->
717 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
718 >  <!-- jsr166 4jdk7 (no longer maintained) -->
719 >  <!-- jsr166x (no longer maintained) -->
720 >  <!-- jsr166y (no longer maintained) -->
721 >  <!-- extra166y (no longer maintained) -->
722 >  <!-- jsr166e (no longer maintained) -->
723  
724 <    <javac srcdir="${4jdk8src.dir}"
706 <           destdir="${build.4jdk8.classes.dir}"
707 <           debug="${build.debug}"
708 <           debuglevel="${build.debuglevel}"
709 <           deprecation="${build.deprecation}"
710 <           source="8"
711 <           target="8"
712 <           classpath=""
713 <           bootclasspath="${bootclasspath8}"
714 <           includeAntRuntime="false"
715 <           includeJavaRuntime="false"
716 <           executable="${javac8}"
717 <           fork="true">
718 <
719 <      <include name="**/*.java"/>
720 <      <compilerarg value="-Xprefer:source"/>
721 <      <compilerarg value="-XDignore.symbol.file=true"/>
722 <      <compilerarg value="-Xlint:all"/>
723 <      <compilerarg value="-Xdoclint:all/protected"/>
724 <      <compilerarg line="${build.args}"/>
725 <
726 <    </javac>
727 <  </target>
728 <
729 <
730 <  <target name="4jdk8jar"
731 <          depends="4jdk8compile"
732 <          description="Builds library jar from compiled sources">
733 <
734 <    <jar destfile="${4jdk8product.jar}">
735 <      <fileset dir="${build.4jdk8.classes.dir}"/>
736 <      <manifest>
737 <        <attribute name="Built-By" value="${user.name}"/>
738 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
739 <      </manifest>
740 <    </jar>
741 <
742 <  </target>
743 <
744 <
745 <  <target name="4jdk8-tck"
746 <          depends="4jdk8jar"
747 <          description="Runs tck tests for jsr166-4jdk8 directly">
748 <
749 <    <run-tck-tests
750 <      target="8"
751 <      workdir="${build.4jdk8.dir}"
752 <      classes="${4jdk8product.jar}">
753 <      <javac-elements>
754 <        <!-- JDK9+ test classes -->
755 <        <exclude name="*9Test.java"/>
756 <        <exclude name="*10Test.java"/>
757 <      </javac-elements>
758 <    </run-tck-tests>
759 <  </target>
760 <
761 <
762 <  <target name="4jdk8-jtreg"
763 <          depends="4jdk8jar"
764 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
765 <    <run-jtreg-tests
766 <       target="8"
767 <       workdir="${build.4jdk8.dir}"
768 <       classes="${4jdk8product.jar}"/>
769 <  </target>
770 <
771 <
772 <  <target name="4jdk8-test"
773 <          depends="4jdk8-tck, 4jdk8-jtreg"
774 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
775 <  </target>
776 <
777 <
778 <  <target name="4jdk8docs"
779 <          description="Builds javadocs for src/jdk8 to dist dir">
780 <
781 <    <delete dir="${4jdk8docs.dir}"/>
782 <    <mkdir dir="${4jdk8docs.dir}"/>
783 <
784 <    <javadoc destdir="${4jdk8docs.dir}"
785 <             packagenames="none"
786 <             link="${java8.api.url}"
787 <             overview="${4jdk8src.dir}/intro.html"
788 <             access="${build.javadoc.access}"
789 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
790 <             classpath=""
791 <             executable="${javadoc8}">
792 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
793 <        <include name="**/*.java"/>
794 <      </fileset>
795 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
796 <      <arg value="-XDignore.symbol.file=true"/>
797 <      <arg value="-tag"/>
798 <      <arg value="${javadoc.jls.option}"/>
799 <      <arg value="-tag"/>
800 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
801 <      <arg value="-tag"/>
802 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
803 <      <arg value="-tag"/>
804 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
805 <    </javadoc>
806 <  </target>
807 <
808 <
809 <  <target name="4jdk8dist"
810 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
811 <          description="Puts all distributable products in single hierarchy"/>
812 <
813 <
814 <  <target name="4jdk8clean"
815 <          description="Removes all 4jdk8 build products">
816 <
817 <    <delete dir="${build.4jdk8.dir}"/>
818 <
819 <  </target>
820 <
821 <
822 <  <target name="4jdk8dist-jar"
823 <          depends="4jdk8clean, 4jdk8jar">
824 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
825 <  </target>
724 > <!-- Find buglets that can be detected by static build tools -->
725  
726 + <!--   <target name="lint"> -->
727 + <!--     <antcall target="dists"> -->
728 + <!--       <param name="build.javadoc.access" value="protected"/> -->
729 + <!--     </antcall> -->
730 + <!--   </target> -->
731  
732 <  <target name="4jdk8dist-docs"
733 <          depends="4jdk8clean, 4jdk8docs">
734 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
732 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
733 >  <target name="doclint-private">
734 >    <antcall target="dist">
735 >      <param name="build.javadoc.access" value="private"/>
736 >    </antcall>
737    </target>
738  
739  
740 + <!-- ==============================================================
741 +  Experimental errorprone support
742 +  https://errorprone.info
743 +  https://errorprone.info/docs/installation
744 +  https://github.com/google/error-prone/issues/1143
745 + =================================================================== -->
746 +  <path id="errorprone.processorpath.path">
747 +    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
748 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
749 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
750 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
751 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
752 +  </path>
753 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
754 +  <property name="errorprone.jsr166.user.flags" value=""/>
755 +  <property name="errorprone.jsr166.flags"
756 +            value="-Xep:HashtableContains:OFF
757 +                   -Xep:PreferJavaTimeOverload:OFF
758 +                   -Xep:JdkObsolete:OFF
759 +                   -Xep:MissingOverride:OFF
760 +                   -Xep:MissingFail:OFF
761 +                   -Xep:ThreadPriorityCheck:OFF
762 +                   -Xep:MixedArrayDimensions:ERROR
763 +                   -Xep:RemoveUnusedImports:ERROR
764 +                   -Xep:EmptyIf:ERROR
765 +                   -Xep:MultipleTopLevelClasses:ERROR
766 +                   -Xep:ClassName:ERROR
767 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
768 +                   -Xep:RedundantThrows:ERROR
769 +                   -Xep:IdentityBinaryExpression:WARN
770 +                   -Xep:ConstructorInvokesOverridable:WARN
771 +                   -Xep:MethodCanBeStatic:WARN
772 +                   ${errorprone.jsr166.user.flags}"/>
773 +  <!-- -Xep:WildcardImport:ERROR -->
774 +  <property name="errorprone.jsr166.test.flags"
775 +            value="-Xep:StringSplitter:OFF
776 +                   -Xep:BoxedPrimitiveConstructor:OFF
777 +                   -Xep:UnnecessaryParentheses:OFF
778 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
779 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
780 +  <target name="errorprone"
781 +          depends="clean, configure-compiler"
782 +          description="Run errorprone over jsr166 source code (experimental)">
783  
784 <  <!-- jsr166 4jdk7 -->
785 <
786 <  <target name="4jdk7compile"
838 <          depends="configure-compiler"
839 <          description="Compiles src/jdk7 sources, targeting jdk7">
840 <
841 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
842 <
843 <    <javac srcdir="${4jdk7src.dir}"
844 <           destdir="${build.4jdk7.classes.dir}"
845 <           debug="${build.debug}"
846 <           debuglevel="${build.debuglevel}"
847 <           deprecation="${build.deprecation}"
848 <           source="6"
849 <           target="6"
850 <           classpath=""
851 <           bootclasspath="${bootclasspath6}"
852 <           includeAntRuntime="false"
853 <           includeJavaRuntime="false"
854 <           executable="${javac7}"
855 <           fork="true">
856 <
857 <      <include name="**/*.java"/>
858 <      <compilerarg value="-Xprefer:source"/>
859 <      <compilerarg value="-XDignore.symbol.file=true"/>
860 <      <compilerarg value="-Xlint:all"/>
861 <      <compilerarg value="-Werror"/>
862 <      <compilerarg line="${build.args}"/>
863 <
864 <    </javac>
865 <  </target>
866 <
867 <  <target name="4jdk7doclint"
868 <          depends="configure-compiler"
869 <          description="Finds doclint warnings">
870 <
871 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
784 >    <local name="destdir"/>
785 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
786 >    <mkdir dir="${destdir}"/>
787  
788 <    <javac srcdir="${4jdk7src.dir}"
789 <           destdir="${build.4jdk7.classes.dir}"
788 >    <javac srcdir="${src.dir}"
789 >           destdir="${destdir}"
790             debug="${build.debug}"
791             debuglevel="${build.debuglevel}"
792             deprecation="${build.deprecation}"
878           source="6"
879           target="6"
793             classpath=""
881           bootclasspath="${bootclasspath6}"
794             includeAntRuntime="false"
795             includeJavaRuntime="false"
796 <           executable="${javac8}"
796 >           encoding="ASCII"
797 >           executable="${build.main.javac}"
798             fork="true">
799  
800        <include name="**/*.java"/>
801 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
802 +      <compilerarg value="-J--illegal-access=permit"/>
803 +      <compilerarg value="-XDcompilePolicy=simple"/>
804 +      <compilerarg value="-processorpath"/>
805 +      <compilerarg pathref="errorprone.processorpath.path"/>
806 +      <compilerarg value="-Xplugin:ErrorProne
807 +                          ${errorprone.jsr166.flags}"/>
808 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
809        <compilerarg value="-Xprefer:source"/>
810        <compilerarg value="-XDignore.symbol.file=true"/>
811        <compilerarg value="-Xlint:all"/>
812 <      <compilerarg value="-Xdoclint:all/protected"/>
812 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
813 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
814        <compilerarg line="${build.args}"/>
893
815      </javac>
895  </target>
896
816  
817 <  <target name="4jdk7jar"
818 <          depends="4jdk7compile"
900 <          description="Builds library jar from compiled sources">
901 <
902 <    <jar destfile="${4jdk7product.jar}">
903 <      <fileset dir="${build.4jdk7.classes.dir}"/>
904 <      <manifest>
905 <        <attribute name="Built-By" value="${user.name}"/>
906 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
907 <      </manifest>
817 >    <jar destfile="${product.jar}">
818 >      <fileset dir="${destdir}"/>
819      </jar>
820  
910  </target>
911
912
913  <target name="4jdk7-tck"
914          depends="4jdk7jar"
915          description="Runs tck tests for jsr166-4jdk7 directly">
916
821      <run-tck-tests
822 <      target="7"
823 <      workdir="${build.4jdk7.dir}"
824 <      classes="${4jdk7product.jar}">
822 >      target="${java.runtime.target}"
823 >      workdir="${build.dir}"
824 >      classes="${product.jar}">
825        <javac-elements>
826 <        <!-- JDK8+ test classes -->
827 <        <exclude name="*8Test.java"/>
828 <        <exclude name="*9Test.java"/>
829 <        <exclude name="*10Test.java"/>
830 <        <exclude name="DoubleAccumulatorTest.java"/>
831 <        <exclude name="DoubleAdderTest.java"/>
832 <        <exclude name="LongAccumulatorTest.java"/>
833 <        <exclude name="LongAdderTest.java"/>
930 <        <exclude name="CompletableFutureTest.java"/>
931 <        <exclude name="SplittableRandomTest.java"/>
932 <        <exclude name="StampedLockTest.java"/>
933 <        <exclude name="SubmissionPublisherTest.java"/>
826 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
827 >        <compilerarg value="-J--illegal-access=permit"/>
828 >        <compilerarg value="-XDcompilePolicy=simple"/>
829 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
830 >        <compilerarg value="-Xplugin:ErrorProne
831 >                            ${errorprone.jsr166.flags}
832 >                            ${errorprone.jsr166.test.flags}"/>
833 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
834        </javac-elements>
835      </run-tck-tests>
836    </target>
837  
838 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
839 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
840 +  <target name="errorprone-jtreg"
841 +          depends="jar"
842 +          description="Run errorprone over jtreg tests (experimental)">
843  
844 <  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
845 <  <target name="4jdk7-tck-junit"
846 <          depends="4jdk7compile">
847 <
848 <    <junit printsummary="true"
849 <           showoutput="true"
850 <           errorProperty="junit.failed"
851 <           failureProperty="junit.failed"
852 <           includeantruntime="true"
853 <           jvm="${java7}"
854 <           fork="true">
855 <
856 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
857 <      <jvmarg value="-server"/>
858 <
844 >    <run-jtreg-tests
845 >       target="${java.runtime.target}"
846 >       workdir="${build.dir}"
847 >       classes="${product.jar}"
848 >       verbose="all">
849 >      <jtreg-elements>
850 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
851 >        <arg value="-javacoption:-processorpath"/>
852 >        <arg value="-javacoption:${errorprone.processorpath}"/>
853 >        <arg value="-javacoption:-Xplugin:ErrorProne
854 >                            ${errorprone.jsr166.flags}
855 >                            ${errorprone.jsr166.test.flags}
856 >                            -Xep:MultipleTopLevelClasses:WARN
857 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
858 >      </jtreg-elements>
859 >    </run-jtreg-tests>
860 >  </target>
861 >
862 >
863 > <!-- ==============================================================
864 >  Running guava tests against jsr166 code
865 > =================================================================== -->
866 >
867 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
868 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
869 > <!-- <property name="guava.version" value="21.0"/> -->
870 >
871 > <!-- HOWTO debug print a path id -->
872 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
873 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
874 >
875 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
876 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
877 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
878 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
879 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
880 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
881 >
882 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
883 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
884 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
885 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
886 >
887 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
888 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
889 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
890 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
891 >
892 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
893 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
894 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
895 >
896 >  <target name="init-ivy">
897 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
898 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
899 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
900 >             classpath="${build.dir}/ivy.jar"/>
901 >  </target>
902 >
903 >  <target name="guava-tests" depends="jar, init-ivy"
904 >          description="Guava tests run against jsr166 collections">
905 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
906 >    <mkdir dir="${guava.dir}"/>
907 >    <ivy:retrieve pathid="guava.testlib.classpath"
908 >      type="jar,bundle" inline="true" conf="default,master"
909 >      pattern="${guava.dir}/[artifact].[ext]"
910 >      organisation="com.google.guava" module="guava-testlib"/>
911 >    <property name="guava.version" value="21.0"/>
912 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
913 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
914 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
915 >           jvm="${build.main.java}" fork="true">
916 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
917 >      <formatter type="brief"/>
918        <classpath>
919 <        <pathelement location="${junit.jar}"/>
920 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
919 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
920 >        <path refid="guava.testlib.classpath"/>
921        </classpath>
922  
923 <      <formatter type="brief"/>
924 <
961 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
962 <      </test>
963 <
923 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
924 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
925      </junit>
926    </target>
927  
967  <target name="4jdk7-jtreg"
968          depends="4jdk7jar"
969          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
970    <run-jtreg-tests
971       target="7"
972       workdir="${build.4jdk7.dir}"
973       classes="${4jdk7product.jar}"/>
974  </target>
975
976
977  <target name="4jdk7-test"
978          depends="4jdk7-tck, 4jdk7-jtreg"
979          description="Runs tck and jtreg tests for jsr166-4jdk7">
980  </target>
981
982
983  <target name="4jdk7docs"
984          description="Builds javadocs for src/jdk7 to dist dir">
985
986    <delete dir="${4jdk7docs.dir}"/>
987    <mkdir dir="${4jdk7docs.dir}"/>
988
989    <javadoc destdir="${4jdk7docs.dir}"
990             packagenames="none"
991             link="${java7.api.url}"
992             overview="${4jdk7src.dir}/intro.html"
993             access="${build.javadoc.access}"
994             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
995             classpath=""
996             executable="${javadoc7}">
997      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
998        <include name="**/*.java"/>
999      </fileset>
1000      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1001      <arg value="-XDignore.symbol.file=true"/>
1002    </javadoc>
1003  </target>
1004
1005
1006  <target name="4jdk7dist"
1007          depends="4jdk7dist-jar, 4jdk7dist-docs"
1008          description="Puts all distributable products in single hierarchy"/>
1009
1010
1011  <target name="4jdk7clean"
1012          description="Removes all 4jdk7 build products">
1013
1014    <delete dir="${build.4jdk7.dir}"/>
1015
1016  </target>
1017
1018
1019  <target name="4jdk7dist-jar"
1020          depends="4jdk7clean, 4jdk7jar">
1021    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1022  </target>
1023
1024
1025  <target name="4jdk7dist-docs"
1026          depends="4jdk7clean, 4jdk7docs">
1027    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1028  </target>
1029
1030
1031  <!-- jsr166x -->
1032
1033  <target name="jsr166xcompile"
1034          depends="configure-compiler"
1035          description="Compiles jsr166x sources to build dir">
1036
1037    <mkdir dir="${build.jsr166x.classes.dir}"/>
1038
1039    <javac srcdir="${topsrc.dir}"
1040           destdir="${build.jsr166x.classes.dir}"
1041           debug="${build.debug}"
1042           debuglevel="${build.debuglevel}"
1043           deprecation="${build.deprecation}"
1044           classpath=""
1045           bootclasspath="${bootclasspath6}"
1046           source="5"
1047           target="5"
1048           includeAntRuntime="false"
1049           includeJavaRuntime="false"
1050           executable="${javac7}"
1051           fork="true">
1052
1053      <include name="jsr166x/**/*.java"/>
1054      <compilerarg value="-XDignore.symbol.file=true"/>
1055      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1056      <compilerarg value="-Werror"/>
1057      <compilerarg line="${build.args}"/>
1058
1059    </javac>
1060  </target>
1061
1062
1063  <target name="jsr166xjar"
1064          depends="jsr166xcompile"
1065          description="Builds library jar from compiled sources">
1066
1067    <jar destfile="${jsr166x.jar}">
1068      <fileset dir="${build.jsr166x.classes.dir}"/>
1069      <manifest>
1070        <attribute name="Built-By" value="${user.name}"/>
1071        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1072      </manifest>
1073    </jar>
1074
1075  </target>
1076
1077
1078  <target name="jsr166xdocs"
1079          description="Builds javadocs to dist dir">
1080
1081    <delete dir="${jsr166xdocs.dir}"/>
1082    <mkdir dir="${jsr166xdocs.dir}"/>
1083
1084    <javadoc destdir="${jsr166xdocs.dir}"
1085             packagenames="jsr166x.*"
1086             link="${java.api.url}"
1087             access="${build.javadoc.access}"
1088             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1089             bootclasspath="${bootclasspath6}"
1090             source="5"
1091             executable="${javadoc7}">
1092      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1093      <arg value="-XDignore.symbol.file=true"/>
1094
1095    </javadoc>
1096  </target>
1097
1098
1099  <target name="jsr166xdist"
1100          depends="jsr166xdist-jar, jsr166xdist-docs"
1101          description="Puts all distributable products in single hierarchy"/>
1102
1103
1104  <target name="jsr166xclean"
1105          description="Removes all jsr166x build products">
1106
1107    <delete dir="${build.jsr166x.dir}"/>
1108
1109  </target>
1110
1111
1112  <target name="jsr166xdist-jar"
1113          depends="jsr166xclean, jsr166xjar">
1114    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1115  </target>
1116
1117  <target name="jsr166xdist-docs"
1118          depends="jsr166xclean, jsr166xdocs">
1119    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1120  </target>
1121
1122  <!-- jsr166y -->
1123
1124
1125  <target name="jsr166ycompile"
1126          depends="configure-compiler"
1127          description="Compiles jsr166y sources">
1128
1129    <mkdir dir="${build.jsr166y.classes.dir}"/>
1130
1131    <javac srcdir="${topsrc.dir}"
1132           destdir="${build.jsr166y.classes.dir}"
1133           debug="${build.debug}"
1134           debuglevel="${build.debuglevel}"
1135           deprecation="${build.deprecation}"
1136           source="6"
1137           target="6"
1138           classpath=""
1139           bootclasspath="${bootclasspath6}"
1140           includeAntRuntime="false"
1141           includeJavaRuntime="false"
1142           executable="${javac7}"
1143           fork="true">
1144
1145      <include name="jsr166y/**/*.java"/>
1146      <compilerarg value="-XDignore.symbol.file=true"/>
1147      <compilerarg value="-Xlint:all"/>
1148      <compilerarg value="-Werror"/>
1149      <compilerarg line="${build.args}"/>
1150
1151    </javac>
1152  </target>
1153
1154
1155  <target name="jsr166yjar"
1156          depends="jsr166ycompile"
1157          description="Builds library jar from compiled sources">
1158
1159    <jar destfile="${jsr166y.jar}" index="true">
1160      <fileset dir="${build.jsr166y.classes.dir}"/>
1161      <manifest>
1162        <attribute name="Built-By" value="${user.name}"/>
1163        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1164      </manifest>
1165    </jar>
1166
1167  </target>
1168
1169
1170  <target name="jsr166ydocs"
1171          description="Builds javadocs to dist dir">
1172
1173    <delete dir="${jsr166ydocs.dir}"/>
1174    <mkdir dir="${jsr166ydocs.dir}"/>
1175
1176    <javadoc destdir="${jsr166ydocs.dir}"
1177             packagenames="jsr166y.*"
1178             link="${java.api.url}"
1179             access="${build.javadoc.access}"
1180             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1181             bootclasspath="${bootclasspath6}"
1182             source="6"
1183             executable="${javadoc7}">
1184      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1185      <arg value="-XDignore.symbol.file=true"/>
1186
1187    </javadoc>
1188  </target>
1189
1190
1191  <target name="jsr166ydist"
1192          depends="jsr166ydist-jar, jsr166ydist-docs"
1193          description="Puts all distributable products in single hierarchy"/>
1194
1195
1196  <target name="jsr166yclean"
1197          description="Removes all jsr166y build products">
1198
1199    <delete dir="${build.jsr166y.dir}"/>
1200
1201  </target>
1202
1203
1204  <target name="jsr166ydist-jar"
1205          depends="jsr166yclean, jsr166yjar">
1206    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1207  </target>
1208
1209  <target name="jsr166ydist-docs"
1210          depends="jsr166yclean, jsr166ydocs">
1211    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1212  </target>
1213
1214
1215  <!-- extra166y -->
1216
1217
1218  <target name="extra166ycompile"
1219          depends="configure-compiler, jsr166yjar"
1220          description="Compiles extra166y sources">
1221
1222    <mkdir dir="${build.extra166y.classes.dir}"/>
1223
1224    <javac srcdir="${topsrc.dir}"
1225           destdir="${build.extra166y.classes.dir}"
1226           debug="${build.debug}"
1227           debuglevel="${build.debuglevel}"
1228           deprecation="${build.deprecation}"
1229           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1230           classpath=""
1231           source="6"
1232           target="6"
1233           includeAntRuntime="false"
1234           includeJavaRuntime="false"
1235           executable="${javac7}"
1236           fork="true">
1237
1238      <include name="extra166y/**/*.java"/>
1239      <compilerarg value="-XDignore.symbol.file=true"/>
1240      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1241      <compilerarg value="-Werror"/>
1242      <compilerarg line="${build.args}"/>
1243
1244    </javac>
1245  </target>
1246
1247
1248  <target name="extra166yjar"
1249          depends="extra166ycompile"
1250          description="Builds library jar from compiled sources">
1251
1252    <jar destfile="${extra166y.jar}" index="true">
1253      <fileset dir="${build.extra166y.classes.dir}"/>
1254      <manifest>
1255        <attribute name="Built-By" value="${user.name}"/>
1256        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1257      </manifest>
1258    </jar>
1259
1260  </target>
1261
1262
1263  <target name="extra166ydocs"
1264          description="Builds javadocs to build dir">
1265
1266    <delete dir="${extra166ydocs.dir}"/>
1267    <mkdir dir="${extra166ydocs.dir}"/>
1268
1269    <javadoc destdir="${extra166ydocs.dir}"
1270             packagenames="extra166y.*"
1271             link="${java.api.url}"
1272             access="${build.javadoc.access}"
1273             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1274             bootclasspath="${bootclasspath6}"
1275             source="6"
1276             executable="${javadoc7}">
1277      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1278      <arg value="-XDignore.symbol.file=true"/>
1279
1280    </javadoc>
1281  </target>
1282
1283
1284  <target name="extra166ydist"
1285          depends="extra166ydist-jar, extra166ydist-docs"
1286          description="Puts all distributable products in single hierarchy"/>
1287
1288
1289  <target name="extra166yclean"
1290          description="Removes all extra166y build products">
1291
1292    <delete dir="${build.extra166y.dir}"/>
1293
1294  </target>
1295
1296
1297  <target name="extra166ydist-jar"
1298          depends="extra166yclean, extra166yjar">
1299    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1300  </target>
1301
1302  <target name="extra166ydist-docs"
1303          depends="extra166yclean, extra166ydocs">
1304    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1305  </target>
1306
1307  <!-- jsr166e -->
1308
1309  <property name="build.jsr166e.java.version" value="6"/>
1310  <property name="build.jsr166e.javac" value="${javac6}"/>
1311
1312  <target name="jsr166ecompile"
1313          depends="configure-compiler"
1314          description="Compiles jsr166e sources">
1315
1316    <mkdir dir="${build.jsr166e.classes.dir}"/>
1317
1318    <javac srcdir="${topsrc.dir}"
1319           destdir="${build.jsr166e.classes.dir}"
1320           debug="${build.debug}"
1321           debuglevel="${build.debuglevel}"
1322           deprecation="${build.deprecation}"
1323           source="${build.jsr166e.java.version}"
1324           target="${build.jsr166e.java.version}"
1325           classpath=""
1326           includeAntRuntime="false"
1327           includeJavaRuntime="false"
1328           executable="${build.jsr166e.javac}"
1329           fork="true">
1330
1331      <include name="jsr166e/**/*.java"/>
1332      <compilerarg value="-XDignore.symbol.file=true"/>
1333      <compilerarg value="-Xlint:all"/>
1334      <compilerarg value="-Werror"/>
1335      <compilerarg line="${build.args}"/>
1336
1337    </javac>
1338  </target>
1339
1340  <!-- jsr166e: find doclint errors -->
1341  <target name="jsr166edoclint">
1342
1343    <mkdir dir="${build.jsr166e.classes.dir}"/>
1344
1345    <javac srcdir="${topsrc.dir}"
1346           destdir="${build.jsr166e.classes.dir}"
1347           debug="${build.debug}"
1348           debuglevel="${build.debuglevel}"
1349           deprecation="${build.deprecation}"
1350           source="${build.jsr166e.java.version}"
1351           target="${build.jsr166e.java.version}"
1352           classpath=""
1353           bootclasspath="${bootclasspath6}"
1354           includeAntRuntime="false"
1355           includeJavaRuntime="false"
1356           executable="${javac8}"
1357           fork="true">
1358
1359      <include name="jsr166e/**/*.java"/>
1360      <compilerarg value="-XDignore.symbol.file=true"/>
1361      <compilerarg value="-Xlint:all"/>
1362      <compilerarg value="-Werror"/>
1363      <compilerarg value="-Xdoclint:all/protected"/>
1364
1365    </javac>
1366  </target>
1367
1368
1369  <target name="jsr166ejar"
1370          depends="jsr166ecompile"
1371          description="Builds library jar from compiled sources">
1372
1373    <jar destfile="${jsr166e.jar}" index="true">
1374      <fileset dir="${build.jsr166e.classes.dir}"/>
1375      <manifest>
1376        <attribute name="Built-By" value="${user.name}"/>
1377        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1378      </manifest>
1379    </jar>
1380
1381  </target>
1382
1383
1384  <target name="jsr166edocs"
1385          description="Builds javadocs to build dir">
1386
1387    <delete dir="${jsr166edocs.dir}"/>
1388    <mkdir dir="${jsr166edocs.dir}"/>
1389
1390    <javadoc destdir="${jsr166edocs.dir}"
1391             packagenames="jsr166e.*"
1392             link="${java.api.url}"
1393             access="${build.javadoc.access}"
1394             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1395             source="${build.jsr166e.java.version}"
1396             executable="${javadoc7}">
1397      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1398      <arg value="-XDignore.symbol.file=true"/>
1399
1400    </javadoc>
1401  </target>
1402
1403
1404  <target name="jsr166e-tck-one-java-version"
1405          depends="jsr166ejar">
1406
1407    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1408
1409    <run-tck-tests
1410      tck.src.dir="${test.src.dir}/tck-jsr166e"
1411      target="${build.jsr166e.java.version}"
1412      workdir="${build.jsr166e.dir}"
1413      classes="${jsr166e.jar}"/>
1414  </target>
1415
1416  <target name="jsr166e-tck"
1417          description="Runs tck tests for jsr166e for multiple java versions">
1418
1419 <!--     <antcall target="clean"/> -->
1420 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1421 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1422 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1423 <!--     </antcall> -->
1424
1425    <antcall target="clean"/>
1426    <antcall target="jsr166e-tck-one-java-version">
1427      <param name="build.jsr166e.java.version" value="7"/>
1428      <param name="build.jsr166e.javac" value="${javac7}"/>
1429    </antcall>
1430
1431    <antcall target="clean"/>
1432    <antcall target="jsr166e-tck-one-java-version">
1433      <param name="build.jsr166e.java.version" value="6"/>
1434      <param name="build.jsr166e.javac" value="${javac6}"/>
1435    </antcall>
1436  </target>
1437
1438
1439  <target name="jsr166e-test"
1440          depends="jsr166e-tck"
1441          description="Runs all tests for jsr166e">
1442  </target>
1443
1444  <target name="jsr166edist"
1445          depends="jsr166edist-jar, jsr166edist-docs"
1446          description="Puts all distributable products in single hierarchy"/>
1447
1448
1449  <target name="jsr166eclean"
1450          description="Removes all jsr166e build products">
1451    <delete dir="${build.jsr166e.dir}"/>
1452  </target>
1453
1454
1455  <target name="jsr166edist-jar"
1456          depends="jsr166eclean, jsr166ejar">
1457    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1458  </target>
1459
1460  <target name="jsr166edist-docs"
1461          depends="jsr166eclean, jsr166edocs">
1462    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1463  </target>
1464
1465
1466 <!-- Find buglets that can be detected by static build tools -->
1467
1468  <target name="lint">
1469    <antcall target="dists">
1470      <param name="build.javadoc.access" value="public"/>
1471    </antcall>
1472  </target>
1473
1474 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1475  <target name="lint-private">
1476    <antcall target="dist">
1477      <param name="build.javadoc.access" value="private"/>
1478    </antcall>
1479  </target>
1480
1481
928   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines