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.66 by jsr166, Sun Apr 11 01:37:41 2004 UTC vs.
Revision 1.91 by jsr166, Sun Nov 18 06:21:11 2012 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.j1.dir"         location="${build.dir}/j1"/>
34 <  <property name="build.loops.dir"      location="${build.dir}/loops"/>
35 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
36 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
37 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
38 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
39 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
40 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
41 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
42 <  <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.jsr166e.dir"           location="${build.dir}/jsr166e"/>
46 >  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
47 >  <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
48 >
49 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
50 >  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
51 >  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
52  
53    <!-- Source locations -->
54    <property name="src.dir"              location="${basedir}/src/main"/>
55    <property name="test.src.dir"         location="${basedir}/src/test"/>
47  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
56    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
57    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
58    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
51  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
52  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
59    <property name="lib.dir"              location="${basedir}/lib"/>
60    <property name="dist.dir"             location="${basedir}/dist"/>
61 +  <property name="topsrc.dir"           location="${basedir}/src"/>
62 +  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
63 +  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
64 +  <property name="jsr166esrc.dir"       location="${basedir}/src/jsr166e"/>
65 +  <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
66 +  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
67  
68    <!-- Distribution locations -->
69 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
69 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
70 >  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
71 >  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
72 >  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
73 >  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
74  
75    <!-- Jar locations -->
76    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
77 +  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
78 +  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
79 +  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
80 +  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
81    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
62  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
82  
83    <!-- Bootclasspath argument -->
84    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
85  
86 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
87 +  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
88 +  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
89 +  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
90 +
91 +  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
92 +  <!-- The below does not yet exist as of 2012-11 -->
93 +  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
94 +  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
95 +
96    <!-- Test classpath -->
97    <path id="test.classpath">
98      <pathelement location="${build.testcases.dir}"/>
# Line 75 | Line 104
104      <pathelement location="${build.loops.dir}"/>
105    </path>
106  
78  <!-- J1 classpath -->
79  <path id="j1.classpath">
80    <pathelement location="${build.j1.dir}"/>
81    <pathelement location="${junit.jar}"/>
82    <pathelement location="${concurrent.jar}"/>
83  </path>
84
107  
108    <!-- Main targets -->
109  
110 +  <target name="dists"
111 +          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
112 +          description="Builds all public jars and docs"/>
113  
114    <target name="compile"
115            depends="init, configure-compiler"
# Line 100 | Line 125
125             source="${build.sourcelevel}"
126               fork="true">
127  
128 +      <include name="**/*.java"/>
129 +      <compilerarg value="-XDignore.symbol.file=true"/>
130 +
131 + <!--
132 +      <exclude name="java/lang/**"/>
133        <compilerarg line="${build.args}"/>
134 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
135 + -->
136  
137      </javac>
138  
# Line 134 | Line 166
166      <delete dir="${build.javadocs.dir}"/>
167      <mkdir dir="${build.javadocs.dir}"/>
168  
169 <    <javadoc destdir="${build.javadocs.dir}"
170 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
139 <            overview="${src.dir}/intro.html"
140 <              source="${build.sourcelevel}">
141 <
142 <      <tag name="revised" description="Last revised:"/>
143 <      <tag name="spec"    description="Specified by:"/>
144 <
145 <      <packageset dir="${src.dir}"/>
169 >    <!-- the packagenames="none" hack below prevents scanning the -->
170 >    <!-- sourcepath for packages -->
171  
172 +    <javadoc destdir="${build.javadocs.dir}"
173 +             packagenames="none"
174 +             link="${jdkapidocs.url}"
175 +             overview="${src.dir}/intro.html"
176 +             sourcepath="${src.dir}:${jdksrc.dir}"
177 +             additionalparam="-XDignore.symbol.file=true" >
178 +      <fileset dir="${src.dir}" defaultexcludes="yes">
179 +      <include name="**/*.java"/>
180 +      </fileset>
181      </javadoc>
182  
183    </target>
184  
185  
186  
153  <target name="doccheck"
154          depends="filter-doccheck"
155          description="Reports on javadoc style errors">
156
157    <delete dir="${build.doccheck.dir}"/>
158    <mkdir dir="${build.doccheck.dir}"/>
159
160    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
161         docletpath="${lib.dir}/doccheck.jar"
162            destdir="${build.doccheck.dir}">
163      <packageset dir="${build.dc-filter.dir}"/>
164    </javadoc>
165
166    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
167
168  </target>
169
170
171
172  <target name="checkstyle"
173          depends="filter-src"
174          description="Reports on style errors in Java source (verbose, mostly chaff)">
175
176    <taskdef resource="checkstyletask.properties"
177            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
178
179    <mkdir dir="${build.checkstyle.dir}"/>
180
181    <checkstyle config="etc/checkstyle/sun_checks.xml"
182       failOnViolation="false">
183      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
184      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
185    </checkstyle>
186
187    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
188          out="${build.checkstyle.dir}/checkstyle-report.html"
189        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
190
191  </target>
192
193
194
187    <target name="dist"
188            depends="init, dist-clean, dist-jar, dist-docs"
189            description="Puts all distributable products in single hierarchy"/>
190  
191  
200
192    <target name="release"
193            depends="dist"
194            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 244 | Line 235
235      <delete dir="${dist.javadocs.dir}"/>
236      <mkdir dir="${dist.javadocs.dir}"/>
237  
238 <    <javadoc destdir="${dist.javadocs.dir}"
239 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
249 <            overview="${src.dir}/intro.html"
250 <              source="${build.sourcelevel}">
251 <
252 <      <packageset dir="${src.dir}"/>
238 >    <!-- the packagenames="none" hack below prevents scanning the -->
239 >    <!-- sourcepath for packages -->
240  
241 +    <javadoc destdir="${dist.javadocs.dir}"
242 +             packagenames="none"
243 +             link="${jdkapidocs.url}"
244 +             overview="${src.dir}/intro.html"
245 +             sourcepath="${src.dir}:${jdksrc.dir}"
246 +             additionalparam="-XDignore.symbol.file=true" >
247 +      <fileset dir="${src.dir}" defaultexcludes="yes">
248 +      <include name="**/*.java"/>
249 +      </fileset>
250      </javadoc>
251  
252    </target>
# Line 278 | Line 274
274    </target>
275  
276  
281  <target name="compile-ant-filter"
282          depends="init">
283
284    <mkdir dir="${build.ant.dir}"/>
285
286    <javac srcdir="${ant.src.dir}"
287          destdir="${build.ant.dir}"
288           source="1.4"/>
289
290  </target>
291
292
293  <target name="filter-src"
294          depends="compile-ant-filter">
295
296    <mkdir dir="${build.filter.src.dir}"/>
297
298    <copy todir="${build.filter.src.dir}">
299      <fileset dir="${src.dir}">
300        <include name="**/*.html"/>
301      </fileset>
302    </copy>
303
304    <copy todir="${build.filter.src.dir}">
305      <fileset dir="${src.dir}">
306        <exclude name="**/*.html"/>
307        <!-- Files excluded from dist-docs -->
308        <exclude name="java/util/Random.*"/>
309        <exclude name="sun/misc/Unsafe.*"/>
310      </fileset>
311      <!--
312      <filterchain>
313      -->
314
315        <!--
316         # This filter gets rid of angle-bracketed type parameters
317         # so that javadoc can run on the result. The following
318         # heuristic seems to work:
319         #
320         # For all lines not starting with space(s)-asterisk-space(s),
321         #   replace <something> with a space, where there may be more
322         #   than one right angle bracket at the end, and "something"
323         #   must not contain parens or pipes. (This may need some
324         #   tweaking.)
325         -->
326
327        <!--
328        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
329                      classpath="${build.ant.dir}">
330          <param name="notmatching" value="^\s+\*\s.*$"/>
331          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
332          <param name="replacement" value=" "/>
333        </filterreader>
334        -->
335
336      <!--
337      </filterchain>
338      -->
339    </copy>
340
341  </target>
342
343
344  <target name="filter-doccheck"
345          depends="filter-src">
346
347    <mkdir dir="${build.dc-filter.dir}"/>
348
349    <copy todir="${build.dc-filter.dir}">
350      <fileset dir="${build.filter.src.dir}">
351        <include name="**/*.html"/>
352      </fileset>
353    </copy>
354
355    <property name="generic.declarations"
356             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 {}"
357    />
358
359    <copy todir="${build.dc-filter.dir}">
360      <fileset dir="${build.filter.src.dir}">
361        <exclude name="**/*.html"/>
362      </fileset>
363      <filterchain>
364        <!--
365         # These two filters try to make the source look like
366         # something that doccheck can process. The first removes
367         # -source 1.4 assertions and the second adds in a bunch
368         # of single letter public nested marker interfaces so that
369         # the generic type parameters are recognized.
370         -->
371
372        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
373                      classpath="${build.ant.dir}">
374          <param name="matching"    value="^\s*assert[\s ].*$"/>
375          <param name="pattern"     value="assert"/>
376          <param name="replacement" value="//assert"/>
377        </filterreader>
378
379        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
380                      classpath="${build.ant.dir}">
381          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
382          <param name="pattern"     value="$"/>
383          <param name="replacement" value=" ${generic.declarations}"/>
384        </filterreader>
385
386      </filterchain>
387    </copy>
388
389  </target>
390
391
277    <target name="compile-tests"
278            depends="jar">
279  
# Line 404 | Line 289
289  
290        <compilerarg value="${bootclasspath.args}"/>
291        <compilerarg line="${build.args}"/>
292 +      <compilerarg value="-XDignore.symbol.file=true"/>
293  
294        <classpath refid="test.classpath"/>
295  
# Line 421 | Line 307
307  
308        <compilerarg value="${bootclasspath.args}"/>
309        <compilerarg line="${build.args}"/>
310 +      <compilerarg value="-XDignore.symbol.file=true"/>
311  
312        <classpath refid="test.classpath"/>
313  
# Line 437 | Line 324
324  
325        <compilerarg value="${bootclasspath.args}"/>
326        <compilerarg line="${build.args}"/>
327 +      <compilerarg value="-XDignore.symbol.file=true"/>
328  
329        <classpath refid="test.classpath"/>
330  
# Line 509 | Line 397
397        <fileset dir="${build.reports.dir}">
398          <include name="TEST-*.xml"/>
399        </fileset>
400 <      <report styledir="${stylesheet.dir}"
513 <                format="${junit.report.format}"
514 <                 todir="${build.reports.dir}"
400 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
401        />
402      </junitreport>
403  
# Line 561 | Line 447
447    </target>
448  
449  
450 +  <!-- Various demos and test programs -->
451 +
452 +
453 +  <target name="loops" depends="init, configure-compiler"
454 +          description="Benchmark from Doug Lea's AQS paper">
455 +
456 +    <mkdir dir="${build.loops.dir}"/>
457  
458 <  <!-- Anthill targets -->
458 >    <javac srcdir="${loops.src.dir}"
459 >          destdir="${build.loops.dir}"
460 >            debug="${build.debug}"
461 >       debuglevel="${build.debuglevel}"
462 >      deprecation="${build.deprecation}"
463 >           source="${build.sourcelevel}"
464 >             fork="true">
465  
466 <  <target name="anthill-build">
466 >      <compilerarg line="${build.args}"/>
467 >      <classpath refid="loops.classpath"/>
468 >      <compilerarg value="-XDignore.symbol.file=true"/>
469  
470 <    <!-- Override this in user.properties -->
570 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
470 >    </javac>
471  
472 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
473 <      <arg value="-Xmx256000000"/>
474 <      <!-- classpath of new JVM -->
575 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
576 <      <!-- location of Ant home directory -->
577 <      <arg value="-Dant.home=${ant.home}"/>
578 <      <!-- the Ant main class -->
579 <      <arg value="org.apache.tools.ant.Main"/>
580 <      <!-- The build file -->
581 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
582 <      <!-- the target to build on the new Ant instance -->
583 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
584 <      <arg value="do-anthill-build"/>
585 <    </exec>
586 <  </target>
587 <
588 <  <target name="do-anthill-build"
589 <          depends="jar, test, docs, dist-docs"/>
590 <
591 <  <target name="anthill-publish">
592 <
593 <    <copy todir="${deployDir}/docs/private">
594 <      <fileset dir="${build.javadocs.dir}"/>
595 <    </copy>
596 <
597 <    <copy todir="${deployDir}/docs/public">
598 <      <fileset dir="${dist.javadocs.dir}"/>
599 <    </copy>
600 <
601 <    <copy tofile="${deployDir}/index.html"
602 <          file="${basedir}/etc/anthill-index.html"/>
603 <
604 <    <copy todir="${deployDir}/notes">
605 <      <fileset dir="${basedir}/etc/notes"/>
606 <    </copy>
472 >    <java classname="ALoops" fork="true">
473 >      <classpath refid="loops.classpath"/>
474 >    </java>
475  
476    </target>
477  
478  
479 <
612 <  <!-- Various demos and test programs -->
479 >  <!-- jsr166x -->
480  
481  
482 <  <target name="sample" depends="init, configure-compiler"
483 <          description="Standalone demo program">
482 >  <target name="jsr166xcompile"
483 >          depends="init, configure-compiler"
484 >          description="Compiles jsr166x sources">
485  
486 <    <mkdir dir="${build.testcases.dir}"/>
486 >    <mkdir dir="${build.jsr166x.dir}"/>
487  
488 <    <javac srcdir="${test.src.dir}"
489 <          destdir="${build.testcases.dir}"
488 >    <javac srcdir="${jsr166xsrc.dir}"
489 >          destdir="${build.jsr166x.dir}"
490              debug="${build.debug}"
491         debuglevel="${build.debuglevel}"
492        deprecation="${build.deprecation}"
493             source="${build.sourcelevel}"
494               fork="true">
495  
496 <      <include name="jsr166/test/Sample.java"/>
496 >      <include name="**/*.java"/>
497 >      <compilerarg line="${build.args}"/>
498 >      <compilerarg value="-XDignore.symbol.file=true"/>
499  
500      </javac>
501  
502 <    <copy todir="${build.testcases.dir}">
633 <      <fileset dir="${test.src.dir}">
634 <        <include name="**/*.properties"/>
635 <      </fileset>
636 <    </copy>
502 >  </target>
503  
504  
505 <    <java classname="jsr166.test.Sample" fork="true">
506 <      <classpath refid="test.classpath"/>
507 <      <!-- <jvmarg value="-ea"/> -->
508 <      <!-- <jvmarg value="-server"/> -->
509 <      <!-- <arg value="1000"/> -->
510 <    </java>
505 >
506 >  <target name="jsr166xjar"
507 >          depends="jsr166xcompile"
508 >          description="Builds library jar from compiled sources">
509 >
510 >    <mkdir dir="${build.jsr166xlib.dir}"/>
511 >
512 >    <jar destfile="${jsr166xproduct.jar}">
513 >      <fileset dir="${build.jsr166x.dir}"/>
514 >    </jar>
515 >
516    </target>
517  
518  
648  <target name="loops" depends="init, configure-compiler"
649          description="Benchmark from Doug Lea's AQS paper">
519  
520 <    <mkdir dir="${build.loops.dir}"/>
520 >  <target name="jsr166xdocs"
521 >          description="Builds javadocs with custom tags to build folder">
522  
523 <    <javac srcdir="${loops.src.dir}"
524 <          destdir="${build.loops.dir}"
655 <            debug="${build.debug}"
656 <       debuglevel="${build.debuglevel}"
657 <      deprecation="${build.deprecation}"
658 <           source="${build.sourcelevel}"
659 <             fork="true">
523 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
524 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
525  
526 <      <compilerarg line="${build.args}"/>
527 <      <classpath refid="loops.classpath"/>
526 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
527 >             packagenames="jsr166x"
528 >             link="${jdkapidocs.url}"
529 >             source="${build.sourcelevel}"
530 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
531 >             additionalparam="-XDignore.symbol.file=true" />
532  
533 <    </javac>
533 >  </target>
534  
535 <    <java classname="ALoops" fork="true">
536 <      <classpath refid="loops.classpath"/>
537 <    </java>
535 >
536 >  <target name="jsr166xdist"
537 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
538 >          description="Puts all distributable products in single hierarchy"/>
539 >
540 >
541 >
542 >  <target name="jsr166xclean"
543 >          description="Removes all build products">
544 >
545 >    <delete dir="${build.jsr166x.dir}"/>
546 >    <delete dir="${build.jsr166xlib.dir}"/>
547 >
548 >  </target>
549 >
550 >
551 >
552 >  <target name="jsr166xdist-clean"
553 >          description="Removes all build and distribution products">
554 >
555 >  </target>
556 >
557 >
558 >
559 >  <target name="jsr166xdist-docs"
560 >          description="Builds javadocs without custom tags to dist folder">
561 >
562 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
563 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
564 >
565 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
566 >             packagenames="jsr166x"
567 >             link="${jdkapidocs.url}"
568 >             source="${build.sourcelevel}"
569 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
570 >             additionalparam="-XDignore.symbol.file=true" />
571  
572    </target>
573  
574 +  <target name="jsr166xdist-jar"
575 +          depends="jsr166xclean, jsr166xjar">
576  
577 <  <target name="compile-j1" depends="init, configure-compiler">
577 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
578  
579 <    <mkdir dir="${build.j1.dir}"/>
579 >  </target>
580 >
581 >  <!-- jsr166y -->
582 >
583 >
584 >  <target name="jsr166ycompile"
585 >          depends="init, configure-compiler"
586 >          description="Compiles jsr166y sources">
587  
588 <    <javac srcdir="${j1.src.dir}"
589 <          destdir="${build.j1.dir}"
588 >    <mkdir dir="${build.jsr166y.dir}"/>
589 >
590 >    <javac srcdir="${jsr166ysrc.dir}"
591 >          destdir="${build.jsr166y.dir}"
592              debug="${build.debug}"
593         debuglevel="${build.debuglevel}"
594        deprecation="${build.deprecation}"
595 <           source="${build.sourcelevel}" >
595 >           source="${build.sourcelevel}"
596 >             fork="true">
597  
598        <include name="**/*.java"/>
685      <exclude name="**/dijkstra/**"/>
686
599        <compilerarg line="${build.args}"/>
600 <      <classpath refid="j1.classpath"/>
600 >      <compilerarg value="-XDignore.symbol.file=true"/>
601 >      <compilerarg value="${bootclasspath.args}"/>
602 >
603 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
604  
605      </javac>
606  
607    </target>
608  
609  
695  <target name="sw" depends="compile-j1"
696          description="Runs the SwingWorker demo">
610  
611 <    <!--
612 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
613 <      <classpath refid="j1.classpath"/>
701 <    </java>
702 <    -->
611 >  <target name="jsr166yjar"
612 >          depends="jsr166ycompile"
613 >          description="Builds library jar from compiled sources">
614  
615 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
615 >    <mkdir dir="${build.jsr166ylib.dir}"/>
616  
617 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
618 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
619 <    </exec>
617 >    <jar destfile="${jsr166yproduct.jar}" index="true">
618 >      <fileset dir="${build.jsr166y.dir}"/>
619 >    </jar>
620  
621    </target>
622  
712  <target name="j1" depends="compile-j1"
713          description="Runs a standalone JavaOne program">
623  
715    <java classname="jsr166.bbuf.BoundedBufferDemo" fork="true">
716      <classpath refid="j1.classpath"/>
717      <jvmarg value="-server"/>
718      <arg value="http://www.perl.com/"/>
719      <arg value="1"/>
720    </java>
624  
625 <  </target>
625 >  <target name="jsr166ydocs"
626 >          description="Builds javadocs with custom tags to build folder">
627  
628 +    <delete dir="${build.jsr166yjavadocs.dir}"/>
629 +    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
630  
631 <  <target name="test-j1" depends="compile-j1"
632 <          description="Runs testcases from the JavaOne source directories">
631 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
632 >             packagenames="jsr166y"
633 >             link="${jdkapidocs.url}"
634 >             source="${build.sourcelevel}"
635 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
636 >             additionalparam="-XDignore.symbol.file=true" />
637  
638 <    <junit printsummary="true"
729 <             showoutput="true"
730 <          errorProperty="junit.failed"
731 <        failureProperty="junit.failed"
732 <                    dir="${build.j1.dir}"
733 <                   fork="true">
638 >  </target>
639  
735      <!-- <jvmarg value="-server"/> -->
736      <classpath refid="j1.classpath"/>
737      <formatter type="xml"/>
640  
641 <      <batchtest todir="${build.j1.dir}">
642 <        <fileset dir="${j1.src.dir}">
643 <          <include name="**/*Test.java"/>
742 <        </fileset>
743 <      </batchtest>
641 >  <target name="jsr166ydist"
642 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
643 >          description="Puts all distributable products in single hierarchy"/>
644  
745    </junit>
645  
747    <available property="junit.report.format"
748                  value="frames"
749              classname="org.apache.xalan.lib.Redirect"/>
750    <property name="junit.report.format" value="noframes"/>
646  
647 <    <junitreport todir="${build.j1.dir}">
648 <      <fileset dir="${build.j1.dir}">
754 <        <include name="TEST-*.xml"/>
755 <      </fileset>
756 <      <report styledir="${stylesheet.dir}"
757 <                format="${junit.report.format}"
758 <                 todir="${build.j1.dir}"
759 <      />
760 <    </junitreport>
647 >  <target name="jsr166yclean"
648 >          description="Removes all build products">
649  
650 <    <fail message="Test Cases Failed" if="junit.failed"/>
650 >    <delete dir="${build.jsr166y.dir}"/>
651 >    <delete dir="${build.jsr166ylib.dir}"/>
652  
653    </target>
654  
655  
656  
657 <  <!-- C++ and JNI definitions and demos -->
657 >  <target name="jsr166ydist-clean"
658 >          description="Removes all build and distribution products">
659  
660 <  <target name="configure-cpp">
660 >  </target>
661  
662 <    <!-- Define tasks and types -->
662 >  <target name="jsr166ydist-docs"
663 >          description="Builds javadocs without custom tags to dist folder">
664  
665 <    <path id="cpptasks.path">
666 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
776 <    </path>
777 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
778 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
665 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
666 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
667  
668 <    <!-- Set platform property for JNI includes -->
669 <
670 <    <condition property="platform" value="linux">
671 <      <os name="Linux"/>
672 <    </condition>
673 <    <condition property="platform" value="win32">
786 <      <os family="windows"/>
787 <    </condition>
788 <    <condition property="platform" value="solaris">
789 <      <os name="SunOS"/>
790 <    </condition>
668 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
669 >             packagenames="jsr166y"
670 >             link="${jdkapidocs.url}"
671 >             source="${build.sourcelevel}"
672 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
673 >             additionalparam="-XDignore.symbol.file=true" />
674  
675    </target>
676  
677 +  <target name="jsr166ydist-jar"
678 +          depends="jsr166yclean, jsr166yjar">
679  
680 <  <target name="cppdemo" depends="configure-cpp">
796 <
797 <    <mkdir dir="${build.dir}"/>
680 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
681  
682 <    <cc multithreaded="true"
800 <                 name="g++"
801 <               objdir="${build.dir}"
802 <              outfile="${build.dir}/CppDemo">
803 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
804 <      <libset libs="stdc++"/>
805 <    </cc>
682 >  </target>
683  
807    <exec executable="${build.dir}/CppDemo">
808      <arg line="count in word frequency of word in command line count"/>
809    </exec>
684  
685 <  </target>
685 >  <!-- extra166y -->
686  
687  
688 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
688 >  <target name="extra166ycompile"
689 >          depends="init, configure-compiler, jsr166ycompile"
690 >          description="Compiles extra166y sources">
691  
692 <    <mkdir dir="${build.testcases.dir}"/>
692 >    <mkdir dir="${build.extra166y.dir}"/>
693  
694 <    <javac srcdir="${test.src.dir}"
695 <          destdir="${build.testcases.dir}"
694 >    <javac srcdir="${extra166ysrc.dir}"
695 >          destdir="${build.extra166y.dir}"
696              debug="${build.debug}"
697 +            classpath="${jsr166yproduct.jar}"
698         debuglevel="${build.debuglevel}"
699        deprecation="${build.deprecation}"
700             source="${build.sourcelevel}"
701               fork="true">
702 <      <compilerarg value="${bootclasspath.args}"/>
702 >
703 >      <include name="**/*.java"/>
704        <compilerarg line="${build.args}"/>
705 <      <classpath refid="test.classpath"/>
706 <      <include name="JniDemo.java"/>
705 >      <compilerarg value="-XDignore.symbol.file=true"/>
706 >      <compilerarg value="${bootclasspath.args}"/>
707 >
708 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
709 >
710      </javac>
711  
712 <    <javah destdir="${build.testcases.dir}"
713 <      classpathref="test.classpath">
714 <      <class name="JniDemo"/>
715 <    </javah>
716 <
717 <    <cc multithreaded="true"
718 <                 name="g++"
719 <               objdir="${build.dir}"
720 <              outfile="${build.dir}/JniDemo"
721 <              outtype="shared">
722 <
723 <      <compiler>
724 <        <defineset>
725 <          <define name="__int64" value="long long"/>
726 <        </defineset>
727 <        <includepath location="${java.home}/../include"/>
728 <        <includepath location="${java.home}/../include/${platform}"/>
729 <        <compilerarg value="-mno-cygwin"/>
730 <      </compiler>
731 <
732 <      <linker>
733 <        <linkerarg value="--add-stdcall-alias"/>
734 <      </linker>
735 <
736 <      <includepath location="${build.testcases.dir}"/>
737 <
738 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
739 <
740 <      <libset libs="stdc++"/>
741 <
861 <    </cc>
862 <
863 <    <!-- Necessary if windows, harmless if not -->
864 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
865 <
866 <    <java classname="JniDemo" fork="true">
867 <      <!-- Watch out: path separator hardwired to semicolon here! -->
868 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
869 <      <classpath refid="test.classpath"/>
870 <      <arg line="count in word frequency of word in command line count"/>
871 <    </java>
712 >  </target>
713 >
714 >
715 >
716 >  <target name="extra166yjar"
717 >          depends="extra166ycompile"
718 >          description="Builds library jar from compiled sources">
719 >
720 >    <mkdir dir="${build.extra166ylib.dir}"/>
721 >
722 >    <jar destfile="${extra166yproduct.jar}" index="true">
723 >      <fileset dir="${build.extra166y.dir}"/>
724 >    </jar>
725 >
726 >  </target>
727 >
728 >
729 >
730 >  <target name="extra166ydocs"
731 >          description="Builds javadocs with custom tags to build folder">
732 >
733 >    <delete dir="${build.extra166yjavadocs.dir}"/>
734 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
735 >
736 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
737 >             packagenames="extra166y"
738 >             link="${jdkapidocs.url}"
739 >             source="${build.sourcelevel}"
740 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
741 >             additionalparam="-XDignore.symbol.file=true" />
742  
743    </target>
744  
745  
746 +  <target name="extra166ydist"
747 +          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
748 +          description="Puts all distributable products in single hierarchy"/>
749  
877  <!-- Backward compatibility, work in progress (some files not checked in) -->
750  
751  
752 +  <target name="extra166yclean"
753 +          description="Removes all build products">
754  
755 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
756 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
883 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
884 <  <property name="pretiger.sourcelevel" value="1.4"/>
755 >    <delete dir="${build.extra166y.dir}"/>
756 >    <delete dir="${build.extra166ylib.dir}"/>
757  
758 <  <target name="defang"
887 <       depends="init"
888 <   description="Generates pre-Tiger compatible source">
758 >  </target>
759  
890    <delete dir="${pretiger.src.dir}"/>
891    <mkdir dir="${pretiger.src.dir}"/>
760  
761 <    <exec executable="perl">
762 <      <arg file="etc/defang.pl"/>
763 <      <!-- <arg value="-v"/> -->
896 <      <arg value="-s"/> <arg file="${src.dir}"/>
897 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
898 <    </exec>
761 >
762 >  <target name="extra166ydist-clean"
763 >          description="Removes all build and distribution products">
764  
765    </target>
766  
767 <  <target name="compile-pretiger"
768 <          depends="init, configure-compiler, defang"
769 <          description="Compiles pre-Tiger sources to build folder">
767 >  <target name="extra166ydist-docs"
768 >          description="Builds javadocs without custom tags to dist folder">
769 >
770 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
771 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
772  
773 <    <mkdir dir="${build.pretiger.dir}"/>
773 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
774 >             packagenames="extra166y"
775 >             link="${jdkapidocs.url}"
776 >             source="${build.sourcelevel}"
777 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
778 >             additionalparam="-XDignore.symbol.file=true" />
779 >
780 >  </target>
781  
782 <    <javac srcdir="${pretiger.src.dir}"
783 <          destdir="${build.pretiger.dir}"
782 >  <target name="extra166ydist-jar"
783 >          depends="extra166yclean, extra166yjar">
784 >
785 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
786 >
787 >  </target>
788 >
789 >  <!-- jsr166e -->
790 >
791 >
792 >  <target name="jsr166ecompile"
793 >          depends="init, configure-compiler"
794 >          description="Compiles jsr166e sources">
795 >
796 >    <mkdir dir="${build.jsr166e.dir}"/>
797 >
798 >    <javac srcdir="${jsr166esrc.dir}"
799 >          destdir="${build.jsr166e.dir}"
800              debug="${build.debug}"
801         debuglevel="${build.debuglevel}"
802        deprecation="${build.deprecation}"
803 <           source="${pretiger.sourcelevel}"
803 >           source="1.7"
804               fork="true">
805  
806 +      <include name="**/*.java"/>
807        <compilerarg line="${build.args}"/>
808 <      <exclude name="**/Thread.java"/>
808 >      <compilerarg value="-XDignore.symbol.file=true"/>
809 >      <compilerarg value="${bootclasspath.args}"/>
810 >
811 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
812  
813      </javac>
814  
815    </target>
816  
923  <target name="pretiger" depends="compile-pretiger">
817  
925    <mkdir dir="${build.lib.dir}"/>
818  
819 <    <jar destfile="${pretiger.jar}">
820 <      <fileset dir="${build.pretiger.dir}">
821 <      </fileset>
819 >  <target name="jsr166ejar"
820 >          depends="jsr166ecompile"
821 >          description="Builds library jar from compiled sources">
822 >
823 >    <mkdir dir="${build.jsr166elib.dir}"/>
824 >
825 >    <jar destfile="${jsr166eproduct.jar}" index="true">
826 >      <fileset dir="${build.jsr166e.dir}"/>
827      </jar>
828  
829    </target>
830  
831 +
832 +
833 +  <target name="jsr166edocs"
834 +          description="Builds javadocs with custom tags to build folder">
835 +
836 +    <delete dir="${build.jsr166ejavadocs.dir}"/>
837 +    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
838 +
839 +    <javadoc destdir="${build.jsr166ejavadocs.dir}"
840 +             packagenames="jsr166e,jsr166e.extra"
841 +             link="${jdkapidocs.url}"
842 +             source="1.7"
843 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
844 +             additionalparam="-XDignore.symbol.file=true" />
845 +
846 +  </target>
847 +
848 +
849 +  <target name="jsr166edist"
850 +          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
851 +          description="Puts all distributable products in single hierarchy"/>
852 +
853 +
854 +
855 +  <target name="jsr166eclean"
856 +          description="Removes all build products">
857 +
858 +    <delete dir="${build.jsr166e.dir}"/>
859 +    <delete dir="${build.jsr166elib.dir}"/>
860 +
861 +  </target>
862 +
863 +
864 +
865 +  <target name="jsr166edist-clean"
866 +          description="Removes all build and distribution products">
867 +
868 +  </target>
869 +
870 +  <target name="jsr166edist-docs"
871 +          description="Builds javadocs without custom tags to dist folder">
872 +
873 +    <delete dir="${dist.jsr166ejavadocs.dir}"/>
874 +    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
875 +
876 +    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
877 +             packagenames="jsr166e,jsr166e.extra"
878 +             link="${jdkapidocs.url}"
879 +             source="1.7"
880 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
881 +             additionalparam="-XDignore.symbol.file=true" />
882 +
883 +  </target>
884 +
885 +  <target name="jsr166edist-jar"
886 +          depends="jsr166eclean, jsr166ejar">
887 +
888 +    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
889 +
890 +  </target>
891 +
892   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines