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.200 by jsr166, Sat Mar 26 06:22:49 2016 UTC vs.
Revision 1.306 by jsr166, Sun Oct 6 18:23:18 2019 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    where each of the above is a JDK or a symlink to same, and
27 <  $HOME/jdk/src/jdk6
28 <  $HOME/jdk/src/jdk7
29 <  $HOME/jdk/src/jdk8
30 <  $HOME/jdk/src/jdk9
31 <  where each of the above is a complete JDK source tree
27 <  (e.g. mercurial forest) or a symlink to same.
27 >  $HOME/jdk/src/jdk11
28 >  $HOME/jdk/src/jdk12
29 >  $HOME/jdk/src/jdk13
30 >  $HOME/jdk/src/jdk14
31 >  where each of the above is a JDK source tree or a symlink to same.
32  
33    Alternatively, define ant variables thus:
34    ant -Djdk$N.home=... -Djdk$N.src.home=...
35 <  for $N in 6 7 8 9 ...
35 >  for $N in 11 .. 14 ...
36  
37 <  As of 2015-09, there is incomplete hacky support for jigsaw
38 <  Build for jigsaw using something like:
39 <  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist
36 <  "docs" target is still broken.
37 >  As of 2016-03, the sources in src/main are for jdk9+ only.
38 >  As of 2019-08, the sources in src/main are for jdk11+ only.
39 >  As of 2019-10, compatibility support for jdk8 is dropped entirely.
40   ------------------------------------------------------------------------------
41    </description>
42  
43 <  <!-- Display main targets by running 'ant -projecthelp' -->
43 >  <!-- Run 'ant -projecthelp' (default target) -->
44    <target name="usage">
45      <java classname="org.apache.tools.ant.Main">
46        <arg value="-projecthelp" />
# Line 51 | Line 54
54  
55  
56    <!-- Compilation options -->
54  <property name="build.sourcelevel"    value="6"/>
57    <property name="build.debug"          value="true"/>
58    <property name="build.debuglevel"     value="source,lines,vars"/>
59    <property name="build.deprecation"    value="false"/>
# Line 62 | Line 64
64    <property name="build.classes.dir"           location="${build.dir}/classes"/>
65    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
66    <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.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
73  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
74  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
75  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
76
77  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
78  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
79  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
80  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
81
82  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
83  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
84  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
85  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
67  
68    <!-- JDK locations -->
69    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 95 | Line 76
76      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
77      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
78      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
79 <    <local name="have.java.base"/>
99 <    <available property="have.java.base"
100 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
101 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
102 <      if:set="have.java.base"/>
103 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
104 <      unless:set="have.java.base"/>
105 <    <local name="modules"/>
106 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
107 <    <local name="boot.jar.dir"/>
108 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
109 <    <path id="bootclasspath@{v}" unless:set="modules">
110 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
111 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
112 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
113 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
114 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
115 <    </path>
116 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
79 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
80      </sequential>
81    </macrodef>
82  
# Line 129 | Line 92
92      </sequential>
93    </macrodef>
94  
95 <  <defjdklocations v="6"/>
96 <  <defjdklocations v="7"/>
97 <  <defjdklocations v="8"/>
98 <  <defjdklocations v="9"/>
95 >  <defjdklocations v="11"/>
96 >  <defjdklocations v="12"/>
97 >  <defjdklocations v="13"/>
98 >  <defjdklocations v="14"/>
99  
100    <!-- Source locations -->
101    <property name="src.dir"              location="${basedir}/src/main"/>
102    <property name="test.src.dir"         location="${basedir}/src/test"/>
103    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
104    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
105 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
106 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
107 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
108 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
105 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
106 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
107 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
108 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
109 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
110    <property name="lib.dir"              location="${basedir}/lib"/>
111    <property name="dist.dir"             location="${basedir}/dist"/>
112    <property name="topsrc.dir"           location="${basedir}/src"/>
149  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
154  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
113  
114    <!-- Javadoc locations -->
115    <property name="docs.dir"          location="${build.dir}/docs"/>
116 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
163 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
164 <
165 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
171 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
116 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
117  
118    <!-- Jar locations -->
119    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
180  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
120    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
121  
122    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
123 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
124 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
125 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
126 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
127 <  <!-- The expected canonical location does not yet exist as of 2016-03 -->
128 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
129 <  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
130 <  <!-- Default jdk doc location (latest stable release seems best) -->
131 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
123 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
124 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
125 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
126 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
127 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
128 >  <!-- The location of jdk early access docs (RIP) -->
129 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
130 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
131 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
132 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
133 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
134 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
135 >  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
136 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
137 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
138  
139    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
140 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
141 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
142 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
143 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
199 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
140 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
141 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
142 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
143 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
144    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
145  
146    <!-- Define the "jtreg" task -->
# Line 204 | Line 148
148    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
149             classpath="${lib.dir}/jtreg.jar" />
150  
151 <  <!-- Tck options; see JSR166TestCase.java
151 >  <!-- Tck configuration options; see JSR166TestCase.java
152     To profile a single tck test class:
153     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
154     To stress test a single tck test class:
# Line 219 | Line 163
163      <attribute name="compile-target" default="@{target}"/>
164      <attribute name="workdir"/>
165      <attribute name="classes"/>
166 <    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
166 >    <!--
167 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
168 >    -->
169 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
170      <element name="javac-elements" optional="true"/>
171  
172      <sequential>
173  
227    <local name="modules"/>
228    <condition property="modules">
229      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
230    </condition>
231
174      <mkdir dir="@{workdir}/tck-classes"/>
175  
176      <javac srcdir="@{tck.src.dir}"
# Line 241 | Line 183
183             classpath="${junit.jar}"
184             includeAntRuntime="false"
185             includeJavaRuntime="false"
186 +           encoding="ASCII"
187             executable="${javac@{compile-target}}"
188             fork="true">
189  
190        <include name="*.java"/>
191        <compilerarg value="-XDignore.symbol.file=true"/>
192        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
193 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
194 <      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
193 >      <compilerarg value="-Xdoclint:reference/private"/>
194 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
195        <compilerarg line="${build.args}"/>
196        <javac-elements/>
197  
# Line 258 | Line 201
201            failonerror="true"
202            jvm="${java@{target}}"
203            fork="true">
204 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
205 <        <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
206 <        <jvmarg line="@{jvmflags}"/>
204 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
205 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
206 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
207 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
208 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
209 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
210 >        <jvmarg line="@{jvmflags}"/>
211 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
212 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
213  
214          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
215 <        <syspropertyset id="system-properties-used-by-tck">
216 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
217 <          <propertyref prefix="jsr166."/>
218 <          <propertyref name="test.timeout.factor"/>
219 <        </syspropertyset>
220 <
221 <        <classpath>
222 <          <pathelement location="${junit.jar}"/>
223 <          <pathelement location="@{workdir}/tck-classes"/>
224 <        </classpath>
215 >        <syspropertyset id="system-properties-used-by-tck">
216 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
217 >          <propertyref prefix="jsr166."/>
218 >          <propertyref name="test.timeout.factor"/>
219 >        </syspropertyset>
220 >
221 >        <classpath>
222 >          <pathelement location="${junit.jar}"/>
223 >          <pathelement location="@{workdir}/tck-classes"/>
224 >        </classpath>
225      </java>
226  
227      </sequential>
228    </macrodef>
229  
230    <!-- Define jtreg test sets for different jdk versions -->
231 <  <fileset dir="${jtreg9.src.dir}">
232 <    <patternset id="jdk9.jtreg.tests">
233 <      <include name="**/*.java"/>
234 <    </patternset>
235 <  </fileset>
236 <
237 <  <fileset dir="${jtreg8.src.dir}">
238 <    <patternset id="jdk8.jtreg.tests">
239 <      <include name="**/*.java"/>
240 <      <exclude name="**/SpliteratorCharacteristics.java"/>
241 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
242 <      <exclude name="**/GCDuringIteration.java"/>
243 <    </patternset>
295 <  </fileset>
231 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
232 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
233 >  <property name="jtreg.test.pattern" value="**/*.java"/>
234 >  <macrodef name="defjtregtests">
235 >    <attribute name="v"/>
236 >    <sequential>
237 >      <fileset dir="${jtreg@{v}.src.dir}">
238 >        <patternset id="jdk@{v}.jtreg.tests">
239 >          <include name="${jtreg.test.pattern}"/>
240 >        </patternset>
241 >      </fileset>
242 >    </sequential>
243 >  </macrodef>
244  
245 <  <fileset dir="${jtreg7.src.dir}">
246 <    <patternset id="jdk7.jtreg.tests">
247 <      <include name="**/*.java"/>
248 <    </patternset>
301 <  </fileset>
245 >  <defjtregtests v="14"/>
246 >  <defjtregtests v="13"/>
247 >  <defjtregtests v="12"/>
248 >  <defjtregtests v="11"/>
249  
250    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
251    <property name="jtreg.flags" value=""/>
252  
253    <macrodef name="run-jtreg-tests">
254 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
308 <    <attribute name="source" default="7"/>
254 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
255      <attribute name="target"/>
256      <attribute name="workdir"/>
257      <attribute name="classes"/>
258 +    <attribute name="verbose" default="${jtreg.verbose}"/>
259      <attribute name="jtregflags" default=""/>
260 +    <element name="jtreg-elements" optional="true"/>
261  
262      <sequential>
263  
264      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
265      <property name="jtreg.verbose" value="nopass,fail,error"/>
266  
319    <local name="modules"/>
320    <condition property="modules">
321      <available file="${jdk@{target}.home}/jmods" type="dir"/>
322    </condition>
323
267      <delete dir="@{workdir}/JTwork"   quiet="true"/>
325    <delete dir="@{workdir}/JTreport" quiet="true"/>
326    <mkdir dir="@{workdir}/JTwork/scratch"/>
327    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
328    <mkdir dir="@{workdir}/JTreport/html"/>
329    <mkdir dir="@{workdir}/JTreport/text"/>
268      <jtreg dir="${jtreg@{target}.src.dir}"
269             jdk="${jdk@{target}.home}"
270 <           workDir="@{workdir}/JTwork"
333 <           reportDir="@{workdir}/JTreport">
270 >           workDir="@{workdir}/JTwork">
271        <patternset refid="jdk@{target}.jtreg.tests"/>
272 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
273 <      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
272 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
273 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
274        <arg value="-agentvm"/>
275 <      <arg value="-verbose:${jtreg.verbose}"/>
275 >      <arg value="-noreport"/>
276 >      <arg value="-verbose:@{verbose}"/>
277        <arg value="-vmoptions:-esa -ea"/>
278        <arg value="-automatic"/>
279        <arg value="-k:!ignore"/>
280        <arg line="@{jtregflags}"/>
281        <arg line="${jtreg.flags}"/>
282 +      <jtreg-elements/>
283      </jtreg>
284      </sequential>
285    </macrodef>
# Line 351 | Line 290
290    </path>
291  
292    <!-- Support @jls tag, used in jdk8+ javadoc -->
293 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
294    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
295    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
296  
297    <!-- Main targets -->
298  
299 <  <property name="build.main.java.version" value="9"/>
300 <  <property name="build.main.javac" value="${javac9}"/>
299 >  <!-- Default values: may seem strange ... -->
300 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
301 >  <!-- But at build time, target jdk9, for maximal binary portability -->
302 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
303 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
304 >    o override-methods=summary
305 >    o {@systemProperty ...}
306 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
307 >    o 8202628: javadoc generates bad links in TestModules.java
308 >    -->
309 >  <property name="java.runtime.target" value="11"/>
310 >  <property name="build.main.java" value="${java11}"/>
311 >  <property name="build.main.javac" value="${javac11}"/>
312 >  <property name="build.main.javadoc" value="${javadoc12}"/>
313 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
314  
315    <target name="dists"
316 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
316 >          depends="dist"
317            description="Builds all public jars and docs"/>
318  
319    <target name="compile"
320            depends="configure-compiler"
321            description="Compiles src/main sources to build dir">
322  
370    <local name="modules"/>
371    <condition property="modules">
372      <and>
373        <available file="${jdk9.home}/jmods" type="dir"/>
374        <equals arg1="9" arg2="${build.main.java.version}"/>
375      </and>
376    </condition>
377
323      <local name="destdir"/>
324 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
380 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
324 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
325  
326      <mkdir dir="${destdir}"/>
327  
# Line 389 | Line 333
333             classpath=""
334             includeAntRuntime="false"
335             includeJavaRuntime="false"
336 +           encoding="ASCII"
337             executable="${build.main.javac}"
338             fork="true">
339  
340        <include name="**/*.java"/>
341 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
341 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
342        <compilerarg value="-Xprefer:source"/>
343        <compilerarg value="-XDignore.symbol.file=true"/>
344 <      <compilerarg value="-Xlint:all"/>
344 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
345 >      <compilerarg value="-Xlint:all,-removal"/>
346 >      <compilerarg line="--doclint-format html5"/>
347 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
348 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
349        <compilerarg value="-Werror"/>
401      <compilerarg value="-Xdoclint:all/protected"/>
350        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351        <compilerarg line="${build.args}"/>
352  
353      </javac>
406
407    <!-- We need jdk9's Contended annotation, but at compile time only -->
408    <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
354    </target>
355  
356  
357    <target name="jar"
358            depends="compile"
359 <          description="Builds library jar from compiled sources">
360 <
359 >          description="Builds library jar for src/main from compiled sources">
360 >    <local name="subdir"/>
361 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
362      <jar destfile="${product.jar}">
363 <      <fileset dir="${build.classes.dir}"/>
363 >      <fileset dir="${build.classes.dir}${subdir}"/>
364        <manifest>
365          <attribute name="Built-By" value="${user.name}"/>
366          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 429 | Line 375
375      <delete dir="${docs.dir}"/>
376      <mkdir dir="${docs.dir}"/>
377  
378 +    <!-- old school frames via docs/index.html?overview-summary.html -->
379 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
380 +    <local name="use-frames"/>
381 +    <condition property="use-frames">
382 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
383 +    </condition>
384 +
385      <!-- the packagenames="none" hack below prevents scanning the -->
386      <!-- sourcepath for packages -->
387  
388 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
389 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
390 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
391 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
392 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
393      <javadoc destdir="${docs.dir}"
394               packagenames="none"
395 <             link="${java9.api.url}"
395 >             link="${java.api.url}"
396               overview="${src.dir}/intro.html"
397               access="${build.javadoc.access}"
398 <             sourcepath="${src.dir}:${jdk9.src.dir}"
398 >             sourcepath="${src.dir}"
399               classpath=""
400 <             executable="${javadoc9}">
400 >             source="${build.main.javadoc.source}"
401 >             executable="${build.main.javadoc}">
402 > <!-- TODO: JDK-8214571 failonerror = "true" -->
403        <fileset dir="${src.dir}" defaultexcludes="yes">
404          <include name="**/*.java"/>
405        </fileset>
406 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
406 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
407        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
408        <arg value="-XDignore.symbol.file=true"/>
409 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
410 <      <arg value="-tag"/>
411 <      <arg value="${javadoc.jls.option}"/>
412 <      <arg value="-tag"/>
413 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
414 <      <arg value="-tag"/>
415 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
416 <      <arg value="-tag"/>
417 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
418 < <!-- tags added in jdk9 -->
419 <      <arg value="-tag"/>
460 <      <arg value="revised:X"/>
461 <      <arg value="-tag"/>
462 <      <arg value="spec:X"/>
409 >      <arg value="-html5"/>
410 >      <arg value="--patch-module=java.base=${src.dir}"/>
411 >      <arg value="--frames" if:set="use-frames"/>
412 >      <arg value="--override-methods=summary"/>
413 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
414 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
415 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
416 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
417 > <!-- tags added in jdk9: currently unused -->
418 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
419 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
420      </javadoc>
421    </target>
422  
# Line 469 | Line 426
426            description="Puts all distributable products in single hierarchy"/>
427  
428  
472  <target name="release"
473          depends="dist"
474          description="Puts entire CVS tree, plus distribution productions, in a jar">
475
476    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
477
478    <jar basedir="${basedir}" destfile="${release.jar}">
479      <!-- <exclude name="build/**"/> -->
480      <exclude name="${release.jar}"/>
481      <exclude name="user.properties"/>
482      <exclude name="etc/notes/**"/>
483      <exclude name="src/emulation/**"/>
484      <exclude name="**/SyntaxTest.java"/>
485      <exclude name="**/SuperfluousAbstract.java"/>
486      <manifest>
487        <attribute name="Built-By" value="${user.name}"/>
488        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
489      </manifest>
490    </jar>
491  </target>
492
493
429    <target name="clean"
430            description="Removes all build products">
496
431      <delete dir="${build.dir}"/>
498
432    </target>
433  
434  
435    <target name="dist-clean"
436            description="Removes all build and distribution products">
504
437      <delete dir="${build.dir}"/>
438      <delete dir="${dist.dir}"/>
507
439    </target>
440  
441  
# Line 519 | Line 450
450    </target>
451  
452    <target name="tck"
453 <          depends="jar"
454 <          description="Runs tck tests for main directly">
453 >          depends="jar"
454 >          description="Runs tck tests for src/main directly">
455  
456      <run-tck-tests
457 <      target="${build.main.java.version}"
457 >      target="${java.runtime.target}"
458        workdir="${build.dir}"
459 <      classes="${product.jar}"/>
459 >      classes="${product.jar}">
460 >      <javac-elements>
461 >        <compilerarg value="-Werror"/>
462 >      </javac-elements>
463 >    </run-tck-tests>
464    </target>
465  
466    <target name="tck-parallelism-1"
467 <          description="Runs tck with given common pool parallelism">
467 >          description="Runs tck with common pool parallelism 1">
468      <antcall target="tck">
469        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
470      </antcall>
471    </target>
472  
473    <target name="tck-parallelism-0"
474 <          description="Runs tck with given common pool parallelism">
474 >          description="Runs tck with common pool parallelism 0">
475      <antcall target="tck">
476        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
477      </antcall>
478    </target>
479  
480 +  <target name="tck-security-manager"
481 +          description="Runs tck with a security manager">
482 +    <antcall target="tck">
483 +      <param name="jsr166.useSecurityManager" value="true"/>
484 +    </antcall>
485 +  </target>
486 +
487    <target name="jtreg"
488 <          depends="jar"
489 <          description="Runs jtreg tests for main using the jtreg ant task">
488 >          depends="jar"
489 >          description="Runs jtreg tests for src/main using the jtreg ant task">
490      <run-jtreg-tests
491 <       target="${build.main.java.version}"
491 >       target="${java.runtime.target}"
492         workdir="${build.dir}"
493         classes="${product.jar}"/>
494    </target>
495  
496    <target name="test"
497 <          depends="tck, tck-parallelism-1, jtreg"
498 <          description="Runs tck and jtreg tests for main">
557 <  </target>
497 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
498 >          description="Runs tck and jtreg tests for src/main"/>
499  
500 <  <target name="jtreg8" description="Runs jtreg tests with jdk8">
500 >  <target name="test-version-permutations"
501 >          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
502 >  </target>
503  
504 <    <antcall target="jtreg">
505 <      <param name="build.main.java.version" value="8"/>
506 <      <param name="build.main.javac" value="${javac8}"/>
504 >  <target name="test11">
505 >    <antcall>
506 >      <param name="java.runtime.target" value="11"/>
507 >      <param name="build.main.javac" value="${javac11}"/>
508 >      <param name="build.main.javadoc" value="${javadoc12}"/>
509 >      <param name="build.main.javadoc.source" value="11"/>
510 >      <target name="clean"/>
511 >      <target name="test"/>
512 >      <target name="docs"/>
513      </antcall>
514 +  </target>
515  
516 +  <target name="test12">
517 +    <antcall>
518 +      <param name="java.runtime.target" value="12"/>
519 +      <param name="build.main.javac" value="${javac12}"/>
520 +      <param name="build.main.javadoc" value="${javadoc12}"/>
521 +      <param name="build.main.javadoc.source" value="12"/>
522 +      <target name="clean"/>
523 +      <target name="test"/>
524 +      <target name="docs"/>
525 +    </antcall>
526    </target>
527  
528 <  <target name="test89"
529 <          description="Runs tck and jtreg tests for main for multiple java versions">
528 >  <target name="test13">
529 >    <antcall>
530 >      <param name="java.runtime.target" value="13"/>
531 >      <param name="build.main.javac" value="${javac13}"/>
532 >      <param name="build.main.javadoc" value="${javadoc13}"/>
533 >      <param name="build.main.javadoc.source" value="13"/>
534 >      <target name="clean"/>
535 >      <target name="test"/>
536 >      <target name="docs"/>
537 >    </antcall>
538 >  </target>
539  
540 <    <antcall target="clean"/>
541 <    <antcall target="test">
542 <      <param name="build.main.java.version" value="8"/>
543 <      <param name="build.main.javac" value="${javac8}"/>
540 >  <target name="test14">
541 >    <antcall>
542 >      <param name="java.runtime.target" value="14"/>
543 >      <param name="build.main.javac" value="${javac14}"/>
544 >      <param name="build.main.javadoc" value="${javadoc14}"/>
545 >      <param name="build.main.javadoc.source" value="14"/>
546 >      <target name="clean"/>
547 >      <target name="test"/>
548 >      <target name="docs"/>
549      </antcall>
550 +  </target>
551  
552 <    <antcall target="clean"/>
553 <    <antcall target="test">
554 <      <param name="build.main.java.version" value="9"/>
555 <      <param name="build.main.javac" value="${javac9}"/>
552 >  <target name="test11-12">
553 >    <antcall>
554 >      <param name="java.runtime.target" value="12"/>
555 >      <param name="build.main.javac" value="${javac11}"/>
556 >      <param name="build.main.javadoc" value="${javadoc12}"/>
557 >      <param name="build.main.javadoc.source" value="11"/>
558 >      <target name="clean"/>
559 >      <target name="test"/>
560 >      <target name="docs"/>
561      </antcall>
562 +  </target>
563  
564 +  <target name="test11-13">
565 +    <antcall>
566 +      <param name="java.runtime.target" value="13"/>
567 +      <param name="build.main.javac" value="${javac11}"/>
568 +      <param name="build.main.javadoc" value="${javadoc13}"/>
569 +      <param name="build.main.javadoc.source" value="11"/>
570 +      <target name="clean"/>
571 +      <target name="test"/>
572 +      <target name="docs"/>
573 +    </antcall>
574    </target>
575  
576 +  <target name="test11-14">
577 +    <antcall>
578 +      <param name="java.runtime.target" value="14"/>
579 +      <param name="build.main.javac" value="${javac11}"/>
580 +      <param name="build.main.javadoc" value="${javadoc14}"/>
581 +      <param name="build.main.javadoc.source" value="11"/>
582 +      <target name="clean"/>
583 +      <target name="test"/>
584 +      <target name="docs"/>
585 +    </antcall>
586 +  </target>
587  
588  
589    <target name="configure-compiler">
590      <fail message="ant version too old">
591 <      <condition>
590 <        <not> <antversion atleast="1.9.1"/> </not>
591 <      </condition>
591 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
592      </fail>
593  
594      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 606 | Line 606
606    </target>
607  
608  
609
610  <!-- Various demos and test programs -->
611
612
613  <target name="loops" depends="configure-compiler"
614          description="Benchmark from Doug Lea's AQS paper">
615
616    <mkdir dir="${build.loops.dir}"/>
617
618    <javac srcdir="${loops.src.dir}"
619          destdir="${build.loops.dir}"
620            debug="${build.debug}"
621       debuglevel="${build.debuglevel}"
622      deprecation="${build.deprecation}"
623           source="${build.sourcelevel}"
624           target="${build.sourcelevel}"
625             fork="true">
626
627      <compilerarg line="${build.args}"/>
628      <classpath refid="loops.classpath"/>
629      <compilerarg value="-XDignore.symbol.file=true"/>
630
631    </javac>
632
633    <java classname="ALoops" fork="true">
634      <classpath refid="loops.classpath"/>
635    </java>
636
637  </target>
638
639
609    <target name="compile-test-loops" depends="jar"
610 <          description="compile all the perf tests in src/test/loops">
610 >          description="Compiles all the perf tests in src/test/loops">
611  
612      <mkdir dir="${build.dir}/test/loops"/>
613  
# Line 649 | Line 618
618             deprecation="${build.deprecation}"
619             includeAntRuntime="false"
620             includeJavaRuntime="false"
621 <           executable="${javac9}"
621 >           encoding="ASCII"
622 >           executable="${build.main.javac}"
623             fork="true">
624  
625        <include name="*.java"/>
626        <compilerarg value="-XDignore.symbol.file=true"/>
627 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
628 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
627 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
628 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
629        <compilerarg line="${build.args}"/>
660
630      </javac>
662
663  </target>
664
665
666  <!-- jsr166 4jdk8 -->
667
668  <target name="4jdk8compile"
669          depends="configure-compiler"
670          description="Compiles src/jdk8 sources, targeting jdk8">
671
672    <mkdir dir="${build.4jdk8.classes.dir}"/>
673
674    <javac srcdir="${4jdk8src.dir}"
675           destdir="${build.4jdk8.classes.dir}"
676           debug="${build.debug}"
677           debuglevel="${build.debuglevel}"
678           deprecation="${build.deprecation}"
679           source="8"
680           target="8"
681           classpath=""
682           bootclasspath="${bootclasspath8}"
683           includeAntRuntime="false"
684           includeJavaRuntime="false"
685           executable="${javac8}"
686           fork="true">
687
688      <include name="**/*.java"/>
689      <compilerarg value="-Xprefer:source"/>
690      <compilerarg value="-XDignore.symbol.file=true"/>
691      <compilerarg value="-Xlint:all"/>
692      <compilerarg value="-Werror"/>
693      <compilerarg line="${build.args}"/>
694
695    </javac>
696  </target>
697
698  <target name="4jdk8doclint"
699          depends="configure-compiler"
700          description="Finds doclint warnings">
701
702    <mkdir dir="${build.4jdk8.classes.dir}"/>
703
704    <javac srcdir="${4jdk8src.dir}"
705           destdir="${build.4jdk8.classes.dir}"
706           debug="${build.debug}"
707           debuglevel="${build.debuglevel}"
708           deprecation="${build.deprecation}"
709           source="8"
710           target="8"
711           classpath=""
712           bootclasspath="${bootclasspath8}"
713           includeAntRuntime="false"
714           includeJavaRuntime="false"
715           executable="${javac8}"
716           fork="true">
717
718      <include name="**/*.java"/>
719      <compilerarg value="-Xprefer:source"/>
720      <compilerarg value="-XDignore.symbol.file=true"/>
721      <compilerarg value="-Xlint:all"/>
722      <compilerarg value="-Xdoclint:all/protected"/>
723      <compilerarg line="${build.args}"/>
724
725    </javac>
726  </target>
727
728
729  <target name="4jdk8jar"
730          depends="4jdk8compile"
731          description="Builds library jar from compiled sources">
732
733    <jar destfile="${4jdk8product.jar}">
734      <fileset dir="${build.4jdk8.classes.dir}"/>
735      <manifest>
736        <attribute name="Built-By" value="${user.name}"/>
737        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
738      </manifest>
739    </jar>
740
631    </target>
632  
633  
634 <  <target name="4jdk8-tck"
635 <          depends="4jdk8jar"
636 <          description="Runs tck tests for jsr166-4jdk8 directly">
634 >  <!-- old branches no longer maintained.  build support deleted -->
635 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
636 >  <!-- jsr166 4jdk7 (no longer maintained) -->
637 >  <!-- jsr166x (no longer maintained) -->
638 >  <!-- jsr166y (no longer maintained) -->
639 >  <!-- extra166y (no longer maintained) -->
640 >  <!-- jsr166e (no longer maintained) -->
641  
642 <    <run-tck-tests
749 <      target="8"
750 <      workdir="${build.4jdk8.dir}"
751 <      classes="${4jdk8product.jar}">
752 <      <javac-elements>
753 <        <!-- JDK9+ test classes -->
754 <        <exclude name="*9Test.java"/>
755 <        <exclude name="*10Test.java"/>
756 <      </javac-elements>
757 <    </run-tck-tests>
758 <  </target>
759 <
760 <
761 <  <target name="4jdk8-jtreg"
762 <          depends="4jdk8jar"
763 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
764 <    <run-jtreg-tests
765 <       target="8"
766 <       workdir="${build.4jdk8.dir}"
767 <       classes="${4jdk8product.jar}"/>
768 <  </target>
769 <
770 <
771 <  <target name="4jdk8-test"
772 <          depends="4jdk8-tck, 4jdk8-jtreg"
773 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
774 <  </target>
775 <
776 <
777 <  <target name="4jdk8docs"
778 <          description="Builds javadocs for src/jdk8 to dist dir">
779 <
780 <    <delete dir="${4jdk8docs.dir}"/>
781 <    <mkdir dir="${4jdk8docs.dir}"/>
782 <
783 <    <javadoc destdir="${4jdk8docs.dir}"
784 <             packagenames="none"
785 <             link="${java8.api.url}"
786 <             overview="${4jdk8src.dir}/intro.html"
787 <             access="${build.javadoc.access}"
788 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
789 <             classpath=""
790 <             executable="${javadoc8}">
791 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
792 <        <include name="**/*.java"/>
793 <      </fileset>
794 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
795 <      <arg value="-XDignore.symbol.file=true"/>
796 <      <arg value="-tag"/>
797 <      <arg value="${javadoc.jls.option}"/>
798 <      <arg value="-tag"/>
799 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
800 <      <arg value="-tag"/>
801 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
802 <      <arg value="-tag"/>
803 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
804 <    </javadoc>
805 <  </target>
806 <
807 <
808 <  <target name="4jdk8dist"
809 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
810 <          description="Puts all distributable products in single hierarchy"/>
811 <
812 <
813 <  <target name="4jdk8clean"
814 <          description="Removes all 4jdk8 build products">
815 <
816 <    <delete dir="${build.4jdk8.dir}"/>
817 <
818 <  </target>
819 <
820 <
821 <  <target name="4jdk8dist-jar"
822 <          depends="4jdk8clean, 4jdk8jar">
823 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
824 <  </target>
642 > <!-- Find buglets that can be detected by static build tools -->
643  
644 + <!--   <target name="lint"> -->
645 + <!--     <antcall target="dists"> -->
646 + <!--       <param name="build.javadoc.access" value="protected"/> -->
647 + <!--     </antcall> -->
648 + <!--   </target> -->
649  
650 <  <target name="4jdk8dist-docs"
651 <          depends="4jdk8clean, 4jdk8docs">
652 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
650 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
651 >  <target name="doclint-private">
652 >    <antcall target="dist">
653 >      <param name="build.javadoc.access" value="private"/>
654 >    </antcall>
655    </target>
656  
657  
658 + <!-- ==============================================================
659 +  Experimental errorprone support
660 +  https://errorprone.info
661 +  https://errorprone.info/docs/installation
662 +  https://github.com/google/error-prone/issues/1143
663 + =================================================================== -->
664 +  <path id="errorprone.processorpath.path">
665 +    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
666 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
667 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
668 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
669 +  </path>
670 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
671 +  <property name="errorprone.jsr166.user.flags" value=""/>
672 +  <property name="errorprone.jsr166.flags"
673 +            value="-Xep:HashtableContains:OFF
674 +                   -Xep:JdkObsolete:OFF
675 +                   -Xep:MissingOverride:OFF
676 +                   -Xep:MissingFail:OFF
677 +                   -Xep:ThreadPriorityCheck:OFF
678 +                   -Xep:MixedArrayDimensions:ERROR
679 +                   -Xep:RemoveUnusedImports:ERROR
680 +                   -Xep:EmptyIf:ERROR
681 +                   -Xep:MultipleTopLevelClasses:ERROR
682 +                   -Xep:ClassName:ERROR
683 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
684 +                   -Xep:RedundantThrows:ERROR
685 +                   -Xep:IdentityBinaryExpression:WARN
686 +                   -Xep:ConstructorInvokesOverridable:WARN
687 +                   -Xep:MethodCanBeStatic:WARN
688 +                   ${errorprone.jsr166.user.flags}"/>
689 +  <!-- -Xep:WildcardImport:ERROR -->
690 +  <property name="errorprone.jsr166.test.flags"
691 +            value="-Xep:StringSplitter:OFF
692 +                   -Xep:BoxedPrimitiveConstructor:OFF
693 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
694 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
695 +  <target name="errorprone"
696 +          depends="clean, configure-compiler"
697 +          description="Run errorprone over jsr166 source code (experimental)">
698  
699 <  <!-- jsr166 4jdk7 -->
700 <
701 <  <target name="4jdk7compile"
837 <          depends="configure-compiler"
838 <          description="Compiles src/jdk7 sources, targeting jdk7">
839 <
840 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
841 <
842 <    <javac srcdir="${4jdk7src.dir}"
843 <           destdir="${build.4jdk7.classes.dir}"
844 <           debug="${build.debug}"
845 <           debuglevel="${build.debuglevel}"
846 <           deprecation="${build.deprecation}"
847 <           source="6"
848 <           target="6"
849 <           classpath=""
850 <           bootclasspath="${bootclasspath6}"
851 <           includeAntRuntime="false"
852 <           includeJavaRuntime="false"
853 <           executable="${javac7}"
854 <           fork="true">
855 <
856 <      <include name="**/*.java"/>
857 <      <compilerarg value="-Xprefer:source"/>
858 <      <compilerarg value="-XDignore.symbol.file=true"/>
859 <      <compilerarg value="-Xlint:all"/>
860 <      <compilerarg value="-Werror"/>
861 <      <compilerarg line="${build.args}"/>
862 <
863 <    </javac>
864 <  </target>
865 <
866 <  <target name="4jdk7doclint"
867 <          depends="configure-compiler"
868 <          description="Finds doclint warnings">
869 <
870 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
699 >    <local name="destdir"/>
700 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
701 >    <mkdir dir="${destdir}"/>
702  
703 <    <javac srcdir="${4jdk7src.dir}"
704 <           destdir="${build.4jdk7.classes.dir}"
703 >    <javac srcdir="${src.dir}"
704 >           destdir="${destdir}"
705             debug="${build.debug}"
706             debuglevel="${build.debuglevel}"
707             deprecation="${build.deprecation}"
877           source="6"
878           target="6"
708             classpath=""
880           bootclasspath="${bootclasspath6}"
709             includeAntRuntime="false"
710             includeJavaRuntime="false"
711 <           executable="${javac8}"
711 >           encoding="ASCII"
712 >           executable="${build.main.javac}"
713             fork="true">
714  
715        <include name="**/*.java"/>
716 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
717 +      <compilerarg value="-J--illegal-access=permit"/>
718 +      <compilerarg value="-XDcompilePolicy=simple"/>
719 +      <compilerarg value="-processorpath"/>
720 +      <compilerarg pathref="errorprone.processorpath.path"/>
721 +      <compilerarg value="-Xplugin:ErrorProne
722 +                          ${errorprone.jsr166.flags}"/>
723 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
724        <compilerarg value="-Xprefer:source"/>
725        <compilerarg value="-XDignore.symbol.file=true"/>
726        <compilerarg value="-Xlint:all"/>
727 <      <compilerarg value="-Xdoclint:all/protected"/>
727 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
728 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
729        <compilerarg line="${build.args}"/>
892
730      </javac>
894  </target>
731  
732 <
733 <  <target name="4jdk7jar"
898 <          depends="4jdk7compile"
899 <          description="Builds library jar from compiled sources">
900 <
901 <    <jar destfile="${4jdk7product.jar}">
902 <      <fileset dir="${build.4jdk7.classes.dir}"/>
903 <      <manifest>
904 <        <attribute name="Built-By" value="${user.name}"/>
905 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
906 <      </manifest>
732 >    <jar destfile="${product.jar}">
733 >      <fileset dir="${destdir}"/>
734      </jar>
735  
909  </target>
910
911
912  <target name="4jdk7-tck"
913          depends="4jdk7jar"
914          description="Runs tck tests for jsr166-4jdk7 directly">
915
736      <run-tck-tests
737 <      target="7"
738 <      workdir="${build.4jdk7.dir}"
739 <      classes="${4jdk7product.jar}">
737 >      target="${java.runtime.target}"
738 >      workdir="${build.dir}"
739 >      classes="${product.jar}">
740        <javac-elements>
741 <        <!-- JDK8+ test classes -->
742 <        <exclude name="*8Test.java"/>
743 <        <exclude name="*9Test.java"/>
744 <        <exclude name="*10Test.java"/>
745 <        <exclude name="DoubleAccumulatorTest.java"/>
746 <        <exclude name="DoubleAdderTest.java"/>
747 <        <exclude name="LongAccumulatorTest.java"/>
748 <        <exclude name="LongAdderTest.java"/>
929 <        <exclude name="CompletableFutureTest.java"/>
930 <        <exclude name="SplittableRandomTest.java"/>
931 <        <exclude name="StampedLockTest.java"/>
932 <        <exclude name="SubmissionPublisherTest.java"/>
741 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
742 >        <compilerarg value="-J--illegal-access=permit"/>
743 >        <compilerarg value="-XDcompilePolicy=simple"/>
744 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
745 >        <compilerarg value="-Xplugin:ErrorProne
746 >                            ${errorprone.jsr166.flags}
747 >                            ${errorprone.jsr166.test.flags}"/>
748 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
749        </javac-elements>
750      </run-tck-tests>
751    </target>
752  
753 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
754 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
755 +  <target name="errorprone-jtreg"
756 +          depends="jar"
757 +          description="Run errorprone over jtreg tests (experimental)">
758  
759 <  <target name="4jdk7-tck-junit"
760 <          depends="4jdk7compile"
761 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
762 <
763 <    <junit printsummary="true"
764 <           showoutput="true"
765 <           errorProperty="junit.failed"
766 <           failureProperty="junit.failed"
767 <           includeantruntime="true"
768 <           jvm="${java7}"
769 <           fork="true">
770 <
771 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
772 <      <jvmarg value="-server"/>
773 <
759 >    <run-jtreg-tests
760 >       target="${java.runtime.target}"
761 >       workdir="${build.dir}"
762 >       classes="${product.jar}"
763 >       verbose="all">
764 >      <jtreg-elements>
765 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
766 >        <arg value="-javacoption:-processorpath"/>
767 >        <arg value="-javacoption:${errorprone.processorpath}"/>
768 >        <arg value="-javacoption:-Xplugin:ErrorProne
769 >                            ${errorprone.jsr166.flags}
770 >                            ${errorprone.jsr166.test.flags}
771 >                            -Xep:MultipleTopLevelClasses:WARN
772 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
773 >      </jtreg-elements>
774 >    </run-jtreg-tests>
775 >  </target>
776 >
777 >
778 > <!-- ==============================================================
779 >  Running guava tests against jsr166 code
780 > =================================================================== -->
781 >
782 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
783 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
784 > <!-- <property name="guava.version" value="21.0"/> -->
785 >
786 > <!-- HOWTO debug print a path id -->
787 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
788 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
789 >
790 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
791 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
792 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
793 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
794 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
795 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
796 >
797 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
798 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
799 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
800 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
801 >
802 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
803 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
804 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
805 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
806 >
807 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
808 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
809 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
810 >
811 >  <target name="init-ivy">
812 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
813 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
814 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
815 >             classpath="${build.dir}/ivy.jar"/>
816 >  </target>
817 >
818 >  <target name="guava-tests" depends="jar, init-ivy"
819 >          description="Guava tests run against jsr166 collections">
820 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
821 >    <mkdir dir="${guava.dir}"/>
822 >    <ivy:retrieve pathid="guava.testlib.classpath"
823 >      type="jar,bundle" inline="true" conf="default,master"
824 >      pattern="${guava.dir}/[artifact].[ext]"
825 >      organisation="com.google.guava" module="guava-testlib"/>
826 >    <property name="guava.version" value="21.0"/>
827 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
828 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
829 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
830 >           jvm="${build.main.java}" fork="true">
831 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
832 >      <formatter type="brief"/>
833        <classpath>
834 <        <pathelement location="${junit.jar}"/>
835 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
834 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
835 >        <path refid="guava.testlib.classpath"/>
836        </classpath>
837  
838 <      <formatter type="brief"/>
839 <
960 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
961 <      </test>
962 <
838 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
839 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
840      </junit>
841    </target>
842  
966  <target name="4jdk7-jtreg"
967          depends="4jdk7jar"
968          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
969    <run-jtreg-tests
970       target="7"
971       workdir="${build.4jdk7.dir}"
972       classes="${4jdk7product.jar}"/>
973  </target>
974
975
976  <target name="4jdk7-test"
977          depends="4jdk7-tck, 4jdk7-jtreg"
978          description="Runs tck and jtreg tests for jsr166-4jdk7">
979  </target>
980
981
982  <target name="4jdk7docs"
983          description="Builds javadocs for src/jdk7 to dist dir">
984
985    <delete dir="${4jdk7docs.dir}"/>
986    <mkdir dir="${4jdk7docs.dir}"/>
987
988    <javadoc destdir="${4jdk7docs.dir}"
989             packagenames="none"
990             link="${java7.api.url}"
991             overview="${4jdk7src.dir}/intro.html"
992             access="${build.javadoc.access}"
993             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
994             classpath=""
995             executable="${javadoc7}">
996      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
997        <include name="**/*.java"/>
998      </fileset>
999      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1000      <arg value="-XDignore.symbol.file=true"/>
1001    </javadoc>
1002  </target>
1003
1004
1005  <target name="4jdk7dist"
1006          depends="4jdk7dist-jar, 4jdk7dist-docs"
1007          description="Puts all distributable products in single hierarchy"/>
1008
1009
1010  <target name="4jdk7clean"
1011          description="Removes all 4jdk7 build products">
1012
1013    <delete dir="${build.4jdk7.dir}"/>
1014
1015  </target>
1016
1017
1018  <target name="4jdk7dist-jar"
1019          depends="4jdk7clean, 4jdk7jar">
1020    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1021  </target>
1022
1023
1024  <target name="4jdk7dist-docs"
1025          depends="4jdk7clean, 4jdk7docs">
1026    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1027  </target>
1028
1029
1030  <!-- jsr166x -->
1031
1032  <target name="jsr166xcompile"
1033          depends="configure-compiler"
1034          description="Compiles jsr166x sources to build dir">
1035
1036    <mkdir dir="${build.jsr166x.classes.dir}"/>
1037
1038    <javac srcdir="${topsrc.dir}"
1039           destdir="${build.jsr166x.classes.dir}"
1040           debug="${build.debug}"
1041           debuglevel="${build.debuglevel}"
1042           deprecation="${build.deprecation}"
1043           classpath=""
1044           bootclasspath="${bootclasspath6}"
1045           source="5"
1046           target="5"
1047           includeAntRuntime="false"
1048           includeJavaRuntime="false"
1049           executable="${javac7}"
1050           fork="true">
1051
1052      <include name="jsr166x/**/*.java"/>
1053      <compilerarg value="-XDignore.symbol.file=true"/>
1054      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1055      <compilerarg value="-Werror"/>
1056      <compilerarg line="${build.args}"/>
1057
1058    </javac>
1059  </target>
1060
1061
1062  <target name="jsr166xjar"
1063          depends="jsr166xcompile"
1064          description="Builds library jar from compiled sources">
1065
1066    <jar destfile="${jsr166x.jar}">
1067      <fileset dir="${build.jsr166x.classes.dir}"/>
1068      <manifest>
1069        <attribute name="Built-By" value="${user.name}"/>
1070        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1071      </manifest>
1072    </jar>
1073
1074  </target>
1075
1076
1077  <target name="jsr166xdocs"
1078          description="Builds javadocs to dist dir">
1079
1080    <delete dir="${jsr166xdocs.dir}"/>
1081    <mkdir dir="${jsr166xdocs.dir}"/>
1082
1083    <javadoc destdir="${jsr166xdocs.dir}"
1084             packagenames="jsr166x.*"
1085             link="${java.api.url}"
1086             access="${build.javadoc.access}"
1087             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1088             bootclasspath="${bootclasspath6}"
1089             source="5"
1090             executable="${javadoc7}">
1091      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1092      <arg value="-XDignore.symbol.file=true"/>
1093
1094    </javadoc>
1095  </target>
1096
1097
1098  <target name="jsr166xdist"
1099          depends="jsr166xdist-jar, jsr166xdist-docs"
1100          description="Puts all distributable products in single hierarchy"/>
1101
1102
1103  <target name="jsr166xclean"
1104          description="Removes all jsr166x build products">
1105
1106    <delete dir="${build.jsr166x.dir}"/>
1107
1108  </target>
1109
1110
1111  <target name="jsr166xdist-jar"
1112          depends="jsr166xclean, jsr166xjar">
1113    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1114  </target>
1115
1116  <target name="jsr166xdist-docs"
1117          depends="jsr166xclean, jsr166xdocs">
1118    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1119  </target>
1120
1121  <!-- jsr166y -->
1122
1123
1124  <target name="jsr166ycompile"
1125          depends="configure-compiler"
1126          description="Compiles jsr166y sources">
1127
1128    <mkdir dir="${build.jsr166y.classes.dir}"/>
1129
1130    <javac srcdir="${topsrc.dir}"
1131           destdir="${build.jsr166y.classes.dir}"
1132           debug="${build.debug}"
1133           debuglevel="${build.debuglevel}"
1134           deprecation="${build.deprecation}"
1135           source="6"
1136           target="6"
1137           classpath=""
1138           bootclasspath="${bootclasspath6}"
1139           includeAntRuntime="false"
1140           includeJavaRuntime="false"
1141           executable="${javac7}"
1142           fork="true">
1143
1144      <include name="jsr166y/**/*.java"/>
1145      <compilerarg value="-XDignore.symbol.file=true"/>
1146      <compilerarg value="-Xlint:all"/>
1147      <compilerarg value="-Werror"/>
1148      <compilerarg line="${build.args}"/>
1149
1150    </javac>
1151  </target>
1152
1153
1154  <target name="jsr166yjar"
1155          depends="jsr166ycompile"
1156          description="Builds library jar from compiled sources">
1157
1158    <jar destfile="${jsr166y.jar}" index="true">
1159      <fileset dir="${build.jsr166y.classes.dir}"/>
1160      <manifest>
1161        <attribute name="Built-By" value="${user.name}"/>
1162        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1163      </manifest>
1164    </jar>
1165
1166  </target>
1167
1168
1169  <target name="jsr166ydocs"
1170          description="Builds javadocs to dist dir">
1171
1172    <delete dir="${jsr166ydocs.dir}"/>
1173    <mkdir dir="${jsr166ydocs.dir}"/>
1174
1175    <javadoc destdir="${jsr166ydocs.dir}"
1176             packagenames="jsr166y.*"
1177             link="${java.api.url}"
1178             access="${build.javadoc.access}"
1179             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1180             bootclasspath="${bootclasspath6}"
1181             source="6"
1182             executable="${javadoc7}">
1183      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1184      <arg value="-XDignore.symbol.file=true"/>
1185
1186    </javadoc>
1187  </target>
1188
1189
1190  <target name="jsr166ydist"
1191          depends="jsr166ydist-jar, jsr166ydist-docs"
1192          description="Puts all distributable products in single hierarchy"/>
1193
1194
1195  <target name="jsr166yclean"
1196          description="Removes all jsr166y build products">
1197
1198    <delete dir="${build.jsr166y.dir}"/>
1199
1200  </target>
1201
1202
1203  <target name="jsr166ydist-jar"
1204          depends="jsr166yclean, jsr166yjar">
1205    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1206  </target>
1207
1208  <target name="jsr166ydist-docs"
1209          depends="jsr166yclean, jsr166ydocs">
1210    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1211  </target>
1212
1213
1214  <!-- extra166y -->
1215
1216
1217  <target name="extra166ycompile"
1218          depends="configure-compiler, jsr166yjar"
1219          description="Compiles extra166y sources">
1220
1221    <mkdir dir="${build.extra166y.classes.dir}"/>
1222
1223    <javac srcdir="${topsrc.dir}"
1224           destdir="${build.extra166y.classes.dir}"
1225           debug="${build.debug}"
1226           debuglevel="${build.debuglevel}"
1227           deprecation="${build.deprecation}"
1228           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1229           classpath=""
1230           source="6"
1231           target="6"
1232           includeAntRuntime="false"
1233           includeJavaRuntime="false"
1234           executable="${javac7}"
1235           fork="true">
1236
1237      <include name="extra166y/**/*.java"/>
1238      <compilerarg value="-XDignore.symbol.file=true"/>
1239      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1240      <compilerarg value="-Werror"/>
1241      <compilerarg line="${build.args}"/>
1242
1243    </javac>
1244  </target>
1245
1246
1247  <target name="extra166yjar"
1248          depends="extra166ycompile"
1249          description="Builds library jar from compiled sources">
1250
1251    <jar destfile="${extra166y.jar}" index="true">
1252      <fileset dir="${build.extra166y.classes.dir}"/>
1253      <manifest>
1254        <attribute name="Built-By" value="${user.name}"/>
1255        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1256      </manifest>
1257    </jar>
1258
1259  </target>
1260
1261
1262  <target name="extra166ydocs"
1263          description="Builds javadocs to build dir">
1264
1265    <delete dir="${extra166ydocs.dir}"/>
1266    <mkdir dir="${extra166ydocs.dir}"/>
1267
1268    <javadoc destdir="${extra166ydocs.dir}"
1269             packagenames="extra166y.*"
1270             link="${java.api.url}"
1271             access="${build.javadoc.access}"
1272             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1273             bootclasspath="${bootclasspath6}"
1274             source="6"
1275             executable="${javadoc7}">
1276      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1277      <arg value="-XDignore.symbol.file=true"/>
1278
1279    </javadoc>
1280  </target>
1281
1282
1283  <target name="extra166ydist"
1284          depends="extra166ydist-jar, extra166ydist-docs"
1285          description="Puts all distributable products in single hierarchy"/>
1286
1287
1288  <target name="extra166yclean"
1289          description="Removes all extra166y build products">
1290
1291    <delete dir="${build.extra166y.dir}"/>
1292
1293  </target>
1294
1295
1296  <target name="extra166ydist-jar"
1297          depends="extra166yclean, extra166yjar">
1298    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1299  </target>
1300
1301  <target name="extra166ydist-docs"
1302          depends="extra166yclean, extra166ydocs">
1303    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1304  </target>
1305
1306  <!-- jsr166e -->
1307
1308  <property name="build.jsr166e.java.version" value="6"/>
1309  <property name="build.jsr166e.javac" value="${javac6}"/>
1310
1311  <target name="jsr166ecompile"
1312          depends="configure-compiler"
1313          description="Compiles jsr166e sources">
1314
1315    <mkdir dir="${build.jsr166e.classes.dir}"/>
1316
1317    <javac srcdir="${topsrc.dir}"
1318           destdir="${build.jsr166e.classes.dir}"
1319           debug="${build.debug}"
1320           debuglevel="${build.debuglevel}"
1321           deprecation="${build.deprecation}"
1322           source="${build.jsr166e.java.version}"
1323           target="${build.jsr166e.java.version}"
1324           classpath=""
1325           includeAntRuntime="false"
1326           includeJavaRuntime="false"
1327           executable="${build.jsr166e.javac}"
1328           fork="true">
1329
1330      <include name="jsr166e/**/*.java"/>
1331      <compilerarg value="-XDignore.symbol.file=true"/>
1332      <compilerarg value="-Xlint:all"/>
1333      <compilerarg value="-Werror"/>
1334      <compilerarg line="${build.args}"/>
1335
1336    </javac>
1337  </target>
1338
1339  <!-- jsr166e: find doclint errors -->
1340  <target name="jsr166edoclint">
1341
1342    <mkdir dir="${build.jsr166e.classes.dir}"/>
1343
1344    <javac srcdir="${topsrc.dir}"
1345           destdir="${build.jsr166e.classes.dir}"
1346           debug="${build.debug}"
1347           debuglevel="${build.debuglevel}"
1348           deprecation="${build.deprecation}"
1349           source="${build.jsr166e.java.version}"
1350           target="${build.jsr166e.java.version}"
1351           classpath=""
1352           bootclasspath="${bootclasspath6}"
1353           includeAntRuntime="false"
1354           includeJavaRuntime="false"
1355           executable="${javac8}"
1356           fork="true">
1357
1358      <include name="jsr166e/**/*.java"/>
1359      <compilerarg value="-XDignore.symbol.file=true"/>
1360      <compilerarg value="-Xlint:all"/>
1361      <compilerarg value="-Werror"/>
1362      <compilerarg value="-Xdoclint:all/protected"/>
1363
1364    </javac>
1365  </target>
1366
1367
1368  <target name="jsr166ejar"
1369          depends="jsr166ecompile"
1370          description="Builds library jar from compiled sources">
1371
1372    <jar destfile="${jsr166e.jar}" index="true">
1373      <fileset dir="${build.jsr166e.classes.dir}"/>
1374      <manifest>
1375        <attribute name="Built-By" value="${user.name}"/>
1376        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1377      </manifest>
1378    </jar>
1379
1380  </target>
1381
1382
1383  <target name="jsr166edocs"
1384          description="Builds javadocs to build dir">
1385
1386    <delete dir="${jsr166edocs.dir}"/>
1387    <mkdir dir="${jsr166edocs.dir}"/>
1388
1389    <javadoc destdir="${jsr166edocs.dir}"
1390             packagenames="jsr166e.*"
1391             link="${java.api.url}"
1392             access="${build.javadoc.access}"
1393             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1394             source="${build.jsr166e.java.version}"
1395             executable="${javadoc7}">
1396      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1397      <arg value="-XDignore.symbol.file=true"/>
1398
1399    </javadoc>
1400  </target>
1401
1402
1403  <target name="jsr166e-tck-one-java-version"
1404          depends="jsr166ejar">
1405
1406    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1407
1408    <run-tck-tests
1409      tck.src.dir="${test.src.dir}/tck-jsr166e"
1410      target="${build.jsr166e.java.version}"
1411      workdir="${build.jsr166e.dir}"
1412      classes="${jsr166e.jar}"/>
1413  </target>
1414
1415  <target name="jsr166e-tck"
1416          description="Runs tck tests for jsr166e for multiple java versions">
1417
1418 <!--     <antcall target="clean"/> -->
1419 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1420 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1421 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1422 <!--     </antcall> -->
1423
1424    <antcall target="clean"/>
1425    <antcall target="jsr166e-tck-one-java-version">
1426      <param name="build.jsr166e.java.version" value="7"/>
1427      <param name="build.jsr166e.javac" value="${javac7}"/>
1428    </antcall>
1429
1430    <antcall target="clean"/>
1431    <antcall target="jsr166e-tck-one-java-version">
1432      <param name="build.jsr166e.java.version" value="6"/>
1433      <param name="build.jsr166e.javac" value="${javac6}"/>
1434    </antcall>
1435  </target>
1436
1437
1438  <target name="jsr166e-test"
1439          depends="jsr166e-tck"
1440          description="Runs all tests for jsr166e">
1441  </target>
1442
1443  <target name="jsr166edist"
1444          depends="jsr166edist-jar, jsr166edist-docs"
1445          description="Puts all distributable products in single hierarchy"/>
1446
1447
1448  <target name="jsr166eclean"
1449          description="Removes all jsr166e build products">
1450    <delete dir="${build.jsr166e.dir}"/>
1451  </target>
1452
1453
1454  <target name="jsr166edist-jar"
1455          depends="jsr166eclean, jsr166ejar">
1456    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1457  </target>
1458
1459  <target name="jsr166edist-docs"
1460          depends="jsr166eclean, jsr166edocs">
1461    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1462  </target>
1463
1464
1465 <!-- Find buglets that can be detected by static build tools -->
1466
1467  <target name="lint">
1468    <antcall target="dists">
1469      <param name="build.javadoc.access" value="public"/>
1470    </antcall>
1471  </target>
1472
1473 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1474  <target name="lint-private">
1475    <antcall target="dist">
1476      <param name="build.javadoc.access" value="private"/>
1477    </antcall>
1478  </target>
1479
1480
843   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines