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.73 by dl, Tue Nov 8 00:13:41 2005 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"/>
43 <  <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
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"/>
50  <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"/>
54  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
55  <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"/>
69  <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 82 | Line 104
104      <pathelement location="${build.loops.dir}"/>
105    </path>
106  
85  <!-- J1 classpath -->
86  <path id="j1.classpath">
87    <pathelement location="${build.classes.dir}"/>
88    <pathelement location="${build.j1.dir}"/>
89    <pathelement location="${junit.jar}"/>
90
91    <!-- Include dl.u.c for BoundedBuffer comparison -->
92    <pathelement location="${concurrent.jar}"/>
93  </path>
94
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 111 | 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}"/>
# Line 149 | 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.5.0/docs/api"
154 <            overview="${src.dir}/intro.html"
155 <            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
156 <    >          
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"
167 <          depends="filter-doccheck"
168 <          description="Reports on javadoc style errors">
169 <
170 <    <delete dir="${build.doccheck.dir}"/>
171 <    <mkdir dir="${build.doccheck.dir}"/>
172 <
173 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
174 <         docletpath="${lib.dir}/doccheck.jar"
175 <            destdir="${build.doccheck.dir}">
176 <      <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  
179    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
180
181  </target>
182
183
184
185  <target name="checkstyle"
186          depends="filter-src"
187          description="Reports on style errors in Java source (verbose, mostly chaff)">
188
189    <taskdef resource="checkstyletask.properties"
190            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
191
192    <mkdir dir="${build.checkstyle.dir}"/>
193
194    <checkstyle config="etc/checkstyle/sun_checks.xml"
195       failOnViolation="false">
196      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
197      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
198    </checkstyle>
199
200    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
201          out="${build.checkstyle.dir}/checkstyle-report.html"
202        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
203
183    </target>
184  
185  
# Line 210 | Line 189
189            description="Puts all distributable products in single hierarchy"/>
190  
191  
213
192    <target name="release"
193            depends="dist"
194            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 257 | 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.5.0/docs/api"
262 <            overview="${src.dir}/intro.html"
238 >    <!-- the packagenames="none" hack below prevents scanning the -->
239 >    <!-- sourcepath for packages -->
240  
241 <            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
242 <     >
243 <      <packageset dir="${src.dir}" defaultexcludes="yes">
244 <      <include name="java/util/concurrent"/>
245 <      <include name="java/util/concurrent/atomic"/>
246 <      <include name="java/util/concurrent/locks"/>
247 <      </packageset>
248 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
272 <      <include name="main/java/util/*.java"/>
273 <      <include name="main/java/util/*.html"/>
274 < <!--      <include name="jsr166x/*.java"/> -->
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  
# Line 300 | Line 274
274    </target>
275  
276  
303  <target name="compile-ant-filter"
304          depends="init">
305
306    <mkdir dir="${build.ant.dir}"/>
307
308    <javac srcdir="${ant.src.dir}"
309          destdir="${build.ant.dir}"
310           source="1.4"/>
311
312  </target>
313
314
315  <target name="filter-src"
316          depends="compile-ant-filter">
317
318    <mkdir dir="${build.filter.src.dir}"/>
319
320    <copy todir="${build.filter.src.dir}">
321      <fileset dir="${src.dir}">
322        <include name="**/*.html"/>
323      </fileset>
324    </copy>
325
326    <copy todir="${build.filter.src.dir}">
327      <fileset dir="${src.dir}">
328        <exclude name="**/*.html"/>
329        <!-- Files excluded from dist-docs -->
330        <exclude name="java/util/Random.*"/>
331        <exclude name="sun/misc/Unsafe.*"/>
332      </fileset>
333      <!--
334      <filterchain>
335      -->
336
337        <!--
338         # This filter gets rid of angle-bracketed type parameters
339         # so that javadoc can run on the result. The following
340         # heuristic seems to work:
341         #
342         # For all lines not starting with space(s)-asterisk-space(s),
343         #   replace <something> with a space, where there may be more
344         #   than one right angle bracket at the end, and "something"
345         #   must not contain parens or pipes. (This may need some
346         #   tweaking.)
347         -->
348
349        <!--
350        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
351                      classpath="${build.ant.dir}">
352          <param name="notmatching" value="^\s+\*\s.*$"/>
353          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
354          <param name="replacement" value=" "/>
355        </filterreader>
356        -->
357
358      <!--
359      </filterchain>
360      -->
361    </copy>
362
363  </target>
364
365
366  <target name="filter-doccheck"
367          depends="filter-src">
368
369    <mkdir dir="${build.dc-filter.dir}"/>
370
371    <copy todir="${build.dc-filter.dir}">
372      <fileset dir="${build.filter.src.dir}">
373        <include name="**/*.html"/>
374      </fileset>
375    </copy>
376
377    <property name="generic.declarations"
378             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 {}"
379    />
380
381    <copy todir="${build.dc-filter.dir}">
382      <fileset dir="${build.filter.src.dir}">
383        <exclude name="**/*.html"/>
384      </fileset>
385      <filterchain>
386        <!--
387         # These two filters try to make the source look like
388         # something that doccheck can process. The first removes
389         # -source 1.4 assertions and the second adds in a bunch
390         # of single letter public nested marker interfaces so that
391         # the generic type parameters are recognized.
392         -->
393
394        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
395                      classpath="${build.ant.dir}">
396          <param name="matching"    value="^\s*assert[\s ].*$"/>
397          <param name="pattern"     value="assert"/>
398          <param name="replacement" value="//assert"/>
399        </filterreader>
400
401        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
402                      classpath="${build.ant.dir}">
403          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
404          <param name="pattern"     value="$"/>
405          <param name="replacement" value=" ${generic.declarations}"/>
406        </filterreader>
407
408      </filterchain>
409    </copy>
410
411  </target>
412
413
277    <target name="compile-tests"
278            depends="jar">
279  
# Line 426 | 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 443 | 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 459 | 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 531 | Line 397
397        <fileset dir="${build.reports.dir}">
398          <include name="TEST-*.xml"/>
399        </fileset>
400 <      <report styledir="${stylesheet.dir}"
535 <                format="${junit.report.format}"
536 <                 todir="${build.reports.dir}"
400 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
401        />
402      </junitreport>
403  
# Line 583 | Line 447
447    </target>
448  
449  
586
587  <!-- Anthill targets -->
588
589  <target name="anthill-build">
590
591    <!-- Override this in user.properties -->
592    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
593
594    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
595      <arg value="-Xmx256000000"/>
596      <!-- classpath of new JVM -->
597      <arg value="-classpath"/> <arg path="${java.class.path}"/>
598      <!-- location of Ant home directory -->
599      <arg value="-Dant.home=${ant.home}"/>
600      <!-- the Ant main class -->
601      <arg value="org.apache.tools.ant.Main"/>
602      <!-- The build file -->
603      <arg value="-buildfile"/>  <arg value="build.xml"/>
604      <!-- the target to build on the new Ant instance -->
605      <arg value="-DJAVA_HOME=${tiger.home}"/>
606      <arg value="do-anthill-build"/>
607    </exec>
608  </target>
609
610  <target name="do-anthill-build"
611          depends="jar, test, docs, dist-docs"/>
612
613  <target name="anthill-publish">
614
615    <copy todir="${deployDir}/docs/private">
616      <fileset dir="${build.javadocs.dir}"/>
617    </copy>
618
619    <copy todir="${deployDir}/docs/public">
620      <fileset dir="${dist.javadocs.dir}"/>
621    </copy>
622
623    <copy tofile="${deployDir}/index.html"
624          file="${basedir}/etc/anthill-index.html"/>
625
626    <copy todir="${deployDir}/notes">
627      <fileset dir="${basedir}/etc/notes"/>
628    </copy>
629
630  </target>
631
632
633
450    <!-- Various demos and test programs -->
451  
452  
637  <target name="sample" depends="init, configure-compiler"
638          description="Standalone demo program">
639
640    <mkdir dir="${build.testcases.dir}"/>
641
642    <javac srcdir="${test.src.dir}"
643          destdir="${build.testcases.dir}"
644            debug="${build.debug}"
645       debuglevel="${build.debuglevel}"
646      deprecation="${build.deprecation}"
647           source="${build.sourcelevel}"
648             fork="true">
649
650      <include name="jsr166/test/Sample.java"/>
651
652    </javac>
653
654    <copy todir="${build.testcases.dir}">
655      <fileset dir="${test.src.dir}">
656        <include name="**/*.properties"/>
657      </fileset>
658    </copy>
659
660
661    <java classname="jsr166.test.Sample" fork="true">
662      <classpath refid="test.classpath"/>
663      <!-- <jvmarg value="-ea"/> -->
664      <!-- <jvmarg value="-server"/> -->
665      <!-- <arg value="1000"/> -->
666    </java>
667  </target>
668
669
453    <target name="loops" depends="init, configure-compiler"
454            description="Benchmark from Doug Lea's AQS paper">
455  
# Line 682 | Line 465
465  
466        <compilerarg line="${build.args}"/>
467        <classpath refid="loops.classpath"/>
468 +      <compilerarg value="-XDignore.symbol.file=true"/>
469  
470      </javac>
471  
# Line 692 | Line 476
476    </target>
477  
478  
479 <  <target name="compile-j1" depends="init, configure-compiler, compile">
479 >  <!-- jsr166x -->
480  
697    <mkdir dir="${build.j1.dir}"/>
481  
482 <    <javac srcdir="${j1.src.dir}"
483 <          destdir="${build.j1.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}" >
493 >           source="${build.sourcelevel}"
494 >             fork="true">
495  
496        <include name="**/*.java"/>
707      <exclude name="**/dijkstra/**"/>
708
497        <compilerarg line="${build.args}"/>
498 <      <classpath refid="j1.classpath"/>
498 >      <compilerarg value="-XDignore.symbol.file=true"/>
499  
500      </javac>
501  
502    </target>
503  
504  
717  <target name="sw" depends="compile-j1"
718          description="Runs the SwingWorker demo">
505  
506 <    <!--
507 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
508 <      <classpath refid="j1.classpath"/>
723 <    </java>
724 <    -->
506 >  <target name="jsr166xjar"
507 >          depends="jsr166xcompile"
508 >          description="Builds library jar from compiled sources">
509  
510 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
510 >    <mkdir dir="${build.jsr166xlib.dir}"/>
511  
512 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
513 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
514 <    </exec>
512 >    <jar destfile="${jsr166xproduct.jar}">
513 >      <fileset dir="${build.jsr166x.dir}"/>
514 >    </jar>
515  
516    </target>
517  
734  <target name="j1" depends="compile-j1"
735          description="Runs a standalone JavaOne program">
518  
737    <java classname="${j1.test}" fork="true">
738      <classpath refid="j1.classpath"/>
739      <jvmarg value="-client"/>
519  
520 <      <!-- TestPseudoRandom args -->
521 <      <arg value="2"/>
743 <      <arg value="25"/>
744 <      <arg value="100000"/>
520 >  <target name="jsr166xdocs"
521 >          description="Builds javadocs with custom tags to build folder">
522  
523 <      <!-- WebCrawler args -->
524 <      <!--
748 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
749 <      <arg value="http://www.priorartisans.com"/>
750 <      <arg value="25"/>
751 <      -->
523 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
524 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
525  
526 <    </java>
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    </target>
534  
535  
536 <  <target name="test-j1" depends="compile-j1"
537 <          description="Runs testcases from the JavaOne source directories">
538 <
761 <    <junit printsummary="true"
762 <             showoutput="true"
763 <          errorProperty="junit.failed"
764 <        failureProperty="junit.failed"
765 <                    dir="${build.j1.dir}"
766 <                   fork="true">
767 <
768 <      <!-- <jvmarg value="-server"/> -->
769 <      <classpath refid="j1.classpath"/>
770 <      <formatter type="xml"/>
771 <
772 <      <batchtest todir="${build.j1.dir}">
773 <        <fileset dir="${j1.src.dir}">
774 <          <include name="**/*Test.java"/>
775 <        </fileset>
776 <      </batchtest>
536 >  <target name="jsr166xdist"
537 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
538 >          description="Puts all distributable products in single hierarchy"/>
539  
778    </junit>
540  
780    <available property="junit.report.format"
781                  value="frames"
782              classname="org.apache.xalan.lib.Redirect"/>
783    <property name="junit.report.format" value="noframes"/>
541  
542 <    <junitreport todir="${build.j1.dir}">
543 <      <fileset dir="${build.j1.dir}">
787 <        <include name="TEST-*.xml"/>
788 <      </fileset>
789 <      <report styledir="${stylesheet.dir}"
790 <                format="${junit.report.format}"
791 <                 todir="${build.j1.dir}"
792 <      />
793 <    </junitreport>
542 >  <target name="jsr166xclean"
543 >          description="Removes all build products">
544  
545 <    <fail message="Test Cases Failed" if="junit.failed"/>
545 >    <delete dir="${build.jsr166x.dir}"/>
546 >    <delete dir="${build.jsr166xlib.dir}"/>
547  
548    </target>
549  
550  
551  
552 <  <!-- C++ and JNI definitions and demos -->
553 <
803 <  <target name="configure-cpp">
804 <
805 <    <!-- Define tasks and types -->
552 >  <target name="jsr166xdist-clean"
553 >          description="Removes all build and distribution products">
554  
555 <    <path id="cpptasks.path">
808 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
809 <    </path>
810 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
811 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
555 >  </target>
556  
813    <!-- Set platform property for JNI includes -->
557  
815    <condition property="platform" value="linux">
816      <os name="Linux"/>
817    </condition>
818    <condition property="platform" value="win32">
819      <os family="windows"/>
820    </condition>
821    <condition property="platform" value="solaris">
822      <os name="SunOS"/>
823    </condition>
558  
559 <  </target>
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 <  <target name="cppdemo" depends="configure-cpp">
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 <    <mkdir dir="${build.dir}"/>
572 >  </target>
573  
574 <    <cc multithreaded="true"
575 <                 name="g++"
834 <               objdir="${build.dir}"
835 <              outfile="${build.dir}/CppDemo">
836 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
837 <      <libset libs="stdc++"/>
838 <    </cc>
574 >  <target name="jsr166xdist-jar"
575 >          depends="jsr166xclean, jsr166xjar">
576  
577 <    <exec executable="${build.dir}/CppDemo">
841 <      <arg line="count in word frequency of word in command line count"/>
842 <    </exec>
577 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
578  
579    </target>
580  
581 +  <!-- jsr166y -->
582  
847  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
583  
584 <    <mkdir dir="${build.testcases.dir}"/>
584 >  <target name="jsr166ycompile"
585 >          depends="init, configure-compiler"
586 >          description="Compiles jsr166y sources">
587  
588 <    <javac srcdir="${test.src.dir}"
589 <          destdir="${build.testcases.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}"
596               fork="true">
597 <      <compilerarg value="${bootclasspath.args}"/>
597 >
598 >      <include name="**/*.java"/>
599        <compilerarg line="${build.args}"/>
600 <      <classpath refid="test.classpath"/>
601 <      <include name="JniDemo.java"/>
600 >      <compilerarg value="-XDignore.symbol.file=true"/>
601 >      <compilerarg value="${bootclasspath.args}"/>
602 >
603 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
604 >
605      </javac>
606  
607 <    <javah destdir="${build.testcases.dir}"
608 <      classpathref="test.classpath">
609 <      <class name="JniDemo"/>
610 <    </javah>
611 <
612 <    <cc multithreaded="true"
613 <                 name="g++"
614 <               objdir="${build.dir}"
615 <              outfile="${build.dir}/JniDemo"
616 <              outtype="shared">
617 <
618 <      <compiler>
619 <        <defineset>
877 <          <define name="__int64" value="long long"/>
878 <        </defineset>
879 <        <includepath location="${java.home}/../include"/>
880 <        <includepath location="${java.home}/../include/${platform}"/>
881 <        <compilerarg value="-mno-cygwin"/>
882 <      </compiler>
883 <
884 <      <linker>
885 <        <linkerarg value="--add-stdcall-alias"/>
886 <      </linker>
887 <
888 <      <includepath location="${build.testcases.dir}"/>
889 <
890 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
891 <
892 <      <libset libs="stdc++"/>
893 <
894 <    </cc>
895 <
896 <    <!-- Necessary if windows, harmless if not -->
897 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
898 <
899 <    <java classname="JniDemo" fork="true">
900 <      <!-- Watch out: path separator hardwired to semicolon here! -->
901 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
902 <      <classpath refid="test.classpath"/>
903 <      <arg line="count in word frequency of word in command line count"/>
904 <    </java>
607 >  </target>
608 >
609 >
610 >
611 >  <target name="jsr166yjar"
612 >          depends="jsr166ycompile"
613 >          description="Builds library jar from compiled sources">
614 >
615 >    <mkdir dir="${build.jsr166ylib.dir}"/>
616 >
617 >    <jar destfile="${jsr166yproduct.jar}" index="true">
618 >      <fileset dir="${build.jsr166y.dir}"/>
619 >    </jar>
620  
621    </target>
622  
623  
624  
625 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
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 >
645 >
646 >
647 >  <target name="jsr166yclean"
648 >          description="Removes all build products">
649 >
650 >    <delete dir="${build.jsr166y.dir}"/>
651 >    <delete dir="${build.jsr166ylib.dir}"/>
652 >
653 >  </target>
654 >
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 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
666 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
916 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
917 <  <property name="pretiger.sourcelevel" value="1.4"/>
665 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
666 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
667  
668 <  <target name="defang"
669 <       depends="init"
670 <   description="Generates pre-Tiger compatible source">
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 <    <delete dir="${pretiger.src.dir}"/>
678 <    <mkdir dir="${pretiger.src.dir}"/>
677 >  <target name="jsr166ydist-jar"
678 >          depends="jsr166yclean, jsr166yjar">
679  
680 <    <exec executable="perl">
927 <      <arg file="etc/defang.pl"/>
928 <      <!-- <arg value="-v"/> -->
929 <      <arg value="-s"/> <arg file="${src.dir}"/>
930 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
931 <    </exec>
680 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
681  
682    </target>
683  
935  <target name="compile-pretiger"
936          depends="init, configure-compiler, defang"
937          description="Compiles pre-Tiger sources to build folder">
684  
685 <    <mkdir dir="${build.pretiger.dir}"/>
685 >  <!-- extra166y -->
686  
687 <    <javac srcdir="${pretiger.src.dir}"
688 <          destdir="${build.pretiger.dir}"
687 >
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="${pretiger.sourcelevel}"
700 >           source="${build.sourcelevel}"
701               fork="true">
702  
703 +      <include name="**/*.java"/>
704        <compilerarg line="${build.args}"/>
705 <      <exclude name="**/Thread.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    </target>
713  
956  <target name="pretiger" depends="compile-pretiger">
714  
958    <mkdir dir="${build.lib.dir}"/>
715  
716 <    <jar destfile="${pretiger.jar}">
717 <      <fileset dir="${build.pretiger.dir}">
718 <      </fileset>
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  
967  <!-- jsr166x -->
728  
729  
730 <  <target name="jsr166xcompile"
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 >
750 >
751 >
752 >  <target name="extra166yclean"
753 >          description="Removes all build products">
754 >
755 >    <delete dir="${build.extra166y.dir}"/>
756 >    <delete dir="${build.extra166ylib.dir}"/>
757 >
758 >  </target>
759 >
760 >
761 >
762 >  <target name="extra166ydist-clean"
763 >          description="Removes all build and distribution products">
764 >
765 >  </target>
766 >
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 >    <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 >  <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 jsr166x sources">
794 >          description="Compiles jsr166e sources">
795  
796 <    <mkdir dir="${build.jsr166x.dir}"/>
796 >    <mkdir dir="${build.jsr166e.dir}"/>
797  
798 <    <javac srcdir="${jsr166xsrc.dir}"
799 <          destdir="${build.jsr166x.dir}"
798 >    <javac srcdir="${jsr166esrc.dir}"
799 >          destdir="${build.jsr166e.dir}"
800              debug="${build.debug}"
801         debuglevel="${build.debuglevel}"
802        deprecation="${build.deprecation}"
803 <           source="${build.sourcelevel}"
803 >           source="1.7"
804               fork="true">
805  
806        <include name="**/*.java"/>
807        <compilerarg line="${build.args}"/>
808 +      <compilerarg value="-XDignore.symbol.file=true"/>
809 +      <compilerarg value="${bootclasspath.args}"/>
810 +
811 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
812  
813      </javac>
814  
# Line 990 | Line 816
816  
817  
818  
819 <  <target name="jsr166xjar"
820 <          depends="jsr166xcompile"
819 >  <target name="jsr166ejar"
820 >          depends="jsr166ecompile"
821            description="Builds library jar from compiled sources">
822  
823 <    <mkdir dir="${build.jsr166xlib.dir}"/>
823 >    <mkdir dir="${build.jsr166elib.dir}"/>
824  
825 <    <jar destfile="${jsr166xproduct.jar}">
826 <      <fileset dir="${build.jsr166x.dir}"/>
825 >    <jar destfile="${jsr166eproduct.jar}" index="true">
826 >      <fileset dir="${build.jsr166e.dir}"/>
827      </jar>
828  
829    </target>
830  
831  
832  
833 <  <target name="jsr166xdocs"
833 >  <target name="jsr166edocs"
834            description="Builds javadocs with custom tags to build folder">
835  
836 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
837 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
836 >    <delete dir="${build.jsr166ejavadocs.dir}"/>
837 >    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
838  
839 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
840 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
841 <            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
842 <
843 <    >
844 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1019 <      <include name="jsr166x"/>
1020 <      </packageset>
1021 <
1022 <
1023 <    </javadoc>
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="jsr166xdist"
850 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
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="jsr166xclean"
855 >  <target name="jsr166eclean"
856            description="Removes all build products">
857  
858 <    <delete dir="${build.jsr166x.dir}"/>
859 <    <delete dir="${build.jsr166xlib.dir}"/>
858 >    <delete dir="${build.jsr166e.dir}"/>
859 >    <delete dir="${build.jsr166elib.dir}"/>
860  
861    </target>
862  
863  
864  
865 <  <target name="jsr166xdist-clean"
865 >  <target name="jsr166edist-clean"
866            description="Removes all build and distribution products">
867  
868    </target>
869  
870 <
1050 <
1051 <  <target name="jsr166xdist-docs"
870 >  <target name="jsr166edist-docs"
871            description="Builds javadocs without custom tags to dist folder">
872  
873 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
874 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
873 >    <delete dir="${dist.jsr166ejavadocs.dir}"/>
874 >    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
875  
876 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
877 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
878 <              source="${build.sourcelevel}">
879 <
880 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
881 <      <include name="jsr166x"/>
1063 <      </packageset>
1064 <
1065 <    </javadoc>
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="jsr166xdist-jar"
886 <          depends="jsr166xclean, jsr166xjar">
885 >  <target name="jsr166edist-jar"
886 >          depends="jsr166eclean, jsr166ejar">
887  
888 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
888 >    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
889  
890    </target>
891  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines