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.89 by jsr166, Fri Jun 10 18:07:30 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="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 117 | Line 148
148      <delete dir="${build.javadocs.dir}"/>
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"
122 <            overview="${src.dir}/intro.html"
123 <              source="${build.sourcelevel}">
124 <
125 <      <tag name="revised" description="Last revised:"/>
126 <      <tag name="spec"    description="Specified by:"/>
127 <
128 <      <packageset dir="${src.dir}"/>
129 <
130 <    </javadoc>
131 <
132 <  </target>
133 <
151 >    <!-- the packagenames="none" hack below prevents scanning the -->
152 >    <!-- sourcepath for packages -->
153  
154 <
155 <  <target name="doccheck"
156 <          depends="filter-doccheck"
157 <          description="Reports on javadoc style errors">
158 <
159 <    <delete dir="${build.doccheck.dir}"/>
160 <    <mkdir dir="${build.doccheck.dir}"/>
161 <
162 <    <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}"/>
154 >    <javadoc destdir="${build.javadocs.dir}"
155 >             packagenames="none"
156 >             link="http://download.oracle.com/javase/7/docs/api/"
157 >             overview="${src.dir}/intro.html"
158 >             sourcepath="${src.dir}:${jdksrc.dir}"
159 >             additionalparam="-XDignore.symbol.file=true" >
160 >      <fileset dir="${src.dir}" defaultexcludes="yes">
161 >      <include name="**/*.java"/>
162 >      </fileset>
163      </javadoc>
164  
149    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
150
165    </target>
166  
167  
168  
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
169    <target name="dist"
170            depends="init, dist-clean, dist-jar, dist-docs"
171            description="Puts all distributable products in single hierarchy"/>
172  
173  
183
174    <target name="release"
175            depends="dist"
176            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 227 | Line 217
217      <delete dir="${dist.javadocs.dir}"/>
218      <mkdir dir="${dist.javadocs.dir}"/>
219  
220 <    <javadoc destdir="${dist.javadocs.dir}"
221 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
232 <            overview="${src.dir}/intro.html"
233 <              source="${build.sourcelevel}">
234 <
235 <      <packageset dir="${src.dir}"/>
220 >    <!-- the packagenames="none" hack below prevents scanning the -->
221 >    <!-- sourcepath for packages -->
222  
223 +    <javadoc destdir="${dist.javadocs.dir}"
224 +             packagenames="none"
225 +             link="http://download.oracle.com/javase/7/docs/api/"
226 +             overview="${src.dir}/intro.html"
227 +             sourcepath="${src.dir}:${jdksrc.dir}"
228 +             additionalparam="-XDignore.symbol.file=true" >
229 +      <fileset dir="${src.dir}" defaultexcludes="yes">
230 +      <include name="**/*.java"/>
231 +      </fileset>
232      </javadoc>
233  
234    </target>
# Line 261 | Line 256
256    </target>
257  
258  
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
259    <target name="compile-tests"
260            depends="jar">
261  
# Line 388 | Line 271
271  
272        <compilerarg value="${bootclasspath.args}"/>
273        <compilerarg line="${build.args}"/>
274 <      
274 >      <compilerarg value="-XDignore.symbol.file=true"/>
275 >
276        <classpath refid="test.classpath"/>
277  
278      </javac>
# Line 402 | Line 286
286               fork="true">
287  
288        <include name="jsr166/test/**"/>
289 <      
289 >
290        <compilerarg value="${bootclasspath.args}"/>
291        <compilerarg line="${build.args}"/>
292 <      
292 >      <compilerarg value="-XDignore.symbol.file=true"/>
293 >
294        <classpath refid="test.classpath"/>
295  
296      </javac>
297  
298 + <!--
299 +    <javac srcdir="${jtreg.src.dir}"
300 +          destdir="${build.testcases.dir}"
301 +            debug="${build.debug}"
302 +       debuglevel="${build.debuglevel}"
303 +      deprecation="${build.deprecation}"
304 +           source="${build.sourcelevel}"
305 +             fork="true">
306 +
307 +      <compilerarg value="${bootclasspath.args}"/>
308 +      <compilerarg line="${build.args}"/>
309 +      <compilerarg value="-XDignore.symbol.file=true"/>
310 +
311 +      <classpath refid="test.classpath"/>
312 +
313 +    </javac>
314 + -->
315 +
316    </target>
317  
318  
# Line 429 | Line 332
332                     fork="true">
333  
334        <jvmarg value="${bootclasspath.args}"/>
335 <      
335 >      <jvmarg value="-server"/>
336 >      <jvmarg value="-showversion"/>
337 >
338        <classpath refid="test.classpath"/>
339  
340        <formatter type="xml"/>
341  
342 <      <batchtest todir="${build.reports.dir}">
342 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
343          <fileset dir="${tck.src.dir}">
344            <include name="**/${testcase}Test.java"/>
345          </fileset>
346 +      </batchtest>
347 +
348 +      <batchtest todir="${build.reports.dir}" if="do.test.old">
349          <fileset dir="${test.src.dir}">
350            <include name="jsr166/test/**/${testcase}Test.java"/>
351          </fileset>
352        </batchtest>
353  
354 + <!--
355 +      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
356 +        <fileset dir="${jtreg.src.dir}">
357 +          <include name="**/${testcase}Test.java"/>
358 +        </fileset>
359 +      </batchtest>
360 + -->
361 +
362      </junit>
363  
364    </target>
# Line 463 | Line 379
379        <fileset dir="${build.reports.dir}">
380          <include name="TEST-*.xml"/>
381        </fileset>
382 <      <report styledir="${stylesheet.dir}"
467 <                format="${junit.report.format}"
468 <                 todir="${build.reports.dir}"
382 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
383        />
384      </junitreport>
385  
# Line 502 | Line 416
416      <available property="xalan.available"
417                 classname="org.apache.xalan.Version"/>
418  
419 <              
419 >
420      <!-- Ant 1.6beta and later don't need or want this check -->
421 <    <!--    
421 >    <!--
422      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
423            unless="junit.available"/>
424  
# Line 515 | Line 429
429    </target>
430  
431  
432 +  <!-- Various demos and test programs -->
433 +
434 +
435 +  <target name="loops" depends="init, configure-compiler"
436 +          description="Benchmark from Doug Lea's AQS paper">
437 +
438 +    <mkdir dir="${build.loops.dir}"/>
439 +
440 +    <javac srcdir="${loops.src.dir}"
441 +          destdir="${build.loops.dir}"
442 +            debug="${build.debug}"
443 +       debuglevel="${build.debuglevel}"
444 +      deprecation="${build.deprecation}"
445 +           source="${build.sourcelevel}"
446 +             fork="true">
447 +
448 +      <compilerarg line="${build.args}"/>
449 +      <classpath refid="loops.classpath"/>
450 +      <compilerarg value="-XDignore.symbol.file=true"/>
451 +
452 +    </javac>
453 +
454 +    <java classname="ALoops" fork="true">
455 +      <classpath refid="loops.classpath"/>
456 +    </java>
457 +
458 +  </target>
459 +
460 +
461 +  <!-- jsr166x -->
462 +
463 +
464 +  <target name="jsr166xcompile"
465 +          depends="init, configure-compiler"
466 +          description="Compiles jsr166x sources">
467 +
468 +    <mkdir dir="${build.jsr166x.dir}"/>
469 +
470 +    <javac srcdir="${jsr166xsrc.dir}"
471 +          destdir="${build.jsr166x.dir}"
472 +            debug="${build.debug}"
473 +       debuglevel="${build.debuglevel}"
474 +      deprecation="${build.deprecation}"
475 +           source="${build.sourcelevel}"
476 +             fork="true">
477 +
478 +      <include name="**/*.java"/>
479 +      <compilerarg line="${build.args}"/>
480 +      <compilerarg value="-XDignore.symbol.file=true"/>
481  
482 <  <!-- Anthill targets -->
482 >    </javac>
483  
521  <target name="anthill-build">
522  
523    <!-- Override this in user.properties -->
524    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
525    
526    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
527      <arg value="-Xmx256000000"/>
528      <!-- classpath of new JVM -->
529      <arg value="-classpath"/> <arg path="${java.class.path}"/>
530      <!-- location of Ant home directory -->
531      <arg value="-Dant.home=${ant.home}"/>
532      <!-- the Ant main class -->
533      <arg value="org.apache.tools.ant.Main"/>
534      <!-- The build file -->
535      <arg value="-buildfile"/>  <arg value="build.xml"/>
536      <!-- the target to build on the new Ant instance -->
537      <arg value="-DJAVA_HOME=${tiger.home}"/>
538      <arg value="do-anthill-build"/>
539    </exec>
484    </target>
541  
542  <target name="do-anthill-build"
543          depends="jar, test, docs, dist-docs"/>
485  
545  <target name="anthill-publish">
486  
547    <copy todir="${deployDir}/docs/private">
548      <fileset dir="${build.javadocs.dir}"/>
549    </copy>
487  
488 <    <copy todir="${deployDir}/docs/public">
489 <      <fileset dir="${dist.javadocs.dir}"/>
490 <    </copy>
488 >  <target name="jsr166xjar"
489 >          depends="jsr166xcompile"
490 >          description="Builds library jar from compiled sources">
491  
492 <    <copy tofile="${deployDir}/index.html"
556 <          file="${basedir}/etc/anthill-index.html"/>
492 >    <mkdir dir="${build.jsr166xlib.dir}"/>
493  
494 <    <copy todir="${deployDir}/notes">
495 <      <fileset dir="${basedir}/etc/notes"/>
496 <    </copy>
494 >    <jar destfile="${jsr166xproduct.jar}">
495 >      <fileset dir="${build.jsr166x.dir}"/>
496 >    </jar>
497  
498    </target>
499  
500  
501  
502 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
502 >  <target name="jsr166xdocs"
503 >          description="Builds javadocs with custom tags to build folder">
504  
505 +    <delete dir="${build.jsr166xjavadocs.dir}"/>
506 +    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
507  
508 <  <target name="compat" depends="jar">
509 <  
510 <    <mkdir dir="${build.testcases.dir}"/>
511 <    
512 <    <javac srcdir="${test.src.dir}"
513 <          destdir="${build.testcases.dir}"
508 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
509 >             packagenames="jsr166x"
510 >             link="http://download.oracle.com/javase/7/docs/api/"
511 >             source="${build.sourcelevel}"
512 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
513 >             additionalparam="-XDignore.symbol.file=true" />
514 >
515 >  </target>
516 >
517 >
518 >  <target name="jsr166xdist"
519 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
520 >          description="Puts all distributable products in single hierarchy"/>
521 >
522 >
523 >
524 >  <target name="jsr166xclean"
525 >          description="Removes all build products">
526 >
527 >    <delete dir="${build.jsr166x.dir}"/>
528 >    <delete dir="${build.jsr166xlib.dir}"/>
529 >
530 >  </target>
531 >
532 >
533 >
534 >  <target name="jsr166xdist-clean"
535 >          description="Removes all build and distribution products">
536 >
537 >  </target>
538 >
539 >
540 >
541 >  <target name="jsr166xdist-docs"
542 >          description="Builds javadocs without custom tags to dist folder">
543 >
544 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
545 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
546 >
547 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
548 >             packagenames="jsr166x"
549 >             link="http://download.oracle.com/javase/7/docs/api/"
550 >             source="${build.sourcelevel}"
551 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
552 >             additionalparam="-XDignore.symbol.file=true" />
553 >
554 >  </target>
555 >
556 >  <target name="jsr166xdist-jar"
557 >          depends="jsr166xclean, jsr166xjar">
558 >
559 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
560 >
561 >  </target>
562 >
563 >  <!-- jsr166y -->
564 >
565 >
566 >  <target name="jsr166ycompile"
567 >          depends="init, configure-compiler"
568 >          description="Compiles jsr166y sources">
569 >
570 >    <mkdir dir="${build.jsr166y.dir}"/>
571 >
572 >    <javac srcdir="${jsr166ysrc.dir}"
573 >          destdir="${build.jsr166y.dir}"
574              debug="${build.debug}"
575         debuglevel="${build.debuglevel}"
576        deprecation="${build.deprecation}"
577             source="${build.sourcelevel}"
578               fork="true">
579 <            
580 <      <compilerarg value="${bootclasspath.args}"/>
579 >
580 >      <include name="**/*.java"/>
581        <compilerarg line="${build.args}"/>
582 <      
583 <      <classpath refid="test.classpath"/>
584 <      
585 <      <include name="Compatibility.java"/>
586 <      
582 >      <compilerarg value="-XDignore.symbol.file=true"/>
583 >      <compilerarg value="${bootclasspath.args}"/>
584 >
585 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
586 >
587      </javac>
588 <    
589 <            
590 <    <java classname="Compatibility" fork="true">
591 <      <jvmarg value="${bootclasspath.args}"/>
592 <      <classpath refid="test.classpath"/>
593 <    </java>
588 >
589 >  </target>
590 >
591 >
592 >
593 >  <target name="jsr166yjar"
594 >          depends="jsr166ycompile"
595 >          description="Builds library jar from compiled sources">
596 >
597 >    <mkdir dir="${build.jsr166ylib.dir}"/>
598 >
599 >    <jar destfile="${jsr166yproduct.jar}" index="true">
600 >      <fileset dir="${build.jsr166y.dir}"/>
601 >    </jar>
602 >
603    </target>
604  
605  
606  
607 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
608 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
609 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
610 <  <property name="pretiger.sourcelevel" value="1.4"/>
611 <  
604 <  <target name="defang"
605 <       depends="init"
606 <   description="Generates pre-Tiger compatible source">
607 <  
608 <    <delete dir="${pretiger.src.dir}"/>
609 <    <mkdir dir="${pretiger.src.dir}"/>
610 <  
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">
607 >  <target name="jsr166ydocs"
608 >          description="Builds javadocs with custom tags to build folder">
609 >
610 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
611 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
612  
613 <    <mkdir dir="${build.pretiger.dir}"/>
613 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
614 >             packagenames="jsr166y"
615 >             link="http://download.oracle.com/javase/7/docs/api/"
616 >             source="${build.sourcelevel}"
617 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
618 >             additionalparam="-XDignore.symbol.file=true" />
619  
620 <    <javac srcdir="${pretiger.src.dir}"
621 <          destdir="${build.pretiger.dir}"
620 >  </target>
621 >
622 >
623 >  <target name="jsr166ydist"
624 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
625 >          description="Puts all distributable products in single hierarchy"/>
626 >
627 >
628 >
629 >  <target name="jsr166yclean"
630 >          description="Removes all build products">
631 >
632 >    <delete dir="${build.jsr166y.dir}"/>
633 >    <delete dir="${build.jsr166ylib.dir}"/>
634 >
635 >  </target>
636 >
637 >
638 >
639 >  <target name="jsr166ydist-clean"
640 >          description="Removes all build and distribution products">
641 >
642 >  </target>
643 >
644 >  <target name="jsr166ydist-docs"
645 >          description="Builds javadocs without custom tags to dist folder">
646 >
647 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
648 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
649 >
650 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
651 >             packagenames="jsr166y"
652 >             link="http://download.oracle.com/javase/7/docs/api/"
653 >             source="${build.sourcelevel}"
654 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
655 >             additionalparam="-XDignore.symbol.file=true" />
656 >
657 >  </target>
658 >
659 >  <target name="jsr166ydist-jar"
660 >          depends="jsr166yclean, jsr166yjar">
661 >
662 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
663 >
664 >  </target>
665 >
666 >  <!-- extra166y -->
667 >
668 >
669 >  <target name="extra166ycompile"
670 >          depends="init, configure-compiler, jsr166ycompile"
671 >          description="Compiles extra166y sources">
672 >
673 >    <mkdir dir="${build.extra166y.dir}"/>
674 >
675 >    <javac srcdir="${extra166ysrc.dir}"
676 >          destdir="${build.extra166y.dir}"
677              debug="${build.debug}"
678 +            classpath="${jsr166yproduct.jar}"
679         debuglevel="${build.debuglevel}"
680        deprecation="${build.deprecation}"
681 <           source="${pretiger.sourcelevel}"
681 >           source="${build.sourcelevel}"
682               fork="true">
683  
684 +      <include name="**/*.java"/>
685        <compilerarg line="${build.args}"/>
686 <      <exclude name="**/Thread.java"/>
686 >      <compilerarg value="-XDignore.symbol.file=true"/>
687 >      <compilerarg value="${bootclasspath.args}"/>
688 >
689 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
690  
691      </javac>
692  
693    </target>
640  
641  <target name="pretiger" depends="compile-pretiger">
694  
695 <    <mkdir dir="${build.lib.dir}"/>
696 <    
697 <    <jar destfile="${pretiger.jar}">
698 <      <fileset dir="${build.pretiger.dir}">
699 <      </fileset>
695 >
696 >
697 >  <target name="extra166yjar"
698 >          depends="extra166ycompile"
699 >          description="Builds library jar from compiled sources">
700 >
701 >    <mkdir dir="${build.extra166ylib.dir}"/>
702 >
703 >    <jar destfile="${extra166yproduct.jar}" index="true">
704 >      <fileset dir="${build.extra166y.dir}"/>
705      </jar>
706 <    
706 >
707 >  </target>
708 >
709 >
710 >
711 >  <target name="extra166ydocs"
712 >          description="Builds javadocs with custom tags to build folder">
713 >
714 >    <delete dir="${build.extra166yjavadocs.dir}"/>
715 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
716 >
717 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
718 >             packagenames="extra166y"
719 >             link="http://download.oracle.com/javase/7/docs/api/"
720 >             source="${build.sourcelevel}"
721 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
722 >             additionalparam="-XDignore.symbol.file=true" />
723 >
724 >  </target>
725 >
726 >
727 >  <target name="extra166ydist"
728 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
729 >          description="Puts all distributable products in single hierarchy"/>
730 >
731 >
732 >
733 >  <target name="extra166yclean"
734 >          description="Removes all build products">
735 >
736 >    <delete dir="${build.extra166y.dir}"/>
737 >    <delete dir="${build.extra166ylib.dir}"/>
738 >
739 >  </target>
740 >
741 >
742 >
743 >  <target name="extra166ydist-clean"
744 >          description="Removes all build and distribution products">
745 >
746 >  </target>
747 >
748 >  <target name="extra166ydist-docs"
749 >          description="Builds javadocs without custom tags to dist folder">
750 >
751 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
752 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
753 >
754 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
755 >             packagenames="extra166y"
756 >             link="http://download.oracle.com/javase/7/docs/api/"
757 >             source="${build.sourcelevel}"
758 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
759 >             additionalparam="-XDignore.symbol.file=true" />
760 >
761 >  </target>
762 >
763 >  <target name="extra166ydist-jar"
764 >          depends="extra166yclean, extra166yjar">
765 >
766 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
767 >
768    </target>
769  
770   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines