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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines