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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines