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.186 by jsr166, Wed Sep 30 18:12:20 2015 UTC vs.
Revision 1.309 by jsr166, Mon Dec 16 22:12:32 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=...
35 <  for $N in 6 7 8 9 ...
34 >  ant -Djdk$N.home=... -Djdk$N.src.home=...
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.dir="$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.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"/>
67  
68    <!-- JDK locations -->
69    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 85 | Line 71
71    <macrodef name="defjdklocations">
72      <attribute name="v"/>
73      <sequential>
74 <    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
75 <    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
76 <    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
77 <    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
78 <    <local name="have.java.base"/>
79 <    <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"/>
74 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
75 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
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 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
80      </sequential>
81    </macrodef>
82  
# Line 123 | 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"/>
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"/>
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"/>
113  
114    <!-- Javadoc locations -->
115    <property name="docs.dir"          location="${build.dir}/docs"/>
116 <  <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"/>
116 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
117  
118    <!-- Jar locations -->
119    <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"/>
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 2014-07 -->
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/"/>
189 <  <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 194 | 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 209 | 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  
217    <local name="modules"/>
218    <condition property="modules">
219      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
220    </condition>
221
174      <mkdir dir="@{workdir}/tck-classes"/>
175  
176      <javac srcdir="@{tck.src.dir}"
# Line 231 | 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"/>
193 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
194 <      <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
192 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
193 >      <compilerarg value="-Xdoclint:reference/private"/>
194 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
195        <compilerarg line="${build.args}"/>
196        <javac-elements/>
197  
# Line 248 | Line 201
201            failonerror="true"
202            jvm="${java@{target}}"
203            fork="true">
204 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
205 <        <jvmarg value="-Xoverride:${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 <        </syspropertyset>
219 <
220 <        <classpath>
221 <          <pathelement location="${junit.jar}"/>
222 <          <pathelement location="@{workdir}/tck-classes"/>
223 <        </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>
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="${jtreg8.src.dir}">
246 <    <patternset id="jdk8.jtreg.tests">
247 <      <include name="**/*.java"/>
248 <      <exclude name="**/SpliteratorCharacteristics.java"/>
281 <      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
282 <      <exclude name="**/GCDuringIteration.java"/>
283 <    </patternset>
284 <  </fileset>
245 >  <defjtregtests v="14"/>
246 >  <defjtregtests v="13"/>
247 >  <defjtregtests v="12"/>
248 >  <defjtregtests v="11"/>
249  
250 <  <fileset dir="${jtreg7.src.dir}">
251 <    <patternset id="jdk7.jtreg.tests">
288 <      <include name="**/*.java"/>
289 <    </patternset>
290 <  </fileset>
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 -->
294 <    <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 <    <local name="modules"/>
265 <    <condition property="modules">
304 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
305 <    </condition>
264 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
265 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
266  
267      <delete dir="@{workdir}/JTwork"   quiet="true"/>
308    <delete dir="@{workdir}/JTreport" quiet="true"/>
309    <mkdir dir="@{workdir}/JTwork/scratch"/>
310    <mkdir dir="@{workdir}/JTreport"/>
268      <jtreg dir="${jtreg@{target}.src.dir}"
269             jdk="${jdk@{target}.home}"
270 <           workDir="@{workdir}/JTwork"
314 <           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="-Xoverride:${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="-vmoptions:${vmoptions}" if:set="vmoptions"/>
275        <arg value="-agentvm"/>
276 <      <arg value="-verbose:nopass,fail,error"/>
276 >      <arg value="-noreport"/>
277 >      <arg value="-verbose:@{verbose}"/>
278        <arg value="-vmoptions:-esa -ea"/>
279        <arg value="-automatic"/>
280        <arg value="-k:!ignore"/>
281        <arg line="@{jtregflags}"/>
282 +      <arg line="${jtreg.flags}"/>
283 +      <jtreg-elements/>
284      </jtreg>
285      </sequential>
286    </macrodef>
# Line 331 | Line 291
291    </path>
292  
293    <!-- Support @jls tag, used in jdk8+ javadoc -->
294 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
295    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
296    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
297  
298    <!-- Main targets -->
299  
300 <  <property name="build.main.java.version" value="9"/>
301 <  <property name="build.main.javac" value="${javac9}"/>
300 >  <!-- Default values: may seem strange ... -->
301 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
302 >  <!-- But at build time, target jdk9, for maximal binary portability -->
303 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
304 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
305 >    o override-methods=summary
306 >    o {@systemProperty ...}
307 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
308 >    o 8202628: javadoc generates bad links in TestModules.java
309 >    -->
310 >  <property name="java.runtime.target" value="11"/>
311 >  <property name="build.main.java" value="${java11}"/>
312 >  <property name="build.main.javac" value="${javac11}"/>
313 >  <property name="build.main.javadoc" value="${javadoc12}"/>
314 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
315  
316    <target name="dists"
317 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
317 >          depends="dist"
318            description="Builds all public jars and docs"/>
319  
320    <target name="compile"
321            depends="configure-compiler"
322            description="Compiles src/main sources to build dir">
323  
350    <local name="modules"/>
351    <condition property="modules">
352      <and>
353        <available file="${jdk9.home}/jmods" type="dir"/>
354        <equals arg1="9" arg2="${build.main.java.version}"/>
355      </and>
356    </condition>
357
324      <local name="destdir"/>
325 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
360 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
325 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
326  
327      <mkdir dir="${destdir}"/>
328  
# Line 369 | Line 334
334             classpath=""
335             includeAntRuntime="false"
336             includeJavaRuntime="false"
337 +           encoding="ASCII"
338             executable="${build.main.javac}"
339             fork="true">
340  
341        <include name="**/*.java"/>
342 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
342 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
343        <compilerarg value="-Xprefer:source"/>
344        <compilerarg value="-XDignore.symbol.file=true"/>
345 <      <compilerarg value="-Xlint:all"/>
345 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
346 >      <compilerarg value="-Xlint:all,-removal"/>
347 >      <compilerarg line="--doclint-format html5"/>
348 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
349 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
350        <compilerarg value="-Werror"/>
381      <compilerarg value="-Xdoclint:all/protected"/>
351        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
352        <compilerarg line="${build.args}"/>
353  
# Line 388 | Line 357
357  
358    <target name="jar"
359            depends="compile"
360 <          description="Builds library jar from compiled sources">
361 <
360 >          description="Builds library jar for src/main from compiled sources">
361 >    <local name="subdir"/>
362 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
363      <jar destfile="${product.jar}">
364 <      <fileset dir="${build.classes.dir}"/>
364 >      <fileset dir="${build.classes.dir}${subdir}"/>
365        <manifest>
366          <attribute name="Built-By" value="${user.name}"/>
367          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
# Line 403 | Line 373
373    <target name="docs"
374            description="Builds javadocs for src/main to dist dir">
375  
376 <    <delete dir="${docs.dir}"/>
376 >    <delete dir="${docs.dir}" quiet="true"/>
377      <mkdir dir="${docs.dir}"/>
378  
379 +    <!-- old school frames via docs/index.html?overview-summary.html -->
380 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
381 +    <local name="use-frames"/>
382 +    <condition property="use-frames">
383 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
384 +    </condition>
385 +
386      <!-- the packagenames="none" hack below prevents scanning the -->
387      <!-- sourcepath for packages -->
388  
389 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
390 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
391 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
392 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
393 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
394      <javadoc destdir="${docs.dir}"
395               packagenames="none"
396 <             link="${java9.api.url}"
396 >             link="${java.api.url}"
397               overview="${src.dir}/intro.html"
398               access="${build.javadoc.access}"
399 <             sourcepath="${src.dir}:${jdk9src.dir}"
399 >             sourcepath="${src.dir}"
400               classpath=""
401 <             executable="${javadoc9}">
401 >             source="${build.main.javadoc.source}"
402 >             executable="${build.main.javadoc}">
403 > <!-- TODO: JDK-8214571 failonerror = "true" -->
404        <fileset dir="${src.dir}" defaultexcludes="yes">
405          <include name="**/*.java"/>
406        </fileset>
407 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
407 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
408        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
409 +      <arg value="-quiet"/>
410        <arg value="-XDignore.symbol.file=true"/>
411 < <!--  TODO     <arg value="-Xmodule:java.base"/> -->
412 <      <arg value="-tag"/>
413 <      <arg value="${javadoc.jls.option}"/>
414 <      <arg value="-tag"/>
415 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
416 <      <arg value="-tag"/>
417 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
418 <      <arg value="-tag"/>
419 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
411 >      <arg value="-html5"/>
412 >      <arg value="--patch-module=java.base=${src.dir}"/>
413 >      <arg value="--frames" if:set="use-frames"/>
414 >      <arg value="--override-methods=summary"/>
415 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
416 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
417 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
418 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
419 > <!-- tags added in jdk9: currently unused -->
420 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
421 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
422      </javadoc>
423    </target>
424  
# Line 441 | Line 428
428            description="Puts all distributable products in single hierarchy"/>
429  
430  
444  <target name="release"
445          depends="dist"
446          description="Puts entire CVS tree, plus distribution productions, in a jar">
447
448    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
449
450    <jar basedir="${basedir}" destfile="${release.jar}">
451      <!-- <exclude name="build/**"/> -->
452      <exclude name="${release.jar}"/>
453      <exclude name="user.properties"/>
454      <exclude name="etc/notes/**"/>
455      <exclude name="src/emulation/**"/>
456      <exclude name="**/SyntaxTest.java"/>
457      <exclude name="**/SuperfluousAbstract.java"/>
458      <manifest>
459        <attribute name="Built-By" value="${user.name}"/>
460        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
461      </manifest>
462    </jar>
463  </target>
464
465
431    <target name="clean"
432            description="Removes all build products">
468
433      <delete dir="${build.dir}"/>
470
434    </target>
435  
436  
437    <target name="dist-clean"
438            description="Removes all build and distribution products">
476
439      <delete dir="${build.dir}"/>
440      <delete dir="${dist.dir}"/>
479
441    </target>
442  
443  
# Line 491 | Line 452
452    </target>
453  
454    <target name="tck"
455 <          depends="jar"
456 <          description="Runs tck tests for main directly">
455 >          depends="jar"
456 >          description="Runs tck tests for src/main directly">
457  
458      <run-tck-tests
459 <      target="${build.main.java.version}"
459 >      target="${java.runtime.target}"
460        workdir="${build.dir}"
461 <      classes="${product.jar}"/>
461 >      classes="${product.jar}">
462 >      <javac-elements>
463 >        <compilerarg value="-Werror"/>
464 >      </javac-elements>
465 >    </run-tck-tests>
466    </target>
467  
468    <target name="tck-parallelism-1"
469 <          description="Runs tck with given common pool parallelism">
469 >          description="Runs tck with common pool parallelism 1">
470      <antcall target="tck">
471        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
472      </antcall>
473    </target>
474  
475    <target name="tck-parallelism-0"
476 <          description="Runs tck with given common pool parallelism">
476 >          description="Runs tck with common pool parallelism 0">
477      <antcall target="tck">
478        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
479      </antcall>
480    </target>
481  
482 +  <target name="tck-security-manager"
483 +          description="Runs tck with a security manager">
484 +    <antcall target="tck">
485 +      <param name="jsr166.useSecurityManager" value="true"/>
486 +    </antcall>
487 +  </target>
488 +
489    <target name="jtreg"
490 <          depends="jar"
491 <          description="Runs jtreg tests for main using the jtreg ant task">
490 >          depends="jar"
491 >          description="Runs jtreg tests for src/main using the jtreg ant task">
492      <run-jtreg-tests
493 <       target="${build.main.java.version}"
493 >       target="${java.runtime.target}"
494         workdir="${build.dir}"
495         classes="${product.jar}"/>
496    </target>
497  
498    <target name="test"
499 <          depends="tck, tck-parallelism-1, jtreg"
500 <          description="Runs tck and jtreg tests for main">
529 <  </target>
499 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
500 >          description="Runs tck and jtreg tests for src/main"/>
501  
502 <  <target name="jtreg8" description="Runs jtreg tests with jdk8">
502 >  <target name="test-version-permutations"
503 >          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
504 >  </target>
505  
506 <    <antcall target="jtreg">
507 <      <param name="build.main.java.version" value="8"/>
508 <      <param name="build.main.javac" value="${javac8}"/>
506 >  <target name="test11">
507 >    <antcall>
508 >      <param name="java.runtime.target" value="11"/>
509 >      <param name="build.main.javac" value="${javac11}"/>
510 >      <param name="build.main.javadoc" value="${javadoc12}"/>
511 >      <param name="build.main.javadoc.source" value="11"/>
512 >      <target name="clean"/>
513 >      <target name="test"/>
514 >      <target name="docs"/>
515      </antcall>
516 +  </target>
517  
518 +  <target name="test12">
519 +    <antcall>
520 +      <param name="java.runtime.target" value="12"/>
521 +      <param name="build.main.javac" value="${javac12}"/>
522 +      <param name="build.main.javadoc" value="${javadoc12}"/>
523 +      <param name="build.main.javadoc.source" value="12"/>
524 +      <target name="clean"/>
525 +      <target name="test"/>
526 +      <target name="docs"/>
527 +    </antcall>
528    </target>
529  
530 <  <target name="test89"
531 <          description="Runs tck and jtreg tests for main for multiple java versions">
530 >  <target name="test13">
531 >    <antcall>
532 >      <param name="java.runtime.target" value="13"/>
533 >      <param name="build.main.javac" value="${javac13}"/>
534 >      <param name="build.main.javadoc" value="${javadoc13}"/>
535 >      <param name="build.main.javadoc.source" value="13"/>
536 >      <target name="clean"/>
537 >      <target name="test"/>
538 >      <target name="docs"/>
539 >    </antcall>
540 >  </target>
541  
542 <    <antcall target="clean"/>
543 <    <antcall target="test">
544 <      <param name="build.main.java.version" value="8"/>
545 <      <param name="build.main.javac" value="${javac8}"/>
542 >  <target name="test14">
543 >    <antcall>
544 >      <param name="java.runtime.target" value="14"/>
545 >      <param name="build.main.javac" value="${javac14}"/>
546 >      <param name="build.main.javadoc" value="${javadoc14}"/>
547 >      <param name="build.main.javadoc.source" value="14"/>
548 >      <target name="clean"/>
549 >      <target name="test"/>
550 >      <target name="docs"/>
551      </antcall>
552 +  </target>
553  
554 <    <antcall target="clean"/>
555 <    <antcall target="test">
556 <      <param name="build.main.java.version" value="9"/>
557 <      <param name="build.main.javac" value="${javac9}"/>
554 >  <target name="test11-12">
555 >    <antcall>
556 >      <param name="java.runtime.target" value="12"/>
557 >      <param name="build.main.javac" value="${javac11}"/>
558 >      <param name="build.main.javadoc" value="${javadoc12}"/>
559 >      <param name="build.main.javadoc.source" value="11"/>
560 >      <target name="clean"/>
561 >      <target name="test"/>
562 >      <target name="docs"/>
563      </antcall>
564 +  </target>
565  
566 +  <target name="test11-13">
567 +    <antcall>
568 +      <param name="java.runtime.target" value="13"/>
569 +      <param name="build.main.javac" value="${javac11}"/>
570 +      <param name="build.main.javadoc" value="${javadoc13}"/>
571 +      <param name="build.main.javadoc.source" value="11"/>
572 +      <target name="clean"/>
573 +      <target name="test"/>
574 +      <target name="docs"/>
575 +    </antcall>
576    </target>
577  
578 +  <target name="test11-14">
579 +    <antcall>
580 +      <param name="java.runtime.target" value="14"/>
581 +      <param name="build.main.javac" value="${javac11}"/>
582 +      <param name="build.main.javadoc" value="${javadoc14}"/>
583 +      <param name="build.main.javadoc.source" value="11"/>
584 +      <target name="clean"/>
585 +      <target name="test"/>
586 +      <target name="docs"/>
587 +    </antcall>
588 +  </target>
589  
590  
591    <target name="configure-compiler">
592      <fail message="ant version too old">
593 <      <condition>
562 <        <not> <antversion atleast="1.9.1"/> </not>
563 <      </condition>
593 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
594      </fail>
595  
596      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 578 | Line 608
608    </target>
609  
610  
581
582  <!-- Various demos and test programs -->
583
584
585  <target name="loops" depends="configure-compiler"
586          description="Benchmark from Doug Lea's AQS paper">
587
588    <mkdir dir="${build.loops.dir}"/>
589
590    <javac srcdir="${loops.src.dir}"
591          destdir="${build.loops.dir}"
592            debug="${build.debug}"
593       debuglevel="${build.debuglevel}"
594      deprecation="${build.deprecation}"
595           source="${build.sourcelevel}"
596             fork="true">
597
598      <compilerarg line="${build.args}"/>
599      <classpath refid="loops.classpath"/>
600      <compilerarg value="-XDignore.symbol.file=true"/>
601
602    </javac>
603
604    <java classname="ALoops" fork="true">
605      <classpath refid="loops.classpath"/>
606    </java>
607
608  </target>
609
610
611    <target name="compile-test-loops" depends="jar"
612 <          description="compile all the perf tests in src/test/loops">
612 >          description="Compiles all the perf tests in src/test/loops">
613  
614      <mkdir dir="${build.dir}/test/loops"/>
615  
# Line 620 | Line 620
620             deprecation="${build.deprecation}"
621             includeAntRuntime="false"
622             includeJavaRuntime="false"
623 <           executable="${javac9}"
623 >           encoding="ASCII"
624 >           executable="${build.main.javac}"
625             fork="true">
626  
627        <include name="*.java"/>
628        <compilerarg value="-XDignore.symbol.file=true"/>
629 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
630 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
629 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
630 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
631        <compilerarg line="${build.args}"/>
631
632      </javac>
633
633    </target>
634  
635  
636 <  <!-- jsr166 4jdk7 -->
637 <
638 <  <target name="4jdk7compile"
639 <          depends="configure-compiler"
640 <          description="Compiles src/jdk7 sources, targeting jdk7">
641 <
642 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
636 >  <!-- old branches no longer maintained.  build support deleted -->
637 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
638 >  <!-- jsr166 4jdk7 (no longer maintained) -->
639 >  <!-- jsr166x (no longer maintained) -->
640 >  <!-- jsr166y (no longer maintained) -->
641 >  <!-- extra166y (no longer maintained) -->
642 >  <!-- jsr166e (no longer maintained) -->
643  
644 <    <javac srcdir="${4jdk7src.dir}"
646 <           destdir="${build.4jdk7.classes.dir}"
647 <           debug="${build.debug}"
648 <           debuglevel="${build.debuglevel}"
649 <           deprecation="${build.deprecation}"
650 <           source="6"
651 <           classpath=""
652 <           bootclasspath="${bootclasspath6}"
653 <           includeAntRuntime="false"
654 <           includeJavaRuntime="false"
655 <           executable="${javac7}"
656 <           fork="true">
644 > <!-- Find buglets that can be detected by static build tools -->
645  
646 <      <include name="**/*.java"/>
647 <      <compilerarg value="-Xprefer:source"/>
648 <      <compilerarg value="-XDignore.symbol.file=true"/>
649 <      <compilerarg value="-Xlint:all"/>
650 <      <compilerarg value="-Werror"/>
663 <      <compilerarg line="${build.args}"/>
646 > <!--   <target name="lint"> -->
647 > <!--     <antcall target="dists"> -->
648 > <!--       <param name="build.javadoc.access" value="protected"/> -->
649 > <!--     </antcall> -->
650 > <!--   </target> -->
651  
652 <    </javac>
652 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
653 >  <target name="doclint-private">
654 >    <antcall target="dist">
655 >      <param name="build.javadoc.access" value="private"/>
656 >    </antcall>
657    </target>
658  
668  <target name="4jdk7doclint"
669          depends="configure-compiler"
670          description="Finds doclint warnings">
659  
660 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
660 > <!-- ==============================================================
661 >  Experimental errorprone support
662 >  https://errorprone.info
663 >  https://errorprone.info/docs/installation
664 >  https://github.com/google/error-prone/issues/1143
665 > =================================================================== -->
666 >  <path id="errorprone.processorpath.path">
667 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
668 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
669 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
670 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
671 >    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
672 >  </path>
673 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
674 >  <property name="errorprone.jsr166.user.flags" value=""/>
675 >  <property name="errorprone.jsr166.flags"
676 >            value="-Xep:HashtableContains:OFF
677 >                   -Xep:JdkObsolete:OFF
678 >                   -Xep:MissingOverride:OFF
679 >                   -Xep:MissingFail:OFF
680 >                   -Xep:ThreadPriorityCheck:OFF
681 >                   -Xep:MixedArrayDimensions:ERROR
682 >                   -Xep:RemoveUnusedImports:ERROR
683 >                   -Xep:EmptyIf:ERROR
684 >                   -Xep:MultipleTopLevelClasses:ERROR
685 >                   -Xep:ClassName:ERROR
686 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
687 >                   -Xep:RedundantThrows:ERROR
688 >                   -Xep:IdentityBinaryExpression:WARN
689 >                   -Xep:ConstructorInvokesOverridable:WARN
690 >                   -Xep:MethodCanBeStatic:WARN
691 >                   ${errorprone.jsr166.user.flags}"/>
692 >  <!-- -Xep:WildcardImport:ERROR -->
693 >  <property name="errorprone.jsr166.test.flags"
694 >            value="-Xep:StringSplitter:OFF
695 >                   -Xep:BoxedPrimitiveConstructor:OFF
696 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
697 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
698 >  <target name="errorprone"
699 >          depends="clean, configure-compiler"
700 >          description="Run errorprone over jsr166 source code (experimental)">
701 >
702 >    <local name="destdir"/>
703 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
704 >    <mkdir dir="${destdir}"/>
705  
706 <    <javac srcdir="${4jdk7src.dir}"
707 <           destdir="${build.4jdk7.classes.dir}"
706 >    <javac srcdir="${src.dir}"
707 >           destdir="${destdir}"
708             debug="${build.debug}"
709             debuglevel="${build.debuglevel}"
710             deprecation="${build.deprecation}"
679           source="6"
711             classpath=""
681           bootclasspath="${bootclasspath7}"
712             includeAntRuntime="false"
713             includeJavaRuntime="false"
714 <           executable="${javac8}"
714 >           encoding="ASCII"
715 >           executable="${build.main.javac}"
716             fork="true">
717  
718        <include name="**/*.java"/>
719 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
720 +      <compilerarg value="-J--illegal-access=permit"/>
721 +      <compilerarg value="-XDcompilePolicy=simple"/>
722 +      <compilerarg value="-processorpath"/>
723 +      <compilerarg pathref="errorprone.processorpath.path"/>
724 +      <compilerarg value="-Xplugin:ErrorProne
725 +                          ${errorprone.jsr166.flags}"/>
726 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
727        <compilerarg value="-Xprefer:source"/>
728        <compilerarg value="-XDignore.symbol.file=true"/>
729        <compilerarg value="-Xlint:all"/>
730 <      <compilerarg value="-Xdoclint:all/protected"/>
730 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
731 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
732        <compilerarg line="${build.args}"/>
693
733      </javac>
695  </target>
696
734  
735 <  <target name="4jdk7jar"
736 <          depends="4jdk7compile"
700 <          description="Builds library jar from compiled sources">
701 <
702 <    <jar destfile="${4jdk7product.jar}">
703 <      <fileset dir="${build.4jdk7.classes.dir}"/>
704 <      <manifest>
705 <        <attribute name="Built-By" value="${user.name}"/>
706 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
707 <      </manifest>
735 >    <jar destfile="${product.jar}">
736 >      <fileset dir="${destdir}"/>
737      </jar>
738  
710  </target>
711
712
713  <target name="4jdk7-tck"
714          depends="4jdk7jar"
715          description="Runs tck tests for jsr166-4jdk7 directly">
716
739      <run-tck-tests
740 <      target="7"
741 <      workdir="${build.4jdk7.dir}"
742 <      classes="${4jdk7product.jar}">
740 >      target="${java.runtime.target}"
741 >      workdir="${build.dir}"
742 >      classes="${product.jar}">
743        <javac-elements>
744 <        <!-- JDK8+ test classes -->
745 <        <exclude name="*8Test.java"/>
746 <        <exclude name="*9Test.java"/>
747 <        <exclude name="*10Test.java"/>
748 <        <exclude name="DoubleAccumulatorTest.java"/>
749 <        <exclude name="DoubleAdderTest.java"/>
750 <        <exclude name="LongAccumulatorTest.java"/>
751 <        <exclude name="LongAdderTest.java"/>
730 <        <exclude name="CompletableFutureTest.java"/>
731 <        <exclude name="SplittableRandomTest.java"/>
732 <        <exclude name="StampedLockTest.java"/>
733 <        <exclude name="SubmissionPublisherTest.java"/>
744 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
745 >        <compilerarg value="-J--illegal-access=permit"/>
746 >        <compilerarg value="-XDcompilePolicy=simple"/>
747 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
748 >        <compilerarg value="-Xplugin:ErrorProne
749 >                            ${errorprone.jsr166.flags}
750 >                            ${errorprone.jsr166.test.flags}"/>
751 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
752        </javac-elements>
753      </run-tck-tests>
754    </target>
755  
756 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
757 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
758 +  <target name="errorprone-jtreg"
759 +          depends="jar"
760 +          description="Run errorprone over jtreg tests (experimental)">
761  
762 <  <target name="4jdk7-tck-junit"
763 <          depends="4jdk7compile"
764 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
765 <
766 <    <junit printsummary="true"
767 <           showoutput="true"
768 <           errorProperty="junit.failed"
769 <           failureProperty="junit.failed"
770 <           includeantruntime="true"
771 <           jvm="${java7}"
772 <           fork="true">
773 <
774 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
775 <      <jvmarg value="-server"/>
776 <
762 >    <run-jtreg-tests
763 >       target="${java.runtime.target}"
764 >       workdir="${build.dir}"
765 >       classes="${product.jar}"
766 >       verbose="all">
767 >      <jtreg-elements>
768 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
769 >        <arg value="-javacoption:-processorpath"/>
770 >        <arg value="-javacoption:${errorprone.processorpath}"/>
771 >        <arg value="-javacoption:-Xplugin:ErrorProne
772 >                            ${errorprone.jsr166.flags}
773 >                            ${errorprone.jsr166.test.flags}
774 >                            -Xep:MultipleTopLevelClasses:WARN
775 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
776 >      </jtreg-elements>
777 >    </run-jtreg-tests>
778 >  </target>
779 >
780 >
781 > <!-- ==============================================================
782 >  Running guava tests against jsr166 code
783 > =================================================================== -->
784 >
785 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
786 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
787 > <!-- <property name="guava.version" value="21.0"/> -->
788 >
789 > <!-- HOWTO debug print a path id -->
790 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
791 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
792 >
793 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
794 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
795 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
796 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
797 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
798 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
799 >
800 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
801 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
802 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
803 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
804 >
805 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
806 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
807 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
808 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
809 >
810 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
811 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
812 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
813 >
814 >  <target name="init-ivy">
815 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
816 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
817 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
818 >             classpath="${build.dir}/ivy.jar"/>
819 >  </target>
820 >
821 >  <target name="guava-tests" depends="jar, init-ivy"
822 >          description="Guava tests run against jsr166 collections">
823 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
824 >    <mkdir dir="${guava.dir}"/>
825 >    <ivy:retrieve pathid="guava.testlib.classpath"
826 >      type="jar,bundle" inline="true" conf="default,master"
827 >      pattern="${guava.dir}/[artifact].[ext]"
828 >      organisation="com.google.guava" module="guava-testlib"/>
829 >    <property name="guava.version" value="21.0"/>
830 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
831 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
832 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
833 >           jvm="${build.main.java}" fork="true">
834 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
835 >      <formatter type="brief"/>
836        <classpath>
837 <        <pathelement location="${junit.jar}"/>
838 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
837 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
838 >        <path refid="guava.testlib.classpath"/>
839        </classpath>
840  
841 <      <formatter type="brief"/>
842 <
761 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
762 <      </test>
763 <
841 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
842 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
843      </junit>
844    </target>
845  
767  <target name="4jdk7-jtreg"
768          depends="4jdk7jar"
769          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
770    <run-jtreg-tests
771       target="7"
772       workdir="${build.4jdk7.dir}"
773       classes="${4jdk7product.jar}"/>
774  </target>
775
776
777  <target name="4jdk7-test"
778          depends="4jdk7-tck, 4jdk7-jtreg"
779          description="Runs tck and jtreg tests for jsr166-4jdk7">
780  </target>
781
782
783  <target name="4jdk7docs"
784          description="Builds javadocs for src/jdk7 to dist dir">
785
786    <delete dir="${4jdk7docs.dir}"/>
787    <mkdir dir="${4jdk7docs.dir}"/>
788
789    <javadoc destdir="${4jdk7docs.dir}"
790             packagenames="none"
791             link="${java7.api.url}"
792             overview="${4jdk7src.dir}/intro.html"
793             access="${build.javadoc.access}"
794             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
795             classpath=""
796             executable="${javadoc7}">
797      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
798        <include name="**/*.java"/>
799      </fileset>
800      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
801      <arg value="-XDignore.symbol.file=true"/>
802    </javadoc>
803  </target>
804
805
806  <target name="4jdk7dist"
807          depends="4jdk7dist-jar, 4jdk7dist-docs"
808          description="Puts all distributable products in single hierarchy"/>
809
810
811  <target name="4jdk7clean"
812          description="Removes all 4jdk7 build products">
813
814    <delete dir="${build.4jdk7.dir}"/>
815
816  </target>
817
818
819  <target name="4jdk7dist-jar"
820          depends="4jdk7clean, 4jdk7jar">
821    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
822  </target>
823
824
825  <target name="4jdk7dist-docs"
826          depends="4jdk7clean, 4jdk7docs">
827    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
828  </target>
829
830
831  <!-- jsr166x -->
832
833  <target name="jsr166xcompile"
834          depends="configure-compiler"
835          description="Compiles jsr166x sources to build dir">
836
837    <mkdir dir="${build.jsr166x.classes.dir}"/>
838
839    <javac srcdir="${topsrc.dir}"
840           destdir="${build.jsr166x.classes.dir}"
841           debug="${build.debug}"
842           debuglevel="${build.debuglevel}"
843           deprecation="${build.deprecation}"
844           classpath=""
845           bootclasspath="${bootclasspath6}"
846           source="5"
847           includeAntRuntime="false"
848           includeJavaRuntime="false"
849           executable="${javac7}"
850           fork="true">
851
852      <include name="jsr166x/**/*.java"/>
853      <compilerarg value="-XDignore.symbol.file=true"/>
854      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
855      <compilerarg value="-Werror"/>
856      <compilerarg line="${build.args}"/>
857
858    </javac>
859  </target>
860
861
862  <target name="jsr166xjar"
863          depends="jsr166xcompile"
864          description="Builds library jar from compiled sources">
865
866    <jar destfile="${jsr166x.jar}">
867      <fileset dir="${build.jsr166x.classes.dir}"/>
868      <manifest>
869        <attribute name="Built-By" value="${user.name}"/>
870        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
871      </manifest>
872    </jar>
873
874  </target>
875
876
877  <target name="jsr166xdocs"
878          description="Builds javadocs to dist dir">
879
880    <delete dir="${jsr166xdocs.dir}"/>
881    <mkdir dir="${jsr166xdocs.dir}"/>
882
883    <javadoc destdir="${jsr166xdocs.dir}"
884             packagenames="jsr166x.*"
885             link="${java.api.url}"
886             access="${build.javadoc.access}"
887             sourcepath="${topsrc.dir}:${jdk6src.dir}"
888             bootclasspath="${bootclasspath6}"
889             source="5"
890             executable="${javadoc7}">
891      <arg line="-Xdocrootparent ${java.docroot.url}"/>
892      <arg value="-XDignore.symbol.file=true"/>
893
894    </javadoc>
895  </target>
896
897
898  <target name="jsr166xdist"
899          depends="jsr166xdist-jar, jsr166xdist-docs"
900          description="Puts all distributable products in single hierarchy"/>
901
902
903  <target name="jsr166xclean"
904          description="Removes all jsr166x build products">
905
906    <delete dir="${build.jsr166x.dir}"/>
907
908  </target>
909
910
911  <target name="jsr166xdist-jar"
912          depends="jsr166xclean, jsr166xjar">
913    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
914  </target>
915
916  <target name="jsr166xdist-docs"
917          depends="jsr166xclean, jsr166xdocs">
918    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
919  </target>
920
921  <!-- jsr166y -->
922
923
924  <target name="jsr166ycompile"
925          depends="configure-compiler"
926          description="Compiles jsr166y sources">
927
928    <mkdir dir="${build.jsr166y.classes.dir}"/>
929
930    <javac srcdir="${topsrc.dir}"
931           destdir="${build.jsr166y.classes.dir}"
932           debug="${build.debug}"
933           debuglevel="${build.debuglevel}"
934           deprecation="${build.deprecation}"
935           source="6"
936           classpath=""
937           bootclasspath="${bootclasspath6}"
938           includeAntRuntime="false"
939           includeJavaRuntime="false"
940           executable="${javac7}"
941           fork="true">
942
943      <include name="jsr166y/**/*.java"/>
944      <compilerarg value="-XDignore.symbol.file=true"/>
945      <compilerarg value="-Xlint:all"/>
946      <compilerarg value="-Werror"/>
947      <compilerarg line="${build.args}"/>
948
949    </javac>
950  </target>
951
952
953  <target name="jsr166yjar"
954          depends="jsr166ycompile"
955          description="Builds library jar from compiled sources">
956
957    <jar destfile="${jsr166y.jar}" index="true">
958      <fileset dir="${build.jsr166y.classes.dir}"/>
959      <manifest>
960        <attribute name="Built-By" value="${user.name}"/>
961        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
962      </manifest>
963    </jar>
964
965  </target>
966
967
968  <target name="jsr166ydocs"
969          description="Builds javadocs to dist dir">
970
971    <delete dir="${jsr166ydocs.dir}"/>
972    <mkdir dir="${jsr166ydocs.dir}"/>
973
974    <javadoc destdir="${jsr166ydocs.dir}"
975             packagenames="jsr166y.*"
976             link="${java.api.url}"
977             access="${build.javadoc.access}"
978             sourcepath="${topsrc.dir}:${jdk6src.dir}"
979             bootclasspath="${bootclasspath6}"
980             source="6"
981             executable="${javadoc7}">
982      <arg line="-Xdocrootparent ${java.docroot.url}"/>
983      <arg value="-XDignore.symbol.file=true"/>
984
985    </javadoc>
986  </target>
987
988
989  <target name="jsr166ydist"
990          depends="jsr166ydist-jar, jsr166ydist-docs"
991          description="Puts all distributable products in single hierarchy"/>
992
993
994  <target name="jsr166yclean"
995          description="Removes all jsr166y build products">
996
997    <delete dir="${build.jsr166y.dir}"/>
998
999  </target>
1000
1001
1002  <target name="jsr166ydist-jar"
1003          depends="jsr166yclean, jsr166yjar">
1004    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1005  </target>
1006
1007  <target name="jsr166ydist-docs"
1008          depends="jsr166yclean, jsr166ydocs">
1009    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1010  </target>
1011
1012
1013  <!-- extra166y -->
1014
1015
1016  <target name="extra166ycompile"
1017          depends="configure-compiler, jsr166yjar"
1018          description="Compiles extra166y sources">
1019
1020    <mkdir dir="${build.extra166y.classes.dir}"/>
1021
1022    <javac srcdir="${topsrc.dir}"
1023           destdir="${build.extra166y.classes.dir}"
1024           debug="${build.debug}"
1025           debuglevel="${build.debuglevel}"
1026           deprecation="${build.deprecation}"
1027           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1028           classpath=""
1029           source="6"
1030           includeAntRuntime="false"
1031           includeJavaRuntime="false"
1032           executable="${javac7}"
1033           fork="true">
1034
1035      <include name="extra166y/**/*.java"/>
1036      <compilerarg value="-XDignore.symbol.file=true"/>
1037      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1038      <compilerarg value="-Werror"/>
1039      <compilerarg line="${build.args}"/>
1040
1041    </javac>
1042  </target>
1043
1044
1045  <target name="extra166yjar"
1046          depends="extra166ycompile"
1047          description="Builds library jar from compiled sources">
1048
1049    <jar destfile="${extra166y.jar}" index="true">
1050      <fileset dir="${build.extra166y.classes.dir}"/>
1051      <manifest>
1052        <attribute name="Built-By" value="${user.name}"/>
1053        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1054      </manifest>
1055    </jar>
1056
1057  </target>
1058
1059
1060  <target name="extra166ydocs"
1061          description="Builds javadocs to build dir">
1062
1063    <delete dir="${extra166ydocs.dir}"/>
1064    <mkdir dir="${extra166ydocs.dir}"/>
1065
1066    <javadoc destdir="${extra166ydocs.dir}"
1067             packagenames="extra166y.*"
1068             link="${java.api.url}"
1069             access="${build.javadoc.access}"
1070             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1071             bootclasspath="${bootclasspath6}"
1072             source="6"
1073             executable="${javadoc7}">
1074      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1075      <arg value="-XDignore.symbol.file=true"/>
1076
1077    </javadoc>
1078  </target>
1079
1080
1081  <target name="extra166ydist"
1082          depends="extra166ydist-jar, extra166ydist-docs"
1083          description="Puts all distributable products in single hierarchy"/>
1084
1085
1086  <target name="extra166yclean"
1087          description="Removes all extra166y build products">
1088
1089    <delete dir="${build.extra166y.dir}"/>
1090
1091  </target>
1092
1093
1094  <target name="extra166ydist-jar"
1095          depends="extra166yclean, extra166yjar">
1096    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1097  </target>
1098
1099  <target name="extra166ydist-docs"
1100          depends="extra166yclean, extra166ydocs">
1101    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1102  </target>
1103
1104  <!-- jsr166e -->
1105
1106  <property name="build.jsr166e.java.version" value="6"/>
1107  <property name="build.jsr166e.javac" value="${javac6}"/>
1108
1109  <target name="jsr166ecompile"
1110          depends="configure-compiler"
1111          description="Compiles jsr166e sources">
1112
1113    <mkdir dir="${build.jsr166e.classes.dir}"/>
1114
1115    <javac srcdir="${topsrc.dir}"
1116           destdir="${build.jsr166e.classes.dir}"
1117           debug="${build.debug}"
1118           debuglevel="${build.debuglevel}"
1119           deprecation="${build.deprecation}"
1120           source="${build.jsr166e.java.version}"
1121           classpath=""
1122           includeAntRuntime="false"
1123           includeJavaRuntime="false"
1124           executable="${build.jsr166e.javac}"
1125           fork="true">
1126
1127      <include name="jsr166e/**/*.java"/>
1128      <compilerarg value="-XDignore.symbol.file=true"/>
1129      <compilerarg value="-Xlint:all"/>
1130      <compilerarg value="-Werror"/>
1131      <compilerarg line="${build.args}"/>
1132
1133    </javac>
1134  </target>
1135
1136  <!-- jsr166e: find doclint errors -->
1137  <target name="jsr166edoclint">
1138
1139    <mkdir dir="${build.jsr166e.classes.dir}"/>
1140
1141    <javac srcdir="${topsrc.dir}"
1142           destdir="${build.jsr166e.classes.dir}"
1143           debug="${build.debug}"
1144           debuglevel="${build.debuglevel}"
1145           deprecation="${build.deprecation}"
1146           source="${build.jsr166e.java.version}"
1147           classpath=""
1148           bootclasspath="${bootclasspath7}"
1149           includeAntRuntime="false"
1150           includeJavaRuntime="false"
1151           executable="${javac8}"
1152           fork="true">
1153
1154      <include name="jsr166e/**/*.java"/>
1155      <compilerarg value="-XDignore.symbol.file=true"/>
1156      <compilerarg value="-Xlint:all"/>
1157      <compilerarg value="-Werror"/>
1158      <compilerarg value="-Xdoclint:all/protected"/>
1159
1160    </javac>
1161  </target>
1162
1163
1164  <target name="jsr166ejar"
1165          depends="jsr166ecompile"
1166          description="Builds library jar from compiled sources">
1167
1168    <jar destfile="${jsr166e.jar}" index="true">
1169      <fileset dir="${build.jsr166e.classes.dir}"/>
1170      <manifest>
1171        <attribute name="Built-By" value="${user.name}"/>
1172        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1173      </manifest>
1174    </jar>
1175
1176  </target>
1177
1178
1179  <target name="jsr166edocs"
1180          description="Builds javadocs to build dir">
1181
1182    <delete dir="${jsr166edocs.dir}"/>
1183    <mkdir dir="${jsr166edocs.dir}"/>
1184
1185    <javadoc destdir="${jsr166edocs.dir}"
1186             packagenames="jsr166e.*"
1187             link="${java.api.url}"
1188             access="${build.javadoc.access}"
1189             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1190             source="${build.jsr166e.java.version}"
1191             executable="${javadoc7}">
1192      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1193      <arg value="-XDignore.symbol.file=true"/>
1194
1195    </javadoc>
1196  </target>
1197
1198
1199  <target name="jsr166e-tck-one-java-version"
1200          depends="jsr166ejar">
1201
1202    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1203
1204    <run-tck-tests
1205      tck.src.dir="${test.src.dir}/tck-jsr166e"
1206      target="${build.jsr166e.java.version}"
1207      workdir="${build.jsr166e.dir}"
1208      classes="${jsr166e.jar}"/>
1209  </target>
1210
1211  <target name="jsr166e-tck"
1212          description="Runs tck tests for jsr166e for multiple java versions">
1213
1214 <!--     <antcall target="clean"/> -->
1215 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1216 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1217 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1218 <!--     </antcall> -->
1219
1220    <antcall target="clean"/>
1221    <antcall target="jsr166e-tck-one-java-version">
1222      <param name="build.jsr166e.java.version" value="7"/>
1223      <param name="build.jsr166e.javac" value="${javac7}"/>
1224    </antcall>
1225
1226    <antcall target="clean"/>
1227    <antcall target="jsr166e-tck-one-java-version">
1228      <param name="build.jsr166e.java.version" value="6"/>
1229      <param name="build.jsr166e.javac" value="${javac6}"/>
1230    </antcall>
1231  </target>
1232
1233
1234  <target name="jsr166e-test"
1235          depends="jsr166e-tck"
1236          description="Runs all tests for jsr166e">
1237  </target>
1238
1239  <target name="jsr166edist"
1240          depends="jsr166edist-jar, jsr166edist-docs"
1241          description="Puts all distributable products in single hierarchy"/>
1242
1243
1244  <target name="jsr166eclean"
1245          description="Removes all jsr166e build products">
1246    <delete dir="${build.jsr166e.dir}"/>
1247  </target>
1248
1249
1250  <target name="jsr166edist-jar"
1251          depends="jsr166eclean, jsr166ejar">
1252    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1253  </target>
1254
1255  <target name="jsr166edist-docs"
1256          depends="jsr166eclean, jsr166edocs">
1257    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1258  </target>
1259
1260
1261 <!-- Find buglets that can be detected by static build tools -->
1262
1263  <target name="lint">
1264    <antcall target="dists">
1265      <param name="build.javadoc.access" value="public"/>
1266    </antcall>
1267  </target>
1268
1269 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1270  <target name="lint-private">
1271    <antcall target="dist">
1272      <param name="build.javadoc.access" value="private"/>
1273    </antcall>
1274  </target>
1275
1276
846   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines