21 |
|
|
22 |
|
|
23 |
|
<!-- Compilation options --> |
24 |
< |
<property name="build.sourcelevel" value="1.5"/> |
24 |
> |
<property name="build.sourcelevel" value="1.6"/> |
25 |
|
<property name="build.debug" value="true"/> |
26 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
27 |
|
<property name="build.deprecation" value="false"/> |
28 |
|
|
29 |
|
<!-- Build locations --> |
30 |
< |
<property name="build.dir" location="build"/> |
31 |
< |
<property name="build.classes.dir" location="${build.dir}/classes"/> |
32 |
< |
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
33 |
< |
<property name="build.j1.dir" location="${build.dir}/j1"/> |
34 |
< |
<property name="build.loops.dir" location="${build.dir}/loops"/> |
35 |
< |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
36 |
< |
<property name="build.ant.dir" location="${build.dir}/ant"/> |
37 |
< |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
38 |
< |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
39 |
< |
<property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/> |
40 |
< |
<property name="build.doccheck.dir" location="${build.dir}/doccheck"/> |
41 |
< |
<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/> |
42 |
< |
<property name="build.dc-filter.dir" location="${build.dir}/filterdocchk"/> |
43 |
< |
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
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.loops.dir" location="${build.dir}/loops"/> |
34 |
> |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
35 |
> |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
36 |
> |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
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 |
< |
|
59 |
> |
<property name="jsr166ysrc.dir" location="${basedir}/src/jsr166y"/> |
60 |
> |
<property name="extra166ysrc.dir" location="${basedir}/src/extra166y"/> |
61 |
> |
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
62 |
|
<!-- Distribution locations --> |
63 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
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.classes.dir}"/> |
88 |
– |
<pathelement location="${build.j1.dir}"/> |
89 |
– |
<pathelement location="${junit.jar}"/> |
90 |
– |
|
91 |
– |
<!-- Include dl.u.c for BoundedBuffer comparison --> |
92 |
– |
<pathelement location="${concurrent.jar}"/> |
93 |
– |
</path> |
94 |
– |
|
89 |
|
|
90 |
|
<!-- Main targets --> |
91 |
|
|
92 |
+ |
<target name="dists" |
93 |
+ |
depends="dist, jsr166xdist, jsr166ydist, extra166ydist" |
94 |
+ |
description="Builds all public jars and docs"/> |
95 |
|
|
96 |
|
<target name="compile" |
97 |
|
depends="init, configure-compiler" |
108 |
|
fork="true"> |
109 |
|
|
110 |
|
<include name="**/*.java"/> |
111 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
112 |
+ |
|
113 |
+ |
<!-- |
114 |
|
<exclude name="java/lang/**"/> |
115 |
|
<compilerarg line="${build.args}"/> |
116 |
+ |
<compilerarg line="-Xlint -Xmaxwarns 1000"/> |
117 |
+ |
--> |
118 |
|
|
119 |
|
</javac> |
120 |
|
|
149 |
|
<mkdir dir="${build.javadocs.dir}"/> |
150 |
|
|
151 |
|
<javadoc destdir="${build.javadocs.dir}" |
152 |
< |
link="http://java.sun.com/j2se/1.4.1/docs/api" |
152 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
153 |
|
overview="${src.dir}/intro.html" |
154 |
< |
source="${build.sourcelevel}"> |
155 |
< |
|
154 |
< |
<tag name="revised" description="Last revised:"/> |
155 |
< |
<tag name="spec" description="Specified by:"/> |
154 |
> |
sourcepath="${src.dir}:${jdksrc.dir}" |
155 |
> |
> |
156 |
|
|
157 |
|
<packageset dir="${src.dir}"/> |
158 |
|
|
162 |
|
|
163 |
|
|
164 |
|
|
165 |
– |
<target name="doccheck" |
166 |
– |
depends="filter-doccheck" |
167 |
– |
description="Reports on javadoc style errors"> |
168 |
– |
|
169 |
– |
<delete dir="${build.doccheck.dir}"/> |
170 |
– |
<mkdir dir="${build.doccheck.dir}"/> |
171 |
– |
|
172 |
– |
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
173 |
– |
docletpath="${lib.dir}/doccheck.jar" |
174 |
– |
destdir="${build.doccheck.dir}"> |
175 |
– |
<packageset dir="${build.dc-filter.dir}"/> |
176 |
– |
</javadoc> |
177 |
– |
|
178 |
– |
<echo>DocCheck output is in ${build.doccheck.dir}</echo> |
179 |
– |
|
180 |
– |
</target> |
181 |
– |
|
182 |
– |
|
183 |
– |
|
184 |
– |
<target name="checkstyle" |
185 |
– |
depends="filter-src" |
186 |
– |
description="Reports on style errors in Java source (verbose, mostly chaff)"> |
187 |
– |
|
188 |
– |
<taskdef resource="checkstyletask.properties" |
189 |
– |
classpath="${lib.dir}/checkstyle-all-3.1.jar"/> |
190 |
– |
|
191 |
– |
<mkdir dir="${build.checkstyle.dir}"/> |
192 |
– |
|
193 |
– |
<checkstyle config="etc/checkstyle/sun_checks.xml" |
194 |
– |
failOnViolation="false"> |
195 |
– |
<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/> |
196 |
– |
<fileset dir="${build.filter.src.dir}" includes="**/*.java"/> |
197 |
– |
</checkstyle> |
198 |
– |
|
199 |
– |
<style in="${build.checkstyle.dir}/checkstyle-report.xml" |
200 |
– |
out="${build.checkstyle.dir}/checkstyle-report.html" |
201 |
– |
style="${stylesheet.dir}/checkstyle-frames.xsl"/> |
202 |
– |
|
203 |
– |
</target> |
204 |
– |
|
205 |
– |
|
206 |
– |
|
165 |
|
<target name="dist" |
166 |
|
depends="init, dist-clean, dist-jar, dist-docs" |
167 |
|
description="Puts all distributable products in single hierarchy"/> |
168 |
|
|
169 |
|
|
212 |
– |
|
170 |
|
<target name="release" |
171 |
|
depends="dist" |
172 |
|
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
213 |
|
<delete dir="${dist.javadocs.dir}"/> |
214 |
|
<mkdir dir="${dist.javadocs.dir}"/> |
215 |
|
|
216 |
< |
<javadoc destdir="${dist.javadocs.dir}" |
217 |
< |
link="http://java.sun.com/j2se/1.4.2/docs/api" |
261 |
< |
overview="${src.dir}/intro.html" |
262 |
< |
source="${build.sourcelevel}"> |
263 |
< |
|
264 |
< |
<packageset dir="${src.dir}"/> |
216 |
> |
<!-- the packagenames="none" hack below prevents scanning the --> |
217 |
> |
<!-- sourcepath for packages --> |
218 |
|
|
219 |
+ |
<javadoc destdir="${dist.javadocs.dir}" |
220 |
+ |
packagenames="none" |
221 |
+ |
link="http://download.oracle.com/javase/6/docs/api/" |
222 |
+ |
overview="${src.dir}/intro.html" |
223 |
+ |
sourcepath="${src.dir}:${jdksrc.dir}" > |
224 |
+ |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
225 |
+ |
<include name="**/*.java"/> |
226 |
+ |
</fileset> |
227 |
|
</javadoc> |
228 |
|
|
229 |
|
</target> |
251 |
|
</target> |
252 |
|
|
253 |
|
|
293 |
– |
<target name="compile-ant-filter" |
294 |
– |
depends="init"> |
295 |
– |
|
296 |
– |
<mkdir dir="${build.ant.dir}"/> |
297 |
– |
|
298 |
– |
<javac srcdir="${ant.src.dir}" |
299 |
– |
destdir="${build.ant.dir}" |
300 |
– |
source="1.4"/> |
301 |
– |
|
302 |
– |
</target> |
303 |
– |
|
304 |
– |
|
305 |
– |
<target name="filter-src" |
306 |
– |
depends="compile-ant-filter"> |
307 |
– |
|
308 |
– |
<mkdir dir="${build.filter.src.dir}"/> |
309 |
– |
|
310 |
– |
<copy todir="${build.filter.src.dir}"> |
311 |
– |
<fileset dir="${src.dir}"> |
312 |
– |
<include name="**/*.html"/> |
313 |
– |
</fileset> |
314 |
– |
</copy> |
315 |
– |
|
316 |
– |
<copy todir="${build.filter.src.dir}"> |
317 |
– |
<fileset dir="${src.dir}"> |
318 |
– |
<exclude name="**/*.html"/> |
319 |
– |
<!-- Files excluded from dist-docs --> |
320 |
– |
<exclude name="java/util/Random.*"/> |
321 |
– |
<exclude name="sun/misc/Unsafe.*"/> |
322 |
– |
</fileset> |
323 |
– |
<!-- |
324 |
– |
<filterchain> |
325 |
– |
--> |
326 |
– |
|
327 |
– |
<!-- |
328 |
– |
# This filter gets rid of angle-bracketed type parameters |
329 |
– |
# so that javadoc can run on the result. The following |
330 |
– |
# heuristic seems to work: |
331 |
– |
# |
332 |
– |
# For all lines not starting with space(s)-asterisk-space(s), |
333 |
– |
# replace <something> with a space, where there may be more |
334 |
– |
# than one right angle bracket at the end, and "something" |
335 |
– |
# must not contain parens or pipes. (This may need some |
336 |
– |
# tweaking.) |
337 |
– |
--> |
338 |
– |
|
339 |
– |
<!-- |
340 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
341 |
– |
classpath="${build.ant.dir}"> |
342 |
– |
<param name="notmatching" value="^\s+\*\s.*$"/> |
343 |
– |
<param name="pattern" value="<[^|>()]+?>+"/> |
344 |
– |
<param name="replacement" value=" "/> |
345 |
– |
</filterreader> |
346 |
– |
--> |
347 |
– |
|
348 |
– |
<!-- |
349 |
– |
</filterchain> |
350 |
– |
--> |
351 |
– |
</copy> |
352 |
– |
|
353 |
– |
</target> |
354 |
– |
|
355 |
– |
|
356 |
– |
<target name="filter-doccheck" |
357 |
– |
depends="filter-src"> |
358 |
– |
|
359 |
– |
<mkdir dir="${build.dc-filter.dir}"/> |
360 |
– |
|
361 |
– |
<copy todir="${build.dc-filter.dir}"> |
362 |
– |
<fileset dir="${build.filter.src.dir}"> |
363 |
– |
<include name="**/*.html"/> |
364 |
– |
</fileset> |
365 |
– |
</copy> |
366 |
– |
|
367 |
– |
<property name="generic.declarations" |
368 |
– |
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 {}" |
369 |
– |
/> |
370 |
– |
|
371 |
– |
<copy todir="${build.dc-filter.dir}"> |
372 |
– |
<fileset dir="${build.filter.src.dir}"> |
373 |
– |
<exclude name="**/*.html"/> |
374 |
– |
</fileset> |
375 |
– |
<filterchain> |
376 |
– |
<!-- |
377 |
– |
# These two filters try to make the source look like |
378 |
– |
# something that doccheck can process. The first removes |
379 |
– |
# -source 1.4 assertions and the second adds in a bunch |
380 |
– |
# of single letter public nested marker interfaces so that |
381 |
– |
# the generic type parameters are recognized. |
382 |
– |
--> |
383 |
– |
|
384 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
385 |
– |
classpath="${build.ant.dir}"> |
386 |
– |
<param name="matching" value="^\s*assert[\s ].*$"/> |
387 |
– |
<param name="pattern" value="assert"/> |
388 |
– |
<param name="replacement" value="//assert"/> |
389 |
– |
</filterreader> |
390 |
– |
|
391 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
392 |
– |
classpath="${build.ant.dir}"> |
393 |
– |
<param name="matching" value="^([^*]*(class|interface|implements) .*|)\{.*$"/> |
394 |
– |
<param name="pattern" value="$"/> |
395 |
– |
<param name="replacement" value=" ${generic.declarations}"/> |
396 |
– |
</filterreader> |
397 |
– |
|
398 |
– |
</filterchain> |
399 |
– |
</copy> |
400 |
– |
|
401 |
– |
</target> |
402 |
– |
|
403 |
– |
|
254 |
|
<target name="compile-tests" |
255 |
|
depends="jar"> |
256 |
|
|
266 |
|
|
267 |
|
<compilerarg value="${bootclasspath.args}"/> |
268 |
|
<compilerarg line="${build.args}"/> |
269 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
270 |
|
|
271 |
|
<classpath refid="test.classpath"/> |
272 |
|
|
284 |
|
|
285 |
|
<compilerarg value="${bootclasspath.args}"/> |
286 |
|
<compilerarg line="${build.args}"/> |
287 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
288 |
|
|
289 |
|
<classpath refid="test.classpath"/> |
290 |
|
|
301 |
|
|
302 |
|
<compilerarg value="${bootclasspath.args}"/> |
303 |
|
<compilerarg line="${build.args}"/> |
304 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
305 |
|
|
306 |
|
<classpath refid="test.classpath"/> |
307 |
|
|
374 |
|
<fileset dir="${build.reports.dir}"> |
375 |
|
<include name="TEST-*.xml"/> |
376 |
|
</fileset> |
377 |
< |
<report styledir="${stylesheet.dir}" |
525 |
< |
format="${junit.report.format}" |
526 |
< |
todir="${build.reports.dir}" |
377 |
> |
<report format="${junit.report.format}" todir="${build.reports.dir}" |
378 |
|
/> |
379 |
|
</junitreport> |
380 |
|
|
424 |
|
</target> |
425 |
|
|
426 |
|
|
576 |
– |
|
577 |
– |
<!-- Anthill targets --> |
578 |
– |
|
579 |
– |
<target name="anthill-build"> |
580 |
– |
|
581 |
– |
<!-- Override this in user.properties --> |
582 |
– |
<property name="tiger.home" location="e:/j2sdk1.5.0"/> |
583 |
– |
|
584 |
– |
<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java"> |
585 |
– |
<arg value="-Xmx256000000"/> |
586 |
– |
<!-- classpath of new JVM --> |
587 |
– |
<arg value="-classpath"/> <arg path="${java.class.path}"/> |
588 |
– |
<!-- location of Ant home directory --> |
589 |
– |
<arg value="-Dant.home=${ant.home}"/> |
590 |
– |
<!-- the Ant main class --> |
591 |
– |
<arg value="org.apache.tools.ant.Main"/> |
592 |
– |
<!-- The build file --> |
593 |
– |
<arg value="-buildfile"/> <arg value="build.xml"/> |
594 |
– |
<!-- the target to build on the new Ant instance --> |
595 |
– |
<arg value="-DJAVA_HOME=${tiger.home}"/> |
596 |
– |
<arg value="do-anthill-build"/> |
597 |
– |
</exec> |
598 |
– |
</target> |
599 |
– |
|
600 |
– |
<target name="do-anthill-build" |
601 |
– |
depends="jar, test, docs, dist-docs"/> |
602 |
– |
|
603 |
– |
<target name="anthill-publish"> |
604 |
– |
|
605 |
– |
<copy todir="${deployDir}/docs/private"> |
606 |
– |
<fileset dir="${build.javadocs.dir}"/> |
607 |
– |
</copy> |
608 |
– |
|
609 |
– |
<copy todir="${deployDir}/docs/public"> |
610 |
– |
<fileset dir="${dist.javadocs.dir}"/> |
611 |
– |
</copy> |
612 |
– |
|
613 |
– |
<copy tofile="${deployDir}/index.html" |
614 |
– |
file="${basedir}/etc/anthill-index.html"/> |
615 |
– |
|
616 |
– |
<copy todir="${deployDir}/notes"> |
617 |
– |
<fileset dir="${basedir}/etc/notes"/> |
618 |
– |
</copy> |
619 |
– |
|
620 |
– |
</target> |
621 |
– |
|
622 |
– |
|
623 |
– |
|
427 |
|
<!-- Various demos and test programs --> |
428 |
|
|
429 |
|
|
627 |
– |
<target name="sample" depends="init, configure-compiler" |
628 |
– |
description="Standalone demo program"> |
629 |
– |
|
630 |
– |
<mkdir dir="${build.testcases.dir}"/> |
631 |
– |
|
632 |
– |
<javac srcdir="${test.src.dir}" |
633 |
– |
destdir="${build.testcases.dir}" |
634 |
– |
debug="${build.debug}" |
635 |
– |
debuglevel="${build.debuglevel}" |
636 |
– |
deprecation="${build.deprecation}" |
637 |
– |
source="${build.sourcelevel}" |
638 |
– |
fork="true"> |
639 |
– |
|
640 |
– |
<include name="jsr166/test/Sample.java"/> |
641 |
– |
|
642 |
– |
</javac> |
643 |
– |
|
644 |
– |
<copy todir="${build.testcases.dir}"> |
645 |
– |
<fileset dir="${test.src.dir}"> |
646 |
– |
<include name="**/*.properties"/> |
647 |
– |
</fileset> |
648 |
– |
</copy> |
649 |
– |
|
650 |
– |
|
651 |
– |
<java classname="jsr166.test.Sample" fork="true"> |
652 |
– |
<classpath refid="test.classpath"/> |
653 |
– |
<!-- <jvmarg value="-ea"/> --> |
654 |
– |
<!-- <jvmarg value="-server"/> --> |
655 |
– |
<!-- <arg value="1000"/> --> |
656 |
– |
</java> |
657 |
– |
</target> |
658 |
– |
|
659 |
– |
|
430 |
|
<target name="loops" depends="init, configure-compiler" |
431 |
|
description="Benchmark from Doug Lea's AQS paper"> |
432 |
|
|
442 |
|
|
443 |
|
<compilerarg line="${build.args}"/> |
444 |
|
<classpath refid="loops.classpath"/> |
445 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
446 |
|
|
447 |
|
</javac> |
448 |
|
|
453 |
|
</target> |
454 |
|
|
455 |
|
|
456 |
< |
<target name="compile-j1" depends="init, configure-compiler, compile"> |
456 |
> |
<!-- jsr166x --> |
457 |
> |
|
458 |
> |
|
459 |
> |
<target name="jsr166xcompile" |
460 |
> |
depends="init, configure-compiler" |
461 |
> |
description="Compiles jsr166x sources"> |
462 |
|
|
463 |
< |
<mkdir dir="${build.j1.dir}"/> |
463 |
> |
<mkdir dir="${build.jsr166x.dir}"/> |
464 |
|
|
465 |
< |
<javac srcdir="${j1.src.dir}" |
466 |
< |
destdir="${build.j1.dir}" |
465 |
> |
<javac srcdir="${jsr166xsrc.dir}" |
466 |
> |
destdir="${build.jsr166x.dir}" |
467 |
|
debug="${build.debug}" |
468 |
|
debuglevel="${build.debuglevel}" |
469 |
|
deprecation="${build.deprecation}" |
470 |
< |
source="${build.sourcelevel}" > |
470 |
> |
source="${build.sourcelevel}" |
471 |
> |
fork="true"> |
472 |
|
|
473 |
|
<include name="**/*.java"/> |
697 |
– |
<exclude name="**/dijkstra/**"/> |
698 |
– |
|
474 |
|
<compilerarg line="${build.args}"/> |
475 |
< |
<classpath refid="j1.classpath"/> |
475 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
476 |
|
|
477 |
|
</javac> |
478 |
|
|
479 |
|
</target> |
480 |
|
|
481 |
|
|
707 |
– |
<target name="sw" depends="compile-j1" |
708 |
– |
description="Runs the SwingWorker demo"> |
482 |
|
|
483 |
< |
<!-- |
484 |
< |
<java classname="jsr166.swing.SwingWorkerDemo" fork="true"> |
485 |
< |
<classpath refid="j1.classpath"/> |
713 |
< |
</java> |
714 |
< |
--> |
483 |
> |
<target name="jsr166xjar" |
484 |
> |
depends="jsr166xcompile" |
485 |
> |
description="Builds library jar from compiled sources"> |
486 |
|
|
487 |
< |
<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/> |
487 |
> |
<mkdir dir="${build.jsr166xlib.dir}"/> |
488 |
|
|
489 |
< |
<exec dir="${build.j1.dir}" executable="appletviewer.exe"> |
490 |
< |
<arg value="${build.j1.dir}/SwingWorker.html"/> |
491 |
< |
</exec> |
489 |
> |
<jar destfile="${jsr166xproduct.jar}"> |
490 |
> |
<fileset dir="${build.jsr166x.dir}"/> |
491 |
> |
</jar> |
492 |
|
|
493 |
|
</target> |
494 |
|
|
724 |
– |
<target name="j1" depends="compile-j1" |
725 |
– |
description="Runs a standalone JavaOne program"> |
495 |
|
|
727 |
– |
<java classname="${j1.test}" fork="true"> |
728 |
– |
<classpath refid="j1.classpath"/> |
729 |
– |
<jvmarg value="-client"/> |
496 |
|
|
497 |
< |
<!-- TestPseudoRandom args --> |
498 |
< |
<arg value="2"/> |
733 |
< |
<arg value="25"/> |
734 |
< |
<arg value="100000"/> |
497 |
> |
<target name="jsr166xdocs" |
498 |
> |
description="Builds javadocs with custom tags to build folder"> |
499 |
|
|
500 |
< |
<!-- WebCrawler args --> |
501 |
< |
<!-- |
738 |
< |
<arg value="jsr166.webcrawler.WebCrawler3"/> |
739 |
< |
<arg value="http://www.priorartisans.com"/> |
740 |
< |
<arg value="25"/> |
741 |
< |
--> |
500 |
> |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
501 |
> |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
502 |
|
|
503 |
< |
</java> |
503 |
> |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
504 |
> |
packagenames="jsr166x" |
505 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
506 |
> |
source="${build.sourcelevel}" |
507 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
508 |
|
|
509 |
|
</target> |
510 |
|
|
511 |
|
|
512 |
< |
<target name="test-j1" depends="compile-j1" |
513 |
< |
description="Runs testcases from the JavaOne source directories"> |
514 |
< |
|
751 |
< |
<junit printsummary="true" |
752 |
< |
showoutput="true" |
753 |
< |
errorProperty="junit.failed" |
754 |
< |
failureProperty="junit.failed" |
755 |
< |
dir="${build.j1.dir}" |
756 |
< |
fork="true"> |
757 |
< |
|
758 |
< |
<!-- <jvmarg value="-server"/> --> |
759 |
< |
<classpath refid="j1.classpath"/> |
760 |
< |
<formatter type="xml"/> |
761 |
< |
|
762 |
< |
<batchtest todir="${build.j1.dir}"> |
763 |
< |
<fileset dir="${j1.src.dir}"> |
764 |
< |
<include name="**/*Test.java"/> |
765 |
< |
</fileset> |
766 |
< |
</batchtest> |
512 |
> |
<target name="jsr166xdist" |
513 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
514 |
> |
description="Puts all distributable products in single hierarchy"/> |
515 |
|
|
768 |
– |
</junit> |
516 |
|
|
770 |
– |
<available property="junit.report.format" |
771 |
– |
value="frames" |
772 |
– |
classname="org.apache.xalan.lib.Redirect"/> |
773 |
– |
<property name="junit.report.format" value="noframes"/> |
517 |
|
|
518 |
< |
<junitreport todir="${build.j1.dir}"> |
519 |
< |
<fileset dir="${build.j1.dir}"> |
777 |
< |
<include name="TEST-*.xml"/> |
778 |
< |
</fileset> |
779 |
< |
<report styledir="${stylesheet.dir}" |
780 |
< |
format="${junit.report.format}" |
781 |
< |
todir="${build.j1.dir}" |
782 |
< |
/> |
783 |
< |
</junitreport> |
518 |
> |
<target name="jsr166xclean" |
519 |
> |
description="Removes all build products"> |
520 |
|
|
521 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
521 |
> |
<delete dir="${build.jsr166x.dir}"/> |
522 |
> |
<delete dir="${build.jsr166xlib.dir}"/> |
523 |
|
|
524 |
|
</target> |
525 |
|
|
526 |
|
|
527 |
|
|
528 |
< |
<!-- C++ and JNI definitions and demos --> |
529 |
< |
|
793 |
< |
<target name="configure-cpp"> |
794 |
< |
|
795 |
< |
<!-- Define tasks and types --> |
528 |
> |
<target name="jsr166xdist-clean" |
529 |
> |
description="Removes all build and distribution products"> |
530 |
|
|
531 |
< |
<path id="cpptasks.path"> |
798 |
< |
<pathelement location="${lib.dir}/cpptasks.jar"/> |
799 |
< |
</path> |
800 |
< |
<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/> |
801 |
< |
<typedef resource="cpptasks.types" classpathref="cpptasks.path"/> |
531 |
> |
</target> |
532 |
|
|
803 |
– |
<!-- Set platform property for JNI includes --> |
533 |
|
|
805 |
– |
<condition property="platform" value="linux"> |
806 |
– |
<os name="Linux"/> |
807 |
– |
</condition> |
808 |
– |
<condition property="platform" value="win32"> |
809 |
– |
<os family="windows"/> |
810 |
– |
</condition> |
811 |
– |
<condition property="platform" value="solaris"> |
812 |
– |
<os name="SunOS"/> |
813 |
– |
</condition> |
534 |
|
|
535 |
< |
</target> |
535 |
> |
<target name="jsr166xdist-docs" |
536 |
> |
description="Builds javadocs without custom tags to dist folder"> |
537 |
|
|
538 |
+ |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
539 |
+ |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
540 |
|
|
541 |
< |
<target name="cppdemo" depends="configure-cpp"> |
541 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
542 |
> |
packagenames="jsr166x" |
543 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
544 |
> |
source="${build.sourcelevel}" |
545 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
546 |
|
|
547 |
< |
<mkdir dir="${build.dir}"/> |
547 |
> |
</target> |
548 |
|
|
549 |
< |
<cc multithreaded="true" |
550 |
< |
name="g++" |
824 |
< |
objdir="${build.dir}" |
825 |
< |
outfile="${build.dir}/CppDemo"> |
826 |
< |
<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/> |
827 |
< |
<libset libs="stdc++"/> |
828 |
< |
</cc> |
549 |
> |
<target name="jsr166xdist-jar" |
550 |
> |
depends="jsr166xclean, jsr166xjar"> |
551 |
|
|
552 |
< |
<exec executable="${build.dir}/CppDemo"> |
831 |
< |
<arg line="count in word frequency of word in command line count"/> |
832 |
< |
</exec> |
552 |
> |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
553 |
|
|
554 |
|
</target> |
555 |
|
|
556 |
+ |
<!-- jsr166y --> |
557 |
|
|
837 |
– |
<target name="jnidemo" depends="init, configure-compiler, configure-cpp"> |
558 |
|
|
559 |
< |
<mkdir dir="${build.testcases.dir}"/> |
559 |
> |
<target name="jsr166ycompile" |
560 |
> |
depends="init, configure-compiler" |
561 |
> |
description="Compiles jsr166y sources"> |
562 |
|
|
563 |
< |
<javac srcdir="${test.src.dir}" |
564 |
< |
destdir="${build.testcases.dir}" |
563 |
> |
<mkdir dir="${build.jsr166y.dir}"/> |
564 |
> |
|
565 |
> |
<javac srcdir="${jsr166ysrc.dir}" |
566 |
> |
destdir="${build.jsr166y.dir}" |
567 |
|
debug="${build.debug}" |
568 |
|
debuglevel="${build.debuglevel}" |
569 |
|
deprecation="${build.deprecation}" |
570 |
|
source="${build.sourcelevel}" |
571 |
|
fork="true"> |
572 |
< |
<compilerarg value="${bootclasspath.args}"/> |
572 |
> |
|
573 |
> |
<include name="**/*.java"/> |
574 |
|
<compilerarg line="${build.args}"/> |
575 |
< |
<classpath refid="test.classpath"/> |
576 |
< |
<include name="JniDemo.java"/> |
852 |
< |
</javac> |
575 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
576 |
> |
<compilerarg value="${bootclasspath.args}"/> |
577 |
|
|
578 |
< |
<javah destdir="${build.testcases.dir}" |
579 |
< |
classpathref="test.classpath"> |
580 |
< |
<class name="JniDemo"/> |
857 |
< |
</javah> |
858 |
< |
|
859 |
< |
<cc multithreaded="true" |
860 |
< |
name="g++" |
861 |
< |
objdir="${build.dir}" |
862 |
< |
outfile="${build.dir}/JniDemo" |
863 |
< |
outtype="shared"> |
864 |
< |
|
865 |
< |
<compiler> |
866 |
< |
<defineset> |
867 |
< |
<define name="__int64" value="long long"/> |
868 |
< |
</defineset> |
869 |
< |
<includepath location="${java.home}/../include"/> |
870 |
< |
<includepath location="${java.home}/../include/${platform}"/> |
871 |
< |
<compilerarg value="-mno-cygwin"/> |
872 |
< |
</compiler> |
873 |
< |
|
874 |
< |
<linker> |
875 |
< |
<linkerarg value="--add-stdcall-alias"/> |
876 |
< |
</linker> |
877 |
< |
|
878 |
< |
<includepath location="${build.testcases.dir}"/> |
879 |
< |
|
880 |
< |
<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/> |
881 |
< |
|
882 |
< |
<libset libs="stdc++"/> |
883 |
< |
|
884 |
< |
</cc> |
885 |
< |
|
886 |
< |
<!-- Necessary if windows, harmless if not --> |
887 |
< |
<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/> |
888 |
< |
|
889 |
< |
<java classname="JniDemo" fork="true"> |
890 |
< |
<!-- Watch out: path separator hardwired to semicolon here! --> |
891 |
< |
<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/> |
892 |
< |
<classpath refid="test.classpath"/> |
893 |
< |
<arg line="count in word frequency of word in command line count"/> |
894 |
< |
</java> |
578 |
> |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
579 |
> |
|
580 |
> |
</javac> |
581 |
|
|
582 |
|
</target> |
583 |
|
|
584 |
|
|
585 |
|
|
586 |
< |
<!-- Backward compatibility, work in progress (some files not checked in) --> |
586 |
> |
<target name="jsr166yjar" |
587 |
> |
depends="jsr166ycompile" |
588 |
> |
description="Builds library jar from compiled sources"> |
589 |
|
|
590 |
+ |
<mkdir dir="${build.jsr166ylib.dir}"/> |
591 |
|
|
592 |
+ |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
593 |
+ |
<fileset dir="${build.jsr166y.dir}"/> |
594 |
+ |
</jar> |
595 |
|
|
596 |
< |
<property name="pretiger.src.dir" location="${build.dir}/pretiger/src"/> |
905 |
< |
<property name="build.pretiger.dir" location="${build.dir}/pretiger/classes"/> |
906 |
< |
<property name="pretiger.jar" location="${build.lib.dir}/jsr166-pretiger.jar"/> |
907 |
< |
<property name="pretiger.sourcelevel" value="1.4"/> |
596 |
> |
</target> |
597 |
|
|
909 |
– |
<target name="defang" |
910 |
– |
depends="init" |
911 |
– |
description="Generates pre-Tiger compatible source"> |
598 |
|
|
913 |
– |
<delete dir="${pretiger.src.dir}"/> |
914 |
– |
<mkdir dir="${pretiger.src.dir}"/> |
599 |
|
|
600 |
< |
<exec executable="perl"> |
601 |
< |
<arg file="etc/defang.pl"/> |
602 |
< |
<!-- <arg value="-v"/> --> |
603 |
< |
<arg value="-s"/> <arg file="${src.dir}"/> |
604 |
< |
<arg value="-t"/> <arg file="${pretiger.src.dir}"/> |
605 |
< |
</exec> |
600 |
> |
<target name="jsr166ydocs" |
601 |
> |
description="Builds javadocs with custom tags to build folder"> |
602 |
> |
|
603 |
> |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
604 |
> |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
605 |
> |
|
606 |
> |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
607 |
> |
packagenames="jsr166y" |
608 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
609 |
> |
source="${build.sourcelevel}" |
610 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
611 |
|
|
612 |
|
</target> |
613 |
|
|
925 |
– |
<target name="compile-pretiger" |
926 |
– |
depends="init, configure-compiler, defang" |
927 |
– |
description="Compiles pre-Tiger sources to build folder"> |
614 |
|
|
615 |
< |
<mkdir dir="${build.pretiger.dir}"/> |
615 |
> |
<target name="jsr166ydist" |
616 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
617 |
> |
description="Puts all distributable products in single hierarchy"/> |
618 |
> |
|
619 |
|
|
931 |
– |
<javac srcdir="${pretiger.src.dir}" |
932 |
– |
destdir="${build.pretiger.dir}" |
933 |
– |
debug="${build.debug}" |
934 |
– |
debuglevel="${build.debuglevel}" |
935 |
– |
deprecation="${build.deprecation}" |
936 |
– |
source="${pretiger.sourcelevel}" |
937 |
– |
fork="true"> |
620 |
|
|
621 |
< |
<compilerarg line="${build.args}"/> |
622 |
< |
<exclude name="**/Thread.java"/> |
621 |
> |
<target name="jsr166yclean" |
622 |
> |
description="Removes all build products"> |
623 |
|
|
624 |
< |
</javac> |
624 |
> |
<delete dir="${build.jsr166y.dir}"/> |
625 |
> |
<delete dir="${build.jsr166ylib.dir}"/> |
626 |
|
|
627 |
|
</target> |
628 |
|
|
946 |
– |
<target name="pretiger" depends="compile-pretiger"> |
629 |
|
|
948 |
– |
<mkdir dir="${build.lib.dir}"/> |
630 |
|
|
631 |
< |
<jar destfile="${pretiger.jar}"> |
632 |
< |
<fileset dir="${build.pretiger.dir}"> |
952 |
< |
</fileset> |
953 |
< |
</jar> |
631 |
> |
<target name="jsr166ydist-clean" |
632 |
> |
description="Removes all build and distribution products"> |
633 |
|
|
634 |
|
</target> |
635 |
|
|
636 |
< |
<!-- jsr166x --> |
636 |
> |
<target name="jsr166ydist-docs" |
637 |
> |
description="Builds javadocs without custom tags to dist folder"> |
638 |
|
|
639 |
+ |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
640 |
+ |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
641 |
|
|
642 |
< |
<target name="jsr166xcompile" |
643 |
< |
depends="init, configure-compiler" |
644 |
< |
description="Compiles jsr166x sources"> |
642 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
643 |
> |
packagenames="jsr166y" |
644 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
645 |
> |
source="${build.sourcelevel}" |
646 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
647 |
|
|
648 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
648 |
> |
</target> |
649 |
|
|
650 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
651 |
< |
destdir="${build.jsr166x.dir}" |
650 |
> |
<target name="jsr166ydist-jar" |
651 |
> |
depends="jsr166yclean, jsr166yjar"> |
652 |
> |
|
653 |
> |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
654 |
> |
|
655 |
> |
</target> |
656 |
> |
|
657 |
> |
<!-- extra166y --> |
658 |
> |
|
659 |
> |
|
660 |
> |
<target name="extra166ycompile" |
661 |
> |
depends="init, configure-compiler, jsr166ycompile" |
662 |
> |
description="Compiles extra166y sources"> |
663 |
> |
|
664 |
> |
<mkdir dir="${build.extra166y.dir}"/> |
665 |
> |
|
666 |
> |
<javac srcdir="${extra166ysrc.dir}" |
667 |
> |
destdir="${build.extra166y.dir}" |
668 |
|
debug="${build.debug}" |
669 |
+ |
classpath="${jsr166yproduct.jar}" |
670 |
|
debuglevel="${build.debuglevel}" |
671 |
|
deprecation="${build.deprecation}" |
672 |
|
source="${build.sourcelevel}" |
674 |
|
|
675 |
|
<include name="**/*.java"/> |
676 |
|
<compilerarg line="${build.args}"/> |
677 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
678 |
+ |
<compilerarg value="${bootclasspath.args}"/> |
679 |
+ |
|
680 |
+ |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
681 |
|
|
682 |
|
</javac> |
683 |
|
|
685 |
|
|
686 |
|
|
687 |
|
|
688 |
< |
<target name="jsr166xjar" |
689 |
< |
depends="jsr166xcompile" |
688 |
> |
<target name="extra166yjar" |
689 |
> |
depends="extra166ycompile" |
690 |
|
description="Builds library jar from compiled sources"> |
691 |
|
|
692 |
< |
<mkdir dir="${build.jsr166xlib.dir}"/> |
692 |
> |
<mkdir dir="${build.extra166ylib.dir}"/> |
693 |
|
|
694 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
695 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
694 |
> |
<jar destfile="${extra166yproduct.jar}" index="true"> |
695 |
> |
<fileset dir="${build.extra166y.dir}"/> |
696 |
|
</jar> |
697 |
|
|
698 |
|
</target> |
699 |
|
|
700 |
|
|
701 |
|
|
702 |
< |
<target name="jsr166xdocs" |
702 |
> |
<target name="extra166ydocs" |
703 |
|
description="Builds javadocs with custom tags to build folder"> |
704 |
|
|
705 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
706 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
1002 |
< |
|
1003 |
< |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
1004 |
< |
link="http://java.sun.com/j2se/1.5.0/docs/api/" |
1005 |
< |
> |
1006 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
1007 |
< |
<include name="jsr166x"/> |
1008 |
< |
</packageset> |
1009 |
< |
|
705 |
> |
<delete dir="${build.extra166yjavadocs.dir}"/> |
706 |
> |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
707 |
|
|
708 |
< |
</javadoc> |
708 |
> |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
709 |
> |
packagenames="extra166y" |
710 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
711 |
> |
source="${build.sourcelevel}" |
712 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
713 |
|
|
714 |
|
</target> |
715 |
|
|
716 |
|
|
717 |
< |
<target name="jsr166xdist" |
718 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
717 |
> |
<target name="extra166ydist" |
718 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
719 |
|
description="Puts all distributable products in single hierarchy"/> |
720 |
|
|
721 |
|
|
722 |
|
|
723 |
< |
<target name="jsr166xclean" |
723 |
> |
<target name="extra166yclean" |
724 |
|
description="Removes all build products"> |
725 |
|
|
726 |
< |
<delete dir="${build.jsr166x.dir}"/> |
727 |
< |
<delete dir="${build.jsr166xlib.dir}"/> |
726 |
> |
<delete dir="${build.extra166y.dir}"/> |
727 |
> |
<delete dir="${build.extra166ylib.dir}"/> |
728 |
|
|
729 |
|
</target> |
730 |
|
|
731 |
|
|
732 |
|
|
733 |
< |
<target name="jsr166xdist-clean" |
733 |
> |
<target name="extra166ydist-clean" |
734 |
|
description="Removes all build and distribution products"> |
735 |
|
|
736 |
|
</target> |
737 |
|
|
738 |
< |
|
1038 |
< |
|
1039 |
< |
<target name="jsr166xdist-docs" |
738 |
> |
<target name="extra166ydist-docs" |
739 |
|
description="Builds javadocs without custom tags to dist folder"> |
740 |
|
|
741 |
< |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
742 |
< |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
741 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
742 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
743 |
|
|
744 |
< |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
745 |
< |
link="http://java.sun.com/j2se/1.5.0/docs/api/" |
746 |
< |
source="${build.sourcelevel}"> |
747 |
< |
|
748 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
1050 |
< |
<include name="jsr166x"/> |
1051 |
< |
</packageset> |
1052 |
< |
|
1053 |
< |
</javadoc> |
744 |
> |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
745 |
> |
packagenames="extra166y" |
746 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
747 |
> |
source="${build.sourcelevel}" |
748 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
749 |
|
|
750 |
|
</target> |
751 |
|
|
752 |
< |
<target name="jsr166xdist-jar" |
753 |
< |
depends="jsr166xclean, jsr166xjar"> |
752 |
> |
<target name="extra166ydist-jar" |
753 |
> |
depends="extra166yclean, extra166yjar"> |
754 |
|
|
755 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
755 |
> |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
756 |
|
|
757 |
|
</target> |
758 |
|
|