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.47 by tim, Fri Aug 1 19:34:05 2003 UTC vs.
Revision 1.84 by dl, Thu Nov 25 12:48:45 2010 UTC

# Line 21 | Line 21
21  
22  
23    <!-- Compilation options -->
24 <  <property name="build.sourcelevel"    value="1.5"/>
25 <  <property name="build.docsourcelevel" value="1.4"/>
24 >  <property name="build.sourcelevel"    value="1.6"/>
25    <property name="build.debug"          value="true"/>
26    <property name="build.debuglevel"     value="source,lines,vars"/>
27    <property name="build.deprecation"    value="false"/>
28  
29    <!-- Build locations -->
30 <  <property name="build.dir"            location="build"/>
31 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
32 <  <property name="build.emulation.dir"  location="${build.dir}/emulation"/>
33 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
34 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
35 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
36 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
37 <  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
38 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
39 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
40 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
41 <  <property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
30 >  <property name="build.dir"                   location="build"/>
31 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
32 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
33 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
34 >  <property name="build.lib.dir"               location="${build.dir}/lib"/>
35 >  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
36 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
37 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
38 >  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
39 >  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
40 >
41 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
42 >  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
43 >  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
44 >
45 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
46 >  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
47 >  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
48  
49    <!-- Source locations -->
50    <property name="src.dir"              location="${basedir}/src/main"/>
46  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
51    <property name="test.src.dir"         location="${basedir}/src/test"/>
52 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
53 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
52 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
53 >  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
54 >  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
55    <property name="lib.dir"              location="${basedir}/lib"/>
56    <property name="dist.dir"             location="${basedir}/dist"/>
57 <
57 >  <property name="topsrc.dir"           location="${basedir}/src"/>
58 >  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
59 >  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
60 >  <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
61 >  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
62    <!-- Distribution locations -->
63 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
63 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
64 >  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
65 >  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
66 >  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
67  
68    <!-- Jar locations -->
69    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
70 +  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
71 +  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
72 +  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
73    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
59  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
60
61
74  
75 <  <!-- Files excluded from dist-docs and emulation jar -->
76 <  <patternset id="unsafe.exclusion">
65 <    <exclude name="java/util/Random.*"/>
66 <    <exclude name="sun/misc/Unsafe.*"/>
67 <  </patternset>
68 <
69 <  <!-- Files excludes from emulation jar -->
70 <  <patternset id="atomic.exclusion">
71 <    <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
72 <    <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
73 <    <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
74 <    <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
75 <  </patternset>
75 >  <!-- Bootclasspath argument -->
76 >  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
77  
78 +  <!-- Test classpath -->
79 +  <path id="test.classpath">
80 +    <pathelement location="${build.testcases.dir}"/>
81 +    <pathelement location="${junit.jar}"/>
82 +  </path>
83 +
84 +  <!-- ALoops classpath -->
85 +  <path id="loops.classpath">
86 +    <pathelement location="${build.loops.dir}"/>
87 +  </path>
88  
89  
90    <!-- Main targets -->
91  
92 +  <target name="dists"
93 +          depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
94 +          description="Builds all public jars and docs"/>
95 +
96    <target name="compile"
97 <          depends="init, configure-compiler, prepare-src"
97 >          depends="init, configure-compiler"
98            description="Compiles main sources to build folder">
99  
85    <property name="prepare.src.dir" value="${src.dir}"/>
86
100      <mkdir dir="${build.classes.dir}"/>
101  
102 < <!--
90 <    <echo>javac ${gjc.args}</echo>
91 <    <echo>bootclasspath=${compile.bootclasspath}</echo>
92 < -->
93 <
94 <    <javac srcdir="${prepare.src.dir}"
102 >    <javac srcdir="${src.dir}"
103            destdir="${build.classes.dir}"
104              debug="${build.debug}"
105         debuglevel="${build.debuglevel}"
# Line 99 | Line 107
107             source="${build.sourcelevel}"
108               fork="true">
109  
110 <      <compilerarg    line="${gjc.args}"/>
111 <      <bootclasspath refid="compile.bootclasspath"/>
110 >      <include name="**/*.java"/>
111 >      <compilerarg value="-XDignore.symbol.file=true"/>
112 >
113 > <!--
114 >      <exclude name="java/lang/**"/>
115 >      <compilerarg line="${build.args}"/>
116 >      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
117 > -->
118  
119      </javac>
120  
121    </target>
122  
123  
110  <target name="jar"
111          depends="configure-emulation, init-jar, native-jar, emulation-jar"
112          description="Builds library jar from compiled sources"/>
113
124  
125 <  <target name="test"
126 <          depends="init, configure-tests, report-tests"
127 <          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
118 <
119 <
120 <  <target name="checkstyle"
121 <          depends="filter-src"
122 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
125 >  <target name="jar"
126 >          depends="compile"
127 >          description="Builds library jar from compiled sources">
128  
129 <    <taskdef resource="checkstyletask.properties"
125 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
129 >    <mkdir dir="${build.lib.dir}"/>
130  
131 <    <checkstyle>
132 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
133 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
130 <    </checkstyle>
131 >    <jar destfile="${product.jar}">
132 >      <fileset dir="${build.classes.dir}"/>
133 >    </jar>
134  
135    </target>
136  
137  
135  <target name="doccheck"
136          depends="filter-doccheck"
137          description="Reports on javadoc style errors">
138
139    <delete dir="${build.doccheck.dir}"/>
140    <mkdir dir="${build.doccheck.dir}"/>
138  
139 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
140 <         docletpath="${lib.dir}/doccheck.jar"
141 <            destdir="${build.doccheck.dir}">
145 <      <packageset dir="${build.filter.doccheck.dir}"/>
146 <    </javadoc>
139 >  <target name="test"
140 >          depends="init, configure-tests, report-tests"
141 >          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
142  
148  </target>
143  
144  
145    <target name="docs"
152          depends="filter-src"
146            description="Builds javadocs with custom tags to build folder">
147  
148      <delete dir="${build.javadocs.dir}"/>
149      <mkdir dir="${build.javadocs.dir}"/>
150  
151      <javadoc destdir="${build.javadocs.dir}"
152 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
152 >                link="http://download.oracle.com/javase/6/docs/api/"
153              overview="${src.dir}/intro.html"
154 <              source="${build.docsourcelevel}">
155 <
163 <      <tag name="revised" description="Last revised:"/>
164 <      <tag name="spec"    description="Specified by:"/>
165 <      <tag name="editor"  description="Last edited by:"/>
166 <      <tag name="fixme"   description="FIX ME:"/>
154 >            sourcepath="${src.dir}:${jdksrc.dir}"
155 >    >
156  
157 <      <packageset dir="${build.filter.src.dir}"/>
157 >      <packageset dir="${src.dir}"/>
158  
159      </javadoc>
160  
161    </target>
162  
163  
175  <target name="strip"
176          depends="init, configure-compiler"
177          description="Strip generics from java source (not working yet)">
178
179    <mkdir dir="${build.stripped.dir}"/>
180
181    <!--
182     # javac -s doesn't reliably generate compilable code. It generates
183     # bridge methods (marked as "synthetic") that can have identical
184     # signatures to existing methods except for the return value.
185     -->
186    <javac srcdir="${src.dir}"
187          destdir="${build.stripped.dir}"
188            debug="${build.debug}"
189       debuglevel="${build.debuglevel}"
190      deprecation="${build.deprecation}"
191           source="${build.sourcelevel}"
192             fork="true">
193
194      <compilerarg    line="${gjc.args} -s"/>
195      <bootclasspath refid="compile.bootclasspath"/>
196
197    </javac>
198
199  </target>
200
164  
165    <target name="dist"
166            depends="init, dist-clean, dist-jar, dist-docs"
167            description="Puts all distributable products in single hierarchy"/>
168  
169 +
170    <target name="release"
171            depends="dist"
172            description="Puts entire CVS tree, plus distribution productions, in a jar">
173  
210 <!--
211    #keep build dir? - dl
212    <delete dir="${build.dir}"/>
213 -->
174      <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
175  
176      <jar basedir="${basedir}" destfile="${release.jar}">
177 +      <!-- <exclude name="build/**"/> -->
178        <exclude name="${release.jar}"/>
179        <exclude name="user.properties"/>
180        <exclude name="etc/notes/**"/>
181 <      <exclude name="lib/gjc/2.1/**"/>
181 >      <exclude name="src/emulation/**"/>
182        <exclude name="**/SyntaxTest.java"/>
183 +      <exclude name="**/SuperfluousAbstract.java"/>
184      </jar>
185  
186    </target>
187  
188 +
189 +
190    <target name="clean"
191            description="Removes all build products">
192  
# Line 233 | Line 197
197    </target>
198  
199  
200 +
201    <target name="dist-clean"
202            description="Removes all build and distribution products">
203  
# Line 241 | Line 206
206    </target>
207  
208  
209 +
210    <target name="dist-docs"
245          depends="filter-src"
211            description="Builds javadocs without custom tags to dist folder">
212  
213      <delete dir="${dist.javadocs.dir}"/>
214      <mkdir dir="${dist.javadocs.dir}"/>
215  
216      <javadoc destdir="${dist.javadocs.dir}"
217 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
217 >            link="http://download.oracle.com/javase/6/docs/api/"
218              overview="${src.dir}/intro.html"
254              source="${build.docsourcelevel}">
255
256      <packageset dir="${build.filter.src.dir}"/>
219  
220 +            sourcepath="${src.dir}:${jdksrc.dir}"
221 +     >
222 + <!--
223 +      <packageset dir="${src.dir}" defaultexcludes="yes">
224 +      <include name="java/util/concurrent"/>
225 +      <include name="java/util/concurrent/atomic"/>
226 +      <include name="java/util/concurrent/locks"/>
227 +      </packageset>
228 + -->
229 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
230 +      <include name="main/java/util/concurrent/*.java"/>
231 +      <include name="main/java/util/concurrent/atomic/*.java"/>
232 +      <include name="main/java/util/concurrent/locks/*.java"/>
233 +      <include name="main/java/util/*.java"/>
234 + <!--
235 +      <include name="main/java/util/concurrent/*.html"/>
236 +      <include name="main/java/util/concurrent/atomic/*.html"/>
237 +      <include name="main/java/util/concurrent/locks/*.html"/>
238 +      <include name="main/java/util/*.html"/>
239 + -->
240 + <!--      <include name="jsr166x/*.java"/> -->
241 +      </fileset>
242      </javadoc>
243  
244    </target>
# Line 269 | Line 253
253      <!-- Version is kept in a separate file -->
254      <loadfile property="version" srcFile="version.properties"/>
255      <echo>Building JSR-166 version ${version}</echo>
256 +    <echo>java.home is ${java.home}</echo>
257  
258    </target>
259  
260  
261 <  <target name="init-jar">
261 >  <target name="dist-jar"
262 >          depends="clean, jar">
263  
264 <    <mkdir dir="${build.lib.dir}"/>
264 >    <copy file="${product.jar}" todir="${dist.dir}"/>
265  
266    </target>
267  
268  
269 <  <target name="native-jar"
270 <          depends="compile"
285 <          unless="build.emulation.true">
269 >  <target name="compile-tests"
270 >          depends="jar">
271  
272 <    <jar destfile="${product.jar}">
288 <      <fileset dir="${build.classes.dir}"/>
289 <    </jar>
272 >    <mkdir dir="${build.testcases.dir}"/>
273  
274 <  </target>
274 >    <javac srcdir="${tck.src.dir}"
275 >          destdir="${build.testcases.dir}"
276 >            debug="${build.debug}"
277 >       debuglevel="${build.debuglevel}"
278 >      deprecation="${build.deprecation}"
279 >           source="${build.sourcelevel}"
280 >             fork="true">
281  
282 +      <compilerarg value="${bootclasspath.args}"/>
283 +      <compilerarg line="${build.args}"/>
284 +      <compilerarg value="-XDignore.symbol.file=true"/>
285  
286 <  <target name="compile-emulation"
287 <          depends="init, configure-compiler"
288 <          if="build.emulation.true">
286 >      <classpath refid="test.classpath"/>
287 >
288 >    </javac>
289 >
290 >    <javac srcdir="${test.src.dir}"
291 >          destdir="${build.testcases.dir}"
292 >            debug="${build.debug}"
293 >       debuglevel="${build.debuglevel}"
294 >      deprecation="${build.deprecation}"
295 >           source="${build.sourcelevel}"
296 >             fork="true">
297 >
298 >      <include name="jsr166/test/**"/>
299 >
300 >      <compilerarg value="${bootclasspath.args}"/>
301 >      <compilerarg line="${build.args}"/>
302 >      <compilerarg value="-XDignore.symbol.file=true"/>
303  
304 <    <mkdir dir="${build.emulation.dir}"/>
304 >      <classpath refid="test.classpath"/>
305 >
306 >    </javac>
307  
308 <    <javac srcdir="${emulation.src.dir}"
309 <          destdir="${build.emulation.dir}"
308 > <!--
309 >    <javac srcdir="${jtreg.src.dir}"
310 >          destdir="${build.testcases.dir}"
311              debug="${build.debug}"
312         debuglevel="${build.debuglevel}"
313        deprecation="${build.deprecation}"
314             source="${build.sourcelevel}"
315               fork="true">
316  
317 <      <compilerarg    line="${gjc.args}"/>
318 <      <bootclasspath refid="compile.bootclasspath"/>
317 >      <compilerarg value="${bootclasspath.args}"/>
318 >      <compilerarg line="${build.args}"/>
319 >      <compilerarg value="-XDignore.symbol.file=true"/>
320 >
321 >      <classpath refid="test.classpath"/>
322  
323      </javac>
324 + -->
325  
326    </target>
327  
328  
329 <  <target name="emulation-jar"
330 <          depends="compile-emulation"
318 <          if="build.emulation.true">
329 >  <target name="run-tests"
330 >          depends="compile-tests">
331  
332 +    <!-- May be overridden by user.properties -->
333 +    <property name="testcase" value="*"/>
334  
335 <    <jar destfile="${product.jar}" duplicate="add">
322 <      <fileset dir="${build.classes.dir}">
323 <        <patternset refid="atomic.exclusion"/>
324 <        <patternset refid="unsafe.exclusion"/>
325 <      </fileset>
326 <      <fileset dir="${build.emulation.dir}"/>
327 <    </jar>
335 >    <mkdir dir="${build.reports.dir}"/>
336  
337 <  </target>
337 >    <junit printsummary="true"
338 >             showoutput="true"
339 >          errorProperty="junit.failed"
340 >        failureProperty="junit.failed"
341 >                    dir="${build.reports.dir}"
342 >                   fork="true">
343  
344 +      <jvmarg value="${bootclasspath.args}"/>
345 +      <jvmarg value="-server"/>
346 +      <jvmarg value="-showversion"/>
347  
348 <  <target name="dist-jar"
333 <          depends="clean, jar">
348 >      <classpath refid="test.classpath"/>
349  
350 <    <copy file="${product.jar}" todir="${dist.dir}"/>
350 >      <formatter type="xml"/>
351  
352 <  </target>
352 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
353 >        <fileset dir="${tck.src.dir}">
354 >          <include name="**/${testcase}Test.java"/>
355 >        </fileset>
356 >      </batchtest>
357  
358 +      <batchtest todir="${build.reports.dir}" if="do.test.old">
359 +        <fileset dir="${test.src.dir}">
360 +          <include name="jsr166/test/**/${testcase}Test.java"/>
361 +        </fileset>
362 +      </batchtest>
363  
364 <  <target name="compile-ant-filter"
365 <          depends="init">
364 > <!--
365 >      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
366 >        <fileset dir="${jtreg.src.dir}">
367 >          <include name="**/${testcase}Test.java"/>
368 >        </fileset>
369 >      </batchtest>
370 > -->
371 >
372 >    </junit>
373 >
374 >  </target>
375  
343    <mkdir dir="${build.ant.dir}"/>
376  
377 <    <javac srcdir="${ant.src.dir}"
378 <          destdir="${build.ant.dir}"
379 <           source="1.4"
377 >  <target name="report-tests"
378 >          depends="run-tests">
379 >
380 >    <!-- Sets junit.report.format to frames if redirection is present,
381 >         otherwise sets it to noframes. -->
382 >    <available property="junit.report.format"
383 >                  value="frames"
384 >              classname="org.apache.xalan.lib.Redirect"
385      />
386 +    <property name="junit.report.format" value="noframes"/>
387 +
388 +    <junitreport todir="${build.reports.dir}">
389 +      <fileset dir="${build.reports.dir}">
390 +        <include name="TEST-*.xml"/>
391 +      </fileset>
392 +      <report format="${junit.report.format}" todir="${build.reports.dir}"
393 +      />
394 +    </junitreport>
395 +
396 +    <fail message="Test Cases Failed" if="junit.failed"/>
397  
398    </target>
399  
400  
401 <  <target name="filter-src"
354 <          depends="compile-ant-filter">
401 >  <target name="configure-compiler">
402  
403 <    <mkdir dir="${build.filter.src.dir}"/>
403 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
404  
405 <    <copy todir="${build.filter.src.dir}">
406 <      <fileset dir="${src.dir}">
407 <        <include name="**/*.html"/>
361 <      </fileset>
362 <    </copy>
405 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
406 >      <istrue value="${build.warnunchecked}"/>
407 >    </condition>
408  
409 <    <copy todir="${build.filter.src.dir}">
365 <      <fileset dir="${src.dir}">
366 <        <exclude name="**/*.html"/>
367 <        <patternset refid="unsafe.exclusion"/>
368 <      </fileset>
369 <      <filterchain>
409 >    <property name="warnunchecked.arg" value=""/>
410  
371        <!--
372         # This filter gets rid of angle-bracketed type parameters
373         # so that javadoc can run on the result. The following
374         # heuristic seems to work:
375         #
376         # For all lines not starting with space(s)-asterisk-space(s),
377         #   replace <something> with a space, where there may be more
378         #   than one right angle bracket at the end, and "something"
379         #   must not contain parens or pipes. (This may need some
380         #   tweaking.)
381         -->
411  
412 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
413 <                      classpath="${build.ant.dir}">
385 <          <param name="notmatching" value="^\s+\*\s.*$"/>
386 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
387 <          <param name="replacement" value=" "/>
388 <        </filterreader>
412 >    <!-- Common options in javac invocations -->
413 >    <property name="build.args" value="${warnunchecked.arg}"/>
414  
415 +  </target>
416  
391        <!--
392         # This filter uncomments lines beginning with "//@" so that
393         # javadoc can see imports that are needed to resolve links
394         # but that shouldn't be in the compiled code.
395         -->
417  
418 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
419 <                      classpath="${build.ant.dir}">
420 <          <param name="matching"    value="^//@.*$"/>
421 <          <param name="pattern"     value="^//@"/>
422 <          <param name="replacement" value=""/>
423 <        </filterreader>
424 <      </filterchain>
425 <    </copy>
418 >  <target name="configure-tests"
419 >       depends="configure-compiler">
420 >
421 >    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
422 >    <available property="junit.available"
423 >               classname="junit.framework.Protectable"/>
424 >
425 >    <!-- Xalan -->
426 >    <available property="xalan.available"
427 >               classname="org.apache.xalan.Version"/>
428 >
429 >
430 >    <!-- Ant 1.6beta and later don't need or want this check -->
431 >    <!--
432 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
433 >          unless="junit.available"/>
434 >
435 >    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
436 >          unless="xalan.available"/>
437 >    -->
438  
439    </target>
440  
441  
442 +  <!-- Various demos and test programs -->
443  
444  
445 <  <target name="filter-doccheck"
446 <          depends="filter-src">
445 >  <target name="loops" depends="init, configure-compiler"
446 >          description="Benchmark from Doug Lea's AQS paper">
447  
448 <    <mkdir dir="${build.filter.doccheck.dir}"/>
448 >    <mkdir dir="${build.loops.dir}"/>
449  
450 <    <copy todir="${build.filter.doccheck.dir}">
451 <      <fileset dir="${build.filter.src.dir}">
452 <        <include name="**/*.html"/>
453 <      </fileset>
454 <    </copy>
450 >    <javac srcdir="${loops.src.dir}"
451 >          destdir="${build.loops.dir}"
452 >            debug="${build.debug}"
453 >       debuglevel="${build.debuglevel}"
454 >      deprecation="${build.deprecation}"
455 >           source="${build.sourcelevel}"
456 >             fork="true">
457  
458 <    <property name="generic.declarations"
459 <             value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
460 <    />
458 >      <compilerarg line="${build.args}"/>
459 >      <classpath refid="loops.classpath"/>
460 >      <compilerarg value="-XDignore.symbol.file=true"/>
461  
462 <    <copy todir="${build.filter.doccheck.dir}">
427 <      <fileset dir="${build.filter.src.dir}">
428 <        <exclude name="**/*.html"/>
429 <      </fileset>
430 <      <filterchain>
431 <        <!--
432 <         # These two filters try to make the source look like
433 <         # something that doccheck can process. The first removes
434 <         # -source 1.4 assertions and the second adds in a bunch
435 <         # of single letter public nested marker interfaces so that
436 <         # the generic type parameters are recognized.
437 <         -->
438 <
439 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
440 <                      classpath="${build.ant.dir}">
441 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
442 <          <param name="pattern"     value="assert"/>
443 <          <param name="replacement" value="//assert"/>
444 <        </filterreader>
445 <
446 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
447 <                      classpath="${build.ant.dir}">
448 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
449 <          <param name="pattern"     value="$"/>
450 <          <param name="replacement" value=" ${generic.declarations}"/>
451 <        </filterreader>
462 >    </javac>
463  
464 <      </filterchain>
465 <    </copy>
464 >    <java classname="ALoops" fork="true">
465 >      <classpath refid="loops.classpath"/>
466 >    </java>
467  
468    </target>
469  
470  
471 <  <target name="compile-tests"
460 <          depends="jar">
471 >  <!-- jsr166x -->
472  
462    <mkdir dir="${build.testcases.dir}"/>
473  
474 < <!--
475 <    <echo>javac ${gjc.args}</echo>
476 <    <echo>bootclasspath=${test.compile.bootclasspath}</echo>
467 <    <echo>classpath="${test.classpath}"</echo>
468 < -->
474 >  <target name="jsr166xcompile"
475 >          depends="init, configure-compiler"
476 >          description="Compiles jsr166x sources">
477  
478 <    <javac srcdir="${test.src.dir}"
479 <          destdir="${build.testcases.dir}"
478 >    <mkdir dir="${build.jsr166x.dir}"/>
479 >
480 >    <javac srcdir="${jsr166xsrc.dir}"
481 >          destdir="${build.jsr166x.dir}"
482              debug="${build.debug}"
483         debuglevel="${build.debuglevel}"
484        deprecation="${build.deprecation}"
485             source="${build.sourcelevel}"
486               fork="true">
487  
488 <      <compilerarg    line="${gjc.args}"/>
489 <      <bootclasspath refid="test.compile.bootclasspath"/>
490 <      <classpath     refid="test.classpath"/>
488 >      <include name="**/*.java"/>
489 >      <compilerarg line="${build.args}"/>
490 >      <compilerarg value="-XDignore.symbol.file=true"/>
491  
492      </javac>
493  
494    </target>
495  
496  
487  <target name="run-tests"
488          depends="compile-tests">
497  
498 <    <!-- May be overridden by user.properties -->
499 <    <property name="testcase" value="*"/>
498 >  <target name="jsr166xjar"
499 >          depends="jsr166xcompile"
500 >          description="Builds library jar from compiled sources">
501  
502 <    <mkdir dir="${build.reports.dir}"/>
502 >    <mkdir dir="${build.jsr166xlib.dir}"/>
503  
504 <    <junit printsummary="true"
505 <             showoutput="true"
506 <          errorProperty="junit.failed"
498 <        failureProperty="junit.failed"
499 <                    dir="${build.reports.dir}"
500 <                   fork="true">
504 >    <jar destfile="${jsr166xproduct.jar}">
505 >      <fileset dir="${build.jsr166x.dir}"/>
506 >    </jar>
507  
508 <      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
508 >  </target>
509  
504      <formatter type="xml"/>
510  
506      <batchtest todir="${build.reports.dir}">
507        <fileset dir="${test.src.dir}">
508          <include name="**/${testcase}Test.java"/>
509        </fileset>
510      </batchtest>
511  
512 <    </junit>
512 >  <target name="jsr166xdocs"
513 >          description="Builds javadocs with custom tags to build folder">
514 >
515 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
516 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
517 >
518 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
519 >             link="http://download.oracle.com/javase/6/docs/api/"
520 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
521 >    >
522 >      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
523 >      <include name="jsr166x"/>
524 >      </packageset>
525 >
526 >
527 >    </javadoc>
528  
529    </target>
530  
531  
532 <  <target name="report-tests"
533 <          depends="run-tests">
532 >  <target name="jsr166xdist"
533 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
534 >          description="Puts all distributable products in single hierarchy"/>
535  
520    <!-- Sets junit.report.format to frames if Xalan is present,
521         otherwise sets it to noframes. -->
522    <available property="junit.report.format"
523                  value="frames"
524              classname="org.apache.xalan.lib.Redirect"
525    />
526    <property name="junit.report.format" value="noframes"/>
536  
528    <junitreport todir="${build.reports.dir}">
529      <fileset dir="${build.reports.dir}">
530        <include name="TEST-*.xml"/>
531      </fileset>
532      <report styledir="${stylesheet.dir}"
533                format="${junit.report.format}"
534                 todir="${build.reports.dir}"
535      />
536    </junitreport>
537  
538 <    <fail message="Test Cases Failed" if="junit.failed"/>
538 >  <target name="jsr166xclean"
539 >          description="Removes all build products">
540 >
541 >    <delete dir="${build.jsr166x.dir}"/>
542 >    <delete dir="${build.jsr166xlib.dir}"/>
543  
544    </target>
545  
546  
543  <target name="configure-compiler">
547  
548 <    <property name="gjc.version"
549 <             value="2.2"/>
548 >  <target name="jsr166xdist-clean"
549 >          description="Removes all build and distribution products">
550  
551 <    <condition property="novariance.arg" value="-novariance">
549 <      <and>
550 <        <equals arg1="${gjc.version}" arg2="2.0"/>
551 <        <or>
552 <          <not><isset property="gjc.novariance"/></not>
553 <          <istrue value="${gjc.novariance}"/>
554 <        </or>
555 <      </and>
556 <    </condition>
551 >  </target>
552  
558    <property name="novariance.arg"
559             value=""/>
553  
561    <property name="gjc.dir"
562             value="${lib.dir}/gjc"/>
554  
555 <    <property name="javac.jar"
556 <          location="${gjc.dir}/${gjc.version}/javac.jar"/>
555 >  <target name="jsr166xdist-docs"
556 >          description="Builds javadocs without custom tags to dist folder">
557  
558 <    <property name="collect.jar"
559 <          location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
558 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
559 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
560  
561 +    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
562 +                link="http://download.oracle.com/javase/6/docs/api/"
563 +              source="${build.sourcelevel}">
564 +
565 +      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
566 +      <include name="jsr166x"/>
567 +      </packageset>
568  
569 <    <condition property="warnunchecked.arg" value="-warnunchecked">
572 <      <istrue value="${gjc.warnunchecked}"/>
573 <    </condition>
569 >    </javadoc>
570  
571 <    <property name="warnunchecked.arg" value=""/>
571 >  </target>
572  
573 <    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
574 <      <istrue value="${build.nothreads}"/>
579 <    </condition>
573 >  <target name="jsr166xdist-jar"
574 >          depends="jsr166xclean, jsr166xjar">
575  
576 +    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
577  
578 <    <!--
583 <     ! Bootclasspath munging for source compilation.
584 <     -->
578 >  </target>
579  
580 <    <path id="pre.bootclasspath">
587 <      <pathelement location="${javac.jar}"/>
588 <    </path>
589 <
590 <    <path id="compile.bootclasspath">
591 <      <pathelement location="${build.classes.dir}"/>
592 <      <pathelement location="${collect.jar}"/>
593 <      <pathelement location="${rt.jar}"/>
594 <    </path>
595 <
596 <    <!-- Flatten paths into platform-appropriate strings -->
597 <    <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
598 <    <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
580 >  <!-- jsr166y -->
581  
582  
583 <    <!-- Common options in javac invocations -->
584 <    <property name="gjc.args"
585 <             value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
586 <    />
583 >  <target name="jsr166ycompile"
584 >          depends="init, configure-compiler"
585 >          description="Compiles jsr166y sources">
586 >
587 >    <mkdir dir="${build.jsr166y.dir}"/>
588 >
589 >    <javac srcdir="${jsr166ysrc.dir}"
590 >          destdir="${build.jsr166y.dir}"
591 >            debug="${build.debug}"
592 >       debuglevel="${build.debuglevel}"
593 >      deprecation="${build.deprecation}"
594 >           source="${build.sourcelevel}"
595 >             fork="true">
596 >
597 >      <include name="**/*.java"/>
598 >      <compilerarg line="${build.args}"/>
599 >      <compilerarg value="-XDignore.symbol.file=true"/>
600 >      <compilerarg value="${bootclasspath.args}"/>
601 >
602 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
603 >
604 >    </javac>
605  
606    </target>
607  
608  
609 <  <target name="prepare-src"
610 <          depends="configure-compiler"
611 <          if="prepare.src.dir">
612 <
613 <    <mkdir dir="${prepare.src.dir}"/>
614 <    <copy todir="${prepare.src.dir}">
615 <      <fileset dir="${src.dir}">
616 <        <exclude name="java/lang/**"/>
617 <      </fileset>
618 <    </copy>
609 >
610 >  <target name="jsr166yjar"
611 >          depends="jsr166ycompile"
612 >          description="Builds library jar from compiled sources">
613 >
614 >    <mkdir dir="${build.jsr166ylib.dir}"/>
615 >
616 >    <jar destfile="${jsr166yproduct.jar}" index="true">
617 >      <fileset dir="${build.jsr166y.dir}"/>
618 >    </jar>
619  
620    </target>
621  
622  
623  <target name="configure-emulation">
623  
624 <    <condition property="build.emulation.true">
625 <      <or>
626 <        <and>
627 <          <os family="windows"/>
628 <          <not>
629 <            <isset property="build.emulation"/>
630 <          </not>
631 <        </and>
632 <        <istrue value="${build.emulation}"/>
633 <      </or>
634 <    </condition>
624 >  <target name="jsr166ydocs"
625 >          description="Builds javadocs with custom tags to build folder">
626 >
627 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
628 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
629 >
630 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
631 >                link="http://download.oracle.com/javase/6/docs/api/"
632 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
633 >    >
634 >      <packageset dir="${topsrc.dir}" defaultexcludes="no">
635 >      <include name="jsr166y"/>
636 >      </packageset>
637 >
638 >
639 >    </javadoc>
640  
641    </target>
642  
643  
644 <  <target name="configure-tests"
645 <       depends="configure-compiler">
644 >  <target name="jsr166ydist"
645 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
646 >          description="Puts all distributable products in single hierarchy"/>
647  
643    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
644    <available property="junit.available"
645               classname="junit.framework.Protectable"/>
648  
647    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
648          unless="junit.available"/>
649  
650 +  <target name="jsr166yclean"
651 +          description="Removes all build products">
652  
653 <    <!--
654 <     ! Bootclasspath munging for testing, so JUnit can test our local
653 <     ! modifications to java.*.
654 <     -->
653 >    <delete dir="${build.jsr166y.dir}"/>
654 >    <delete dir="${build.jsr166ylib.dir}"/>
655  
656 <    <path id="test.classpath">
657 <      <pathelement location="${product.jar}"/>
658 <      <pathelement location="${build.testcases.dir}"/>
659 <      <pathelement location="${junit.jar}"/>
660 <    </path>
656 >  </target>
657  
662    <path id="test.compile.bootclasspath">
663      <pathelement location="${javac.jar}"/>
664      <pathelement location="${collect.jar}"/>
665      <pathelement location="${rt.jar}"/>
666    </path>
658  
668    <path id="test.run.bootclasspath">
669      <pathelement location="${javac.jar}"/>
670      <path refid="test.classpath"/>
671    </path>
659  
660 <    <!-- Flatten test classpaths into platform-appropriate strings -->
661 <    <property name="test.classpath"             refid="test.classpath"/>
675 <    <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
676 <    <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
660 >  <target name="jsr166ydist-clean"
661 >          description="Removes all build and distribution products">
662  
663    </target>
664  
665 +  <target name="jsr166ydist-docs"
666 +          description="Builds javadocs without custom tags to dist folder">
667  
668 +    <delete dir="${dist.jsr166yjavadocs.dir}"/>
669 +    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
670  
671 <  <!-- Anthill targets -->
671 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
672 >                link="http://download.oracle.com/javase/6/docs/api/"
673 >              source="${build.sourcelevel}"
674 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
675 >            >
676 >      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
677 >      <include name="jsr166y/*.java"/>
678 >            </fileset>
679 >    </javadoc>
680  
681 <  <target name="anthill-build"
685 <          depends="jar, test, docs, dist-docs"/>
681 >  </target>
682  
683 <  <target name="anthill-publish">
683 >  <target name="jsr166ydist-jar"
684 >          depends="jsr166yclean, jsr166yjar">
685  
686 <    <copy todir="${deployDir}/docs/private">
687 <      <fileset dir="${build.javadocs.dir}"/>
688 <    </copy>
686 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
687 >
688 >  </target>
689  
690 <    <copy todir="${deployDir}/docs/public">
694 <      <fileset dir="${dist.javadocs.dir}"/>
695 <    </copy>
690 >  <!-- extra166y -->
691  
697    <copy tofile="${deployDir}/index.html"
698          file="${basedir}/etc/anthill-index.html"/>
692  
693 <    <copy todir="${deployDir}/notes">
694 <      <fileset dir="${basedir}/etc/notes"/>
695 <    </copy>
693 >  <target name="extra166ycompile"
694 >          depends="init, configure-compiler, jsr166ycompile"
695 >          description="Compiles extra166y sources">
696 >
697 >    <mkdir dir="${build.extra166y.dir}"/>
698 >
699 >    <javac srcdir="${extra166ysrc.dir}"
700 >          destdir="${build.extra166y.dir}"
701 >            debug="${build.debug}"
702 >            classpath="${jsr166yproduct.jar}"
703 >       debuglevel="${build.debuglevel}"
704 >      deprecation="${build.deprecation}"
705 >           source="${build.sourcelevel}"
706 >             fork="true">
707 >
708 >      <include name="**/*.java"/>
709 >      <compilerarg line="${build.args}"/>
710 >      <compilerarg value="-XDignore.symbol.file=true"/>
711 >      <compilerarg value="${bootclasspath.args}"/>
712 >
713 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
714 >
715 >    </javac>
716  
717    </target>
718  
719  
707  <target name="ng" depends="test">
708    <java classname="SuperfluousAbstract" fork="true">
720  
721 <      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
721 >  <target name="extra166yjar"
722 >          depends="extra166ycompile"
723 >          description="Builds library jar from compiled sources">
724 >
725 >    <mkdir dir="${build.extra166ylib.dir}"/>
726 >
727 >    <jar destfile="${extra166yproduct.jar}" index="true">
728 >      <fileset dir="${build.extra166y.dir}"/>
729 >    </jar>
730 >
731 >  </target>
732 >
733 >
734 >
735 >  <target name="extra166ydocs"
736 >          description="Builds javadocs with custom tags to build folder">
737 >
738 >    <delete dir="${build.extra166yjavadocs.dir}"/>
739 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
740 >
741 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
742 >                link="http://download.oracle.com/javase/6/docs/api/"
743 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
744 >    >
745 >      <packageset dir="${topsrc.dir}" defaultexcludes="no">
746 >      <include name="extra166y"/>
747 >      </packageset>
748 >
749 >
750 >    </javadoc>
751 >
752 >  </target>
753 >
754 >
755 >  <target name="extra166ydist"
756 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
757 >          description="Puts all distributable products in single hierarchy"/>
758 >
759 >
760 >
761 >  <target name="extra166yclean"
762 >          description="Removes all build products">
763 >
764 >    <delete dir="${build.extra166y.dir}"/>
765 >    <delete dir="${build.extra166ylib.dir}"/>
766 >
767 >  </target>
768 >
769 >
770 >
771 >  <target name="extra166ydist-clean"
772 >          description="Removes all build and distribution products">
773  
712    </java>
774    </target>
775  
776 +  <target name="extra166ydist-docs"
777 +          description="Builds javadocs without custom tags to dist folder">
778 +
779 +    <delete dir="${dist.extra166yjavadocs.dir}"/>
780 +    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
781 +
782 +    <javadoc destdir="${dist.extra166yjavadocs.dir}"
783 +                link="http://download.oracle.com/javase/6/docs/api/"
784 +              source="${build.sourcelevel}"
785 +            sourcepath="${topsrc.dir}:${jdksrc.dir}"
786 +            >
787 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
788 +      <include name="extra166y/*.java"/>
789 +            </fileset>
790 +    </javadoc>
791 +
792 +  </target>
793 +
794 +  <target name="extra166ydist-jar"
795 +          depends="extra166yclean, extra166yjar">
796 +
797 +    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
798 +
799 +  </target>
800  
801   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines