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.57 by tim, Mon Sep 15 14:07:36 2003 UTC vs.
Revision 1.63 by tim, Sat Dec 13 20:45:41 2003 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 34 | Line 33
33    <property name="build.lib.dir"        location="${build.dir}/lib"/>
34    <property name="build.ant.dir"        location="${build.dir}/ant"/>
35    <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"/>
36    <property name="build.reports.dir"    location="${build.dir}/reports"/>
37 +  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
38    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
39    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
40 <  <property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
40 >  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
41  
42    <!-- Source locations -->
43    <property name="src.dir"              location="${basedir}/src/main"/>
44    <property name="test.src.dir"         location="${basedir}/src/test"/>
45 +  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
46 +  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
47    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
48    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
49    <property name="lib.dir"              location="${basedir}/lib"/>
# Line 55 | Line 55
55    <!-- Jar locations -->
56    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
57    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
58 <  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
59 <  <property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
60 <
61 <
62 <  <!-- Files excluded from dist-docs -->
63 <  <patternset id="docs.exclusion">
64 <    <exclude name="java/util/Random.*"/>
65 <    <exclude name="sun/misc/Unsafe.*"/>
66 <  </patternset>
58 >  
59 >  <!-- Bootclasspath argument -->
60 >  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
61  
62 +  <!-- Test classpath -->
63 +  <path id="test.classpath">
64 +    <pathelement location="${build.testcases.dir}"/>
65 +    <pathelement location="${junit.jar}"/>
66 +  </path>
67  
68  
69    <!-- Main targets -->
70  
71 +
72    <target name="compile"
73 <          depends="init, configure-compiler, prepare-src"
73 >          depends="init, configure-compiler"
74            description="Compiles main sources to build folder">
75  
76    <property name="prepare.src.dir" value="${src.dir}"/>
77
76      <mkdir dir="${build.classes.dir}"/>
77  
78 < <!--
81 <    <echo>javac ${build.args}</echo>
82 < -->
83 <
84 <    <javac srcdir="${prepare.src.dir}"
78 >    <javac srcdir="${src.dir}"
79            destdir="${build.classes.dir}"
80              debug="${build.debug}"
81         debuglevel="${build.debuglevel}"
# Line 89 | Line 83
83             source="${build.sourcelevel}"
84               fork="true">
85  
86 <      <compilerarg    line="${build.args}"/>
86 >      <compilerarg line="${build.args}"/>
87  
88      </javac>
89  
90    </target>
91  
92  
99  <target name="jar"
100          depends="init-jar, native-jar"
101          description="Builds library jar from compiled sources"/>
102
103
104  <target name="test"
105          depends="init, configure-tests, report-tests"
106          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
107
93  
94 <  <target name="checkstyle"
95 <          depends="filter-src"
96 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
94 >  <target name="jar"
95 >          depends="compile"
96 >          description="Builds library jar from compiled sources">
97  
98 <    <taskdef resource="checkstyletask.properties"
114 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
98 >    <mkdir dir="${build.lib.dir}"/>
99  
100 <    <checkstyle>
101 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
102 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
119 <    </checkstyle>
100 >    <jar destfile="${product.jar}">
101 >      <fileset dir="${build.classes.dir}"/>
102 >    </jar>
103  
104    </target>
105  
106  
124  <target name="doccheck"
125          depends="filter-doccheck"
126          description="Reports on javadoc style errors">
127
128    <delete dir="${build.doccheck.dir}"/>
129    <mkdir dir="${build.doccheck.dir}"/>
130
131    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
132         docletpath="${lib.dir}/doccheck.jar"
133            destdir="${build.doccheck.dir}">
134      <packageset dir="${build.filter.doccheck.dir}"/>
135    </javadoc>
107  
108 <    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
108 >  <target name="test"
109 >          depends="init, configure-tests, report-tests"
110 >          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
111  
139  </target>
112  
113  
114    <target name="docs"
143          depends="filter-src"
115            description="Builds javadocs with custom tags to build folder">
116  
117      <delete dir="${build.javadocs.dir}"/>
# Line 149 | Line 120
120      <javadoc destdir="${build.javadocs.dir}"
121                  link="http://java.sun.com/j2se/1.4.1/docs/api"
122              overview="${src.dir}/intro.html"
123 <              source="${build.docsourcelevel}">
123 >              source="${build.sourcelevel}">
124  
125        <tag name="revised" description="Last revised:"/>
126        <tag name="spec"    description="Specified by:"/>
156      <tag name="editor"  description="Last edited by:"/>
157      <tag name="fixme"   description="FIX ME:"/>
127  
128 <      <packageset dir="${build.filter.src.dir}"/>
128 >      <packageset dir="${src.dir}"/>
129  
130      </javadoc>
131  
132    </target>
133  
134  
166  <target name="sinjdocs"
167          depends="configure-tests"
168          description="Builds javadocs with custom tags to build folder">
169
170    <delete dir="${build.sinjdocs.dir}"/>
171    <mkdir dir="${build.sinjdocs.dir}"/>
172
173    <java classname="net.cscott.sinjdoc.Main" fork="true">
135  
136 <      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
136 >  <target name="doccheck"
137 >          depends="filter-doccheck"
138 >          description="Reports on javadoc style errors">
139  
140 <      <classpath>
141 <        <pathelement location="${sinjdoc.jar}"/>
179 <        <pathelement location="${lib.dir}/jutil.jar"/>
180 <        <pathelement location="${lib.dir}/cup.jar"/>
181 <        <path refid="test.classpath"/>
182 <      </classpath>
183 <
184 <      <!-- <arg value="-help"/> -->
185 <      <!-- <arg value="-verbose"/> -->
186 <      <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
187 <      
188 <      <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
189 <      <arg value="-sourcepath"/> <arg value="${src.dir}"/>
190 <      <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
191 <      <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
192 <      
193 <      <arg value="java.lang"/>
194 <      <arg value="java.util"/>
195 <      <arg value="java.util.concurrent"/>
196 <      <arg value="java.util.concurrent.atomic"/>
197 <      <arg value="java.util.concurrent.locks"/>
140 >    <delete dir="${build.doccheck.dir}"/>
141 >    <mkdir dir="${build.doccheck.dir}"/>
142  
143 +    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
144 +         docletpath="${lib.dir}/doccheck.jar"
145 +            destdir="${build.doccheck.dir}">
146 +      <packageset dir="${build.dc-filter.dir}"/>
147 +    </javadoc>
148  
149 <    </java>
149 >    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
150  
151    </target>
152  
153  
205  <target name="strip"
206          depends="init, configure-compiler"
207          description="Strip generics from java source (not working yet)">
208
209    <mkdir dir="${build.stripped.dir}"/>
154  
155 <    <!--
156 <     # javac -s doesn't reliably generate compilable code. It generates
157 <     # bridge methods (marked as "synthetic") that can have identical
214 <     # signatures to existing methods except for the return value.
215 <     -->
216 <    <javac srcdir="${src.dir}"
217 <          destdir="${build.stripped.dir}"
218 <            debug="${build.debug}"
219 <       debuglevel="${build.debuglevel}"
220 <      deprecation="${build.deprecation}"
221 <           source="${build.sourcelevel}"
222 <             fork="true">
155 >  <target name="checkstyle"
156 >          depends="filter-src"
157 >          description="Reports on style errors in Java source (verbose, mostly chaff)">
158  
159 <      <compilerarg    line="${build.args} -s"/>
159 >    <taskdef resource="checkstyletask.properties"
160 >            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
161  
162 <    </javac>
162 >    <mkdir dir="${build.checkstyle.dir}"/>
163 >    
164 >    <checkstyle config="etc/checkstyle/sun_checks.xml"
165 >       failOnViolation="false">
166 >      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
167 >      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
168 >    </checkstyle>
169 >    
170 >    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
171 >          out="${build.checkstyle.dir}/checkstyle-report.html"
172 >        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
173  
174    </target>
175  
176 +  
177  
178    <target name="dist"
179            depends="init, dist-clean, dist-jar, dist-docs"
180            description="Puts all distributable products in single hierarchy"/>
181  
182 +
183 +
184    <target name="release"
185            depends="dist"
186            description="Puts entire CVS tree, plus distribution productions, in a jar">
187  
239 <!--
240    #keep build dir? - dl
241    <delete dir="${build.dir}"/>
242 -->
188      <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
189  
190      <jar basedir="${basedir}" destfile="${release.jar}">
191 +      <!-- <exclude name="build/**"/> -->
192        <exclude name="${release.jar}"/>
193        <exclude name="user.properties"/>
194        <exclude name="etc/notes/**"/>
195 +      <exclude name="src/emulation/**"/>
196        <exclude name="**/SyntaxTest.java"/>
197 +      <exclude name="**/SuperfluousAbstract.java"/>
198      </jar>
199  
200    </target>
201  
202 +
203 +
204    <target name="clean"
205            description="Removes all build products">
206  
# Line 261 | Line 211
211    </target>
212  
213  
214 +
215    <target name="dist-clean"
216            description="Removes all build and distribution products">
217  
# Line 269 | Line 220
220    </target>
221  
222  
223 +
224    <target name="dist-docs"
273          depends="filter-src"
225            description="Builds javadocs without custom tags to dist folder">
226  
227      <delete dir="${dist.javadocs.dir}"/>
228      <mkdir dir="${dist.javadocs.dir}"/>
229  
230      <javadoc destdir="${dist.javadocs.dir}"
231 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
231 >                link="http://java.sun.com/j2se/1.4.2/docs/api"
232              overview="${src.dir}/intro.html"
233 <              source="${build.docsourcelevel}">
233 >              source="${build.sourcelevel}">
234  
235 <      <packageset dir="${build.filter.src.dir}"/>
235 >      <packageset dir="${src.dir}"/>
236  
237      </javadoc>
238  
# Line 300 | Line 251
251      <echo>java.home is ${java.home}</echo>
252  
253    </target>
254 <
255 <
305 <  <target name="init-jar">
306 <
307 <    <mkdir dir="${build.lib.dir}"/>
308 <
309 <  </target>
310 <
311 <
312 <  <target name="native-jar"
313 <          depends="compile">
314 <
315 <    <jar destfile="${product.jar}">
316 <      <fileset dir="${build.classes.dir}"/>
317 <    </jar>
318 <
319 <  </target>
320 <
321 <
254 >  
255 >  
256    <target name="dist-jar"
257            depends="clean, jar">
258  
# Line 354 | Line 288
288      <copy todir="${build.filter.src.dir}">
289        <fileset dir="${src.dir}">
290          <exclude name="**/*.html"/>
291 <        <patternset refid="docs.exclusion"/>
291 >        <!-- Files excluded from dist-docs -->
292 >        <exclude name="java/util/Random.*"/>
293 >        <exclude name="sun/misc/Unsafe.*"/>
294        </fileset>
295 +      <!--
296        <filterchain>
297 +      -->
298  
299          <!--
300           # This filter gets rid of angle-bracketed type parameters
# Line 370 | Line 308
308           #   tweaking.)
309           -->
310  
311 +        <!--
312          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
313                        classpath="${build.ant.dir}">
314            <param name="notmatching" value="^\s+\*\s.*$"/>
315            <param name="pattern"     value="&lt;[^|>()]+?>+"/>
316            <param name="replacement" value=" "/>
317          </filterreader>
318 +        -->
319  
320 +      <!--
321        </filterchain>
322 +      -->
323      </copy>
324  
325    </target>
326  
327  
386
387
328    <target name="filter-doccheck"
329            depends="filter-src">
330  
331 <    <mkdir dir="${build.filter.doccheck.dir}"/>
331 >    <mkdir dir="${build.dc-filter.dir}"/>
332  
333 <    <copy todir="${build.filter.doccheck.dir}">
333 >    <copy todir="${build.dc-filter.dir}">
334        <fileset dir="${build.filter.src.dir}">
335          <include name="**/*.html"/>
336        </fileset>
# Line 400 | Line 340
340               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 {}"
341      />
342  
343 <    <copy todir="${build.filter.doccheck.dir}">
343 >    <copy todir="${build.dc-filter.dir}">
344        <fileset dir="${build.filter.src.dir}">
345          <exclude name="**/*.html"/>
346        </fileset>
# Line 438 | Line 378
378  
379      <mkdir dir="${build.testcases.dir}"/>
380  
381 < <!--
382 <    <echo>javac ${build.args}</echo>
383 <    <echo>classpath="${test.classpath}"</echo>
384 < -->
381 >    <javac srcdir="${tck.src.dir}"
382 >          destdir="${build.testcases.dir}"
383 >            debug="${build.debug}"
384 >       debuglevel="${build.debuglevel}"
385 >      deprecation="${build.deprecation}"
386 >           source="${build.sourcelevel}"
387 >             fork="true">
388 >
389 >      <compilerarg value="${bootclasspath.args}"/>
390 >      <compilerarg line="${build.args}"/>
391 >      
392 >      <classpath refid="test.classpath"/>
393 >
394 >    </javac>
395  
396      <javac srcdir="${test.src.dir}"
397            destdir="${build.testcases.dir}"
# Line 451 | Line 401
401             source="${build.sourcelevel}"
402               fork="true">
403  
404 +      <include name="jsr166/test/**"/>
405 +      
406 +      <compilerarg value="${bootclasspath.args}"/>
407        <compilerarg line="${build.args}"/>
408 +      
409        <classpath refid="test.classpath"/>
410 +
411 +    </javac>
412 +
413 + <!--
414 +    <javac srcdir="${jtreg.src.dir}"
415 +          destdir="${build.testcases.dir}"
416 +            debug="${build.debug}"
417 +       debuglevel="${build.debuglevel}"
418 +      deprecation="${build.deprecation}"
419 +           source="${build.sourcelevel}"
420 +             fork="true">
421 +
422 +      <compilerarg value="${bootclasspath.args}"/>
423 +      <compilerarg line="${build.args}"/>
424        
425 <      <include name="java/**"/>
458 <      <include name="jsr166/**"/>
425 >      <classpath refid="test.classpath"/>
426  
427      </javac>
428 + -->
429  
430    </target>
431  
# Line 477 | Line 445
445                      dir="${build.reports.dir}"
446                     fork="true">
447  
448 <      <jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
448 >      <jvmarg value="${bootclasspath.args}"/>
449 >      
450 >      <classpath refid="test.classpath"/>
451  
452        <formatter type="xml"/>
453  
454 <      <batchtest todir="${build.reports.dir}">
454 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
455 >        <fileset dir="${tck.src.dir}">
456 >          <include name="**/${testcase}Test.java"/>
457 >        </fileset>
458 >      </batchtest>
459 >      
460 >      <batchtest todir="${build.reports.dir}" if="do.test.old">
461          <fileset dir="${test.src.dir}">
462 <          <include name="java/**/${testcase}Test.java"/>
463 <          <include name="jsr166/**/${testcase}Test.java"/>
462 >          <include name="jsr166/test/**/${testcase}Test.java"/>
463 >        </fileset>
464 >      </batchtest>
465 >
466 > <!--      
467 >      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
468 >        <fileset dir="${jtreg.src.dir}">
469 >          <include name="**/${testcase}Test.java"/>
470          </fileset>
471        </batchtest>
472 + -->
473  
474      </junit>
475  
# Line 528 | Line 511
511      </condition>
512  
513      <property name="warnunchecked.arg" value=""/>
531    
532    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
533      <istrue value="${build.nothreads}"/>
534    </condition>
514  
515  
516      <!-- Common options in javac invocations -->
# Line 540 | Line 519
519    </target>
520  
521  
543  <target name="prepare-src"
544          depends="configure-compiler"
545          if="prepare.src.dir">
546
547    <mkdir dir="${prepare.src.dir}"/>
548    <copy todir="${prepare.src.dir}">
549      <fileset dir="${src.dir}">
550        <exclude name="java/lang/**"/>
551      </fileset>
552    </copy>
553
554  </target>
555
556
522    <target name="configure-tests"
523         depends="configure-compiler">
524  
# Line 561 | Line 526
526      <available property="junit.available"
527                 classname="junit.framework.Protectable"/>
528  
564    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
565          unless="junit.available"/>
566
529      <!-- Xalan -->
530      <available property="xalan.available"
531                 classname="org.apache.xalan.Version"/>
532  
533 +              
534 +    <!-- Ant 1.6beta and later don't need or want this check -->
535 +    <!--    
536 +    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
537 +          unless="junit.available"/>
538 +
539      <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
540            unless="xalan.available"/>
541 <
574 <
575 <    <!--
576 <     ! Bootclasspath munging for testing, so JUnit can test our local
577 <     ! modifications to java.*.
578 <     -->
579 <
580 <    <path id="test.classpath">
581 <      <pathelement location="${product.jar}"/>
582 <      <pathelement location="${rt.jar}"/>
583 <      <pathelement location="${junit.jar}"/>
584 <      <pathelement location="${build.testcases.dir}"/>
585 <    </path>
586 <
587 <    <path id="test.bootclasspath">
588 <      <path refid="test.classpath"/>
589 <    </path>
590 <
591 <    <!-- Flatten test classpaths into platform-appropriate strings -->
592 <    <property name="test.classpath"         refid="test.classpath"/>
593 <    <property name="test.bootclasspath"     refid="test.bootclasspath"/>
541 >    -->
542  
543    </target>
544  
# Line 642 | Line 590
590    </target>
591  
592  
593 <  <target name="ng" depends="test">
594 <    <java classname="SuperfluousAbstract" fork="true">
593 >  <!-- Standalone sample program -->
594 >  
595 >  <target name="sample" depends="jar">
596 >  
597 >    <mkdir dir="${build.testcases.dir}"/>
598 >    
599 >    <javac srcdir="${test.src.dir}"
600 >          destdir="${build.testcases.dir}"
601 >            debug="${build.debug}"
602 >       debuglevel="${build.debuglevel}"
603 >      deprecation="${build.deprecation}"
604 >           source="${build.sourcelevel}"
605 >             fork="true">
606 >            
607 >      <compilerarg value="${bootclasspath.args}"/>
608 >      <compilerarg line="${build.args}"/>
609 >      
610 >      <classpath refid="test.classpath"/>
611 >      
612 >      <include name="jsr166/test/Sample.java"/>
613 >      
614 >    </javac>
615 >    
616 >            
617 >    <java classname="jsr166.test.Sample" fork="true">
618 >      <jvmarg value="${bootclasspath.args}"/>
619 >      <classpath refid="test.classpath"/>
620 >    </java>
621 >  </target>
622  
623 <      <jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
623 >  
624 >  
625 >  <!-- C++ and JNI definitions and demos -->
626 >  
627 >  <target name="configure-cpp">
628  
629 +    <!-- Define tasks and types -->
630 +    
631 +    <path id="cpptasks.path">
632 +      <pathelement location="${lib.dir}/cpptasks.jar"/>
633 +    </path>
634 +    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
635 +    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
636 +    
637 +    <!-- Set platform property for JNI includes -->
638 +    
639 +    <condition property="platform" value="linux">
640 +      <os name="Linux"/>
641 +    </condition>
642 +    <condition property="platform" value="win32">
643 +      <os family="windows"/>
644 +    </condition>
645 +    <condition property="platform" value="solaris">
646 +      <os name="SunOS"/>
647 +    </condition>
648 +    
649 +  </target>
650 +  
651 +  
652 +  <target name="cppdemo" depends="configure-cpp">
653 +  
654 +    <mkdir dir="${build.dir}"/>
655 +    
656 +    <cc multithreaded="true"
657 +                 name="g++"
658 +               objdir="${build.dir}"
659 +              outfile="${build.dir}/CppDemo">
660 +      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
661 +      <libset libs="stdc++"/>
662 +    </cc>
663 +    
664 +    <exec executable="${build.dir}/CppDemo">
665 +      <arg line="count in word frequency of word in command line count"/>
666 +    </exec>
667 +    
668 +  </target>
669 +  
670 +  
671 +  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
672 +  
673 +    <mkdir dir="${build.testcases.dir}"/>
674 +    
675 +    <javac srcdir="${test.src.dir}"
676 +          destdir="${build.testcases.dir}"
677 +            debug="${build.debug}"
678 +       debuglevel="${build.debuglevel}"
679 +      deprecation="${build.deprecation}"
680 +           source="${build.sourcelevel}"
681 +             fork="true">
682 +      <compilerarg value="${bootclasspath.args}"/>
683 +      <compilerarg line="${build.args}"/>
684 +      <classpath refid="test.classpath"/>
685 +      <include name="JniDemo.java"/>
686 +    </javac>
687 +    
688 +    <javah destdir="${build.testcases.dir}"
689 +      classpathref="test.classpath">
690 +      <class name="JniDemo"/>
691 +    </javah>
692 +    
693 +    <cc multithreaded="true"
694 +                 name="g++"
695 +               objdir="${build.dir}"
696 +              outfile="${build.dir}/JniDemo"
697 +              outtype="shared">
698 +              
699 +      <compiler>
700 +        <defineset>
701 +          <define name="__int64" value="long long"/>
702 +        </defineset>
703 +        <includepath location="${java.home}/../include"/>
704 +        <includepath location="${java.home}/../include/${platform}"/>
705 +        <compilerarg value="-mno-cygwin"/>
706 +      </compiler>
707 +      
708 +      <linker>
709 +        <linkerarg value="--add-stdcall-alias"/>
710 +      </linker>
711 +      
712 +      <includepath location="${build.testcases.dir}"/>
713 +      
714 +      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
715 +      
716 +      <libset libs="stdc++"/>
717 +      
718 +    </cc>
719 +    
720 +    <!-- Necessary if windows, harmless if not -->
721 +    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
722 +    
723 +    <java classname="JniDemo" fork="true">
724 +      <!-- Watch out: path separator hardwired to semicolon here! -->
725 +      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
726 +      <classpath refid="test.classpath"/>
727      </java>
728 +    
729    </target>
730  
731  
732 +
733 +  <!-- Backward compatibility, work in progress (some files not checked in) -->
734 +
735 +
736 +
737 +  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
738 +  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
739 +  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
740 +  <property name="pretiger.sourcelevel" value="1.4"/>
741 +  
742 +  <target name="defang"
743 +       depends="init"
744 +   description="Generates pre-Tiger compatible source">
745 +  
746 +    <delete dir="${pretiger.src.dir}"/>
747 +    <mkdir dir="${pretiger.src.dir}"/>
748 +  
749 +    <exec executable="perl">
750 +      <arg file="etc/defang.pl"/>
751 +      <!-- <arg value="-v"/> -->
752 +      <arg value="-s"/> <arg file="${src.dir}"/>
753 +      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
754 +    </exec>
755 +    
756 +  </target>
757 +
758 +  <target name="compile-pretiger"
759 +          depends="init, configure-compiler, defang"
760 +          description="Compiles pre-Tiger sources to build folder">
761 +
762 +    <mkdir dir="${build.pretiger.dir}"/>
763 +
764 +    <javac srcdir="${pretiger.src.dir}"
765 +          destdir="${build.pretiger.dir}"
766 +            debug="${build.debug}"
767 +       debuglevel="${build.debuglevel}"
768 +      deprecation="${build.deprecation}"
769 +           source="${pretiger.sourcelevel}"
770 +             fork="true">
771 +
772 +      <compilerarg line="${build.args}"/>
773 +      <exclude name="**/Thread.java"/>
774 +
775 +    </javac>
776 +
777 +  </target>
778 +  
779 +  <target name="pretiger" depends="compile-pretiger">
780 +
781 +    <mkdir dir="${build.lib.dir}"/>
782 +    
783 +    <jar destfile="${pretiger.jar}">
784 +      <fileset dir="${build.pretiger.dir}">
785 +      </fileset>
786 +    </jar>
787 +    
788 +  </target>
789 +
790   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines