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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines