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.83 by dl, Sat Nov 13 13:20:12 2010 UTC vs.
Revision 1.310 by jsr166, Tue Dec 17 02:09:40 2019 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 6 | Line 9
9  
10    Usage: ant [target]
11  
12 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
13 +  more details.
14 +
15    User-specific settings are read from user.properties.
16    See user.properties.sample for an explanation of some useful settings.
17 +
18 +  The repository contains all dependencies except for ant and the JDK
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/jdk11
23 +  $HOME/jdk/jdk12
24 +  $HOME/jdk/jdk13
25 +  $HOME/jdk/jdk14
26 +  $HOME/jdk/jdk15
27 +  where each of the above is a JDK or a symlink to same, and
28 +  $HOME/jdk/src/jdk11
29 +  $HOME/jdk/src/jdk12
30 +  $HOME/jdk/src/jdk13
31 +  $HOME/jdk/src/jdk14
32 +  $HOME/jdk/src/jdk15
33 +  where each of the above is a JDK source tree or a symlink to same.
34 +
35 +  Alternatively, define ant variables thus:
36 +  ant -Djdk$N.home=... -Djdk$N.src.home=...
37 +  for $N in 11 .. 15 ...
38 +
39 +  As of 2016-03, the sources in src/main are for jdk9+ only.
40 +  As of 2019-08, the sources in src/main are for jdk11+ only.
41 +  As of 2019-10, compatibility support for jdk8 is dropped entirely.
42   ------------------------------------------------------------------------------
43    </description>
44  
45 <  <target name="usage" description="Advises user to run with -projecthelp">
46 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
45 >  <!-- Run 'ant -projecthelp' (default target) -->
46 >  <target name="usage">
47 >    <java classname="org.apache.tools.ant.Main">
48 >      <arg value="-projecthelp" />
49 >    </java>
50    </target>
51  
52 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
53  
54    <!-- User-specific settings -->
55    <property file="user.properties"/>
56  
57  
58    <!-- Compilation options -->
24  <property name="build.sourcelevel"    value="1.6"/>
59    <property name="build.debug"          value="true"/>
60    <property name="build.debuglevel"     value="source,lines,vars"/>
61    <property name="build.deprecation"    value="false"/>
62 +  <property name="build.javadoc.access" value="protected"/>
63  
64    <!-- Build locations -->
65    <property name="build.dir"                   location="build"/>
66    <property name="build.classes.dir"           location="${build.dir}/classes"/>
67    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
68    <property name="build.loops.dir"             location="${build.dir}/loops"/>
69 <  <property name="build.lib.dir"               location="${build.dir}/lib"/>
70 <  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
71 <  <property name="build.reports.dir"           location="${build.dir}/reports"/>
72 <  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
73 <  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
74 <  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
75 <
76 <  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
77 <  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
78 <  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
79 <
80 <  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
81 <  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
82 <  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
69 >
70 >  <!-- JDK locations -->
71 >  <property name="jdks.home"  location="${user.home}/jdk"/>
72 >
73 >  <macrodef name="defjdklocations">
74 >    <attribute name="v"/>
75 >    <sequential>
76 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
77 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
78 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
79 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
80 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
81 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
82 >    </sequential>
83 >  </macrodef>
84 >
85 >  <macrodef name="mirror-dir">
86 >    <attribute name="src"/>
87 >    <attribute name="dst"/>
88 >    <sequential>
89 >    <delete dir="@{dst}"/>
90 >    <mkdir dir="@{dst}"/>
91 >    <copy todir="@{dst}" preservelastmodified="true">
92 >      <fileset dir="@{src}"/>
93 >    </copy>
94 >    </sequential>
95 >  </macrodef>
96 >
97 >  <defjdklocations v="11"/>
98 >  <defjdklocations v="12"/>
99 >  <defjdklocations v="13"/>
100 >  <defjdklocations v="14"/>
101 >  <defjdklocations v="15"/>
102  
103    <!-- Source locations -->
104    <property name="src.dir"              location="${basedir}/src/main"/>
105    <property name="test.src.dir"         location="${basedir}/src/test"/>
106    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
107    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
108 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
108 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
109 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
110 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
111 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
112 >  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
113 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
114    <property name="lib.dir"              location="${basedir}/lib"/>
115    <property name="dist.dir"             location="${basedir}/dist"/>
116    <property name="topsrc.dir"           location="${basedir}/src"/>
117 <  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
118 <  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
119 <  <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
120 <  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
62 <  <!-- Distribution locations -->
63 <  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
64 <  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
65 <  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
66 <  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
117 >
118 >  <!-- Javadoc locations -->
119 >  <property name="docs.dir"          location="${build.dir}/docs"/>
120 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
121  
122    <!-- Jar locations -->
123 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
124 <  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
125 <  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
126 <  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
127 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
128 <
129 <  <!-- Bootclasspath argument -->
130 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
131 <
132 <  <!-- Test classpath -->
133 <  <path id="test.classpath">
134 <    <pathelement location="${build.testcases.dir}"/>
135 <    <pathelement location="${junit.jar}"/>
136 <  </path>
123 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
124 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
125 >
126 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
127 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
128 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
129 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
130 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
131 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
132 >  <!-- The location of jdk early access docs (RIP) -->
133 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
134 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
135 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
136 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
137 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
138 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
139 >  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
140 >  <property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/docs"/>
141 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
142 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
143 >
144 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
145 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
146 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
147 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
148 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
149 >  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
150 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
151 >
152 >  <!-- Define the "jtreg" task -->
153 >  <!-- See the docs in "jtreg -onlineHelp" -->
154 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
155 >           classpath="${lib.dir}/jtreg.jar" />
156 >
157 >  <!-- Tck configuration options; see JSR166TestCase.java
158 >   To profile a single tck test class:
159 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
160 >   To stress test a single tck test class:
161 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
162 >   To stress test a single tck test method:
163 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
164 >  -->
165 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
166 >  <macrodef name="run-tck-tests">
167 >    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
168 >    <attribute name="target"/>
169 >    <attribute name="compile-target" default="@{target}"/>
170 >    <attribute name="workdir"/>
171 >    <attribute name="classes"/>
172 >    <!--
173 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
174 >    -->
175 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
176 >    <element name="javac-elements" optional="true"/>
177 >
178 >    <sequential>
179 >
180 >    <mkdir dir="@{workdir}/tck-classes"/>
181 >
182 >    <javac srcdir="@{tck.src.dir}"
183 >           destdir="@{workdir}/tck-classes"
184 >           debug="${build.debug}"
185 >           debuglevel="${build.debuglevel}"
186 >           deprecation="${build.deprecation}"
187 >           source="@{compile-target}"
188 >           target="@{compile-target}"
189 >           classpath="${junit.jar}"
190 >           includeAntRuntime="false"
191 >           includeJavaRuntime="false"
192 >           encoding="ASCII"
193 >           executable="${javac@{compile-target}}"
194 >           fork="true">
195 >
196 >      <include name="*.java"/>
197 >      <compilerarg value="-XDignore.symbol.file=true"/>
198 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
199 >      <compilerarg value="-Xdoclint:reference/private"/>
200 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
201 >      <compilerarg line="${build.args}"/>
202 >      <javac-elements/>
203 >
204 >    </javac>
205 >
206 >    <java classname="${jsr166.tckTestClass}"
207 >          failonerror="true"
208 >          jvm="${java@{target}}"
209 >          fork="true">
210 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
211 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
212 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
213 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
214 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
215 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
216 >        <jvmarg line="@{jvmflags}"/>
217 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
218 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
219 >
220 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
221 >        <syspropertyset id="system-properties-used-by-tck">
222 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
223 >          <propertyref prefix="jsr166."/>
224 >          <propertyref name="test.timeout.factor"/>
225 >        </syspropertyset>
226 >
227 >        <classpath>
228 >          <pathelement location="${junit.jar}"/>
229 >          <pathelement location="@{workdir}/tck-classes"/>
230 >        </classpath>
231 >    </java>
232 >
233 >    </sequential>
234 >  </macrodef>
235 >
236 >  <!-- Define jtreg test sets for different jdk versions -->
237 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
238 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
239 >  <property name="jtreg.test.pattern" value="**/*.java"/>
240 >  <macrodef name="defjtregtests">
241 >    <attribute name="v"/>
242 >    <sequential>
243 >      <fileset dir="${jtreg@{v}.src.dir}">
244 >        <patternset id="jdk@{v}.jtreg.tests">
245 >          <include name="${jtreg.test.pattern}"/>
246 >        </patternset>
247 >      </fileset>
248 >    </sequential>
249 >  </macrodef>
250 >
251 >  <defjtregtests v="15"/>
252 >  <defjtregtests v="14"/>
253 >  <defjtregtests v="13"/>
254 >  <defjtregtests v="12"/>
255 >  <defjtregtests v="11"/>
256 >
257 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
258 >  <property name="jtreg.flags" value=""/>
259 >
260 >  <macrodef name="run-jtreg-tests">
261 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
262 >    <attribute name="target"/>
263 >    <attribute name="workdir"/>
264 >    <attribute name="classes"/>
265 >    <attribute name="verbose" default="${jtreg.verbose}"/>
266 >    <attribute name="jtregflags" default=""/>
267 >    <element name="jtreg-elements" optional="true"/>
268 >
269 >    <sequential>
270 >
271 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
272 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
273 >
274 >    <delete dir="@{workdir}/JTwork"   quiet="true"/>
275 >    <jtreg dir="${jtreg@{target}.src.dir}"
276 >           jdk="${jdk@{target}.home}"
277 >           workDir="@{workdir}/JTwork">
278 >      <patternset refid="jdk@{target}.jtreg.tests"/>
279 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
280 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
281 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
282 >      <arg value="-agentvm"/>
283 >      <arg value="-noreport"/>
284 >      <arg value="-verbose:@{verbose}"/>
285 >      <arg value="-vmoptions:-esa -ea"/>
286 >      <arg value="-automatic"/>
287 >      <arg value="-k:!ignore"/>
288 >      <arg line="@{jtregflags}"/>
289 >      <arg line="${jtreg.flags}"/>
290 >      <jtreg-elements/>
291 >    </jtreg>
292 >    </sequential>
293 >  </macrodef>
294  
295    <!-- ALoops classpath -->
296    <path id="loops.classpath">
297      <pathelement location="${build.loops.dir}"/>
298    </path>
299  
300 +  <!-- Support @jls tag, used in jdk8+ javadoc -->
301 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
302 +  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
303 +  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
304  
305    <!-- Main targets -->
306  
307 +  <!-- Default values: may seem strange ... -->
308 +  <!-- At runtime, target latest LTS, i.e. jdk11 -->
309 +  <!-- But at build time, target jdk9, for maximal binary portability -->
310 +  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
311 +  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
312 +    o override-methods=summary
313 +    o {@systemProperty ...}
314 +    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
315 +    o 8202628: javadoc generates bad links in TestModules.java
316 +    -->
317 +  <property name="java.runtime.target" value="11"/>
318 +  <property name="build.main.java" value="${java11}"/>
319 +  <property name="build.main.javac" value="${javac11}"/>
320 +  <property name="build.main.javadoc" value="${javadoc12}"/>
321 +  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
322 +
323    <target name="dists"
324 <          depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
324 >          depends="dist"
325            description="Builds all public jars and docs"/>
326  
327    <target name="compile"
328 <          depends="init, configure-compiler"
329 <          description="Compiles main sources to build folder">
328 >          depends="configure-compiler"
329 >          description="Compiles src/main sources to build dir">
330  
331 <    <mkdir dir="${build.classes.dir}"/>
331 >    <local name="destdir"/>
332 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
333 >
334 >    <mkdir dir="${destdir}"/>
335  
336      <javac srcdir="${src.dir}"
337 <          destdir="${build.classes.dir}"
338 <            debug="${build.debug}"
339 <       debuglevel="${build.debuglevel}"
340 <      deprecation="${build.deprecation}"
341 <           source="${build.sourcelevel}"
342 <             fork="true">
337 >           destdir="${destdir}"
338 >           debug="${build.debug}"
339 >           debuglevel="${build.debuglevel}"
340 >           deprecation="${build.deprecation}"
341 >           classpath=""
342 >           includeAntRuntime="false"
343 >           includeJavaRuntime="false"
344 >           encoding="ASCII"
345 >           executable="${build.main.javac}"
346 >           fork="true">
347  
348        <include name="**/*.java"/>
349 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
350 +      <compilerarg value="-Xprefer:source"/>
351        <compilerarg value="-XDignore.symbol.file=true"/>
352 <
353 < <!--
354 <      <exclude name="java/lang/**"/>
352 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
353 >      <compilerarg value="-Xlint:all,-removal"/>
354 >      <compilerarg line="--doclint-format html5"/>
355 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
356 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
357 >      <compilerarg value="-Werror"/>
358 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
359        <compilerarg line="${build.args}"/>
116      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
117 -->
360  
361      </javac>
120
362    </target>
363  
364  
124
365    <target name="jar"
366            depends="compile"
367 <          description="Builds library jar from compiled sources">
368 <
369 <    <mkdir dir="${build.lib.dir}"/>
130 <
367 >          description="Builds library jar for src/main from compiled sources">
368 >    <local name="subdir"/>
369 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
370      <jar destfile="${product.jar}">
371 <      <fileset dir="${build.classes.dir}"/>
371 >      <fileset dir="${build.classes.dir}${subdir}"/>
372 >      <manifest>
373 >        <attribute name="Built-By" value="${user.name}"/>
374 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
375 >      </manifest>
376      </jar>
134
377    </target>
378  
379  
138
139  <target name="test"
140          depends="init, configure-tests, report-tests"
141          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
142
143
144
380    <target name="docs"
381 <          description="Builds javadocs with custom tags to build folder">
381 >          description="Builds javadocs for src/main to dist dir">
382  
383 <    <delete dir="${build.javadocs.dir}"/>
384 <    <mkdir dir="${build.javadocs.dir}"/>
383 >    <delete dir="${docs.dir}" quiet="true"/>
384 >    <mkdir dir="${docs.dir}"/>
385  
386 <    <javadoc destdir="${build.javadocs.dir}"
387 <                link="http://download.oracle.com/javase/6/docs/api/"
388 <            overview="${src.dir}/intro.html"
389 <            sourcepath="${src.dir}:${jdksrc.dir}"
390 <    >
386 >    <!-- old school frames via docs/index.html?overview-summary.html -->
387 >    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
388 >    <local name="use-frames"/>
389 >    <condition property="use-frames">
390 >      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
391 >    </condition>
392  
393 <      <packageset dir="${src.dir}"/>
393 >    <!-- the packagenames="none" hack below prevents scanning the -->
394 >    <!-- sourcepath for packages -->
395  
396 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
397 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
398 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
399 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
400 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
401 +    <javadoc destdir="${docs.dir}"
402 +             packagenames="none"
403 +             link="${java.api.url}"
404 +             overview="${src.dir}/intro.html"
405 +             access="${build.javadoc.access}"
406 +             sourcepath="${src.dir}"
407 +             classpath=""
408 +             source="${build.main.javadoc.source}"
409 +             executable="${build.main.javadoc}">
410 + <!-- TODO: JDK-8214571 failonerror = "true" -->
411 +      <fileset dir="${src.dir}" defaultexcludes="yes">
412 +        <include name="**/*.java"/>
413 +      </fileset>
414 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
415 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
416 +      <arg value="-quiet"/>
417 +      <arg value="-XDignore.symbol.file=true"/>
418 +      <arg value="-html5"/>
419 +      <arg value="--patch-module=java.base=${src.dir}"/>
420 +      <arg value="--frames" if:set="use-frames"/>
421 +      <arg value="--override-methods=summary"/>
422 +      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
423 +      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
424 +      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
425 +      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
426 + <!-- tags added in jdk9: currently unused -->
427 + <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
428 + <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
429      </javadoc>
160
430    </target>
431  
432  
164
433    <target name="dist"
434 <          depends="init, dist-clean, dist-jar, dist-docs"
434 >          depends="dist-clean, dist-jar, dist-docs"
435            description="Puts all distributable products in single hierarchy"/>
436  
437  
170  <target name="release"
171          depends="dist"
172          description="Puts entire CVS tree, plus distribution productions, in a jar">
173
174    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
175
176    <jar basedir="${basedir}" destfile="${release.jar}">
177      <!-- <exclude name="build/**"/> -->
178      <exclude name="${release.jar}"/>
179      <exclude name="user.properties"/>
180      <exclude name="etc/notes/**"/>
181      <exclude name="src/emulation/**"/>
182      <exclude name="**/SyntaxTest.java"/>
183      <exclude name="**/SuperfluousAbstract.java"/>
184    </jar>
185
186  </target>
187
188
189
438    <target name="clean"
439            description="Removes all build products">
192
440      <delete dir="${build.dir}"/>
194    <delete dir="${build.classes.dir}"/>
195    <delete dir="${build.lib.dir}"/>
196
441    </target>
442  
443  
200
444    <target name="dist-clean"
445            description="Removes all build and distribution products">
446 <
446 >    <delete dir="${build.dir}"/>
447      <delete dir="${dist.dir}"/>
205
206  </target>
207
208
209
210  <target name="dist-docs"
211          description="Builds javadocs without custom tags to dist folder">
212
213    <delete dir="${dist.javadocs.dir}"/>
214    <mkdir dir="${dist.javadocs.dir}"/>
215
216    <javadoc destdir="${dist.javadocs.dir}"
217            link="http://download.oracle.com/javase/6/docs/api/"
218            overview="${src.dir}/intro.html"
219
220            sourcepath="${src.dir}:${jdksrc.dir}"
221     >
222 <!--
223      <packageset dir="${src.dir}" defaultexcludes="yes">
224      <include name="java/util/concurrent"/>
225      <include name="java/util/concurrent/atomic"/>
226      <include name="java/util/concurrent/locks"/>
227      </packageset>
228 -->
229      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
230      <include name="main/java/util/concurrent/*.java"/>
231      <include name="main/java/util/concurrent/atomic/*.java"/>
232      <include name="main/java/util/concurrent/locks/*.java"/>
233      <include name="main/java/util/*.java"/>
234 <!--
235      <include name="main/java/util/concurrent/*.html"/>
236      <include name="main/java/util/concurrent/atomic/*.html"/>
237      <include name="main/java/util/concurrent/locks/*.html"/>
238      <include name="main/java/util/*.html"/>
239 -->
240 <!--      <include name="jsr166x/*.java"/> -->
241      </fileset>
242    </javadoc>
243
244  </target>
245
246
247
248  <!-- Internal targets -->
249
250
251  <target name="init">
252
253    <!-- Version is kept in a separate file -->
254    <loadfile property="version" srcFile="version.properties"/>
255    <echo>Building JSR-166 version ${version}</echo>
256    <echo>java.home is ${java.home}</echo>
257
448    </target>
449  
450  
451    <target name="dist-jar"
452            depends="clean, jar">
263
453      <copy file="${product.jar}" todir="${dist.dir}"/>
265
454    </target>
455  
456 <
457 <  <target name="compile-tests"
458 <          depends="jar">
271 <
272 <    <mkdir dir="${build.testcases.dir}"/>
273 <
274 <    <javac srcdir="${tck.src.dir}"
275 <          destdir="${build.testcases.dir}"
276 <            debug="${build.debug}"
277 <       debuglevel="${build.debuglevel}"
278 <      deprecation="${build.deprecation}"
279 <           source="${build.sourcelevel}"
280 <             fork="true">
281 <
282 <      <compilerarg value="${bootclasspath.args}"/>
283 <      <compilerarg line="${build.args}"/>
284 <
285 <      <classpath refid="test.classpath"/>
286 <
287 <    </javac>
288 <
289 <    <javac srcdir="${test.src.dir}"
290 <          destdir="${build.testcases.dir}"
291 <            debug="${build.debug}"
292 <       debuglevel="${build.debuglevel}"
293 <      deprecation="${build.deprecation}"
294 <           source="${build.sourcelevel}"
295 <             fork="true">
296 <
297 <      <include name="jsr166/test/**"/>
298 <
299 <      <compilerarg value="${bootclasspath.args}"/>
300 <      <compilerarg line="${build.args}"/>
301 <
302 <      <classpath refid="test.classpath"/>
303 <
304 <    </javac>
305 <
306 < <!--
307 <    <javac srcdir="${jtreg.src.dir}"
308 <          destdir="${build.testcases.dir}"
309 <            debug="${build.debug}"
310 <       debuglevel="${build.debuglevel}"
311 <      deprecation="${build.deprecation}"
312 <           source="${build.sourcelevel}"
313 <             fork="true">
314 <
315 <      <compilerarg value="${bootclasspath.args}"/>
316 <      <compilerarg line="${build.args}"/>
317 <
318 <      <classpath refid="test.classpath"/>
319 <
320 <    </javac>
321 < -->
322 <
456 >  <target name="dist-docs"
457 >          depends="clean, docs">
458 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
459    </target>
460  
461 <
462 <  <target name="run-tests"
463 <          depends="compile-tests">
464 <
465 <    <!-- May be overridden by user.properties -->
466 <    <property name="testcase" value="*"/>
467 <
468 <    <mkdir dir="${build.reports.dir}"/>
469 <
470 <    <junit printsummary="true"
471 <             showoutput="true"
472 <          errorProperty="junit.failed"
473 <        failureProperty="junit.failed"
474 <                    dir="${build.reports.dir}"
475 <                   fork="true">
476 <
477 <      <jvmarg value="${bootclasspath.args}"/>
478 <      <jvmarg value="-server"/>
479 <      <jvmarg value="-showversion"/>
480 <
481 <      <classpath refid="test.classpath"/>
482 <
483 <      <formatter type="xml"/>
484 <
485 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
486 <        <fileset dir="${tck.src.dir}">
487 <          <include name="**/${testcase}Test.java"/>
488 <        </fileset>
489 <      </batchtest>
490 <
491 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
492 <        <fileset dir="${test.src.dir}">
493 <          <include name="jsr166/test/**/${testcase}Test.java"/>
494 <        </fileset>
495 <      </batchtest>
496 <
497 < <!--
498 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
499 <        <fileset dir="${jtreg.src.dir}">
500 <          <include name="**/${testcase}Test.java"/>
501 <        </fileset>
502 <      </batchtest>
367 < -->
368 <
369 <    </junit>
370 <
461 >  <target name="tck"
462 >          depends="jar"
463 >          description="Runs tck tests for src/main directly">
464 >
465 >    <run-tck-tests
466 >      target="${java.runtime.target}"
467 >      workdir="${build.dir}"
468 >      classes="${product.jar}">
469 >      <javac-elements>
470 >        <compilerarg value="-Werror"/>
471 >      </javac-elements>
472 >    </run-tck-tests>
473 >  </target>
474 >
475 >  <target name="tck-parallelism-1"
476 >          description="Runs tck with common pool parallelism 1">
477 >    <antcall target="tck">
478 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
479 >    </antcall>
480 >  </target>
481 >
482 >  <target name="tck-parallelism-0"
483 >          description="Runs tck with common pool parallelism 0">
484 >    <antcall target="tck">
485 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
486 >    </antcall>
487 >  </target>
488 >
489 >  <target name="tck-security-manager"
490 >          description="Runs tck with a security manager">
491 >    <antcall target="tck">
492 >      <param name="jsr166.useSecurityManager" value="true"/>
493 >    </antcall>
494 >  </target>
495 >
496 >  <target name="jtreg"
497 >          depends="jar"
498 >          description="Runs jtreg tests for src/main using the jtreg ant task">
499 >    <run-jtreg-tests
500 >       target="${java.runtime.target}"
501 >       workdir="${build.dir}"
502 >       classes="${product.jar}"/>
503    </target>
504  
505 +  <target name="test"
506 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
507 +          description="Runs tck and jtreg tests for src/main"/>
508  
509 <  <target name="report-tests"
510 <          depends="run-tests">
511 <
377 <    <!-- Sets junit.report.format to frames if redirection is present,
378 <         otherwise sets it to noframes. -->
379 <    <available property="junit.report.format"
380 <                  value="frames"
381 <              classname="org.apache.xalan.lib.Redirect"
382 <    />
383 <    <property name="junit.report.format" value="noframes"/>
384 <
385 <    <junitreport todir="${build.reports.dir}">
386 <      <fileset dir="${build.reports.dir}">
387 <        <include name="TEST-*.xml"/>
388 <      </fileset>
389 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
390 <      />
391 <    </junitreport>
392 <
393 <    <fail message="Test Cases Failed" if="junit.failed"/>
509 >  <target name="test-version-permutations"
510 >          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs">
511 >  </target>
512  
513 +  <target name="test11">
514 +    <antcall>
515 +      <param name="java.runtime.target" value="11"/>
516 +      <param name="build.main.javac" value="${javac11}"/>
517 +      <param name="build.main.javadoc" value="${javadoc12}"/>
518 +      <param name="build.main.javadoc.source" value="11"/>
519 +      <target name="clean"/>
520 +      <target name="test"/>
521 +      <target name="docs"/>
522 +    </antcall>
523 +  </target>
524 +
525 +  <target name="test12">
526 +    <antcall>
527 +      <param name="java.runtime.target" value="12"/>
528 +      <param name="build.main.javac" value="${javac12}"/>
529 +      <param name="build.main.javadoc" value="${javadoc12}"/>
530 +      <param name="build.main.javadoc.source" value="12"/>
531 +      <target name="clean"/>
532 +      <target name="test"/>
533 +      <target name="docs"/>
534 +    </antcall>
535 +  </target>
536 +
537 +  <target name="test13">
538 +    <antcall>
539 +      <param name="java.runtime.target" value="13"/>
540 +      <param name="build.main.javac" value="${javac13}"/>
541 +      <param name="build.main.javadoc" value="${javadoc13}"/>
542 +      <param name="build.main.javadoc.source" value="13"/>
543 +      <target name="clean"/>
544 +      <target name="test"/>
545 +      <target name="docs"/>
546 +    </antcall>
547 +  </target>
548 +
549 +  <target name="test14">
550 +    <antcall>
551 +      <param name="java.runtime.target" value="14"/>
552 +      <param name="build.main.javac" value="${javac14}"/>
553 +      <param name="build.main.javadoc" value="${javadoc14}"/>
554 +      <param name="build.main.javadoc.source" value="14"/>
555 +      <target name="clean"/>
556 +      <target name="test"/>
557 +      <target name="docs"/>
558 +    </antcall>
559 +  </target>
560 +
561 +  <target name="test15">
562 +    <antcall>
563 +      <param name="java.runtime.target" value="15"/>
564 +      <param name="build.main.javac" value="${javac15}"/>
565 +      <param name="build.main.javadoc" value="${javadoc15}"/>
566 +      <param name="build.main.javadoc.source" value="15"/>
567 +      <target name="clean"/>
568 +      <target name="test"/>
569 +      <target name="docs"/>
570 +    </antcall>
571 +  </target>
572 +
573 +  <target name="test11-12">
574 +    <antcall>
575 +      <param name="java.runtime.target" value="12"/>
576 +      <param name="build.main.javac" value="${javac11}"/>
577 +      <param name="build.main.javadoc" value="${javadoc12}"/>
578 +      <param name="build.main.javadoc.source" value="11"/>
579 +      <target name="clean"/>
580 +      <target name="test"/>
581 +      <target name="docs"/>
582 +    </antcall>
583 +  </target>
584 +
585 +  <target name="test11-13">
586 +    <antcall>
587 +      <param name="java.runtime.target" value="13"/>
588 +      <param name="build.main.javac" value="${javac11}"/>
589 +      <param name="build.main.javadoc" value="${javadoc13}"/>
590 +      <param name="build.main.javadoc.source" value="11"/>
591 +      <target name="clean"/>
592 +      <target name="test"/>
593 +      <target name="docs"/>
594 +    </antcall>
595 +  </target>
596 +
597 +  <target name="test11-14">
598 +    <antcall>
599 +      <param name="java.runtime.target" value="14"/>
600 +      <param name="build.main.javac" value="${javac11}"/>
601 +      <param name="build.main.javadoc" value="${javadoc14}"/>
602 +      <param name="build.main.javadoc.source" value="11"/>
603 +      <target name="clean"/>
604 +      <target name="test"/>
605 +      <target name="docs"/>
606 +    </antcall>
607 +  </target>
608 +
609 +  <target name="test11-15">
610 +    <antcall>
611 +      <param name="java.runtime.target" value="15"/>
612 +      <param name="build.main.javac" value="${javac11}"/>
613 +      <param name="build.main.javadoc" value="${javadoc15}"/>
614 +      <param name="build.main.javadoc.source" value="11"/>
615 +      <target name="clean"/>
616 +      <target name="test"/>
617 +      <target name="docs"/>
618 +    </antcall>
619    </target>
620  
621  
622    <target name="configure-compiler">
623 +    <fail message="ant version too old">
624 +      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
625 +    </fail>
626  
627      <property name="unchecked.option" value="-Xlint:unchecked"/>
628  
# Line 412 | Line 639
639    </target>
640  
641  
642 <  <target name="configure-tests"
643 <       depends="configure-compiler">
417 <
418 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
419 <    <available property="junit.available"
420 <               classname="junit.framework.Protectable"/>
421 <
422 <    <!-- Xalan -->
423 <    <available property="xalan.available"
424 <               classname="org.apache.xalan.Version"/>
425 <
426 <
427 <    <!-- Ant 1.6beta and later don't need or want this check -->
428 <    <!--
429 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
430 <          unless="junit.available"/>
431 <
432 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
433 <          unless="xalan.available"/>
434 <    -->
435 <
436 <  </target>
437 <
438 <
439 <  <!-- Various demos and test programs -->
440 <
441 <
442 <  <target name="loops" depends="init, configure-compiler"
443 <          description="Benchmark from Doug Lea's AQS paper">
642 >  <target name="compile-test-loops" depends="jar"
643 >          description="Compiles all the perf tests in src/test/loops">
644  
645 <    <mkdir dir="${build.loops.dir}"/>
645 >    <mkdir dir="${build.dir}/test/loops"/>
646  
647 <    <javac srcdir="${loops.src.dir}"
648 <          destdir="${build.loops.dir}"
649 <            debug="${build.debug}"
650 <       debuglevel="${build.debuglevel}"
651 <      deprecation="${build.deprecation}"
652 <           source="${build.sourcelevel}"
653 <             fork="true">
647 >    <javac srcdir="${basedir}/src/test/loops"
648 >           destdir="${build.dir}/test/loops"
649 >           debug="${build.debug}"
650 >           debuglevel="${build.debuglevel}"
651 >           deprecation="${build.deprecation}"
652 >           includeAntRuntime="false"
653 >           includeJavaRuntime="false"
654 >           encoding="ASCII"
655 >           executable="${build.main.javac}"
656 >           fork="true">
657  
658 +      <include name="*.java"/>
659 +      <compilerarg value="-XDignore.symbol.file=true"/>
660 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
661 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
662        <compilerarg line="${build.args}"/>
456      <classpath refid="loops.classpath"/>
457
663      </javac>
459
460    <java classname="ALoops" fork="true">
461      <classpath refid="loops.classpath"/>
462    </java>
463
664    </target>
665  
666  
667 <  <!-- jsr166x -->
668 <
669 <
670 <  <target name="jsr166xcompile"
671 <          depends="init, configure-compiler"
672 <          description="Compiles jsr166x sources">
673 <
674 <    <mkdir dir="${build.jsr166x.dir}"/>
675 <
676 <    <javac srcdir="${jsr166xsrc.dir}"
677 <          destdir="${build.jsr166x.dir}"
678 <            debug="${build.debug}"
679 <       debuglevel="${build.debuglevel}"
680 <      deprecation="${build.deprecation}"
681 <           source="${build.sourcelevel}"
682 <             fork="true">
683 <
684 <      <include name="**/*.java"/>
685 <      <compilerarg line="${build.args}"/>
686 <
687 <    </javac>
488 <
667 >  <!-- old branches no longer maintained.  build support deleted -->
668 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
669 >  <!-- jsr166 4jdk7 (no longer maintained) -->
670 >  <!-- jsr166x (no longer maintained) -->
671 >  <!-- jsr166y (no longer maintained) -->
672 >  <!-- extra166y (no longer maintained) -->
673 >  <!-- jsr166e (no longer maintained) -->
674 >
675 > <!-- Find buglets that can be detected by static build tools -->
676 >
677 > <!--   <target name="lint"> -->
678 > <!--     <antcall target="dists"> -->
679 > <!--       <param name="build.javadoc.access" value="protected"/> -->
680 > <!--     </antcall> -->
681 > <!--   </target> -->
682 >
683 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
684 >  <target name="doclint-private">
685 >    <antcall target="dist">
686 >      <param name="build.javadoc.access" value="private"/>
687 >    </antcall>
688    </target>
689  
690  
691 + <!-- ==============================================================
692 +  Experimental errorprone support
693 +  https://errorprone.info
694 +  https://errorprone.info/docs/installation
695 +  https://github.com/google/error-prone/issues/1143
696 + =================================================================== -->
697 +  <path id="errorprone.processorpath.path">
698 +    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
699 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
700 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
701 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
702 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
703 +  </path>
704 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
705 +  <property name="errorprone.jsr166.user.flags" value=""/>
706 +  <property name="errorprone.jsr166.flags"
707 +            value="-Xep:HashtableContains:OFF
708 +                   -Xep:JdkObsolete:OFF
709 +                   -Xep:MissingOverride:OFF
710 +                   -Xep:MissingFail:OFF
711 +                   -Xep:ThreadPriorityCheck:OFF
712 +                   -Xep:MixedArrayDimensions:ERROR
713 +                   -Xep:RemoveUnusedImports:ERROR
714 +                   -Xep:EmptyIf:ERROR
715 +                   -Xep:MultipleTopLevelClasses:ERROR
716 +                   -Xep:ClassName:ERROR
717 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
718 +                   -Xep:RedundantThrows:ERROR
719 +                   -Xep:IdentityBinaryExpression:WARN
720 +                   -Xep:ConstructorInvokesOverridable:WARN
721 +                   -Xep:MethodCanBeStatic:WARN
722 +                   ${errorprone.jsr166.user.flags}"/>
723 +  <!-- -Xep:WildcardImport:ERROR -->
724 +  <property name="errorprone.jsr166.test.flags"
725 +            value="-Xep:StringSplitter:OFF
726 +                   -Xep:BoxedPrimitiveConstructor:OFF
727 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
728 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
729 +  <target name="errorprone"
730 +          depends="clean, configure-compiler"
731 +          description="Run errorprone over jsr166 source code (experimental)">
732 +
733 +    <local name="destdir"/>
734 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
735 +    <mkdir dir="${destdir}"/>
736  
737 <  <target name="jsr166xjar"
738 <          depends="jsr166xcompile"
739 <          description="Builds library jar from compiled sources">
740 <
741 <    <mkdir dir="${build.jsr166xlib.dir}"/>
742 <
743 <    <jar destfile="${jsr166xproduct.jar}">
744 <      <fileset dir="${build.jsr166x.dir}"/>
745 <    </jar>
746 <
747 <  </target>
504 <
505 <
506 <
507 <  <target name="jsr166xdocs"
508 <          description="Builds javadocs with custom tags to build folder">
509 <
510 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
511 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
512 <
513 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
514 <             link="http://download.oracle.com/javase/6/docs/api/"
515 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
516 <    >
517 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
518 <      <include name="jsr166x"/>
519 <      </packageset>
520 <
521 <
522 <    </javadoc>
523 <
524 <  </target>
525 <
526 <
527 <  <target name="jsr166xdist"
528 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
529 <          description="Puts all distributable products in single hierarchy"/>
530 <
531 <
532 <
533 <  <target name="jsr166xclean"
534 <          description="Removes all build products">
535 <
536 <    <delete dir="${build.jsr166x.dir}"/>
537 <    <delete dir="${build.jsr166xlib.dir}"/>
538 <
539 <  </target>
540 <
541 <
542 <
543 <  <target name="jsr166xdist-clean"
544 <          description="Removes all build and distribution products">
545 <
546 <  </target>
547 <
548 <
549 <
550 <  <target name="jsr166xdist-docs"
551 <          description="Builds javadocs without custom tags to dist folder">
552 <
553 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
554 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
555 <
556 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
557 <                link="http://download.oracle.com/javase/6/docs/api/"
558 <              source="${build.sourcelevel}">
559 <
560 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
561 <      <include name="jsr166x"/>
562 <      </packageset>
563 <
564 <    </javadoc>
565 <
566 <  </target>
567 <
568 <  <target name="jsr166xdist-jar"
569 <          depends="jsr166xclean, jsr166xjar">
570 <
571 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
572 <
573 <  </target>
574 <
575 <  <!-- jsr166y -->
576 <
577 <
578 <  <target name="jsr166ycompile"
579 <          depends="init, configure-compiler"
580 <          description="Compiles jsr166y sources">
581 <
582 <    <mkdir dir="${build.jsr166y.dir}"/>
583 <
584 <    <javac srcdir="${jsr166ysrc.dir}"
585 <          destdir="${build.jsr166y.dir}"
586 <            debug="${build.debug}"
587 <       debuglevel="${build.debuglevel}"
588 <      deprecation="${build.deprecation}"
589 <           source="${build.sourcelevel}"
590 <             fork="true">
737 >    <javac srcdir="${src.dir}"
738 >           destdir="${destdir}"
739 >           debug="${build.debug}"
740 >           debuglevel="${build.debuglevel}"
741 >           deprecation="${build.deprecation}"
742 >           classpath=""
743 >           includeAntRuntime="false"
744 >           includeJavaRuntime="false"
745 >           encoding="ASCII"
746 >           executable="${build.main.javac}"
747 >           fork="true">
748  
749        <include name="**/*.java"/>
750 <      <compilerarg line="${build.args}"/>
750 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
751 >      <compilerarg value="-J--illegal-access=permit"/>
752 >      <compilerarg value="-XDcompilePolicy=simple"/>
753 >      <compilerarg value="-processorpath"/>
754 >      <compilerarg pathref="errorprone.processorpath.path"/>
755 >      <compilerarg value="-Xplugin:ErrorProne
756 >                          ${errorprone.jsr166.flags}"/>
757 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
758 >      <compilerarg value="-Xprefer:source"/>
759        <compilerarg value="-XDignore.symbol.file=true"/>
760 <      <compilerarg value="${bootclasspath.args}"/>
761 <
762 < <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
598 <
599 <    </javac>
600 <
601 <  </target>
602 <
603 <
604 <
605 <  <target name="jsr166yjar"
606 <          depends="jsr166ycompile"
607 <          description="Builds library jar from compiled sources">
608 <
609 <    <mkdir dir="${build.jsr166ylib.dir}"/>
610 <
611 <    <jar destfile="${jsr166yproduct.jar}" index="true">
612 <      <fileset dir="${build.jsr166y.dir}"/>
613 <    </jar>
614 <
615 <  </target>
616 <
617 <
618 <
619 <  <target name="jsr166ydocs"
620 <          description="Builds javadocs with custom tags to build folder">
621 <
622 <    <delete dir="${build.jsr166yjavadocs.dir}"/>
623 <    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
624 <
625 <    <javadoc destdir="${build.jsr166yjavadocs.dir}"
626 <                link="http://download.oracle.com/javase/6/docs/api/"
627 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
628 <    >
629 <      <packageset dir="${topsrc.dir}" defaultexcludes="no">
630 <      <include name="jsr166y"/>
631 <      </packageset>
632 <
633 <
634 <    </javadoc>
635 <
636 <  </target>
637 <
638 <
639 <  <target name="jsr166ydist"
640 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
641 <          description="Puts all distributable products in single hierarchy"/>
642 <
643 <
644 <
645 <  <target name="jsr166yclean"
646 <          description="Removes all build products">
647 <
648 <    <delete dir="${build.jsr166y.dir}"/>
649 <    <delete dir="${build.jsr166ylib.dir}"/>
650 <
651 <  </target>
652 <
653 <
654 <
655 <  <target name="jsr166ydist-clean"
656 <          description="Removes all build and distribution products">
657 <
658 <  </target>
659 <
660 <  <target name="jsr166ydist-docs"
661 <          description="Builds javadocs without custom tags to dist folder">
662 <
663 <    <delete dir="${dist.jsr166yjavadocs.dir}"/>
664 <    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
665 <
666 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
667 <                link="http://download.oracle.com/javase/6/docs/api/"
668 <              source="${build.sourcelevel}"
669 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
670 <            >
671 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
672 <      <include name="jsr166y/*.java"/>
673 <            </fileset>
674 <    </javadoc>
675 <
676 <  </target>
677 <
678 <  <target name="jsr166ydist-jar"
679 <          depends="jsr166yclean, jsr166yjar">
680 <
681 <    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
682 <
683 <  </target>
684 <
685 <  <!-- extra166y -->
686 <
687 <
688 <  <target name="extra166ycompile"
689 <          depends="init, configure-compiler, jsr166ycompile"
690 <          description="Compiles extra166y sources">
691 <
692 <    <mkdir dir="${build.extra166y.dir}"/>
693 <
694 <    <javac srcdir="${extra166ysrc.dir}"
695 <          destdir="${build.extra166y.dir}"
696 <            debug="${build.debug}"
697 <            classpath="${jsr166yproduct.jar}"
698 <       debuglevel="${build.debuglevel}"
699 <      deprecation="${build.deprecation}"
700 <           source="${build.sourcelevel}"
701 <             fork="true">
702 <
703 <      <include name="**/*.java"/>
760 >      <compilerarg value="-Xlint:all"/>
761 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
762 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
763        <compilerarg line="${build.args}"/>
705      <compilerarg value="-XDignore.symbol.file=true"/>
706      <compilerarg value="${bootclasspath.args}"/>
707
708 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
709
764      </javac>
765  
766 <  </target>
767 <
714 <
715 <
716 <  <target name="extra166yjar"
717 <          depends="extra166ycompile"
718 <          description="Builds library jar from compiled sources">
719 <
720 <    <mkdir dir="${build.extra166ylib.dir}"/>
721 <
722 <    <jar destfile="${extra166yproduct.jar}" index="true">
723 <      <fileset dir="${build.extra166y.dir}"/>
766 >    <jar destfile="${product.jar}">
767 >      <fileset dir="${destdir}"/>
768      </jar>
769  
770 <  </target>
771 <
772 <
773 <
774 <  <target name="extra166ydocs"
775 <          description="Builds javadocs with custom tags to build folder">
776 <
777 <    <delete dir="${build.extra166yjavadocs.dir}"/>
778 <    <mkdir dir="${build.extra166yjavadocs.dir}"/>
779 <
780 <    <javadoc destdir="${build.extra166yjavadocs.dir}"
781 <                link="http://download.oracle.com/javase/6/docs/api/"
782 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
783 <    >
784 <      <packageset dir="${topsrc.dir}" defaultexcludes="no">
785 <      <include name="extra166y"/>
786 <      </packageset>
787 <
788 <
789 <    </javadoc>
790 <
791 <  </target>
792 <
793 <
794 <  <target name="extra166ydist"
795 <          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
796 <          description="Puts all distributable products in single hierarchy"/>
797 <
798 <
799 <
800 <  <target name="extra166yclean"
801 <          description="Removes all build products">
802 <
803 <    <delete dir="${build.extra166y.dir}"/>
804 <    <delete dir="${build.extra166ylib.dir}"/>
805 <
806 <  </target>
807 <
808 <
809 <
810 <  <target name="extra166ydist-clean"
811 <          description="Removes all build and distribution products">
812 <
813 <  </target>
814 <
815 <  <target name="extra166ydist-docs"
816 <          description="Builds javadocs without custom tags to dist folder">
817 <
818 <    <delete dir="${dist.extra166yjavadocs.dir}"/>
819 <    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
820 <
821 <    <javadoc destdir="${dist.extra166yjavadocs.dir}"
822 <                link="http://download.oracle.com/javase/6/docs/api/"
823 <              source="${build.sourcelevel}"
824 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
825 <            >
826 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
827 <      <include name="extra166y/*.java"/>
828 <            </fileset>
829 <    </javadoc>
830 <
831 <  </target>
832 <
833 <  <target name="extra166ydist-jar"
834 <          depends="extra166yclean, extra166yjar">
835 <
836 <    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
770 >    <run-tck-tests
771 >      target="${java.runtime.target}"
772 >      workdir="${build.dir}"
773 >      classes="${product.jar}">
774 >      <javac-elements>
775 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
776 >        <compilerarg value="-J--illegal-access=permit"/>
777 >        <compilerarg value="-XDcompilePolicy=simple"/>
778 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
779 >        <compilerarg value="-Xplugin:ErrorProne
780 >                            ${errorprone.jsr166.flags}
781 >                            ${errorprone.jsr166.test.flags}"/>
782 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
783 >      </javac-elements>
784 >    </run-tck-tests>
785 >  </target>
786 >
787 >  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
788 >  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
789 >  <target name="errorprone-jtreg"
790 >          depends="jar"
791 >          description="Run errorprone over jtreg tests (experimental)">
792 >
793 >    <run-jtreg-tests
794 >       target="${java.runtime.target}"
795 >       workdir="${build.dir}"
796 >       classes="${product.jar}"
797 >       verbose="all">
798 >      <jtreg-elements>
799 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
800 >        <arg value="-javacoption:-processorpath"/>
801 >        <arg value="-javacoption:${errorprone.processorpath}"/>
802 >        <arg value="-javacoption:-Xplugin:ErrorProne
803 >                            ${errorprone.jsr166.flags}
804 >                            ${errorprone.jsr166.test.flags}
805 >                            -Xep:MultipleTopLevelClasses:WARN
806 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
807 >      </jtreg-elements>
808 >    </run-jtreg-tests>
809 >  </target>
810 >
811 >
812 > <!-- ==============================================================
813 >  Running guava tests against jsr166 code
814 > =================================================================== -->
815 >
816 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
817 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
818 > <!-- <property name="guava.version" value="21.0"/> -->
819 >
820 > <!-- HOWTO debug print a path id -->
821 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
822 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
823 >
824 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
825 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
826 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
827 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
828 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
829 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
830 >
831 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
832 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
833 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
834 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
835 >
836 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
837 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
838 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
839 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
840 >
841 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
842 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
843 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
844 >
845 >  <target name="init-ivy">
846 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
847 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
848 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
849 >             classpath="${build.dir}/ivy.jar"/>
850 >  </target>
851 >
852 >  <target name="guava-tests" depends="jar, init-ivy"
853 >          description="Guava tests run against jsr166 collections">
854 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
855 >    <mkdir dir="${guava.dir}"/>
856 >    <ivy:retrieve pathid="guava.testlib.classpath"
857 >      type="jar,bundle" inline="true" conf="default,master"
858 >      pattern="${guava.dir}/[artifact].[ext]"
859 >      organisation="com.google.guava" module="guava-testlib"/>
860 >    <property name="guava.version" value="21.0"/>
861 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
862 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
863 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
864 >           jvm="${build.main.java}" fork="true">
865 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
866 >      <formatter type="brief"/>
867 >      <classpath>
868 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
869 >        <path refid="guava.testlib.classpath"/>
870 >      </classpath>
871  
872 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
873 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
874 +    </junit>
875    </target>
876  
877   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines