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.86 by jsr166, Sat May 28 02:19:20 2011 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=true"/>
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://download.oracle.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 228 | Line 213
213      <delete dir="${dist.javadocs.dir}"/>
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"
233 <            overview="${src.dir}/intro.html"
234 <              source="${build.sourcelevel}">
235 <
236 <      <packageset dir="${src.dir}"/>
216 >    <!-- the packagenames="none" hack below prevents scanning the -->
217 >    <!-- sourcepath for packages -->
218  
219 +    <javadoc destdir="${dist.javadocs.dir}"
220 +             packagenames="none"
221 +             link="http://download.oracle.com/javase/6/docs/api/"
222 +             overview="${src.dir}/intro.html"
223 +             sourcepath="${src.dir}:${jdksrc.dir}" >
224 +      <fileset dir="${src.dir}" defaultexcludes="yes">
225 +      <include name="**/*.java"/>
226 +      </fileset>
227      </javadoc>
228  
229    </target>
# Line 252 | Line 241
241      <echo>java.home is ${java.home}</echo>
242  
243    </target>
244 <  
245 <  
244 >
245 >
246    <target name="dist-jar"
247            depends="clean, jar">
248  
# Line 262 | Line 251
251    </target>
252  
253  
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
254    <target name="compile-tests"
255            depends="jar">
256  
# Line 389 | Line 266
266  
267        <compilerarg value="${bootclasspath.args}"/>
268        <compilerarg line="${build.args}"/>
269 <      
269 >      <compilerarg value="-XDignore.symbol.file=true"/>
270 >
271        <classpath refid="test.classpath"/>
272  
273      </javac>
# Line 403 | Line 281
281               fork="true">
282  
283        <include name="jsr166/test/**"/>
284 <      
284 >
285        <compilerarg value="${bootclasspath.args}"/>
286        <compilerarg line="${build.args}"/>
287 <      
287 >      <compilerarg value="-XDignore.symbol.file=true"/>
288 >
289        <classpath refid="test.classpath"/>
290  
291      </javac>
# Line 422 | Line 301
301  
302        <compilerarg value="${bootclasspath.args}"/>
303        <compilerarg line="${build.args}"/>
304 <      
304 >      <compilerarg value="-XDignore.symbol.file=true"/>
305 >
306        <classpath refid="test.classpath"/>
307  
308      </javac>
# Line 447 | Line 327
327                     fork="true">
328  
329        <jvmarg value="${bootclasspath.args}"/>
330 <      
330 >      <jvmarg value="-server"/>
331 >      <jvmarg value="-showversion"/>
332 >
333        <classpath refid="test.classpath"/>
334  
335        <formatter type="xml"/>
# Line 457 | Line 339
339            <include name="**/${testcase}Test.java"/>
340          </fileset>
341        </batchtest>
342 <      
342 >
343        <batchtest todir="${build.reports.dir}" if="do.test.old">
344          <fileset dir="${test.src.dir}">
345            <include name="jsr166/test/**/${testcase}Test.java"/>
346          </fileset>
347        </batchtest>
348  
349 < <!--      
349 > <!--
350        <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
351          <fileset dir="${jtreg.src.dir}">
352            <include name="**/${testcase}Test.java"/>
# Line 492 | Line 374
374        <fileset dir="${build.reports.dir}">
375          <include name="TEST-*.xml"/>
376        </fileset>
377 <      <report styledir="${stylesheet.dir}"
496 <                format="${junit.report.format}"
497 <                 todir="${build.reports.dir}"
377 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
378        />
379      </junitreport>
380  
# Line 531 | Line 411
411      <available property="xalan.available"
412                 classname="org.apache.xalan.Version"/>
413  
414 <              
414 >
415      <!-- Ant 1.6beta and later don't need or want this check -->
416 <    <!--    
416 >    <!--
417      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
418            unless="junit.available"/>
419  
# Line 544 | Line 424
424    </target>
425  
426  
427 +  <!-- Various demos and test programs -->
428 +
429 +
430 +  <target name="loops" depends="init, configure-compiler"
431 +          description="Benchmark from Doug Lea's AQS paper">
432  
433 <  <!-- Anthill targets -->
433 >    <mkdir dir="${build.loops.dir}"/>
434  
435 <  <target name="anthill-build">
436 <  
437 <    <!-- Override this in user.properties -->
438 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
439 <    
440 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
441 <      <arg value="-Xmx256000000"/>
442 <      <!-- classpath of new JVM -->
443 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
444 <      <!-- location of Ant home directory -->
445 <      <arg value="-Dant.home=${ant.home}"/>
446 <      <!-- the Ant main class -->
447 <      <arg value="org.apache.tools.ant.Main"/>
448 <      <!-- The build file -->
449 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
450 <      <!-- the target to build on the new Ant instance -->
451 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
567 <      <arg value="do-anthill-build"/>
568 <    </exec>
569 <  </target>
570 <  
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>
435 >    <javac srcdir="${loops.src.dir}"
436 >          destdir="${build.loops.dir}"
437 >            debug="${build.debug}"
438 >       debuglevel="${build.debuglevel}"
439 >      deprecation="${build.deprecation}"
440 >           source="${build.sourcelevel}"
441 >             fork="true">
442 >
443 >      <compilerarg line="${build.args}"/>
444 >      <classpath refid="loops.classpath"/>
445 >      <compilerarg value="-XDignore.symbol.file=true"/>
446 >
447 >    </javac>
448 >
449 >    <java classname="ALoops" fork="true">
450 >      <classpath refid="loops.classpath"/>
451 >    </java>
452  
453    </target>
454  
455  
456 <  <!-- Standalone sample program -->
457 <  
458 <  <target name="sample" depends="jar">
459 <  
460 <    <mkdir dir="${build.testcases.dir}"/>
461 <    
462 <    <javac srcdir="${test.src.dir}"
463 <          destdir="${build.testcases.dir}"
456 >  <!-- jsr166x -->
457 >
458 >
459 >  <target name="jsr166xcompile"
460 >          depends="init, configure-compiler"
461 >          description="Compiles jsr166x sources">
462 >
463 >    <mkdir dir="${build.jsr166x.dir}"/>
464 >
465 >    <javac srcdir="${jsr166xsrc.dir}"
466 >          destdir="${build.jsr166x.dir}"
467              debug="${build.debug}"
468         debuglevel="${build.debuglevel}"
469        deprecation="${build.deprecation}"
470             source="${build.sourcelevel}"
471               fork="true">
472 <            
473 <      <compilerarg value="${bootclasspath.args}"/>
472 >
473 >      <include name="**/*.java"/>
474        <compilerarg line="${build.args}"/>
475 <      
476 <      <classpath refid="test.classpath"/>
612 <      
613 <      <include name="jsr166/test/Sample.java"/>
614 <      
475 >      <compilerarg value="-XDignore.symbol.file=true"/>
476 >
477      </javac>
478 <    
479 <            
480 <    <java classname="jsr166.test.Sample" fork="true">
481 <      <jvmarg value="${bootclasspath.args}"/>
482 <      <classpath refid="test.classpath"/>
483 <    </java>
478 >
479 >  </target>
480 >
481 >
482 >
483 >  <target name="jsr166xjar"
484 >          depends="jsr166xcompile"
485 >          description="Builds library jar from compiled sources">
486 >
487 >    <mkdir dir="${build.jsr166xlib.dir}"/>
488 >
489 >    <jar destfile="${jsr166xproduct.jar}">
490 >      <fileset dir="${build.jsr166x.dir}"/>
491 >    </jar>
492 >
493 >  </target>
494 >
495 >
496 >
497 >  <target name="jsr166xdocs"
498 >          description="Builds javadocs with custom tags to build folder">
499 >
500 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
501 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
502 >
503 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
504 >             packagenames="jsr166x"
505 >             link="http://download.oracle.com/javase/6/docs/api/"
506 >             source="${build.sourcelevel}"
507 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
508 >
509    </target>
510  
511  
512 +  <target name="jsr166xdist"
513 +          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
514 +          description="Puts all distributable products in single hierarchy"/>
515 +
516 +
517  
518 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
518 >  <target name="jsr166xclean"
519 >          description="Removes all build products">
520  
521 +    <delete dir="${build.jsr166x.dir}"/>
522 +    <delete dir="${build.jsr166xlib.dir}"/>
523  
524 +  </target>
525  
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">
526  
655    <mkdir dir="${build.pretiger.dir}"/>
527  
528 <    <javac srcdir="${pretiger.src.dir}"
529 <          destdir="${build.pretiger.dir}"
528 >  <target name="jsr166xdist-clean"
529 >          description="Removes all build and distribution products">
530 >
531 >  </target>
532 >
533 >
534 >
535 >  <target name="jsr166xdist-docs"
536 >          description="Builds javadocs without custom tags to dist folder">
537 >
538 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
539 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
540 >
541 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
542 >             packagenames="jsr166x"
543 >             link="http://download.oracle.com/javase/6/docs/api/"
544 >             source="${build.sourcelevel}"
545 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
546 >
547 >  </target>
548 >
549 >  <target name="jsr166xdist-jar"
550 >          depends="jsr166xclean, jsr166xjar">
551 >
552 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
553 >
554 >  </target>
555 >
556 >  <!-- jsr166y -->
557 >
558 >
559 >  <target name="jsr166ycompile"
560 >          depends="init, configure-compiler"
561 >          description="Compiles jsr166y sources">
562 >
563 >    <mkdir dir="${build.jsr166y.dir}"/>
564 >
565 >    <javac srcdir="${jsr166ysrc.dir}"
566 >          destdir="${build.jsr166y.dir}"
567              debug="${build.debug}"
568         debuglevel="${build.debuglevel}"
569        deprecation="${build.deprecation}"
570 <           source="${pretiger.sourcelevel}"
570 >           source="${build.sourcelevel}"
571               fork="true">
572  
573 +      <include name="**/*.java"/>
574        <compilerarg line="${build.args}"/>
575 <      <exclude name="**/Thread.java"/>
575 >      <compilerarg value="-XDignore.symbol.file=true"/>
576 >      <compilerarg value="${bootclasspath.args}"/>
577 >
578 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
579  
580      </javac>
581  
582    </target>
671  
672  <target name="pretiger" depends="compile-pretiger">
583  
584 <    <mkdir dir="${build.lib.dir}"/>
585 <    
586 <    <jar destfile="${pretiger.jar}">
587 <      <fileset dir="${build.pretiger.dir}">
588 <      </fileset>
584 >
585 >
586 >  <target name="jsr166yjar"
587 >          depends="jsr166ycompile"
588 >          description="Builds library jar from compiled sources">
589 >
590 >    <mkdir dir="${build.jsr166ylib.dir}"/>
591 >
592 >    <jar destfile="${jsr166yproduct.jar}" index="true">
593 >      <fileset dir="${build.jsr166y.dir}"/>
594 >    </jar>
595 >
596 >  </target>
597 >
598 >
599 >
600 >  <target name="jsr166ydocs"
601 >          description="Builds javadocs with custom tags to build folder">
602 >
603 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
604 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
605 >
606 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
607 >             packagenames="jsr166y"
608 >             link="http://download.oracle.com/javase/6/docs/api/"
609 >             source="${build.sourcelevel}"
610 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
611 >
612 >  </target>
613 >
614 >
615 >  <target name="jsr166ydist"
616 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
617 >          description="Puts all distributable products in single hierarchy"/>
618 >
619 >
620 >
621 >  <target name="jsr166yclean"
622 >          description="Removes all build products">
623 >
624 >    <delete dir="${build.jsr166y.dir}"/>
625 >    <delete dir="${build.jsr166ylib.dir}"/>
626 >
627 >  </target>
628 >
629 >
630 >
631 >  <target name="jsr166ydist-clean"
632 >          description="Removes all build and distribution products">
633 >
634 >  </target>
635 >
636 >  <target name="jsr166ydist-docs"
637 >          description="Builds javadocs without custom tags to dist folder">
638 >
639 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
640 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
641 >
642 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
643 >             packagenames="jsr166y"
644 >             link="http://download.oracle.com/javase/6/docs/api/"
645 >             source="${build.sourcelevel}"
646 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
647 >
648 >  </target>
649 >
650 >  <target name="jsr166ydist-jar"
651 >          depends="jsr166yclean, jsr166yjar">
652 >
653 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
654 >
655 >  </target>
656 >
657 >  <!-- extra166y -->
658 >
659 >
660 >  <target name="extra166ycompile"
661 >          depends="init, configure-compiler, jsr166ycompile"
662 >          description="Compiles extra166y sources">
663 >
664 >    <mkdir dir="${build.extra166y.dir}"/>
665 >
666 >    <javac srcdir="${extra166ysrc.dir}"
667 >          destdir="${build.extra166y.dir}"
668 >            debug="${build.debug}"
669 >            classpath="${jsr166yproduct.jar}"
670 >       debuglevel="${build.debuglevel}"
671 >      deprecation="${build.deprecation}"
672 >           source="${build.sourcelevel}"
673 >             fork="true">
674 >
675 >      <include name="**/*.java"/>
676 >      <compilerarg line="${build.args}"/>
677 >      <compilerarg value="-XDignore.symbol.file=true"/>
678 >      <compilerarg value="${bootclasspath.args}"/>
679 >
680 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
681 >
682 >    </javac>
683 >
684 >  </target>
685 >
686 >
687 >
688 >  <target name="extra166yjar"
689 >          depends="extra166ycompile"
690 >          description="Builds library jar from compiled sources">
691 >
692 >    <mkdir dir="${build.extra166ylib.dir}"/>
693 >
694 >    <jar destfile="${extra166yproduct.jar}" index="true">
695 >      <fileset dir="${build.extra166y.dir}"/>
696      </jar>
697 <    
697 >
698 >  </target>
699 >
700 >
701 >
702 >  <target name="extra166ydocs"
703 >          description="Builds javadocs with custom tags to build folder">
704 >
705 >    <delete dir="${build.extra166yjavadocs.dir}"/>
706 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
707 >
708 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
709 >             packagenames="extra166y"
710 >             link="http://download.oracle.com/javase/6/docs/api/"
711 >             source="${build.sourcelevel}"
712 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
713 >
714 >  </target>
715 >
716 >
717 >  <target name="extra166ydist"
718 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
719 >          description="Puts all distributable products in single hierarchy"/>
720 >
721 >
722 >
723 >  <target name="extra166yclean"
724 >          description="Removes all build products">
725 >
726 >    <delete dir="${build.extra166y.dir}"/>
727 >    <delete dir="${build.extra166ylib.dir}"/>
728 >
729 >  </target>
730 >
731 >
732 >
733 >  <target name="extra166ydist-clean"
734 >          description="Removes all build and distribution products">
735 >
736 >  </target>
737 >
738 >  <target name="extra166ydist-docs"
739 >          description="Builds javadocs without custom tags to dist folder">
740 >
741 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
742 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
743 >
744 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
745 >             packagenames="extra166y"
746 >             link="http://download.oracle.com/javase/6/docs/api/"
747 >             source="${build.sourcelevel}"
748 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
749 >
750 >  </target>
751 >
752 >  <target name="extra166ydist-jar"
753 >          depends="extra166yclean, extra166yjar">
754 >
755 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
756 >
757    </target>
758  
759   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines