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.62 by tim, Wed Dec 10 01:51:11 2003 UTC vs.
Revision 1.80 by dl, Sat Aug 1 23:35:22 2009 UTC

# Line 21 | Line 21
21  
22  
23    <!-- Compilation options -->
24 <  <property name="build.sourcelevel"    value="1.5"/>
24 >  <property name="build.sourcelevel"    value="1.6"/>
25    <property name="build.debug"          value="true"/>
26    <property name="build.debuglevel"     value="source,lines,vars"/>
27    <property name="build.deprecation"    value="false"/>
28  
29    <!-- Build locations -->
30 <  <property name="build.dir"            location="build"/>
31 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
32 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
33 <  <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"/>
30 >  <property name="build.dir"                   location="build"/>
31 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
32 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
33 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
34 >  <property name="build.lib.dir"               location="${build.dir}/lib"/>
35 >  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
36 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
37 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
38 >  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
39 >  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
40 >
41 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
42 >  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
43 >  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
44 >
45 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
46 >  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
47 >  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
48  
49    <!-- Source locations -->
50    <property name="src.dir"              location="${basedir}/src/main"/>
51    <property name="test.src.dir"         location="${basedir}/src/test"/>
52 +  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
53    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
54    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
47  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
48  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
55    <property name="lib.dir"              location="${basedir}/lib"/>
56    <property name="dist.dir"             location="${basedir}/dist"/>
57 <
57 >  <property name="topsrc.dir"           location="${basedir}/src"/>
58 >  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
59 >  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
60 >  <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
61 >  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
62    <!-- Distribution locations -->
63 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
63 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
64 >  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
65 >  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
66 >  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
67  
68    <!-- Jar locations -->
69    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
70 +  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
71 +  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
72 +  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
73    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
74 <  
74 >
75    <!-- Bootclasspath argument -->
76    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
77  
# Line 65 | Line 81
81      <pathelement location="${junit.jar}"/>
82    </path>
83  
84 +  <!-- ALoops classpath -->
85 +  <path id="loops.classpath">
86 +    <pathelement location="${build.loops.dir}"/>
87 +  </path>
88  
89  
90    <!-- Main targets -->
91  
92 +  <target name="dists"
93 +          depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
94 +          description="Builds all public jars and docs"/>
95  
96    <target name="compile"
97            depends="init, configure-compiler"
# Line 84 | Line 107
107             source="${build.sourcelevel}"
108               fork="true">
109  
110 +      <include name="**/*.java"/>
111 +      <compilerarg value="-XDignore.symbol.file"/>
112 +
113 + <!--
114 +      <exclude name="java/lang/**"/>
115        <compilerarg line="${build.args}"/>
116 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
117 + -->
118  
119      </javac>
120  
# Line 119 | Line 149
149      <mkdir dir="${build.javadocs.dir}"/>
150  
151      <javadoc destdir="${build.javadocs.dir}"
152 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
152 >                link="http://java.sun.com/javase/6/docs/api/"
153              overview="${src.dir}/intro.html"
154 <              source="${build.sourcelevel}">
155 <
126 <      <tag name="revised" description="Last revised:"/>
127 <      <tag name="spec"    description="Specified by:"/>
154 >            sourcepath="${src.dir}:${jdksrc.dir}"
155 >    >          
156  
157        <packageset dir="${src.dir}"/>
158  
# Line 134 | Line 162
162  
163  
164  
137  <target name="doccheck"
138          depends="filter-doccheck"
139          description="Reports on javadoc style errors">
140
141    <delete dir="${build.doccheck.dir}"/>
142    <mkdir dir="${build.doccheck.dir}"/>
143
144    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
145         docletpath="${lib.dir}/doccheck.jar"
146            destdir="${build.doccheck.dir}">
147      <packageset dir="${build.dc-filter.dir}"/>
148    </javadoc>
149
150    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
151
152  </target>
153
154
155
156  <target name="checkstyle"
157          depends="filter-src"
158          description="Reports on style errors in Java source (verbose, mostly chaff)">
159
160    <taskdef resource="checkstyletask.properties"
161            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
162
163    <mkdir dir="${build.checkstyle.dir}"/>
164    
165    <checkstyle config="etc/checkstyle/sun_checks.xml"
166       failOnViolation="false">
167      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
168      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
169    </checkstyle>
170    
171    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
172          out="${build.checkstyle.dir}/checkstyle-report.html"
173        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
174
175  </target>
176
177  
178
165    <target name="dist"
166            depends="init, dist-clean, dist-jar, dist-docs"
167            description="Puts all distributable products in single hierarchy"/>
168  
169  
184
170    <target name="release"
171            depends="dist"
172            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 229 | Line 214
214      <mkdir dir="${dist.javadocs.dir}"/>
215  
216      <javadoc destdir="${dist.javadocs.dir}"
217 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
217 >            link="http://java.sun.com/javase/6/docs/api/"
218              overview="${src.dir}/intro.html"
234              source="${build.sourcelevel}">
235
236      <packageset dir="${src.dir}"/>
219  
220 +            sourcepath="${src.dir}:${jdksrc.dir}"
221 +     >
222 + <!--
223 +      <packageset dir="${src.dir}" defaultexcludes="yes">
224 +      <include name="java/util/concurrent"/>
225 +      <include name="java/util/concurrent/atomic"/>
226 +      <include name="java/util/concurrent/locks"/>
227 +      </packageset>
228 + -->
229 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
230 +      <include name="main/java/util/concurrent/*.java"/>
231 +      <include name="main/java/util/concurrent/atomic/*.java"/>
232 +      <include name="main/java/util/concurrent/locks/*.java"/>
233 +      <include name="main/java/util/*.java"/>
234 + <!--
235 +      <include name="main/java/util/concurrent/*.html"/>
236 +      <include name="main/java/util/concurrent/atomic/*.html"/>
237 +      <include name="main/java/util/concurrent/locks/*.html"/>
238 +      <include name="main/java/util/*.html"/>
239 + -->
240 + <!--      <include name="jsr166x/*.java"/> -->
241 +      </fileset>
242      </javadoc>
243  
244    </target>
# Line 252 | Line 256
256      <echo>java.home is ${java.home}</echo>
257  
258    </target>
259 <  
260 <  
259 >
260 >
261    <target name="dist-jar"
262            depends="clean, jar">
263  
# Line 262 | Line 266
266    </target>
267  
268  
265  <target name="compile-ant-filter"
266          depends="init">
267
268    <mkdir dir="${build.ant.dir}"/>
269
270    <javac srcdir="${ant.src.dir}"
271          destdir="${build.ant.dir}"
272           source="1.4"
273    />
274
275  </target>
276
277
278  <target name="filter-src"
279          depends="compile-ant-filter">
280
281    <mkdir dir="${build.filter.src.dir}"/>
282
283    <copy todir="${build.filter.src.dir}">
284      <fileset dir="${src.dir}">
285        <include name="**/*.html"/>
286      </fileset>
287    </copy>
288
289    <copy todir="${build.filter.src.dir}">
290      <fileset dir="${src.dir}">
291        <exclude name="**/*.html"/>
292        <!-- Files excluded from dist-docs -->
293        <exclude name="java/util/Random.*"/>
294        <exclude name="sun/misc/Unsafe.*"/>
295      </fileset>
296      <!--
297      <filterchain>
298      -->
299
300        <!--
301         # This filter gets rid of angle-bracketed type parameters
302         # so that javadoc can run on the result. The following
303         # heuristic seems to work:
304         #
305         # For all lines not starting with space(s)-asterisk-space(s),
306         #   replace <something> with a space, where there may be more
307         #   than one right angle bracket at the end, and "something"
308         #   must not contain parens or pipes. (This may need some
309         #   tweaking.)
310         -->
311
312        <!--
313        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
314                      classpath="${build.ant.dir}">
315          <param name="notmatching" value="^\s+\*\s.*$"/>
316          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
317          <param name="replacement" value=" "/>
318        </filterreader>
319        -->
320
321      <!--
322      </filterchain>
323      -->
324    </copy>
325
326  </target>
327
328
329  <target name="filter-doccheck"
330          depends="filter-src">
331
332    <mkdir dir="${build.dc-filter.dir}"/>
333
334    <copy todir="${build.dc-filter.dir}">
335      <fileset dir="${build.filter.src.dir}">
336        <include name="**/*.html"/>
337      </fileset>
338    </copy>
339
340    <property name="generic.declarations"
341             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 {}"
342    />
343
344    <copy todir="${build.dc-filter.dir}">
345      <fileset dir="${build.filter.src.dir}">
346        <exclude name="**/*.html"/>
347      </fileset>
348      <filterchain>
349        <!--
350         # These two filters try to make the source look like
351         # something that doccheck can process. The first removes
352         # -source 1.4 assertions and the second adds in a bunch
353         # of single letter public nested marker interfaces so that
354         # the generic type parameters are recognized.
355         -->
356
357        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
358                      classpath="${build.ant.dir}">
359          <param name="matching"    value="^\s*assert[\s ].*$"/>
360          <param name="pattern"     value="assert"/>
361          <param name="replacement" value="//assert"/>
362        </filterreader>
363
364        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
365                      classpath="${build.ant.dir}">
366          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
367          <param name="pattern"     value="$"/>
368          <param name="replacement" value=" ${generic.declarations}"/>
369        </filterreader>
370
371      </filterchain>
372    </copy>
373
374  </target>
375
376
269    <target name="compile-tests"
270            depends="jar">
271  
# Line 389 | Line 281
281  
282        <compilerarg value="${bootclasspath.args}"/>
283        <compilerarg line="${build.args}"/>
284 <      
284 >
285        <classpath refid="test.classpath"/>
286  
287      </javac>
# Line 403 | Line 295
295               fork="true">
296  
297        <include name="jsr166/test/**"/>
298 <      
298 >
299        <compilerarg value="${bootclasspath.args}"/>
300        <compilerarg line="${build.args}"/>
301 <      
301 >
302        <classpath refid="test.classpath"/>
303  
304      </javac>
# Line 422 | Line 314
314  
315        <compilerarg value="${bootclasspath.args}"/>
316        <compilerarg line="${build.args}"/>
317 <      
317 >
318        <classpath refid="test.classpath"/>
319  
320      </javac>
# Line 447 | Line 339
339                     fork="true">
340  
341        <jvmarg value="${bootclasspath.args}"/>
342 <      
342 >      <jvmarg value="-server"/>
343 >      <jvmarg value="-showversion"/>
344 >
345        <classpath refid="test.classpath"/>
346  
347        <formatter type="xml"/>
# Line 457 | Line 351
351            <include name="**/${testcase}Test.java"/>
352          </fileset>
353        </batchtest>
354 <      
354 >
355        <batchtest todir="${build.reports.dir}" if="do.test.old">
356          <fileset dir="${test.src.dir}">
357            <include name="jsr166/test/**/${testcase}Test.java"/>
358          </fileset>
359        </batchtest>
360  
361 < <!--      
361 > <!--
362        <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
363          <fileset dir="${jtreg.src.dir}">
364            <include name="**/${testcase}Test.java"/>
# Line 492 | Line 386
386        <fileset dir="${build.reports.dir}">
387          <include name="TEST-*.xml"/>
388        </fileset>
389 <      <report styledir="${stylesheet.dir}"
496 <                format="${junit.report.format}"
497 <                 todir="${build.reports.dir}"
389 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
390        />
391      </junitreport>
392  
# Line 531 | Line 423
423      <available property="xalan.available"
424                 classname="org.apache.xalan.Version"/>
425  
426 <              
426 >
427      <!-- Ant 1.6beta and later don't need or want this check -->
428 <    <!--    
428 >    <!--
429      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
430            unless="junit.available"/>
431  
# Line 544 | Line 436
436    </target>
437  
438  
439 +  <!-- Various demos and test programs -->
440  
548  <!-- Anthill targets -->
441  
442 <  <target name="anthill-build">
443 <  
444 <    <!-- Override this in user.properties -->
445 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
446 <    
447 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
448 <      <arg value="-Xmx256000000"/>
449 <      <!-- classpath of new JVM -->
450 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
451 <      <!-- location of Ant home directory -->
452 <      <arg value="-Dant.home=${ant.home}"/>
453 <      <!-- the Ant main class -->
454 <      <arg value="org.apache.tools.ant.Main"/>
455 <      <!-- The build file -->
456 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
457 <      <!-- the target to build on the new Ant instance -->
458 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
459 <      <arg value="do-anthill-build"/>
460 <    </exec>
461 <  </target>
462 <  
571 <  <target name="do-anthill-build"
572 <          depends="jar, test, docs, dist-docs"/>
573 <
574 <  <target name="anthill-publish">
575 <
576 <    <copy todir="${deployDir}/docs/private">
577 <      <fileset dir="${build.javadocs.dir}"/>
578 <    </copy>
579 <
580 <    <copy todir="${deployDir}/docs/public">
581 <      <fileset dir="${dist.javadocs.dir}"/>
582 <    </copy>
583 <
584 <    <copy tofile="${deployDir}/index.html"
585 <          file="${basedir}/etc/anthill-index.html"/>
586 <
587 <    <copy todir="${deployDir}/notes">
588 <      <fileset dir="${basedir}/etc/notes"/>
589 <    </copy>
442 >  <target name="loops" depends="init, configure-compiler"
443 >          description="Benchmark from Doug Lea's AQS paper">
444 >
445 >    <mkdir dir="${build.loops.dir}"/>
446 >
447 >    <javac srcdir="${loops.src.dir}"
448 >          destdir="${build.loops.dir}"
449 >            debug="${build.debug}"
450 >       debuglevel="${build.debuglevel}"
451 >      deprecation="${build.deprecation}"
452 >           source="${build.sourcelevel}"
453 >             fork="true">
454 >
455 >      <compilerarg line="${build.args}"/>
456 >      <classpath refid="loops.classpath"/>
457 >
458 >    </javac>
459 >
460 >    <java classname="ALoops" fork="true">
461 >      <classpath refid="loops.classpath"/>
462 >    </java>
463  
464    </target>
465  
466  
467 <  <!-- Standalone sample program -->
468 <  
469 <  <target name="sample" depends="jar">
470 <  
471 <    <mkdir dir="${build.testcases.dir}"/>
472 <    
473 <    <javac srcdir="${test.src.dir}"
474 <          destdir="${build.testcases.dir}"
467 >  <!-- jsr166x -->
468 >
469 >
470 >  <target name="jsr166xcompile"
471 >          depends="init, configure-compiler"
472 >          description="Compiles jsr166x sources">
473 >
474 >    <mkdir dir="${build.jsr166x.dir}"/>
475 >
476 >    <javac srcdir="${jsr166xsrc.dir}"
477 >          destdir="${build.jsr166x.dir}"
478              debug="${build.debug}"
479         debuglevel="${build.debuglevel}"
480        deprecation="${build.deprecation}"
481             source="${build.sourcelevel}"
482               fork="true">
483 <            
484 <      <compilerarg value="${bootclasspath.args}"/>
483 >
484 >      <include name="**/*.java"/>
485        <compilerarg line="${build.args}"/>
486 <      
611 <      <classpath refid="test.classpath"/>
612 <      
613 <      <include name="jsr166/test/Sample.java"/>
614 <      
486 >
487      </javac>
488 <    
617 <            
618 <    <java classname="jsr166.test.Sample" fork="true">
619 <      <jvmarg value="${bootclasspath.args}"/>
620 <      <classpath refid="test.classpath"/>
621 <    </java>
488 >
489    </target>
490  
491  
492  
493 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
493 >  <target name="jsr166xjar"
494 >          depends="jsr166xcompile"
495 >          description="Builds library jar from compiled sources">
496 >
497 >    <mkdir dir="${build.jsr166xlib.dir}"/>
498  
499 +    <jar destfile="${jsr166xproduct.jar}">
500 +      <fileset dir="${build.jsr166x.dir}"/>
501 +    </jar>
502  
503 +  </target>
504  
630  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
631  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
632  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
633  <property name="pretiger.sourcelevel" value="1.4"/>
634  
635  <target name="defang"
636       depends="init"
637   description="Generates pre-Tiger compatible source">
638  
639    <delete dir="${pretiger.src.dir}"/>
640    <mkdir dir="${pretiger.src.dir}"/>
641  
642    <exec executable="perl">
643      <arg file="etc/defang.pl"/>
644      <!-- <arg value="-v"/> -->
645      <arg value="-s"/> <arg file="${src.dir}"/>
646      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
647    </exec>
648    
649  </target>
650
651  <target name="compile-pretiger"
652          depends="init, configure-compiler, defang"
653          description="Compiles pre-Tiger sources to build folder">
505  
655    <mkdir dir="${build.pretiger.dir}"/>
506  
507 <    <javac srcdir="${pretiger.src.dir}"
508 <          destdir="${build.pretiger.dir}"
507 >  <target name="jsr166xdocs"
508 >          description="Builds javadocs with custom tags to build folder">
509 >
510 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
511 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
512 >
513 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
514 >             link="http://java.sun.com/javase/6/docs/api/"
515 >
516 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
517 >
518 >    >
519 >      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
520 >      <include name="jsr166x"/>
521 >      </packageset>
522 >
523 >
524 >    </javadoc>
525 >
526 >  </target>
527 >
528 >
529 >  <target name="jsr166xdist"
530 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
531 >          description="Puts all distributable products in single hierarchy"/>
532 >
533 >
534 >
535 >  <target name="jsr166xclean"
536 >          description="Removes all build products">
537 >
538 >    <delete dir="${build.jsr166x.dir}"/>
539 >    <delete dir="${build.jsr166xlib.dir}"/>
540 >
541 >  </target>
542 >
543 >
544 >
545 >  <target name="jsr166xdist-clean"
546 >          description="Removes all build and distribution products">
547 >
548 >  </target>
549 >
550 >
551 >
552 >  <target name="jsr166xdist-docs"
553 >          description="Builds javadocs without custom tags to dist folder">
554 >
555 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
556 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
557 >
558 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
559 >                link="http://java.sun.com/javase/6/docs/api/"
560 >              source="${build.sourcelevel}">
561 >
562 >      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
563 >      <include name="jsr166x"/>
564 >      </packageset>
565 >
566 >    </javadoc>
567 >
568 >  </target>
569 >
570 >  <target name="jsr166xdist-jar"
571 >          depends="jsr166xclean, jsr166xjar">
572 >
573 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
574 >
575 >  </target>
576 >
577 >  <!-- jsr166y -->
578 >
579 >
580 >  <target name="jsr166ycompile"
581 >          depends="init, configure-compiler"
582 >          description="Compiles jsr166y sources">
583 >
584 >    <mkdir dir="${build.jsr166y.dir}"/>
585 >
586 >    <javac srcdir="${jsr166ysrc.dir}"
587 >          destdir="${build.jsr166y.dir}"
588              debug="${build.debug}"
589         debuglevel="${build.debuglevel}"
590        deprecation="${build.deprecation}"
591 <           source="${pretiger.sourcelevel}"
591 >           source="${build.sourcelevel}"
592               fork="true">
593  
594 +      <include name="**/*.java"/>
595        <compilerarg line="${build.args}"/>
596 <      <exclude name="**/Thread.java"/>
596 >      <compilerarg value="${bootclasspath.args}"/>
597 >
598 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
599  
600      </javac>
601  
602    </target>
671  
672  <target name="pretiger" depends="compile-pretiger">
603  
604 <    <mkdir dir="${build.lib.dir}"/>
605 <    
606 <    <jar destfile="${pretiger.jar}">
607 <      <fileset dir="${build.pretiger.dir}">
608 <      </fileset>
604 >
605 >
606 >  <target name="jsr166yjar"
607 >          depends="jsr166ycompile"
608 >          description="Builds library jar from compiled sources">
609 >
610 >    <mkdir dir="${build.jsr166ylib.dir}"/>
611 >
612 >    <jar destfile="${jsr166yproduct.jar}" index="true">
613 >      <fileset dir="${build.jsr166y.dir}"/>
614 >    </jar>
615 >
616 >  </target>
617 >
618 >
619 >
620 >  <target name="jsr166ydocs"
621 >          description="Builds javadocs with custom tags to build folder">
622 >
623 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
624 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
625 >
626 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
627 >                link="http://java.sun.com/javase/6/docs/api/"
628 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
629 >
630 >    >
631 >      <packageset dir="${topsrc.dir}" defaultexcludes="no">
632 >      <include name="jsr166y"/>
633 >      </packageset>
634 >
635 >
636 >    </javadoc>
637 >
638 >  </target>
639 >
640 >
641 >  <target name="jsr166ydist"
642 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
643 >          description="Puts all distributable products in single hierarchy"/>
644 >
645 >
646 >
647 >  <target name="jsr166yclean"
648 >          description="Removes all build products">
649 >
650 >    <delete dir="${build.jsr166y.dir}"/>
651 >    <delete dir="${build.jsr166ylib.dir}"/>
652 >
653 >  </target>
654 >
655 >
656 >
657 >  <target name="jsr166ydist-clean"
658 >          description="Removes all build and distribution products">
659 >
660 >  </target>
661 >
662 >  <target name="jsr166ydist-docs"
663 >          description="Builds javadocs without custom tags to dist folder">
664 >
665 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
666 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
667 >
668 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
669 >                link="http://java.sun.com/javase/6/docs/api/"
670 >              source="${build.sourcelevel}"
671 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
672 >            >          
673 >      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
674 >      <include name="jsr166y/*.java"/>
675 >            </fileset>
676 >    </javadoc>
677 >
678 >  </target>
679 >
680 >  <target name="jsr166ydist-jar"
681 >          depends="jsr166yclean, jsr166yjar">
682 >
683 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
684 >
685 >  </target>
686 >
687 >  <!-- extra166y -->
688 >
689 >
690 >  <target name="extra166ycompile"
691 >          depends="init, configure-compiler, jsr166ycompile"
692 >          description="Compiles extra166y sources">
693 >
694 >    <mkdir dir="${build.extra166y.dir}"/>
695 >
696 >    <javac srcdir="${extra166ysrc.dir}"
697 >          destdir="${build.extra166y.dir}"
698 >            debug="${build.debug}"
699 >            classpath="${jsr166yproduct.jar}"
700 >       debuglevel="${build.debuglevel}"
701 >      deprecation="${build.deprecation}"
702 >           source="${build.sourcelevel}"
703 >             fork="true">
704 >
705 >      <include name="**/*.java"/>
706 >      <compilerarg line="${build.args}"/>
707 >      <compilerarg value="${bootclasspath.args}"/>
708 >
709 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
710 >
711 >    </javac>
712 >
713 >  </target>
714 >
715 >
716 >
717 >  <target name="extra166yjar"
718 >          depends="extra166ycompile"
719 >          description="Builds library jar from compiled sources">
720 >
721 >    <mkdir dir="${build.extra166ylib.dir}"/>
722 >
723 >    <jar destfile="${extra166yproduct.jar}" index="true">
724 >      <fileset dir="${build.extra166y.dir}"/>
725      </jar>
726 <    
726 >
727 >  </target>
728 >
729 >
730 >
731 >  <target name="extra166ydocs"
732 >          description="Builds javadocs with custom tags to build folder">
733 >
734 >    <delete dir="${build.extra166yjavadocs.dir}"/>
735 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
736 >
737 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
738 >                link="http://java.sun.com/javase/6/docs/api/"
739 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
740 >
741 >    >
742 >      <packageset dir="${topsrc.dir}" defaultexcludes="no">
743 >      <include name="extra166y"/>
744 >      </packageset>
745 >
746 >
747 >    </javadoc>
748 >
749 >  </target>
750 >
751 >
752 >  <target name="extra166ydist"
753 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
754 >          description="Puts all distributable products in single hierarchy"/>
755 >
756 >
757 >
758 >  <target name="extra166yclean"
759 >          description="Removes all build products">
760 >
761 >    <delete dir="${build.extra166y.dir}"/>
762 >    <delete dir="${build.extra166ylib.dir}"/>
763 >
764 >  </target>
765 >
766 >
767 >
768 >  <target name="extra166ydist-clean"
769 >          description="Removes all build and distribution products">
770 >
771 >  </target>
772 >
773 >  <target name="extra166ydist-docs"
774 >          description="Builds javadocs without custom tags to dist folder">
775 >
776 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
777 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
778 >
779 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
780 >                link="http://java.sun.com/javase/6/docs/api/"
781 >              source="${build.sourcelevel}"
782 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
783 >            >
784 >      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
785 >      <include name="extra166y/*.java"/>
786 >            </fileset>
787 >    </javadoc>
788 >
789 >  </target>
790 >
791 >  <target name="extra166ydist-jar"
792 >          depends="extra166yclean, extra166yjar">
793 >
794 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
795 >
796    </target>
797  
798   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines