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.69 by jsr166, Fri Jul 2 16:06:25 2004 UTC vs.
Revision 1.90 by dl, Fri Jul 15 13:21:07 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.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 <
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    <!-- Distribution locations -->
68 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
68 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
69 >  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
70 >  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
71 >  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
72 >  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
73  
74    <!-- Jar locations -->
75    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
76 +  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
77 +  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
78 +  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
79 +  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
80    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
62  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
81  
82    <!-- Bootclasspath argument -->
83    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
# Line 75 | Line 93
93      <pathelement location="${build.loops.dir}"/>
94    </path>
95  
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
96  
97    <!-- Main targets -->
98  
99 +  <target name="dists"
100 +          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
101 +          description="Builds all public jars and docs"/>
102  
103    <target name="compile"
104            depends="init, configure-compiler"
# Line 101 | Line 115
115               fork="true">
116  
117        <include name="**/*.java"/>
118 +      <compilerarg value="-XDignore.symbol.file=true"/>
119 +
120 + <!--
121        <exclude name="java/lang/**"/>
122        <compilerarg line="${build.args}"/>
123 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
124 + -->
125  
126      </javac>
127  
# Line 136 | Line 155
155      <delete dir="${build.javadocs.dir}"/>
156      <mkdir dir="${build.javadocs.dir}"/>
157  
158 <    <javadoc destdir="${build.javadocs.dir}"
159 <                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:"/>
158 >    <!-- the packagenames="none" hack below prevents scanning the -->
159 >    <!-- sourcepath for packages -->
160  
161 <      <packageset dir="${src.dir}"/>
162 <
163 <    </javadoc>
164 <
165 <  </target>
166 <
167 <
168 <
169 <  <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}"/>
161 >    <javadoc destdir="${build.javadocs.dir}"
162 >             packagenames="none"
163 >             link="http://download.oracle.com/javase/7/docs/api/"
164 >             overview="${src.dir}/intro.html"
165 >             sourcepath="${src.dir}:${jdksrc.dir}"
166 >             additionalparam="-XDignore.symbol.file=true" >
167 >      <fileset dir="${src.dir}" defaultexcludes="yes">
168 >      <include name="**/*.java"/>
169 >      </fileset>
170      </javadoc>
171  
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
172    </target>
173  
174  
# Line 199 | Line 178
178            description="Puts all distributable products in single hierarchy"/>
179  
180  
202
181    <target name="release"
182            depends="dist"
183            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 246 | Line 224
224      <delete dir="${dist.javadocs.dir}"/>
225      <mkdir dir="${dist.javadocs.dir}"/>
226  
227 <    <javadoc destdir="${dist.javadocs.dir}"
228 <                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}"/>
227 >    <!-- the packagenames="none" hack below prevents scanning the -->
228 >    <!-- sourcepath for packages -->
229  
230 +    <javadoc destdir="${dist.javadocs.dir}"
231 +             packagenames="none"
232 +             link="http://download.oracle.com/javase/7/docs/api/"
233 +             overview="${src.dir}/intro.html"
234 +             sourcepath="${src.dir}:${jdksrc.dir}"
235 +             additionalparam="-XDignore.symbol.file=true" >
236 +      <fileset dir="${src.dir}" defaultexcludes="yes">
237 +      <include name="**/*.java"/>
238 +      </fileset>
239      </javadoc>
240  
241    </target>
# Line 280 | Line 263
263    </target>
264  
265  
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
266    <target name="compile-tests"
267            depends="jar">
268  
# Line 406 | Line 278
278  
279        <compilerarg value="${bootclasspath.args}"/>
280        <compilerarg line="${build.args}"/>
281 +      <compilerarg value="-XDignore.symbol.file=true"/>
282  
283        <classpath refid="test.classpath"/>
284  
# Line 423 | Line 296
296  
297        <compilerarg value="${bootclasspath.args}"/>
298        <compilerarg line="${build.args}"/>
299 +      <compilerarg value="-XDignore.symbol.file=true"/>
300  
301        <classpath refid="test.classpath"/>
302  
# Line 439 | Line 313
313  
314        <compilerarg value="${bootclasspath.args}"/>
315        <compilerarg line="${build.args}"/>
316 +      <compilerarg value="-XDignore.symbol.file=true"/>
317  
318        <classpath refid="test.classpath"/>
319  
# Line 511 | Line 386
386        <fileset dir="${build.reports.dir}">
387          <include name="TEST-*.xml"/>
388        </fileset>
389 <      <report styledir="${stylesheet.dir}"
515 <                format="${junit.report.format}"
516 <                 todir="${build.reports.dir}"
389 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
390        />
391      </junitreport>
392  
# Line 563 | Line 436
436    </target>
437  
438  
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
439    <!-- Various demos and test programs -->
440  
441  
442 <  <target name="sample" depends="init, configure-compiler"
443 <          description="Standalone demo program">
442 >  <target name="loops" depends="init, configure-compiler"
443 >          description="Benchmark from Doug Lea's AQS paper">
444  
445 <    <mkdir dir="${build.testcases.dir}"/>
445 >    <mkdir dir="${build.loops.dir}"/>
446  
447 <    <javac srcdir="${test.src.dir}"
448 <          destdir="${build.testcases.dir}"
447 >    <javac srcdir="${loops.src.dir}"
448 >          destdir="${build.loops.dir}"
449              debug="${build.debug}"
450         debuglevel="${build.debuglevel}"
451        deprecation="${build.deprecation}"
452             source="${build.sourcelevel}"
453               fork="true">
454  
455 <      <include name="jsr166/test/Sample.java"/>
455 >      <compilerarg line="${build.args}"/>
456 >      <classpath refid="loops.classpath"/>
457 >      <compilerarg value="-XDignore.symbol.file=true"/>
458  
459      </javac>
460  
461 <    <copy todir="${build.testcases.dir}">
462 <      <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"/> -->
461 >    <java classname="ALoops" fork="true">
462 >      <classpath refid="loops.classpath"/>
463      </java>
464 +
465    </target>
466  
467  
468 <  <target name="loops" depends="init, configure-compiler"
651 <          description="Benchmark from Doug Lea's AQS paper">
468 >  <!-- jsr166x -->
469  
653    <mkdir dir="${build.loops.dir}"/>
470  
471 <    <javac srcdir="${loops.src.dir}"
472 <          destdir="${build.loops.dir}"
471 >  <target name="jsr166xcompile"
472 >          depends="init, configure-compiler"
473 >          description="Compiles jsr166x sources">
474 >
475 >    <mkdir dir="${build.jsr166x.dir}"/>
476 >
477 >    <javac srcdir="${jsr166xsrc.dir}"
478 >          destdir="${build.jsr166x.dir}"
479              debug="${build.debug}"
480         debuglevel="${build.debuglevel}"
481        deprecation="${build.deprecation}"
482             source="${build.sourcelevel}"
483               fork="true">
484  
485 +      <include name="**/*.java"/>
486        <compilerarg line="${build.args}"/>
487 <      <classpath refid="loops.classpath"/>
487 >      <compilerarg value="-XDignore.symbol.file=true"/>
488  
489      </javac>
490  
491 <    <java classname="ALoops" fork="true">
492 <      <classpath refid="loops.classpath"/>
493 <    </java>
491 >  </target>
492 >
493 >
494 >
495 >  <target name="jsr166xjar"
496 >          depends="jsr166xcompile"
497 >          description="Builds library jar from compiled sources">
498 >
499 >    <mkdir dir="${build.jsr166xlib.dir}"/>
500 >
501 >    <jar destfile="${jsr166xproduct.jar}">
502 >      <fileset dir="${build.jsr166x.dir}"/>
503 >    </jar>
504  
505    </target>
506  
507  
675  <target name="compile-j1" depends="init, configure-compiler">
508  
509 <    <mkdir dir="${build.j1.dir}"/>
509 >  <target name="jsr166xdocs"
510 >          description="Builds javadocs with custom tags to build folder">
511  
512 <    <javac srcdir="${j1.src.dir}"
513 <          destdir="${build.j1.dir}"
681 <            debug="${build.debug}"
682 <       debuglevel="${build.debuglevel}"
683 <      deprecation="${build.deprecation}"
684 <           source="${build.sourcelevel}" >
512 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
513 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
514  
515 <      <include name="**/*.java"/>
516 <      <exclude name="**/dijkstra/**"/>
515 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
516 >             packagenames="jsr166x"
517 >             link="http://download.oracle.com/javase/7/docs/api/"
518 >             source="${build.sourcelevel}"
519 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
520 >             additionalparam="-XDignore.symbol.file=true" />
521  
522 <      <compilerarg line="${build.args}"/>
690 <      <classpath refid="j1.classpath"/>
522 >  </target>
523  
524 <    </javac>
524 >
525 >  <target name="jsr166xdist"
526 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
527 >          description="Puts all distributable products in single hierarchy"/>
528 >
529 >
530 >
531 >  <target name="jsr166xclean"
532 >          description="Removes all build products">
533 >
534 >    <delete dir="${build.jsr166x.dir}"/>
535 >    <delete dir="${build.jsr166xlib.dir}"/>
536  
537    </target>
538  
539  
697  <target name="sw" depends="compile-j1"
698          description="Runs the SwingWorker demo">
540  
541 <    <!--
542 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
543 <      <classpath refid="j1.classpath"/>
544 <    </java>
704 <    -->
541 >  <target name="jsr166xdist-clean"
542 >          description="Removes all build and distribution products">
543 >
544 >  </target>
545  
706    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
546  
547 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
548 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
549 <    </exec>
547 >
548 >  <target name="jsr166xdist-docs"
549 >          description="Builds javadocs without custom tags to dist folder">
550 >
551 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
552 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
553 >
554 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
555 >             packagenames="jsr166x"
556 >             link="http://download.oracle.com/javase/7/docs/api/"
557 >             source="${build.sourcelevel}"
558 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
559 >             additionalparam="-XDignore.symbol.file=true" />
560  
561    </target>
562  
563 <  <target name="j1" depends="compile-j1"
564 <          description="Runs a standalone JavaOne program">
563 >  <target name="jsr166xdist-jar"
564 >          depends="jsr166xclean, jsr166xjar">
565  
566 <    <java classname="${j1.test}" fork="true">
718 <      <classpath refid="j1.classpath"/>
719 <      <jvmarg value="-client"/>
566 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
567  
568 <      <!-- TestPseudoRandom args -->
722 <      <arg value="2"/>
723 <      <arg value="25"/>
724 <      <arg value="100000"/>
568 >  </target>
569  
570 <      <!-- WebCrawler args -->
727 <      <!--
728 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
729 <      <arg value="http://www.priorartisans.com"/>
730 <      <arg value="25"/>
731 <      -->
570 >  <!-- jsr166y -->
571  
572 <    </java>
572 >
573 >  <target name="jsr166ycompile"
574 >          depends="init, configure-compiler"
575 >          description="Compiles jsr166y sources">
576 >
577 >    <mkdir dir="${build.jsr166y.dir}"/>
578 >
579 >    <javac srcdir="${jsr166ysrc.dir}"
580 >          destdir="${build.jsr166y.dir}"
581 >            debug="${build.debug}"
582 >       debuglevel="${build.debuglevel}"
583 >      deprecation="${build.deprecation}"
584 >           source="${build.sourcelevel}"
585 >             fork="true">
586 >
587 >      <include name="**/*.java"/>
588 >      <compilerarg line="${build.args}"/>
589 >      <compilerarg value="-XDignore.symbol.file=true"/>
590 >      <compilerarg value="${bootclasspath.args}"/>
591 >
592 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
593 >
594 >    </javac>
595  
596    </target>
597  
598  
738  <target name="test-j1" depends="compile-j1"
739          description="Runs testcases from the JavaOne source directories">
599  
600 <    <junit printsummary="true"
601 <             showoutput="true"
602 <          errorProperty="junit.failed"
744 <        failureProperty="junit.failed"
745 <                    dir="${build.j1.dir}"
746 <                   fork="true">
600 >  <target name="jsr166yjar"
601 >          depends="jsr166ycompile"
602 >          description="Builds library jar from compiled sources">
603  
604 <      <!-- <jvmarg value="-server"/> -->
749 <      <classpath refid="j1.classpath"/>
750 <      <formatter type="xml"/>
604 >    <mkdir dir="${build.jsr166ylib.dir}"/>
605  
606 <      <batchtest todir="${build.j1.dir}">
607 <        <fileset dir="${j1.src.dir}">
608 <          <include name="**/*Test.java"/>
755 <        </fileset>
756 <      </batchtest>
606 >    <jar destfile="${jsr166yproduct.jar}" index="true">
607 >      <fileset dir="${build.jsr166y.dir}"/>
608 >    </jar>
609  
610 <    </junit>
610 >  </target>
611  
760    <available property="junit.report.format"
761                  value="frames"
762              classname="org.apache.xalan.lib.Redirect"/>
763    <property name="junit.report.format" value="noframes"/>
612  
765    <junitreport todir="${build.j1.dir}">
766      <fileset dir="${build.j1.dir}">
767        <include name="TEST-*.xml"/>
768      </fileset>
769      <report styledir="${stylesheet.dir}"
770                format="${junit.report.format}"
771                 todir="${build.j1.dir}"
772      />
773    </junitreport>
613  
614 <    <fail message="Test Cases Failed" if="junit.failed"/>
614 >  <target name="jsr166ydocs"
615 >          description="Builds javadocs with custom tags to build folder">
616 >
617 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
618 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
619 >
620 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
621 >             packagenames="jsr166y"
622 >             link="http://download.oracle.com/javase/7/docs/api/"
623 >             source="${build.sourcelevel}"
624 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
625 >             additionalparam="-XDignore.symbol.file=true" />
626  
627    </target>
628  
629  
630 +  <target name="jsr166ydist"
631 +          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
632 +          description="Puts all distributable products in single hierarchy"/>
633  
781  <!-- C++ and JNI definitions and demos -->
634  
783  <target name="configure-cpp">
635  
636 <    <!-- Define tasks and types -->
636 >  <target name="jsr166yclean"
637 >          description="Removes all build products">
638  
639 <    <path id="cpptasks.path">
640 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
789 <    </path>
790 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
791 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
639 >    <delete dir="${build.jsr166y.dir}"/>
640 >    <delete dir="${build.jsr166ylib.dir}"/>
641  
642 <    <!-- Set platform property for JNI includes -->
642 >  </target>
643  
644 <    <condition property="platform" value="linux">
645 <      <os name="Linux"/>
646 <    </condition>
647 <    <condition property="platform" value="win32">
799 <      <os family="windows"/>
800 <    </condition>
801 <    <condition property="platform" value="solaris">
802 <      <os name="SunOS"/>
803 <    </condition>
644 >
645 >
646 >  <target name="jsr166ydist-clean"
647 >          description="Removes all build and distribution products">
648  
649    </target>
650  
651 +  <target name="jsr166ydist-docs"
652 +          description="Builds javadocs without custom tags to dist folder">
653 +
654 +    <delete dir="${dist.jsr166yjavadocs.dir}"/>
655 +    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
656  
657 <  <target name="cppdemo" depends="configure-cpp">
657 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
658 >             packagenames="jsr166y"
659 >             link="http://download.oracle.com/javase/7/docs/api/"
660 >             source="${build.sourcelevel}"
661 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
662 >             additionalparam="-XDignore.symbol.file=true" />
663  
664 <    <mkdir dir="${build.dir}"/>
664 >  </target>
665  
666 <    <cc multithreaded="true"
667 <                 name="g++"
814 <               objdir="${build.dir}"
815 <              outfile="${build.dir}/CppDemo">
816 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
817 <      <libset libs="stdc++"/>
818 <    </cc>
666 >  <target name="jsr166ydist-jar"
667 >          depends="jsr166yclean, jsr166yjar">
668  
669 <    <exec executable="${build.dir}/CppDemo">
821 <      <arg line="count in word frequency of word in command line count"/>
822 <    </exec>
669 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
670  
671    </target>
672  
673  
674 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
674 >  <!-- extra166y -->
675  
829    <mkdir dir="${build.testcases.dir}"/>
676  
677 <    <javac srcdir="${test.src.dir}"
678 <          destdir="${build.testcases.dir}"
677 >  <target name="extra166ycompile"
678 >          depends="init, configure-compiler, jsr166ycompile"
679 >          description="Compiles extra166y sources">
680 >
681 >    <mkdir dir="${build.extra166y.dir}"/>
682 >
683 >    <javac srcdir="${extra166ysrc.dir}"
684 >          destdir="${build.extra166y.dir}"
685              debug="${build.debug}"
686 +            classpath="${jsr166yproduct.jar}"
687         debuglevel="${build.debuglevel}"
688        deprecation="${build.deprecation}"
689             source="${build.sourcelevel}"
690               fork="true">
691 <      <compilerarg value="${bootclasspath.args}"/>
691 >
692 >      <include name="**/*.java"/>
693        <compilerarg line="${build.args}"/>
694 <      <classpath refid="test.classpath"/>
695 <      <include name="JniDemo.java"/>
694 >      <compilerarg value="-XDignore.symbol.file=true"/>
695 >      <compilerarg value="${bootclasspath.args}"/>
696 >
697 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
698 >
699      </javac>
700  
701 <    <javah destdir="${build.testcases.dir}"
702 <      classpathref="test.classpath">
703 <      <class name="JniDemo"/>
704 <    </javah>
705 <
706 <    <cc multithreaded="true"
707 <                 name="g++"
708 <               objdir="${build.dir}"
709 <              outfile="${build.dir}/JniDemo"
710 <              outtype="shared">
711 <
712 <      <compiler>
713 <        <defineset>
857 <          <define name="__int64" value="long long"/>
858 <        </defineset>
859 <        <includepath location="${java.home}/../include"/>
860 <        <includepath location="${java.home}/../include/${platform}"/>
861 <        <compilerarg value="-mno-cygwin"/>
862 <      </compiler>
863 <
864 <      <linker>
865 <        <linkerarg value="--add-stdcall-alias"/>
866 <      </linker>
867 <
868 <      <includepath location="${build.testcases.dir}"/>
869 <
870 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
871 <
872 <      <libset libs="stdc++"/>
873 <
874 <    </cc>
875 <
876 <    <!-- Necessary if windows, harmless if not -->
877 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
878 <
879 <    <java classname="JniDemo" fork="true">
880 <      <!-- Watch out: path separator hardwired to semicolon here! -->
881 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
882 <      <classpath refid="test.classpath"/>
883 <      <arg line="count in word frequency of word in command line count"/>
884 <    </java>
701 >  </target>
702 >
703 >
704 >
705 >  <target name="extra166yjar"
706 >          depends="extra166ycompile"
707 >          description="Builds library jar from compiled sources">
708 >
709 >    <mkdir dir="${build.extra166ylib.dir}"/>
710 >
711 >    <jar destfile="${extra166yproduct.jar}" index="true">
712 >      <fileset dir="${build.extra166y.dir}"/>
713 >    </jar>
714  
715    </target>
716  
717  
718  
719 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
719 >  <target name="extra166ydocs"
720 >          description="Builds javadocs with custom tags to build folder">
721 >
722 >    <delete dir="${build.extra166yjavadocs.dir}"/>
723 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
724 >
725 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
726 >             packagenames="extra166y"
727 >             link="http://download.oracle.com/javase/7/docs/api/"
728 >             source="${build.sourcelevel}"
729 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
730 >             additionalparam="-XDignore.symbol.file=true" />
731 >
732 >  </target>
733 >
734 >
735 >  <target name="extra166ydist"
736 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
737 >          description="Puts all distributable products in single hierarchy"/>
738 >
739 >
740 >
741 >  <target name="extra166yclean"
742 >          description="Removes all build products">
743 >
744 >    <delete dir="${build.extra166y.dir}"/>
745 >    <delete dir="${build.extra166ylib.dir}"/>
746 >
747 >  </target>
748 >
749 >
750  
751 +  <target name="extra166ydist-clean"
752 +          description="Removes all build and distribution products">
753  
754 +  </target>
755  
756 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
757 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
896 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
897 <  <property name="pretiger.sourcelevel" value="1.4"/>
756 >  <target name="extra166ydist-docs"
757 >          description="Builds javadocs without custom tags to dist folder">
758  
759 <  <target name="defang"
760 <       depends="init"
901 <   description="Generates pre-Tiger compatible source">
759 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
760 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
761  
762 <    <delete dir="${pretiger.src.dir}"/>
763 <    <mkdir dir="${pretiger.src.dir}"/>
762 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
763 >             packagenames="extra166y"
764 >             link="http://download.oracle.com/javase/7/docs/api/"
765 >             source="${build.sourcelevel}"
766 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
767 >             additionalparam="-XDignore.symbol.file=true" />
768 >
769 >  </target>
770  
771 <    <exec executable="perl">
772 <      <arg file="etc/defang.pl"/>
773 <      <!-- <arg value="-v"/> -->
774 <      <arg value="-s"/> <arg file="${src.dir}"/>
910 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
911 <    </exec>
771 >  <target name="extra166ydist-jar"
772 >          depends="extra166yclean, extra166yjar">
773 >
774 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
775  
776    </target>
777  
778 <  <target name="compile-pretiger"
779 <          depends="init, configure-compiler, defang"
780 <          description="Compiles pre-Tiger sources to build folder">
778 >  <!-- jsr166e -->
779 >
780 >
781 >  <target name="jsr166ecompile"
782 >          depends="init, configure-compiler"
783 >          description="Compiles jsr166e sources">
784  
785 <    <mkdir dir="${build.pretiger.dir}"/>
785 >    <mkdir dir="${build.jsr166e.dir}"/>
786  
787 <    <javac srcdir="${pretiger.src.dir}"
788 <          destdir="${build.pretiger.dir}"
787 >    <javac srcdir="${jsr166esrc.dir}"
788 >          destdir="${build.jsr166e.dir}"
789              debug="${build.debug}"
790         debuglevel="${build.debuglevel}"
791        deprecation="${build.deprecation}"
792 <           source="${pretiger.sourcelevel}"
792 >           source="1.7"
793               fork="true">
794  
795 +      <include name="**/*.java"/>
796        <compilerarg line="${build.args}"/>
797 <      <exclude name="**/Thread.java"/>
797 >      <compilerarg value="-XDignore.symbol.file=true"/>
798 >      <compilerarg value="${bootclasspath.args}"/>
799 >
800 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
801  
802      </javac>
803  
804    </target>
805  
936  <target name="pretiger" depends="compile-pretiger">
806  
938    <mkdir dir="${build.lib.dir}"/>
807  
808 <    <jar destfile="${pretiger.jar}">
809 <      <fileset dir="${build.pretiger.dir}">
810 <      </fileset>
808 >  <target name="jsr166ejar"
809 >          depends="jsr166ecompile"
810 >          description="Builds library jar from compiled sources">
811 >
812 >    <mkdir dir="${build.jsr166elib.dir}"/>
813 >
814 >    <jar destfile="${jsr166eproduct.jar}" index="true">
815 >      <fileset dir="${build.jsr166e.dir}"/>
816      </jar>
817  
818    </target>
819  
820 +
821 +
822 +  <target name="jsr166edocs"
823 +          description="Builds javadocs with custom tags to build folder">
824 +
825 +    <delete dir="${build.jsr166ejavadocs.dir}"/>
826 +    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
827 +
828 +    <javadoc destdir="${build.jsr166ejavadocs.dir}"
829 +             packagenames="jsr166e,jsr166e.extra"
830 +             link="http://download.oracle.com/javase/7/docs/api/"
831 +             source="1.7"
832 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
833 +             additionalparam="-XDignore.symbol.file=true" />
834 +
835 +  </target>
836 +
837 +
838 +  <target name="jsr166edist"
839 +          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
840 +          description="Puts all distributable products in single hierarchy"/>
841 +
842 +
843 +
844 +  <target name="jsr166eclean"
845 +          description="Removes all build products">
846 +
847 +    <delete dir="${build.jsr166e.dir}"/>
848 +    <delete dir="${build.jsr166elib.dir}"/>
849 +
850 +  </target>
851 +
852 +
853 +
854 +  <target name="jsr166edist-clean"
855 +          description="Removes all build and distribution products">
856 +
857 +  </target>
858 +
859 +  <target name="jsr166edist-docs"
860 +          description="Builds javadocs without custom tags to dist folder">
861 +
862 +    <delete dir="${dist.jsr166ejavadocs.dir}"/>
863 +    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
864 +
865 +    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
866 +             packagenames="jsr166e,jsr166e.extra"
867 +             link="http://download.oracle.com/javase/7/docs/api/"
868 +             source="1.7"
869 +             sourcepath="${topsrc.dir}:${jdksrc.dir}"
870 +             additionalparam="-XDignore.symbol.file=true" />
871 +
872 +  </target>
873 +
874 +  <target name="jsr166edist-jar"
875 +          depends="jsr166eclean, jsr166ejar">
876 +
877 +    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
878 +
879 +  </target>
880 +
881   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines