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.274 by jsr166, Fri Jun 22 18:55:33 2018 UTC vs.
Revision 1.326 by jsr166, Fri Nov 25 19:33:39 2022 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if"
2 >  xmlns:if="ant:if"
3    xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
# Line 19 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
22 <  $HOME/jdk/jdk8
23 <  $HOME/jdk/jdk9
24 <  $HOME/jdk/jdk10
25 <  $HOME/jdk/jdk11
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/jdk8
26 <  $HOME/jdk/src/jdk9
29 <  $HOME/jdk/src/jdk10
30 <  $HOME/jdk/src/jdk11
31 <  where each of the above is a complete JDK source tree
32 <  (e.g. mercurial forest) or a symlink to same.
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 8 9 10 ...
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  
# Line 53 | Line 50
50  
51  
52    <!-- Compilation options -->
56  <property name="build.sourcelevel"    value="6"/>
53    <property name="build.debug"          value="true"/>
54    <property name="build.debuglevel"     value="source,lines,vars"/>
55    <property name="build.deprecation"    value="false"/>
# Line 65 | Line 61
61    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
62    <property name="build.loops.dir"             location="${build.dir}/loops"/>
63  
68  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
69  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
70  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
71  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
72
73  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
74  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
75  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
76  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
77
78  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
79  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
80  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
81  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
82
83  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
84  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
85  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
86  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
87
64    <!-- JDK locations -->
65    <property name="jdks.home"  location="${user.home}/jdk"/>
66  
# Line 96 | Line 72
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 <    <local name="have.java.base"/>
100 <    <available property="have.java.base"
101 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
102 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
103 <      if:set="have.java.base"/>
104 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
105 <      unless:set="have.java.base"/>
106 <    <local name="modules"/>
107 <    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
108 <    <local name="boot.jar.dir"/>
109 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
110 <    <path id="bootclasspath@{v}" unless:set="modules">
111 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
112 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
113 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
114 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
115 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
116 <    </path>
117 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
75 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
76      </sequential>
77    </macrodef>
78  
# Line 130 | Line 88
88      </sequential>
89    </macrodef>
90  
91 <  <defjdklocations v="6"/>
92 <  <defjdklocations v="7"/>
93 <  <defjdklocations v="8"/>
136 <  <defjdklocations v="9"/>
137 <  <defjdklocations v="10"/>
138 <  <defjdklocations v="11"/>
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="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
101 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
102 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
103 <  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
149 <  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
150 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
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"/>
154  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
155  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
156  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
157  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
158  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
159  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
107  
108    <!-- Javadoc locations -->
109    <property name="docs.dir"          location="${build.dir}/docs"/>
110 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
164 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
165 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
166 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
167 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
168 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
169 <
170 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
171 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
172 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
173 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
174 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
175 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
176 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
110 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
111  
112    <!-- Jar locations -->
113    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
180  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
181  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
182  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
183  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
184  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
185  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.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="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
119 <  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
120 <  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
121 <  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
122 <  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
195 <  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
196 <  <!-- The location of jdk early access docs (RIP) -->
197 <  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
198 <  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
199 <  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
200 <  <!-- Default jdk doc location (latest stable release seems best) -->
201 <  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
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="java5.api.url"      value="${java5.docroot.url}/api/"/>
126 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
127 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
207 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
208 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
209 <  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
210 <  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
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 -->
# Line 215 | Line 132
132    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
133             classpath="${lib.dir}/jtreg.jar" />
134  
135 <  <!-- Tck options; see JSR166TestCase.java
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:
# Line 238 | Line 155
155  
156      <sequential>
157  
241    <local name="modules"/>
242    <condition property="modules">
243      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
244    </condition>
245
246    <local name="use-doclint"/>
247    <condition property="use-doclint">
248      <not> <equals arg1="@{target}" arg2="7"/> </not>
249    </condition>
250
158      <mkdir dir="@{workdir}/tck-classes"/>
159  
160      <javac srcdir="@{tck.src.dir}"
# Line 267 | Line 174
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" if:set="use-doclint"/>
178 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
272 <      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
177 >      <compilerarg value="-Xdoclint:reference/private"/>
178 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
179        <compilerarg line="${build.args}"/>
180        <javac-elements/>
181  
# Line 279 | Line 185
185            failonerror="true"
186            jvm="${java@{target}}"
187            fork="true">
188 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
189 <        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
190 <        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
191 <        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
192 <        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
193 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
194 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
195 <        <jvmarg line="@{jvmflags}"/>
196 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
197 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
198 <
199 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
200 <        <syspropertyset id="system-properties-used-by-tck">
201 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
202 <          <propertyref prefix="jsr166."/>
203 <          <propertyref name="test.timeout.factor"/>
204 <        </syspropertyset>
205 <
206 <        <classpath>
207 <          <pathelement location="${junit.jar}"/>
208 <          <pathelement location="@{workdir}/tck-classes"/>
303 <        </classpath>
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>
# Line 321 | Line 226
226      </sequential>
227    </macrodef>
228  
229 <  <defjtregtests v="11"/>
230 <  <defjtregtests v="10"/>
231 <  <defjtregtests v="9"/>
327 <  <defjtregtests v="8"/>
328 <  <defjtregtests v="7"/>
229 >  <defjtregtests v="17"/>
230 >  <defjtregtests v="18"/>
231 >  <defjtregtests v="19"/>
232  
233    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
234    <property name="jtreg.flags" value=""/>
235  
236    <macrodef name="run-jtreg-tests">
334    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
237      <attribute name="target"/>
238      <attribute name="workdir"/>
239      <attribute name="classes"/>
# Line 344 | Line 246
246      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
247      <property name="jtreg.verbose" value="nopass,fail,error"/>
248  
249 <    <local name="modules"/>
250 <    <condition property="modules">
251 <      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
252 <    </condition>
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"/>
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="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
261 <      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
262 <      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
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}"/>
363      <arg value="-vmoptions:-esa -ea"/>
269        <arg value="-automatic"/>
270        <arg value="-k:!ignore"/>
271        <arg line="@{jtregflags}"/>
# Line 376 | Line 281
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 <  <property name="build.main.java.version" value="9"/>
291 <  <!-- Workaround "no nested properties in ant" -->
292 <  <macrodef name="define-build-main-properties">
293 <    <attribute name="v"/>
294 <    <sequential>
295 <      <property name="build.main.java"    value="${java@{v}}"/>
296 <      <property name="build.main.javac"   value="${javac@{v}}"/>
391 <      <!-- Force javadoc version to be at least 10,
392 <           so we can use override-methods=summary -->
393 <      <condition property="build.main.javadoc"
394 <                 value="${javadoc11}"
395 <                 else="${javadoc@{v}}">
396 <        <equals arg1="@{v}" arg2="9"/>
397 <      </condition>
398 <    </sequential>
399 <  </macrodef>
400 <  <define-build-main-properties v="${build.main.java.version}"/>
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, 4jdk8dist"
299 >          depends="dist"
300            description="Builds all public jars and docs"/>
405          <!--
406              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
407          -->
301  
302    <target name="compile"
303            depends="configure-compiler"
# Line 432 | Line 325
325        <compilerarg value="-Xprefer:source"/>
326        <compilerarg value="-XDignore.symbol.file=true"/>
327        <compilerarg value="-Xlint:all"/>
328 <      <compilerarg line="--doclint-format html5"/>
329 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
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}"/>
440
333      </javac>
334    </target>
335  
444
336    <target name="jar"
337            depends="compile"
338            description="Builds library jar for src/main from compiled sources">
# Line 459 | Line 350
350  
351    <target name="docs"
352            description="Builds javadocs for src/main to dist dir">
353 <
463 <    <delete dir="${docs.dir}"/>
353 >    <delete dir="${docs.dir}" quiet="true"/>
354      <mkdir dir="${docs.dir}"/>
465
466    <!-- the packagenames="none" hack below prevents scanning the -->
467    <!-- sourcepath for packages -->
468
469 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
470 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
471 <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
472 <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
473 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
355      <javadoc destdir="${docs.dir}"
356               packagenames="none"
357 <             link="${java9.api.url}"
357 >             link="${java.api.url}"
358               overview="${src.dir}/intro.html"
359               access="${build.javadoc.access}"
360               sourcepath="${src.dir}"
361               classpath=""
362 <             source="9"
362 >             source="${build.main.javadoc.source}"
363               executable="${build.main.javadoc}">
364        <fileset dir="${src.dir}" defaultexcludes="yes">
365 <        <include name="**/*.java"/>
365 >        <include name="java/**/*.java"/>
366        </fileset>
367 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
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:"/>
496 <!-- tags added in jdk9: currently unused -->
497 <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
498 <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
381      </javadoc>
382    </target>
383  
502
384    <target name="dist"
385            depends="dist-clean, dist-jar, dist-docs"
386            description="Puts all distributable products in single hierarchy"/>
387  
507
508  <target name="release"
509          depends="dist"
510          description="Puts entire CVS tree, plus distribution productions, in a jar">
511
512    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
513
514    <jar basedir="${basedir}" destfile="${release.jar}">
515      <!-- <exclude name="build/**"/> -->
516      <exclude name="${release.jar}"/>
517      <exclude name="user.properties"/>
518      <exclude name="etc/notes/**"/>
519      <exclude name="src/emulation/**"/>
520      <exclude name="**/SyntaxTest.java"/>
521      <exclude name="**/SuperfluousAbstract.java"/>
522      <manifest>
523        <attribute name="Built-By" value="${user.name}"/>
524        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
525      </manifest>
526    </jar>
527  </target>
528
529
388    <target name="clean"
389            description="Removes all build products">
390      <delete dir="${build.dir}"/>
391    </target>
392  
535
393    <target name="dist-clean"
394            description="Removes all build and distribution products">
395      <delete dir="${build.dir}"/>
396      <delete dir="${dist.dir}"/>
397    </target>
398  
542
399    <target name="dist-jar"
400            depends="clean, jar">
401      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 551 | Line 407
407    </target>
408  
409    <target name="tck"
410 <          depends="jar"
410 >          depends="jar"
411            description="Runs tck tests for src/main directly">
556
412      <run-tck-tests
413 <      target="${build.main.java.version}"
413 >      target="${java.runtime.target}"
414        workdir="${build.dir}"
415        classes="${product.jar}">
416        <javac-elements>
417 <        <compilerarg value="-Werror"/>
417 >        <!-- <compilerarg value="-Werror"/> -->
418        </javac-elements>
419      </run-tck-tests>
420    </target>
# Line 586 | Line 441
441    </target>
442  
443    <target name="jtreg"
444 <          depends="jar"
444 >          depends="jar"
445            description="Runs jtreg tests for src/main using the jtreg ant task">
446      <run-jtreg-tests
447 <       target="${build.main.java.version}"
447 >       target="${java.runtime.target}"
448         workdir="${build.dir}"
449         classes="${product.jar}"/>
450    </target>
# Line 598 | Line 453
453            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
454            description="Runs tck and jtreg tests for src/main"/>
455  
456 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
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  
603 <!--     <antcall target="jtreg"> -->
604 <!--       <param name="build.main.java.version" value="8"/> -->
605 <!--       <param name="build.main.javac" value="${javac8}"/> -->
606 <!--     </antcall> -->
607
608 <!--   </target> -->
609
610  <target name="test91011"
611          description="Runs tck and jtreg tests for src/main for multiple java versions">
460  
461 <    <antcall target="clean"/>
462 <    <antcall target="test">
463 <      <param name="build.main.java.version" value="9"/>
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 <
472 <    <antcall target="clean"/>
473 <    <antcall target="test">
474 <      <param name="build.main.java.version" value="10"/>
475 <    </antcall>
476 <
477 <    <antcall target="clean"/>
478 <    <antcall target="test">
479 <      <param name="build.main.java.version" value="11"/>
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>
627
628    <!-- Clean up to avoid obscure wrong class file version bugs -->
629    <antcall target="clean"/>
630
482    </target>
483  
484  
634
485    <target name="configure-compiler">
486      <fail message="ant version too old">
487        <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
# Line 652 | Line 502
502    </target>
503  
504  
655
656  <!-- Various demos and test programs -->
657
658
659  <!-- description="Benchmark from Doug Lea's AQS paper" -->
660  <target name="loops" depends="configure-compiler">
661
662    <mkdir dir="${build.loops.dir}"/>
663
664    <javac srcdir="${loops.src.dir}"
665          destdir="${build.loops.dir}"
666            debug="${build.debug}"
667       debuglevel="${build.debuglevel}"
668      deprecation="${build.deprecation}"
669           source="${build.sourcelevel}"
670           target="${build.sourcelevel}"
671         encoding="ASCII"
672             fork="true">
673
674      <compilerarg line="${build.args}"/>
675      <classpath refid="loops.classpath"/>
676      <compilerarg value="-XDignore.symbol.file=true"/>
677
678    </javac>
679
680    <java classname="ALoops" fork="true">
681      <classpath refid="loops.classpath"/>
682    </java>
683  </target>
684
685
505    <target name="compile-test-loops" depends="jar"
506            description="Compiles all the perf tests in src/test/loops">
507  
# Line 701 | Line 520
520  
521        <include name="*.java"/>
522        <compilerarg value="-XDignore.symbol.file=true"/>
523 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
524 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
706 <      <compilerarg line="${build.args}"/>
707 <    </javac>
708 <  </target>
709 <
710 <
711 <  <!-- jsr166 4jdk8 -->
712 <
713 <  <target name="4jdk8compile"
714 <          depends="configure-compiler"
715 <          description="Compiles src/jdk8 sources, targeting jdk8">
716 <
717 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
718 <
719 <    <javac srcdir="${4jdk8src.dir}"
720 <           destdir="${build.4jdk8.classes.dir}"
721 <           debug="${build.debug}"
722 <           debuglevel="${build.debuglevel}"
723 <           deprecation="${build.deprecation}"
724 <           source="8"
725 <           target="8"
726 <           classpath=""
727 <           bootclasspath="${bootclasspath8}"
728 <           includeAntRuntime="false"
729 <           includeJavaRuntime="false"
730 <           encoding="ASCII"
731 <           executable="${javac8}"
732 <           fork="true">
733 <      <include name="**/*.java"/>
734 <      <compilerarg value="-Xprefer:source"/>
735 <      <compilerarg value="-XDignore.symbol.file=true"/>
736 <      <compilerarg value="-Xlint:all"/>
737 <      <compilerarg value="-Werror"/>
738 <      <compilerarg line="${build.args}"/>
739 <    </javac>
740 <  </target>
741 <
742 <  <target name="4jdk8doclint"
743 <          depends="configure-compiler"
744 <          description="Finds doclint warnings">
745 <
746 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
747 <
748 <    <javac srcdir="${4jdk8src.dir}"
749 <           destdir="${build.4jdk8.classes.dir}"
750 <           debug="${build.debug}"
751 <           debuglevel="${build.debuglevel}"
752 <           deprecation="${build.deprecation}"
753 <           source="8"
754 <           target="8"
755 <           classpath=""
756 <           bootclasspath="${bootclasspath8}"
757 <           includeAntRuntime="false"
758 <           includeJavaRuntime="false"
759 <           encoding="ASCII"
760 <           executable="${javac8}"
761 <           fork="true">
762 <      <include name="**/*.java"/>
763 <      <compilerarg value="-Xprefer:source"/>
764 <      <compilerarg value="-XDignore.symbol.file=true"/>
765 <      <compilerarg value="-Xlint:all"/>
766 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
523 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
524 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
525        <compilerarg line="${build.args}"/>
526      </javac>
527    </target>
528  
529  
530 <  <target name="4jdk8jar"
531 <          depends="4jdk8compile"
774 <          description="Builds library jar from compiled sources">
775 <
776 <    <jar destfile="${4jdk8product.jar}">
777 <      <fileset dir="${build.4jdk8.classes.dir}"/>
778 <      <manifest>
779 <        <attribute name="Built-By" value="${user.name}"/>
780 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
781 <      </manifest>
782 <    </jar>
783 <  </target>
784 <
785 <
786 <  <target name="4jdk8-tck"
787 <          depends="4jdk8jar"
788 <          description="Runs tck tests for jsr166-4jdk8 directly">
789 <
790 <    <run-tck-tests
791 <      target="8"
792 <      workdir="${build.4jdk8.dir}"
793 <      classes="${4jdk8product.jar}">
794 <      <javac-elements>
795 <        <!-- JDK9+ test classes -->
796 <        <exclude name="*9Test.java"/>
797 <        <exclude name="*10Test.java"/>
798 <        <compilerarg value="-Werror"/>
799 <      </javac-elements>
800 <    </run-tck-tests>
801 <  </target>
802 <
803 <
804 <  <target name="4jdk8-jtreg"
805 <          depends="4jdk8jar"
806 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
807 <    <run-jtreg-tests
808 <       target="8"
809 <       workdir="${build.4jdk8.dir}"
810 <       classes="${4jdk8product.jar}"/>
811 <  </target>
812 <
813 <
814 <  <target name="4jdk8-test"
815 <          depends="4jdk8-tck, 4jdk8-jtreg"
816 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
817 <
818 <
819 <  <target name="4jdk8docs"
820 <          description="Builds javadocs for src/jdk8 to dist dir">
821 <
822 <    <delete dir="${4jdk8docs.dir}"/>
823 <    <mkdir dir="${4jdk8docs.dir}"/>
824 <
825 <    <javadoc destdir="${4jdk8docs.dir}"
826 <             packagenames="none"
827 <             link="${java8.api.url}"
828 <             overview="${4jdk8src.dir}/intro.html"
829 <             access="${build.javadoc.access}"
830 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
831 <             classpath=""
832 <             source="8"
833 <             executable="${javadoc8}"
834 <             failonerror = "true">
835 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
836 <        <include name="**/*.java"/>
837 <      </fileset>
838 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
839 <      <arg value="-XDignore.symbol.file=true"/>
840 <      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
841 <      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
842 <      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
843 < <!-- @apiNote tag currently unused -->
844 < <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
845 <    </javadoc>
846 <  </target>
847 <
848 <
849 <  <target name="4jdk8dist"
850 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
851 <          description="Puts all distributable products in single hierarchy"/>
852 <
853 <
854 <  <target name="4jdk8clean"
855 <          description="Removes all 4jdk8 build products">
856 <    <delete dir="${build.4jdk8.dir}"/>
857 <  </target>
858 <
859 <
860 <  <target name="4jdk8dist-jar"
861 <          depends="4jdk8clean, 4jdk8jar">
862 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
863 <  </target>
864 <
865 <
866 <  <target name="4jdk8dist-docs"
867 <          depends="4jdk8clean, 4jdk8docs">
868 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
869 <  </target>
870 <
871 <
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) -->
873
874  <target name="4jdk7compile" depends="configure-compiler">
875    <mkdir dir="${build.4jdk7.classes.dir}"/>
876
877    <javac srcdir="${4jdk7src.dir}"
878           destdir="${build.4jdk7.classes.dir}"
879           debug="${build.debug}"
880           debuglevel="${build.debuglevel}"
881           deprecation="${build.deprecation}"
882           source="6"
883           target="6"
884           classpath=""
885           bootclasspath="${bootclasspath6}"
886           includeAntRuntime="false"
887           includeJavaRuntime="false"
888           encoding="ASCII"
889           executable="${javac7}"
890           fork="true">
891
892      <include name="**/*.java"/>
893      <compilerarg value="-Xprefer:source"/>
894      <compilerarg value="-XDignore.symbol.file=true"/>
895      <compilerarg value="-Xlint:all"/>
896      <compilerarg value="-Werror"/>
897      <compilerarg line="${build.args}"/>
898    </javac>
899  </target>
900
901  <target name="4jdk7doclint" depends="configure-compiler">
902    <mkdir dir="${build.4jdk7.classes.dir}"/>
903
904    <javac srcdir="${4jdk7src.dir}"
905           destdir="${build.4jdk7.classes.dir}"
906           debug="${build.debug}"
907           debuglevel="${build.debuglevel}"
908           deprecation="${build.deprecation}"
909           source="6"
910           target="6"
911           classpath=""
912           bootclasspath="${bootclasspath6}"
913           includeAntRuntime="false"
914           includeJavaRuntime="false"
915           encoding="ASCII"
916           executable="${javac8}"
917           fork="true">
918
919      <include name="**/*.java"/>
920      <compilerarg value="-Xprefer:source"/>
921      <compilerarg value="-XDignore.symbol.file=true"/>
922      <compilerarg value="-Xlint:all"/>
923      <compilerarg value="-Xdoclint:all/protected"/>
924      <compilerarg line="${build.args}"/>
925    </javac>
926  </target>
927
928  <target name="4jdk7jar" depends="4jdk7compile">
929    <jar destfile="${4jdk7product.jar}">
930      <fileset dir="${build.4jdk7.classes.dir}"/>
931      <manifest>
932        <attribute name="Built-By" value="${user.name}"/>
933        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
934      </manifest>
935    </jar>
936  </target>
937
938  <target name="4jdk7-tck" depends="4jdk7jar">
939    <run-tck-tests
940      target="7"
941      workdir="${build.4jdk7.dir}"
942      classes="${4jdk7product.jar}">
943      <javac-elements>
944        <!-- JDK8+ test classes -->
945        <exclude name="*8Test.java"/>
946        <exclude name="*9Test.java"/>
947        <exclude name="*10Test.java"/>
948        <exclude name="DoubleAccumulatorTest.java"/>
949        <exclude name="DoubleAdderTest.java"/>
950        <exclude name="LongAccumulatorTest.java"/>
951        <exclude name="LongAdderTest.java"/>
952        <exclude name="CompletableFutureTest.java"/>
953        <exclude name="SplittableRandomTest.java"/>
954        <exclude name="StampedLockTest.java"/>
955        <exclude name="SubmissionPublisherTest.java"/>
956        <compilerarg value="-Werror"/>
957      </javac-elements>
958    </run-tck-tests>
959  </target>
960
961  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
962  <target name="4jdk7-tck-junit" depends="4jdk7compile">
963
964    <junit printsummary="true"
965           showoutput="true"
966           errorProperty="junit.failed"
967           failureProperty="junit.failed"
968           includeantruntime="true"
969           jvm="${java7}"
970           fork="true">
971
972      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
973      <jvmarg value="-server"/>
974
975      <classpath>
976        <pathelement location="${junit.jar}"/>
977        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
978      </classpath>
979
980      <formatter type="brief"/>
981
982      <test name="${jsr166.tckTestClass}" haltonfailure="no">
983      </test>
984    </junit>
985  </target>
986
987  <target name="4jdk7-jtreg" depends="4jdk7jar">
988    <run-jtreg-tests
989       target="7"
990       workdir="${build.4jdk7.dir}"
991       classes="${4jdk7product.jar}"/>
992  </target>
993
994  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
995
996  <target name="4jdk7docs">
997    <delete dir="${4jdk7docs.dir}"/>
998    <mkdir dir="${4jdk7docs.dir}"/>
999
1000    <javadoc destdir="${4jdk7docs.dir}"
1001             packagenames="none"
1002             link="${java7.api.url}"
1003             overview="${4jdk7src.dir}/intro.html"
1004             access="${build.javadoc.access}"
1005             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1006             classpath=""
1007             executable="${javadoc7}"
1008             failonerror = "true">
1009      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1010        <include name="**/*.java"/>
1011      </fileset>
1012      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1013      <arg value="-XDignore.symbol.file=true"/>
1014    </javadoc>
1015  </target>
1016
1017  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1018
1019  <target name="4jdk7clean">
1020    <delete dir="${build.4jdk7.dir}"/>
1021  </target>
1022
1023  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1024    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1025  </target>
1026
1027  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1028    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1029  </target>
1030
1031
533    <!-- jsr166x (no longer maintained) -->
1033
1034  <target name="jsr166xcompile" depends="configure-compiler">
1035    <mkdir dir="${build.jsr166x.classes.dir}"/>
1036
1037    <javac srcdir="${topsrc.dir}"
1038           destdir="${build.jsr166x.classes.dir}"
1039           debug="${build.debug}"
1040           debuglevel="${build.debuglevel}"
1041           deprecation="${build.deprecation}"
1042           classpath=""
1043           bootclasspath="${bootclasspath6}"
1044           source="5"
1045           target="5"
1046           includeAntRuntime="false"
1047           includeJavaRuntime="false"
1048           encoding="ASCII"
1049           executable="${javac7}"
1050           fork="true">
1051      <include name="jsr166x/**/*.java"/>
1052      <compilerarg value="-XDignore.symbol.file=true"/>
1053      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1054      <compilerarg value="-Werror"/>
1055      <compilerarg line="${build.args}"/>
1056    </javac>
1057  </target>
1058
1059  <target name="jsr166xjar" depends="jsr166xcompile">
1060    <jar destfile="${jsr166x.jar}">
1061      <fileset dir="${build.jsr166x.classes.dir}"/>
1062      <manifest>
1063        <attribute name="Built-By" value="${user.name}"/>
1064        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1065      </manifest>
1066    </jar>
1067  </target>
1068
1069  <target name="jsr166xdocs">
1070    <delete dir="${jsr166xdocs.dir}"/>
1071    <mkdir dir="${jsr166xdocs.dir}"/>
1072
1073    <javadoc destdir="${jsr166xdocs.dir}"
1074             packagenames="jsr166x.*"
1075             link="${java.api.url}"
1076             access="${build.javadoc.access}"
1077             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1078             bootclasspath="${bootclasspath6}"
1079             source="5"
1080             executable="${javadoc7}"
1081             failonerror = "true">
1082      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1083      <arg value="-XDignore.symbol.file=true"/>
1084    </javadoc>
1085  </target>
1086
1087  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1088
1089  <target name="jsr166xclean">
1090    <delete dir="${build.jsr166x.dir}"/>
1091  </target>
1092
1093  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1094    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1095  </target>
1096
1097  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1098    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1099  </target>
1100
1101
534    <!-- jsr166y (no longer maintained) -->
1103
1104  <target name="jsr166ycompile" depends="configure-compiler">
1105    <mkdir dir="${build.jsr166y.classes.dir}"/>
1106
1107    <javac srcdir="${topsrc.dir}"
1108           destdir="${build.jsr166y.classes.dir}"
1109           debug="${build.debug}"
1110           debuglevel="${build.debuglevel}"
1111           deprecation="${build.deprecation}"
1112           source="6"
1113           target="6"
1114           classpath=""
1115           bootclasspath="${bootclasspath6}"
1116           includeAntRuntime="false"
1117           includeJavaRuntime="false"
1118           encoding="ASCII"
1119           executable="${javac7}"
1120           fork="true">
1121
1122      <include name="jsr166y/**/*.java"/>
1123      <compilerarg value="-XDignore.symbol.file=true"/>
1124      <compilerarg value="-Xlint:all"/>
1125      <compilerarg value="-Werror"/>
1126      <compilerarg line="${build.args}"/>
1127    </javac>
1128  </target>
1129
1130  <target name="jsr166yjar" depends="jsr166ycompile">
1131    <jar destfile="${jsr166y.jar}" index="true">
1132      <fileset dir="${build.jsr166y.classes.dir}"/>
1133      <manifest>
1134        <attribute name="Built-By" value="${user.name}"/>
1135        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1136      </manifest>
1137    </jar>
1138  </target>
1139
1140  <target name="jsr166ydocs">
1141    <delete dir="${jsr166ydocs.dir}"/>
1142    <mkdir dir="${jsr166ydocs.dir}"/>
1143
1144    <javadoc destdir="${jsr166ydocs.dir}"
1145             packagenames="jsr166y.*"
1146             link="${java.api.url}"
1147             access="${build.javadoc.access}"
1148             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1149             bootclasspath="${bootclasspath6}"
1150             source="6"
1151             executable="${javadoc7}"
1152             failonerror = "true">
1153      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1154      <arg value="-XDignore.symbol.file=true"/>
1155    </javadoc>
1156  </target>
1157
1158  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1159
1160  <target name="jsr166yclean">
1161    <delete dir="${build.jsr166y.dir}"/>
1162  </target>
1163
1164  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1165    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1166  </target>
1167
1168  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1169    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1170  </target>
1171
1172
535    <!-- extra166y (no longer maintained) -->
1174
1175  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1176    <mkdir dir="${build.extra166y.classes.dir}"/>
1177
1178    <javac srcdir="${topsrc.dir}"
1179           destdir="${build.extra166y.classes.dir}"
1180           debug="${build.debug}"
1181           debuglevel="${build.debuglevel}"
1182           deprecation="${build.deprecation}"
1183           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1184           classpath=""
1185           source="6"
1186           target="6"
1187           includeAntRuntime="false"
1188           includeJavaRuntime="false"
1189           encoding="ASCII"
1190           executable="${javac7}"
1191           fork="true">
1192
1193      <include name="extra166y/**/*.java"/>
1194      <compilerarg value="-XDignore.symbol.file=true"/>
1195      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1196      <compilerarg value="-Werror"/>
1197      <compilerarg line="${build.args}"/>
1198    </javac>
1199  </target>
1200
1201  <target name="extra166yjar" depends="extra166ycompile">
1202    <jar destfile="${extra166y.jar}" index="true">
1203      <fileset dir="${build.extra166y.classes.dir}"/>
1204      <manifest>
1205        <attribute name="Built-By" value="${user.name}"/>
1206        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1207      </manifest>
1208    </jar>
1209  </target>
1210
1211  <target name="extra166ydocs">
1212    <delete dir="${extra166ydocs.dir}"/>
1213    <mkdir dir="${extra166ydocs.dir}"/>
1214
1215    <javadoc destdir="${extra166ydocs.dir}"
1216             packagenames="extra166y.*"
1217             link="${java.api.url}"
1218             access="${build.javadoc.access}"
1219             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1220             bootclasspath="${bootclasspath6}"
1221             source="6"
1222             executable="${javadoc7}">
1223      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1224      <arg value="-XDignore.symbol.file=true"/>
1225    </javadoc>
1226  </target>
1227
1228  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1229
1230  <target name="extra166yclean">
1231    <delete dir="${build.extra166y.dir}"/>
1232  </target>
1233
1234  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1235    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1236  </target>
1237
1238  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1239    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1240  </target>
1241
1242
536    <!-- jsr166e (no longer maintained) -->
537  
1245  <property name="build.jsr166e.java.version" value="6"/>
1246  <property name="build.jsr166e.javac" value="${javac6}"/>
1247
1248  <target name="jsr166ecompile" depends="configure-compiler">
1249    <mkdir dir="${build.jsr166e.classes.dir}"/>
1250
1251    <javac srcdir="${topsrc.dir}"
1252           destdir="${build.jsr166e.classes.dir}"
1253           debug="${build.debug}"
1254           debuglevel="${build.debuglevel}"
1255           deprecation="${build.deprecation}"
1256           source="${build.jsr166e.java.version}"
1257           target="${build.jsr166e.java.version}"
1258           classpath=""
1259           includeAntRuntime="false"
1260           includeJavaRuntime="false"
1261           executable="${build.jsr166e.javac}"
1262           fork="true">
1263
1264      <include name="jsr166e/**/*.java"/>
1265      <compilerarg value="-XDignore.symbol.file=true"/>
1266      <compilerarg value="-Xlint:all"/>
1267      <compilerarg value="-Werror"/>
1268      <compilerarg line="${build.args}"/>
1269    </javac>
1270  </target>
1271
1272  <target name="jsr166edoclint">
1273    <mkdir dir="${build.jsr166e.classes.dir}"/>
1274
1275    <javac srcdir="${topsrc.dir}"
1276           destdir="${build.jsr166e.classes.dir}"
1277           debug="${build.debug}"
1278           debuglevel="${build.debuglevel}"
1279           deprecation="${build.deprecation}"
1280           source="${build.jsr166e.java.version}"
1281           target="${build.jsr166e.java.version}"
1282           classpath=""
1283           bootclasspath="${bootclasspath6}"
1284           includeAntRuntime="false"
1285           includeJavaRuntime="false"
1286           executable="${javac8}"
1287           fork="true">
1288
1289      <include name="jsr166e/**/*.java"/>
1290      <compilerarg value="-XDignore.symbol.file=true"/>
1291      <compilerarg value="-Xlint:all"/>
1292      <compilerarg value="-Werror"/>
1293      <compilerarg value="-Xdoclint:all/protected"/>
1294    </javac>
1295  </target>
1296
1297  <target name="jsr166ejar" depends="jsr166ecompile">
1298    <jar destfile="${jsr166e.jar}" index="true">
1299      <fileset dir="${build.jsr166e.classes.dir}"/>
1300      <manifest>
1301        <attribute name="Built-By" value="${user.name}"/>
1302        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1303      </manifest>
1304    </jar>
1305  </target>
1306
1307  <target name="jsr166edocs">
1308    <delete dir="${jsr166edocs.dir}"/>
1309    <mkdir dir="${jsr166edocs.dir}"/>
1310
1311    <javadoc destdir="${jsr166edocs.dir}"
1312             packagenames="jsr166e.*"
1313             link="${java.api.url}"
1314             access="${build.javadoc.access}"
1315             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1316             source="${build.jsr166e.java.version}"
1317             executable="${javadoc7}"
1318             failonerror = "true">
1319      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1320      <arg value="-XDignore.symbol.file=true"/>
1321    </javadoc>
1322  </target>
1323
1324  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1325    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1326    <run-tck-tests
1327      tck.src.dir="${test.src.dir}/tck-jsr166e"
1328      target="${build.jsr166e.java.version}"
1329      workdir="${build.jsr166e.dir}"
1330      classes="${jsr166e.jar}"/>
1331  </target>
1332
1333  <target name="jsr166e-tck">
1334
1335 <!--     <antcall target="clean"/> -->
1336 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1337 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1338 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1339 <!--     </antcall> -->
1340
1341    <antcall target="clean"/>
1342    <antcall target="jsr166e-tck-one-java-version">
1343      <param name="build.jsr166e.java.version" value="7"/>
1344      <param name="build.jsr166e.javac" value="${javac7}"/>
1345    </antcall>
1346
1347    <antcall target="clean"/>
1348    <antcall target="jsr166e-tck-one-java-version">
1349      <param name="build.jsr166e.java.version" value="6"/>
1350      <param name="build.jsr166e.javac" value="${javac6}"/>
1351    </antcall>
1352  </target>
1353
1354  <target name="jsr166e-test" depends="jsr166e-tck"/>
1355
1356  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1357
1358  <target name="jsr166eclean">
1359    <delete dir="${build.jsr166e.dir}"/>
1360  </target>
1361
1362  <target name="jsr166edist-jar"
1363          depends="jsr166eclean, jsr166ejar">
1364    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1365  </target>
1366
1367  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1368    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1369  </target>
1370
1371
538   <!-- Find buglets that can be detected by static build tools -->
539  
540   <!--   <target name="lint"> -->
# Line 1386 | Line 552
552  
553  
554   <!-- ==============================================================
555 <  Experimental errorprone support - http://errorprone.info
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 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
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
# Line 1403 | Line 581
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"
# Line 1435 | Line 615
615        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
616        <compilerarg value="-J--illegal-access=permit"/>
617        <compilerarg value="-XDcompilePolicy=simple"/>
618 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
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}"/>
# Line 1443 | Line 624
624        <compilerarg value="-XDignore.symbol.file=true"/>
625        <compilerarg value="-Xlint:all"/>
626        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
627 <      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
627 >      <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
628 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
629        <compilerarg line="${build.args}"/>
630      </javac>
631  
# Line 1452 | Line 634
634      </jar>
635  
636      <run-tck-tests
637 <      target="${build.main.java.version}"
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.jar}"/>
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"/>
648 >        <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
649 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
650        </javac-elements>
651      </run-tck-tests>
652    </target>
# Line 1475 | Line 658
658            description="Run errorprone over jtreg tests (experimental)">
659  
660      <run-jtreg-tests
661 <       target="${build.main.java.version}"
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.jar}"/>
668 >        <arg value="-javacoption:${errorprone.processorpath}"/>
669          <arg value="-javacoption:-Xplugin:ErrorProne
670                              ${errorprone.jsr166.flags}
671                              ${errorprone.jsr166.test.flags}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines