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.36 by tim, Thu May 29 17:29:08 2003 UTC vs.
Revision 1.119 by jsr166, Mon Jan 21 02:31:40 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines