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.76 by dl, Tue Jan 6 16:31:52 2009 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 >  <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 +  <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  
62    <!-- Distribution locations -->
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 -->
# Line 84 | Line 104
104             source="${build.sourcelevel}"
105               fork="true">
106  
107 +      <include name="**/*.java"/>
108 +      <compilerarg value="-XDignore.symbol.file"/>
109 +
110 + <!--
111 +      <exclude name="java/lang/**"/>
112        <compilerarg line="${build.args}"/>
113 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
114 + -->
115  
116      </javac>
117  
# Line 119 | Line 146
146      <mkdir dir="${build.javadocs.dir}"/>
147  
148      <javadoc destdir="${build.javadocs.dir}"
149 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
149 >                link="http://java.sun.com/javase/6/docs/api/"
150              overview="${src.dir}/intro.html"
151 <              source="${build.sourcelevel}">
152 <
126 <      <tag name="revised" description="Last revised:"/>
127 <      <tag name="spec"    description="Specified by:"/>
151 >            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
152 >    >          
153  
154        <packageset dir="${src.dir}"/>
155  
# Line 134 | Line 159
159  
160  
161  
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
162    <target name="dist"
163            depends="init, dist-clean, dist-jar, dist-docs"
164            description="Puts all distributable products in single hierarchy"/>
# Line 229 | Line 212
212      <mkdir dir="${dist.javadocs.dir}"/>
213  
214      <javadoc destdir="${dist.javadocs.dir}"
215 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
215 >            link="http://java.sun.com/javase/6/docs/api/"
216              overview="${src.dir}/intro.html"
234              source="${build.sourcelevel}">
235
236      <packageset dir="${src.dir}"/>
217  
218 +            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
219 +     >
220 + <!--
221 +      <packageset dir="${src.dir}" defaultexcludes="yes">
222 +      <include name="java/util/concurrent"/>
223 +      <include name="java/util/concurrent/atomic"/>
224 +      <include name="java/util/concurrent/locks"/>
225 +      </packageset>
226 + -->
227 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
228 +      <include name="main/java/util/concurrent/*.java"/>
229 +      <include name="main/java/util/concurrent/atomic/*.java"/>
230 +      <include name="main/java/util/concurrent/locks/*.java"/>
231 +      <include name="main/java/util/*.java"/>
232 + <!--
233 +      <include name="main/java/util/concurrent/*.html"/>
234 +      <include name="main/java/util/concurrent/atomic/*.html"/>
235 +      <include name="main/java/util/concurrent/locks/*.html"/>
236 +      <include name="main/java/util/*.html"/>
237 + -->
238 + <!--      <include name="jsr166x/*.java"/> -->
239 +      </fileset>
240      </javadoc>
241  
242    </target>
# Line 252 | Line 254
254      <echo>java.home is ${java.home}</echo>
255  
256    </target>
257 <  
258 <  
257 >
258 >
259    <target name="dist-jar"
260            depends="clean, jar">
261  
# Line 262 | Line 264
264    </target>
265  
266  
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
267    <target name="compile-tests"
268            depends="jar">
269  
# Line 389 | Line 279
279  
280        <compilerarg value="${bootclasspath.args}"/>
281        <compilerarg line="${build.args}"/>
282 <      
282 >
283        <classpath refid="test.classpath"/>
284  
285      </javac>
# Line 403 | Line 293
293               fork="true">
294  
295        <include name="jsr166/test/**"/>
296 <      
296 >
297        <compilerarg value="${bootclasspath.args}"/>
298        <compilerarg line="${build.args}"/>
299 <      
299 >
300        <classpath refid="test.classpath"/>
301  
302      </javac>
# Line 422 | Line 312
312  
313        <compilerarg value="${bootclasspath.args}"/>
314        <compilerarg line="${build.args}"/>
315 <      
315 >
316        <classpath refid="test.classpath"/>
317  
318      </javac>
# Line 447 | Line 337
337                     fork="true">
338  
339        <jvmarg value="${bootclasspath.args}"/>
340 <      
340 >      <jvmarg value="-server"/>
341 >      <jvmarg value="-showversion"/>
342 >
343        <classpath refid="test.classpath"/>
344  
345        <formatter type="xml"/>
# Line 457 | Line 349
349            <include name="**/${testcase}Test.java"/>
350          </fileset>
351        </batchtest>
352 <      
352 >
353        <batchtest todir="${build.reports.dir}" if="do.test.old">
354          <fileset dir="${test.src.dir}">
355            <include name="jsr166/test/**/${testcase}Test.java"/>
356          </fileset>
357        </batchtest>
358  
359 < <!--      
359 > <!--
360        <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
361          <fileset dir="${jtreg.src.dir}">
362            <include name="**/${testcase}Test.java"/>
# Line 492 | Line 384
384        <fileset dir="${build.reports.dir}">
385          <include name="TEST-*.xml"/>
386        </fileset>
387 <      <report styledir="${stylesheet.dir}"
496 <                format="${junit.report.format}"
497 <                 todir="${build.reports.dir}"
387 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
388        />
389      </junitreport>
390  
# Line 531 | Line 421
421      <available property="xalan.available"
422                 classname="org.apache.xalan.Version"/>
423  
424 <              
424 >
425      <!-- Ant 1.6beta and later don't need or want this check -->
426 <    <!--    
426 >    <!--
427      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
428            unless="junit.available"/>
429  
# Line 544 | Line 434
434    </target>
435  
436  
437 +  <!-- Various demos and test programs -->
438  
548  <!-- Anthill targets -->
439  
440 <  <target name="anthill-build">
441 <  
442 <    <!-- Override this in user.properties -->
443 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
444 <    
445 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
446 <      <arg value="-Xmx256000000"/>
447 <      <!-- classpath of new JVM -->
448 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
449 <      <!-- location of Ant home directory -->
450 <      <arg value="-Dant.home=${ant.home}"/>
451 <      <!-- the Ant main class -->
452 <      <arg value="org.apache.tools.ant.Main"/>
453 <      <!-- The build file -->
454 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
455 <      <!-- the target to build on the new Ant instance -->
456 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
457 <      <arg value="do-anthill-build"/>
458 <    </exec>
459 <  </target>
460 <  
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>
440 >  <target name="loops" depends="init, configure-compiler"
441 >          description="Benchmark from Doug Lea's AQS paper">
442 >
443 >    <mkdir dir="${build.loops.dir}"/>
444 >
445 >    <javac srcdir="${loops.src.dir}"
446 >          destdir="${build.loops.dir}"
447 >            debug="${build.debug}"
448 >       debuglevel="${build.debuglevel}"
449 >      deprecation="${build.deprecation}"
450 >           source="${build.sourcelevel}"
451 >             fork="true">
452 >
453 >      <compilerarg line="${build.args}"/>
454 >      <classpath refid="loops.classpath"/>
455 >
456 >    </javac>
457 >
458 >    <java classname="ALoops" fork="true">
459 >      <classpath refid="loops.classpath"/>
460 >    </java>
461  
462    </target>
463  
464  
465 <  <!-- Standalone sample program -->
466 <  
467 <  <target name="sample" depends="jar">
468 <  
469 <    <mkdir dir="${build.testcases.dir}"/>
470 <    
471 <    <javac srcdir="${test.src.dir}"
472 <          destdir="${build.testcases.dir}"
465 >  <!-- jsr166x -->
466 >
467 >
468 >  <target name="jsr166xcompile"
469 >          depends="init, configure-compiler"
470 >          description="Compiles jsr166x sources">
471 >
472 >    <mkdir dir="${build.jsr166x.dir}"/>
473 >
474 >    <javac srcdir="${jsr166xsrc.dir}"
475 >          destdir="${build.jsr166x.dir}"
476              debug="${build.debug}"
477         debuglevel="${build.debuglevel}"
478        deprecation="${build.deprecation}"
479             source="${build.sourcelevel}"
480               fork="true">
481 <            
482 <      <compilerarg value="${bootclasspath.args}"/>
481 >
482 >      <include name="**/*.java"/>
483        <compilerarg line="${build.args}"/>
484 <      
611 <      <classpath refid="test.classpath"/>
612 <      
613 <      <include name="jsr166/test/Sample.java"/>
614 <      
484 >
485      </javac>
486 <    
487 <            
488 <    <java classname="jsr166.test.Sample" fork="true">
489 <      <jvmarg value="${bootclasspath.args}"/>
490 <      <classpath refid="test.classpath"/>
491 <    </java>
486 >
487 >  </target>
488 >
489 >
490 >
491 >  <target name="jsr166xjar"
492 >          depends="jsr166xcompile"
493 >          description="Builds library jar from compiled sources">
494 >
495 >    <mkdir dir="${build.jsr166xlib.dir}"/>
496 >
497 >    <jar destfile="${jsr166xproduct.jar}">
498 >      <fileset dir="${build.jsr166x.dir}"/>
499 >    </jar>
500 >
501 >  </target>
502 >
503 >
504 >
505 >  <target name="jsr166xdocs"
506 >          description="Builds javadocs with custom tags to build folder">
507 >
508 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
509 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
510 >
511 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
512 >             link="http://java.sun.com/javase/6/docs/api/"
513 >
514 >            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
515 >
516 >    >
517 >      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
518 >      <include name="jsr166x"/>
519 >      </packageset>
520 >
521 >
522 >    </javadoc>
523 >
524 >  </target>
525 >
526 >
527 >  <target name="jsr166xdist"
528 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
529 >          description="Puts all distributable products in single hierarchy"/>
530 >
531 >
532 >
533 >  <target name="jsr166xclean"
534 >          description="Removes all build products">
535 >
536 >    <delete dir="${build.jsr166x.dir}"/>
537 >    <delete dir="${build.jsr166xlib.dir}"/>
538 >
539 >  </target>
540 >
541 >
542 >
543 >  <target name="jsr166xdist-clean"
544 >          description="Removes all build and distribution products">
545 >
546    </target>
547  
548  
549  
550 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
550 >  <target name="jsr166xdist-docs"
551 >          description="Builds javadocs without custom tags to dist folder">
552  
553 +    <delete dir="${dist.jsr166xjavadocs.dir}"/>
554 +    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
555  
556 +    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
557 +                link="http://java.sun.com/javase/6/docs/api/"
558 +              source="${build.sourcelevel}">
559  
560 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
561 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
562 <  <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">
560 >      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
561 >      <include name="jsr166x"/>
562 >      </packageset>
563  
564 <    <mkdir dir="${build.pretiger.dir}"/>
564 >    </javadoc>
565 >
566 >  </target>
567 >
568 >  <target name="jsr166xdist-jar"
569 >          depends="jsr166xclean, jsr166xjar">
570 >
571 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
572 >
573 >  </target>
574  
575 <    <javac srcdir="${pretiger.src.dir}"
576 <          destdir="${build.pretiger.dir}"
575 >  <!-- jsr166y -->
576 >
577 >
578 >  <target name="jsr166ycompile"
579 >          depends="init, configure-compiler"
580 >          description="Compiles jsr166y sources">
581 >
582 >    <mkdir dir="${build.jsr166y.dir}"/>
583 >
584 >    <javac srcdir="${jsr166ysrc.dir}"
585 >          destdir="${build.jsr166y.dir}"
586              debug="${build.debug}"
587         debuglevel="${build.debuglevel}"
588        deprecation="${build.deprecation}"
589 <           source="${pretiger.sourcelevel}"
589 >           source="${build.sourcelevel}"
590               fork="true">
591  
592 +      <include name="**/*.java"/>
593        <compilerarg line="${build.args}"/>
594 <      <exclude name="**/Thread.java"/>
594 >      <compilerarg value="${bootclasspath.args}"/>
595 >
596 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
597  
598      </javac>
599  
600    </target>
671  
672  <target name="pretiger" depends="compile-pretiger">
601  
602 <    <mkdir dir="${build.lib.dir}"/>
603 <    
604 <    <jar destfile="${pretiger.jar}">
605 <      <fileset dir="${build.pretiger.dir}">
606 <      </fileset>
602 >
603 >
604 >  <target name="jsr166yjar"
605 >          depends="jsr166ycompile"
606 >          description="Builds library jar from compiled sources">
607 >
608 >    <mkdir dir="${build.jsr166ylib.dir}"/>
609 >
610 >    <jar destfile="${jsr166yproduct.jar}" index="true">
611 >      <fileset dir="${build.jsr166y.dir}"/>
612      </jar>
613 <    
613 >
614 >  </target>
615 >
616 >
617 >
618 >  <target name="jsr166ydocs"
619 >          description="Builds javadocs with custom tags to build folder">
620 >
621 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
622 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
623 >
624 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
625 >                link="http://java.sun.com/javase/6/docs/api/"
626 >            sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
627 >
628 >    >
629 >      <packageset dir="${topsrc.dir}" defaultexcludes="no">
630 >      <include name="jsr166y"/>
631 >      </packageset>
632 >
633 >
634 >    </javadoc>
635 >
636 >  </target>
637 >
638 >
639 >  <target name="jsr166ydist"
640 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
641 >          description="Puts all distributable products in single hierarchy"/>
642 >
643 >
644 >
645 >  <target name="jsr166yclean"
646 >          description="Removes all build products">
647 >
648 >    <delete dir="${build.jsr166y.dir}"/>
649 >    <delete dir="${build.jsr166ylib.dir}"/>
650 >
651 >  </target>
652 >
653 >
654 >
655 >  <target name="jsr166ydist-clean"
656 >          description="Removes all build and distribution products">
657 >
658 >  </target>
659 >
660 >  <target name="jsr166ydist-docs"
661 >          description="Builds javadocs without custom tags to dist folder">
662 >
663 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
664 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
665 >
666 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
667 >                link="http://java.sun.com/javase/6/docs/api/"
668 >              source="${build.sourcelevel}">
669 >      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
670 >      <include name="jsr166y/*.java"/>
671 >            </fileset>
672 >    </javadoc>
673 >
674 >  </target>
675 >
676 >  <target name="jsr166ydist-jar"
677 >          depends="jsr166yclean, jsr166yjar">
678 >
679 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
680 >
681 >  </target>
682 >
683 >  <!-- extra166y -->
684 >
685 >
686 >  <target name="extra166ycompile"
687 >          depends="init, configure-compiler"
688 >          description="Compiles extra166y sources">
689 >
690 >    <mkdir dir="${build.extra166y.dir}"/>
691 >
692 >    <javac srcdir="${extra166ysrc.dir}"
693 >          destdir="${build.extra166y.dir}"
694 >            debug="${build.debug}"
695 >       debuglevel="${build.debuglevel}"
696 >      deprecation="${build.deprecation}"
697 >           source="${build.sourcelevel}"
698 >             fork="true">
699 >
700 >      <include name="**/*.java"/>
701 >      <compilerarg line="${build.args}"/>
702 >      <compilerarg value="${bootclasspath.args}"/>
703 >
704 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
705 >
706 >    </javac>
707 >
708 >  </target>
709 >
710 >
711 >
712 >  <target name="extra166yjar"
713 >          depends="extra166ycompile"
714 >          description="Builds library jar from compiled sources">
715 >
716 >    <mkdir dir="${build.extra166ylib.dir}"/>
717 >
718 >    <jar destfile="${extra166yproduct.jar}" index="true">
719 >      <fileset dir="${build.extra166y.dir}"/>
720 >    </jar>
721 >
722 >  </target>
723 >
724 >
725 >
726 >  <target name="extra166ydocs"
727 >          description="Builds javadocs with custom tags to build folder">
728 >
729 >    <delete dir="${build.extra166yjavadocs.dir}"/>
730 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
731 >
732 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
733 >                link="http://java.sun.com/javase/6/docs/api/"
734 >            sourcepath="${extra166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
735 >
736 >    >
737 >      <packageset dir="${topsrc.dir}" defaultexcludes="no">
738 >      <include name="extra166y"/>
739 >      </packageset>
740 >
741 >
742 >    </javadoc>
743 >
744 >  </target>
745 >
746 >
747 >  <target name="extra166ydist"
748 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
749 >          description="Puts all distributable products in single hierarchy"/>
750 >
751 >
752 >
753 >  <target name="extra166yclean"
754 >          description="Removes all build products">
755 >
756 >    <delete dir="${build.extra166y.dir}"/>
757 >    <delete dir="${build.extra166ylib.dir}"/>
758 >
759 >  </target>
760 >
761 >
762 >
763 >  <target name="extra166ydist-clean"
764 >          description="Removes all build and distribution products">
765 >
766 >  </target>
767 >
768 >  <target name="extra166ydist-docs"
769 >          description="Builds javadocs without custom tags to dist folder">
770 >
771 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
772 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
773 >
774 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
775 >                link="http://java.sun.com/javase/6/docs/api/"
776 >              source="${build.sourcelevel}">
777 >      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
778 >      <include name="extra166y/*.java"/>
779 >            </fileset>
780 >    </javadoc>
781 >
782 >  </target>
783 >
784 >  <target name="extra166ydist-jar"
785 >          depends="extra166yclean, extra166yjar">
786 >
787 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
788 >
789    </target>
790  
791   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines