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.65 by jsr166, Fri Apr 9 20:10:29 2004 UTC vs.
Revision 1.201 by dl, Sat Mar 26 12:35:25 2016 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if" xmlns:unless="ant:unless">
3  
4    <description>
5   ------------------------------------------------------------------------------
# Line 8 | Line 9
9  
10    User-specific settings are read from user.properties.
11    See user.properties.sample for an explanation of some useful settings.
12 +
13 +  The repository contains all dependencies except for ant and the JDK
14 +  itself.  Because the JDK version matters and because different
15 +  targets require different JDKs, we assume that users have created a
16 +  hierarchy containing:
17 +  $HOME/jdk/jdk6
18 +  $HOME/jdk/jdk7
19 +  $HOME/jdk/jdk8
20 +  $HOME/jdk/jdk9
21 +  where each of the above is a JDK or a symlink to same, and
22 +  $HOME/jdk/src/jdk6
23 +  $HOME/jdk/src/jdk7
24 +  $HOME/jdk/src/jdk8
25 +  $HOME/jdk/src/jdk9
26 +  where each of the above is a complete JDK source tree
27 +  (e.g. mercurial forest) or a symlink to same.
28 +
29 +  Alternatively, define ant variables thus:
30 +  ant -Djdk$N.home=... -Djdk$N.src.home=...
31 +  for $N in 6 7 8 9 ...
32 +
33 +  As of 2015-09, there is incomplete hacky support for jigsaw
34 +  Build for jigsaw using something like:
35 +  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist
36 +  "docs" target is still broken.
37   ------------------------------------------------------------------------------
38    </description>
39  
40 <  <target name="usage" description="Advises user to run with -projecthelp">
41 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
40 >  <!-- Display main targets by running 'ant -projecthelp' -->
41 >  <target name="usage">
42 >    <java classname="org.apache.tools.ant.Main">
43 >      <arg value="-projecthelp" />
44 >    </java>
45    </target>
46  
47 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
48  
49    <!-- User-specific settings -->
50    <property file="user.properties"/>
51  
52  
53    <!-- Compilation options -->
54 <  <property name="build.sourcelevel"    value="1.5"/>
54 >  <property name="build.sourcelevel"    value="6"/>
55    <property name="build.debug"          value="true"/>
56    <property name="build.debuglevel"     value="source,lines,vars"/>
57    <property name="build.deprecation"    value="false"/>
58 +  <property name="build.javadoc.access" value="protected"/>
59  
60    <!-- Build locations -->
61 <  <property name="build.dir"            location="build"/>
62 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
63 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
64 <  <property name="build.j1.dir"         location="${build.dir}/j1"/>
65 <  <property name="build.loops.dir"      location="${build.dir}/loops"/>
66 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
67 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
68 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
69 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
70 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
71 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
72 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
73 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
61 >  <property name="build.dir"                   location="build"/>
62 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
63 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
64 >  <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"/>
86 >
87 >  <!-- JDK locations -->
88 >  <property name="jdks.home"  location="${user.home}/jdk"/>
89 >
90 >  <macrodef name="defjdklocations">
91 >    <attribute name="v"/>
92 >    <sequential>
93 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
94 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
95 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
96 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
97 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
98 >    <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"/>
117 >    </sequential>
118 >  </macrodef>
119 >
120 >  <macrodef name="mirror-dir">
121 >    <attribute name="src"/>
122 >    <attribute name="dst"/>
123 >    <sequential>
124 >    <delete dir="@{dst}"/>
125 >    <mkdir dir="@{dst}"/>
126 >    <copy todir="@{dst}" preservelastmodified="true">
127 >      <fileset dir="@{src}"/>
128 >    </copy>
129 >    </sequential>
130 >  </macrodef>
131 >
132 >  <defjdklocations v="6"/>
133 >  <defjdklocations v="7"/>
134 >  <defjdklocations v="8"/>
135 >  <defjdklocations v="9"/>
136  
137    <!-- Source locations -->
138    <property name="src.dir"              location="${basedir}/src/main"/>
139    <property name="test.src.dir"         location="${basedir}/src/test"/>
47  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
140    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
141    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
142 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
143 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
144 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
142 >  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
143 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
144 >  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
145 >  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
146    <property name="lib.dir"              location="${basedir}/lib"/>
147    <property name="dist.dir"             location="${basedir}/dist"/>
148 <
149 <  <!-- Distribution locations -->
150 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
148 >  <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"/>
155 >
156 >  <!-- Javadoc locations -->
157 >  <property name="docs.dir"          location="${build.dir}/docs"/>
158 >  <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"/>
172  
173    <!-- Jar locations -->
174 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
175 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
174 >  <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"/>
181 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
182 >
183 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
184 >  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
185 >  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
186 >  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
187 >  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
188 >  <!-- The expected canonical location does not yet exist as of 2016-03 -->
189 >  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
190 >  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
191 >  <!-- Default jdk doc location (latest stable release seems best) -->
192 >  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
193 >
194 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
195 >  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
196 >  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
197 >  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
198 >  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
199 >  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
200 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
201 >
202 >  <!-- Define the "jtreg" task -->
203 >  <!-- See the docs in "jtreg -onlineHelp" -->
204 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
205 >           classpath="${lib.dir}/jtreg.jar" />
206 >
207 >  <!-- Tck options; see JSR166TestCase.java
208 >   To profile a single tck test class:
209 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
210 >   To stress test a single tck test class:
211 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
212 >   To stress test a single tck test method:
213 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
214 >  -->
215 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
216 >  <macrodef name="run-tck-tests">
217 >    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
218 >    <attribute name="target"/>
219 >    <attribute name="compile-target" default="@{target}"/>
220 >    <attribute name="workdir"/>
221 >    <attribute name="classes"/>
222 >    <!--
223 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
224 >    -->
225 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
226 >    <element name="javac-elements" optional="true"/>
227  
228 <  <!-- Bootclasspath argument -->
64 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
228 >    <sequential>
229  
230 <  <!-- Test classpath -->
231 <  <path id="test.classpath">
232 <    <pathelement location="${build.testcases.dir}"/>
233 <    <pathelement location="${junit.jar}"/>
234 <  </path>
230 >    <local name="modules"/>
231 >    <condition property="modules">
232 >      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233 >    </condition>
234 >
235 >    <mkdir dir="@{workdir}/tck-classes"/>
236 >
237 >    <javac srcdir="@{tck.src.dir}"
238 >           destdir="@{workdir}/tck-classes"
239 >           debug="${build.debug}"
240 >           debuglevel="${build.debuglevel}"
241 >           deprecation="${build.deprecation}"
242 >           source="@{compile-target}"
243 >           target="@{compile-target}"
244 >           classpath="${junit.jar}"
245 >           includeAntRuntime="false"
246 >           includeJavaRuntime="false"
247 >           executable="${javac@{compile-target}}"
248 >           fork="true">
249 >
250 >      <include name="*.java"/>
251 >      <compilerarg value="-XDignore.symbol.file=true"/>
252 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
253 >      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
254 >      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
255 >      <compilerarg line="${build.args}"/>
256 >      <javac-elements/>
257 >
258 >    </javac>
259 >
260 >    <java classname="${jsr166.tckTestClass}"
261 >          failonerror="true"
262 >          jvm="${java@{target}}"
263 >          fork="true">
264 >        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
265 >        <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
266 >        <jvmarg line="@{jvmflags}"/>
267 >
268 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
269 >        <syspropertyset id="system-properties-used-by-tck">
270 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
271 >          <propertyref prefix="jsr166."/>
272 >          <propertyref name="test.timeout.factor"/>
273 >        </syspropertyset>
274 >
275 >        <classpath>
276 >          <pathelement location="${junit.jar}"/>
277 >          <pathelement location="@{workdir}/tck-classes"/>
278 >        </classpath>
279 >    </java>
280 >
281 >    </sequential>
282 >  </macrodef>
283 >
284 >  <!-- Define jtreg test sets for different jdk versions -->
285 >  <fileset dir="${jtreg9.src.dir}">
286 >    <patternset id="jdk9.jtreg.tests">
287 >      <include name="**/*.java"/>
288 >    </patternset>
289 >  </fileset>
290 >
291 >  <fileset dir="${jtreg8.src.dir}">
292 >    <patternset id="jdk8.jtreg.tests">
293 >      <include name="**/*.java"/>
294 >      <exclude name="**/SpliteratorCharacteristics.java"/>
295 >      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
296 >      <exclude name="**/GCDuringIteration.java"/>
297 >    </patternset>
298 >  </fileset>
299 >
300 >  <fileset dir="${jtreg7.src.dir}">
301 >    <patternset id="jdk7.jtreg.tests">
302 >      <include name="**/*.java"/>
303 >    </patternset>
304 >  </fileset>
305 >
306 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
307 >  <property name="jtreg.flags" value=""/>
308 >
309 >  <macrodef name="run-jtreg-tests">
310 >    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
311 >    <attribute name="source" default="7"/>
312 >    <attribute name="target"/>
313 >    <attribute name="workdir"/>
314 >    <attribute name="classes"/>
315 >    <attribute name="jtregflags" default=""/>
316 >
317 >    <sequential>
318 >
319 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
320 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
321 >
322 >    <local name="modules"/>
323 >    <condition property="modules">
324 >      <available file="${jdk@{target}.home}/jmods" type="dir"/>
325 >    </condition>
326 >
327 >    <delete dir="@{workdir}/JTwork"   quiet="true"/>
328 >    <delete dir="@{workdir}/JTreport" quiet="true"/>
329 >    <mkdir dir="@{workdir}/JTwork/scratch"/>
330 >    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
331 >    <mkdir dir="@{workdir}/JTreport/html"/>
332 >    <mkdir dir="@{workdir}/JTreport/text"/>
333 >    <jtreg dir="${jtreg@{target}.src.dir}"
334 >           jdk="${jdk@{target}.home}"
335 >           workDir="@{workdir}/JTwork"
336 >           reportDir="@{workdir}/JTreport">
337 >      <patternset refid="jdk@{target}.jtreg.tests"/>
338 >      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
339 >      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
340 >      <arg value="-agentvm"/>
341 >      <arg value="-verbose:${jtreg.verbose}"/>
342 >      <arg value="-vmoptions:-esa -ea"/>
343 >      <arg value="-automatic"/>
344 >      <arg value="-k:!ignore"/>
345 >      <arg line="@{jtregflags}"/>
346 >      <arg line="${jtreg.flags}"/>
347 >    </jtreg>
348 >    </sequential>
349 >  </macrodef>
350  
351    <!-- ALoops classpath -->
352    <path id="loops.classpath">
353      <pathelement location="${build.loops.dir}"/>
354    </path>
355  
356 <  <!-- J1 classpath -->
357 <  <path id="j1.classpath">
358 <    <pathelement location="${build.j1.dir}"/>
80 <    <pathelement location="${junit.jar}"/>
81 <  </path>
82 <
356 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
357 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
358 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
359  
360    <!-- Main targets -->
361  
362 +  <property name="build.main.java.version" value="9"/>
363 +  <property name="build.main.javac" value="${javac9}"/>
364 +
365 +  <target name="dists"
366 +          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
367 +          description="Builds all public jars and docs"/>
368  
369    <target name="compile"
370 <          depends="init, configure-compiler"
371 <          description="Compiles main sources to build folder">
370 >          depends="configure-compiler"
371 >          description="Compiles src/main sources to build dir">
372  
373 <    <mkdir dir="${build.classes.dir}"/>
373 >    <local name="modules"/>
374 >    <condition property="modules">
375 >      <and>
376 >        <available file="${jdk9.home}/jmods" type="dir"/>
377 >        <equals arg1="9" arg2="${build.main.java.version}"/>
378 >      </and>
379 >    </condition>
380  
381 <    <javac srcdir="${src.dir}"
382 <          destdir="${build.classes.dir}"
383 <            debug="${build.debug}"
384 <       debuglevel="${build.debuglevel}"
385 <      deprecation="${build.deprecation}"
98 <           source="${build.sourcelevel}"
99 <             fork="true">
381 >    <local name="destdir"/>
382 >    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
383 >    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
384 >
385 >    <mkdir dir="${destdir}"/>
386  
387 +    <javac srcdir="${src.dir}"
388 +           destdir="${destdir}"
389 +           debug="${build.debug}"
390 +           debuglevel="${build.debuglevel}"
391 +           deprecation="${build.deprecation}"
392 +           classpath=""
393 +           includeAntRuntime="false"
394 +           includeJavaRuntime="false"
395 +           executable="${build.main.javac}"
396 +           fork="true">
397 +
398 +      <include name="**/*.java"/>
399 +      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
400 +      <compilerarg value="-Xprefer:source"/>
401 +      <compilerarg value="-XDignore.symbol.file=true"/>
402 +      <compilerarg value="-Xlint:all"/>
403 +      <compilerarg value="-Werror"/>
404 +      <compilerarg value="-Xdoclint:all/protected"/>
405 +      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
406        <compilerarg line="${build.args}"/>
407  
408      </javac>
409  
410 +    <!-- We need jdk9's Contended annotation, but at compile time only -->
411 +    <!--
412 +        <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
413 +    -->
414    </target>
415  
416  
108
417    <target name="jar"
418            depends="compile"
419            description="Builds library jar from compiled sources">
420  
113    <mkdir dir="${build.lib.dir}"/>
114
421      <jar destfile="${product.jar}">
422        <fileset dir="${build.classes.dir}"/>
423 +      <manifest>
424 +        <attribute name="Built-By" value="${user.name}"/>
425 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
426 +      </manifest>
427      </jar>
118
428    </target>
429  
430  
122
123  <target name="test"
124          depends="init, configure-tests, report-tests"
125          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
126
127
128
431    <target name="docs"
432 <          description="Builds javadocs with custom tags to build folder">
131 <
132 <    <delete dir="${build.javadocs.dir}"/>
133 <    <mkdir dir="${build.javadocs.dir}"/>
134 <
135 <    <javadoc destdir="${build.javadocs.dir}"
136 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
137 <            overview="${src.dir}/intro.html"
138 <              source="${build.sourcelevel}">
139 <
140 <      <tag name="revised" description="Last revised:"/>
141 <      <tag name="spec"    description="Specified by:"/>
142 <
143 <      <packageset dir="${src.dir}"/>
144 <
145 <    </javadoc>
146 <
147 <  </target>
432 >          description="Builds javadocs for src/main to dist dir">
433  
434 +    <delete dir="${docs.dir}"/>
435 +    <mkdir dir="${docs.dir}"/>
436  
437 +    <!-- the packagenames="none" hack below prevents scanning the -->
438 +    <!-- sourcepath for packages -->
439  
440 <  <target name="doccheck"
441 <          depends="filter-doccheck"
442 <          description="Reports on javadoc style errors">
443 <
444 <    <delete dir="${build.doccheck.dir}"/>
445 <    <mkdir dir="${build.doccheck.dir}"/>
446 <
447 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
448 <         docletpath="${lib.dir}/doccheck.jar"
449 <            destdir="${build.doccheck.dir}">
450 <      <packageset dir="${build.dc-filter.dir}"/>
440 >    <javadoc destdir="${docs.dir}"
441 >             packagenames="none"
442 >             link="${java9.api.url}"
443 >             overview="${src.dir}/intro.html"
444 >             access="${build.javadoc.access}"
445 >             sourcepath="${src.dir}:${jdk9.src.dir}"
446 >             classpath=""
447 >             executable="${javadoc9}">
448 >      <fileset dir="${src.dir}" defaultexcludes="yes">
449 >        <include name="**/*.java"/>
450 >      </fileset>
451 >      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
452 >      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
453 >      <arg value="-XDignore.symbol.file=true"/>
454 > <!--  TODO     <arg value="-Xmodule:java.base"/> -->
455 >      <arg value="-tag"/>
456 >      <arg value="${javadoc.jls.option}"/>
457 >      <arg value="-tag"/>
458 >      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
459 >      <arg value="-tag"/>
460 >      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
461 >      <arg value="-tag"/>
462 >      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
463 > <!-- tags added in jdk9 -->
464 >      <arg value="-tag"/>
465 >      <arg value="revised:X"/>
466 >      <arg value="-tag"/>
467 >      <arg value="spec:X"/>
468      </javadoc>
163
164    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
165
166  </target>
167
168
169
170  <target name="checkstyle"
171          depends="filter-src"
172          description="Reports on style errors in Java source (verbose, mostly chaff)">
173
174    <taskdef resource="checkstyletask.properties"
175            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
176
177    <mkdir dir="${build.checkstyle.dir}"/>
178
179    <checkstyle config="etc/checkstyle/sun_checks.xml"
180       failOnViolation="false">
181      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
182      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
183    </checkstyle>
184
185    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
186          out="${build.checkstyle.dir}/checkstyle-report.html"
187        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
188
469    </target>
470  
471  
192
472    <target name="dist"
473 <          depends="init, dist-clean, dist-jar, dist-docs"
473 >          depends="dist-clean, dist-jar, dist-docs"
474            description="Puts all distributable products in single hierarchy"/>
475  
476  
198
477    <target name="release"
478            depends="dist"
479            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 210 | Line 488
488        <exclude name="src/emulation/**"/>
489        <exclude name="**/SyntaxTest.java"/>
490        <exclude name="**/SuperfluousAbstract.java"/>
491 +      <manifest>
492 +        <attribute name="Built-By" value="${user.name}"/>
493 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
494 +      </manifest>
495      </jar>
214
496    </target>
497  
498  
218
499    <target name="clean"
500            description="Removes all build products">
501  
502      <delete dir="${build.dir}"/>
223    <delete dir="${build.classes.dir}"/>
224    <delete dir="${build.lib.dir}"/>
503  
504    </target>
505  
506  
229
507    <target name="dist-clean"
508            description="Removes all build and distribution products">
509  
510 +    <delete dir="${build.dir}"/>
511      <delete dir="${dist.dir}"/>
512  
513    </target>
514  
515  
516 +  <target name="dist-jar"
517 +          depends="clean, jar">
518 +    <copy file="${product.jar}" todir="${dist.dir}"/>
519 +  </target>
520  
521    <target name="dist-docs"
522 <          description="Builds javadocs without custom tags to dist folder">
522 >          depends="clean, docs">
523 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
524 >  </target>
525 >
526 >  <target name="tck"
527 >          depends="jar"
528 >          description="Runs tck tests for main directly">
529  
530 <    <delete dir="${dist.javadocs.dir}"/>
531 <    <mkdir dir="${dist.javadocs.dir}"/>
530 >    <run-tck-tests
531 >      target="${build.main.java.version}"
532 >      workdir="${build.dir}"
533 >      classes="${product.jar}"/>
534 >  </target>
535  
536 <    <javadoc destdir="${dist.javadocs.dir}"
537 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
538 <            overview="${src.dir}/intro.html"
539 <              source="${build.sourcelevel}">
536 >  <target name="tck-parallelism-1"
537 >          description="Runs tck with given common pool parallelism">
538 >    <antcall target="tck">
539 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
540 >    </antcall>
541 >  </target>
542  
543 <      <packageset dir="${src.dir}"/>
543 >  <target name="tck-parallelism-0"
544 >          description="Runs tck with given common pool parallelism">
545 >    <antcall target="tck">
546 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
547 >    </antcall>
548 >  </target>
549  
550 <    </javadoc>
550 >  <target name="jtreg"
551 >          depends="jar"
552 >          description="Runs jtreg tests for main using the jtreg ant task">
553 >    <run-jtreg-tests
554 >       target="${build.main.java.version}"
555 >       workdir="${build.dir}"
556 >       classes="${product.jar}"/>
557 >  </target>
558  
559 +  <target name="test"
560 +          depends="tck, tck-parallelism-1, jtreg"
561 +          description="Runs tck and jtreg tests for main">
562    </target>
563  
564 +  <target name="jtreg8" description="Runs jtreg tests with jdk8">
565  
566 +    <antcall target="jtreg">
567 +      <param name="build.main.java.version" value="8"/>
568 +      <param name="build.main.javac" value="${javac8}"/>
569 +    </antcall>
570  
571 <  <!-- Internal targets -->
571 >  </target>
572  
573 +  <target name="test89"
574 +          description="Runs tck and jtreg tests for main for multiple java versions">
575  
576 <  <target name="init">
576 >    <antcall target="clean"/>
577 >    <antcall target="test">
578 >      <param name="build.main.java.version" value="8"/>
579 >      <param name="build.main.javac" value="${javac8}"/>
580 >    </antcall>
581  
582 <    <!-- Version is kept in a separate file -->
583 <    <loadfile property="version" srcFile="version.properties"/>
584 <    <echo>Building JSR-166 version ${version}</echo>
585 <    <echo>java.home is ${java.home}</echo>
582 >    <antcall target="clean"/>
583 >    <antcall target="test">
584 >      <param name="build.main.java.version" value="9"/>
585 >      <param name="build.main.javac" value="${javac9}"/>
586 >    </antcall>
587  
588    </target>
589  
590  
271  <target name="dist-jar"
272          depends="clean, jar">
591  
592 <    <copy file="${product.jar}" todir="${dist.dir}"/>
592 >  <target name="configure-compiler">
593 >    <fail message="ant version too old">
594 >      <condition>
595 >        <not> <antversion atleast="1.9.1"/> </not>
596 >      </condition>
597 >    </fail>
598  
599 <  </target>
599 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
600  
601 +    <condition property="warnunchecked.arg" value="${unchecked.option}">
602 +      <istrue value="${build.warnunchecked}"/>
603 +    </condition>
604  
605 <  <target name="compile-ant-filter"
280 <          depends="init">
605 >    <property name="warnunchecked.arg" value=""/>
606  
282    <mkdir dir="${build.ant.dir}"/>
607  
608 <    <javac srcdir="${ant.src.dir}"
609 <          destdir="${build.ant.dir}"
286 <           source="1.4"/>
608 >    <!-- Common options in javac invocations -->
609 >    <property name="build.args" value="${warnunchecked.arg}"/>
610  
611    </target>
612  
613  
291  <target name="filter-src"
292          depends="compile-ant-filter">
614  
615 <    <mkdir dir="${build.filter.src.dir}"/>
615 >  <!-- Various demos and test programs -->
616  
296    <copy todir="${build.filter.src.dir}">
297      <fileset dir="${src.dir}">
298        <include name="**/*.html"/>
299      </fileset>
300    </copy>
617  
618 <    <copy todir="${build.filter.src.dir}">
619 <      <fileset dir="${src.dir}">
304 <        <exclude name="**/*.html"/>
305 <        <!-- Files excluded from dist-docs -->
306 <        <exclude name="java/util/Random.*"/>
307 <        <exclude name="sun/misc/Unsafe.*"/>
308 <      </fileset>
309 <      <!--
310 <      <filterchain>
311 <      -->
312 <
313 <        <!--
314 <         # This filter gets rid of angle-bracketed type parameters
315 <         # so that javadoc can run on the result. The following
316 <         # heuristic seems to work:
317 <         #
318 <         # For all lines not starting with space(s)-asterisk-space(s),
319 <         #   replace <something> with a space, where there may be more
320 <         #   than one right angle bracket at the end, and "something"
321 <         #   must not contain parens or pipes. (This may need some
322 <         #   tweaking.)
323 <         -->
324 <
325 <        <!--
326 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
327 <                      classpath="${build.ant.dir}">
328 <          <param name="notmatching" value="^\s+\*\s.*$"/>
329 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
330 <          <param name="replacement" value=" "/>
331 <        </filterreader>
332 <        -->
333 <
334 <      <!--
335 <      </filterchain>
336 <      -->
337 <    </copy>
618 >  <target name="loops" depends="configure-compiler"
619 >          description="Benchmark from Doug Lea's AQS paper">
620  
621 <  </target>
621 >    <mkdir dir="${build.loops.dir}"/>
622  
623 +    <javac srcdir="${loops.src.dir}"
624 +          destdir="${build.loops.dir}"
625 +            debug="${build.debug}"
626 +       debuglevel="${build.debuglevel}"
627 +      deprecation="${build.deprecation}"
628 +           source="${build.sourcelevel}"
629 +           target="${build.sourcelevel}"
630 +             fork="true">
631  
632 <  <target name="filter-doccheck"
633 <          depends="filter-src">
632 >      <compilerarg line="${build.args}"/>
633 >      <classpath refid="loops.classpath"/>
634 >      <compilerarg value="-XDignore.symbol.file=true"/>
635  
636 <    <mkdir dir="${build.dc-filter.dir}"/>
636 >    </javac>
637  
638 <    <copy todir="${build.dc-filter.dir}">
639 <      <fileset dir="${build.filter.src.dir}">
640 <        <include name="**/*.html"/>
350 <      </fileset>
351 <    </copy>
638 >    <java classname="ALoops" fork="true">
639 >      <classpath refid="loops.classpath"/>
640 >    </java>
641  
642 <    <property name="generic.declarations"
354 <             value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
355 <    />
356 <
357 <    <copy todir="${build.dc-filter.dir}">
358 <      <fileset dir="${build.filter.src.dir}">
359 <        <exclude name="**/*.html"/>
360 <      </fileset>
361 <      <filterchain>
362 <        <!--
363 <         # These two filters try to make the source look like
364 <         # something that doccheck can process. The first removes
365 <         # -source 1.4 assertions and the second adds in a bunch
366 <         # of single letter public nested marker interfaces so that
367 <         # the generic type parameters are recognized.
368 <         -->
369 <
370 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
371 <                      classpath="${build.ant.dir}">
372 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
373 <          <param name="pattern"     value="assert"/>
374 <          <param name="replacement" value="//assert"/>
375 <        </filterreader>
376 <
377 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
378 <                      classpath="${build.ant.dir}">
379 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
380 <          <param name="pattern"     value="$"/>
381 <          <param name="replacement" value=" ${generic.declarations}"/>
382 <        </filterreader>
642 >  </target>
643  
384      </filterchain>
385    </copy>
644  
645 <  </target>
645 >  <target name="compile-test-loops" depends="jar"
646 >          description="compile all the perf tests in src/test/loops">
647  
648 +    <mkdir dir="${build.dir}/test/loops"/>
649  
650 <  <target name="compile-tests"
651 <          depends="jar">
650 >    <javac srcdir="${basedir}/src/test/loops"
651 >           destdir="${build.dir}/test/loops"
652 >           debug="${build.debug}"
653 >           debuglevel="${build.debuglevel}"
654 >           deprecation="${build.deprecation}"
655 >           includeAntRuntime="false"
656 >           includeJavaRuntime="false"
657 >           executable="${javac9}"
658 >           fork="true">
659 >
660 >      <include name="*.java"/>
661 >      <compilerarg value="-XDignore.symbol.file=true"/>
662 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
663 >      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
664 >      <compilerarg line="${build.args}"/>
665  
666 <    <mkdir dir="${build.testcases.dir}"/>
666 >    </javac>
667 >
668 >  </target>
669  
395    <javac srcdir="${tck.src.dir}"
396          destdir="${build.testcases.dir}"
397            debug="${build.debug}"
398       debuglevel="${build.debuglevel}"
399      deprecation="${build.deprecation}"
400           source="${build.sourcelevel}"
401             fork="true">
670  
671 <      <compilerarg value="${bootclasspath.args}"/>
671 >  <!-- jsr166 4jdk8 -->
672 >
673 >  <target name="4jdk8compile"
674 >          depends="configure-compiler"
675 >          description="Compiles src/jdk8 sources, targeting jdk8">
676 >
677 >    <mkdir dir="${build.4jdk8.classes.dir}"/>
678 >
679 >    <javac srcdir="${4jdk8src.dir}"
680 >           destdir="${build.4jdk8.classes.dir}"
681 >           debug="${build.debug}"
682 >           debuglevel="${build.debuglevel}"
683 >           deprecation="${build.deprecation}"
684 >           source="8"
685 >           target="8"
686 >           classpath=""
687 >           bootclasspath="${bootclasspath8}"
688 >           includeAntRuntime="false"
689 >           includeJavaRuntime="false"
690 >           executable="${javac8}"
691 >           fork="true">
692 >
693 >      <include name="**/*.java"/>
694 >      <compilerarg value="-Xprefer:source"/>
695 >      <compilerarg value="-XDignore.symbol.file=true"/>
696 >      <compilerarg value="-Xlint:all"/>
697 >      <compilerarg value="-Werror"/>
698        <compilerarg line="${build.args}"/>
699  
700 <      <classpath refid="test.classpath"/>
700 >    </javac>
701 >  </target>
702 >
703 >  <target name="4jdk8doclint"
704 >          depends="configure-compiler"
705 >          description="Finds doclint warnings">
706 >
707 >    <mkdir dir="${build.4jdk8.classes.dir}"/>
708 >
709 >    <javac srcdir="${4jdk8src.dir}"
710 >           destdir="${build.4jdk8.classes.dir}"
711 >           debug="${build.debug}"
712 >           debuglevel="${build.debuglevel}"
713 >           deprecation="${build.deprecation}"
714 >           source="8"
715 >           target="8"
716 >           classpath=""
717 >           bootclasspath="${bootclasspath8}"
718 >           includeAntRuntime="false"
719 >           includeJavaRuntime="false"
720 >           executable="${javac8}"
721 >           fork="true">
722 >
723 >      <include name="**/*.java"/>
724 >      <compilerarg value="-Xprefer:source"/>
725 >      <compilerarg value="-XDignore.symbol.file=true"/>
726 >      <compilerarg value="-Xlint:all"/>
727 >      <compilerarg value="-Xdoclint:all/protected"/>
728 >      <compilerarg line="${build.args}"/>
729  
730      </javac>
731 +  </target>
732  
410    <javac srcdir="${test.src.dir}"
411          destdir="${build.testcases.dir}"
412            debug="${build.debug}"
413       debuglevel="${build.debuglevel}"
414      deprecation="${build.deprecation}"
415           source="${build.sourcelevel}"
416             fork="true">
733  
734 <      <include name="jsr166/test/**"/>
734 >  <target name="4jdk8jar"
735 >          depends="4jdk8compile"
736 >          description="Builds library jar from compiled sources">
737  
738 <      <compilerarg value="${bootclasspath.args}"/>
739 <      <compilerarg line="${build.args}"/>
738 >    <jar destfile="${4jdk8product.jar}">
739 >      <fileset dir="${build.4jdk8.classes.dir}"/>
740 >      <manifest>
741 >        <attribute name="Built-By" value="${user.name}"/>
742 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
743 >      </manifest>
744 >    </jar>
745  
746 <      <classpath refid="test.classpath"/>
746 >  </target>
747  
425    </javac>
748  
749 < <!--
750 <    <javac srcdir="${jtreg.src.dir}"
751 <          destdir="${build.testcases.dir}"
752 <            debug="${build.debug}"
753 <       debuglevel="${build.debuglevel}"
754 <      deprecation="${build.deprecation}"
755 <           source="${build.sourcelevel}"
756 <             fork="true">
749 >  <target name="4jdk8-tck"
750 >          depends="4jdk8jar"
751 >          description="Runs tck tests for jsr166-4jdk8 directly">
752 >
753 >    <run-tck-tests
754 >      target="8"
755 >      workdir="${build.4jdk8.dir}"
756 >      classes="${4jdk8product.jar}">
757 >      <javac-elements>
758 >        <!-- JDK9+ test classes -->
759 >        <exclude name="*9Test.java"/>
760 >        <exclude name="*10Test.java"/>
761 >      </javac-elements>
762 >    </run-tck-tests>
763 >  </target>
764  
436      <compilerarg value="${bootclasspath.args}"/>
437      <compilerarg line="${build.args}"/>
765  
766 <      <classpath refid="test.classpath"/>
766 >  <target name="4jdk8-jtreg"
767 >          depends="4jdk8jar"
768 >          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
769 >    <run-jtreg-tests
770 >       target="8"
771 >       workdir="${build.4jdk8.dir}"
772 >       classes="${4jdk8product.jar}"/>
773 >  </target>
774  
441    </javac>
442 -->
775  
776 +  <target name="4jdk8-test"
777 +          depends="4jdk8-tck, 4jdk8-jtreg"
778 +          description="Runs tck and jtreg tests for jsr166-4jdk8">
779    </target>
780  
781  
782 <  <target name="run-tests"
783 <          depends="compile-tests">
782 >  <target name="4jdk8docs"
783 >          description="Builds javadocs for src/jdk8 to dist dir">
784 >
785 >    <delete dir="${4jdk8docs.dir}"/>
786 >    <mkdir dir="${4jdk8docs.dir}"/>
787 >
788 >    <javadoc destdir="${4jdk8docs.dir}"
789 >             packagenames="none"
790 >             link="${java8.api.url}"
791 >             overview="${4jdk8src.dir}/intro.html"
792 >             access="${build.javadoc.access}"
793 >             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
794 >             classpath=""
795 >             executable="${javadoc8}">
796 >      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
797 >        <include name="**/*.java"/>
798 >      </fileset>
799 >      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
800 >      <arg value="-XDignore.symbol.file=true"/>
801 >      <arg value="-tag"/>
802 >      <arg value="${javadoc.jls.option}"/>
803 >      <arg value="-tag"/>
804 >      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
805 >      <arg value="-tag"/>
806 >      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
807 >      <arg value="-tag"/>
808 >      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
809 >    </javadoc>
810 >  </target>
811  
450    <!-- May be overridden by user.properties -->
451    <property name="testcase" value="*"/>
812  
813 <    <mkdir dir="${build.reports.dir}"/>
813 >  <target name="4jdk8dist"
814 >          depends="4jdk8dist-jar, 4jdk8dist-docs"
815 >          description="Puts all distributable products in single hierarchy"/>
816  
455    <junit printsummary="true"
456             showoutput="true"
457          errorProperty="junit.failed"
458        failureProperty="junit.failed"
459                    dir="${build.reports.dir}"
460                   fork="true">
817  
818 <      <jvmarg value="${bootclasspath.args}"/>
819 <      <jvmarg value="-server"/>
464 <      <jvmarg value="-showversion"/>
818 >  <target name="4jdk8clean"
819 >          description="Removes all 4jdk8 build products">
820  
821 <      <classpath refid="test.classpath"/>
821 >    <delete dir="${build.4jdk8.dir}"/>
822  
823 <      <formatter type="xml"/>
823 >  </target>
824  
470      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
471        <fileset dir="${tck.src.dir}">
472          <include name="**/${testcase}Test.java"/>
473        </fileset>
474      </batchtest>
475
476      <batchtest todir="${build.reports.dir}" if="do.test.old">
477        <fileset dir="${test.src.dir}">
478          <include name="jsr166/test/**/${testcase}Test.java"/>
479        </fileset>
480      </batchtest>
481
482 <!--
483      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
484        <fileset dir="${jtreg.src.dir}">
485          <include name="**/${testcase}Test.java"/>
486        </fileset>
487      </batchtest>
488 -->
825  
826 <    </junit>
826 >  <target name="4jdk8dist-jar"
827 >          depends="4jdk8clean, 4jdk8jar">
828 >    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
829 >  </target>
830 >
831  
832 +  <target name="4jdk8dist-docs"
833 +          depends="4jdk8clean, 4jdk8docs">
834 +    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
835    </target>
836  
837  
495  <target name="report-tests"
496          depends="run-tests">
838  
839 <    <!-- Sets junit.report.format to frames if redirection is present,
840 <         otherwise sets it to noframes. -->
841 <    <available property="junit.report.format"
842 <                  value="frames"
843 <              classname="org.apache.xalan.lib.Redirect"
844 <    />
845 <    <property name="junit.report.format" value="noframes"/>
505 <
506 <    <junitreport todir="${build.reports.dir}">
507 <      <fileset dir="${build.reports.dir}">
508 <        <include name="TEST-*.xml"/>
509 <      </fileset>
510 <      <report styledir="${stylesheet.dir}"
511 <                format="${junit.report.format}"
512 <                 todir="${build.reports.dir}"
513 <      />
514 <    </junitreport>
839 >  <!-- jsr166 4jdk7 -->
840 >
841 >  <target name="4jdk7compile"
842 >          depends="configure-compiler"
843 >          description="Compiles src/jdk7 sources, targeting jdk7">
844 >
845 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
846  
847 <    <fail message="Test Cases Failed" if="junit.failed"/>
847 >    <javac srcdir="${4jdk7src.dir}"
848 >           destdir="${build.4jdk7.classes.dir}"
849 >           debug="${build.debug}"
850 >           debuglevel="${build.debuglevel}"
851 >           deprecation="${build.deprecation}"
852 >           source="6"
853 >           target="6"
854 >           classpath=""
855 >           bootclasspath="${bootclasspath6}"
856 >           includeAntRuntime="false"
857 >           includeJavaRuntime="false"
858 >           executable="${javac7}"
859 >           fork="true">
860 >
861 >      <include name="**/*.java"/>
862 >      <compilerarg value="-Xprefer:source"/>
863 >      <compilerarg value="-XDignore.symbol.file=true"/>
864 >      <compilerarg value="-Xlint:all"/>
865 >      <compilerarg value="-Werror"/>
866 >      <compilerarg line="${build.args}"/>
867  
868 +    </javac>
869    </target>
870  
871 +  <target name="4jdk7doclint"
872 +          depends="configure-compiler"
873 +          description="Finds doclint warnings">
874 +
875 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
876 +
877 +    <javac srcdir="${4jdk7src.dir}"
878 +           destdir="${build.4jdk7.classes.dir}"
879 +           debug="${build.debug}"
880 +           debuglevel="${build.debuglevel}"
881 +           deprecation="${build.deprecation}"
882 +           source="6"
883 +           target="6"
884 +           classpath=""
885 +           bootclasspath="${bootclasspath6}"
886 +           includeAntRuntime="false"
887 +           includeJavaRuntime="false"
888 +           executable="${javac8}"
889 +           fork="true">
890 +
891 +      <include name="**/*.java"/>
892 +      <compilerarg value="-Xprefer:source"/>
893 +      <compilerarg value="-XDignore.symbol.file=true"/>
894 +      <compilerarg value="-Xlint:all"/>
895 +      <compilerarg value="-Xdoclint:all/protected"/>
896 +      <compilerarg line="${build.args}"/>
897  
898 <  <target name="configure-compiler">
898 >    </javac>
899 >  </target>
900  
523    <property name="unchecked.option" value="-Xlint:unchecked"/>
901  
902 <    <condition property="warnunchecked.arg" value="${unchecked.option}">
903 <      <istrue value="${build.warnunchecked}"/>
904 <    </condition>
902 >  <target name="4jdk7jar"
903 >          depends="4jdk7compile"
904 >          description="Builds library jar from compiled sources">
905  
906 <    <property name="warnunchecked.arg" value=""/>
906 >    <jar destfile="${4jdk7product.jar}">
907 >      <fileset dir="${build.4jdk7.classes.dir}"/>
908 >      <manifest>
909 >        <attribute name="Built-By" value="${user.name}"/>
910 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
911 >      </manifest>
912 >    </jar>
913  
914 +  </target>
915  
532    <!-- Common options in javac invocations -->
533    <property name="build.args" value="${warnunchecked.arg}"/>
916  
917 +  <target name="4jdk7-tck"
918 +          depends="4jdk7jar"
919 +          description="Runs tck tests for jsr166-4jdk7 directly">
920 +
921 +    <run-tck-tests
922 +      target="7"
923 +      workdir="${build.4jdk7.dir}"
924 +      classes="${4jdk7product.jar}">
925 +      <javac-elements>
926 +        <!-- JDK8+ test classes -->
927 +        <exclude name="*8Test.java"/>
928 +        <exclude name="*9Test.java"/>
929 +        <exclude name="*10Test.java"/>
930 +        <exclude name="DoubleAccumulatorTest.java"/>
931 +        <exclude name="DoubleAdderTest.java"/>
932 +        <exclude name="LongAccumulatorTest.java"/>
933 +        <exclude name="LongAdderTest.java"/>
934 +        <exclude name="CompletableFutureTest.java"/>
935 +        <exclude name="SplittableRandomTest.java"/>
936 +        <exclude name="StampedLockTest.java"/>
937 +        <exclude name="SubmissionPublisherTest.java"/>
938 +      </javac-elements>
939 +    </run-tck-tests>
940    </target>
941  
942  
943 <  <target name="configure-tests"
944 <       depends="configure-compiler">
943 >  <target name="4jdk7-tck-junit"
944 >          depends="4jdk7compile"
945 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
946  
947 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
948 <    <available property="junit.available"
949 <               classname="junit.framework.Protectable"/>
947 >    <junit printsummary="true"
948 >           showoutput="true"
949 >           errorProperty="junit.failed"
950 >           failureProperty="junit.failed"
951 >           includeantruntime="true"
952 >           jvm="${java7}"
953 >           fork="true">
954  
955 <    <!-- Xalan -->
956 <    <available property="xalan.available"
547 <               classname="org.apache.xalan.Version"/>
955 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
956 >      <jvmarg value="-server"/>
957  
958 +      <classpath>
959 +        <pathelement location="${junit.jar}"/>
960 +        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
961 +      </classpath>
962  
963 <    <!-- Ant 1.6beta and later don't need or want this check -->
551 <    <!--
552 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
553 <          unless="junit.available"/>
963 >      <formatter type="brief"/>
964  
965 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
966 <          unless="xalan.available"/>
557 <    -->
965 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
966 >      </test>
967  
968 +    </junit>
969    </target>
970  
971 +  <target name="4jdk7-jtreg"
972 +          depends="4jdk7jar"
973 +          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
974 +    <run-jtreg-tests
975 +       target="7"
976 +       workdir="${build.4jdk7.dir}"
977 +       classes="${4jdk7product.jar}"/>
978 +  </target>
979  
980  
981 <  <!-- Anthill targets -->
982 <
983 <  <target name="anthill-build">
981 >  <target name="4jdk7-test"
982 >          depends="4jdk7-tck, 4jdk7-jtreg"
983 >          description="Runs tck and jtreg tests for jsr166-4jdk7">
984 >  </target>
985  
567    <!-- Override this in user.properties -->
568    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
986  
987 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
988 <      <arg value="-Xmx256000000"/>
989 <      <!-- classpath of new JVM -->
990 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
991 <      <!-- location of Ant home directory -->
992 <      <arg value="-Dant.home=${ant.home}"/>
993 <      <!-- the Ant main class -->
994 <      <arg value="org.apache.tools.ant.Main"/>
995 <      <!-- The build file -->
996 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
997 <      <!-- the target to build on the new Ant instance -->
998 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
999 <      <arg value="do-anthill-build"/>
1000 <    </exec>
987 >  <target name="4jdk7docs"
988 >          description="Builds javadocs for src/jdk7 to dist dir">
989 >
990 >    <delete dir="${4jdk7docs.dir}"/>
991 >    <mkdir dir="${4jdk7docs.dir}"/>
992 >
993 >    <javadoc destdir="${4jdk7docs.dir}"
994 >             packagenames="none"
995 >             link="${java7.api.url}"
996 >             overview="${4jdk7src.dir}/intro.html"
997 >             access="${build.javadoc.access}"
998 >             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
999 >             classpath=""
1000 >             executable="${javadoc7}">
1001 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1002 >        <include name="**/*.java"/>
1003 >      </fileset>
1004 >      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1005 >      <arg value="-XDignore.symbol.file=true"/>
1006 >    </javadoc>
1007    </target>
1008  
586  <target name="do-anthill-build"
587          depends="jar, test, docs, dist-docs"/>
1009  
1010 <  <target name="anthill-publish">
1010 >  <target name="4jdk7dist"
1011 >          depends="4jdk7dist-jar, 4jdk7dist-docs"
1012 >          description="Puts all distributable products in single hierarchy"/>
1013  
591    <copy todir="${deployDir}/docs/private">
592      <fileset dir="${build.javadocs.dir}"/>
593    </copy>
1014  
1015 <    <copy todir="${deployDir}/docs/public">
1016 <      <fileset dir="${dist.javadocs.dir}"/>
597 <    </copy>
1015 >  <target name="4jdk7clean"
1016 >          description="Removes all 4jdk7 build products">
1017  
1018 <    <copy tofile="${deployDir}/index.html"
600 <          file="${basedir}/etc/anthill-index.html"/>
1018 >    <delete dir="${build.4jdk7.dir}"/>
1019  
1020 <    <copy todir="${deployDir}/notes">
603 <      <fileset dir="${basedir}/etc/notes"/>
604 <    </copy>
1020 >  </target>
1021  
1022 +
1023 +  <target name="4jdk7dist-jar"
1024 +          depends="4jdk7clean, 4jdk7jar">
1025 +    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1026    </target>
1027  
1028  
1029 +  <target name="4jdk7dist-docs"
1030 +          depends="4jdk7clean, 4jdk7docs">
1031 +    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1032 +  </target>
1033  
610  <!-- Various demos and test programs -->
1034  
1035 +  <!-- jsr166x -->
1036  
1037 <  <target name="sample" depends="init, configure-compiler"
1038 <          description="Standalone demo program">
1037 >  <target name="jsr166xcompile"
1038 >          depends="configure-compiler"
1039 >          description="Compiles jsr166x sources to build dir">
1040  
1041 <    <mkdir dir="${build.testcases.dir}"/>
1041 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
1042  
1043 <    <javac srcdir="${test.src.dir}"
1044 <          destdir="${build.testcases.dir}"
1045 <            debug="${build.debug}"
1046 <       debuglevel="${build.debuglevel}"
1047 <      deprecation="${build.deprecation}"
1048 <           source="${build.sourcelevel}"
1049 <             fork="true">
1043 >    <javac srcdir="${topsrc.dir}"
1044 >           destdir="${build.jsr166x.classes.dir}"
1045 >           debug="${build.debug}"
1046 >           debuglevel="${build.debuglevel}"
1047 >           deprecation="${build.deprecation}"
1048 >           classpath=""
1049 >           bootclasspath="${bootclasspath6}"
1050 >           source="5"
1051 >           target="5"
1052 >           includeAntRuntime="false"
1053 >           includeJavaRuntime="false"
1054 >           executable="${javac7}"
1055 >           fork="true">
1056  
1057 <      <include name="jsr166/test/Sample.java"/>
1057 >      <include name="jsr166x/**/*.java"/>
1058 >      <compilerarg value="-XDignore.symbol.file=true"/>
1059 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1060 >      <compilerarg value="-Werror"/>
1061 >      <compilerarg line="${build.args}"/>
1062  
1063      </javac>
1064 +  </target>
1065  
630    <copy todir="${build.testcases.dir}">
631      <fileset dir="${test.src.dir}">
632        <include name="**/*.properties"/>
633      </fileset>
634    </copy>
1066  
1067 +  <target name="jsr166xjar"
1068 +          depends="jsr166xcompile"
1069 +          description="Builds library jar from compiled sources">
1070 +
1071 +    <jar destfile="${jsr166x.jar}">
1072 +      <fileset dir="${build.jsr166x.classes.dir}"/>
1073 +      <manifest>
1074 +        <attribute name="Built-By" value="${user.name}"/>
1075 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1076 +      </manifest>
1077 +    </jar>
1078  
637    <java classname="jsr166.test.Sample" fork="true">
638      <classpath refid="test.classpath"/>
639      <!-- <jvmarg value="-ea"/> -->
640      <!-- <jvmarg value="-server"/> -->
641      <!-- <arg value="1000"/> -->
642    </java>
1079    </target>
1080  
1081  
1082 <  <target name="loops" depends="init, configure-compiler"
1083 <          description="Benchmark from Doug Lea's AQS paper">
1082 >  <target name="jsr166xdocs"
1083 >          description="Builds javadocs to dist dir">
1084  
1085 <    <mkdir dir="${build.loops.dir}"/>
1085 >    <delete dir="${jsr166xdocs.dir}"/>
1086 >    <mkdir dir="${jsr166xdocs.dir}"/>
1087  
1088 <    <javac srcdir="${loops.src.dir}"
1089 <          destdir="${build.loops.dir}"
1090 <            debug="${build.debug}"
1091 <       debuglevel="${build.debuglevel}"
1092 <      deprecation="${build.deprecation}"
1093 <           source="${build.sourcelevel}"
1094 <             fork="true">
1088 >    <javadoc destdir="${jsr166xdocs.dir}"
1089 >             packagenames="jsr166x.*"
1090 >             link="${java.api.url}"
1091 >             access="${build.javadoc.access}"
1092 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1093 >             bootclasspath="${bootclasspath6}"
1094 >             source="5"
1095 >             executable="${javadoc7}">
1096 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1097 >      <arg value="-XDignore.symbol.file=true"/>
1098  
1099 <      <compilerarg line="${build.args}"/>
1100 <      <classpath refid="loops.classpath"/>
1099 >    </javadoc>
1100 >  </target>
1101  
662    </javac>
1102  
1103 <    <java classname="ALoops" fork="true">
1104 <      <classpath refid="loops.classpath"/>
1105 <    </java>
1103 >  <target name="jsr166xdist"
1104 >          depends="jsr166xdist-jar, jsr166xdist-docs"
1105 >          description="Puts all distributable products in single hierarchy"/>
1106 >
1107 >
1108 >  <target name="jsr166xclean"
1109 >          description="Removes all jsr166x build products">
1110 >
1111 >    <delete dir="${build.jsr166x.dir}"/>
1112  
1113    </target>
1114  
1115  
1116 <  <target name="compile-j1" depends="init, configure-compiler">
1116 >  <target name="jsr166xdist-jar"
1117 >          depends="jsr166xclean, jsr166xjar">
1118 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1119 >  </target>
1120  
1121 <    <mkdir dir="${build.j1.dir}"/>
1121 >  <target name="jsr166xdist-docs"
1122 >          depends="jsr166xclean, jsr166xdocs">
1123 >    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1124 >  </target>
1125 >
1126 >  <!-- jsr166y -->
1127  
675    <javac srcdir="${j1.src.dir}"
676          destdir="${build.j1.dir}"
677            debug="${build.debug}"
678       debuglevel="${build.debuglevel}"
679      deprecation="${build.deprecation}"
680           source="${build.sourcelevel}"
681             fork="true">
1128  
1129 +  <target name="jsr166ycompile"
1130 +          depends="configure-compiler"
1131 +          description="Compiles jsr166y sources">
1132 +
1133 +    <mkdir dir="${build.jsr166y.classes.dir}"/>
1134 +
1135 +    <javac srcdir="${topsrc.dir}"
1136 +           destdir="${build.jsr166y.classes.dir}"
1137 +           debug="${build.debug}"
1138 +           debuglevel="${build.debuglevel}"
1139 +           deprecation="${build.deprecation}"
1140 +           source="6"
1141 +           target="6"
1142 +           classpath=""
1143 +           bootclasspath="${bootclasspath6}"
1144 +           includeAntRuntime="false"
1145 +           includeJavaRuntime="false"
1146 +           executable="${javac7}"
1147 +           fork="true">
1148 +
1149 +      <include name="jsr166y/**/*.java"/>
1150 +      <compilerarg value="-XDignore.symbol.file=true"/>
1151 +      <compilerarg value="-Xlint:all"/>
1152 +      <compilerarg value="-Werror"/>
1153        <compilerarg line="${build.args}"/>
684      <classpath refid="j1.classpath"/>
1154  
1155      </javac>
1156 +  </target>
1157 +
1158 +
1159 +  <target name="jsr166yjar"
1160 +          depends="jsr166ycompile"
1161 +          description="Builds library jar from compiled sources">
1162 +
1163 +    <jar destfile="${jsr166y.jar}" index="true">
1164 +      <fileset dir="${build.jsr166y.classes.dir}"/>
1165 +      <manifest>
1166 +        <attribute name="Built-By" value="${user.name}"/>
1167 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1168 +      </manifest>
1169 +    </jar>
1170  
1171    </target>
1172  
1173  
1174 <  <target name="sw" depends="compile-j1"
1175 <          description="Runs the SwingWorker demo">
1174 >  <target name="jsr166ydocs"
1175 >          description="Builds javadocs to dist dir">
1176 >
1177 >    <delete dir="${jsr166ydocs.dir}"/>
1178 >    <mkdir dir="${jsr166ydocs.dir}"/>
1179 >
1180 >    <javadoc destdir="${jsr166ydocs.dir}"
1181 >             packagenames="jsr166y.*"
1182 >             link="${java.api.url}"
1183 >             access="${build.javadoc.access}"
1184 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1185 >             bootclasspath="${bootclasspath6}"
1186 >             source="6"
1187 >             executable="${javadoc7}">
1188 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1189 >      <arg value="-XDignore.symbol.file=true"/>
1190 >
1191 >    </javadoc>
1192 >  </target>
1193 >
1194 >
1195 >  <target name="jsr166ydist"
1196 >          depends="jsr166ydist-jar, jsr166ydist-docs"
1197 >          description="Puts all distributable products in single hierarchy"/>
1198  
694    <!--
695    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
696      <classpath refid="j1.classpath"/>
697    </java>
698    -->
1199  
1200 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
1200 >  <target name="jsr166yclean"
1201 >          description="Removes all jsr166y build products">
1202  
1203 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
703 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
704 <    </exec>
1203 >    <delete dir="${build.jsr166y.dir}"/>
1204  
1205    </target>
1206  
708  <target name="j1" depends="compile-j1"
709          description="Runs a standalone JavaOne program">
1207  
1208 <    <java classname="jsr166.misc.SortedEnumSet" fork="true">
1209 <      <classpath refid="j1.classpath"/>
1210 <    </java>
1208 >  <target name="jsr166ydist-jar"
1209 >          depends="jsr166yclean, jsr166yjar">
1210 >    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1211 >  </target>
1212  
1213 +  <target name="jsr166ydist-docs"
1214 +          depends="jsr166yclean, jsr166ydocs">
1215 +    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1216    </target>
1217  
1218  
1219 <  <target name="test-j1" depends="compile-j1"
719 <          description="Runs testcases from the JavaOne source directories">
1219 >  <!-- extra166y -->
1220  
721    <junit printsummary="true"
722             showoutput="true"
723          errorProperty="junit.failed"
724        failureProperty="junit.failed"
725                    dir="${build.j1.dir}"
726                   fork="true">
727
728      <!-- <jvmarg value="-server"/> -->
729      <classpath refid="j1.classpath"/>
730      <formatter type="xml"/>
731
732      <batchtest todir="${build.j1.dir}">
733        <fileset dir="${j1.src.dir}">
734          <include name="**/*Test.java"/>
735        </fileset>
736      </batchtest>
1221  
1222 <    </junit>
1222 >  <target name="extra166ycompile"
1223 >          depends="configure-compiler, jsr166yjar"
1224 >          description="Compiles extra166y sources">
1225  
1226 <    <available property="junit.report.format"
741 <                  value="frames"
742 <              classname="org.apache.xalan.lib.Redirect"/>
743 <    <property name="junit.report.format" value="noframes"/>
744 <
745 <    <junitreport todir="${build.j1.dir}">
746 <      <fileset dir="${build.j1.dir}">
747 <        <include name="TEST-*.xml"/>
748 <      </fileset>
749 <      <report styledir="${stylesheet.dir}"
750 <                format="${junit.report.format}"
751 <                 todir="${build.j1.dir}"
752 <      />
753 <    </junitreport>
1226 >    <mkdir dir="${build.extra166y.classes.dir}"/>
1227  
1228 <    <fail message="Test Cases Failed" if="junit.failed"/>
1228 >    <javac srcdir="${topsrc.dir}"
1229 >           destdir="${build.extra166y.classes.dir}"
1230 >           debug="${build.debug}"
1231 >           debuglevel="${build.debuglevel}"
1232 >           deprecation="${build.deprecation}"
1233 >           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1234 >           classpath=""
1235 >           source="6"
1236 >           target="6"
1237 >           includeAntRuntime="false"
1238 >           includeJavaRuntime="false"
1239 >           executable="${javac7}"
1240 >           fork="true">
1241  
1242 +      <include name="extra166y/**/*.java"/>
1243 +      <compilerarg value="-XDignore.symbol.file=true"/>
1244 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1245 +      <compilerarg value="-Werror"/>
1246 +      <compilerarg line="${build.args}"/>
1247 +
1248 +    </javac>
1249    </target>
1250  
1251  
1252 +  <target name="extra166yjar"
1253 +          depends="extra166ycompile"
1254 +          description="Builds library jar from compiled sources">
1255  
1256 <  <!-- C++ and JNI definitions and demos -->
1256 >    <jar destfile="${extra166y.jar}" index="true">
1257 >      <fileset dir="${build.extra166y.classes.dir}"/>
1258 >      <manifest>
1259 >        <attribute name="Built-By" value="${user.name}"/>
1260 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1261 >      </manifest>
1262 >    </jar>
1263  
1264 <  <target name="configure-cpp">
1264 >  </target>
1265  
765    <!-- Define tasks and types -->
1266  
1267 <    <path id="cpptasks.path">
1268 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
769 <    </path>
770 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
771 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
1267 >  <target name="extra166ydocs"
1268 >          description="Builds javadocs to build dir">
1269  
1270 <    <!-- Set platform property for JNI includes -->
1270 >    <delete dir="${extra166ydocs.dir}"/>
1271 >    <mkdir dir="${extra166ydocs.dir}"/>
1272  
1273 <    <condition property="platform" value="linux">
1274 <      <os name="Linux"/>
1275 <    </condition>
1276 <    <condition property="platform" value="win32">
1277 <      <os family="windows"/>
1278 <    </condition>
1279 <    <condition property="platform" value="solaris">
1280 <      <os name="SunOS"/>
1281 <    </condition>
1273 >    <javadoc destdir="${extra166ydocs.dir}"
1274 >             packagenames="extra166y.*"
1275 >             link="${java.api.url}"
1276 >             access="${build.javadoc.access}"
1277 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1278 >             bootclasspath="${bootclasspath6}"
1279 >             source="6"
1280 >             executable="${javadoc7}">
1281 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1282 >      <arg value="-XDignore.symbol.file=true"/>
1283  
1284 +    </javadoc>
1285    </target>
1286  
1287  
1288 <  <target name="cppdemo" depends="configure-cpp">
1288 >  <target name="extra166ydist"
1289 >          depends="extra166ydist-jar, extra166ydist-docs"
1290 >          description="Puts all distributable products in single hierarchy"/>
1291  
790    <mkdir dir="${build.dir}"/>
1292  
1293 <    <cc multithreaded="true"
1294 <                 name="g++"
794 <               objdir="${build.dir}"
795 <              outfile="${build.dir}/CppDemo">
796 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
797 <      <libset libs="stdc++"/>
798 <    </cc>
1293 >  <target name="extra166yclean"
1294 >          description="Removes all extra166y build products">
1295  
1296 <    <exec executable="${build.dir}/CppDemo">
801 <      <arg line="count in word frequency of word in command line count"/>
802 <    </exec>
1296 >    <delete dir="${build.extra166y.dir}"/>
1297  
1298    </target>
1299  
1300  
1301 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
1301 >  <target name="extra166ydist-jar"
1302 >          depends="extra166yclean, extra166yjar">
1303 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1304 >  </target>
1305  
1306 <    <mkdir dir="${build.testcases.dir}"/>
1306 >  <target name="extra166ydist-docs"
1307 >          depends="extra166yclean, extra166ydocs">
1308 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1309 >  </target>
1310  
1311 <    <javac srcdir="${test.src.dir}"
1312 <          destdir="${build.testcases.dir}"
1313 <            debug="${build.debug}"
1314 <       debuglevel="${build.debuglevel}"
1315 <      deprecation="${build.deprecation}"
1316 <           source="${build.sourcelevel}"
1317 <             fork="true">
1318 <      <compilerarg value="${bootclasspath.args}"/>
1311 >  <!-- jsr166e -->
1312 >
1313 >  <property name="build.jsr166e.java.version" value="6"/>
1314 >  <property name="build.jsr166e.javac" value="${javac6}"/>
1315 >
1316 >  <target name="jsr166ecompile"
1317 >          depends="configure-compiler"
1318 >          description="Compiles jsr166e sources">
1319 >
1320 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
1321 >
1322 >    <javac srcdir="${topsrc.dir}"
1323 >           destdir="${build.jsr166e.classes.dir}"
1324 >           debug="${build.debug}"
1325 >           debuglevel="${build.debuglevel}"
1326 >           deprecation="${build.deprecation}"
1327 >           source="${build.jsr166e.java.version}"
1328 >           target="${build.jsr166e.java.version}"
1329 >           classpath=""
1330 >           includeAntRuntime="false"
1331 >           includeJavaRuntime="false"
1332 >           executable="${build.jsr166e.javac}"
1333 >           fork="true">
1334 >
1335 >      <include name="jsr166e/**/*.java"/>
1336 >      <compilerarg value="-XDignore.symbol.file=true"/>
1337 >      <compilerarg value="-Xlint:all"/>
1338 >      <compilerarg value="-Werror"/>
1339        <compilerarg line="${build.args}"/>
1340 <      <classpath refid="test.classpath"/>
821 <      <include name="JniDemo.java"/>
1340 >
1341      </javac>
1342 +  </target>
1343 +
1344 +  <!-- jsr166e: find doclint errors -->
1345 +  <target name="jsr166edoclint">
1346 +
1347 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1348  
1349 <    <javah destdir="${build.testcases.dir}"
1350 <      classpathref="test.classpath">
1351 <      <class name="JniDemo"/>
1352 <    </javah>
1349 >    <javac srcdir="${topsrc.dir}"
1350 >           destdir="${build.jsr166e.classes.dir}"
1351 >           debug="${build.debug}"
1352 >           debuglevel="${build.debuglevel}"
1353 >           deprecation="${build.deprecation}"
1354 >           source="${build.jsr166e.java.version}"
1355 >           target="${build.jsr166e.java.version}"
1356 >           classpath=""
1357 >           bootclasspath="${bootclasspath6}"
1358 >           includeAntRuntime="false"
1359 >           includeJavaRuntime="false"
1360 >           executable="${javac8}"
1361 >           fork="true">
1362 >
1363 >      <include name="jsr166e/**/*.java"/>
1364 >      <compilerarg value="-XDignore.symbol.file=true"/>
1365 >      <compilerarg value="-Xlint:all"/>
1366 >      <compilerarg value="-Werror"/>
1367 >      <compilerarg value="-Xdoclint:all/protected"/>
1368  
1369 <    <cc multithreaded="true"
1370 <                 name="g++"
831 <               objdir="${build.dir}"
832 <              outfile="${build.dir}/JniDemo"
833 <              outtype="shared">
1369 >    </javac>
1370 >  </target>
1371  
835      <compiler>
836        <defineset>
837          <define name="__int64" value="long long"/>
838        </defineset>
839        <includepath location="${java.home}/../include"/>
840        <includepath location="${java.home}/../include/${platform}"/>
841        <compilerarg value="-mno-cygwin"/>
842      </compiler>
1372  
1373 <      <linker>
1374 <        <linkerarg value="--add-stdcall-alias"/>
1375 <      </linker>
1373 >  <target name="jsr166ejar"
1374 >          depends="jsr166ecompile"
1375 >          description="Builds library jar from compiled sources">
1376  
1377 <      <includepath location="${build.testcases.dir}"/>
1377 >    <jar destfile="${jsr166e.jar}" index="true">
1378 >      <fileset dir="${build.jsr166e.classes.dir}"/>
1379 >      <manifest>
1380 >        <attribute name="Built-By" value="${user.name}"/>
1381 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1382 >      </manifest>
1383 >    </jar>
1384  
1385 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
1385 >  </target>
1386  
852      <libset libs="stdc++"/>
1387  
1388 <    </cc>
1388 >  <target name="jsr166edocs"
1389 >          description="Builds javadocs to build dir">
1390  
1391 <    <!-- Necessary if windows, harmless if not -->
1392 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
1391 >    <delete dir="${jsr166edocs.dir}"/>
1392 >    <mkdir dir="${jsr166edocs.dir}"/>
1393  
1394 <    <java classname="JniDemo" fork="true">
1395 <      <!-- Watch out: path separator hardwired to semicolon here! -->
1396 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
1397 <      <classpath refid="test.classpath"/>
1398 <      <arg line="count in word frequency of word in command line count"/>
1399 <    </java>
1394 >    <javadoc destdir="${jsr166edocs.dir}"
1395 >             packagenames="jsr166e.*"
1396 >             link="${java.api.url}"
1397 >             access="${build.javadoc.access}"
1398 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1399 >             source="${build.jsr166e.java.version}"
1400 >             executable="${javadoc7}">
1401 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1402 >      <arg value="-XDignore.symbol.file=true"/>
1403  
1404 +    </javadoc>
1405    </target>
1406  
1407  
1408 +  <target name="jsr166e-tck-one-java-version"
1409 +          depends="jsr166ejar">
1410  
1411 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
1411 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1412  
1413 +    <run-tck-tests
1414 +      tck.src.dir="${test.src.dir}/tck-jsr166e"
1415 +      target="${build.jsr166e.java.version}"
1416 +      workdir="${build.jsr166e.dir}"
1417 +      classes="${jsr166e.jar}"/>
1418 +  </target>
1419  
1420 +  <target name="jsr166e-tck"
1421 +          description="Runs tck tests for jsr166e for multiple java versions">
1422  
1423 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
1424 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
1425 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
1426 <  <property name="pretiger.sourcelevel" value="1.4"/>
1423 > <!--     <antcall target="clean"/> -->
1424 > <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1425 > <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1426 > <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1427 > <!--     </antcall> -->
1428  
1429 <  <target name="defang"
1430 <       depends="init"
1431 <   description="Generates pre-Tiger compatible source">
1429 >    <antcall target="clean"/>
1430 >    <antcall target="jsr166e-tck-one-java-version">
1431 >      <param name="build.jsr166e.java.version" value="7"/>
1432 >      <param name="build.jsr166e.javac" value="${javac7}"/>
1433 >    </antcall>
1434  
1435 <    <delete dir="${pretiger.src.dir}"/>
1436 <    <mkdir dir="${pretiger.src.dir}"/>
1435 >    <antcall target="clean"/>
1436 >    <antcall target="jsr166e-tck-one-java-version">
1437 >      <param name="build.jsr166e.java.version" value="6"/>
1438 >      <param name="build.jsr166e.javac" value="${javac6}"/>
1439 >    </antcall>
1440 >  </target>
1441  
886    <exec executable="perl">
887      <arg file="etc/defang.pl"/>
888      <!-- <arg value="-v"/> -->
889      <arg value="-s"/> <arg file="${src.dir}"/>
890      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
891    </exec>
1442  
1443 +  <target name="jsr166e-test"
1444 +          depends="jsr166e-tck"
1445 +          description="Runs all tests for jsr166e">
1446    </target>
1447  
1448 <  <target name="compile-pretiger"
1449 <          depends="init, configure-compiler, defang"
1450 <          description="Compiles pre-Tiger sources to build folder">
1448 >  <target name="jsr166edist"
1449 >          depends="jsr166edist-jar, jsr166edist-docs"
1450 >          description="Puts all distributable products in single hierarchy"/>
1451  
899    <mkdir dir="${build.pretiger.dir}"/>
1452  
1453 <    <javac srcdir="${pretiger.src.dir}"
1454 <          destdir="${build.pretiger.dir}"
1455 <            debug="${build.debug}"
1456 <       debuglevel="${build.debuglevel}"
905 <      deprecation="${build.deprecation}"
906 <           source="${pretiger.sourcelevel}"
907 <             fork="true">
1453 >  <target name="jsr166eclean"
1454 >          description="Removes all jsr166e build products">
1455 >    <delete dir="${build.jsr166e.dir}"/>
1456 >  </target>
1457  
909      <compilerarg line="${build.args}"/>
910      <exclude name="**/Thread.java"/>
1458  
1459 <    </javac>
1459 >  <target name="jsr166edist-jar"
1460 >          depends="jsr166eclean, jsr166ejar">
1461 >    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1462 >  </target>
1463  
1464 +  <target name="jsr166edist-docs"
1465 +          depends="jsr166eclean, jsr166edocs">
1466 +    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1467    </target>
1468  
916  <target name="pretiger" depends="compile-pretiger">
1469  
1470 <    <mkdir dir="${build.lib.dir}"/>
1470 > <!-- Find buglets that can be detected by static build tools -->
1471  
1472 <    <jar destfile="${pretiger.jar}">
1473 <      <fileset dir="${build.pretiger.dir}">
1474 <      </fileset>
1475 <    </jar>
1472 >  <target name="lint">
1473 >    <antcall target="dists">
1474 >      <param name="build.javadoc.access" value="public"/>
1475 >    </antcall>
1476 >  </target>
1477  
1478 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1479 +  <target name="lint-private">
1480 +    <antcall target="dist">
1481 +      <param name="build.javadoc.access" value="private"/>
1482 +    </antcall>
1483    </target>
1484  
1485 +
1486   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines