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.30 by tim, Wed May 28 14:19:25 2003 UTC vs.
Revision 1.118 by jsr166, Mon Jan 21 01:05:01 2013 UTC

# Line 7 | Line 7
7    Usage: ant [target]
8  
9    User-specific settings are read from user.properties.
10 <  See user.properties.sample for examples.
10 >  See user.properties.sample for an explanation of some useful settings.
11 >
12 >  The repository contains all dependencies except for ant and the JDK
13 >  itself.  Because the JDK version matters and because different
14 >  targets require different JDKs, we assume that users have created a
15 >  hierarchy containing:
16 >  $HOME/jdk/jdk6
17 >  $HOME/jdk/jdk7
18 >  $HOME/jdk/jdk8
19 >  where each of the above is a JDK or a symlink to same, and
20 >  $HOME/jdk/src/jdk6
21 >  $HOME/jdk/src/jdk7
22 >  $HOME/jdk/src/jdk8
23 >  where each of the above is a complete JDK source tree
24 >  (e.g. mercurial forest) or a symlink to same.
25   ------------------------------------------------------------------------------
26    </description>
27  
# Line 21 | Line 35
35  
36  
37    <!-- Compilation options -->
38 <  <property name="build.sourcelevel"    value="1.5"/>
25 <  <property name="build.docsourcelevel" value="1.4"/>
38 >  <property name="build.sourcelevel"    value="6"/>
39    <property name="build.debug"          value="true"/>
40    <property name="build.debuglevel"     value="source,lines,vars"/>
41    <property name="build.deprecation"    value="false"/>
42  
43    <!-- Build locations -->
44 <  <property name="build.dir"            location="build"/>
45 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
46 <  <property name="build.emulation.dir"  location="${build.dir}/emulation"/>
47 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
48 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
49 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
50 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
51 <  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
52 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
53 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
54 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
44 >  <property name="build.dir"                   location="build"/>
45 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
46 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
47 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
48 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
49 >
50 >  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51 >  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52 >  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53 >  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54 >
55 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
56 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
57 >  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
58 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59 >
60 >  <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61 >  <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62 >  <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63 >  <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64 >
65 >  <!-- JDK locations -->
66 >  <property name="jdks.home"  location="${user.home}/jdk"/>
67 >
68 >  <macrodef name="defjdklocations">
69 >    <attribute name="v"/>
70 >    <sequential>
71 >    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
72 >    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
73 >    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
74 >    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
75 >    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
76 >    <local name="boot.jar.dir"/>
77 >    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
78 >    <path id="bootclasspath@{v}">
79 >      <pathelement path="${boot.jar.dir}/resources.jar"/>
80 >      <pathelement path="${boot.jar.dir}/rt.jar"/>
81 >      <pathelement path="${boot.jar.dir}/jsse.jar"/>
82 >      <pathelement path="${boot.jar.dir}/jce.jar"/>
83 >      <pathelement path="${boot.jar.dir}/charsets.jar"/>
84 >    </path>
85 >    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
86 >    </sequential>
87 >  </macrodef>
88 >
89 >  <defjdklocations v="6"/>
90 >  <defjdklocations v="7"/>
91 >  <defjdklocations v="8"/>
92  
93    <!-- Source locations -->
94    <property name="src.dir"              location="${basedir}/src/main"/>
45  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
95    <property name="test.src.dir"         location="${basedir}/src/test"/>
96 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
97 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
96 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
97 >  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
98 >  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
99    <property name="lib.dir"              location="${basedir}/lib"/>
100    <property name="dist.dir"             location="${basedir}/dist"/>
101 +  <property name="topsrc.dir"           location="${basedir}/src"/>
102 +  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
103 +  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
104 +  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
105 +  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
106 +  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
107  
108    <!-- Distribution locations -->
109 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
109 >  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
110 >  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
111 >  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
112 >  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
113 >  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
114 >  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
115  
116    <!-- Jar locations -->
117 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
118 <  <property name="javac.jar"            location="${lib.dir}/javac.jar"/>
119 <  <property name="collect.jar"          location="${lib.dir}/collect.jar"/>
120 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
121 <  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
117 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
118 >  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
119 >  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
120 >  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
121 >  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
122 >  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
123 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
124 >
125 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
126 >  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
127 >  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
128 >  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
129 >
130 >  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
131 >  <!-- The below does not yet exist as of 2012-11 -->
132 >  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
133 >
134 >  <!-- Default jdk api doc location (latest stable release seems best) -->
135 >  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
136 >
137 >  <!-- Define the "jtreg" task -->
138 >  <!-- See the docs in "jtreg -onlineHelp" -->
139 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
140 >           classpath="${lib.dir}/jtreg.jar" />
141  
142 +  <!-- Test classpath -->
143 +  <path id="test.classpath">
144 +    <pathelement location="${build.testcases.dir}"/>
145 +    <pathelement location="${junit.jar}"/>
146 +  </path>
147  
148 +  <macrodef name="run-tck-tests">
149 +    <attribute name="target"/>
150 +    <attribute name="workdir"/>
151 +    <attribute name="product.jar" default="${product.jar}"/>
152 +    <attribute name="jvmflags" default=""/>
153 +    <sequential>
154 +
155 +    <mkdir dir="@{workdir}/tck-classes"/>
156 +
157 +    <javac srcdir="${tck.src.dir}"
158 +           destdir="@{workdir}/tck-classes"
159 +           debug="${build.debug}"
160 +           debuglevel="${build.debuglevel}"
161 +           deprecation="${build.deprecation}"
162 +           source="6"
163 +           classpath="${junit.jar}"
164 +           includeAntRuntime="false"
165 +           includeJavaRuntime="false"
166 +           executable="${javac@{target}}"
167 +           fork="true">
168 +
169 +      <include name="**/*.java"/>
170 +      <bootclasspath path="@{product.jar}"/>
171 +      <bootclasspath path="${bootclasspath6}"/>
172 +      <compilerarg value="-XDignore.symbol.file=true"/>
173 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
174 +      <compilerarg line="${build.args}"/>
175  
176 <  <!--
65 <   ! Bootclasspath munging for source compilation.
66 <   -->
176 >    </javac>
177  
178 <  <path id="javac.bootclasspath.prefix">
179 <    <!-- <pathelement location="${src.dir}"/> -->
180 <    <pathelement location="${javac.jar}"/>
178 >    <java classname="JSR166TestCase"
179 >          failonerror="true"
180 >          jvm="${java@{target}}"
181 >          fork="true">
182 >        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
183 >        <jvmarg line="@{jvmflags}"/>
184 >        <classpath>
185 >          <pathelement location="${junit.jar}"/>
186 >          <pathelement location="@{workdir}/tck-classes"/>
187 >        </classpath>
188 >    </java>
189 >
190 >    </sequential>
191 >  </macrodef>
192 >
193 >  <!-- ALoops classpath -->
194 >  <path id="loops.classpath">
195 >    <pathelement location="${build.loops.dir}"/>
196    </path>
197  
198 <  <path id="javac.bootclasspath">
199 <    <!-- <pathelement location="${src.dir}"/> -->
200 <    <pathelement location="${collect.jar}"/>
201 <    <pathelement location="${rt.jar}"/>
202 <  </path>
198 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
199 >  <!-- TODO: How do we get &trade to work? -->
200 >  <!-- TODO: Why isn't @jls a "standard" tag? -->
201 >  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
202 >  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
203 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
204 >
205 >  <!-- Main targets -->
206 >
207 >  <target name="dists"
208 >          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
209 >          description="Builds all public jars and docs"/>
210  
211 <  <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
212 <  <property name="javac.bootclasspath.prefix" refid="javac.bootclasspath.prefix"/>
211 >  <target name="compile"
212 >          depends="configure-compiler"
213 >          description="Compiles src/main sources to build dir">
214  
215 <  <!-- Turn the flattened bootclasspath prefix into a javac argument -->
83 <  <property name="javac.args" value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
215 >    <mkdir dir="${build.classes.dir}"/>
216  
217 +    <javac srcdir="${src.dir}"
218 +           destdir="${build.classes.dir}"
219 +           debug="${build.debug}"
220 +           debuglevel="${build.debuglevel}"
221 +           deprecation="${build.deprecation}"
222 +           classpath=""
223 +           includeAntRuntime="false"
224 +           includeJavaRuntime="false"
225 +           executable="${javac8}"
226 +           fork="true">
227 +
228 +      <include name="**/*.java"/>
229 +      <compilerarg value="-XDignore.symbol.file=true"/>
230 +      <compilerarg value="-Xlint:all"/>
231 +      <compilerarg line="${build.args}"/>
232  
233 +    </javac>
234 +  </target>
235  
87  <!--
88   ! Bootclasspath munging for testing, so JUnit can test our local
89   ! modifications to java.*.
90   -->
236  
237 <  <path id="test.classpath">
238 <    <pathelement location="${product.jar}"/>
239 <    <pathelement location="${build.testcases.dir}"/>
95 <    <pathelement location="${junit.jar}"/>
96 <  </path>
237 >  <target name="jar"
238 >          depends="compile"
239 >          description="Builds library jar from compiled sources">
240  
241 <  <!-- Flatten test classpath into a platform-appropriate string -->
242 <  <property name="test.classpath" refid="test.classpath"/>
241 >    <jar destfile="${product.jar}">
242 >      <fileset dir="${build.classes.dir}"/>
243 >    </jar>
244 >  </target>
245  
101  <!-- Turn the flattened test classpath into a javac argument -->
102  <property name="test.javac.args" value='-Xbootclasspath/p:${test.classpath}'/>
246  
247 +  <target name="test"
248 +          depends="configure-tests, report-tests"
249 +          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
250  
251  
252 <  <!-- Files excluded from emulation and dist-docs -->
253 <  <patternset id="emulation.excludes">
108 <    <exclude name="java/util/Random.*"/>
109 <    <exclude name="sun/misc/Unsafe.*"/>
110 <  </patternset>
252 >  <target name="docs"
253 >          description="Builds javadocs for src/main to dist dir">
254  
255 +    <delete dir="${dist.javadocs.dir}"/>
256 +    <mkdir dir="${dist.javadocs.dir}"/>
257  
258 +    <!-- the packagenames="none" hack below prevents scanning the -->
259 +    <!-- sourcepath for packages -->
260  
261 <  <!-- Main targets -->
261 >    <javadoc destdir="${dist.javadocs.dir}"
262 >             packagenames="none"
263 >             link="${jdkapi8docs.url}"
264 >             overview="${src.dir}/intro.html"
265 >             classpath=""
266 >             executable="${javadoc8}">
267 >      <sourcepath path="${src.dir}"/>
268 >      <sourcepath path="${jdk8src.dir}"/>
269 >      <arg value="-XDignore.symbol.file=true"/>
270 >      <arg value="-tag"/>
271 >      <arg value="${javadoc.jls.option}"/>
272 >      <fileset dir="${src.dir}" defaultexcludes="yes">
273 >        <include name="**/*.java"/>
274 >      </fileset>
275 >    </javadoc>
276 >  </target>
277  
116  <target name="compile"
117          depends="init"
118          description="Compiles main sources to build folder">
278  
279 <    <mkdir dir="${build.classes.dir}"/>
279 >  <target name="dist"
280 >          depends="dist-clean, dist-jar, docs"
281 >          description="Puts all distributable products in single hierarchy"/>
282  
283 <    <javac srcdir="${src.dir}"
284 <          destdir="${build.classes.dir}"
283 >
284 >  <target name="release"
285 >          depends="dist"
286 >          description="Puts entire CVS tree, plus distribution productions, in a jar">
287 >
288 >    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
289 >
290 >    <jar basedir="${basedir}" destfile="${release.jar}">
291 >      <!-- <exclude name="build/**"/> -->
292 >      <exclude name="${release.jar}"/>
293 >      <exclude name="user.properties"/>
294 >      <exclude name="etc/notes/**"/>
295 >      <exclude name="src/emulation/**"/>
296 >      <exclude name="**/SyntaxTest.java"/>
297 >      <exclude name="**/SuperfluousAbstract.java"/>
298 >    </jar>
299 >  </target>
300 >
301 >
302 >  <target name="clean"
303 >          description="Removes all build products">
304 >
305 >    <delete dir="${build.dir}"/>
306 >
307 >  </target>
308 >
309 >
310 >  <target name="dist-clean"
311 >          description="Removes all build and distribution products">
312 >
313 >    <delete dir="${dist.dir}"/>
314 >
315 >  </target>
316 >
317 >
318 >  <!-- Internal targets -->
319 >
320 >
321 >  <target name="dist-jar"
322 >          depends="clean, jar">
323 >
324 >    <copy file="${product.jar}" todir="${dist.dir}"/>
325 >
326 >  </target>
327 >
328 >
329 >  <target name="compile-tests"
330 >          depends="jar">
331 >
332 >    <mkdir dir="${build.testcases.dir}"/>
333 >
334 >    <javac srcdir="${tck.src.dir}"
335 >           destdir="${build.testcases.dir}"
336 >           debug="${build.debug}"
337 >           debuglevel="${build.debuglevel}"
338 >           deprecation="${build.deprecation}"
339 >           source="6"
340 >           classpath="${junit.jar}"
341 >           includeAntRuntime="false"
342 >           includeJavaRuntime="false"
343 >           executable="${javac8}"
344 >           fork="true">
345 >
346 >      <include name="**/*.java"/>
347 >      <bootclasspath path="@{product.jar}"/>
348 >      <bootclasspath path="${bootclasspath6}"/>
349 >      <compilerarg value="-XDignore.symbol.file=true"/>
350 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
351 >      <compilerarg line="${build.args}"/>
352 >
353 >    </javac>
354 >
355 >    <javac srcdir="${test.src.dir}"
356 >           destdir="${build.testcases.dir}"
357 >           debug="${build.debug}"
358 >           debuglevel="${build.debuglevel}"
359 >           deprecation="${build.deprecation}"
360 >           source="6"
361 >           classpath=""
362 >           includeAntRuntime="false"
363 >           includeJavaRuntime="false"
364 >           executable="${javac8}"
365 >           fork="true">
366 >
367 >      <include name="jsr166/test/**/*.java"/>
368 >      <bootclasspath path="${product.jar}"/>
369 >      <bootclasspath path="${bootclasspath6}"/>
370 >      <compilerarg value="-XDignore.symbol.file=true"/>
371 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
372 >      <compilerarg line="${build.args}"/>
373 >
374 >    </javac>
375 >
376 > <!--
377 >    <javac srcdir="${jtreg.src.dir}"
378 >          destdir="${build.testcases.dir}"
379              debug="${build.debug}"
380         debuglevel="${build.debuglevel}"
381        deprecation="${build.deprecation}"
382             source="${build.sourcelevel}"
383               fork="true">
384  
385 <      <bootclasspath refid="javac.bootclasspath"/>
386 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
385 >      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
386 >      <compilerarg value="-XDignore.symbol.file=true"/>
387 >      <compilerarg line="${build.args}"/>
388  
389      </javac>
390 + -->
391  
392    </target>
393  
394  
395 <  <target name="jar"
396 <          depends="check-emulation, init-jar, native-jar, emulation-jar"
397 <          description="Builds library jar from compiled sources"/>
395 >  <target name="run-tests"
396 >          depends="compile-tests">
397 >
398 >    <!-- May be overridden by user.properties -->
399 >    <property name="testcase" value="*"/>
400  
401 +    <mkdir dir="${build.reports.dir}"/>
402  
403 <  <target name="test"
404 <          depends="init, check-junit, report-tests"
405 <          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
403 >    <junit printsummary="true"
404 >             showoutput="true"
405 >          errorProperty="junit.failed"
406 >        failureProperty="junit.failed"
407 >                    dir="${build.reports.dir}"
408 >                    jvm="${java8}"
409 >                   fork="true">
410 >
411 >      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
412 >      <jvmarg value="-server"/>
413 >      <jvmarg value="-showversion"/>
414 >
415 >      <classpath refid="test.classpath"/>
416 >
417 >      <formatter type="xml"/>
418 >
419 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
420 >        <fileset dir="${tck.src.dir}">
421 >          <include name="**/${testcase}Test.java"/>
422 >        </fileset>
423 >      </batchtest>
424 >
425 >      <batchtest todir="${build.reports.dir}" if="do.test.old">
426 >        <fileset dir="${test.src.dir}">
427 >          <include name="jsr166/test/**/${testcase}Test.java"/>
428 >        </fileset>
429 >      </batchtest>
430 >
431 > <!--
432 >      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
433 >        <fileset dir="${jtreg.src.dir}">
434 >          <include name="**/${testcase}Test.java"/>
435 >        </fileset>
436 >      </batchtest>
437 > -->
438 >
439 >    </junit>
440 >
441 >  </target>
442  
443  
444 <  <target name="checkstyle"
445 <          depends="filter-src"
446 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
444 >  <target name="report-tests"
445 >          depends="run-tests">
446 >
447 >    <!-- Sets junit.report.format to frames if redirection is present,
448 >         otherwise sets it to noframes. -->
449 >    <available property="junit.report.format"
450 >                  value="frames"
451 >              classname="org.apache.xalan.lib.Redirect"
452 >    />
453 >    <property name="junit.report.format" value="noframes"/>
454  
455 <    <taskdef resource="checkstyletask.properties"
456 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
455 >    <junitreport todir="${build.reports.dir}">
456 >      <fileset dir="${build.reports.dir}">
457 >        <include name="TEST-*.xml"/>
458 >      </fileset>
459 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
460 >      />
461 >    </junitreport>
462  
463 <    <checkstyle>
156 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
157 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
158 <    </checkstyle>
463 >    <fail message="Test Cases Failed" if="junit.failed"/>
464  
465    </target>
466  
467  
468 <  <target name="doccheck"
164 <          depends="filter-src"
165 <          description="Reports on javadoc style errors (not working yet)">
468 >  <target name="configure-compiler">
469  
470 <    <delete dir="${build.doccheck.dir}"/>
471 <    <mkdir dir="${build.doccheck.dir}"/>
470 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
471 >
472 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
473 >      <istrue value="${build.warnunchecked}"/>
474 >    </condition>
475 >
476 >    <property name="warnunchecked.arg" value=""/>
477  
478 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
479 <         docletpath="${lib.dir}/doccheck.jar"
480 <            destdir="${build.doccheck.dir}">
173 <      <packageset dir="${build.filter.src.dir}"/>
174 <    </javadoc>
478 >
479 >    <!-- Common options in javac invocations -->
480 >    <property name="build.args" value="${warnunchecked.arg}"/>
481  
482    </target>
483  
484  
485 <  <target name="docs"
486 <          depends="filter-src"
181 <          description="Builds javadocs with custom tags to build folder">
485 >  <target name="configure-tests"
486 >       depends="configure-compiler">
487  
488 <    <delete dir="${build.javadocs.dir}"/>
489 <    <mkdir dir="${build.javadocs.dir}"/>
488 >    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
489 >    <available property="junit.available"
490 >               classname="junit.framework.Protectable"/>
491  
492 <    <javadoc destdir="${build.javadocs.dir}"
493 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
494 <            overview="${src.dir}/intro.html"
189 <              source="${build.docsourcelevel}">
190 <
191 <      <tag name="revised" description="Last revised:"/>
192 <      <tag name="spec"    description="Specified by:"/>
193 <      <tag name="editor"  description="Last edited by:"/>
194 <      <tag name="fixme"   description="FIX ME:"/>
492 >    <!-- Xalan -->
493 >    <available property="xalan.available"
494 >               classname="org.apache.xalan.Version"/>
495  
196      <packageset dir="${build.filter.src.dir}"/>
496  
497 <    </javadoc>
497 >    <!-- Ant 1.6beta and later don't need or want this check -->
498 >    <!--
499 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
500 >          unless="junit.available"/>
501 >
502 >    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
503 >          unless="xalan.available"/>
504 >    -->
505  
506    </target>
507  
508  
509 <  <!--
204 <   # javac -s doesn't reliably generate compilable code. It generates
205 <   # bridge methods (marked as "synthetic") that can have identical
206 <   # signatures to existing methods except for the return value.
207 <   -->
208 <  <target name="strip"
209 <          depends="init">
509 >  <!-- Various demos and test programs -->
510  
211    <mkdir dir="${build.stripped.dir}"/>
511  
512 <    <javac srcdir="${src.dir}"
513 <          destdir="${build.stripped.dir}"
512 >  <target name="loops" depends="configure-compiler"
513 >          description="Benchmark from Doug Lea's AQS paper">
514 >
515 >    <mkdir dir="${build.loops.dir}"/>
516 >
517 >    <javac srcdir="${loops.src.dir}"
518 >          destdir="${build.loops.dir}"
519              debug="${build.debug}"
520         debuglevel="${build.debuglevel}"
521        deprecation="${build.deprecation}"
522             source="${build.sourcelevel}"
523               fork="true">
524  
525 <      <bootclasspath refid="javac.bootclasspath"/>
526 <      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
525 >      <compilerarg line="${build.args}"/>
526 >      <classpath refid="loops.classpath"/>
527 >      <compilerarg value="-XDignore.symbol.file=true"/>
528  
529      </javac>
530  
531 +    <java classname="ALoops" fork="true">
532 +      <classpath refid="loops.classpath"/>
533 +    </java>
534 +
535    </target>
536  
537  
538 <  <target name="dist"
539 <          depends="init, dist-clean, dist-jar, dist-docs"
540 <          description="Puts all distributable products in single hierarchy"/>
538 >  <!-- jsr166 4jdk7 -->
539 >
540 >  <target name="4jdk7compile"
541 >          depends="configure-compiler"
542 >          description="Compiles src/jdk7 sources, targeting jdk7">
543 >
544 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
545 >
546 >    <javac srcdir="${4jdk7src.dir}"
547 >           destdir="${build.4jdk7.classes.dir}"
548 >           debug="${build.debug}"
549 >           debuglevel="${build.debuglevel}"
550 >           deprecation="${build.deprecation}"
551 >           source="6"
552 >           classpath=""
553 >           includeAntRuntime="false"
554 >           includeJavaRuntime="false"
555 >           executable="${javac7}"
556 >           fork="true">
557 >
558 >      <include name="**/*.java"/>
559 >      <bootclasspath path="${bootclasspath6}"/>
560 >      <compilerarg value="-XDignore.symbol.file=true"/>
561 >      <compilerarg value="-Xlint:all"/>
562 >      <compilerarg line="${build.args}"/>
563  
564 +    </javac>
565 +  </target>
566  
234  <target name="clean"
235          description="Removes all build products">
567  
568 <    <delete dir="${build.dir}"/>
569 <    <delete dir="${build.classes.dir}"/>
570 <    <delete dir="${build.lib.dir}"/>
568 >  <target name="4jdk7-jar"
569 >          depends="4jdk7compile"
570 >          description="Builds library jar from compiled sources">
571  
572 <  </target>
572 >    <jar destfile="${4jdk7product.jar}">
573 >      <fileset dir="${build.4jdk7.classes.dir}"/>
574 >    </jar>
575  
576 +  </target>
577  
244  <target name="dist-clean"
245          description="Removes all build and distribution products">
578  
579 <    <delete dir="${dist.dir}"/>
579 >  <target name="4jdk7-test-tck"
580 >          depends="4jdk7-jar"
581 >          description="Runs tck tests for jsr166-4jdk7 directly">
582  
583 +    <run-tck-tests
584 +      target="7"
585 +      workdir="${build.4jdk7.dir}"
586 +      product.jar="${4jdk7product.jar}"/>
587    </target>
588  
589  
590 <  <target name="dist-docs"
591 <          depends="filter-src"
592 <          description="Builds javadocs without custom tags to dist folder">
590 >  <target name="4jdk7-test-tck-junit"
591 >          depends="4jdk7compile"
592 >          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
593  
594 <    <delete dir="${dist.javadocs.dir}"/>
595 <    <mkdir dir="${dist.javadocs.dir}"/>
594 >    <junit printsummary="true"
595 >           showoutput="true"
596 >           errorProperty="junit.failed"
597 >           failureProperty="junit.failed"
598 >           includeantruntime="true"
599 >           jvm="${java7}"
600 >           fork="true">
601 >
602 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
603 >      <jvmarg value="-server"/>
604 >
605 >      <classpath>
606 >        <pathelement location="${junit.jar}"/>
607 >        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
608 >      </classpath>
609  
610 <    <javadoc destdir="${dist.javadocs.dir}"
611 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
612 <            overview="${src.dir}/intro.html"
613 <              source="${build.docsourcelevel}">
610 >      <formatter type="brief"/>
611 >
612 >      <test name="JSR166TestCase" haltonfailure="no">
613 >      </test>
614 >
615 >    </junit>
616 >  </target>
617 >
618 >  <target name="4jdk7-test-jtreg"
619 >          depends="4jdk7compile"
620 >          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
621 >    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
622 >    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
623 >    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
624 >    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
625 >    <jtreg dir="${jtreg.src.dir}"
626 >           jdk="${jdk7.home}"
627 >           workDir="${build.4jdk7.dir}/JTwork"
628 >           reportDir="${build.4jdk7.dir}/JTreport">
629 >
630 >      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
631 >      <arg value="-agentvm"/>
632 >      <arg value="-v:nopass,fail"/>
633 >      <arg value="-vmoptions:-esa -ea"/>
634 >      <arg value="-automatic"/>
635 >      <arg value="-k:!ignore"/>
636 >    </jtreg>
637 >  </target>
638  
264      <packageset dir="${build.filter.src.dir}"/>
639  
640 +  <target name="4jdk7-test"
641 +          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
642 +          description="Runs tck and jtreg tests for jsr166-4jdk7">
643 +  </target>
644 +
645 +
646 +  <target name="4jdk7docs"
647 +          description="Builds javadocs for src/jdk7 to dist dir">
648 +
649 +    <delete dir="${dist.4jdk7.docs.dir}"/>
650 +    <mkdir dir="${dist.4jdk7.docs.dir}"/>
651 +
652 +    <javadoc destdir="${dist.4jdk7.docs.dir}"
653 +             packagenames="none"
654 +             link="${jdkapi7docs.url}"
655 +             overview="${4jdk7src.dir}/intro.html"
656 +             classpath=""
657 +             executable="${javadoc7}">
658 +      <sourcepath path="${4jdk7src.dir}"/>
659 +      <sourcepath path="${jdk7src.dir}"/>
660 +      <arg value="-XDignore.symbol.file=true"/>
661 +      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
662 +        <include name="**/*.java"/>
663 +      </fileset>
664      </javadoc>
665 +  </target>
666 +
667 +
668 +  <target name="4jdk7dist"
669 +          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
670 +          description="Puts all distributable products in single hierarchy"/>
671 +
672 +
673 +  <target name="4jdk7clean"
674 +          description="Removes all 4jdk7 build products">
675 +
676 +    <delete dir="${build.4jdk7.dir}"/>
677  
678    </target>
679  
680  
681 +  <target name="4jdk7dist-clean"
682 +          description="Removes all build and distribution products">
683  
684 <  <!-- Internal targets -->
684 >  </target>
685  
686 <  <target name="set-warnings-if" if="build.warnings">
686 >  <target name="4jdk7dist-jar"
687 >          depends="4jdk7clean, 4jdk7-jar">
688  
689 <    <property name="build.warnings.option" value="-warnunchecked"/>
689 >    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
690  
691    </target>
692  
693  
694 <  <target name="set-warnings-unless" unless="build.warnings">
694 >  <!-- jsr166x -->
695 >
696 >  <target name="jsr166xcompile"
697 >          depends="configure-compiler"
698 >          description="Compiles jsr166x sources to build dir">
699  
700 <    <property name="build.warnings.option" value=""/>
700 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
701  
702 +    <javac srcdir="${topsrc.dir}"
703 +           destdir="${build.jsr166x.classes.dir}"
704 +           debug="${build.debug}"
705 +           debuglevel="${build.debuglevel}"
706 +           deprecation="${build.deprecation}"
707 +           classpath=""
708 +           source="5"
709 +           includeAntRuntime="false"
710 +           includeJavaRuntime="false"
711 +           executable="${javac7}"
712 +           fork="true">
713 +
714 +      <include name="jsr166x/**/*.java"/>
715 +      <bootclasspath path="${bootclasspath6}"/>
716 +      <compilerarg value="-XDignore.symbol.file=true"/>
717 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
718 +      <compilerarg line="${build.args}"/>
719 +
720 +    </javac>
721    </target>
722  
723  
724 <  <target name="init"
725 <          depends="set-warnings-if, set-warnings-unless">
724 >  <target name="jsr166x-jar"
725 >          depends="jsr166xcompile"
726 >          description="Builds library jar from compiled sources">
727  
728 <    <!-- Version is kept in a separate file -->
729 <    <loadfile property="version" srcFile="version.properties"/>
730 <    <echo>Building JSR-166 version ${version}</echo>
728 >    <jar destfile="${jsr166x.jar}">
729 >      <fileset dir="${build.jsr166x.classes.dir}"/>
730 >    </jar>
731  
732    </target>
733  
734  
735 <  <target name="init-jar">
735 >  <target name="jsr166xdocs"
736 >          description="Builds javadocs to dist dir">
737  
738 <    <mkdir dir="${build.lib.dir}"/>
738 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
739 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
740  
741 +    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
742 +             packagenames="jsr166x.*"
743 +             link="${jdkapidocs.url}"
744 +             source="5"
745 +             executable="${javadoc7}">
746 +      <sourcepath path="${topsrc.dir}"/>
747 +      <sourcepath path="${jdk6src.dir}"/>
748 +      <bootclasspath path="${bootclasspath6}"/>
749 +      <arg value="-XDignore.symbol.file=true"/>
750 +
751 +    </javadoc>
752    </target>
753  
754  
755 <  <target name="native-jar"
756 <          depends="compile"
757 <          unless="build.emulation.true">
755 >  <target name="jsr166xdist"
756 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
757 >          description="Puts all distributable products in single hierarchy"/>
758  
759 <    <jar destfile="${product.jar}">
760 <      <fileset dir="${build.classes.dir}"/>
761 <    </jar>
759 >
760 >  <target name="jsr166xclean"
761 >          description="Removes all jsr166x build products">
762 >
763 >    <delete dir="${build.jsr166x.dir}"/>
764  
765    </target>
766  
767  
768 <  <target name="compile-emulation"
769 <          depends="init"
318 <          if="build.emulation.true">
768 >  <target name="jsr166xdist-clean"
769 >          description="Removes all build and distribution products">
770  
771 <    <mkdir dir="${build.emulation.dir}"/>
771 >  </target>
772  
322    <javac srcdir="${emulation.src.dir}"
323          destdir="${build.emulation.dir}"
324            debug="${build.debug}"
325       debuglevel="${build.debuglevel}"
326      deprecation="${build.deprecation}"
327           source="${build.sourcelevel}"
328             fork="true">
773  
774 <      <bootclasspath refid="javac.bootclasspath"/>
775 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
774 >  <target name="jsr166xdist-jar"
775 >          depends="jsr166xclean, jsr166x-jar">
776  
777 <    </javac>
777 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
778  
779    </target>
780  
781 +  <!-- jsr166y -->
782  
338  <target name="emulation-jar"
339          depends="compile-emulation"
340          if="build.emulation.true">
783  
784 +  <target name="jsr166ycompile"
785 +          depends="configure-compiler"
786 +          description="Compiles jsr166y sources">
787  
788 <    <jar destfile="${product.jar}" duplicate="add">
789 <      <fileset dir="${build.classes.dir}">
790 <        <patternset refid="emulation.excludes"/>
791 <      </fileset>
792 <      <fileset dir="${build.emulation.dir}"/>
788 >    <mkdir dir="${build.jsr166y.classes.dir}"/>
789 >
790 >    <javac srcdir="${topsrc.dir}"
791 >           destdir="${build.jsr166y.classes.dir}"
792 >           debug="${build.debug}"
793 >           debuglevel="${build.debuglevel}"
794 >           deprecation="${build.deprecation}"
795 >           source="6"
796 >           classpath=""
797 >           includeAntRuntime="false"
798 >           includeJavaRuntime="false"
799 >           executable="${javac7}"
800 >           fork="true">
801 >
802 >      <include name="jsr166y/**/*.java"/>
803 >      <bootclasspath path="${bootclasspath6}"/>
804 >      <compilerarg value="-XDignore.symbol.file=true"/>
805 >      <compilerarg value="-Xlint:all"/>
806 >      <compilerarg line="${build.args}"/>
807 >
808 >    </javac>
809 >  </target>
810 >
811 >
812 >  <target name="jsr166y-jar"
813 >          depends="jsr166ycompile"
814 >          description="Builds library jar from compiled sources">
815 >
816 >    <jar destfile="${jsr166y.jar}" index="true">
817 >      <fileset dir="${build.jsr166y.classes.dir}"/>
818      </jar>
819  
820    </target>
821  
822  
823 <  <target name="dist-jar"
824 <          depends="clean, jar">
823 >  <target name="jsr166ydocs"
824 >          description="Builds javadocs to dist dir">
825  
826 <    <copy file="${product.jar}" todir="${dist.dir}"/>
826 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
827 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
828 >
829 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
830 >             packagenames="jsr166y.*"
831 >             link="${jdkapidocs.url}"
832 >             source="6"
833 >             executable="${javadoc7}">
834 >      <sourcepath path="${topsrc.dir}"/>
835 >      <sourcepath path="${jdk6src.dir}"/>
836 >      <bootclasspath path="${bootclasspath6}"/>
837 >      <arg value="-XDignore.symbol.file=true"/>
838  
839 +    </javadoc>
840    </target>
841  
842  
843 <  <target name="compile-ant-filter"
844 <          depends="init">
843 >  <target name="jsr166ydist"
844 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
845 >          description="Puts all distributable products in single hierarchy"/>
846  
364    <mkdir dir="${build.ant.dir}"/>
847  
848 <    <javac srcdir="${ant.src.dir}"
849 <          destdir="${build.ant.dir}"
850 <           source="1.4"
851 <    />
848 >  <target name="jsr166yclean"
849 >          description="Removes all jsr166y build products">
850 >
851 >    <delete dir="${build.jsr166y.dir}"/>
852  
853    </target>
854  
855  
856 <  <target name="filter-src"
857 <          depends="compile-ant-filter">
856 >  <target name="jsr166ydist-clean"
857 >          description="Removes all build and distribution products">
858  
859 <    <mkdir dir="${build.filter.src.dir}"/>
859 >  </target>
860  
861 <    <copy todir="${build.filter.src.dir}">
862 <      <fileset dir="${src.dir}">
863 <        <patternset refid="emulation.excludes"/>
864 <      </fileset>
383 <      <filterchain>
384 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
385 <                      classpath="${build.ant.dir}">
386 <          <!--
387 <           # These arguments are to get rid of angle-bracketed type
388 <           # parameters so that javadoc can run on the result. The
389 <           # following heuristic that seems to work:
390 <           #
391 <           # For all lines not starting with space(s)-asterisk-space(s),
392 <           #   replace <something> with a space, where there may be more
393 <           #   than one right angle bracket at the end, and "something"
394 <           #   must not contain parens or pipes. (This may need some
395 <           #   tweaking.)
396 <           -->
397 <          <param name="notmatching" value="^\s+\*\s.*$"/>
398 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
399 <          <param name="replacement" value=" "/>
400 <        </filterreader>
401 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
402 <                      classpath="${build.ant.dir}">
403 <          <!--
404 <           # These arguments are to uncomment lines beginning with
405 <           # "//@" so that javadoc can see imports that are needed
406 <           # to resolve links but that shouldn't be in the compiled
407 <           # code.
408 <           -->
409 <          <param name="matching" value="^//@.*$"/>
410 <          <param name="pattern" value="^//@"/>
411 <          <param name="replacement" value=""/>
412 <        </filterreader>
413 <      </filterchain>
414 <    </copy>
861 >  <target name="jsr166ydist-jar"
862 >          depends="jsr166yclean, jsr166y-jar">
863 >
864 >    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
865  
866    </target>
867  
868  
869 <  <target name="compile-tests"
420 <          depends="jar">
869 >  <!-- extra166y -->
870  
422    <mkdir dir="${build.testcases.dir}"/>
871  
872 <    <javac srcdir="${test.src.dir}"
873 <          destdir="${build.testcases.dir}"
874 <            debug="${build.debug}"
427 <       debuglevel="${build.debuglevel}"
428 <      deprecation="${build.deprecation}"
429 <           source="${build.sourcelevel}"
430 <             fork="true">
872 >  <target name="extra166ycompile"
873 >          depends="configure-compiler, jsr166y-jar"
874 >          description="Compiles extra166y sources">
875  
876 <      <bootclasspath refid="javac.bootclasspath"/>
877 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
878 <      <classpath refid="test.classpath"/>
876 >    <mkdir dir="${build.extra166y.classes.dir}"/>
877 >
878 >    <javac srcdir="${topsrc.dir}"
879 >           destdir="${build.extra166y.classes.dir}"
880 >           debug="${build.debug}"
881 >           debuglevel="${build.debuglevel}"
882 >           deprecation="${build.deprecation}"
883 >           classpath=""
884 >           source="6"
885 >           includeAntRuntime="false"
886 >           includeJavaRuntime="false"
887 >           executable="${javac7}"
888 >           fork="true">
889 >
890 >      <include name="extra166y/**/*.java"/>
891 >      <bootclasspath path="${jsr166y.jar}"/>
892 >      <bootclasspath path="${bootclasspath6}"/>
893 >      <compilerarg value="-XDignore.symbol.file=true"/>
894 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
895 >      <compilerarg line="${build.args}"/>
896  
897      </javac>
898 +  </target>
899 +
900 +
901 +  <target name="extra166y-jar"
902 +          depends="extra166ycompile"
903 +          description="Builds library jar from compiled sources">
904 +
905 +    <jar destfile="${extra166y.jar}" index="true">
906 +      <fileset dir="${build.extra166y.classes.dir}"/>
907 +    </jar>
908  
909    </target>
910  
911  
912 <  <target name="run-tests"
913 <          depends="compile-tests">
912 >  <target name="extra166ydocs"
913 >          description="Builds javadocs to build dir">
914  
915 <    <!-- May be overridden by user.properties -->
916 <    <property name="testcase" value="*"/>
915 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
916 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
917  
918 <    <mkdir dir="${build.reports.dir}"/>
918 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
919 >             packagenames="extra166y.*"
920 >             link="${jdkapidocs.url}"
921 >             source="6"
922 >             executable="${javadoc7}">
923 >      <sourcepath path="${topsrc.dir}"/>
924 >      <sourcepath path="${jdk6src.dir}"/>
925 >      <bootclasspath path="${bootclasspath6}"/>
926 >      <arg value="-XDignore.symbol.file=true"/>
927  
928 <    <junit printsummary="true"
929 <             showoutput="true"
451 <          errorProperty="junit.failed"
452 <        failureProperty="junit.failed"
453 <                    dir="${build.reports.dir}"
454 <                   fork="true">
928 >    </javadoc>
929 >  </target>
930  
456      <jvmarg value="${test.javac.args}"/>
931  
932 <      <formatter type="xml"/>
932 >  <target name="extra166ydist"
933 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
934 >          description="Puts all distributable products in single hierarchy"/>
935  
460      <batchtest todir="${build.reports.dir}">
461        <fileset dir="${test.src.dir}">
462          <include name="**/${testcase}Test.java"/>
463        </fileset>
464      </batchtest>
936  
937 <    </junit>
937 >  <target name="extra166yclean"
938 >          description="Removes all extra166y build products">
939 >
940 >    <delete dir="${build.extra166y.dir}"/>
941  
942    </target>
943  
944  
945 <  <target name="report-tests"
946 <          depends="run-tests">
945 >  <target name="extra166ydist-clean"
946 >          description="Removes all build and distribution products">
947  
948 <    <!-- Sets junit.report.format to frames if Xalan is present,
475 <         otherwise sets it to noframes. -->
476 <    <available property="junit.report.format"
477 <                  value="frames"
478 <              classname="org.apache.xalan.lib.Redirect"
479 <    />
480 <    <property name="junit.report.format" value="noframes"/>
948 >  </target>
949  
950 <    <junitreport todir="${build.reports.dir}">
951 <      <fileset dir="${build.reports.dir}">
484 <        <include name="TEST-*.xml"/>
485 <      </fileset>
486 <      <report styledir="${stylesheet.dir}"
487 <                format="${junit.report.format}"
488 <                 todir="${build.reports.dir}"
489 <      />
490 <    </junitreport>
950 >  <target name="extra166ydist-jar"
951 >          depends="extra166yclean, extra166y-jar">
952  
953 <    <fail message="Test Cases Failed" if="junit.failed"/>
953 >    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
954  
955    </target>
956  
957 +  <!-- jsr166e -->
958  
959 <  <target name="check-junit">
959 >  <target name="jsr166ecompile"
960 >          depends="configure-compiler"
961 >          description="Compiles jsr166e sources">
962  
963 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
500 <    <available property="junit.available"
501 <               classname="junit.framework.Protectable"/>
963 >    <mkdir dir="${build.jsr166e.classes.dir}"/>
964  
965 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
966 <          unless="junit.available"/>
965 >    <javac srcdir="${topsrc.dir}"
966 >           destdir="${build.jsr166e.classes.dir}"
967 >           debug="${build.debug}"
968 >           debuglevel="${build.debuglevel}"
969 >           deprecation="${build.deprecation}"
970 >           source="7"
971 >           classpath=""
972 >           includeAntRuntime="false"
973 >           includeJavaRuntime="false"
974 >           executable="${javac7}"
975 >           fork="true">
976 >
977 >      <include name="jsr166e/**/*.java"/>
978 >      <compilerarg value="-XDignore.symbol.file=true"/>
979 >      <compilerarg value="-Xlint:all"/>
980 >      <compilerarg line="${build.args}"/>
981  
982 +    </javac>
983    </target>
984  
985  
986 <  <target name="check-emulation">
987 <    <condition property="build.emulation.true">
988 <      <or>
989 <        <isset property="build.emulation"/>
990 <        <os family="windows"/>
991 <      </or>
992 <    </condition>
986 >  <target name="jsr166e-jar"
987 >          depends="jsr166ecompile"
988 >          description="Builds library jar from compiled sources">
989 >
990 >    <jar destfile="${jsr166e.jar}" index="true">
991 >      <fileset dir="${build.jsr166e.classes.dir}"/>
992 >    </jar>
993 >
994    </target>
995  
996  
997 +  <target name="jsr166edocs"
998 +          description="Builds javadocs to build dir">
999  
1000 <  <!-- Anthill targets -->
1000 >    <delete dir="${dist.jsr166ejavadocs.dir}"/>
1001 >    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1002  
1003 <  <target name="anthill-build"
1004 <          depends="jar, test, docs, dist-docs"/>
1003 >    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1004 >             packagenames="jsr166e.*"
1005 >             link="${jdkapidocs.url}"
1006 >             source="7"
1007 >             executable="${javadoc7}">
1008 >      <sourcepath path="${topsrc.dir}"/>
1009 >      <sourcepath path="${jdk7src.dir}"/>
1010 >      <arg value="-XDignore.symbol.file=true"/>
1011  
1012 <  <target name="anthill-publish">
1012 >    </javadoc>
1013 >  </target>
1014  
527    <copy todir="${deployDir}/docs/private">
528      <fileset dir="${build.javadocs.dir}"/>
529    </copy>
1015  
1016 <    <copy todir="${deployDir}/docs/public">
1017 <      <fileset dir="${dist.javadocs.dir}"/>
1018 <    </copy>
1016 >  <target name="jsr166edist"
1017 >          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1018 >          description="Puts all distributable products in single hierarchy"/>
1019  
535    <copy tofile="${deployDir}/index.html"
536          file="${basedir}/etc/anthill-index.html"/>
1020  
1021 <    <copy todir="${deployDir}/notes">
1022 <      <fileset dir="${basedir}/etc/notes"/>
1023 <    </copy>
1021 >  <target name="jsr166eclean"
1022 >          description="Removes all jsr166e build products">
1023 >
1024 >    <delete dir="${build.jsr166e.dir}"/>
1025  
1026    </target>
1027  
1028  
1029 +  <target name="jsr166edist-clean"
1030 +          description="Removes all build and distribution products">
1031 +
1032 +  </target>
1033 +
1034 +  <target name="jsr166edist-jar"
1035 +          depends="jsr166eclean, jsr166e-jar">
1036 +
1037 +    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1038 +
1039 +  </target>
1040 +
1041   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines