30 |
|
<!-- Build locations --> |
31 |
|
<property name="build.dir" location="build"/> |
32 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
33 |
– |
<property name="build.emulation.dir" location="${build.dir}/emulation"/> |
33 |
|
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
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"/> |
37 |
+ |
<property name="build.sinjdocs.dir" location="${build.dir}/sinjdocs"/> |
38 |
|
<property name="build.stripped.dir" location="${build.dir}/stripped"/> |
39 |
|
<property name="build.reports.dir" location="${build.dir}/reports"/> |
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"/> |
44 |
|
|
45 |
|
<!-- Source locations --> |
46 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
45 |
– |
<property name="emulation.src.dir" location="${basedir}/src/emulation"/> |
47 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
48 |
|
<property name="ant.src.dir" location="${basedir}/etc/ant"/> |
49 |
|
<property name="stylesheet.dir" location="${basedir}/etc/xsl"/> |
57 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
58 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
59 |
|
<property name="rt.jar" location="${java.home}/lib/rt.jar"/> |
60 |
+ |
<property name="sinjdoc.jar" location="${lib.dir}/sinjdoc.jar"/> |
61 |
|
|
62 |
|
|
63 |
< |
|
64 |
< |
<!-- Files excluded from emulation and dist-docs --> |
63 |
< |
<patternset id="emulation.excludes"> |
63 |
> |
<!-- Files excluded from dist-docs --> |
64 |
> |
<patternset id="docs.exclusion"> |
65 |
|
<exclude name="java/util/Random.*"/> |
66 |
|
<exclude name="sun/misc/Unsafe.*"/> |
67 |
|
</patternset> |
78 |
|
|
79 |
|
<mkdir dir="${build.classes.dir}"/> |
80 |
|
|
80 |
– |
<!-- |
81 |
– |
<echo>javac ${gjc.args}</echo> |
82 |
– |
<echo>bootclasspath=${compile.bootclasspath}</echo> |
83 |
– |
--> |
84 |
– |
|
81 |
|
<javac srcdir="${prepare.src.dir}" |
82 |
|
destdir="${build.classes.dir}" |
83 |
|
debug="${build.debug}" |
86 |
|
source="${build.sourcelevel}" |
87 |
|
fork="true"> |
88 |
|
|
89 |
< |
<compilerarg line="${gjc.args}"/> |
94 |
< |
<bootclasspath refid="compile.bootclasspath"/> |
89 |
> |
<compilerarg line="${build.args}"/> |
90 |
|
|
91 |
|
</javac> |
92 |
|
|
94 |
|
|
95 |
|
|
96 |
|
<target name="jar" |
97 |
< |
depends="configure-emulation, init-jar, native-jar, emulation-jar" |
97 |
> |
depends="init-jar, native-jar" |
98 |
|
description="Builds library jar from compiled sources"/> |
99 |
|
|
100 |
|
|
108 |
|
description="Reports on style errors in Java source (verbose, mostly chaff)"> |
109 |
|
|
110 |
|
<taskdef resource="checkstyletask.properties" |
111 |
< |
classpath="${lib.dir}/checkstyle-all-2.4.jar"/> |
111 |
> |
classpath="${lib.dir}/checkstyle-all-3.1.jar"/> |
112 |
|
|
113 |
< |
<checkstyle> |
114 |
< |
<formatter type="plain"/> <!-- also available: type="xml" --> |
113 |
> |
<mkdir dir="${build.checkstyle.dir}"/> |
114 |
> |
|
115 |
> |
<checkstyle config="etc/checkstyle/sun_checks.xml" |
116 |
> |
failOnViolation="false"> |
117 |
> |
<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/> |
118 |
|
<fileset dir="${build.filter.src.dir}" includes="**/*.java"/> |
119 |
|
</checkstyle> |
120 |
+ |
|
121 |
+ |
<style in="${build.checkstyle.dir}/checkstyle-report.xml" |
122 |
+ |
out="${build.checkstyle.dir}/checkstyle-report.html" |
123 |
+ |
style="${stylesheet.dir}/checkstyle-frames.xsl"/> |
124 |
|
|
125 |
|
</target> |
126 |
|
|
127 |
|
|
128 |
|
<target name="doccheck" |
129 |
< |
depends="filter-src" |
130 |
< |
description="Reports on javadoc style errors (not working yet)"> |
129 |
> |
depends="filter-doccheck" |
130 |
> |
description="Reports on javadoc style errors"> |
131 |
|
|
132 |
|
<delete dir="${build.doccheck.dir}"/> |
133 |
|
<mkdir dir="${build.doccheck.dir}"/> |
135 |
|
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
136 |
|
docletpath="${lib.dir}/doccheck.jar" |
137 |
|
destdir="${build.doccheck.dir}"> |
138 |
< |
<packageset dir="${build.filter.src.dir}"/> |
138 |
> |
<packageset dir="${build.dc-filter.dir}"/> |
139 |
|
</javadoc> |
140 |
|
|
141 |
+ |
<echo>DocCheck output is in ${build.doccheck.dir}</echo> |
142 |
+ |
|
143 |
|
</target> |
144 |
|
|
145 |
|
|
157 |
|
|
158 |
|
<tag name="revised" description="Last revised:"/> |
159 |
|
<tag name="spec" description="Specified by:"/> |
156 |
– |
<tag name="editor" description="Last edited by:"/> |
157 |
– |
<tag name="fixme" description="FIX ME:"/> |
160 |
|
|
161 |
|
<packageset dir="${build.filter.src.dir}"/> |
162 |
|
|
165 |
|
</target> |
166 |
|
|
167 |
|
|
168 |
< |
<target name="strip" |
169 |
< |
depends="init, configure-compiler" |
170 |
< |
description="Strip generics from java source (not working yet)"> |
168 |
> |
<target name="sinjdocs" |
169 |
> |
depends="configure-tests" |
170 |
> |
description="Builds javadocs with custom tags to build folder"> |
171 |
|
|
172 |
< |
<mkdir dir="${build.stripped.dir}"/> |
172 |
> |
<delete dir="${build.sinjdocs.dir}"/> |
173 |
> |
<mkdir dir="${build.sinjdocs.dir}"/> |
174 |
|
|
175 |
< |
<!-- |
173 |
< |
# javac -s doesn't reliably generate compilable code. It generates |
174 |
< |
# bridge methods (marked as "synthetic") that can have identical |
175 |
< |
# signatures to existing methods except for the return value. |
176 |
< |
--> |
177 |
< |
<javac srcdir="${src.dir}" |
178 |
< |
destdir="${build.stripped.dir}" |
179 |
< |
debug="${build.debug}" |
180 |
< |
debuglevel="${build.debuglevel}" |
181 |
< |
deprecation="${build.deprecation}" |
182 |
< |
source="${build.sourcelevel}" |
183 |
< |
fork="true"> |
175 |
> |
<java classname="net.cscott.sinjdoc.Main" fork="true"> |
176 |
|
|
177 |
< |
<compilerarg line="${gjc.args} -s"/> |
186 |
< |
<bootclasspath refid="compile.bootclasspath"/> |
177 |
> |
<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/> |
178 |
|
|
179 |
< |
</javac> |
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 |
|
|
209 |
|
description="Puts all distributable products in single hierarchy"/> |
210 |
|
|
211 |
|
|
212 |
+ |
<target name="release" |
213 |
+ |
depends="dist" |
214 |
+ |
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
215 |
+ |
|
216 |
+ |
<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/> |
217 |
+ |
|
218 |
+ |
<jar basedir="${basedir}" destfile="${release.jar}"> |
219 |
+ |
<!-- <exclude name="build/**"/> --> |
220 |
+ |
<exclude name="${release.jar}"/> |
221 |
+ |
<exclude name="user.properties"/> |
222 |
+ |
<exclude name="etc/notes/**"/> |
223 |
+ |
<exclude name="src/emulation/**"/> |
224 |
+ |
<exclude name="**/SyntaxTest.java"/> |
225 |
+ |
<exclude name="**/SuperfluousAbstract.java"/> |
226 |
+ |
</jar> |
227 |
+ |
|
228 |
+ |
</target> |
229 |
+ |
|
230 |
|
<target name="clean" |
231 |
|
description="Removes all build products"> |
232 |
|
|
273 |
|
<!-- Version is kept in a separate file --> |
274 |
|
<loadfile property="version" srcFile="version.properties"/> |
275 |
|
<echo>Building JSR-166 version ${version}</echo> |
276 |
+ |
<echo>java.home is ${java.home}</echo> |
277 |
|
|
278 |
|
</target> |
279 |
|
|
286 |
|
|
287 |
|
|
288 |
|
<target name="native-jar" |
289 |
< |
depends="compile" |
257 |
< |
unless="build.emulation.true"> |
289 |
> |
depends="compile"> |
290 |
|
|
291 |
|
<jar destfile="${product.jar}"> |
292 |
|
<fileset dir="${build.classes.dir}"/> |
295 |
|
</target> |
296 |
|
|
297 |
|
|
266 |
– |
<target name="compile-emulation" |
267 |
– |
depends="init, configure-compiler" |
268 |
– |
if="build.emulation.true"> |
269 |
– |
|
270 |
– |
<mkdir dir="${build.emulation.dir}"/> |
271 |
– |
|
272 |
– |
<javac srcdir="${emulation.src.dir}" |
273 |
– |
destdir="${build.emulation.dir}" |
274 |
– |
debug="${build.debug}" |
275 |
– |
debuglevel="${build.debuglevel}" |
276 |
– |
deprecation="${build.deprecation}" |
277 |
– |
source="${build.sourcelevel}" |
278 |
– |
fork="true"> |
279 |
– |
|
280 |
– |
<compilerarg line="${gjc.args}"/> |
281 |
– |
<bootclasspath refid="compile.bootclasspath"/> |
282 |
– |
|
283 |
– |
</javac> |
284 |
– |
|
285 |
– |
</target> |
286 |
– |
|
287 |
– |
|
288 |
– |
<target name="emulation-jar" |
289 |
– |
depends="compile-emulation" |
290 |
– |
if="build.emulation.true"> |
291 |
– |
|
292 |
– |
|
293 |
– |
<jar destfile="${product.jar}" duplicate="add"> |
294 |
– |
<fileset dir="${build.classes.dir}"> |
295 |
– |
<patternset refid="emulation.excludes"/> |
296 |
– |
</fileset> |
297 |
– |
<fileset dir="${build.emulation.dir}"/> |
298 |
– |
</jar> |
299 |
– |
|
300 |
– |
</target> |
301 |
– |
|
302 |
– |
|
298 |
|
<target name="dist-jar" |
299 |
|
depends="clean, jar"> |
300 |
|
|
327 |
|
</fileset> |
328 |
|
</copy> |
329 |
|
|
335 |
– |
<!-- Not needed now, used for doccheck filtering: |
336 |
– |
<property name="generic.declarations" |
337 |
– |
value="public interface E {} public interface T {} public interface K {} public interface V {}" |
338 |
– |
/> |
339 |
– |
--> |
340 |
– |
|
330 |
|
<copy todir="${build.filter.src.dir}"> |
331 |
|
<fileset dir="${src.dir}"> |
332 |
|
<exclude name="**/*.html"/> |
333 |
< |
<patternset refid="emulation.excludes"/> |
333 |
> |
<patternset refid="docs.exclusion"/> |
334 |
|
</fileset> |
335 |
|
<filterchain> |
336 |
|
|
353 |
|
<param name="replacement" value=" "/> |
354 |
|
</filterreader> |
355 |
|
|
356 |
+ |
</filterchain> |
357 |
+ |
</copy> |
358 |
|
|
359 |
< |
<!-- |
369 |
< |
# This filter uncomments lines beginning with "//@" so that |
370 |
< |
# javadoc can see imports that are needed to resolve links |
371 |
< |
# but that shouldn't be in the compiled code. |
372 |
< |
--> |
359 |
> |
</target> |
360 |
|
|
374 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
375 |
– |
classpath="${build.ant.dir}"> |
376 |
– |
<param name="matching" value="^//@.*$"/> |
377 |
– |
<param name="pattern" value="^//@"/> |
378 |
– |
<param name="replacement" value=""/> |
379 |
– |
</filterreader> |
361 |
|
|
362 |
+ |
<target name="filter-doccheck" |
363 |
+ |
depends="filter-src"> |
364 |
|
|
365 |
+ |
<mkdir dir="${build.dc-filter.dir}"/> |
366 |
+ |
|
367 |
+ |
<copy todir="${build.dc-filter.dir}"> |
368 |
+ |
<fileset dir="${build.filter.src.dir}"> |
369 |
+ |
<include name="**/*.html"/> |
370 |
+ |
</fileset> |
371 |
+ |
</copy> |
372 |
+ |
|
373 |
+ |
<property name="generic.declarations" |
374 |
+ |
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 {}" |
375 |
+ |
/> |
376 |
+ |
|
377 |
+ |
<copy todir="${build.dc-filter.dir}"> |
378 |
+ |
<fileset dir="${build.filter.src.dir}"> |
379 |
+ |
<exclude name="**/*.html"/> |
380 |
+ |
</fileset> |
381 |
+ |
<filterchain> |
382 |
|
<!-- |
383 |
< |
# The next two filters try to make the source look like |
383 |
> |
# These two filters try to make the source look like |
384 |
|
# something that doccheck can process. The first removes |
385 |
|
# -source 1.4 assertions and the second adds in a bunch |
386 |
|
# of single letter public nested marker interfaces so that |
387 |
|
# the generic type parameters are recognized. |
388 |
– |
# |
389 |
– |
# Currently commented out because doccheck doesn't work. :-( |
388 |
|
--> |
389 |
|
|
392 |
– |
<!-- |
390 |
|
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
391 |
|
classpath="${build.ant.dir}"> |
392 |
|
<param name="matching" value="^\s*assert[\s ].*$"/> |
396 |
|
|
397 |
|
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
398 |
|
classpath="${build.ant.dir}"> |
399 |
< |
<param name="matching" value="^(.*(class|interface|implements) .*|)\{.*$"/> |
399 |
> |
<param name="matching" value="^([^*]*(class|interface|implements) .*|)\{.*$"/> |
400 |
|
<param name="pattern" value="$"/> |
401 |
|
<param name="replacement" value=" ${generic.declarations}"/> |
402 |
|
</filterreader> |
406 |
– |
--> |
403 |
|
|
404 |
|
</filterchain> |
405 |
|
</copy> |
412 |
|
|
413 |
|
<mkdir dir="${build.testcases.dir}"/> |
414 |
|
|
419 |
– |
<!-- |
420 |
– |
<echo>javac ${gjc.args}</echo> |
421 |
– |
<echo>bootclasspath=${test.compile.bootclasspath}</echo> |
422 |
– |
<echo>classpath="${test.classpath}"</echo> |
423 |
– |
--> |
424 |
– |
|
415 |
|
<javac srcdir="${test.src.dir}" |
416 |
|
destdir="${build.testcases.dir}" |
417 |
|
debug="${build.debug}" |
420 |
|
source="${build.sourcelevel}" |
421 |
|
fork="true"> |
422 |
|
|
423 |
< |
<compilerarg line="${gjc.args}"/> |
424 |
< |
<bootclasspath refid="test.compile.bootclasspath"/> |
425 |
< |
<classpath refid="test.classpath"/> |
423 |
> |
<compilerarg line="${build.args}"/> |
424 |
> |
<classpath refid="test.classpath"/> |
425 |
> |
|
426 |
> |
<include name="java/**"/> |
427 |
> |
<include name="jsr166/**"/> |
428 |
|
|
429 |
|
</javac> |
430 |
|
|
446 |
|
dir="${build.reports.dir}" |
447 |
|
fork="true"> |
448 |
|
|
449 |
< |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
449 |
> |
<jvmarg value="-Xbootclasspath:${test.bootclasspath}"/> |
450 |
|
|
451 |
|
<formatter type="xml"/> |
452 |
|
|
453 |
|
<batchtest todir="${build.reports.dir}"> |
454 |
|
<fileset dir="${test.src.dir}"> |
455 |
< |
<include name="**/${testcase}Test.java"/> |
455 |
> |
<include name="java/**/${testcase}Test.java"/> |
456 |
> |
<include name="jsr166/**/${testcase}Test.java"/> |
457 |
|
</fileset> |
458 |
|
</batchtest> |
459 |
|
|
465 |
|
<target name="report-tests" |
466 |
|
depends="run-tests"> |
467 |
|
|
468 |
< |
<!-- Sets junit.report.format to frames if Xalan is present, |
468 |
> |
<!-- Sets junit.report.format to frames if redirection is present, |
469 |
|
otherwise sets it to noframes. --> |
470 |
|
<available property="junit.report.format" |
471 |
|
value="frames" |
490 |
|
|
491 |
|
<target name="configure-compiler"> |
492 |
|
|
493 |
< |
<property name="gjc.version" |
501 |
< |
value="2.0"/> |
493 |
> |
<property name="unchecked.option" value="-Xlint:unchecked"/> |
494 |
|
|
495 |
< |
<condition property="novariance.arg" value="-novariance"> |
496 |
< |
<and> |
505 |
< |
<equals arg1="${gjc.version}" arg2="2.0"/> |
506 |
< |
<or> |
507 |
< |
<not><isset property="gjc.novariance"/></not> |
508 |
< |
<istrue value="${gjc.novariance}"/> |
509 |
< |
</or> |
510 |
< |
</and> |
511 |
< |
</condition> |
512 |
< |
|
513 |
< |
<property name="novariance.arg" |
514 |
< |
value=""/> |
515 |
< |
|
516 |
< |
<property name="gjc.dir" |
517 |
< |
value="${lib.dir}/gjc"/> |
518 |
< |
|
519 |
< |
<property name="javac.jar" |
520 |
< |
location="${gjc.dir}/${gjc.version}/javac.jar"/> |
521 |
< |
|
522 |
< |
<property name="collect.jar" |
523 |
< |
location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/> |
524 |
< |
|
525 |
< |
|
526 |
< |
<condition property="warnunchecked.arg" value="-warnunchecked"> |
527 |
< |
<istrue value="${gjc.warnunchecked}"/> |
495 |
> |
<condition property="warnunchecked.arg" value="${unchecked.option}"> |
496 |
> |
<istrue value="${build.warnunchecked}"/> |
497 |
|
</condition> |
498 |
|
|
499 |
|
<property name="warnunchecked.arg" value=""/> |
500 |
< |
|
500 |
> |
|
501 |
|
<condition property="prepare.src.dir" value="${build.dir}/prepare-src"> |
502 |
|
<istrue value="${build.nothreads}"/> |
503 |
|
</condition> |
504 |
|
|
505 |
|
|
537 |
– |
<!-- |
538 |
– |
! Bootclasspath munging for source compilation. |
539 |
– |
--> |
540 |
– |
|
541 |
– |
<path id="pre.bootclasspath"> |
542 |
– |
<!-- <pathelement location="${src.dir}"/> --> |
543 |
– |
<pathelement location="${javac.jar}"/> |
544 |
– |
</path> |
545 |
– |
|
546 |
– |
<path id="compile.bootclasspath"> |
547 |
– |
<!-- <pathelement location="${src.dir}"/> --> |
548 |
– |
<pathelement location="${collect.jar}"/> |
549 |
– |
<pathelement location="${rt.jar}"/> |
550 |
– |
</path> |
551 |
– |
|
552 |
– |
<!-- Flatten paths into platform-appropriate strings --> |
553 |
– |
<property name="pre.bootclasspath" refid="pre.bootclasspath"/> |
554 |
– |
<property name="compile.bootclasspath" refid="compile.bootclasspath"/> |
555 |
– |
|
556 |
– |
|
506 |
|
<!-- Common options in javac invocations --> |
507 |
< |
<property name="gjc.args" |
559 |
< |
value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}" |
560 |
< |
/> |
507 |
> |
<property name="build.args" value="${warnunchecked.arg}"/> |
508 |
|
|
509 |
|
</target> |
510 |
|
|
523 |
|
</target> |
524 |
|
|
525 |
|
|
579 |
– |
<target name="configure-emulation"> |
580 |
– |
|
581 |
– |
<condition property="build.emulation.true"> |
582 |
– |
<or> |
583 |
– |
<and> |
584 |
– |
<os family="windows"/> |
585 |
– |
<not> |
586 |
– |
<isset property="build.emulation"/> |
587 |
– |
</not> |
588 |
– |
</and> |
589 |
– |
<istrue value="${build.emulation}"/> |
590 |
– |
</or> |
591 |
– |
</condition> |
592 |
– |
|
593 |
– |
</target> |
594 |
– |
|
595 |
– |
|
526 |
|
<target name="configure-tests" |
527 |
|
depends="configure-compiler"> |
528 |
|
|
533 |
|
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
534 |
|
unless="junit.available"/> |
535 |
|
|
536 |
+ |
<!-- Xalan --> |
537 |
+ |
<available property="xalan.available" |
538 |
+ |
classname="org.apache.xalan.Version"/> |
539 |
+ |
|
540 |
+ |
<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests" |
541 |
+ |
unless="xalan.available"/> |
542 |
+ |
|
543 |
|
|
544 |
|
<!-- |
545 |
|
! Bootclasspath munging for testing, so JUnit can test our local |
548 |
|
|
549 |
|
<path id="test.classpath"> |
550 |
|
<pathelement location="${product.jar}"/> |
614 |
– |
<pathelement location="${build.testcases.dir}"/> |
615 |
– |
<pathelement location="${junit.jar}"/> |
616 |
– |
</path> |
617 |
– |
|
618 |
– |
<path id="test.compile.bootclasspath"> |
619 |
– |
<pathelement location="${javac.jar}"/> |
620 |
– |
<pathelement location="${collect.jar}"/> |
551 |
|
<pathelement location="${rt.jar}"/> |
552 |
+ |
<pathelement location="${junit.jar}"/> |
553 |
+ |
<pathelement location="${build.testcases.dir}"/> |
554 |
|
</path> |
555 |
|
|
556 |
< |
<path id="test.run.bootclasspath"> |
625 |
< |
<pathelement location="${javac.jar}"/> |
556 |
> |
<path id="test.bootclasspath"> |
557 |
|
<path refid="test.classpath"/> |
558 |
|
</path> |
559 |
|
|
560 |
|
<!-- Flatten test classpaths into platform-appropriate strings --> |
561 |
< |
<property name="test.classpath" refid="test.classpath"/> |
562 |
< |
<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/> |
632 |
< |
<property name="test.run.bootclasspath" refid="test.run.bootclasspath"/> |
561 |
> |
<property name="test.classpath" refid="test.classpath"/> |
562 |
> |
<property name="test.bootclasspath" refid="test.bootclasspath"/> |
563 |
|
|
564 |
|
</target> |
565 |
|
|
567 |
|
|
568 |
|
<!-- Anthill targets --> |
569 |
|
|
570 |
< |
<target name="anthill-build" |
570 |
> |
<target name="anthill-build"> |
571 |
> |
|
572 |
> |
<!-- Override this in user.properties --> |
573 |
> |
<property name="tiger.home" location="e:/j2sdk1.5.0"/> |
574 |
> |
|
575 |
> |
<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java"> |
576 |
> |
<arg value="-Xmx256000000"/> |
577 |
> |
<!-- classpath of new JVM --> |
578 |
> |
<arg value="-classpath"/> <arg path="${java.class.path}"/> |
579 |
> |
<!-- location of Ant home directory --> |
580 |
> |
<arg value="-Dant.home=${ant.home}"/> |
581 |
> |
<!-- the Ant main class --> |
582 |
> |
<arg value="org.apache.tools.ant.Main"/> |
583 |
> |
<!-- The build file --> |
584 |
> |
<arg value="-buildfile"/> <arg value="build.xml"/> |
585 |
> |
<!-- the target to build on the new Ant instance --> |
586 |
> |
<arg value="-DJAVA_HOME=${tiger.home}"/> |
587 |
> |
<arg value="do-anthill-build"/> |
588 |
> |
</exec> |
589 |
> |
</target> |
590 |
> |
|
591 |
> |
<target name="do-anthill-build" |
592 |
|
depends="jar, test, docs, dist-docs"/> |
593 |
|
|
594 |
|
<target name="anthill-publish"> |
611 |
|
</target> |
612 |
|
|
613 |
|
|
614 |
+ |
<target name="ng" depends="test"> |
615 |
+ |
<java classname="SuperfluousAbstract" fork="true"> |
616 |
+ |
|
617 |
+ |
<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/> |
618 |
+ |
|
619 |
+ |
</java> |
620 |
+ |
</target> |
621 |
+ |
|
622 |
+ |
|
623 |
|
</project> |