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.63 by tim, Sat Dec 13 20:45:41 2003 UTC vs.
Revision 1.321 by jsr166, Sat Dec 12 18:58:10 2020 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines