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.59 by tim, Sun Dec 7 20:49:10 2003 UTC vs.
Revision 1.75 by jsr166, Tue Sep 18 12:46:40 2007 UTC

# Line 30 | 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"/>
34  <property name="build.ant.dir"        location="${build.dir}/ant"/>
35    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
36    <property name="build.reports.dir"    location="${build.dir}/reports"/>
37 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
38 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
39 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
40 <  <property name="build.dc-filter.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"/>
67 <  
67 >
68    <!-- Bootclasspath argument -->
69    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
70  
# Line 63 | Line 74
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  
90      <mkdir dir="${build.classes.dir}"/>
91  
92 <    <javac srcdir="${prepare.src.dir}"
92 >    <javac srcdir="${src.dir}"
93            destdir="${build.classes.dir}"
94              debug="${build.debug}"
95         debuglevel="${build.debuglevel}"
# Line 82 | Line 97
97             source="${build.sourcelevel}"
98               fork="true">
99  
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  
# Line 117 | Line 139
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.sourcelevel}">
145 <
124 <      <tag name="revised" description="Last revised:"/>
125 <      <tag name="spec"    description="Specified by:"/>
144 >            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
145 >    >          
146  
147        <packageset dir="${src.dir}"/>
148  
# Line 132 | Line 152
152  
153  
154  
135  <target name="checkstyle"
136          depends="filter-src"
137          description="Reports on style errors in Java source (verbose, mostly chaff)">
138
139    <taskdef resource="checkstyletask.properties"
140            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
141
142    <mkdir dir="${build.checkstyle.dir}"/>
143    
144    <checkstyle config="etc/checkstyle/sun_checks.xml"
145       failOnViolation="false">
146      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
147      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
148    </checkstyle>
149    
150    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
151          out="${build.checkstyle.dir}/checkstyle-report.html"
152        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
153
154  </target>
155
156
157
158  <target name="doccheck"
159          depends="filter-doccheck"
160          description="Reports on javadoc style errors">
161
162    <delete dir="${build.doccheck.dir}"/>
163    <mkdir dir="${build.doccheck.dir}"/>
164
165    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
166         docletpath="${lib.dir}/doccheck.jar"
167            destdir="${build.doccheck.dir}">
168      <packageset dir="${build.dc-filter.dir}"/>
169    </javadoc>
170
171    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
172
173  </target>
174
175  
176
155    <target name="dist"
156            depends="init, dist-clean, dist-jar, dist-docs"
157            description="Puts all distributable products in single hierarchy"/>
# Line 227 | Line 205
205      <mkdir dir="${dist.javadocs.dir}"/>
206  
207      <javadoc destdir="${dist.javadocs.dir}"
208 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
208 >            link="http://java.sun.com/javase/6/docs/api/"
209              overview="${src.dir}/intro.html"
232              source="${build.sourcelevel}">
233
234      <packageset dir="${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 260 | Line 257
257    </target>
258  
259  
260 <  <target name="compile-ant-filter"
261 <          depends="init">
265 <
266 <    <mkdir dir="${build.ant.dir}"/>
267 <
268 <    <javac srcdir="${ant.src.dir}"
269 <          destdir="${build.ant.dir}"
270 <           source="1.4"
271 <    />
272 <
273 <  </target>
274 <
275 <
276 <  <target name="filter-src"
277 <          depends="compile-ant-filter">
278 <
279 <    <mkdir dir="${build.filter.src.dir}"/>
280 <
281 <    <copy todir="${build.filter.src.dir}">
282 <      <fileset dir="${src.dir}">
283 <        <include name="**/*.html"/>
284 <      </fileset>
285 <    </copy>
286 <
287 <    <copy todir="${build.filter.src.dir}">
288 <      <fileset dir="${src.dir}">
289 <        <exclude name="**/*.html"/>
290 <        <!-- Files excluded from dist-docs -->
291 <        <exclude name="java/util/Random.*"/>
292 <        <exclude name="sun/misc/Unsafe.*"/>
293 <      </fileset>
294 <      <!--
295 <      <filterchain>
296 <      -->
297 <
298 <        <!--
299 <         # This filter gets rid of angle-bracketed type parameters
300 <         # so that javadoc can run on the result. The following
301 <         # heuristic seems to work:
302 <         #
303 <         # For all lines not starting with space(s)-asterisk-space(s),
304 <         #   replace <something> with a space, where there may be more
305 <         #   than one right angle bracket at the end, and "something"
306 <         #   must not contain parens or pipes. (This may need some
307 <         #   tweaking.)
308 <         -->
309 <
310 <        <!--
311 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
312 <                      classpath="${build.ant.dir}">
313 <          <param name="notmatching" value="^\s+\*\s.*$"/>
314 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
315 <          <param name="replacement" value=" "/>
316 <        </filterreader>
317 <        -->
318 <
319 <      <!--
320 <      </filterchain>
321 <      -->
322 <    </copy>
260 >  <target name="compile-tests"
261 >          depends="jar">
262  
263 <  </target>
263 >    <mkdir dir="${build.testcases.dir}"/>
264  
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 <  <target name="filter-doccheck"
274 <          depends="filter-src">
329 <
330 <    <mkdir dir="${build.dc-filter.dir}"/>
331 <
332 <    <copy todir="${build.dc-filter.dir}">
333 <      <fileset dir="${build.filter.src.dir}">
334 <        <include name="**/*.html"/>
335 <      </fileset>
336 <    </copy>
273 >      <compilerarg value="${bootclasspath.args}"/>
274 >      <compilerarg line="${build.args}"/>
275  
276 <    <property name="generic.declarations"
339 <             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 {}"
340 <    />
276 >      <classpath refid="test.classpath"/>
277  
278 <    <copy todir="${build.dc-filter.dir}">
343 <      <fileset dir="${build.filter.src.dir}">
344 <        <exclude name="**/*.html"/>
345 <      </fileset>
346 <      <filterchain>
347 <        <!--
348 <         # These two filters try to make the source look like
349 <         # something that doccheck can process. The first removes
350 <         # -source 1.4 assertions and the second adds in a bunch
351 <         # of single letter public nested marker interfaces so that
352 <         # the generic type parameters are recognized.
353 <         -->
354 <
355 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
356 <                      classpath="${build.ant.dir}">
357 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
358 <          <param name="pattern"     value="assert"/>
359 <          <param name="replacement" value="//assert"/>
360 <        </filterreader>
361 <
362 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
363 <                      classpath="${build.ant.dir}">
364 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
365 <          <param name="pattern"     value="$"/>
366 <          <param name="replacement" value=" ${generic.declarations}"/>
367 <        </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"
376 <          depends="jar">
293 >      <classpath refid="test.classpath"/>
294  
295 <    <mkdir dir="${build.testcases.dir}"/>
295 >    </javac>
296  
297 <    <javac srcdir="${test.src.dir}/tck"
297 > <!--
298 >    <javac srcdir="${jtreg.src.dir}"
299            destdir="${build.testcases.dir}"
300              debug="${build.debug}"
301         debuglevel="${build.debuglevel}"
# Line 387 | Line 305
305  
306        <compilerarg value="${bootclasspath.args}"/>
307        <compilerarg line="${build.args}"/>
308 <      
308 >
309        <classpath refid="test.classpath"/>
310  
311      </javac>
312 + -->
313  
314    </target>
315  
# Line 411 | Line 330
330                     fork="true">
331  
332        <jvmarg value="${bootclasspath.args}"/>
333 <      
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}">
341 <        <fileset dir="${test.src.dir}/tck">
342 <          <include name="${testcase}Test.java"/>
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 + <!--
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>
# Line 442 | Line 377
377        <fileset dir="${build.reports.dir}">
378          <include name="TEST-*.xml"/>
379        </fileset>
380 <      <report styledir="${stylesheet.dir}"
446 <                format="${junit.report.format}"
447 <                 todir="${build.reports.dir}"
380 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
381        />
382      </junitreport>
383  
# Line 462 | Line 395
395      </condition>
396  
397      <property name="warnunchecked.arg" value=""/>
465    
466    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
467      <istrue value="${build.nothreads}"/>
468    </condition>
469    
470    <property name="prepare.src.dir" value="${src.dir}"/>
398  
399  
400      <!-- Common options in javac invocations -->
# Line 476 | Line 403
403    </target>
404  
405  
479  <target name="prepare-src"
480          depends="configure-compiler"
481          if="prepare.src.dir">
482
483    <mkdir dir="${prepare.src.dir}"/>
484    <copy todir="${prepare.src.dir}">
485      <fileset dir="${src.dir}">
486        <exclude name="java/lang/**"/>
487      </fileset>
488    </copy>
489
490  </target>
491
492
406    <target name="configure-tests"
407         depends="configure-compiler">
408  
# Line 501 | Line 414
414      <available property="xalan.available"
415                 classname="org.apache.xalan.Version"/>
416  
417 <              
417 >
418      <!-- Ant 1.6beta and later don't need or want this check -->
419 <    <!--    
419 >    <!--
420      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
421            unless="junit.available"/>
422  
# Line 514 | Line 427
427    </target>
428  
429  
430 +  <!-- Various demos and test programs -->
431  
518  <!-- Anthill targets -->
432  
433 <  <target name="anthill-build">
434 <  
522 <    <!-- Override this in user.properties -->
523 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
524 <    
525 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
526 <      <arg value="-Xmx256000000"/>
527 <      <!-- classpath of new JVM -->
528 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
529 <      <!-- location of Ant home directory -->
530 <      <arg value="-Dant.home=${ant.home}"/>
531 <      <!-- the Ant main class -->
532 <      <arg value="org.apache.tools.ant.Main"/>
533 <      <!-- The build file -->
534 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
535 <      <!-- the target to build on the new Ant instance -->
536 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
537 <      <arg value="do-anthill-build"/>
538 <    </exec>
539 <  </target>
540 <  
541 <  <target name="do-anthill-build"
542 <          depends="jar, test, docs, dist-docs"/>
433 >  <target name="loops" depends="init, configure-compiler"
434 >          description="Benchmark from Doug Lea's AQS paper">
435  
436 <  <target name="anthill-publish">
436 >    <mkdir dir="${build.loops.dir}"/>
437  
438 <    <copy todir="${deployDir}/docs/private">
439 <      <fileset dir="${build.javadocs.dir}"/>
440 <    </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 <    <copy todir="${deployDir}/docs/public">
447 <      <fileset dir="${dist.javadocs.dir}"/>
552 <    </copy>
446 >      <compilerarg line="${build.args}"/>
447 >      <classpath refid="loops.classpath"/>
448  
449 <    <copy tofile="${deployDir}/index.html"
555 <          file="${basedir}/etc/anthill-index.html"/>
449 >    </javac>
450  
451 <    <copy todir="${deployDir}/notes">
452 <      <fileset dir="${basedir}/etc/notes"/>
453 <    </copy>
451 >    <java classname="ALoops" fork="true">
452 >      <classpath refid="loops.classpath"/>
453 >    </java>
454  
455    </target>
456  
457  
458 +  <!-- jsr166x -->
459  
565  <!-- Backward compatibility, work in progress -->
460  
461 +  <target name="jsr166xcompile"
462 +          depends="init, configure-compiler"
463 +          description="Compiles jsr166x sources">
464  
465 <  <target name="compat" depends="jar">
466 <  
467 <    <mkdir dir="${build.testcases.dir}"/>
468 <    
572 <    <javac srcdir="${test.src.dir}"
573 <          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 value="${bootclasspath.args}"/>
474 >
475 >      <include name="**/*.java"/>
476        <compilerarg line="${build.args}"/>
477 <      
583 <      <classpath refid="test.classpath"/>
584 <      
585 <      <include name="Compatibility.java"/>
586 <      
477 >
478      </javac>
479 <    
589 <            
590 <    <java classname="Compatibility" fork="true">
591 <      <jvmarg value="${bootclasspath.args}"/>
592 <      <classpath refid="test.classpath"/>
593 <    </java>
479 >
480    </target>
481  
482  
483  
484 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
485 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
486 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
487 <  <property name="pretiger.sourcelevel" value="1.4"/>
488 <  
489 <  <target name="defang"
490 <       depends="init"
491 <   description="Generates pre-Tiger compatible source">
492 <  
493 <    <delete dir="${pretiger.src.dir}"/>
494 <    <mkdir dir="${pretiger.src.dir}"/>
495 <  
496 <    <exec executable="perl">
497 <      <arg file="etc/defang.pl"/>
498 <      <!-- <arg value="-v"/> -->
499 <      <arg value="-s"/> <arg file="${src.dir}"/>
500 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
501 <    </exec>
502 <    
503 <  </target>
504 <
505 <  <target name="compile-pretiger"
506 <          depends="init, configure-compiler, defang"
507 <          description="Compiles pre-Tiger sources to build folder">
484 >  <target name="jsr166xjar"
485 >          depends="jsr166xcompile"
486 >          description="Builds library jar from compiled sources">
487 >
488 >    <mkdir dir="${build.jsr166xlib.dir}"/>
489 >
490 >    <jar destfile="${jsr166xproduct.jar}">
491 >      <fileset dir="${build.jsr166x.dir}"/>
492 >    </jar>
493 >
494 >  </target>
495 >
496 >
497 >
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 >
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  
623    <mkdir dir="${build.pretiger.dir}"/>
570  
571 <    <javac srcdir="${pretiger.src.dir}"
572 <          destdir="${build.pretiger.dir}"
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="${pretiger.sourcelevel}"
582 >           source="${build.sourcelevel}"
583               fork="true">
584  
585 +      <include name="**/*.java"/>
586        <compilerarg line="${build.args}"/>
587 <      <exclude name="**/Thread.java"/>
587 >      <compilerarg value="${bootclasspath.args}"/>
588 >
589 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
590  
591      </javac>
592  
593    </target>
639  
640  <target name="pretiger" depends="compile-pretiger">
594  
595 <    <mkdir dir="${build.lib.dir}"/>
596 <    
597 <    <jar destfile="${pretiger.jar}">
598 <      <fileset dir="${build.pretiger.dir}">
599 <      </fileset>
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 <    
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