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.56 by tim, Mon Sep 1 04:21:55 2003 UTC vs.
Revision 1.75 by jsr166, Tue Sep 18 12:46:40 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines