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.184 by jsr166, Wed Sep 30 15:30:46 2015 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"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless">
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 7 | 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  
# Line 14 | 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/jdk6
23 <  $HOME/jdk/jdk7
24 <  $HOME/jdk/jdk8
25 <  $HOME/jdk/jdk9
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/jdk6
31 <  $HOME/jdk/src/jdk7
32 <  $HOME/jdk/src/jdk8
33 <  $HOME/jdk/src/jdk9
34 <  where each of the above is a complete JDK source tree
35 <  (e.g. mercurial forest) or a symlink to same.
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=...
41 <  for $N in 6 7 8 9 ...
40 >  ant -Djdk$N.home=... -Djdk$N.src.home=...
41 >  for $N in 11 .. 17 ...
42  
43 <  As of 2015-09, there is incomplete hacky support for jigsaw
44 <  Build for jigsaw using something like:
45 <  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
36 <  "docs" target is still broken.
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 <  <!-- Display main targets by running 'ant -projecthelp' -->
49 >  <!-- Run 'ant -projecthelp' (default target) -->
50    <target name="usage">
51      <java classname="org.apache.tools.ant.Main">
52        <arg value="-projecthelp" />
# Line 51 | Line 60
60  
61  
62    <!-- Compilation options -->
54  <property name="build.sourcelevel"    value="6"/>
63    <property name="build.debug"          value="true"/>
64    <property name="build.debuglevel"     value="source,lines,vars"/>
65    <property name="build.deprecation"    value="false"/>
# Line 62 | Line 70
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"/>
65  <property name="build.reports.dir"           location="${build.dir}/reports"/>
66
67  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
69  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71
72  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
73  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
74  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
75  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
76
77  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
78  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
79  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
80  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
73  
74    <!-- JDK locations -->
75    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 85 | Line 77
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 <    <local name="have.java.base"/>
85 <    <available property="have.java.base"
94 <      file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
95 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
96 <      if:set="have.java.base"/>
97 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
98 <      unless:set="have.java.base"/>
99 <    <local name="modules"/>
100 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
101 <    <local name="boot.jar.dir"/>
102 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
103 <    <path id="bootclasspath@{v}" unless:set="modules">
104 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
105 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
106 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
107 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
108 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
109 <    </path>
110 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
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  
# Line 123 | Line 98
98      </sequential>
99    </macrodef>
100  
101 <  <defjdklocations v="6"/>
102 <  <defjdklocations v="7"/>
103 <  <defjdklocations v="8"/>
104 <  <defjdklocations v="9"/>
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="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
115 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
116 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
117 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
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"/>
143  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
144  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
145  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
146  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
147  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
125  
126    <!-- Javadoc locations -->
127    <property name="docs.dir"          location="${build.dir}/docs"/>
128 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
152 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
153 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
154 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
155 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
156 <
157 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
158 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
159 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
160 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
161 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
162 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
128 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
129  
130    <!-- Jar locations -->
131    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
166  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
167  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
168  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
169  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
170  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.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 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
136 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
137 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
138 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
139 <  <!-- The expected canonical location does not yet exist as of 2014-07 -->
140 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
141 <  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
142 <  <!-- Default jdk doc location (latest stable release seems best) -->
143 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
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="java5.api.url"      value="${java5.docroot.url}/api/"/>
156 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
157 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
158 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
159 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
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 -->
# Line 194 | Line 166
166    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
167             classpath="${lib.dir}/jtreg.jar" />
168  
169 <  <!-- Test classpath -->
198 <  <path id="test.classpath">
199 <    <pathelement location="${build.testcases.dir}"/>
200 <    <pathelement location="${junit.jar}"/>
201 <  </path>
202 <
203 <  <!-- Tck options; see JSR166TestCase.java
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:
# Line 215 | Line 181
181      <attribute name="compile-target" default="@{target}"/>
182      <attribute name="workdir"/>
183      <attribute name="classes"/>
184 <    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
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      <sequential>
191  
223    <local name="modules"/>
224    <condition property="modules">
225      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
226    </condition>
227
192      <mkdir dir="@{workdir}/tck-classes"/>
193  
194      <javac srcdir="@{tck.src.dir}"
# Line 237 | Line 201
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"/>
211 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
212 <      <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
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  
# Line 254 | Line 219
219            failonerror="true"
220            jvm="${java@{target}}"
221            fork="true">
222 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
223 <        <jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
224 <        <jvmarg line="@{jvmflags}"/>
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 <        </syspropertyset>
237 <
238 <        <classpath>
239 <          <pathelement location="${junit.jar}"/>
240 <          <pathelement location="@{workdir}/tck-classes"/>
241 <        </classpath>
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 <  <fileset dir="${jtreg9.src.dir}">
250 <    <patternset id="jdk9.jtreg.tests">
251 <      <include name="**/*.java"/>
252 <    </patternset>
253 <  </fileset>
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 <  <fileset dir="${jtreg8.src.dir}">
264 <    <patternset id="jdk8.jtreg.tests">
265 <      <include name="**/*.java"/>
266 <      <exclude name="**/SpliteratorCharacteristics.java"/>
267 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
268 <      <exclude name="**/GCDuringIteration.java"/>
269 <    </patternset>
290 <  </fileset>
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 <  <fileset dir="${jtreg7.src.dir}">
272 <    <patternset id="jdk7.jtreg.tests">
294 <      <include name="**/*.java"/>
295 <    </patternset>
296 <  </fileset>
271 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
272 >  <property name="jtreg.flags" value=""/>
273  
274    <macrodef name="run-jtreg-tests">
275 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
300 <    <attribute name="source" default="7"/>
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 <    <local name="modules"/>
286 <    <condition property="modules">
310 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
311 <    </condition>
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"/>
314    <delete dir="@{workdir}/JTreport" quiet="true"/>
315    <mkdir dir="@{workdir}/JTwork/scratch"/>
316    <mkdir dir="@{workdir}/JTreport"/>
289      <jtreg dir="${jtreg@{target}.src.dir}"
290             jdk="${jdk@{target}.home}"
291 <           workDir="@{workdir}/JTwork"
320 <           reportDir="@{workdir}/JTreport">
291 >           workDir="@{workdir}/JTwork">
292        <patternset refid="jdk@{target}.jtreg.tests"/>
293 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
294 <      <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
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="-v:nopass,fail"/>
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>
# Line 337 | Line 312
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 <  <property name="build.main.java.version" value="9"/>
322 <  <property name="build.main.javac" value="${javac9}"/>
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    <target name="dists"
338 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
338 >          depends="dist"
339            description="Builds all public jars and docs"/>
340  
341    <target name="compile"
342            depends="configure-compiler"
343            description="Compiles src/main sources to build dir">
344  
356    <local name="modules"/>
357    <condition property="modules">
358      <and>
359        <available file="${jdk9.home}/jmods" type="dir"/>
360        <equals arg1="9" arg2="${build.main.java.version}"/>
361      </and>
362    </condition>
363
345      <local name="destdir"/>
346 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
366 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
346 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
347  
348      <mkdir dir="${destdir}"/>
349  
# Line 375 | Line 355
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="-Xmodule:java.base" if:set="modules"/>
363 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
364        <compilerarg value="-Xprefer:source"/>
365        <compilerarg value="-XDignore.symbol.file=true"/>
366 <      <compilerarg value="-Xlint:all"/>
367 <      <compilerarg value="-Werror"/>
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  
# Line 394 | Line 382
382  
383    <target name="jar"
384            depends="compile"
385 <          description="Builds library jar from compiled sources">
386 <
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}"/>
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."/>
# Line 409 | Line 398
398    <target name="docs"
399            description="Builds javadocs for src/main to dist dir">
400  
401 <    <delete dir="${docs.dir}"/>
401 >    <delete dir="${docs.dir}" quiet="true"/>
402      <mkdir dir="${docs.dir}"/>
403  
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      <!-- 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="${java9.api.url}"
421 >             link="${java.api.url}"
422               overview="${src.dir}/intro.html"
423               access="${build.javadoc.access}"
424 <             sourcepath="${src.dir}:${jdk9src.dir}"
424 >             sourcepath="${src.dir}"
425               classpath=""
426 <             executable="${javadoc9}">
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"/>
430 >        <include name="java/**/*.java"/>
431        </fileset>
432 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
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 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
437 <      <arg value="-tag"/>
438 <      <arg value="${javadoc.jls.option}"/>
439 <      <arg value="-tag"/>
440 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
441 <      <arg value="-tag"/>
442 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
443 <      <arg value="-tag"/>
444 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
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  
# Line 447 | Line 454
454            description="Puts all distributable products in single hierarchy"/>
455  
456  
450  <target name="release"
451          depends="dist"
452          description="Puts entire CVS tree, plus distribution productions, in a jar">
453
454    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
455
456    <jar basedir="${basedir}" destfile="${release.jar}">
457      <!-- <exclude name="build/**"/> -->
458      <exclude name="${release.jar}"/>
459      <exclude name="user.properties"/>
460      <exclude name="etc/notes/**"/>
461      <exclude name="src/emulation/**"/>
462      <exclude name="**/SyntaxTest.java"/>
463      <exclude name="**/SuperfluousAbstract.java"/>
464      <manifest>
465        <attribute name="Built-By" value="${user.name}"/>
466        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
467      </manifest>
468    </jar>
469  </target>
470
471
457    <target name="clean"
458            description="Removes all build products">
474
459      <delete dir="${build.dir}"/>
476
460    </target>
461  
462  
463    <target name="dist-clean"
464            description="Removes all build and distribution products">
482
465      <delete dir="${build.dir}"/>
466      <delete dir="${dist.dir}"/>
485
467    </target>
468  
469  
# Line 497 | Line 478
478    </target>
479  
480    <target name="tck"
481 <          depends="jar"
482 <          description="Runs tck tests for main directly">
481 >          depends="jar"
482 >          description="Runs tck tests for src/main directly">
483  
484      <run-tck-tests
485 <      target="${build.main.java.version}"
485 >      target="${java.runtime.target}"
486        workdir="${build.dir}"
487 <      classes="${product.jar}"/>
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 given common pool parallelism">
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 given common pool parallelism">
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 main using the jtreg ant task">
516 >          depends="jar"
517 >          description="Runs jtreg tests for src/main using the jtreg ant task">
518      <run-jtreg-tests
519 <       target="${build.main.java.version}"
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, jtreg"
526 <          description="Runs tck and jtreg tests for main">
525 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
526 >          description="Runs tck and jtreg tests for src/main"/>
527 >
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="jtreg8" description="Runs jtreg tests with jdk8">
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 <    <antcall target="jtreg">
595 <      <param name="build.main.java.version" value="8"/>
596 <      <param name="build.main.javac" value="${javac8}"/>
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="test89"
619 <          description="Runs tck and jtreg tests for main for multiple java versions">
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 <    <antcall target="clean"/>
631 <    <antcall target="test">
632 <      <param name="build.main.java.version" value="8"/>
633 <      <param name="build.main.javac" value="${javac8}"/>
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 <    <antcall target="clean"/>
643 <    <antcall target="test">
644 <      <param name="build.main.java.version" value="9"/>
645 <      <param name="build.main.javac" value="${javac9}"/>
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>
568 <        <not> <antversion atleast="1.9.1"/> </not>
569 <      </condition>
680 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
681      </fail>
682  
683      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 584 | Line 695
695    </target>
696  
697  
587
588  <!-- Various demos and test programs -->
589
590
591  <target name="loops" depends="configure-compiler"
592          description="Benchmark from Doug Lea's AQS paper">
593
594    <mkdir dir="${build.loops.dir}"/>
595
596    <javac srcdir="${loops.src.dir}"
597          destdir="${build.loops.dir}"
598            debug="${build.debug}"
599       debuglevel="${build.debuglevel}"
600      deprecation="${build.deprecation}"
601           source="${build.sourcelevel}"
602             fork="true">
603
604      <compilerarg line="${build.args}"/>
605      <classpath refid="loops.classpath"/>
606      <compilerarg value="-XDignore.symbol.file=true"/>
607
608    </javac>
609
610    <java classname="ALoops" fork="true">
611      <classpath refid="loops.classpath"/>
612    </java>
613
614  </target>
615
616
698    <target name="compile-test-loops" depends="jar"
699 <          description="compile all the perf tests in src/test/loops">
699 >          description="Compiles all the perf tests in src/test/loops">
700  
701      <mkdir dir="${build.dir}/test/loops"/>
702  
# Line 626 | Line 707
707             deprecation="${build.deprecation}"
708             includeAntRuntime="false"
709             includeJavaRuntime="false"
710 <           executable="${javac9}"
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"/>
717 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
716 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
717 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
718        <compilerarg line="${build.args}"/>
637
719      </javac>
639
720    </target>
721  
722  
723 <  <!-- jsr166 4jdk7 -->
724 <
725 <  <target name="4jdk7compile"
726 <          depends="configure-compiler"
727 <          description="Compiles src/jdk7 sources, targeting jdk7">
728 <
729 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
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 <    <javac srcdir="${4jdk7src.dir}"
652 <           destdir="${build.4jdk7.classes.dir}"
653 <           debug="${build.debug}"
654 <           debuglevel="${build.debuglevel}"
655 <           deprecation="${build.deprecation}"
656 <           source="6"
657 <           classpath=""
658 <           bootclasspath="${bootclasspath6}"
659 <           includeAntRuntime="false"
660 <           includeJavaRuntime="false"
661 <           executable="${javac7}"
662 <           fork="true">
731 > <!-- Find buglets that can be detected by static build tools -->
732  
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"/>
669 <      <compilerarg line="${build.args}"/>
733 > <!--   <target name="lint"> -->
734 > <!--     <antcall target="dists"> -->
735 > <!--       <param name="build.javadoc.access" value="protected"/> -->
736 > <!--     </antcall> -->
737 > <!--   </target> -->
738  
739 <    </javac>
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  
674  <target name="4jdk7doclint"
675          depends="configure-compiler"
676          description="Finds doclint warnings">
746  
747 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
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="${4jdk7src.dir}"
796 <           destdir="${build.4jdk7.classes.dir}"
795 >    <javac srcdir="${src.dir}"
796 >           destdir="${destdir}"
797             debug="${build.debug}"
798             debuglevel="${build.debuglevel}"
799             deprecation="${build.deprecation}"
685           source="6"
800             classpath=""
687           bootclasspath="${bootclasspath7}"
801             includeAntRuntime="false"
802             includeJavaRuntime="false"
803 <           executable="${javac8}"
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"/>
819 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
820 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
821        <compilerarg line="${build.args}"/>
699
822      </javac>
701  </target>
702
823  
824 <  <target name="4jdk7jar"
825 <          depends="4jdk7compile"
706 <          description="Builds library jar from compiled sources">
707 <
708 <    <jar destfile="${4jdk7product.jar}">
709 <      <fileset dir="${build.4jdk7.classes.dir}"/>
710 <      <manifest>
711 <        <attribute name="Built-By" value="${user.name}"/>
712 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
713 <      </manifest>
824 >    <jar destfile="${product.jar}">
825 >      <fileset dir="${destdir}"/>
826      </jar>
827  
716  </target>
717
718
719  <target name="4jdk7-tck"
720          depends="4jdk7jar"
721          description="Runs tck tests for jsr166-4jdk7 directly">
722
828      <run-tck-tests
829 <      target="7"
830 <      workdir="${build.4jdk7.dir}"
831 <      classes="${4jdk7product.jar}">
829 >      target="${java.runtime.target}"
830 >      workdir="${build.dir}"
831 >      classes="${product.jar}">
832        <javac-elements>
833 <        <!-- JDK8+ test classes -->
834 <        <exclude name="*8Test.java"/>
835 <        <exclude name="*9Test.java"/>
836 <        <exclude name="*10Test.java"/>
837 <        <exclude name="DoubleAccumulatorTest.java"/>
838 <        <exclude name="DoubleAdderTest.java"/>
839 <        <exclude name="LongAccumulatorTest.java"/>
840 <        <exclude name="LongAdderTest.java"/>
736 <        <exclude name="CompletableFutureTest.java"/>
737 <        <exclude name="SplittableRandomTest.java"/>
738 <        <exclude name="StampedLockTest.java"/>
739 <        <exclude name="SubmissionPublisherTest.java"/>
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 <  <target name="4jdk7-tck-junit"
852 <          depends="4jdk7compile"
853 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
854 <
855 <    <junit printsummary="true"
856 <           showoutput="true"
857 <           errorProperty="junit.failed"
858 <           failureProperty="junit.failed"
859 <           includeantruntime="true"
860 <           jvm="${java7}"
861 <           fork="true">
862 <
863 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
864 <      <jvmarg value="-server"/>
865 <
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="${junit.jar}"/>
927 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
926 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
927 >        <path refid="guava.testlib.classpath"/>
928        </classpath>
929  
930 <      <formatter type="brief"/>
931 <
767 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
768 <      </test>
769 <
930 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
931 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
932      </junit>
933    </target>
934  
773  <target name="4jdk7-jtreg"
774          depends="4jdk7jar"
775          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
776    <run-jtreg-tests
777       target="7"
778       workdir="${build.4jdk7.dir}"
779       classes="${4jdk7product.jar}"/>
780  </target>
781
782
783  <target name="4jdk7-test"
784          depends="4jdk7-tck, 4jdk7-jtreg"
785          description="Runs tck and jtreg tests for jsr166-4jdk7">
786  </target>
787
788
789  <target name="4jdk7docs"
790          description="Builds javadocs for src/jdk7 to dist dir">
791
792    <delete dir="${4jdk7docs.dir}"/>
793    <mkdir dir="${4jdk7docs.dir}"/>
794
795    <javadoc destdir="${4jdk7docs.dir}"
796             packagenames="none"
797             link="${java7.api.url}"
798             overview="${4jdk7src.dir}/intro.html"
799             access="${build.javadoc.access}"
800             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
801             classpath=""
802             executable="${javadoc7}">
803      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
804        <include name="**/*.java"/>
805      </fileset>
806      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
807      <arg value="-XDignore.symbol.file=true"/>
808    </javadoc>
809  </target>
810
811
812  <target name="4jdk7dist"
813          depends="4jdk7dist-jar, 4jdk7dist-docs"
814          description="Puts all distributable products in single hierarchy"/>
815
816
817  <target name="4jdk7clean"
818          description="Removes all 4jdk7 build products">
819
820    <delete dir="${build.4jdk7.dir}"/>
821
822  </target>
823
824
825  <target name="4jdk7dist-jar"
826          depends="4jdk7clean, 4jdk7jar">
827    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
828  </target>
829
830
831  <target name="4jdk7dist-docs"
832          depends="4jdk7clean, 4jdk7docs">
833    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
834  </target>
835
836
837  <!-- jsr166x -->
838
839  <target name="jsr166xcompile"
840          depends="configure-compiler"
841          description="Compiles jsr166x sources to build dir">
842
843    <mkdir dir="${build.jsr166x.classes.dir}"/>
844
845    <javac srcdir="${topsrc.dir}"
846           destdir="${build.jsr166x.classes.dir}"
847           debug="${build.debug}"
848           debuglevel="${build.debuglevel}"
849           deprecation="${build.deprecation}"
850           classpath=""
851           bootclasspath="${bootclasspath6}"
852           source="5"
853           includeAntRuntime="false"
854           includeJavaRuntime="false"
855           executable="${javac7}"
856           fork="true">
857
858      <include name="jsr166x/**/*.java"/>
859      <compilerarg value="-XDignore.symbol.file=true"/>
860      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
861      <compilerarg value="-Werror"/>
862      <compilerarg line="${build.args}"/>
863
864    </javac>
865  </target>
866
867
868  <target name="jsr166xjar"
869          depends="jsr166xcompile"
870          description="Builds library jar from compiled sources">
871
872    <jar destfile="${jsr166x.jar}">
873      <fileset dir="${build.jsr166x.classes.dir}"/>
874      <manifest>
875        <attribute name="Built-By" value="${user.name}"/>
876        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
877      </manifest>
878    </jar>
879
880  </target>
881
882
883  <target name="jsr166xdocs"
884          description="Builds javadocs to dist dir">
885
886    <delete dir="${jsr166xdocs.dir}"/>
887    <mkdir dir="${jsr166xdocs.dir}"/>
888
889    <javadoc destdir="${jsr166xdocs.dir}"
890             packagenames="jsr166x.*"
891             link="${java.api.url}"
892             access="${build.javadoc.access}"
893             sourcepath="${topsrc.dir}:${jdk6src.dir}"
894             bootclasspath="${bootclasspath6}"
895             source="5"
896             executable="${javadoc7}">
897      <arg line="-Xdocrootparent ${java.docroot.url}"/>
898      <arg value="-XDignore.symbol.file=true"/>
899
900    </javadoc>
901  </target>
902
903
904  <target name="jsr166xdist"
905          depends="jsr166xdist-jar, jsr166xdist-docs"
906          description="Puts all distributable products in single hierarchy"/>
907
908
909  <target name="jsr166xclean"
910          description="Removes all jsr166x build products">
911
912    <delete dir="${build.jsr166x.dir}"/>
913
914  </target>
915
916
917  <target name="jsr166xdist-jar"
918          depends="jsr166xclean, jsr166xjar">
919    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
920  </target>
921
922  <target name="jsr166xdist-docs"
923          depends="jsr166xclean, jsr166xdocs">
924    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
925  </target>
926
927  <!-- jsr166y -->
928
929
930  <target name="jsr166ycompile"
931          depends="configure-compiler"
932          description="Compiles jsr166y sources">
933
934    <mkdir dir="${build.jsr166y.classes.dir}"/>
935
936    <javac srcdir="${topsrc.dir}"
937           destdir="${build.jsr166y.classes.dir}"
938           debug="${build.debug}"
939           debuglevel="${build.debuglevel}"
940           deprecation="${build.deprecation}"
941           source="6"
942           classpath=""
943           bootclasspath="${bootclasspath6}"
944           includeAntRuntime="false"
945           includeJavaRuntime="false"
946           executable="${javac7}"
947           fork="true">
948
949      <include name="jsr166y/**/*.java"/>
950      <compilerarg value="-XDignore.symbol.file=true"/>
951      <compilerarg value="-Xlint:all"/>
952      <compilerarg value="-Werror"/>
953      <compilerarg line="${build.args}"/>
954
955    </javac>
956  </target>
957
958
959  <target name="jsr166yjar"
960          depends="jsr166ycompile"
961          description="Builds library jar from compiled sources">
962
963    <jar destfile="${jsr166y.jar}" index="true">
964      <fileset dir="${build.jsr166y.classes.dir}"/>
965      <manifest>
966        <attribute name="Built-By" value="${user.name}"/>
967        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
968      </manifest>
969    </jar>
970
971  </target>
972
973
974  <target name="jsr166ydocs"
975          description="Builds javadocs to dist dir">
976
977    <delete dir="${jsr166ydocs.dir}"/>
978    <mkdir dir="${jsr166ydocs.dir}"/>
979
980    <javadoc destdir="${jsr166ydocs.dir}"
981             packagenames="jsr166y.*"
982             link="${java.api.url}"
983             access="${build.javadoc.access}"
984             sourcepath="${topsrc.dir}:${jdk6src.dir}"
985             bootclasspath="${bootclasspath6}"
986             source="6"
987             executable="${javadoc7}">
988      <arg line="-Xdocrootparent ${java.docroot.url}"/>
989      <arg value="-XDignore.symbol.file=true"/>
990
991    </javadoc>
992  </target>
993
994
995  <target name="jsr166ydist"
996          depends="jsr166ydist-jar, jsr166ydist-docs"
997          description="Puts all distributable products in single hierarchy"/>
998
999
1000  <target name="jsr166yclean"
1001          description="Removes all jsr166y build products">
1002
1003    <delete dir="${build.jsr166y.dir}"/>
1004
1005  </target>
1006
1007
1008  <target name="jsr166ydist-jar"
1009          depends="jsr166yclean, jsr166yjar">
1010    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1011  </target>
1012
1013  <target name="jsr166ydist-docs"
1014          depends="jsr166yclean, jsr166ydocs">
1015    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1016  </target>
1017
1018
1019  <!-- extra166y -->
1020
1021
1022  <target name="extra166ycompile"
1023          depends="configure-compiler, jsr166yjar"
1024          description="Compiles extra166y sources">
1025
1026    <mkdir dir="${build.extra166y.classes.dir}"/>
1027
1028    <javac srcdir="${topsrc.dir}"
1029           destdir="${build.extra166y.classes.dir}"
1030           debug="${build.debug}"
1031           debuglevel="${build.debuglevel}"
1032           deprecation="${build.deprecation}"
1033           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1034           classpath=""
1035           source="6"
1036           includeAntRuntime="false"
1037           includeJavaRuntime="false"
1038           executable="${javac7}"
1039           fork="true">
1040
1041      <include name="extra166y/**/*.java"/>
1042      <compilerarg value="-XDignore.symbol.file=true"/>
1043      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1044      <compilerarg value="-Werror"/>
1045      <compilerarg line="${build.args}"/>
1046
1047    </javac>
1048  </target>
1049
1050
1051  <target name="extra166yjar"
1052          depends="extra166ycompile"
1053          description="Builds library jar from compiled sources">
1054
1055    <jar destfile="${extra166y.jar}" index="true">
1056      <fileset dir="${build.extra166y.classes.dir}"/>
1057      <manifest>
1058        <attribute name="Built-By" value="${user.name}"/>
1059        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1060      </manifest>
1061    </jar>
1062
1063  </target>
1064
1065
1066  <target name="extra166ydocs"
1067          description="Builds javadocs to build dir">
1068
1069    <delete dir="${extra166ydocs.dir}"/>
1070    <mkdir dir="${extra166ydocs.dir}"/>
1071
1072    <javadoc destdir="${extra166ydocs.dir}"
1073             packagenames="extra166y.*"
1074             link="${java.api.url}"
1075             access="${build.javadoc.access}"
1076             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1077             bootclasspath="${bootclasspath6}"
1078             source="6"
1079             executable="${javadoc7}">
1080      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1081      <arg value="-XDignore.symbol.file=true"/>
1082
1083    </javadoc>
1084  </target>
1085
1086
1087  <target name="extra166ydist"
1088          depends="extra166ydist-jar, extra166ydist-docs"
1089          description="Puts all distributable products in single hierarchy"/>
1090
1091
1092  <target name="extra166yclean"
1093          description="Removes all extra166y build products">
1094
1095    <delete dir="${build.extra166y.dir}"/>
1096
1097  </target>
1098
1099
1100  <target name="extra166ydist-jar"
1101          depends="extra166yclean, extra166yjar">
1102    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1103  </target>
1104
1105  <target name="extra166ydist-docs"
1106          depends="extra166yclean, extra166ydocs">
1107    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1108  </target>
1109
1110  <!-- jsr166e -->
1111
1112  <property name="build.jsr166e.java.version" value="6"/>
1113  <property name="build.jsr166e.javac" value="${javac6}"/>
1114
1115  <target name="jsr166ecompile"
1116          depends="configure-compiler"
1117          description="Compiles jsr166e sources">
1118
1119    <mkdir dir="${build.jsr166e.classes.dir}"/>
1120
1121    <javac srcdir="${topsrc.dir}"
1122           destdir="${build.jsr166e.classes.dir}"
1123           debug="${build.debug}"
1124           debuglevel="${build.debuglevel}"
1125           deprecation="${build.deprecation}"
1126           source="${build.jsr166e.java.version}"
1127           classpath=""
1128           includeAntRuntime="false"
1129           includeJavaRuntime="false"
1130           executable="${build.jsr166e.javac}"
1131           fork="true">
1132
1133      <include name="jsr166e/**/*.java"/>
1134      <compilerarg value="-XDignore.symbol.file=true"/>
1135      <compilerarg value="-Xlint:all"/>
1136      <compilerarg value="-Werror"/>
1137      <compilerarg line="${build.args}"/>
1138
1139    </javac>
1140  </target>
1141
1142  <!-- jsr166e: find doclint errors -->
1143  <target name="jsr166edoclint">
1144
1145    <mkdir dir="${build.jsr166e.classes.dir}"/>
1146
1147    <javac srcdir="${topsrc.dir}"
1148           destdir="${build.jsr166e.classes.dir}"
1149           debug="${build.debug}"
1150           debuglevel="${build.debuglevel}"
1151           deprecation="${build.deprecation}"
1152           source="${build.jsr166e.java.version}"
1153           classpath=""
1154           bootclasspath="${bootclasspath7}"
1155           includeAntRuntime="false"
1156           includeJavaRuntime="false"
1157           executable="${javac8}"
1158           fork="true">
1159
1160      <include name="jsr166e/**/*.java"/>
1161      <compilerarg value="-XDignore.symbol.file=true"/>
1162      <compilerarg value="-Xlint:all"/>
1163      <compilerarg value="-Werror"/>
1164      <compilerarg value="-Xdoclint:all/protected"/>
1165
1166    </javac>
1167  </target>
1168
1169
1170  <target name="jsr166ejar"
1171          depends="jsr166ecompile"
1172          description="Builds library jar from compiled sources">
1173
1174    <jar destfile="${jsr166e.jar}" index="true">
1175      <fileset dir="${build.jsr166e.classes.dir}"/>
1176      <manifest>
1177        <attribute name="Built-By" value="${user.name}"/>
1178        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1179      </manifest>
1180    </jar>
1181
1182  </target>
1183
1184
1185  <target name="jsr166edocs"
1186          description="Builds javadocs to build dir">
1187
1188    <delete dir="${jsr166edocs.dir}"/>
1189    <mkdir dir="${jsr166edocs.dir}"/>
1190
1191    <javadoc destdir="${jsr166edocs.dir}"
1192             packagenames="jsr166e.*"
1193             link="${java.api.url}"
1194             access="${build.javadoc.access}"
1195             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1196             source="${build.jsr166e.java.version}"
1197             executable="${javadoc7}">
1198      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1199      <arg value="-XDignore.symbol.file=true"/>
1200
1201    </javadoc>
1202  </target>
1203
1204
1205  <target name="jsr166e-tck-one-java-version"
1206          depends="jsr166ejar">
1207
1208    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1209
1210    <run-tck-tests
1211      tck.src.dir="${test.src.dir}/tck-jsr166e"
1212      target="${build.jsr166e.java.version}"
1213      workdir="${build.jsr166e.dir}"
1214      classes="${jsr166e.jar}"/>
1215  </target>
1216
1217  <target name="jsr166e-tck"
1218          description="Runs tck tests for jsr166e for multiple java versions">
1219
1220 <!--     <antcall target="clean"/> -->
1221 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1222 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1223 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1224 <!--     </antcall> -->
1225
1226    <antcall target="clean"/>
1227    <antcall target="jsr166e-tck-one-java-version">
1228      <param name="build.jsr166e.java.version" value="7"/>
1229      <param name="build.jsr166e.javac" value="${javac7}"/>
1230    </antcall>
1231
1232    <antcall target="clean"/>
1233    <antcall target="jsr166e-tck-one-java-version">
1234      <param name="build.jsr166e.java.version" value="6"/>
1235      <param name="build.jsr166e.javac" value="${javac6}"/>
1236    </antcall>
1237  </target>
1238
1239
1240  <target name="jsr166e-test"
1241          depends="jsr166e-tck"
1242          description="Runs all tests for jsr166e">
1243  </target>
1244
1245  <target name="jsr166edist"
1246          depends="jsr166edist-jar, jsr166edist-docs"
1247          description="Puts all distributable products in single hierarchy"/>
1248
1249
1250  <target name="jsr166eclean"
1251          description="Removes all jsr166e build products">
1252    <delete dir="${build.jsr166e.dir}"/>
1253  </target>
1254
1255
1256  <target name="jsr166edist-jar"
1257          depends="jsr166eclean, jsr166ejar">
1258    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1259  </target>
1260
1261  <target name="jsr166edist-docs"
1262          depends="jsr166eclean, jsr166edocs">
1263    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1264  </target>
1265
1266
1267 <!-- Find buglets that can be detected by static build tools -->
1268
1269  <target name="lint">
1270    <antcall target="dists">
1271      <param name="build.javadoc.access" value="public"/>
1272    </antcall>
1273  </target>
1274
1275 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1276  <target name="lint-private">
1277    <antcall target="dist">
1278      <param name="build.javadoc.access" value="private"/>
1279    </antcall>
1280  </target>
1281
1282
935   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines