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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines