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.68 by jsr166, Mon Jun 14 17:22:09 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 101 | Line 126
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 136 | 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"
141 <            overview="${src.dir}/intro.html"
142 <              source="${build.sourcelevel}">
143 <
144 <      <tag name="revised" description="Last revised:"/>
145 <      <tag name="spec"    description="Specified by:"/>
169 >    <!-- the packagenames="none" hack below prevents scanning the -->
170 >    <!-- sourcepath for packages -->
171  
172 <      <packageset dir="${src.dir}"/>
173 <
174 <    </javadoc>
175 <
176 <  </target>
177 <
178 <
179 <
180 <  <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"
163 <         docletpath="${lib.dir}/doccheck.jar"
164 <            destdir="${build.doccheck.dir}">
165 <      <packageset dir="${build.dc-filter.dir}"/>
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  
168    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
169
170  </target>
171
172
173
174  <target name="checkstyle"
175          depends="filter-src"
176          description="Reports on style errors in Java source (verbose, mostly chaff)">
177
178    <taskdef resource="checkstyletask.properties"
179            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
180
181    <mkdir dir="${build.checkstyle.dir}"/>
182
183    <checkstyle config="etc/checkstyle/sun_checks.xml"
184       failOnViolation="false">
185      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
186      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
187    </checkstyle>
188
189    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
190          out="${build.checkstyle.dir}/checkstyle-report.html"
191        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
192
183    </target>
184  
185  
# Line 199 | Line 189
189            description="Puts all distributable products in single hierarchy"/>
190  
191  
202
192    <target name="release"
193            depends="dist"
194            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 246 | 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"
251 <            overview="${src.dir}/intro.html"
252 <              source="${build.sourcelevel}">
253 <
254 <      <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 280 | Line 274
274    </target>
275  
276  
283  <target name="compile-ant-filter"
284          depends="init">
285
286    <mkdir dir="${build.ant.dir}"/>
287
288    <javac srcdir="${ant.src.dir}"
289          destdir="${build.ant.dir}"
290           source="1.4"/>
291
292  </target>
293
294
295  <target name="filter-src"
296          depends="compile-ant-filter">
297
298    <mkdir dir="${build.filter.src.dir}"/>
299
300    <copy todir="${build.filter.src.dir}">
301      <fileset dir="${src.dir}">
302        <include name="**/*.html"/>
303      </fileset>
304    </copy>
305
306    <copy todir="${build.filter.src.dir}">
307      <fileset dir="${src.dir}">
308        <exclude name="**/*.html"/>
309        <!-- Files excluded from dist-docs -->
310        <exclude name="java/util/Random.*"/>
311        <exclude name="sun/misc/Unsafe.*"/>
312      </fileset>
313      <!--
314      <filterchain>
315      -->
316
317        <!--
318         # This filter gets rid of angle-bracketed type parameters
319         # so that javadoc can run on the result. The following
320         # heuristic seems to work:
321         #
322         # For all lines not starting with space(s)-asterisk-space(s),
323         #   replace <something> with a space, where there may be more
324         #   than one right angle bracket at the end, and "something"
325         #   must not contain parens or pipes. (This may need some
326         #   tweaking.)
327         -->
328
329        <!--
330        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
331                      classpath="${build.ant.dir}">
332          <param name="notmatching" value="^\s+\*\s.*$"/>
333          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
334          <param name="replacement" value=" "/>
335        </filterreader>
336        -->
337
338      <!--
339      </filterchain>
340      -->
341    </copy>
342
343  </target>
344
345
346  <target name="filter-doccheck"
347          depends="filter-src">
348
349    <mkdir dir="${build.dc-filter.dir}"/>
350
351    <copy todir="${build.dc-filter.dir}">
352      <fileset dir="${build.filter.src.dir}">
353        <include name="**/*.html"/>
354      </fileset>
355    </copy>
356
357    <property name="generic.declarations"
358             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 {}"
359    />
360
361    <copy todir="${build.dc-filter.dir}">
362      <fileset dir="${build.filter.src.dir}">
363        <exclude name="**/*.html"/>
364      </fileset>
365      <filterchain>
366        <!--
367         # These two filters try to make the source look like
368         # something that doccheck can process. The first removes
369         # -source 1.4 assertions and the second adds in a bunch
370         # of single letter public nested marker interfaces so that
371         # the generic type parameters are recognized.
372         -->
373
374        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
375                      classpath="${build.ant.dir}">
376          <param name="matching"    value="^\s*assert[\s ].*$"/>
377          <param name="pattern"     value="assert"/>
378          <param name="replacement" value="//assert"/>
379        </filterreader>
380
381        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
382                      classpath="${build.ant.dir}">
383          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
384          <param name="pattern"     value="$"/>
385          <param name="replacement" value=" ${generic.declarations}"/>
386        </filterreader>
387
388      </filterchain>
389    </copy>
390
391  </target>
392
393
277    <target name="compile-tests"
278            depends="jar">
279  
# Line 406 | 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 423 | 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 439 | 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 511 | Line 397
397        <fileset dir="${build.reports.dir}">
398          <include name="TEST-*.xml"/>
399        </fileset>
400 <      <report styledir="${stylesheet.dir}"
515 <                format="${junit.report.format}"
516 <                 todir="${build.reports.dir}"
400 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
401        />
402      </junitreport>
403  
# Line 563 | Line 447
447    </target>
448  
449  
566
567  <!-- Anthill targets -->
568
569  <target name="anthill-build">
570
571    <!-- Override this in user.properties -->
572    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
573
574    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
575      <arg value="-Xmx256000000"/>
576      <!-- classpath of new JVM -->
577      <arg value="-classpath"/> <arg path="${java.class.path}"/>
578      <!-- location of Ant home directory -->
579      <arg value="-Dant.home=${ant.home}"/>
580      <!-- the Ant main class -->
581      <arg value="org.apache.tools.ant.Main"/>
582      <!-- The build file -->
583      <arg value="-buildfile"/>  <arg value="build.xml"/>
584      <!-- the target to build on the new Ant instance -->
585      <arg value="-DJAVA_HOME=${tiger.home}"/>
586      <arg value="do-anthill-build"/>
587    </exec>
588  </target>
589
590  <target name="do-anthill-build"
591          depends="jar, test, docs, dist-docs"/>
592
593  <target name="anthill-publish">
594
595    <copy todir="${deployDir}/docs/private">
596      <fileset dir="${build.javadocs.dir}"/>
597    </copy>
598
599    <copy todir="${deployDir}/docs/public">
600      <fileset dir="${dist.javadocs.dir}"/>
601    </copy>
602
603    <copy tofile="${deployDir}/index.html"
604          file="${basedir}/etc/anthill-index.html"/>
605
606    <copy todir="${deployDir}/notes">
607      <fileset dir="${basedir}/etc/notes"/>
608    </copy>
609
610  </target>
611
612
613
450    <!-- Various demos and test programs -->
451  
452  
453 <  <target name="sample" depends="init, configure-compiler"
454 <          description="Standalone demo program">
453 >  <target name="loops" depends="init, configure-compiler"
454 >          description="Benchmark from Doug Lea's AQS paper">
455  
456 <    <mkdir dir="${build.testcases.dir}"/>
456 >    <mkdir dir="${build.loops.dir}"/>
457  
458 <    <javac srcdir="${test.src.dir}"
459 <          destdir="${build.testcases.dir}"
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 <      <include name="jsr166/test/Sample.java"/>
466 >      <compilerarg line="${build.args}"/>
467 >      <classpath refid="loops.classpath"/>
468 >      <compilerarg value="-XDignore.symbol.file=true"/>
469  
470      </javac>
471  
472 <    <copy todir="${build.testcases.dir}">
473 <      <fileset dir="${test.src.dir}">
636 <        <include name="**/*.properties"/>
637 <      </fileset>
638 <    </copy>
639 <
640 <
641 <    <java classname="jsr166.test.Sample" fork="true">
642 <      <classpath refid="test.classpath"/>
643 <      <!-- <jvmarg value="-ea"/> -->
644 <      <!-- <jvmarg value="-server"/> -->
645 <      <!-- <arg value="1000"/> -->
472 >    <java classname="ALoops" fork="true">
473 >      <classpath refid="loops.classpath"/>
474      </java>
475 +
476    </target>
477  
478  
479 <  <target name="loops" depends="init, configure-compiler"
651 <          description="Benchmark from Doug Lea's AQS paper">
479 >  <!-- jsr166x -->
480  
653    <mkdir dir="${build.loops.dir}"/>
481  
482 <    <javac srcdir="${loops.src.dir}"
483 <          destdir="${build.loops.dir}"
482 >  <target name="jsr166xcompile"
483 >          depends="init, configure-compiler"
484 >          description="Compiles jsr166x sources">
485 >
486 >    <mkdir dir="${build.jsr166x.dir}"/>
487 >
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="**/*.java"/>
497        <compilerarg line="${build.args}"/>
498 <      <classpath refid="loops.classpath"/>
498 >      <compilerarg value="-XDignore.symbol.file=true"/>
499  
500      </javac>
501  
502 <    <java classname="ALoops" fork="true">
503 <      <classpath refid="loops.classpath"/>
504 <    </java>
502 >  </target>
503 >
504 >
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  
675  <target name="compile-j1" depends="init, configure-compiler">
519  
520 <    <mkdir dir="${build.j1.dir}"/>
520 >  <target name="jsr166xdocs"
521 >          description="Builds javadocs with custom tags to build folder">
522  
523 <    <javac srcdir="${j1.src.dir}"
524 <          destdir="${build.j1.dir}"
681 <            debug="${build.debug}"
682 <       debuglevel="${build.debuglevel}"
683 <      deprecation="${build.deprecation}"
684 <           source="${build.sourcelevel}" >
523 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
524 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
525  
526 <      <include name="**/*.java"/>
527 <      <exclude name="**/dijkstra/**"/>
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 <      <compilerarg line="${build.args}"/>
690 <      <classpath refid="j1.classpath"/>
533 >  </target>
534  
535 <    </javac>
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  
697  <target name="sw" depends="compile-j1"
698          description="Runs the SwingWorker demo">
551  
552 <    <!--
553 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
554 <      <classpath refid="j1.classpath"/>
555 <    </java>
704 <    -->
552 >  <target name="jsr166xdist-clean"
553 >          description="Removes all build and distribution products">
554 >
555 >  </target>
556  
706    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
557  
558 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
559 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
560 <    </exec>
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="j1" depends="compile-j1"
575 <          description="Runs a standalone JavaOne program">
574 >  <target name="jsr166xdist-jar"
575 >          depends="jsr166xclean, jsr166xjar">
576  
577 <    <java classname="${j1.test}" fork="true">
718 <      <classpath refid="j1.classpath"/>
719 <      <jvmarg value="-client"/>
577 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
578  
579 <      <!-- WebCrawler args -->
722 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
723 <      <arg value="http://www.priorartisans.com"/>
724 <      <arg value="25"/>
579 >  </target>
580  
581 <    </java>
581 >  <!-- jsr166y -->
582 >
583 >
584 >  <target name="jsr166ycompile"
585 >          depends="init, configure-compiler"
586 >          description="Compiles jsr166y sources">
587 >
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}"
596 >             fork="true">
597 >
598 >      <include name="**/*.java"/>
599 >      <compilerarg line="${build.args}"/>
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  
731  <target name="test-j1" depends="compile-j1"
732          description="Runs testcases from the JavaOne source directories">
610  
611 <    <junit printsummary="true"
612 <             showoutput="true"
613 <          errorProperty="junit.failed"
737 <        failureProperty="junit.failed"
738 <                    dir="${build.j1.dir}"
739 <                   fork="true">
611 >  <target name="jsr166yjar"
612 >          depends="jsr166ycompile"
613 >          description="Builds library jar from compiled sources">
614  
615 <      <!-- <jvmarg value="-server"/> -->
742 <      <classpath refid="j1.classpath"/>
743 <      <formatter type="xml"/>
615 >    <mkdir dir="${build.jsr166ylib.dir}"/>
616  
617 <      <batchtest todir="${build.j1.dir}">
618 <        <fileset dir="${j1.src.dir}">
619 <          <include name="**/*Test.java"/>
748 <        </fileset>
749 <      </batchtest>
617 >    <jar destfile="${jsr166yproduct.jar}" index="true">
618 >      <fileset dir="${build.jsr166y.dir}"/>
619 >    </jar>
620  
621 <    </junit>
621 >  </target>
622  
753    <available property="junit.report.format"
754                  value="frames"
755              classname="org.apache.xalan.lib.Redirect"/>
756    <property name="junit.report.format" value="noframes"/>
623  
758    <junitreport todir="${build.j1.dir}">
759      <fileset dir="${build.j1.dir}">
760        <include name="TEST-*.xml"/>
761      </fileset>
762      <report styledir="${stylesheet.dir}"
763                format="${junit.report.format}"
764                 todir="${build.j1.dir}"
765      />
766    </junitreport>
624  
625 <    <fail message="Test Cases Failed" if="junit.failed"/>
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 >    <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    </target>
639  
640  
641 +  <target name="jsr166ydist"
642 +          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
643 +          description="Puts all distributable products in single hierarchy"/>
644  
774  <!-- C++ and JNI definitions and demos -->
645  
776  <target name="configure-cpp">
646  
647 <    <!-- Define tasks and types -->
647 >  <target name="jsr166yclean"
648 >          description="Removes all build products">
649  
650 <    <path id="cpptasks.path">
651 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
782 <    </path>
783 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
784 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
650 >    <delete dir="${build.jsr166y.dir}"/>
651 >    <delete dir="${build.jsr166ylib.dir}"/>
652  
653 <    <!-- Set platform property for JNI includes -->
653 >  </target>
654  
655 <    <condition property="platform" value="linux">
656 <      <os name="Linux"/>
657 <    </condition>
658 <    <condition property="platform" value="win32">
792 <      <os family="windows"/>
793 <    </condition>
794 <    <condition property="platform" value="solaris">
795 <      <os name="SunOS"/>
796 <    </condition>
655 >
656 >
657 >  <target name="jsr166ydist-clean"
658 >          description="Removes all build and distribution products">
659  
660    </target>
661  
662 +  <target name="jsr166ydist-docs"
663 +          description="Builds javadocs without custom tags to dist folder">
664 +
665 +    <delete dir="${dist.jsr166yjavadocs.dir}"/>
666 +    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
667  
668 <  <target name="cppdemo" depends="configure-cpp">
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 <    <mkdir dir="${build.dir}"/>
675 >  </target>
676  
677 <    <cc multithreaded="true"
678 <                 name="g++"
807 <               objdir="${build.dir}"
808 <              outfile="${build.dir}/CppDemo">
809 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
810 <      <libset libs="stdc++"/>
811 <    </cc>
677 >  <target name="jsr166ydist-jar"
678 >          depends="jsr166yclean, jsr166yjar">
679  
680 <    <exec executable="${build.dir}/CppDemo">
814 <      <arg line="count in word frequency of word in command line count"/>
815 <    </exec>
680 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
681  
682    </target>
683  
684  
685 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
685 >  <!-- extra166y -->
686  
822    <mkdir dir="${build.testcases.dir}"/>
687  
688 <    <javac srcdir="${test.src.dir}"
689 <          destdir="${build.testcases.dir}"
688 >  <target name="extra166ycompile"
689 >          depends="init, configure-compiler, jsr166ycompile"
690 >          description="Compiles extra166y sources">
691 >
692 >    <mkdir dir="${build.extra166y.dir}"/>
693 >
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 <
867 <    </cc>
868 <
869 <    <!-- Necessary if windows, harmless if not -->
870 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
871 <
872 <    <java classname="JniDemo" fork="true">
873 <      <!-- Watch out: path separator hardwired to semicolon here! -->
874 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
875 <      <classpath refid="test.classpath"/>
876 <      <arg line="count in word frequency of word in command line count"/>
877 <    </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  
883  <!-- 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"/>
889 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
890 <  <property name="pretiger.sourcelevel" value="1.4"/>
755 >    <delete dir="${build.extra166y.dir}"/>
756 >    <delete dir="${build.extra166ylib.dir}"/>
757  
758 <  <target name="defang"
893 <       depends="init"
894 <   description="Generates pre-Tiger compatible source">
758 >  </target>
759  
896    <delete dir="${pretiger.src.dir}"/>
897    <mkdir dir="${pretiger.src.dir}"/>
760  
761 <    <exec executable="perl">
762 <      <arg file="etc/defang.pl"/>
763 <      <!-- <arg value="-v"/> -->
902 <      <arg value="-s"/> <arg file="${src.dir}"/>
903 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
904 <    </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  
929  <target name="pretiger" depends="compile-pretiger">
817  
931    <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