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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines