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.214 by jsr166, Sun Jun 26 23:44:19 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://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" -->
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}:${jdk9.src.dir}"
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 < <!--  TODO     <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"/>
460 <      <arg value="revised:X"/>
461 <      <arg value="-tag"/>
462 <      <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 469 | Line 428
428            description="Puts all distributable products in single hierarchy"/>
429  
430  
472  <target name="release"
473          depends="dist"
474          description="Puts entire CVS tree, plus distribution productions, in a jar">
475
476    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
477
478    <jar basedir="${basedir}" destfile="${release.jar}">
479      <!-- <exclude name="build/**"/> -->
480      <exclude name="${release.jar}"/>
481      <exclude name="user.properties"/>
482      <exclude name="etc/notes/**"/>
483      <exclude name="src/emulation/**"/>
484      <exclude name="**/SyntaxTest.java"/>
485      <exclude name="**/SuperfluousAbstract.java"/>
486      <manifest>
487        <attribute name="Built-By" value="${user.name}"/>
488        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
489      </manifest>
490    </jar>
491  </target>
492
493
431    <target name="clean"
432            description="Removes all build products">
496
433      <delete dir="${build.dir}"/>
498
434    </target>
435  
436  
437    <target name="dist-clean"
438            description="Removes all build and distribution products">
504
439      <delete dir="${build.dir}"/>
440      <delete dir="${dist.dir}"/>
507
441    </target>
442  
443  
# Line 519 | 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 550 | 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">
564 <  </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>
597 <        <not> <antversion atleast="1.9.1"/> </not>
598 <      </condition>
593 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
594      </fail>
595  
596      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 613 | Line 608
608    </target>
609  
610  
616
617  <!-- Various demos and test programs -->
618
619
620  <!-- description="Benchmark from Doug Lea's AQS paper" -->
621  <target name="loops" depends="configure-compiler">
622
623    <mkdir dir="${build.loops.dir}"/>
624
625    <javac srcdir="${loops.src.dir}"
626          destdir="${build.loops.dir}"
627            debug="${build.debug}"
628       debuglevel="${build.debuglevel}"
629      deprecation="${build.deprecation}"
630           source="${build.sourcelevel}"
631           target="${build.sourcelevel}"
632             fork="true">
633
634      <compilerarg line="${build.args}"/>
635      <classpath refid="loops.classpath"/>
636      <compilerarg value="-XDignore.symbol.file=true"/>
637
638    </javac>
639
640    <java classname="ALoops" fork="true">
641      <classpath refid="loops.classpath"/>
642    </java>
643
644  </target>
645
646
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 656 | 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}"/>
667
632      </javac>
669
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}"/>
680 <
681 <    <javac srcdir="${4jdk8src.dir}"
682 <           destdir="${build.4jdk8.classes.dir}"
683 <           debug="${build.debug}"
684 <           debuglevel="${build.debuglevel}"
685 <           deprecation="${build.deprecation}"
686 <           source="8"
687 <           target="8"
688 <           classpath=""
689 <           bootclasspath="${bootclasspath8}"
690 <           includeAntRuntime="false"
691 <           includeJavaRuntime="false"
692 <           executable="${javac8}"
693 <           fork="true">
694 <
695 <      <include name="**/*.java"/>
696 <      <compilerarg value="-Xprefer:source"/>
697 <      <compilerarg value="-XDignore.symbol.file=true"/>
698 <      <compilerarg value="-Xlint:all"/>
699 <      <compilerarg value="-Werror"/>
700 <      <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>
703 <  </target>
704 <
705 <  <target name="4jdk8doclint"
706 <          depends="configure-compiler"
707 <          description="Finds doclint warnings">
708 <
709 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
710 <
711 <    <javac srcdir="${4jdk8src.dir}"
712 <           destdir="${build.4jdk8.classes.dir}"
713 <           debug="${build.debug}"
714 <           debuglevel="${build.debuglevel}"
715 <           deprecation="${build.deprecation}"
716 <           source="8"
717 <           target="8"
718 <           classpath=""
719 <           bootclasspath="${bootclasspath8}"
720 <           includeAntRuntime="false"
721 <           includeJavaRuntime="false"
722 <           executable="${javac8}"
723 <           fork="true">
724 <
725 <      <include name="**/*.java"/>
726 <      <compilerarg value="-Xprefer:source"/>
727 <      <compilerarg value="-XDignore.symbol.file=true"/>
728 <      <compilerarg value="-Xlint:all"/>
729 <      <compilerarg value="-Xdoclint:all/protected"/>
730 <      <compilerarg line="${build.args}"/>
731 <
732 <    </javac>
733 <  </target>
734 <
735 <
736 <  <target name="4jdk8jar"
737 <          depends="4jdk8compile"
738 <          description="Builds library jar from compiled sources">
739 <
740 <    <jar destfile="${4jdk8product.jar}">
741 <      <fileset dir="${build.4jdk8.classes.dir}"/>
742 <      <manifest>
743 <        <attribute name="Built-By" value="${user.name}"/>
744 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
745 <      </manifest>
746 <    </jar>
747 <
748 <  </target>
749 <
750 <
751 <  <target name="4jdk8-tck"
752 <          depends="4jdk8jar"
753 <          description="Runs tck tests for jsr166-4jdk8 directly">
754 <
755 <    <run-tck-tests
756 <      target="8"
757 <      workdir="${build.4jdk8.dir}"
758 <      classes="${4jdk8product.jar}">
759 <      <javac-elements>
760 <        <!-- JDK9+ test classes -->
761 <        <exclude name="*9Test.java"/>
762 <        <exclude name="*10Test.java"/>
763 <      </javac-elements>
764 <    </run-tck-tests>
765 <  </target>
766 <
767 <
768 <  <target name="4jdk8-jtreg"
769 <          depends="4jdk8jar"
770 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
771 <    <run-jtreg-tests
772 <       target="8"
773 <       workdir="${build.4jdk8.dir}"
774 <       classes="${4jdk8product.jar}"/>
775 <  </target>
776 <
777 <
778 <  <target name="4jdk8-test"
779 <          depends="4jdk8-tck, 4jdk8-jtreg"
780 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
781 <  </target>
782 <
783 <
784 <  <target name="4jdk8docs"
785 <          description="Builds javadocs for src/jdk8 to dist dir">
786 <
787 <    <delete dir="${4jdk8docs.dir}"/>
788 <    <mkdir dir="${4jdk8docs.dir}"/>
789 <
790 <    <javadoc destdir="${4jdk8docs.dir}"
791 <             packagenames="none"
792 <             link="${java8.api.url}"
793 <             overview="${4jdk8src.dir}/intro.html"
794 <             access="${build.javadoc.access}"
795 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
796 <             classpath=""
797 <             executable="${javadoc8}"
798 <             failonerror = "true">
799 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
800 <        <include name="**/*.java"/>
801 <      </fileset>
802 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
803 <      <arg value="-XDignore.symbol.file=true"/>
804 <      <arg value="-tag"/>
805 <      <arg value="${javadoc.jls.option}"/>
806 <      <arg value="-tag"/>
807 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
808 <      <arg value="-tag"/>
809 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
810 <      <arg value="-tag"/>
811 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
812 <    </javadoc>
813 <  </target>
814 <
815 <
816 <  <target name="4jdk8dist"
817 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
818 <          description="Puts all distributable products in single hierarchy"/>
819 <
820 <
821 <  <target name="4jdk8clean"
822 <          description="Removes all 4jdk8 build products">
823 <
824 <    <delete dir="${build.4jdk8.dir}"/>
825 <
826 <  </target>
827 <
828 <
829 <  <target name="4jdk8dist-jar"
830 <          depends="4jdk8clean, 4jdk8jar">
831 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
832 <  </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"
845 <          depends="configure-compiler"
846 <          description="Compiles src/jdk7 sources, targeting jdk7">
847 <
848 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
849 <
850 <    <javac srcdir="${4jdk7src.dir}"
851 <           destdir="${build.4jdk7.classes.dir}"
852 <           debug="${build.debug}"
853 <           debuglevel="${build.debuglevel}"
854 <           deprecation="${build.deprecation}"
855 <           source="6"
856 <           target="6"
857 <           classpath=""
858 <           bootclasspath="${bootclasspath6}"
859 <           includeAntRuntime="false"
860 <           includeJavaRuntime="false"
861 <           executable="${javac7}"
862 <           fork="true">
863 <
864 <      <include name="**/*.java"/>
865 <      <compilerarg value="-Xprefer:source"/>
866 <      <compilerarg value="-XDignore.symbol.file=true"/>
867 <      <compilerarg value="-Xlint:all"/>
868 <      <compilerarg value="-Werror"/>
869 <      <compilerarg line="${build.args}"/>
870 <
871 <    </javac>
872 <  </target>
873 <
874 <  <target name="4jdk7doclint"
875 <          depends="configure-compiler"
876 <          description="Finds doclint warnings">
877 <
878 <    <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}"
885           source="6"
886           target="6"
711             classpath=""
888           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}"/>
900
733      </javac>
902  </target>
903
734  
735 <  <target name="4jdk7jar"
736 <          depends="4jdk7compile"
907 <          description="Builds library jar from compiled sources">
908 <
909 <    <jar destfile="${4jdk7product.jar}">
910 <      <fileset dir="${build.4jdk7.classes.dir}"/>
911 <      <manifest>
912 <        <attribute name="Built-By" value="${user.name}"/>
913 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
914 <      </manifest>
735 >    <jar destfile="${product.jar}">
736 >      <fileset dir="${destdir}"/>
737      </jar>
738  
917  </target>
918
919
920  <target name="4jdk7-tck"
921          depends="4jdk7jar"
922          description="Runs tck tests for jsr166-4jdk7 directly">
923
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"/>
937 <        <exclude name="CompletableFutureTest.java"/>
938 <        <exclude name="SplittableRandomTest.java"/>
939 <        <exclude name="StampedLockTest.java"/>
940 <        <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 <
968 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
969 <      </test>
970 <
841 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
842 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
843      </junit>
844    </target>
845  
974  <target name="4jdk7-jtreg"
975          depends="4jdk7jar"
976          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
977    <run-jtreg-tests
978       target="7"
979       workdir="${build.4jdk7.dir}"
980       classes="${4jdk7product.jar}"/>
981  </target>
982
983
984  <target name="4jdk7-test"
985          depends="4jdk7-tck, 4jdk7-jtreg"
986          description="Runs tck and jtreg tests for jsr166-4jdk7">
987  </target>
988
989
990  <target name="4jdk7docs"
991          description="Builds javadocs for src/jdk7 to dist dir">
992
993    <delete dir="${4jdk7docs.dir}"/>
994    <mkdir dir="${4jdk7docs.dir}"/>
995
996    <javadoc destdir="${4jdk7docs.dir}"
997             packagenames="none"
998             link="${java7.api.url}"
999             overview="${4jdk7src.dir}/intro.html"
1000             access="${build.javadoc.access}"
1001             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1002             classpath=""
1003             executable="${javadoc7}"
1004             failonerror = "true">
1005      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1006        <include name="**/*.java"/>
1007      </fileset>
1008      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1009      <arg value="-XDignore.symbol.file=true"/>
1010    </javadoc>
1011  </target>
1012
1013
1014  <target name="4jdk7dist"
1015          depends="4jdk7dist-jar, 4jdk7dist-docs"
1016          description="Puts all distributable products in single hierarchy"/>
1017
1018
1019  <target name="4jdk7clean"
1020          description="Removes all 4jdk7 build products">
1021
1022    <delete dir="${build.4jdk7.dir}"/>
1023
1024  </target>
1025
1026
1027  <target name="4jdk7dist-jar"
1028          depends="4jdk7clean, 4jdk7jar">
1029    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1030  </target>
1031
1032
1033  <target name="4jdk7dist-docs"
1034          depends="4jdk7clean, 4jdk7docs">
1035    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1036  </target>
1037
1038
1039  <!-- jsr166x -->
1040
1041  <target name="jsr166xcompile"
1042          depends="configure-compiler"
1043          description="Compiles jsr166x sources to build dir">
1044
1045    <mkdir dir="${build.jsr166x.classes.dir}"/>
1046
1047    <javac srcdir="${topsrc.dir}"
1048           destdir="${build.jsr166x.classes.dir}"
1049           debug="${build.debug}"
1050           debuglevel="${build.debuglevel}"
1051           deprecation="${build.deprecation}"
1052           classpath=""
1053           bootclasspath="${bootclasspath6}"
1054           source="5"
1055           target="5"
1056           includeAntRuntime="false"
1057           includeJavaRuntime="false"
1058           executable="${javac7}"
1059           fork="true">
1060
1061      <include name="jsr166x/**/*.java"/>
1062      <compilerarg value="-XDignore.symbol.file=true"/>
1063      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1064      <compilerarg value="-Werror"/>
1065      <compilerarg line="${build.args}"/>
1066
1067    </javac>
1068  </target>
1069
1070
1071  <target name="jsr166xjar"
1072          depends="jsr166xcompile"
1073          description="Builds library jar from compiled sources">
1074
1075    <jar destfile="${jsr166x.jar}">
1076      <fileset dir="${build.jsr166x.classes.dir}"/>
1077      <manifest>
1078        <attribute name="Built-By" value="${user.name}"/>
1079        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1080      </manifest>
1081    </jar>
1082
1083  </target>
1084
1085
1086  <target name="jsr166xdocs"
1087          description="Builds javadocs to dist dir">
1088
1089    <delete dir="${jsr166xdocs.dir}"/>
1090    <mkdir dir="${jsr166xdocs.dir}"/>
1091
1092    <javadoc destdir="${jsr166xdocs.dir}"
1093             packagenames="jsr166x.*"
1094             link="${java.api.url}"
1095             access="${build.javadoc.access}"
1096             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1097             bootclasspath="${bootclasspath6}"
1098             source="5"
1099             executable="${javadoc7}"
1100             failonerror = "true">
1101      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1102      <arg value="-XDignore.symbol.file=true"/>
1103
1104    </javadoc>
1105  </target>
1106
1107
1108  <target name="jsr166xdist"
1109          depends="jsr166xdist-jar, jsr166xdist-docs"
1110          description="Puts all distributable products in single hierarchy"/>
1111
1112
1113  <target name="jsr166xclean"
1114          description="Removes all jsr166x build products">
1115
1116    <delete dir="${build.jsr166x.dir}"/>
1117
1118  </target>
1119
1120
1121  <target name="jsr166xdist-jar"
1122          depends="jsr166xclean, jsr166xjar">
1123    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1124  </target>
1125
1126  <target name="jsr166xdist-docs"
1127          depends="jsr166xclean, jsr166xdocs">
1128    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1129  </target>
1130
1131  <!-- jsr166y -->
1132
1133
1134  <target name="jsr166ycompile"
1135          depends="configure-compiler"
1136          description="Compiles jsr166y sources">
1137
1138    <mkdir dir="${build.jsr166y.classes.dir}"/>
1139
1140    <javac srcdir="${topsrc.dir}"
1141           destdir="${build.jsr166y.classes.dir}"
1142           debug="${build.debug}"
1143           debuglevel="${build.debuglevel}"
1144           deprecation="${build.deprecation}"
1145           source="6"
1146           target="6"
1147           classpath=""
1148           bootclasspath="${bootclasspath6}"
1149           includeAntRuntime="false"
1150           includeJavaRuntime="false"
1151           executable="${javac7}"
1152           fork="true">
1153
1154      <include name="jsr166y/**/*.java"/>
1155      <compilerarg value="-XDignore.symbol.file=true"/>
1156      <compilerarg value="-Xlint:all"/>
1157      <compilerarg value="-Werror"/>
1158      <compilerarg line="${build.args}"/>
1159
1160    </javac>
1161  </target>
1162
1163
1164  <target name="jsr166yjar"
1165          depends="jsr166ycompile"
1166          description="Builds library jar from compiled sources">
1167
1168    <jar destfile="${jsr166y.jar}" index="true">
1169      <fileset dir="${build.jsr166y.classes.dir}"/>
1170      <manifest>
1171        <attribute name="Built-By" value="${user.name}"/>
1172        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1173      </manifest>
1174    </jar>
1175
1176  </target>
1177
1178
1179  <target name="jsr166ydocs"
1180          description="Builds javadocs to dist dir">
1181
1182    <delete dir="${jsr166ydocs.dir}"/>
1183    <mkdir dir="${jsr166ydocs.dir}"/>
1184
1185    <javadoc destdir="${jsr166ydocs.dir}"
1186             packagenames="jsr166y.*"
1187             link="${java.api.url}"
1188             access="${build.javadoc.access}"
1189             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1190             bootclasspath="${bootclasspath6}"
1191             source="6"
1192             executable="${javadoc7}"
1193             failonerror = "true">
1194      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1195      <arg value="-XDignore.symbol.file=true"/>
1196
1197    </javadoc>
1198  </target>
1199
1200
1201  <target name="jsr166ydist"
1202          depends="jsr166ydist-jar, jsr166ydist-docs"
1203          description="Puts all distributable products in single hierarchy"/>
1204
1205
1206  <target name="jsr166yclean"
1207          description="Removes all jsr166y build products">
1208
1209    <delete dir="${build.jsr166y.dir}"/>
1210
1211  </target>
1212
1213
1214  <target name="jsr166ydist-jar"
1215          depends="jsr166yclean, jsr166yjar">
1216    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1217  </target>
1218
1219  <target name="jsr166ydist-docs"
1220          depends="jsr166yclean, jsr166ydocs">
1221    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1222  </target>
1223
1224
1225  <!-- extra166y -->
1226
1227
1228  <target name="extra166ycompile"
1229          depends="configure-compiler, jsr166yjar"
1230          description="Compiles extra166y sources">
1231
1232    <mkdir dir="${build.extra166y.classes.dir}"/>
1233
1234    <javac srcdir="${topsrc.dir}"
1235           destdir="${build.extra166y.classes.dir}"
1236           debug="${build.debug}"
1237           debuglevel="${build.debuglevel}"
1238           deprecation="${build.deprecation}"
1239           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1240           classpath=""
1241           source="6"
1242           target="6"
1243           includeAntRuntime="false"
1244           includeJavaRuntime="false"
1245           executable="${javac7}"
1246           fork="true">
1247
1248      <include name="extra166y/**/*.java"/>
1249      <compilerarg value="-XDignore.symbol.file=true"/>
1250      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1251      <compilerarg value="-Werror"/>
1252      <compilerarg line="${build.args}"/>
1253
1254    </javac>
1255  </target>
1256
1257
1258  <target name="extra166yjar"
1259          depends="extra166ycompile"
1260          description="Builds library jar from compiled sources">
1261
1262    <jar destfile="${extra166y.jar}" index="true">
1263      <fileset dir="${build.extra166y.classes.dir}"/>
1264      <manifest>
1265        <attribute name="Built-By" value="${user.name}"/>
1266        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1267      </manifest>
1268    </jar>
1269
1270  </target>
1271
1272
1273  <target name="extra166ydocs"
1274          description="Builds javadocs to build dir">
1275
1276    <delete dir="${extra166ydocs.dir}"/>
1277    <mkdir dir="${extra166ydocs.dir}"/>
1278
1279    <javadoc destdir="${extra166ydocs.dir}"
1280             packagenames="extra166y.*"
1281             link="${java.api.url}"
1282             access="${build.javadoc.access}"
1283             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1284             bootclasspath="${bootclasspath6}"
1285             source="6"
1286             executable="${javadoc7}">
1287      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1288      <arg value="-XDignore.symbol.file=true"/>
1289
1290    </javadoc>
1291  </target>
1292
1293
1294  <target name="extra166ydist"
1295          depends="extra166ydist-jar, extra166ydist-docs"
1296          description="Puts all distributable products in single hierarchy"/>
1297
1298
1299  <target name="extra166yclean"
1300          description="Removes all extra166y build products">
1301
1302    <delete dir="${build.extra166y.dir}"/>
1303
1304  </target>
1305
1306
1307  <target name="extra166ydist-jar"
1308          depends="extra166yclean, extra166yjar">
1309    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1310  </target>
1311
1312  <target name="extra166ydist-docs"
1313          depends="extra166yclean, extra166ydocs">
1314    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1315  </target>
1316
1317  <!-- jsr166e -->
1318
1319  <property name="build.jsr166e.java.version" value="6"/>
1320  <property name="build.jsr166e.javac" value="${javac6}"/>
1321
1322  <target name="jsr166ecompile"
1323          depends="configure-compiler"
1324          description="Compiles jsr166e sources">
1325
1326    <mkdir dir="${build.jsr166e.classes.dir}"/>
1327
1328    <javac srcdir="${topsrc.dir}"
1329           destdir="${build.jsr166e.classes.dir}"
1330           debug="${build.debug}"
1331           debuglevel="${build.debuglevel}"
1332           deprecation="${build.deprecation}"
1333           source="${build.jsr166e.java.version}"
1334           target="${build.jsr166e.java.version}"
1335           classpath=""
1336           includeAntRuntime="false"
1337           includeJavaRuntime="false"
1338           executable="${build.jsr166e.javac}"
1339           fork="true">
1340
1341      <include name="jsr166e/**/*.java"/>
1342      <compilerarg value="-XDignore.symbol.file=true"/>
1343      <compilerarg value="-Xlint:all"/>
1344      <compilerarg value="-Werror"/>
1345      <compilerarg line="${build.args}"/>
1346
1347    </javac>
1348  </target>
1349
1350  <!-- jsr166e: find doclint errors -->
1351  <target name="jsr166edoclint">
1352
1353    <mkdir dir="${build.jsr166e.classes.dir}"/>
1354
1355    <javac srcdir="${topsrc.dir}"
1356           destdir="${build.jsr166e.classes.dir}"
1357           debug="${build.debug}"
1358           debuglevel="${build.debuglevel}"
1359           deprecation="${build.deprecation}"
1360           source="${build.jsr166e.java.version}"
1361           target="${build.jsr166e.java.version}"
1362           classpath=""
1363           bootclasspath="${bootclasspath6}"
1364           includeAntRuntime="false"
1365           includeJavaRuntime="false"
1366           executable="${javac8}"
1367           fork="true">
1368
1369      <include name="jsr166e/**/*.java"/>
1370      <compilerarg value="-XDignore.symbol.file=true"/>
1371      <compilerarg value="-Xlint:all"/>
1372      <compilerarg value="-Werror"/>
1373      <compilerarg value="-Xdoclint:all/protected"/>
1374
1375    </javac>
1376  </target>
1377
1378
1379  <target name="jsr166ejar"
1380          depends="jsr166ecompile"
1381          description="Builds library jar from compiled sources">
1382
1383    <jar destfile="${jsr166e.jar}" index="true">
1384      <fileset dir="${build.jsr166e.classes.dir}"/>
1385      <manifest>
1386        <attribute name="Built-By" value="${user.name}"/>
1387        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1388      </manifest>
1389    </jar>
1390
1391  </target>
1392
1393
1394  <target name="jsr166edocs"
1395          description="Builds javadocs to build dir">
1396
1397    <delete dir="${jsr166edocs.dir}"/>
1398    <mkdir dir="${jsr166edocs.dir}"/>
1399
1400    <javadoc destdir="${jsr166edocs.dir}"
1401             packagenames="jsr166e.*"
1402             link="${java.api.url}"
1403             access="${build.javadoc.access}"
1404             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1405             source="${build.jsr166e.java.version}"
1406             executable="${javadoc7}"
1407             failonerror = "true">
1408      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1409      <arg value="-XDignore.symbol.file=true"/>
1410
1411    </javadoc>
1412  </target>
1413
1414
1415  <target name="jsr166e-tck-one-java-version"
1416          depends="jsr166ejar">
1417
1418    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1419
1420    <run-tck-tests
1421      tck.src.dir="${test.src.dir}/tck-jsr166e"
1422      target="${build.jsr166e.java.version}"
1423      workdir="${build.jsr166e.dir}"
1424      classes="${jsr166e.jar}"/>
1425  </target>
1426
1427  <target name="jsr166e-tck"
1428          description="Runs tck tests for jsr166e for multiple java versions">
1429
1430 <!--     <antcall target="clean"/> -->
1431 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1432 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1433 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1434 <!--     </antcall> -->
1435
1436    <antcall target="clean"/>
1437    <antcall target="jsr166e-tck-one-java-version">
1438      <param name="build.jsr166e.java.version" value="7"/>
1439      <param name="build.jsr166e.javac" value="${javac7}"/>
1440    </antcall>
1441
1442    <antcall target="clean"/>
1443    <antcall target="jsr166e-tck-one-java-version">
1444      <param name="build.jsr166e.java.version" value="6"/>
1445      <param name="build.jsr166e.javac" value="${javac6}"/>
1446    </antcall>
1447  </target>
1448
1449
1450  <target name="jsr166e-test"
1451          depends="jsr166e-tck"
1452          description="Runs all tests for jsr166e">
1453  </target>
1454
1455  <target name="jsr166edist"
1456          depends="jsr166edist-jar, jsr166edist-docs"
1457          description="Puts all distributable products in single hierarchy"/>
1458
1459
1460  <target name="jsr166eclean"
1461          description="Removes all jsr166e build products">
1462    <delete dir="${build.jsr166e.dir}"/>
1463  </target>
1464
1465
1466  <target name="jsr166edist-jar"
1467          depends="jsr166eclean, jsr166ejar">
1468    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1469  </target>
1470
1471  <target name="jsr166edist-docs"
1472          depends="jsr166eclean, jsr166edocs">
1473    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1474  </target>
1475
1476
1477 <!-- Find buglets that can be detected by static build tools -->
1478
1479  <target name="lint">
1480    <antcall target="dists">
1481      <param name="build.javadoc.access" value="public"/>
1482    </antcall>
1483  </target>
1484
1485 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1486  <target name="lint-private">
1487    <antcall target="dist">
1488      <param name="build.javadoc.access" value="private"/>
1489    </antcall>
1490  </target>
1491
1492
846   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines