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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines