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.58 by tim, Mon Sep 15 15:13:35 2003 UTC vs.
Revision 1.66 by jsr166, Sun Apr 11 01:37:41 2004 UTC

# Line 22 | Line 22
22  
23    <!-- Compilation options -->
24    <property name="build.sourcelevel"    value="1.5"/>
25  <property name="build.docsourcelevel" value="1.4"/>
25    <property name="build.debug"          value="true"/>
26    <property name="build.debuglevel"     value="source,lines,vars"/>
27    <property name="build.deprecation"    value="false"/>
# Line 31 | Line 30
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"/>
37  <property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
38  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
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.checkstyle.dir" location="${build.dir}/checkstyle"/>
43  
44    <!-- Source locations -->
45    <property name="src.dir"              location="${basedir}/src/main"/>
46    <property name="test.src.dir"         location="${basedir}/src/test"/>
47 +  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
48 +  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
49 +  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
50 +  <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"/>
53    <property name="lib.dir"              location="${basedir}/lib"/>
# Line 56 | Line 59
59    <!-- Jar locations -->
60    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
61    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
62 <  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
60 <  <property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
61 <
62 >  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
63  
64 <  <!-- Files excluded from dist-docs -->
65 <  <patternset id="docs.exclusion">
65 <    <exclude name="java/util/Random.*"/>
66 <    <exclude name="sun/misc/Unsafe.*"/>
67 <  </patternset>
64 >  <!-- Bootclasspath argument -->
65 >  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
66  
67 +  <!-- Test classpath -->
68 +  <path id="test.classpath">
69 +    <pathelement location="${build.testcases.dir}"/>
70 +    <pathelement location="${junit.jar}"/>
71 +  </path>
72 +
73 +  <!-- ALoops classpath -->
74 +  <path id="loops.classpath">
75 +    <pathelement location="${build.loops.dir}"/>
76 +  </path>
77 +
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  
85  
86    <!-- Main targets -->
87  
88 +
89    <target name="compile"
90 <          depends="init, configure-compiler, prepare-src"
90 >          depends="init, configure-compiler"
91            description="Compiles main sources to build folder">
92  
77    <property name="prepare.src.dir" value="${src.dir}"/>
78
93      <mkdir dir="${build.classes.dir}"/>
94  
95 <    <javac srcdir="${prepare.src.dir}"
95 >    <javac srcdir="${src.dir}"
96            destdir="${build.classes.dir}"
97              debug="${build.debug}"
98         debuglevel="${build.debuglevel}"
# Line 93 | Line 107
107    </target>
108  
109  
110 +
111    <target name="jar"
112 <          depends="init-jar, native-jar"
113 <          description="Builds library jar from compiled sources"/>
112 >          depends="compile"
113 >          description="Builds library jar from compiled sources">
114 >
115 >    <mkdir dir="${build.lib.dir}"/>
116 >
117 >    <jar destfile="${product.jar}">
118 >      <fileset dir="${build.classes.dir}"/>
119 >    </jar>
120 >
121 >  </target>
122 >
123  
124  
125    <target name="test"
# Line 103 | Line 127
127            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
128  
129  
106  <target name="checkstyle"
107          depends="filter-src"
108          description="Reports on style errors in Java source (verbose, mostly chaff)">
130  
131 <    <taskdef resource="checkstyletask.properties"
132 <            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
131 >  <target name="docs"
132 >          description="Builds javadocs with custom tags to build folder">
133  
134 <    <mkdir dir="${build.checkstyle.dir}"/>
135 <    
136 <    <checkstyle config="etc/checkstyle/sun_checks.xml"
137 <       failOnViolation="false">
138 <      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
139 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
140 <    </checkstyle>
141 <    
142 <    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
143 <          out="${build.checkstyle.dir}/checkstyle-report.html"
144 <        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
134 >    <delete dir="${build.javadocs.dir}"/>
135 >    <mkdir dir="${build.javadocs.dir}"/>
136 >
137 >    <javadoc destdir="${build.javadocs.dir}"
138 >                link="http://java.sun.com/j2se/1.4.1/docs/api"
139 >            overview="${src.dir}/intro.html"
140 >              source="${build.sourcelevel}">
141 >
142 >      <tag name="revised" description="Last revised:"/>
143 >      <tag name="spec"    description="Specified by:"/>
144 >
145 >      <packageset dir="${src.dir}"/>
146 >
147 >    </javadoc>
148  
149    </target>
150  
151  
152 +
153    <target name="doccheck"
154            depends="filter-doccheck"
155            description="Reports on javadoc style errors">
# Line 143 | Line 168
168    </target>
169  
170  
146  <target name="docs"
147          depends="filter-src"
148          description="Builds javadocs with custom tags to build folder">
171  
172 <    <delete dir="${build.javadocs.dir}"/>
173 <    <mkdir dir="${build.javadocs.dir}"/>
172 >  <target name="checkstyle"
173 >          depends="filter-src"
174 >          description="Reports on style errors in Java source (verbose, mostly chaff)">
175  
176 <    <javadoc destdir="${build.javadocs.dir}"
177 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
155 <            overview="${src.dir}/intro.html"
156 <              source="${build.docsourcelevel}">
176 >    <taskdef resource="checkstyletask.properties"
177 >            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
178  
179 <      <tag name="revised" description="Last revised:"/>
159 <      <tag name="spec"    description="Specified by:"/>
179 >    <mkdir dir="${build.checkstyle.dir}"/>
180  
181 <      <packageset dir="${build.filter.src.dir}"/>
181 >    <checkstyle config="etc/checkstyle/sun_checks.xml"
182 >       failOnViolation="false">
183 >      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
184 >      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
185 >    </checkstyle>
186  
187 <    </javadoc>
187 >    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
188 >          out="${build.checkstyle.dir}/checkstyle-report.html"
189 >        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
190  
191    </target>
192  
193  
168  <target name="sinjdocs"
169          depends="configure-tests"
170          description="Builds javadocs with custom tags to build folder">
171
172    <delete dir="${build.sinjdocs.dir}"/>
173    <mkdir dir="${build.sinjdocs.dir}"/>
174
175    <java classname="net.cscott.sinjdoc.Main" fork="true">
176
177      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
178
179      <classpath>
180        <pathelement location="${sinjdoc.jar}"/>
181        <pathelement location="${lib.dir}/jutil.jar"/>
182        <pathelement location="${lib.dir}/cup.jar"/>
183        <path refid="test.classpath"/>
184      </classpath>
185
186      <!-- <arg value="-help"/> -->
187      <!-- <arg value="-verbose"/> -->
188      <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
189      
190      <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
191      <arg value="-sourcepath"/> <arg value="${src.dir}"/>
192      <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
193      <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
194      
195      <arg value="java.lang"/>
196      <arg value="java.util"/>
197      <arg value="java.util.concurrent"/>
198      <arg value="java.util.concurrent.atomic"/>
199      <arg value="java.util.concurrent.locks"/>
200
201
202    </java>
203
204  </target>
205
194  
195    <target name="dist"
196            depends="init, dist-clean, dist-jar, dist-docs"
197            description="Puts all distributable products in single hierarchy"/>
198  
199  
200 +
201    <target name="release"
202            depends="dist"
203            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 227 | Line 216
216  
217    </target>
218  
219 +
220 +
221    <target name="clean"
222            description="Removes all build products">
223  
# Line 237 | Line 228
228    </target>
229  
230  
231 +
232    <target name="dist-clean"
233            description="Removes all build and distribution products">
234  
# Line 245 | Line 237
237    </target>
238  
239  
240 +
241    <target name="dist-docs"
249          depends="filter-src"
242            description="Builds javadocs without custom tags to dist folder">
243  
244      <delete dir="${dist.javadocs.dir}"/>
245      <mkdir dir="${dist.javadocs.dir}"/>
246  
247      <javadoc destdir="${dist.javadocs.dir}"
248 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
248 >                link="http://java.sun.com/j2se/1.4.2/docs/api"
249              overview="${src.dir}/intro.html"
250 <              source="${build.docsourcelevel}">
250 >              source="${build.sourcelevel}">
251  
252 <      <packageset dir="${build.filter.src.dir}"/>
252 >      <packageset dir="${src.dir}"/>
253  
254      </javadoc>
255  
# Line 278 | Line 270
270    </target>
271  
272  
281  <target name="init-jar">
282
283    <mkdir dir="${build.lib.dir}"/>
284
285  </target>
286
287
288  <target name="native-jar"
289          depends="compile">
290
291    <jar destfile="${product.jar}">
292      <fileset dir="${build.classes.dir}"/>
293    </jar>
294
295  </target>
296
297
273    <target name="dist-jar"
274            depends="clean, jar">
275  
# Line 310 | Line 285
285  
286      <javac srcdir="${ant.src.dir}"
287            destdir="${build.ant.dir}"
288 <           source="1.4"
314 <    />
288 >           source="1.4"/>
289  
290    </target>
291  
# Line 330 | Line 304
304      <copy todir="${build.filter.src.dir}">
305        <fileset dir="${src.dir}">
306          <exclude name="**/*.html"/>
307 <        <patternset refid="docs.exclusion"/>
307 >        <!-- Files excluded from dist-docs -->
308 >        <exclude name="java/util/Random.*"/>
309 >        <exclude name="sun/misc/Unsafe.*"/>
310        </fileset>
311 +      <!--
312        <filterchain>
313 +      -->
314  
315          <!--
316           # This filter gets rid of angle-bracketed type parameters
# Line 346 | Line 324
324           #   tweaking.)
325           -->
326  
327 +        <!--
328          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
329                        classpath="${build.ant.dir}">
330            <param name="notmatching" value="^\s+\*\s.*$"/>
331            <param name="pattern"     value="&lt;[^|>()]+?>+"/>
332            <param name="replacement" value=" "/>
333          </filterreader>
334 +        -->
335  
336 +      <!--
337        </filterchain>
338 +      -->
339      </copy>
340  
341    </target>
# Line 412 | Line 394
394  
395      <mkdir dir="${build.testcases.dir}"/>
396  
397 +    <javac srcdir="${tck.src.dir}"
398 +          destdir="${build.testcases.dir}"
399 +            debug="${build.debug}"
400 +       debuglevel="${build.debuglevel}"
401 +      deprecation="${build.deprecation}"
402 +           source="${build.sourcelevel}"
403 +             fork="true">
404 +
405 +      <compilerarg value="${bootclasspath.args}"/>
406 +      <compilerarg line="${build.args}"/>
407 +
408 +      <classpath refid="test.classpath"/>
409 +
410 +    </javac>
411 +
412      <javac srcdir="${test.src.dir}"
413            destdir="${build.testcases.dir}"
414              debug="${build.debug}"
# Line 420 | Line 417
417             source="${build.sourcelevel}"
418               fork="true">
419  
420 +      <include name="jsr166/test/**"/>
421 +
422 +      <compilerarg value="${bootclasspath.args}"/>
423 +      <compilerarg line="${build.args}"/>
424 +
425 +      <classpath refid="test.classpath"/>
426 +
427 +    </javac>
428 +
429 + <!--
430 +    <javac srcdir="${jtreg.src.dir}"
431 +          destdir="${build.testcases.dir}"
432 +            debug="${build.debug}"
433 +       debuglevel="${build.debuglevel}"
434 +      deprecation="${build.deprecation}"
435 +           source="${build.sourcelevel}"
436 +             fork="true">
437 +
438 +      <compilerarg value="${bootclasspath.args}"/>
439        <compilerarg line="${build.args}"/>
440 +
441        <classpath refid="test.classpath"/>
425      
426      <include name="java/**"/>
427      <include name="jsr166/**"/>
442  
443      </javac>
444 + -->
445  
446    </target>
447  
# Line 446 | Line 461
461                      dir="${build.reports.dir}"
462                     fork="true">
463  
464 <      <jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
464 >      <jvmarg value="${bootclasspath.args}"/>
465 >      <jvmarg value="-server"/>
466 >      <jvmarg value="-showversion"/>
467 >
468 >      <classpath refid="test.classpath"/>
469  
470        <formatter type="xml"/>
471  
472 <      <batchtest todir="${build.reports.dir}">
472 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
473 >        <fileset dir="${tck.src.dir}">
474 >          <include name="**/${testcase}Test.java"/>
475 >        </fileset>
476 >      </batchtest>
477 >
478 >      <batchtest todir="${build.reports.dir}" if="do.test.old">
479          <fileset dir="${test.src.dir}">
480 <          <include name="java/**/${testcase}Test.java"/>
456 <          <include name="jsr166/**/${testcase}Test.java"/>
480 >          <include name="jsr166/test/**/${testcase}Test.java"/>
481          </fileset>
482        </batchtest>
483  
484 + <!--
485 +      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
486 +        <fileset dir="${jtreg.src.dir}">
487 +          <include name="**/${testcase}Test.java"/>
488 +        </fileset>
489 +      </batchtest>
490 + -->
491 +
492      </junit>
493  
494    </target>
# Line 497 | Line 529
529      </condition>
530  
531      <property name="warnunchecked.arg" value=""/>
500    
501    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
502      <istrue value="${build.nothreads}"/>
503    </condition>
532  
533  
534      <!-- Common options in javac invocations -->
# Line 509 | Line 537
537    </target>
538  
539  
512  <target name="prepare-src"
513          depends="configure-compiler"
514          if="prepare.src.dir">
515
516    <mkdir dir="${prepare.src.dir}"/>
517    <copy todir="${prepare.src.dir}">
518      <fileset dir="${src.dir}">
519        <exclude name="java/lang/**"/>
520      </fileset>
521    </copy>
522
523  </target>
524
525
540    <target name="configure-tests"
541         depends="configure-compiler">
542  
# Line 530 | Line 544
544      <available property="junit.available"
545                 classname="junit.framework.Protectable"/>
546  
533    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
534          unless="junit.available"/>
535
547      <!-- Xalan -->
548      <available property="xalan.available"
549                 classname="org.apache.xalan.Version"/>
550  
540    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
541          unless="xalan.available"/>
542
551  
552 +    <!-- Ant 1.6beta and later don't need or want this check -->
553      <!--
554 <     ! Bootclasspath munging for testing, so JUnit can test our local
555 <     ! modifications to java.*.
547 <     -->
548 <
549 <    <path id="test.classpath">
550 <      <pathelement location="${product.jar}"/>
551 <      <pathelement location="${rt.jar}"/>
552 <      <pathelement location="${junit.jar}"/>
553 <      <pathelement location="${build.testcases.dir}"/>
554 <    </path>
555 <
556 <    <path id="test.bootclasspath">
557 <      <path refid="test.classpath"/>
558 <    </path>
554 >    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
555 >          unless="junit.available"/>
556  
557 <    <!-- Flatten test classpaths into platform-appropriate strings -->
558 <    <property name="test.classpath"         refid="test.classpath"/>
559 <    <property name="test.bootclasspath"     refid="test.bootclasspath"/>
557 >    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
558 >          unless="xalan.available"/>
559 >    -->
560  
561    </target>
562  
# Line 568 | Line 565
565    <!-- Anthill targets -->
566  
567    <target name="anthill-build">
568 <  
568 >
569      <!-- Override this in user.properties -->
570      <property name="tiger.home" location="e:/j2sdk1.5.0"/>
571 <    
571 >
572      <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
573        <arg value="-Xmx256000000"/>
574        <!-- classpath of new JVM -->
# Line 587 | Line 584
584        <arg value="do-anthill-build"/>
585      </exec>
586    </target>
587 <  
587 >
588    <target name="do-anthill-build"
589            depends="jar, test, docs, dist-docs"/>
590  
# Line 611 | Line 608
608    </target>
609  
610  
614  <target name="ng" depends="test">
615    <java classname="SuperfluousAbstract" fork="true">
611  
612 <      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
612 >  <!-- Various demos and test programs -->
613 >
614 >
615 >  <target name="sample" depends="init, configure-compiler"
616 >          description="Standalone demo program">
617 >
618 >    <mkdir dir="${build.testcases.dir}"/>
619 >
620 >    <javac srcdir="${test.src.dir}"
621 >          destdir="${build.testcases.dir}"
622 >            debug="${build.debug}"
623 >       debuglevel="${build.debuglevel}"
624 >      deprecation="${build.deprecation}"
625 >           source="${build.sourcelevel}"
626 >             fork="true">
627 >
628 >      <include name="jsr166/test/Sample.java"/>
629 >
630 >    </javac>
631 >
632 >    <copy todir="${build.testcases.dir}">
633 >      <fileset dir="${test.src.dir}">
634 >        <include name="**/*.properties"/>
635 >      </fileset>
636 >    </copy>
637 >
638 >
639 >    <java classname="jsr166.test.Sample" fork="true">
640 >      <classpath refid="test.classpath"/>
641 >      <!-- <jvmarg value="-ea"/> -->
642 >      <!-- <jvmarg value="-server"/> -->
643 >      <!-- <arg value="1000"/> -->
644 >    </java>
645 >  </target>
646 >
647 >
648 >  <target name="loops" depends="init, configure-compiler"
649 >          description="Benchmark from Doug Lea's AQS paper">
650 >
651 >    <mkdir dir="${build.loops.dir}"/>
652 >
653 >    <javac srcdir="${loops.src.dir}"
654 >          destdir="${build.loops.dir}"
655 >            debug="${build.debug}"
656 >       debuglevel="${build.debuglevel}"
657 >      deprecation="${build.deprecation}"
658 >           source="${build.sourcelevel}"
659 >             fork="true">
660 >
661 >      <compilerarg line="${build.args}"/>
662 >      <classpath refid="loops.classpath"/>
663 >
664 >    </javac>
665 >
666 >    <java classname="ALoops" fork="true">
667 >      <classpath refid="loops.classpath"/>
668 >    </java>
669 >
670 >  </target>
671 >
672 >
673 >  <target name="compile-j1" depends="init, configure-compiler">
674 >
675 >    <mkdir dir="${build.j1.dir}"/>
676 >
677 >    <javac srcdir="${j1.src.dir}"
678 >          destdir="${build.j1.dir}"
679 >            debug="${build.debug}"
680 >       debuglevel="${build.debuglevel}"
681 >      deprecation="${build.deprecation}"
682 >           source="${build.sourcelevel}" >
683 >
684 >      <include name="**/*.java"/>
685 >      <exclude name="**/dijkstra/**"/>
686 >
687 >      <compilerarg line="${build.args}"/>
688 >      <classpath refid="j1.classpath"/>
689 >
690 >    </javac>
691 >
692 >  </target>
693 >
694 >
695 >  <target name="sw" depends="compile-j1"
696 >          description="Runs the SwingWorker demo">
697 >
698 >    <!--
699 >    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
700 >      <classpath refid="j1.classpath"/>
701 >    </java>
702 >    -->
703 >
704 >    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
705 >
706 >    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
707 >      <arg value="${build.j1.dir}/SwingWorker.html"/>
708 >    </exec>
709 >
710 >  </target>
711 >
712 >  <target name="j1" depends="compile-j1"
713 >          description="Runs a standalone JavaOne program">
714 >
715 >    <java classname="jsr166.bbuf.BoundedBufferDemo" fork="true">
716 >      <classpath refid="j1.classpath"/>
717 >      <jvmarg value="-server"/>
718 >      <arg value="http://www.perl.com/"/>
719 >      <arg value="1"/>
720 >    </java>
721 >
722 >  </target>
723 >
724 >
725 >  <target name="test-j1" depends="compile-j1"
726 >          description="Runs testcases from the JavaOne source directories">
727 >
728 >    <junit printsummary="true"
729 >             showoutput="true"
730 >          errorProperty="junit.failed"
731 >        failureProperty="junit.failed"
732 >                    dir="${build.j1.dir}"
733 >                   fork="true">
734 >
735 >      <!-- <jvmarg value="-server"/> -->
736 >      <classpath refid="j1.classpath"/>
737 >      <formatter type="xml"/>
738 >
739 >      <batchtest todir="${build.j1.dir}">
740 >        <fileset dir="${j1.src.dir}">
741 >          <include name="**/*Test.java"/>
742 >        </fileset>
743 >      </batchtest>
744 >
745 >    </junit>
746 >
747 >    <available property="junit.report.format"
748 >                  value="frames"
749 >              classname="org.apache.xalan.lib.Redirect"/>
750 >    <property name="junit.report.format" value="noframes"/>
751 >
752 >    <junitreport todir="${build.j1.dir}">
753 >      <fileset dir="${build.j1.dir}">
754 >        <include name="TEST-*.xml"/>
755 >      </fileset>
756 >      <report styledir="${stylesheet.dir}"
757 >                format="${junit.report.format}"
758 >                 todir="${build.j1.dir}"
759 >      />
760 >    </junitreport>
761 >
762 >    <fail message="Test Cases Failed" if="junit.failed"/>
763 >
764 >  </target>
765 >
766 >
767 >
768 >  <!-- C++ and JNI definitions and demos -->
769 >
770 >  <target name="configure-cpp">
771 >
772 >    <!-- Define tasks and types -->
773 >
774 >    <path id="cpptasks.path">
775 >      <pathelement location="${lib.dir}/cpptasks.jar"/>
776 >    </path>
777 >    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
778 >    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
779 >
780 >    <!-- Set platform property for JNI includes -->
781 >
782 >    <condition property="platform" value="linux">
783 >      <os name="Linux"/>
784 >    </condition>
785 >    <condition property="platform" value="win32">
786 >      <os family="windows"/>
787 >    </condition>
788 >    <condition property="platform" value="solaris">
789 >      <os name="SunOS"/>
790 >    </condition>
791 >
792 >  </target>
793 >
794 >
795 >  <target name="cppdemo" depends="configure-cpp">
796 >
797 >    <mkdir dir="${build.dir}"/>
798 >
799 >    <cc multithreaded="true"
800 >                 name="g++"
801 >               objdir="${build.dir}"
802 >              outfile="${build.dir}/CppDemo">
803 >      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
804 >      <libset libs="stdc++"/>
805 >    </cc>
806 >
807 >    <exec executable="${build.dir}/CppDemo">
808 >      <arg line="count in word frequency of word in command line count"/>
809 >    </exec>
810 >
811 >  </target>
812 >
813 >
814 >  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
815 >
816 >    <mkdir dir="${build.testcases.dir}"/>
817 >
818 >    <javac srcdir="${test.src.dir}"
819 >          destdir="${build.testcases.dir}"
820 >            debug="${build.debug}"
821 >       debuglevel="${build.debuglevel}"
822 >      deprecation="${build.deprecation}"
823 >           source="${build.sourcelevel}"
824 >             fork="true">
825 >      <compilerarg value="${bootclasspath.args}"/>
826 >      <compilerarg line="${build.args}"/>
827 >      <classpath refid="test.classpath"/>
828 >      <include name="JniDemo.java"/>
829 >    </javac>
830  
831 +    <javah destdir="${build.testcases.dir}"
832 +      classpathref="test.classpath">
833 +      <class name="JniDemo"/>
834 +    </javah>
835 +
836 +    <cc multithreaded="true"
837 +                 name="g++"
838 +               objdir="${build.dir}"
839 +              outfile="${build.dir}/JniDemo"
840 +              outtype="shared">
841 +
842 +      <compiler>
843 +        <defineset>
844 +          <define name="__int64" value="long long"/>
845 +        </defineset>
846 +        <includepath location="${java.home}/../include"/>
847 +        <includepath location="${java.home}/../include/${platform}"/>
848 +        <compilerarg value="-mno-cygwin"/>
849 +      </compiler>
850 +
851 +      <linker>
852 +        <linkerarg value="--add-stdcall-alias"/>
853 +      </linker>
854 +
855 +      <includepath location="${build.testcases.dir}"/>
856 +
857 +      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
858 +
859 +      <libset libs="stdc++"/>
860 +
861 +    </cc>
862 +
863 +    <!-- Necessary if windows, harmless if not -->
864 +    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
865 +
866 +    <java classname="JniDemo" fork="true">
867 +      <!-- Watch out: path separator hardwired to semicolon here! -->
868 +      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
869 +      <classpath refid="test.classpath"/>
870 +      <arg line="count in word frequency of word in command line count"/>
871      </java>
872 +
873 +  </target>
874 +
875 +
876 +
877 +  <!-- Backward compatibility, work in progress (some files not checked in) -->
878 +
879 +
880 +
881 +  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
882 +  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
883 +  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
884 +  <property name="pretiger.sourcelevel" value="1.4"/>
885 +
886 +  <target name="defang"
887 +       depends="init"
888 +   description="Generates pre-Tiger compatible source">
889 +
890 +    <delete dir="${pretiger.src.dir}"/>
891 +    <mkdir dir="${pretiger.src.dir}"/>
892 +
893 +    <exec executable="perl">
894 +      <arg file="etc/defang.pl"/>
895 +      <!-- <arg value="-v"/> -->
896 +      <arg value="-s"/> <arg file="${src.dir}"/>
897 +      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
898 +    </exec>
899 +
900    </target>
901  
902 +  <target name="compile-pretiger"
903 +          depends="init, configure-compiler, defang"
904 +          description="Compiles pre-Tiger sources to build folder">
905 +
906 +    <mkdir dir="${build.pretiger.dir}"/>
907 +
908 +    <javac srcdir="${pretiger.src.dir}"
909 +          destdir="${build.pretiger.dir}"
910 +            debug="${build.debug}"
911 +       debuglevel="${build.debuglevel}"
912 +      deprecation="${build.deprecation}"
913 +           source="${pretiger.sourcelevel}"
914 +             fork="true">
915 +
916 +      <compilerarg line="${build.args}"/>
917 +      <exclude name="**/Thread.java"/>
918 +
919 +    </javac>
920 +
921 +  </target>
922 +
923 +  <target name="pretiger" depends="compile-pretiger">
924 +
925 +    <mkdir dir="${build.lib.dir}"/>
926 +
927 +    <jar destfile="${pretiger.jar}">
928 +      <fileset dir="${build.pretiger.dir}">
929 +      </fileset>
930 +    </jar>
931 +
932 +  </target>
933  
934   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines