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.57 by tim, Mon Sep 15 14:07:36 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 31 | Line 30
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.ant.dir"        location="${build.dir}/ant"/>
35    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
37  <property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
38  <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="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"/>
58  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
59  <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 -->
72 <  <patternset id="docs.exclusion">
73 <    <exclude name="java/util/Random.*"/>
74 <    <exclude name="sun/misc/Unsafe.*"/>
75 <  </patternset>
76 <
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  
76    <property name="prepare.src.dir" value="${src.dir}"/>
77
90      <mkdir dir="${build.classes.dir}"/>
91  
92 < <!--
81 <    <echo>javac ${build.args}</echo>
82 < -->
83 <
84 <    <javac srcdir="${prepare.src.dir}"
92 >    <javac srcdir="${src.dir}"
93            destdir="${build.classes.dir}"
94              debug="${build.debug}"
95         debuglevel="${build.debuglevel}"
# Line 89 | Line 97
97             source="${build.sourcelevel}"
98               fork="true">
99  
100 <      <compilerarg    line="${build.args}"/>
100 >      <include name="**/*.java"/>
101 >      <compilerarg value="-XDignore.symbol.file"/>
102 >
103 > <!--
104 >      <exclude name="java/lang/**"/>
105 >      <compilerarg line="${build.args}"/>
106 >      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
107 > -->
108  
109      </javac>
110  
111    </target>
112  
113  
99  <target name="jar"
100          depends="init-jar, native-jar"
101          description="Builds library jar from compiled sources"/>
102
103
104  <target name="test"
105          depends="init, configure-tests, report-tests"
106          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
107
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"
114 <            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"/>
119 <    </checkstyle>
121 >    <jar destfile="${product.jar}">
122 >      <fileset dir="${build.classes.dir}"/>
123 >    </jar>
124  
125    </target>
126  
127  
124  <target name="doccheck"
125          depends="filter-doccheck"
126          description="Reports on javadoc style errors">
128  
129 <    <delete dir="${build.doccheck.dir}"/>
130 <    <mkdir dir="${build.doccheck.dir}"/>
131 <
131 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
132 <         docletpath="${lib.dir}/doccheck.jar"
133 <            destdir="${build.doccheck.dir}">
134 <      <packageset dir="${build.filter.doccheck.dir}"/>
135 <    </javadoc>
136 <
137 <    <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  
139  </target>
133  
134  
135    <target name="docs"
143          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 <
154 <      <tag name="revised" description="Last revised:"/>
155 <      <tag name="spec"    description="Specified by:"/>
156 <      <tag name="editor"  description="Last edited by:"/>
157 <      <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  
166  <target name="sinjdocs"
167          depends="configure-tests"
168          description="Builds javadocs with custom tags to build folder">
169
170    <delete dir="${build.sinjdocs.dir}"/>
171    <mkdir dir="${build.sinjdocs.dir}"/>
172
173    <java classname="net.cscott.sinjdoc.Main" fork="true">
174
175      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
176
177      <classpath>
178        <pathelement location="${sinjdoc.jar}"/>
179        <pathelement location="${lib.dir}/jutil.jar"/>
180        <pathelement location="${lib.dir}/cup.jar"/>
181        <path refid="test.classpath"/>
182      </classpath>
183
184      <!-- <arg value="-help"/> -->
185      <!-- <arg value="-verbose"/> -->
186      <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
187      
188      <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
189      <arg value="-sourcepath"/> <arg value="${src.dir}"/>
190      <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
191      <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
192      
193      <arg value="java.lang"/>
194      <arg value="java.util"/>
195      <arg value="java.util.concurrent"/>
196      <arg value="java.util.concurrent.atomic"/>
197      <arg value="java.util.concurrent.locks"/>
198
199
200    </java>
201
202  </target>
203
204
205  <target name="strip"
206          depends="init, configure-compiler"
207          description="Strip generics from java source (not working yet)">
208
209    <mkdir dir="${build.stripped.dir}"/>
210
211    <!--
212     # javac -s doesn't reliably generate compilable code. It generates
213     # bridge methods (marked as "synthetic") that can have identical
214     # signatures to existing methods except for the return value.
215     -->
216    <javac srcdir="${src.dir}"
217          destdir="${build.stripped.dir}"
218            debug="${build.debug}"
219       debuglevel="${build.debuglevel}"
220      deprecation="${build.deprecation}"
221           source="${build.sourcelevel}"
222             fork="true">
223
224      <compilerarg    line="${build.args} -s"/>
225
226    </javac>
227
228  </target>
229
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  
239 <!--
240    #keep build dir? - dl
241    <delete dir="${build.dir}"/>
242 -->
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="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 261 | Line 188
188    </target>
189  
190  
191 +
192    <target name="dist-clean"
193            description="Removes all build and distribution products">
194  
# Line 269 | Line 197
197    </target>
198  
199  
200 +
201    <target name="dist-docs"
273          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"
282              source="${build.docsourcelevel}">
283
284      <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 302 | Line 249
249    </target>
250  
251  
305  <target name="init-jar">
306
307    <mkdir dir="${build.lib.dir}"/>
308
309  </target>
310
311
312  <target name="native-jar"
313          depends="compile">
314
315    <jar destfile="${product.jar}">
316      <fileset dir="${build.classes.dir}"/>
317    </jar>
318
319  </target>
320
321
252    <target name="dist-jar"
253            depends="clean, jar">
254  
# Line 327 | Line 257
257    </target>
258  
259  
260 <  <target name="compile-ant-filter"
261 <          depends="init">
332 <
333 <    <mkdir dir="${build.ant.dir}"/>
334 <
335 <    <javac srcdir="${ant.src.dir}"
336 <          destdir="${build.ant.dir}"
337 <           source="1.4"
338 <    />
339 <
340 <  </target>
341 <
342 <
343 <  <target name="filter-src"
344 <          depends="compile-ant-filter">
345 <
346 <    <mkdir dir="${build.filter.src.dir}"/>
347 <
348 <    <copy todir="${build.filter.src.dir}">
349 <      <fileset dir="${src.dir}">
350 <        <include name="**/*.html"/>
351 <      </fileset>
352 <    </copy>
353 <
354 <    <copy todir="${build.filter.src.dir}">
355 <      <fileset dir="${src.dir}">
356 <        <exclude name="**/*.html"/>
357 <        <patternset refid="docs.exclusion"/>
358 <      </fileset>
359 <      <filterchain>
360 <
361 <        <!--
362 <         # This filter gets rid of angle-bracketed type parameters
363 <         # so that javadoc can run on the result. The following
364 <         # heuristic seems to work:
365 <         #
366 <         # For all lines not starting with space(s)-asterisk-space(s),
367 <         #   replace <something> with a space, where there may be more
368 <         #   than one right angle bracket at the end, and "something"
369 <         #   must not contain parens or pipes. (This may need some
370 <         #   tweaking.)
371 <         -->
372 <
373 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
374 <                      classpath="${build.ant.dir}">
375 <          <param name="notmatching" value="^\s+\*\s.*$"/>
376 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
377 <          <param name="replacement" value=" "/>
378 <        </filterreader>
379 <
380 <      </filterchain>
381 <    </copy>
382 <
383 <  </target>
384 <
385 <
386 <
260 >  <target name="compile-tests"
261 >          depends="jar">
262  
263 <  <target name="filter-doccheck"
389 <          depends="filter-src">
263 >    <mkdir dir="${build.testcases.dir}"/>
264  
265 <    <mkdir dir="${build.filter.doccheck.dir}"/>
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 <    <copy todir="${build.filter.doccheck.dir}">
274 <      <fileset dir="${build.filter.src.dir}">
395 <        <include name="**/*.html"/>
396 <      </fileset>
397 <    </copy>
273 >      <compilerarg value="${bootclasspath.args}"/>
274 >      <compilerarg line="${build.args}"/>
275  
276 <    <property name="generic.declarations"
400 <             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 {}"
401 <    />
276 >      <classpath refid="test.classpath"/>
277  
278 <    <copy todir="${build.filter.doccheck.dir}">
404 <      <fileset dir="${build.filter.src.dir}">
405 <        <exclude name="**/*.html"/>
406 <      </fileset>
407 <      <filterchain>
408 <        <!--
409 <         # These two filters try to make the source look like
410 <         # something that doccheck can process. The first removes
411 <         # -source 1.4 assertions and the second adds in a bunch
412 <         # of single letter public nested marker interfaces so that
413 <         # the generic type parameters are recognized.
414 <         -->
415 <
416 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
417 <                      classpath="${build.ant.dir}">
418 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
419 <          <param name="pattern"     value="assert"/>
420 <          <param name="replacement" value="//assert"/>
421 <        </filterreader>
422 <
423 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
424 <                      classpath="${build.ant.dir}">
425 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
426 <          <param name="pattern"     value="$"/>
427 <          <param name="replacement" value=" ${generic.declarations}"/>
428 <        </filterreader>
278 >    </javac>
279  
280 <      </filterchain>
281 <    </copy>
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 <  </target>
288 >      <include name="jsr166/test/**"/>
289  
290 +      <compilerarg value="${bootclasspath.args}"/>
291 +      <compilerarg line="${build.args}"/>
292  
293 <  <target name="compile-tests"
437 <          depends="jar">
293 >      <classpath refid="test.classpath"/>
294  
295 <    <mkdir dir="${build.testcases.dir}"/>
295 >    </javac>
296  
297   <!--
298 <    <echo>javac ${build.args}</echo>
443 <    <echo>classpath="${test.classpath}"</echo>
444 < -->
445 <
446 <    <javac srcdir="${test.src.dir}"
298 >    <javac srcdir="${jtreg.src.dir}"
299            destdir="${build.testcases.dir}"
300              debug="${build.debug}"
301         debuglevel="${build.debuglevel}"
# Line 451 | Line 303
303             source="${build.sourcelevel}"
304               fork="true">
305  
306 +      <compilerarg value="${bootclasspath.args}"/>
307        <compilerarg line="${build.args}"/>
308 +
309        <classpath refid="test.classpath"/>
456      
457      <include name="java/**"/>
458      <include name="jsr166/**"/>
310  
311      </javac>
312 + -->
313  
314    </target>
315  
# Line 477 | Line 329
329                      dir="${build.reports.dir}"
330                     fork="true">
331  
332 <      <jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
332 >      <jvmarg value="${bootclasspath.args}"/>
333 >      <jvmarg value="-server"/>
334 >      <jvmarg value="-showversion"/>
335 >
336 >      <classpath refid="test.classpath"/>
337  
338        <formatter type="xml"/>
339  
340 <      <batchtest todir="${build.reports.dir}">
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="java/**/${testcase}Test.java"/>
349 <          <include name="jsr166/**/${testcase}Test.java"/>
348 >          <include name="jsr166/test/**/${testcase}Test.java"/>
349 >        </fileset>
350 >      </batchtest>
351 >
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  
# Line 508 | Line 377
377        <fileset dir="${build.reports.dir}">
378          <include name="TEST-*.xml"/>
379        </fileset>
380 <      <report styledir="${stylesheet.dir}"
512 <                format="${junit.report.format}"
513 <                 todir="${build.reports.dir}"
380 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
381        />
382      </junitreport>
383  
# Line 528 | Line 395
395      </condition>
396  
397      <property name="warnunchecked.arg" value=""/>
531    
532    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
533      <istrue value="${build.nothreads}"/>
534    </condition>
398  
399  
400      <!-- Common options in javac invocations -->
# Line 540 | Line 403
403    </target>
404  
405  
543  <target name="prepare-src"
544          depends="configure-compiler"
545          if="prepare.src.dir">
546
547    <mkdir dir="${prepare.src.dir}"/>
548    <copy todir="${prepare.src.dir}">
549      <fileset dir="${src.dir}">
550        <exclude name="java/lang/**"/>
551      </fileset>
552    </copy>
553
554  </target>
555
556
406    <target name="configure-tests"
407         depends="configure-compiler">
408  
# Line 561 | Line 410
410      <available property="junit.available"
411                 classname="junit.framework.Protectable"/>
412  
564    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
565          unless="junit.available"/>
566
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 <    <!--
431 <     ! Bootclasspath munging for testing, so JUnit can test our local
577 <     ! modifications to java.*.
578 <     -->
430 >  <!-- Various demos and test programs -->
431 >
432  
433 <    <path id="test.classpath">
434 <      <pathelement location="${product.jar}"/>
582 <      <pathelement location="${rt.jar}"/>
583 <      <pathelement location="${junit.jar}"/>
584 <      <pathelement location="${build.testcases.dir}"/>
585 <    </path>
433 >  <target name="loops" depends="init, configure-compiler"
434 >          description="Benchmark from Doug Lea's AQS paper">
435  
436 <    <path id="test.bootclasspath">
437 <      <path refid="test.classpath"/>
438 <    </path>
436 >    <mkdir dir="${build.loops.dir}"/>
437 >
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 <    <!-- Flatten test classpaths into platform-appropriate strings -->
447 <    <property name="test.classpath"         refid="test.classpath"/>
448 <    <property name="test.bootclasspath"     refid="test.bootclasspath"/>
446 >      <compilerarg line="${build.args}"/>
447 >      <classpath refid="loops.classpath"/>
448 >
449 >    </javac>
450 >
451 >    <java classname="ALoops" fork="true">
452 >      <classpath refid="loops.classpath"/>
453 >    </java>
454  
455    </target>
456  
457  
458 +  <!-- jsr166x -->
459  
599  <!-- Anthill targets -->
460  
461 <  <target name="anthill-build">
462 <  
463 <    <!-- Override this in user.properties -->
464 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
465 <    
466 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
467 <      <arg value="-Xmx256000000"/>
468 <      <!-- classpath of new JVM -->
469 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
470 <      <!-- location of Ant home directory -->
471 <      <arg value="-Dant.home=${ant.home}"/>
472 <      <!-- the Ant main class -->
473 <      <arg value="org.apache.tools.ant.Main"/>
474 <      <!-- The build file -->
475 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
476 <      <!-- the target to build on the new Ant instance -->
477 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
478 <      <arg value="do-anthill-build"/>
479 <    </exec>
461 >  <target name="jsr166xcompile"
462 >          depends="init, configure-compiler"
463 >          description="Compiles jsr166x sources">
464 >
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 >      <include name="**/*.java"/>
476 >      <compilerarg line="${build.args}"/>
477 >
478 >    </javac>
479 >
480    </target>
621  
622  <target name="do-anthill-build"
623          depends="jar, test, docs, dist-docs"/>
481  
625  <target name="anthill-publish">
482  
627    <copy todir="${deployDir}/docs/private">
628      <fileset dir="${build.javadocs.dir}"/>
629    </copy>
483  
484 <    <copy todir="${deployDir}/docs/public">
485 <      <fileset dir="${dist.javadocs.dir}"/>
486 <    </copy>
484 >  <target name="jsr166xjar"
485 >          depends="jsr166xcompile"
486 >          description="Builds library jar from compiled sources">
487  
488 <    <copy tofile="${deployDir}/index.html"
636 <          file="${basedir}/etc/anthill-index.html"/>
488 >    <mkdir dir="${build.jsr166xlib.dir}"/>
489  
490 <    <copy todir="${deployDir}/notes">
491 <      <fileset dir="${basedir}/etc/notes"/>
492 <    </copy>
490 >    <jar destfile="${jsr166xproduct.jar}">
491 >      <fileset dir="${build.jsr166x.dir}"/>
492 >    </jar>
493  
494    </target>
495  
496  
645  <target name="ng" depends="test">
646    <java classname="SuperfluousAbstract" fork="true">
497  
498 <      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
498 >  <target name="jsr166xdocs"
499 >          description="Builds javadocs with custom tags to build folder">
500 >
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 >            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
508 >
509 >    >
510 >      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
511 >      <include name="jsr166x"/>
512 >      </packageset>
513 >
514 >
515 >    </javadoc>
516  
650    </java>
517    </target>
518  
519  
520 +  <target name="jsr166xdist"
521 +          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
522 +          description="Puts all distributable products in single hierarchy"/>
523 +
524 +
525 +
526 +  <target name="jsr166xclean"
527 +          description="Removes all build products">
528 +
529 +    <delete dir="${build.jsr166x.dir}"/>
530 +    <delete dir="${build.jsr166xlib.dir}"/>
531 +
532 +  </target>
533 +
534 +
535 +
536 +  <target name="jsr166xdist-clean"
537 +          description="Removes all build and distribution products">
538 +
539 +  </target>
540 +
541 +
542 +
543 +  <target name="jsr166xdist-docs"
544 +          description="Builds javadocs without custom tags to dist folder">
545 +
546 +    <delete dir="${dist.jsr166xjavadocs.dir}"/>
547 +    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
548 +
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 +    </javadoc>
558 +
559 +  </target>
560 +
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 +
570 +
571 +  <target name="jsr166ycompile"
572 +          depends="init, configure-compiler"
573 +          description="Compiles jsr166y sources">
574 +
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 +      <include name="**/*.java"/>
586 +      <compilerarg line="${build.args}"/>
587 +      <compilerarg value="${bootclasspath.args}"/>
588 +
589 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
590 +
591 +    </javac>
592 +
593 +  </target>
594 +
595 +
596 +
597 +  <target name="jsr166yjar"
598 +          depends="jsr166ycompile"
599 +          description="Builds library jar from compiled sources">
600 +
601 +    <mkdir dir="${build.jsr166ylib.dir}"/>
602 +
603 +    <jar destfile="${jsr166yproduct.jar}">
604 +      <fileset dir="${build.jsr166y.dir}"/>
605 +    </jar>
606 +
607 +  </target>
608 +
609 +
610 +
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 +    <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 +
626 +
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 +
636 +
637 +
638 +  <target name="jsr166yclean"
639 +          description="Removes all build products">
640 +
641 +    <delete dir="${build.jsr166y.dir}"/>
642 +    <delete dir="${build.jsr166ylib.dir}"/>
643 +
644 +  </target>
645 +
646 +
647 +
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 +    <delete dir="${dist.jsr166yjavadocs.dir}"/>
657 +    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
658 +
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 +
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