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.36 by tim, Thu May 29 17:29:08 2003 UTC vs.
Revision 1.64 by tim, Wed Mar 24 20:32:33 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 30 | Line 29
29    <!-- Build locations -->
30    <property name="build.dir"            location="build"/>
31    <property name="build.classes.dir"    location="${build.dir}/classes"/>
33  <property name="build.emulation.dir"  location="${build.dir}/emulation"/>
32    <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
33 +  <property name="build.j1.dir"         location="${build.dir}/j1"/>
34    <property name="build.lib.dir"        location="${build.dir}/lib"/>
35    <property name="build.ant.dir"        location="${build.dir}/ant"/>
36    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
38  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
37    <property name="build.reports.dir"    location="${build.dir}/reports"/>
38 +  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
39    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
40    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
41 +  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
42  
43    <!-- Source locations -->
44    <property name="src.dir"              location="${basedir}/src/main"/>
45  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
45    <property name="test.src.dir"         location="${basedir}/src/test"/>
46 +  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
47 +  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
48 +  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
49    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
50    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
51    <property name="lib.dir"              location="${basedir}/lib"/>
# Line 55 | Line 57
57    <!-- Jar locations -->
58    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
59    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
60 <  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
61 <
62 <
63 <
64 <  <!-- Files excluded from emulation and dist-docs -->
65 <  <patternset id="emulation.excludes">
66 <    <exclude name="java/util/Random.*"/>
67 <    <exclude name="sun/misc/Unsafe.*"/>
68 <  </patternset>
69 <
60 >  
61 >  <!-- Bootclasspath argument -->
62 >  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
63 >
64 >  <!-- Test classpath -->
65 >  <path id="test.classpath">
66 >    <pathelement location="${build.testcases.dir}"/>
67 >    <pathelement location="${junit.jar}"/>
68 >  </path>
69 >
70 >  <!-- Test classpath -->
71 >  <path id="j1.classpath">
72 >    <pathelement location="${build.j1.dir}"/>
73 >    <pathelement location="${junit.jar}"/>
74 >  </path>
75  
76  
77    <!-- Main targets -->
78  
79 +
80    <target name="compile"
81 <          depends="init, configure-compiler, prepare-src"
81 >          depends="init, configure-compiler"
82            description="Compiles main sources to build folder">
83  
76    <property name="prepare.src.dir" value="${src.dir}"/>
77
84      <mkdir dir="${build.classes.dir}"/>
85  
86 <    <javac srcdir="${prepare.src.dir}"
86 >    <javac srcdir="${src.dir}"
87            destdir="${build.classes.dir}"
88              debug="${build.debug}"
89         debuglevel="${build.debuglevel}"
# Line 85 | Line 91
91             source="${build.sourcelevel}"
92               fork="true">
93  
94 <      <bootclasspath refid="javac.bootclasspath"/>
89 <      <compilerarg line="${build.javac.args}"/>
94 >      <compilerarg line="${build.args}"/>
95  
96      </javac>
97  
98    </target>
99  
100  
96  <target name="jar"
97          depends="configure-emulation, init-jar, native-jar, emulation-jar"
98          description="Builds library jar from compiled sources"/>
99
101  
102 <  <target name="test"
103 <          depends="init, configure-tests, report-tests"
104 <          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
104 <
105 <
106 <  <target name="checkstyle"
107 <          depends="filter-src"
108 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
102 >  <target name="jar"
103 >          depends="compile"
104 >          description="Builds library jar from compiled sources">
105  
106 <    <taskdef resource="checkstyletask.properties"
111 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
106 >    <mkdir dir="${build.lib.dir}"/>
107  
108 <    <checkstyle>
109 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
110 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
116 <    </checkstyle>
108 >    <jar destfile="${product.jar}">
109 >      <fileset dir="${build.classes.dir}"/>
110 >    </jar>
111  
112    </target>
113  
114  
121  <target name="doccheck"
122          depends="filter-src"
123          description="Reports on javadoc style errors (not working yet)">
115  
116 <    <delete dir="${build.doccheck.dir}"/>
117 <    <mkdir dir="${build.doccheck.dir}"/>
118 <
128 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
129 <         docletpath="${lib.dir}/doccheck.jar"
130 <            destdir="${build.doccheck.dir}">
131 <      <packageset dir="${build.filter.src.dir}"/>
132 <    </javadoc>
116 >  <target name="test"
117 >          depends="init, configure-tests, report-tests"
118 >          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
119  
134  </target>
120  
121  
122    <target name="docs"
138          depends="filter-src"
123            description="Builds javadocs with custom tags to build folder">
124  
125      <delete dir="${build.javadocs.dir}"/>
# Line 144 | Line 128
128      <javadoc destdir="${build.javadocs.dir}"
129                  link="http://java.sun.com/j2se/1.4.1/docs/api"
130              overview="${src.dir}/intro.html"
131 <              source="${build.docsourcelevel}">
131 >              source="${build.sourcelevel}">
132  
133        <tag name="revised" description="Last revised:"/>
134        <tag name="spec"    description="Specified by:"/>
151      <tag name="editor"  description="Last edited by:"/>
152      <tag name="fixme"   description="FIX ME:"/>
135  
136 <      <packageset dir="${build.filter.src.dir}"/>
136 >      <packageset dir="${src.dir}"/>
137  
138      </javadoc>
139  
140    </target>
141  
142  
161  <target name="strip"
162          depends="init, configure-compiler"
163          description="Strip generics from java source (not working yet)">
143  
144 <    <mkdir dir="${build.stripped.dir}"/>
144 >  <target name="doccheck"
145 >          depends="filter-doccheck"
146 >          description="Reports on javadoc style errors">
147  
148 <    <!--
149 <     # javac -s doesn't reliably generate compilable code. It generates
169 <     # bridge methods (marked as "synthetic") that can have identical
170 <     # signatures to existing methods except for the return value.
171 <     -->
172 <    <javac srcdir="${src.dir}"
173 <          destdir="${build.stripped.dir}"
174 <            debug="${build.debug}"
175 <       debuglevel="${build.debuglevel}"
176 <      deprecation="${build.deprecation}"
177 <           source="${build.sourcelevel}"
178 <             fork="true">
148 >    <delete dir="${build.doccheck.dir}"/>
149 >    <mkdir dir="${build.doccheck.dir}"/>
150  
151 <      <bootclasspath refid="javac.bootclasspath"/>
152 <      <compilerarg line="${build.javac.args} -s"/>
151 >    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
152 >         docletpath="${lib.dir}/doccheck.jar"
153 >            destdir="${build.doccheck.dir}">
154 >      <packageset dir="${build.dc-filter.dir}"/>
155 >    </javadoc>
156  
157 <    </javac>
157 >    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
158 >
159 >  </target>
160 >
161 >
162 >
163 >  <target name="checkstyle"
164 >          depends="filter-src"
165 >          description="Reports on style errors in Java source (verbose, mostly chaff)">
166 >
167 >    <taskdef resource="checkstyletask.properties"
168 >            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
169 >
170 >    <mkdir dir="${build.checkstyle.dir}"/>
171 >    
172 >    <checkstyle config="etc/checkstyle/sun_checks.xml"
173 >       failOnViolation="false">
174 >      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
175 >      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
176 >    </checkstyle>
177 >    
178 >    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
179 >          out="${build.checkstyle.dir}/checkstyle-report.html"
180 >        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
181  
182    </target>
183  
184 +  
185  
186    <target name="dist"
187            depends="init, dist-clean, dist-jar, dist-docs"
188            description="Puts all distributable products in single hierarchy"/>
189  
190  
191 +
192 +  <target name="release"
193 +          depends="dist"
194 +          description="Puts entire CVS tree, plus distribution productions, in a jar">
195 +
196 +    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
197 +
198 +    <jar basedir="${basedir}" destfile="${release.jar}">
199 +      <!-- <exclude name="build/**"/> -->
200 +      <exclude name="${release.jar}"/>
201 +      <exclude name="user.properties"/>
202 +      <exclude name="etc/notes/**"/>
203 +      <exclude name="src/emulation/**"/>
204 +      <exclude name="**/SyntaxTest.java"/>
205 +      <exclude name="**/SuperfluousAbstract.java"/>
206 +    </jar>
207 +
208 +  </target>
209 +
210 +
211 +
212    <target name="clean"
213            description="Removes all build products">
214  
# Line 200 | Line 219
219    </target>
220  
221  
222 +
223    <target name="dist-clean"
224            description="Removes all build and distribution products">
225  
# Line 208 | Line 228
228    </target>
229  
230  
231 +
232    <target name="dist-docs"
212          depends="filter-src"
233            description="Builds javadocs without custom tags to dist folder">
234  
235      <delete dir="${dist.javadocs.dir}"/>
236      <mkdir dir="${dist.javadocs.dir}"/>
237  
238      <javadoc destdir="${dist.javadocs.dir}"
239 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
239 >                link="http://java.sun.com/j2se/1.4.2/docs/api"
240              overview="${src.dir}/intro.html"
241 <              source="${build.docsourcelevel}">
241 >              source="${build.sourcelevel}">
242  
243 <      <packageset dir="${build.filter.src.dir}"/>
243 >      <packageset dir="${src.dir}"/>
244  
245      </javadoc>
246  
# Line 236 | Line 256
256      <!-- Version is kept in a separate file -->
257      <loadfile property="version" srcFile="version.properties"/>
258      <echo>Building JSR-166 version ${version}</echo>
259 +    <echo>java.home is ${java.home}</echo>
260  
261    </target>
262 <
263 <
243 <  <target name="init-jar">
244 <
245 <    <mkdir dir="${build.lib.dir}"/>
246 <
247 <  </target>
248 <
249 <
250 <  <target name="native-jar"
251 <          depends="compile"
252 <          unless="build.emulation.true">
253 <
254 <    <jar destfile="${product.jar}">
255 <      <fileset dir="${build.classes.dir}"/>
256 <    </jar>
257 <
258 <  </target>
259 <
260 <
261 <  <target name="compile-emulation"
262 <          depends="init, configure-compiler"
263 <          if="build.emulation.true">
264 <
265 <    <mkdir dir="${build.emulation.dir}"/>
266 <
267 <    <javac srcdir="${emulation.src.dir}"
268 <          destdir="${build.emulation.dir}"
269 <            debug="${build.debug}"
270 <       debuglevel="${build.debuglevel}"
271 <      deprecation="${build.deprecation}"
272 <           source="${build.sourcelevel}"
273 <             fork="true">
274 <
275 <      <bootclasspath refid="javac.bootclasspath"/>
276 <      <compilerarg line="${build.javac.args}"/>
277 <
278 <    </javac>
279 <
280 <  </target>
281 <
282 <
283 <  <target name="emulation-jar"
284 <          depends="compile-emulation"
285 <          if="build.emulation.true">
286 <
287 <
288 <    <jar destfile="${product.jar}" duplicate="add">
289 <      <fileset dir="${build.classes.dir}">
290 <        <patternset refid="emulation.excludes"/>
291 <      </fileset>
292 <      <fileset dir="${build.emulation.dir}"/>
293 <    </jar>
294 <
295 <  </target>
296 <
297 <
262 >  
263 >  
264    <target name="dist-jar"
265            depends="clean, jar">
266  
# Line 327 | Line 293
293        </fileset>
294      </copy>
295  
330    <!-- Not needed now, used for doccheck filtering:
331    <property name="generic.declarations"
332             value="public interface E {} public interface T {} public interface K {} public interface V {}"
333    />
334    -->
335
296      <copy todir="${build.filter.src.dir}">
297        <fileset dir="${src.dir}">
298          <exclude name="**/*.html"/>
299 <        <patternset refid="emulation.excludes"/>
299 >        <!-- Files excluded from dist-docs -->
300 >        <exclude name="java/util/Random.*"/>
301 >        <exclude name="sun/misc/Unsafe.*"/>
302        </fileset>
303 +      <!--
304        <filterchain>
305 +      -->
306  
307          <!--
308           # This filter gets rid of angle-bracketed type parameters
# Line 352 | Line 316
316           #   tweaking.)
317           -->
318  
319 +        <!--
320          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
321                        classpath="${build.ant.dir}">
322            <param name="notmatching" value="^\s+\*\s.*$"/>
323            <param name="pattern"     value="&lt;[^|>()]+?>+"/>
324            <param name="replacement" value=" "/>
325          </filterreader>
326 +        -->
327  
328 +      <!--
329 +      </filterchain>
330 +      -->
331 +    </copy>
332  
333 <        <!--
364 <         # This filter uncomments lines beginning with "//@" so that
365 <         # javadoc can see imports that are needed to resolve links
366 <         # but that shouldn't be in the compiled code.
367 <         -->
333 >  </target>
334  
369        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
370                      classpath="${build.ant.dir}">
371          <param name="matching"    value="^//@.*$"/>
372          <param name="pattern"     value="^//@"/>
373          <param name="replacement" value=""/>
374        </filterreader>
335  
336 +  <target name="filter-doccheck"
337 +          depends="filter-src">
338 +
339 +    <mkdir dir="${build.dc-filter.dir}"/>
340 +
341 +    <copy todir="${build.dc-filter.dir}">
342 +      <fileset dir="${build.filter.src.dir}">
343 +        <include name="**/*.html"/>
344 +      </fileset>
345 +    </copy>
346 +
347 +    <property name="generic.declarations"
348 +             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 {}"
349 +    />
350  
351 +    <copy todir="${build.dc-filter.dir}">
352 +      <fileset dir="${build.filter.src.dir}">
353 +        <exclude name="**/*.html"/>
354 +      </fileset>
355 +      <filterchain>
356          <!--
357 <         # The next two filters try to make the source look like
357 >         # These two filters try to make the source look like
358           # something that doccheck can process. The first removes
359           # -source 1.4 assertions and the second adds in a bunch
360           # of single letter public nested marker interfaces so that
361           # the generic type parameters are recognized.
383         #
384         # Currently commented out because doccheck doesn't work. :-(
362           -->
363  
387        <!--
364          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
365                        classpath="${build.ant.dir}">
366            <param name="matching"    value="^\s*assert[\s ].*$"/>
# Line 394 | Line 370
370  
371          <filterreader classname="jsr166.ant.filters.ReplaceFilter"
372                        classpath="${build.ant.dir}">
373 <          <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
373 >          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
374            <param name="pattern"     value="$"/>
375            <param name="replacement" value=" ${generic.declarations}"/>
376          </filterreader>
401        -->
377  
378        </filterchain>
379      </copy>
# Line 411 | Line 386
386  
387      <mkdir dir="${build.testcases.dir}"/>
388  
389 +    <javac srcdir="${tck.src.dir}"
390 +          destdir="${build.testcases.dir}"
391 +            debug="${build.debug}"
392 +       debuglevel="${build.debuglevel}"
393 +      deprecation="${build.deprecation}"
394 +           source="${build.sourcelevel}"
395 +             fork="true">
396 +
397 +      <compilerarg value="${bootclasspath.args}"/>
398 +      <compilerarg line="${build.args}"/>
399 +      
400 +      <classpath refid="test.classpath"/>
401 +
402 +    </javac>
403 +
404      <javac srcdir="${test.src.dir}"
405            destdir="${build.testcases.dir}"
406              debug="${build.debug}"
# Line 419 | Line 409
409             source="${build.sourcelevel}"
410               fork="true">
411  
412 +      <include name="jsr166/test/**"/>
413 +      
414 +      <compilerarg value="${bootclasspath.args}"/>
415 +      <compilerarg line="${build.args}"/>
416 +      
417        <classpath refid="test.classpath"/>
423      <bootclasspath refid="javac.bootclasspath"/>
424      <compilerarg line="${build.javac.args}"/>
418  
419      </javac>
420  
421 + <!--
422 +    <javac srcdir="${jtreg.src.dir}"
423 +          destdir="${build.testcases.dir}"
424 +            debug="${build.debug}"
425 +       debuglevel="${build.debuglevel}"
426 +      deprecation="${build.deprecation}"
427 +           source="${build.sourcelevel}"
428 +             fork="true">
429 +
430 +      <compilerarg value="${bootclasspath.args}"/>
431 +      <compilerarg line="${build.args}"/>
432 +      
433 +      <classpath refid="test.classpath"/>
434 +
435 +    </javac>
436 + -->
437 +
438    </target>
439  
440  
# Line 443 | Line 453
453                      dir="${build.reports.dir}"
454                     fork="true">
455  
456 <      <jvmarg value="${test.bootclasspath.arg}"/>
456 >      <jvmarg value="${bootclasspath.args}"/>
457 >      <jvmarg value="-server"/>
458 >      <jvmarg value="-showversion"/>
459 >      
460 >      <classpath refid="test.classpath"/>
461  
462        <formatter type="xml"/>
463  
464 <      <batchtest todir="${build.reports.dir}">
464 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
465 >        <fileset dir="${tck.src.dir}">
466 >          <include name="**/${testcase}Test.java"/>
467 >        </fileset>
468 >      </batchtest>
469 >      
470 >      <batchtest todir="${build.reports.dir}" if="do.test.old">
471          <fileset dir="${test.src.dir}">
472 +          <include name="jsr166/test/**/${testcase}Test.java"/>
473 +        </fileset>
474 +      </batchtest>
475 +
476 + <!--      
477 +      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
478 +        <fileset dir="${jtreg.src.dir}">
479            <include name="**/${testcase}Test.java"/>
480          </fileset>
481        </batchtest>
482 + -->
483  
484      </junit>
485  
# Line 461 | Line 489
489    <target name="report-tests"
490            depends="run-tests">
491  
492 <    <!-- Sets junit.report.format to frames if Xalan is present,
492 >    <!-- Sets junit.report.format to frames if redirection is present,
493           otherwise sets it to noframes. -->
494      <available property="junit.report.format"
495                    value="frames"
# Line 486 | Line 514
514  
515    <target name="configure-compiler">
516  
517 <    <property name="gjc.version"
490 <             value="2.0"/>
517 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
518  
519 <    <condition property="build.novariance" value="-novariance">
520 <      <and>
494 <        <equals arg1="${gjc.version}" arg2="2.0"/>
495 <        <or>
496 <          <not><isset property="gjc.novariance"/></not>
497 <          <istrue value="${gjc.novariance}"/>
498 <        </or>
499 <      </and>
519 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
520 >      <istrue value="${build.warnunchecked}"/>
521      </condition>
522  
523 <    <property name="build.novariance"
503 <             value=""/>
504 <
505 <    <property name="gjc.dir"
506 <             value="${lib.dir}/gjc"/>
523 >    <property name="warnunchecked.arg" value=""/>
524  
508    <property name="javac.jar"
509          location="${gjc.dir}/${gjc.version}/javac.jar"/>
525  
526 <    <property name="collect.jar"
527 <          location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>
526 >    <!-- Common options in javac invocations -->
527 >    <property name="build.args" value="${warnunchecked.arg}"/>
528  
529 +  </target>
530  
515    <condition property="build.warnunchecked" value="-warnunchecked">
516      <istrue value="${gjc.warnunchecked}"/>
517    </condition>
531  
532 <    <property name="build.warnunchecked" value=""/>
532 >  <target name="configure-tests"
533 >       depends="configure-compiler">
534  
535 <    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
536 <      <istrue value="${build.nothreads}"/>
537 <    </condition>
535 >    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
536 >    <available property="junit.available"
537 >               classname="junit.framework.Protectable"/>
538  
539 +    <!-- Xalan -->
540 +    <available property="xalan.available"
541 +               classname="org.apache.xalan.Version"/>
542 +
543 +              
544 +    <!-- Ant 1.6beta and later don't need or want this check -->
545 +    <!--    
546 +    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
547 +          unless="junit.available"/>
548  
549 <    <!--
550 <     ! Bootclasspath munging for source compilation.
551 <     -->
529 <
530 <    <path id="javac.bootclasspath.prefix">
531 <      <!-- <pathelement location="${src.dir}"/> -->
532 <      <pathelement location="${javac.jar}"/>
533 <    </path>
549 >    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
550 >          unless="xalan.available"/>
551 >    -->
552  
553 <    <path id="javac.bootclasspath">
536 <      <!-- <pathelement location="${src.dir}"/> -->
537 <      <pathelement location="${collect.jar}"/>
538 <      <pathelement location="${rt.jar}"/>
539 <    </path>
553 >  </target>
554  
541    <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
542    <property name="javac.bootclasspath.prefix"
543             refid="javac.bootclasspath.prefix"/>
544
545    <!-- Turn the flattened bootclasspath prefix into a javac argument -->
546    <property name="build.bootclasspath.arg"
547             value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
548
549    <!-- Flatten bootclasspath for trace message -->
550    <property name="javac.bootclasspath"
551             refid="javac.bootclasspath"/>
555  
553    <!-- Common options in javac invocations -->
554    <property name="build.javac.args"
555             value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
556  
557 <    <echo>javac ${build.javac.args}</echo>
558 <    <echo>bootclasspath=${javac.bootclasspath}</echo>
557 >  <!-- Anthill targets -->
558  
559 +  <target name="anthill-build">
560 +  
561 +    <!-- Override this in user.properties -->
562 +    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
563 +    
564 +    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
565 +      <arg value="-Xmx256000000"/>
566 +      <!-- classpath of new JVM -->
567 +      <arg value="-classpath"/> <arg path="${java.class.path}"/>
568 +      <!-- location of Ant home directory -->
569 +      <arg value="-Dant.home=${ant.home}"/>
570 +      <!-- the Ant main class -->
571 +      <arg value="org.apache.tools.ant.Main"/>
572 +      <!-- The build file -->
573 +      <arg value="-buildfile"/>  <arg value="build.xml"/>
574 +      <!-- the target to build on the new Ant instance -->
575 +      <arg value="-DJAVA_HOME=${tiger.home}"/>
576 +      <arg value="do-anthill-build"/>
577 +    </exec>
578    </target>
579 +  
580 +  <target name="do-anthill-build"
581 +          depends="jar, test, docs, dist-docs"/>
582  
583 +  <target name="anthill-publish">
584  
585 <  <target name="prepare-src"
586 <          depends="configure-compiler"
587 <          if="prepare.src.dir">
585 >    <copy todir="${deployDir}/docs/private">
586 >      <fileset dir="${build.javadocs.dir}"/>
587 >    </copy>
588  
589 <    <mkdir dir="${prepare.src.dir}"/>
590 <    <copy todir="${prepare.src.dir}">
569 <      <fileset dir="${src.dir}">
570 <        <exclude name="java/lang/**"/>
571 <      </fileset>
589 >    <copy todir="${deployDir}/docs/public">
590 >      <fileset dir="${dist.javadocs.dir}"/>
591      </copy>
592  
593 <  </target>
593 >    <copy tofile="${deployDir}/index.html"
594 >          file="${basedir}/etc/anthill-index.html"/>
595  
596 +    <copy todir="${deployDir}/notes">
597 +      <fileset dir="${basedir}/etc/notes"/>
598 +    </copy>
599  
600 <  <target name="configure-emulation">
600 >  </target>
601  
579    <condition property="build.emulation.true">
580      <or>
581        <and>
582          <os family="windows"/>
583          <not>
584            <isset property="build.emulation"/>
585          </not>
586        </and>
587        <istrue value="${build.emulation}"/>
588      </or>
589    </condition>
602  
603 +  <!-- Standalone sample program -->
604 +  
605 +  <target name="sample" depends="">
606 +  
607 +    <mkdir dir="${build.testcases.dir}"/>
608 +    
609 +    <javac srcdir="${test.src.dir}"
610 +          destdir="${build.testcases.dir}"
611 +            debug="${build.debug}"
612 +       debuglevel="${build.debuglevel}"
613 +      deprecation="${build.deprecation}"
614 +           source="${build.sourcelevel}"
615 +             fork="true">
616 +      
617 +      <!--
618 +      <compilerarg value="${bootclasspath.args}"/>
619 +      <compilerarg line="${build.args}"/>
620 +      
621 +      <classpath refid="test.classpath"/>
622 +      -->
623 +      
624 +      <include name="jsr166/test/Sample.java"/>
625 +      
626 +    </javac>
627 +    
628 +    <copy todir="${build.testcases.dir}">
629 +      <fileset dir="${test.src.dir}">
630 +        <include name="**/*.properties"/>
631 +      </fileset>
632 +    </copy>
633 +  
634 +            
635 +    <java classname="jsr166.test.Sample" fork="true">
636 +      <jvmarg value="${bootclasspath.args}"/>
637 +      <!-- <jvmarg value="-server"/> -->
638 +      <!-- <jvmarg value="-ea"/> -->
639 +      <classpath refid="test.classpath"/>
640 +      <!-- <arg value="1000"/> -->
641 +    </java>
642    </target>
643  
644  
645 <  <target name="configure-tests">
645 >  <!-- BoF demos -->
646 >  
647 >  <target name="j1" depends="jar">
648 >  
649 >    <mkdir dir="${build.j1.dir}"/>
650 >    
651 >    <javac srcdir="${j1.src.dir}"
652 >          destdir="${build.j1.dir}"
653 >            debug="${build.debug}"
654 >       debuglevel="${build.debuglevel}"
655 >      deprecation="${build.deprecation}"
656 >           source="${build.sourcelevel}"
657 >             fork="true">
658 >            
659 >      <compilerarg value="${bootclasspath.args}"/>
660 >      <compilerarg line="${build.args}"/>
661 >      
662 >      <classpath refid="j1.classpath"/>
663 >      
664 >    </javac>
665 >    
666 > <!--
667 >    <java classname="MainClass" fork="true">
668 >      <jvmarg value="${bootclasspath.args}"/>
669 >      <classpath refid="j1.classpath"/>
670 >    </java>
671 > -->
672  
673 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
674 <    <available property="junit.available"
675 <               classname="junit.framework.Protectable"/>
673 >    <junit printsummary="true"
674 >             showoutput="true"
675 >          errorProperty="junit.failed"
676 >        failureProperty="junit.failed"
677 >                    dir="${build.j1.dir}"
678 >                   fork="true">
679  
680 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
681 <          unless="junit.available"/>
680 >      <jvmarg value="${bootclasspath.args}"/>
681 >      <jvmarg value="-server"/>
682 >      
683 >      <classpath refid="j1.classpath"/>
684  
685 +      <formatter type="xml"/>
686  
687 <    <!--
688 <     ! Bootclasspath munging for testing, so JUnit can test our local
689 <     ! modifications to java.*.
690 <     -->
691 <
692 <    <path id="test.classpath">
693 <      <pathelement location="${product.jar}"/>
694 <      <pathelement location="${build.testcases.dir}"/>
695 <      <pathelement location="${junit.jar}"/>
696 <    </path>
687 >      <batchtest todir="${build.j1.dir}">
688 >        <fileset dir="${j1.src.dir}">
689 >          <include name="**/*Test.java"/>
690 >        </fileset>
691 >      </batchtest>
692 >
693 >    </junit>
694 >
695 >    <!-- Sets junit.report.format to frames if redirection is present,
696 >         otherwise sets it to noframes. -->
697 >    <available property="junit.report.format"
698 >                  value="frames"
699 >              classname="org.apache.xalan.lib.Redirect"
700 >    />
701 >    <property name="junit.report.format" value="noframes"/>
702  
703 <    <!-- Flatten test classpath into a platform-appropriate string -->
704 <    <property name="test.classpath" refid="test.classpath"/>
703 >    <junitreport todir="${build.j1.dir}">
704 >      <fileset dir="${build.j1.dir}">
705 >        <include name="TEST-*.xml"/>
706 >      </fileset>
707 >      <report styledir="${stylesheet.dir}"
708 >                format="${junit.report.format}"
709 >                 todir="${build.j1.dir}"
710 >      />
711 >    </junitreport>
712  
713 <    <!-- Turn the flattened test classpath into a javac argument -->
619 <    <property name="test.bootclasspath.arg"
620 <             value='-Xbootclasspath/p:${test.classpath}'/>
713 >    <fail message="Test Cases Failed" if="junit.failed"/>
714  
715    </target>
716  
717 +  
718 +  
719 +  <!-- C++ and JNI definitions and demos -->
720 +  
721 +  <target name="configure-cpp">
722 +
723 +    <!-- Define tasks and types -->
724 +    
725 +    <path id="cpptasks.path">
726 +      <pathelement location="${lib.dir}/cpptasks.jar"/>
727 +    </path>
728 +    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
729 +    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
730 +    
731 +    <!-- Set platform property for JNI includes -->
732 +    
733 +    <condition property="platform" value="linux">
734 +      <os name="Linux"/>
735 +    </condition>
736 +    <condition property="platform" value="win32">
737 +      <os family="windows"/>
738 +    </condition>
739 +    <condition property="platform" value="solaris">
740 +      <os name="SunOS"/>
741 +    </condition>
742 +    
743 +  </target>
744 +  
745 +  
746 +  <target name="cppdemo" depends="configure-cpp">
747 +  
748 +    <mkdir dir="${build.dir}"/>
749 +    
750 +    <cc multithreaded="true"
751 +                 name="g++"
752 +               objdir="${build.dir}"
753 +              outfile="${build.dir}/CppDemo">
754 +      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
755 +      <libset libs="stdc++"/>
756 +    </cc>
757 +    
758 +    <exec executable="${build.dir}/CppDemo">
759 +      <arg line="count in word frequency of word in command line count"/>
760 +    </exec>
761 +    
762 +  </target>
763 +  
764 +  
765 +  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
766 +  
767 +    <mkdir dir="${build.testcases.dir}"/>
768 +    
769 +    <javac srcdir="${test.src.dir}"
770 +          destdir="${build.testcases.dir}"
771 +            debug="${build.debug}"
772 +       debuglevel="${build.debuglevel}"
773 +      deprecation="${build.deprecation}"
774 +           source="${build.sourcelevel}"
775 +             fork="true">
776 +      <compilerarg value="${bootclasspath.args}"/>
777 +      <compilerarg line="${build.args}"/>
778 +      <classpath refid="test.classpath"/>
779 +      <include name="JniDemo.java"/>
780 +    </javac>
781 +    
782 +    <javah destdir="${build.testcases.dir}"
783 +      classpathref="test.classpath">
784 +      <class name="JniDemo"/>
785 +    </javah>
786 +    
787 +    <cc multithreaded="true"
788 +                 name="g++"
789 +               objdir="${build.dir}"
790 +              outfile="${build.dir}/JniDemo"
791 +              outtype="shared">
792 +              
793 +      <compiler>
794 +        <defineset>
795 +          <define name="__int64" value="long long"/>
796 +        </defineset>
797 +        <includepath location="${java.home}/../include"/>
798 +        <includepath location="${java.home}/../include/${platform}"/>
799 +        <compilerarg value="-mno-cygwin"/>
800 +      </compiler>
801 +      
802 +      <linker>
803 +        <linkerarg value="--add-stdcall-alias"/>
804 +      </linker>
805 +      
806 +      <includepath location="${build.testcases.dir}"/>
807 +      
808 +      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
809 +      
810 +      <libset libs="stdc++"/>
811 +      
812 +    </cc>
813 +    
814 +    <!-- Necessary if windows, harmless if not -->
815 +    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
816 +    
817 +    <java classname="JniDemo" fork="true">
818 +      <!-- Watch out: path separator hardwired to semicolon here! -->
819 +      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
820 +      <classpath refid="test.classpath"/>
821 +      <arg line="count in word frequency of word in command line count"/>
822 +    </java>
823 +    
824 +  </target>
825  
826  
626  <!-- Anthill targets -->
827  
828 <  <target name="anthill-build"
629 <          depends="jar, test, docs, dist-docs"/>
828 >  <!-- Backward compatibility, work in progress (some files not checked in) -->
829  
631  <target name="anthill-publish">
830  
633    <copy todir="${deployDir}/docs/private">
634      <fileset dir="${build.javadocs.dir}"/>
635    </copy>
831  
832 <    <copy todir="${deployDir}/docs/public">
833 <      <fileset dir="${dist.javadocs.dir}"/>
834 <    </copy>
832 >  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
833 >  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
834 >  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
835 >  <property name="pretiger.sourcelevel" value="1.4"/>
836 >  
837 >  <target name="defang"
838 >       depends="init"
839 >   description="Generates pre-Tiger compatible source">
840 >  
841 >    <delete dir="${pretiger.src.dir}"/>
842 >    <mkdir dir="${pretiger.src.dir}"/>
843 >  
844 >    <exec executable="perl">
845 >      <arg file="etc/defang.pl"/>
846 >      <!-- <arg value="-v"/> -->
847 >      <arg value="-s"/> <arg file="${src.dir}"/>
848 >      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
849 >    </exec>
850 >    
851 >  </target>
852  
853 <    <copy tofile="${deployDir}/index.html"
854 <          file="${basedir}/etc/anthill-index.html"/>
853 >  <target name="compile-pretiger"
854 >          depends="init, configure-compiler, defang"
855 >          description="Compiles pre-Tiger sources to build folder">
856  
857 <    <copy todir="${deployDir}/notes">
858 <      <fileset dir="${basedir}/etc/notes"/>
859 <    </copy>
857 >    <mkdir dir="${build.pretiger.dir}"/>
858 >
859 >    <javac srcdir="${pretiger.src.dir}"
860 >          destdir="${build.pretiger.dir}"
861 >            debug="${build.debug}"
862 >       debuglevel="${build.debuglevel}"
863 >      deprecation="${build.deprecation}"
864 >           source="${pretiger.sourcelevel}"
865 >             fork="true">
866 >
867 >      <compilerarg line="${build.args}"/>
868 >      <exclude name="**/Thread.java"/>
869 >
870 >    </javac>
871  
872    </target>
873 +  
874 +  <target name="pretiger" depends="compile-pretiger">
875  
876 +    <mkdir dir="${build.lib.dir}"/>
877 +    
878 +    <jar destfile="${pretiger.jar}">
879 +      <fileset dir="${build.pretiger.dir}">
880 +      </fileset>
881 +    </jar>
882 +    
883 +  </target>
884  
885   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines