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"/> |
33 |
|
<property name="build.loops.dir" location="${build.dir}/loops"/> |
34 |
|
<property name="build.lib.dir" location="${build.dir}/lib"/> |
36 |
– |
<property name="build.ant.dir" location="${build.dir}/ant"/> |
35 |
|
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
36 |
|
<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"/> |
37 |
|
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
38 |
|
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
39 |
|
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
40 |
|
|
41 |
+ |
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
42 |
+ |
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
43 |
+ |
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
44 |
+ |
|
45 |
+ |
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
46 |
+ |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
47 |
+ |
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
48 |
+ |
|
49 |
|
<!-- Source locations --> |
50 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
51 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
50 |
– |
<property name="j1.src.dir" location="${basedir}/src/javaone"/> |
52 |
|
<property name="loops.src.dir" location="${basedir}/src/loops"/> |
53 |
|
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
54 |
|
<property name="jtreg.src.dir" location="${test.src.dir}/jtreg"/> |
54 |
– |
<property name="ant.src.dir" location="${basedir}/etc/ant"/> |
55 |
– |
<property name="stylesheet.dir" location="${basedir}/etc/xsl"/> |
55 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
56 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
57 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
58 |
|
<property name="jsr166xsrc.dir" location="${basedir}/src/jsr166x"/> |
59 |
+ |
<property name="jsr166ysrc.dir" location="${basedir}/src/jsr166y"/> |
60 |
+ |
<property name="extra166ysrc.dir" location="${basedir}/src/extra166y"/> |
61 |
|
|
62 |
|
<!-- Distribution locations --> |
63 |
|
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
64 |
|
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
65 |
+ |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
66 |
+ |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
67 |
|
|
68 |
|
<!-- Jar locations --> |
69 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
70 |
|
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
71 |
+ |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
72 |
+ |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
73 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
69 |
– |
<property name="concurrent.jar" location="${lib.dir}/concurrent.jar"/> |
74 |
|
|
75 |
|
<!-- Bootclasspath argument --> |
76 |
|
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
86 |
|
<pathelement location="${build.loops.dir}"/> |
87 |
|
</path> |
88 |
|
|
85 |
– |
<!-- J1 classpath --> |
86 |
– |
<path id="j1.classpath"> |
87 |
– |
<pathelement location="${build.j1.dir}"/> |
88 |
– |
<pathelement location="${junit.jar}"/> |
89 |
– |
<pathelement location="${concurrent.jar}"/> |
90 |
– |
</path> |
91 |
– |
|
89 |
|
|
90 |
|
<!-- Main targets --> |
91 |
|
|
105 |
|
fork="true"> |
106 |
|
|
107 |
|
<include name="**/*.java"/> |
108 |
+ |
<compilerarg value="-XDignore.symbol.file"/> |
109 |
+ |
|
110 |
+ |
<!-- |
111 |
|
<exclude name="java/lang/**"/> |
112 |
|
<compilerarg line="${build.args}"/> |
113 |
+ |
<compilerarg line="-Xlint -Xmaxwarns 1000"/> |
114 |
+ |
--> |
115 |
|
|
116 |
|
</javac> |
117 |
|
|
146 |
|
<mkdir dir="${build.javadocs.dir}"/> |
147 |
|
|
148 |
|
<javadoc destdir="${build.javadocs.dir}" |
149 |
< |
link="http://java.sun.com/j2se/1.4.1/docs/api" |
149 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
150 |
|
overview="${src.dir}/intro.html" |
151 |
< |
source="${build.sourcelevel}"> |
152 |
< |
|
151 |
< |
<tag name="revised" description="Last revised:"/> |
152 |
< |
<tag name="spec" description="Specified by:"/> |
151 |
> |
sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
152 |
> |
> |
153 |
|
|
154 |
|
<packageset dir="${src.dir}"/> |
155 |
|
|
159 |
|
|
160 |
|
|
161 |
|
|
162 |
– |
<target name="doccheck" |
163 |
– |
depends="filter-doccheck" |
164 |
– |
description="Reports on javadoc style errors"> |
165 |
– |
|
166 |
– |
<delete dir="${build.doccheck.dir}"/> |
167 |
– |
<mkdir dir="${build.doccheck.dir}"/> |
168 |
– |
|
169 |
– |
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
170 |
– |
docletpath="${lib.dir}/doccheck.jar" |
171 |
– |
destdir="${build.doccheck.dir}"> |
172 |
– |
<packageset dir="${build.dc-filter.dir}"/> |
173 |
– |
</javadoc> |
174 |
– |
|
175 |
– |
<echo>DocCheck output is in ${build.doccheck.dir}</echo> |
176 |
– |
|
177 |
– |
</target> |
178 |
– |
|
179 |
– |
|
180 |
– |
|
181 |
– |
<target name="checkstyle" |
182 |
– |
depends="filter-src" |
183 |
– |
description="Reports on style errors in Java source (verbose, mostly chaff)"> |
184 |
– |
|
185 |
– |
<taskdef resource="checkstyletask.properties" |
186 |
– |
classpath="${lib.dir}/checkstyle-all-3.1.jar"/> |
187 |
– |
|
188 |
– |
<mkdir dir="${build.checkstyle.dir}"/> |
189 |
– |
|
190 |
– |
<checkstyle config="etc/checkstyle/sun_checks.xml" |
191 |
– |
failOnViolation="false"> |
192 |
– |
<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/> |
193 |
– |
<fileset dir="${build.filter.src.dir}" includes="**/*.java"/> |
194 |
– |
</checkstyle> |
195 |
– |
|
196 |
– |
<style in="${build.checkstyle.dir}/checkstyle-report.xml" |
197 |
– |
out="${build.checkstyle.dir}/checkstyle-report.html" |
198 |
– |
style="${stylesheet.dir}/checkstyle-frames.xsl"/> |
199 |
– |
|
200 |
– |
</target> |
201 |
– |
|
202 |
– |
|
203 |
– |
|
162 |
|
<target name="dist" |
163 |
|
depends="init, dist-clean, dist-jar, dist-docs" |
164 |
|
description="Puts all distributable products in single hierarchy"/> |
212 |
|
<mkdir dir="${dist.javadocs.dir}"/> |
213 |
|
|
214 |
|
<javadoc destdir="${dist.javadocs.dir}" |
215 |
< |
link="http://java.sun.com/j2se/1.4.2/docs/api" |
215 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
216 |
|
overview="${src.dir}/intro.html" |
259 |
– |
source="${build.sourcelevel}"> |
260 |
– |
|
261 |
– |
<packageset dir="${src.dir}"/> |
217 |
|
|
218 |
+ |
sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
219 |
+ |
> |
220 |
+ |
<!-- |
221 |
+ |
<packageset dir="${src.dir}" defaultexcludes="yes"> |
222 |
+ |
<include name="java/util/concurrent"/> |
223 |
+ |
<include name="java/util/concurrent/atomic"/> |
224 |
+ |
<include name="java/util/concurrent/locks"/> |
225 |
+ |
</packageset> |
226 |
+ |
--> |
227 |
+ |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
228 |
+ |
<include name="main/java/util/concurrent/*.java"/> |
229 |
+ |
<include name="main/java/util/concurrent/atomic/*.java"/> |
230 |
+ |
<include name="main/java/util/concurrent/locks/*.java"/> |
231 |
+ |
<include name="main/java/util/*.java"/> |
232 |
+ |
<!-- |
233 |
+ |
<include name="main/java/util/concurrent/*.html"/> |
234 |
+ |
<include name="main/java/util/concurrent/atomic/*.html"/> |
235 |
+ |
<include name="main/java/util/concurrent/locks/*.html"/> |
236 |
+ |
<include name="main/java/util/*.html"/> |
237 |
+ |
--> |
238 |
+ |
<!-- <include name="jsr166x/*.java"/> --> |
239 |
+ |
</fileset> |
240 |
|
</javadoc> |
241 |
|
|
242 |
|
</target> |
264 |
|
</target> |
265 |
|
|
266 |
|
|
290 |
– |
<target name="compile-ant-filter" |
291 |
– |
depends="init"> |
292 |
– |
|
293 |
– |
<mkdir dir="${build.ant.dir}"/> |
294 |
– |
|
295 |
– |
<javac srcdir="${ant.src.dir}" |
296 |
– |
destdir="${build.ant.dir}" |
297 |
– |
source="1.4"/> |
298 |
– |
|
299 |
– |
</target> |
300 |
– |
|
301 |
– |
|
302 |
– |
<target name="filter-src" |
303 |
– |
depends="compile-ant-filter"> |
304 |
– |
|
305 |
– |
<mkdir dir="${build.filter.src.dir}"/> |
306 |
– |
|
307 |
– |
<copy todir="${build.filter.src.dir}"> |
308 |
– |
<fileset dir="${src.dir}"> |
309 |
– |
<include name="**/*.html"/> |
310 |
– |
</fileset> |
311 |
– |
</copy> |
312 |
– |
|
313 |
– |
<copy todir="${build.filter.src.dir}"> |
314 |
– |
<fileset dir="${src.dir}"> |
315 |
– |
<exclude name="**/*.html"/> |
316 |
– |
<!-- Files excluded from dist-docs --> |
317 |
– |
<exclude name="java/util/Random.*"/> |
318 |
– |
<exclude name="sun/misc/Unsafe.*"/> |
319 |
– |
</fileset> |
320 |
– |
<!-- |
321 |
– |
<filterchain> |
322 |
– |
--> |
323 |
– |
|
324 |
– |
<!-- |
325 |
– |
# This filter gets rid of angle-bracketed type parameters |
326 |
– |
# so that javadoc can run on the result. The following |
327 |
– |
# heuristic seems to work: |
328 |
– |
# |
329 |
– |
# For all lines not starting with space(s)-asterisk-space(s), |
330 |
– |
# replace <something> with a space, where there may be more |
331 |
– |
# than one right angle bracket at the end, and "something" |
332 |
– |
# must not contain parens or pipes. (This may need some |
333 |
– |
# tweaking.) |
334 |
– |
--> |
335 |
– |
|
336 |
– |
<!-- |
337 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
338 |
– |
classpath="${build.ant.dir}"> |
339 |
– |
<param name="notmatching" value="^\s+\*\s.*$"/> |
340 |
– |
<param name="pattern" value="<[^|>()]+?>+"/> |
341 |
– |
<param name="replacement" value=" "/> |
342 |
– |
</filterreader> |
343 |
– |
--> |
344 |
– |
|
345 |
– |
<!-- |
346 |
– |
</filterchain> |
347 |
– |
--> |
348 |
– |
</copy> |
349 |
– |
|
350 |
– |
</target> |
351 |
– |
|
352 |
– |
|
353 |
– |
<target name="filter-doccheck" |
354 |
– |
depends="filter-src"> |
355 |
– |
|
356 |
– |
<mkdir dir="${build.dc-filter.dir}"/> |
357 |
– |
|
358 |
– |
<copy todir="${build.dc-filter.dir}"> |
359 |
– |
<fileset dir="${build.filter.src.dir}"> |
360 |
– |
<include name="**/*.html"/> |
361 |
– |
</fileset> |
362 |
– |
</copy> |
363 |
– |
|
364 |
– |
<property name="generic.declarations" |
365 |
– |
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 {}" |
366 |
– |
/> |
367 |
– |
|
368 |
– |
<copy todir="${build.dc-filter.dir}"> |
369 |
– |
<fileset dir="${build.filter.src.dir}"> |
370 |
– |
<exclude name="**/*.html"/> |
371 |
– |
</fileset> |
372 |
– |
<filterchain> |
373 |
– |
<!-- |
374 |
– |
# These two filters try to make the source look like |
375 |
– |
# something that doccheck can process. The first removes |
376 |
– |
# -source 1.4 assertions and the second adds in a bunch |
377 |
– |
# of single letter public nested marker interfaces so that |
378 |
– |
# the generic type parameters are recognized. |
379 |
– |
--> |
380 |
– |
|
381 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
382 |
– |
classpath="${build.ant.dir}"> |
383 |
– |
<param name="matching" value="^\s*assert[\s ].*$"/> |
384 |
– |
<param name="pattern" value="assert"/> |
385 |
– |
<param name="replacement" value="//assert"/> |
386 |
– |
</filterreader> |
387 |
– |
|
388 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
389 |
– |
classpath="${build.ant.dir}"> |
390 |
– |
<param name="matching" value="^([^*]*(class|interface|implements) .*|)\{.*$"/> |
391 |
– |
<param name="pattern" value="$"/> |
392 |
– |
<param name="replacement" value=" ${generic.declarations}"/> |
393 |
– |
</filterreader> |
394 |
– |
|
395 |
– |
</filterchain> |
396 |
– |
</copy> |
397 |
– |
|
398 |
– |
</target> |
399 |
– |
|
400 |
– |
|
267 |
|
<target name="compile-tests" |
268 |
|
depends="jar"> |
269 |
|
|
384 |
|
<fileset dir="${build.reports.dir}"> |
385 |
|
<include name="TEST-*.xml"/> |
386 |
|
</fileset> |
387 |
< |
<report styledir="${stylesheet.dir}" |
522 |
< |
format="${junit.report.format}" |
523 |
< |
todir="${build.reports.dir}" |
387 |
> |
<report format="${junit.report.format}" todir="${build.reports.dir}" |
388 |
|
/> |
389 |
|
</junitreport> |
390 |
|
|
434 |
|
</target> |
435 |
|
|
436 |
|
|
573 |
– |
|
574 |
– |
<!-- Anthill targets --> |
575 |
– |
|
576 |
– |
<target name="anthill-build"> |
577 |
– |
|
578 |
– |
<!-- Override this in user.properties --> |
579 |
– |
<property name="tiger.home" location="e:/j2sdk1.5.0"/> |
580 |
– |
|
581 |
– |
<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java"> |
582 |
– |
<arg value="-Xmx256000000"/> |
583 |
– |
<!-- classpath of new JVM --> |
584 |
– |
<arg value="-classpath"/> <arg path="${java.class.path}"/> |
585 |
– |
<!-- location of Ant home directory --> |
586 |
– |
<arg value="-Dant.home=${ant.home}"/> |
587 |
– |
<!-- the Ant main class --> |
588 |
– |
<arg value="org.apache.tools.ant.Main"/> |
589 |
– |
<!-- The build file --> |
590 |
– |
<arg value="-buildfile"/> <arg value="build.xml"/> |
591 |
– |
<!-- the target to build on the new Ant instance --> |
592 |
– |
<arg value="-DJAVA_HOME=${tiger.home}"/> |
593 |
– |
<arg value="do-anthill-build"/> |
594 |
– |
</exec> |
595 |
– |
</target> |
596 |
– |
|
597 |
– |
<target name="do-anthill-build" |
598 |
– |
depends="jar, test, docs, dist-docs"/> |
599 |
– |
|
600 |
– |
<target name="anthill-publish"> |
601 |
– |
|
602 |
– |
<copy todir="${deployDir}/docs/private"> |
603 |
– |
<fileset dir="${build.javadocs.dir}"/> |
604 |
– |
</copy> |
605 |
– |
|
606 |
– |
<copy todir="${deployDir}/docs/public"> |
607 |
– |
<fileset dir="${dist.javadocs.dir}"/> |
608 |
– |
</copy> |
609 |
– |
|
610 |
– |
<copy tofile="${deployDir}/index.html" |
611 |
– |
file="${basedir}/etc/anthill-index.html"/> |
612 |
– |
|
613 |
– |
<copy todir="${deployDir}/notes"> |
614 |
– |
<fileset dir="${basedir}/etc/notes"/> |
615 |
– |
</copy> |
616 |
– |
|
617 |
– |
</target> |
618 |
– |
|
619 |
– |
|
620 |
– |
|
437 |
|
<!-- Various demos and test programs --> |
438 |
|
|
439 |
|
|
624 |
– |
<target name="sample" depends="init, configure-compiler" |
625 |
– |
description="Standalone demo program"> |
626 |
– |
|
627 |
– |
<mkdir dir="${build.testcases.dir}"/> |
628 |
– |
|
629 |
– |
<javac srcdir="${test.src.dir}" |
630 |
– |
destdir="${build.testcases.dir}" |
631 |
– |
debug="${build.debug}" |
632 |
– |
debuglevel="${build.debuglevel}" |
633 |
– |
deprecation="${build.deprecation}" |
634 |
– |
source="${build.sourcelevel}" |
635 |
– |
fork="true"> |
636 |
– |
|
637 |
– |
<include name="jsr166/test/Sample.java"/> |
638 |
– |
|
639 |
– |
</javac> |
640 |
– |
|
641 |
– |
<copy todir="${build.testcases.dir}"> |
642 |
– |
<fileset dir="${test.src.dir}"> |
643 |
– |
<include name="**/*.properties"/> |
644 |
– |
</fileset> |
645 |
– |
</copy> |
646 |
– |
|
647 |
– |
|
648 |
– |
<java classname="jsr166.test.Sample" fork="true"> |
649 |
– |
<classpath refid="test.classpath"/> |
650 |
– |
<!-- <jvmarg value="-ea"/> --> |
651 |
– |
<!-- <jvmarg value="-server"/> --> |
652 |
– |
<!-- <arg value="1000"/> --> |
653 |
– |
</java> |
654 |
– |
</target> |
655 |
– |
|
656 |
– |
|
440 |
|
<target name="loops" depends="init, configure-compiler" |
441 |
|
description="Benchmark from Doug Lea's AQS paper"> |
442 |
|
|
462 |
|
</target> |
463 |
|
|
464 |
|
|
465 |
< |
<target name="compile-j1" depends="init, configure-compiler"> |
465 |
> |
<!-- jsr166x --> |
466 |
> |
|
467 |
> |
|
468 |
> |
<target name="jsr166xcompile" |
469 |
> |
depends="init, configure-compiler" |
470 |
> |
description="Compiles jsr166x sources"> |
471 |
|
|
472 |
< |
<mkdir dir="${build.j1.dir}"/> |
472 |
> |
<mkdir dir="${build.jsr166x.dir}"/> |
473 |
|
|
474 |
< |
<javac srcdir="${j1.src.dir}" |
475 |
< |
destdir="${build.j1.dir}" |
474 |
> |
<javac srcdir="${jsr166xsrc.dir}" |
475 |
> |
destdir="${build.jsr166x.dir}" |
476 |
|
debug="${build.debug}" |
477 |
|
debuglevel="${build.debuglevel}" |
478 |
|
deprecation="${build.deprecation}" |
479 |
< |
source="${build.sourcelevel}" > |
479 |
> |
source="${build.sourcelevel}" |
480 |
> |
fork="true"> |
481 |
|
|
482 |
|
<include name="**/*.java"/> |
694 |
– |
<exclude name="**/dijkstra/**"/> |
695 |
– |
|
483 |
|
<compilerarg line="${build.args}"/> |
697 |
– |
<classpath refid="j1.classpath"/> |
484 |
|
|
485 |
|
</javac> |
486 |
|
|
487 |
|
</target> |
488 |
|
|
489 |
|
|
704 |
– |
<target name="sw" depends="compile-j1" |
705 |
– |
description="Runs the SwingWorker demo"> |
490 |
|
|
491 |
< |
<!-- |
492 |
< |
<java classname="jsr166.swing.SwingWorkerDemo" fork="true"> |
493 |
< |
<classpath refid="j1.classpath"/> |
710 |
< |
</java> |
711 |
< |
--> |
491 |
> |
<target name="jsr166xjar" |
492 |
> |
depends="jsr166xcompile" |
493 |
> |
description="Builds library jar from compiled sources"> |
494 |
|
|
495 |
< |
<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/> |
495 |
> |
<mkdir dir="${build.jsr166xlib.dir}"/> |
496 |
|
|
497 |
< |
<exec dir="${build.j1.dir}" executable="appletviewer.exe"> |
498 |
< |
<arg value="${build.j1.dir}/SwingWorker.html"/> |
499 |
< |
</exec> |
497 |
> |
<jar destfile="${jsr166xproduct.jar}"> |
498 |
> |
<fileset dir="${build.jsr166x.dir}"/> |
499 |
> |
</jar> |
500 |
|
|
501 |
|
</target> |
502 |
|
|
721 |
– |
<target name="j1" depends="compile-j1" |
722 |
– |
description="Runs a standalone JavaOne program"> |
503 |
|
|
724 |
– |
<java classname="${j1.test}" fork="true"> |
725 |
– |
<classpath refid="j1.classpath"/> |
726 |
– |
<jvmarg value="-client"/> |
504 |
|
|
505 |
< |
<!-- TestPseudoRandom args --> |
506 |
< |
<arg value="2"/> |
730 |
< |
<arg value="25"/> |
731 |
< |
<arg value="100000"/> |
505 |
> |
<target name="jsr166xdocs" |
506 |
> |
description="Builds javadocs with custom tags to build folder"> |
507 |
|
|
508 |
< |
<!-- WebCrawler args --> |
509 |
< |
<!-- |
735 |
< |
<arg value="jsr166.webcrawler.WebCrawler3"/> |
736 |
< |
<arg value="http://www.priorartisans.com"/> |
737 |
< |
<arg value="25"/> |
738 |
< |
--> |
508 |
> |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
509 |
> |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
510 |
|
|
511 |
< |
</java> |
511 |
> |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
512 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
513 |
|
|
514 |
< |
</target> |
514 |
> |
sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
515 |
|
|
516 |
+ |
> |
517 |
+ |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
518 |
+ |
<include name="jsr166x"/> |
519 |
+ |
</packageset> |
520 |
|
|
745 |
– |
<target name="test-j1" depends="compile-j1" |
746 |
– |
description="Runs testcases from the JavaOne source directories"> |
521 |
|
|
522 |
< |
<junit printsummary="true" |
749 |
< |
showoutput="true" |
750 |
< |
errorProperty="junit.failed" |
751 |
< |
failureProperty="junit.failed" |
752 |
< |
dir="${build.j1.dir}" |
753 |
< |
fork="true"> |
522 |
> |
</javadoc> |
523 |
|
|
524 |
< |
<!-- <jvmarg value="-server"/> --> |
756 |
< |
<classpath refid="j1.classpath"/> |
757 |
< |
<formatter type="xml"/> |
524 |
> |
</target> |
525 |
|
|
759 |
– |
<batchtest todir="${build.j1.dir}"> |
760 |
– |
<fileset dir="${j1.src.dir}"> |
761 |
– |
<include name="**/*Test.java"/> |
762 |
– |
</fileset> |
763 |
– |
</batchtest> |
526 |
|
|
527 |
< |
</junit> |
527 |
> |
<target name="jsr166xdist" |
528 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
529 |
> |
description="Puts all distributable products in single hierarchy"/> |
530 |
|
|
767 |
– |
<available property="junit.report.format" |
768 |
– |
value="frames" |
769 |
– |
classname="org.apache.xalan.lib.Redirect"/> |
770 |
– |
<property name="junit.report.format" value="noframes"/> |
531 |
|
|
772 |
– |
<junitreport todir="${build.j1.dir}"> |
773 |
– |
<fileset dir="${build.j1.dir}"> |
774 |
– |
<include name="TEST-*.xml"/> |
775 |
– |
</fileset> |
776 |
– |
<report styledir="${stylesheet.dir}" |
777 |
– |
format="${junit.report.format}" |
778 |
– |
todir="${build.j1.dir}" |
779 |
– |
/> |
780 |
– |
</junitreport> |
532 |
|
|
533 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
533 |
> |
<target name="jsr166xclean" |
534 |
> |
description="Removes all build products"> |
535 |
> |
|
536 |
> |
<delete dir="${build.jsr166x.dir}"/> |
537 |
> |
<delete dir="${build.jsr166xlib.dir}"/> |
538 |
|
|
539 |
|
</target> |
540 |
|
|
541 |
|
|
542 |
|
|
543 |
< |
<!-- C++ and JNI definitions and demos --> |
543 |
> |
<target name="jsr166xdist-clean" |
544 |
> |
description="Removes all build and distribution products"> |
545 |
|
|
546 |
< |
<target name="configure-cpp"> |
546 |
> |
</target> |
547 |
|
|
792 |
– |
<!-- Define tasks and types --> |
548 |
|
|
794 |
– |
<path id="cpptasks.path"> |
795 |
– |
<pathelement location="${lib.dir}/cpptasks.jar"/> |
796 |
– |
</path> |
797 |
– |
<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/> |
798 |
– |
<typedef resource="cpptasks.types" classpathref="cpptasks.path"/> |
549 |
|
|
550 |
< |
<!-- Set platform property for JNI includes --> |
550 |
> |
<target name="jsr166xdist-docs" |
551 |
> |
description="Builds javadocs without custom tags to dist folder"> |
552 |
|
|
553 |
< |
<condition property="platform" value="linux"> |
554 |
< |
<os name="Linux"/> |
804 |
< |
</condition> |
805 |
< |
<condition property="platform" value="win32"> |
806 |
< |
<os family="windows"/> |
807 |
< |
</condition> |
808 |
< |
<condition property="platform" value="solaris"> |
809 |
< |
<os name="SunOS"/> |
810 |
< |
</condition> |
553 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
554 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
555 |
|
|
556 |
< |
</target> |
556 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
557 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
558 |
> |
source="${build.sourcelevel}"> |
559 |
|
|
560 |
+ |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
561 |
+ |
<include name="jsr166x"/> |
562 |
+ |
</packageset> |
563 |
|
|
564 |
< |
<target name="cppdemo" depends="configure-cpp"> |
564 |
> |
</javadoc> |
565 |
|
|
566 |
< |
<mkdir dir="${build.dir}"/> |
566 |
> |
</target> |
567 |
|
|
568 |
< |
<cc multithreaded="true" |
569 |
< |
name="g++" |
821 |
< |
objdir="${build.dir}" |
822 |
< |
outfile="${build.dir}/CppDemo"> |
823 |
< |
<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/> |
824 |
< |
<libset libs="stdc++"/> |
825 |
< |
</cc> |
568 |
> |
<target name="jsr166xdist-jar" |
569 |
> |
depends="jsr166xclean, jsr166xjar"> |
570 |
|
|
571 |
< |
<exec executable="${build.dir}/CppDemo"> |
828 |
< |
<arg line="count in word frequency of word in command line count"/> |
829 |
< |
</exec> |
571 |
> |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
572 |
|
|
573 |
|
</target> |
574 |
|
|
575 |
+ |
<!-- jsr166y --> |
576 |
|
|
834 |
– |
<target name="jnidemo" depends="init, configure-compiler, configure-cpp"> |
577 |
|
|
578 |
< |
<mkdir dir="${build.testcases.dir}"/> |
578 |
> |
<target name="jsr166ycompile" |
579 |
> |
depends="init, configure-compiler" |
580 |
> |
description="Compiles jsr166y sources"> |
581 |
|
|
582 |
< |
<javac srcdir="${test.src.dir}" |
583 |
< |
destdir="${build.testcases.dir}" |
582 |
> |
<mkdir dir="${build.jsr166y.dir}"/> |
583 |
> |
|
584 |
> |
<javac srcdir="${jsr166ysrc.dir}" |
585 |
> |
destdir="${build.jsr166y.dir}" |
586 |
|
debug="${build.debug}" |
587 |
|
debuglevel="${build.debuglevel}" |
588 |
|
deprecation="${build.deprecation}" |
589 |
|
source="${build.sourcelevel}" |
590 |
|
fork="true"> |
591 |
< |
<compilerarg value="${bootclasspath.args}"/> |
591 |
> |
|
592 |
> |
<include name="**/*.java"/> |
593 |
|
<compilerarg line="${build.args}"/> |
594 |
< |
<classpath refid="test.classpath"/> |
848 |
< |
<include name="JniDemo.java"/> |
849 |
< |
</javac> |
594 |
> |
<compilerarg value="${bootclasspath.args}"/> |
595 |
|
|
596 |
< |
<javah destdir="${build.testcases.dir}" |
597 |
< |
classpathref="test.classpath"> |
598 |
< |
<class name="JniDemo"/> |
854 |
< |
</javah> |
855 |
< |
|
856 |
< |
<cc multithreaded="true" |
857 |
< |
name="g++" |
858 |
< |
objdir="${build.dir}" |
859 |
< |
outfile="${build.dir}/JniDemo" |
860 |
< |
outtype="shared"> |
861 |
< |
|
862 |
< |
<compiler> |
863 |
< |
<defineset> |
864 |
< |
<define name="__int64" value="long long"/> |
865 |
< |
</defineset> |
866 |
< |
<includepath location="${java.home}/../include"/> |
867 |
< |
<includepath location="${java.home}/../include/${platform}"/> |
868 |
< |
<compilerarg value="-mno-cygwin"/> |
869 |
< |
</compiler> |
870 |
< |
|
871 |
< |
<linker> |
872 |
< |
<linkerarg value="--add-stdcall-alias"/> |
873 |
< |
</linker> |
874 |
< |
|
875 |
< |
<includepath location="${build.testcases.dir}"/> |
876 |
< |
|
877 |
< |
<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/> |
878 |
< |
|
879 |
< |
<libset libs="stdc++"/> |
880 |
< |
|
881 |
< |
</cc> |
882 |
< |
|
883 |
< |
<!-- Necessary if windows, harmless if not --> |
884 |
< |
<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/> |
885 |
< |
|
886 |
< |
<java classname="JniDemo" fork="true"> |
887 |
< |
<!-- Watch out: path separator hardwired to semicolon here! --> |
888 |
< |
<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/> |
889 |
< |
<classpath refid="test.classpath"/> |
890 |
< |
<arg line="count in word frequency of word in command line count"/> |
891 |
< |
</java> |
596 |
> |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
597 |
> |
|
598 |
> |
</javac> |
599 |
|
|
600 |
|
</target> |
601 |
|
|
602 |
|
|
603 |
|
|
604 |
< |
<!-- Backward compatibility, work in progress (some files not checked in) --> |
604 |
> |
<target name="jsr166yjar" |
605 |
> |
depends="jsr166ycompile" |
606 |
> |
description="Builds library jar from compiled sources"> |
607 |
> |
|
608 |
> |
<mkdir dir="${build.jsr166ylib.dir}"/> |
609 |
> |
|
610 |
> |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
611 |
> |
<fileset dir="${build.jsr166y.dir}"/> |
612 |
> |
</jar> |
613 |
> |
|
614 |
> |
</target> |
615 |
> |
|
616 |
> |
|
617 |
|
|
618 |
+ |
<target name="jsr166ydocs" |
619 |
+ |
description="Builds javadocs with custom tags to build folder"> |
620 |
|
|
621 |
+ |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
622 |
+ |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
623 |
|
|
624 |
< |
<property name="pretiger.src.dir" location="${build.dir}/pretiger/src"/> |
625 |
< |
<property name="build.pretiger.dir" location="${build.dir}/pretiger/classes"/> |
626 |
< |
<property name="pretiger.jar" location="${build.lib.dir}/jsr166-pretiger.jar"/> |
904 |
< |
<property name="pretiger.sourcelevel" value="1.4"/> |
624 |
> |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
625 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
626 |
> |
sourcepath="${src.dir}:${jsr166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
627 |
|
|
628 |
< |
<target name="defang" |
629 |
< |
depends="init" |
630 |
< |
description="Generates pre-Tiger compatible source"> |
628 |
> |
> |
629 |
> |
<packageset dir="${topsrc.dir}" defaultexcludes="no"> |
630 |
> |
<include name="jsr166y"/> |
631 |
> |
</packageset> |
632 |
|
|
910 |
– |
<delete dir="${pretiger.src.dir}"/> |
911 |
– |
<mkdir dir="${pretiger.src.dir}"/> |
633 |
|
|
634 |
< |
<exec executable="perl"> |
914 |
< |
<arg file="etc/defang.pl"/> |
915 |
< |
<!-- <arg value="-v"/> --> |
916 |
< |
<arg value="-s"/> <arg file="${src.dir}"/> |
917 |
< |
<arg value="-t"/> <arg file="${pretiger.src.dir}"/> |
918 |
< |
</exec> |
634 |
> |
</javadoc> |
635 |
|
|
636 |
|
</target> |
637 |
|
|
922 |
– |
<target name="compile-pretiger" |
923 |
– |
depends="init, configure-compiler, defang" |
924 |
– |
description="Compiles pre-Tiger sources to build folder"> |
638 |
|
|
639 |
< |
<mkdir dir="${build.pretiger.dir}"/> |
639 |
> |
<target name="jsr166ydist" |
640 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
641 |
> |
description="Puts all distributable products in single hierarchy"/> |
642 |
|
|
928 |
– |
<javac srcdir="${pretiger.src.dir}" |
929 |
– |
destdir="${build.pretiger.dir}" |
930 |
– |
debug="${build.debug}" |
931 |
– |
debuglevel="${build.debuglevel}" |
932 |
– |
deprecation="${build.deprecation}" |
933 |
– |
source="${pretiger.sourcelevel}" |
934 |
– |
fork="true"> |
643 |
|
|
936 |
– |
<compilerarg line="${build.args}"/> |
937 |
– |
<exclude name="**/Thread.java"/> |
644 |
|
|
645 |
< |
</javac> |
645 |
> |
<target name="jsr166yclean" |
646 |
> |
description="Removes all build products"> |
647 |
> |
|
648 |
> |
<delete dir="${build.jsr166y.dir}"/> |
649 |
> |
<delete dir="${build.jsr166ylib.dir}"/> |
650 |
|
|
651 |
|
</target> |
652 |
|
|
943 |
– |
<target name="pretiger" depends="compile-pretiger"> |
653 |
|
|
945 |
– |
<mkdir dir="${build.lib.dir}"/> |
654 |
|
|
655 |
< |
<jar destfile="${pretiger.jar}"> |
656 |
< |
<fileset dir="${build.pretiger.dir}"> |
949 |
< |
</fileset> |
950 |
< |
</jar> |
655 |
> |
<target name="jsr166ydist-clean" |
656 |
> |
description="Removes all build and distribution products"> |
657 |
|
|
658 |
|
</target> |
659 |
|
|
660 |
< |
<!-- jsr166x --> |
660 |
> |
<target name="jsr166ydist-docs" |
661 |
> |
description="Builds javadocs without custom tags to dist folder"> |
662 |
|
|
663 |
+ |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
664 |
+ |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
665 |
|
|
666 |
< |
<target name="jsr166xcompile" |
667 |
< |
depends="init, configure-compiler" |
668 |
< |
description="Compiles jsr166x sources"> |
666 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
667 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
668 |
> |
source="${build.sourcelevel}" |
669 |
> |
sourcepath="${src.dir}:${jsr166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
670 |
> |
> |
671 |
> |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
672 |
> |
<include name="jsr166y/*.java"/> |
673 |
> |
</fileset> |
674 |
> |
</javadoc> |
675 |
|
|
676 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
676 |
> |
</target> |
677 |
|
|
678 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
679 |
< |
destdir="${build.jsr166x.dir}" |
678 |
> |
<target name="jsr166ydist-jar" |
679 |
> |
depends="jsr166yclean, jsr166yjar"> |
680 |
> |
|
681 |
> |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
682 |
> |
|
683 |
> |
</target> |
684 |
> |
|
685 |
> |
<!-- extra166y --> |
686 |
> |
|
687 |
> |
|
688 |
> |
<target name="extra166ycompile" |
689 |
> |
depends="init, configure-compiler, jsr166ycompile" |
690 |
> |
description="Compiles extra166y sources"> |
691 |
> |
|
692 |
> |
<mkdir dir="${build.extra166y.dir}"/> |
693 |
> |
|
694 |
> |
<javac srcdir="${extra166ysrc.dir}" |
695 |
> |
destdir="${build.extra166y.dir}" |
696 |
|
debug="${build.debug}" |
697 |
+ |
classpath="${jsr166yproduct.jar}" |
698 |
|
debuglevel="${build.debuglevel}" |
699 |
|
deprecation="${build.deprecation}" |
700 |
|
source="${build.sourcelevel}" |
702 |
|
|
703 |
|
<include name="**/*.java"/> |
704 |
|
<compilerarg line="${build.args}"/> |
705 |
+ |
<compilerarg value="${bootclasspath.args}"/> |
706 |
+ |
|
707 |
+ |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
708 |
|
|
709 |
|
</javac> |
710 |
|
|
712 |
|
|
713 |
|
|
714 |
|
|
715 |
< |
<target name="jsr166xjar" |
716 |
< |
depends="jsr166xcompile" |
715 |
> |
<target name="extra166yjar" |
716 |
> |
depends="extra166ycompile" |
717 |
|
description="Builds library jar from compiled sources"> |
718 |
|
|
719 |
< |
<mkdir dir="${build.jsr166xlib.dir}"/> |
719 |
> |
<mkdir dir="${build.extra166ylib.dir}"/> |
720 |
|
|
721 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
722 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
721 |
> |
<jar destfile="${extra166yproduct.jar}" index="true"> |
722 |
> |
<fileset dir="${build.extra166y.dir}"/> |
723 |
|
</jar> |
724 |
|
|
725 |
|
</target> |
726 |
|
|
727 |
|
|
728 |
|
|
729 |
< |
<target name="jsr166xdocs" |
729 |
> |
<target name="extra166ydocs" |
730 |
|
description="Builds javadocs with custom tags to build folder"> |
731 |
|
|
732 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
733 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
732 |
> |
<delete dir="${build.extra166yjavadocs.dir}"/> |
733 |
> |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
734 |
> |
|
735 |
> |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
736 |
> |
link="http://java.sun.com/javase/6/docs/api/" |
737 |
> |
sourcepath="${src.dir}:${jsr166ysrc.dir}:${extra166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
738 |
|
|
1000 |
– |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
1001 |
– |
link="http://java.sun.com/j2se/1.5.0/docs/api/" |
739 |
|
> |
740 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
741 |
< |
<include name="jsr166x"/> |
740 |
> |
<packageset dir="${topsrc.dir}" defaultexcludes="no"> |
741 |
> |
<include name="extra166y"/> |
742 |
|
</packageset> |
743 |
|
|
744 |
|
|
747 |
|
</target> |
748 |
|
|
749 |
|
|
750 |
< |
<target name="jsr166xdist" |
751 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
750 |
> |
<target name="extra166ydist" |
751 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
752 |
|
description="Puts all distributable products in single hierarchy"/> |
753 |
|
|
754 |
|
|
755 |
|
|
756 |
< |
<target name="jsr166xclean" |
756 |
> |
<target name="extra166yclean" |
757 |
|
description="Removes all build products"> |
758 |
|
|
759 |
< |
<delete dir="${build.jsr166x.dir}"/> |
760 |
< |
<delete dir="${build.jsr166xlib.dir}"/> |
759 |
> |
<delete dir="${build.extra166y.dir}"/> |
760 |
> |
<delete dir="${build.extra166ylib.dir}"/> |
761 |
|
|
762 |
|
</target> |
763 |
|
|
764 |
|
|
765 |
|
|
766 |
< |
<target name="jsr166xdist-clean" |
766 |
> |
<target name="extra166ydist-clean" |
767 |
|
description="Removes all build and distribution products"> |
768 |
|
|
769 |
|
</target> |
770 |
|
|
771 |
< |
|
1035 |
< |
|
1036 |
< |
<target name="jsr166xdist-docs" |
771 |
> |
<target name="extra166ydist-docs" |
772 |
|
description="Builds javadocs without custom tags to dist folder"> |
773 |
|
|
774 |
< |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
775 |
< |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
1041 |
< |
|
1042 |
< |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
1043 |
< |
link="http://java.sun.com/j2se/1.5.0/docs/api/" |
1044 |
< |
source="${build.sourcelevel}"> |
1045 |
< |
|
1046 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
1047 |
< |
<include name="jsr166x"/> |
1048 |
< |
</packageset> |
774 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
775 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
776 |
|
|
777 |
+ |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
778 |
+ |
link="http://java.sun.com/javase/6/docs/api/" |
779 |
+ |
source="${build.sourcelevel}" |
780 |
+ |
sourcepath="${src.dir}:${jsr166ysrc.dir}:${extra166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
781 |
+ |
> |
782 |
+ |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
783 |
+ |
<include name="extra166y/*.java"/> |
784 |
+ |
</fileset> |
785 |
|
</javadoc> |
786 |
|
|
787 |
|
</target> |
788 |
|
|
789 |
< |
<target name="jsr166xdist-jar" |
790 |
< |
depends="jsr166xclean, jsr166xjar"> |
789 |
> |
<target name="extra166ydist-jar" |
790 |
> |
depends="extra166yclean, extra166yjar"> |
791 |
|
|
792 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
792 |
> |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
793 |
|
|
794 |
|
</target> |
795 |
|
|