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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines