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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines