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.jsr166e.dir" location="${build.dir}/jsr166e"/> |
46 |
+ |
<property name="build.jsr166elib.dir" location="${build.dir}/jsr166elib"/> |
47 |
+ |
<property name="build.jsr166ejavadocs.dir" location="${build.dir}/jsr166ejavadocs"/> |
48 |
+ |
|
49 |
+ |
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
50 |
+ |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
51 |
+ |
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
52 |
+ |
|
53 |
|
<!-- Source locations --> |
54 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
55 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
50 |
– |
<property name="j1.src.dir" location="${basedir}/src/javaone"/> |
56 |
|
<property name="loops.src.dir" location="${basedir}/src/loops"/> |
57 |
|
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
58 |
|
<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"/> |
59 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
60 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
61 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
62 |
|
<property name="jsr166xsrc.dir" location="${basedir}/src/jsr166x"/> |
63 |
+ |
<property name="jsr166ysrc.dir" location="${basedir}/src/jsr166y"/> |
64 |
+ |
<property name="jsr166esrc.dir" location="${basedir}/src/jsr166e"/> |
65 |
+ |
<property name="extra166ysrc.dir" location="${basedir}/src/extra166y"/> |
66 |
+ |
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
67 |
|
|
68 |
|
<!-- Distribution locations --> |
69 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
69 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
70 |
|
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
71 |
+ |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
72 |
+ |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
73 |
+ |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
74 |
|
|
75 |
|
<!-- Jar locations --> |
76 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
77 |
|
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
78 |
+ |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
79 |
+ |
<property name="jsr166eproduct.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
80 |
+ |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
81 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
69 |
– |
<property name="concurrent.jar" location="${lib.dir}/concurrent.jar"/> |
82 |
|
|
83 |
|
<!-- Bootclasspath argument --> |
84 |
|
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
85 |
|
|
86 |
+ |
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
87 |
+ |
<property name="jdkapi5docs.url" value="http://docs.oracle.com/javase/1.5.0/docs/api/"/> |
88 |
+ |
<property name="jdkapi6docs.url" value="http://docs.oracle.com/javase/6/docs/api/"/> |
89 |
+ |
<property name="jdkapi7docs.url" value="http://docs.oracle.com/javase/7/docs/api/"/> |
90 |
+ |
|
91 |
+ |
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
92 |
+ |
<!-- The below does not yet exist as of 2012-11 --> |
93 |
+ |
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
94 |
+ |
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
95 |
+ |
|
96 |
|
<!-- Test classpath --> |
97 |
|
<path id="test.classpath"> |
98 |
|
<pathelement location="${build.testcases.dir}"/> |
104 |
|
<pathelement location="${build.loops.dir}"/> |
105 |
|
</path> |
106 |
|
|
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 |
– |
|
107 |
|
|
108 |
|
<!-- Main targets --> |
109 |
|
|
110 |
+ |
<target name="dists" |
111 |
+ |
depends="dist, jsr166xdist, jsr166ydist,jsr166edist, extra166ydist" |
112 |
+ |
description="Builds all public jars and docs"/> |
113 |
|
|
114 |
|
<target name="compile" |
115 |
|
depends="init, configure-compiler" |
126 |
|
fork="true"> |
127 |
|
|
128 |
|
<include name="**/*.java"/> |
129 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
130 |
+ |
|
131 |
+ |
<!-- |
132 |
|
<exclude name="java/lang/**"/> |
133 |
|
<compilerarg line="${build.args}"/> |
134 |
+ |
<compilerarg line="-Xlint -Xmaxwarns 1000"/> |
135 |
+ |
--> |
136 |
|
|
137 |
|
</javac> |
138 |
|
|
166 |
|
<delete dir="${build.javadocs.dir}"/> |
167 |
|
<mkdir dir="${build.javadocs.dir}"/> |
168 |
|
|
169 |
< |
<javadoc destdir="${build.javadocs.dir}" |
170 |
< |
link="http://java.sun.com/j2se/1.4.1/docs/api" |
151 |
< |
overview="${src.dir}/intro.html" |
152 |
< |
source="${build.sourcelevel}"> |
169 |
> |
<!-- the packagenames="none" hack below prevents scanning the --> |
170 |
> |
<!-- sourcepath for packages --> |
171 |
|
|
172 |
< |
<tag name="revised" description="Last revised:"/> |
173 |
< |
<tag name="spec" description="Specified by:"/> |
174 |
< |
|
175 |
< |
<packageset dir="${src.dir}"/> |
176 |
< |
|
177 |
< |
</javadoc> |
178 |
< |
|
179 |
< |
</target> |
180 |
< |
|
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}"/> |
172 |
> |
<javadoc destdir="${build.javadocs.dir}" |
173 |
> |
packagenames="none" |
174 |
> |
link="${jdkapidocs.url}" |
175 |
> |
overview="${src.dir}/intro.html" |
176 |
> |
sourcepath="${src.dir}:${jdksrc.dir}" |
177 |
> |
additionalparam="-XDignore.symbol.file=true" > |
178 |
> |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
179 |
> |
<include name="**/*.java"/> |
180 |
> |
</fileset> |
181 |
|
</javadoc> |
182 |
|
|
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 |
– |
|
183 |
|
</target> |
184 |
|
|
185 |
|
|
189 |
|
description="Puts all distributable products in single hierarchy"/> |
190 |
|
|
191 |
|
|
212 |
– |
|
192 |
|
<target name="release" |
193 |
|
depends="dist" |
194 |
|
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
235 |
|
<delete dir="${dist.javadocs.dir}"/> |
236 |
|
<mkdir dir="${dist.javadocs.dir}"/> |
237 |
|
|
238 |
< |
<javadoc destdir="${dist.javadocs.dir}" |
239 |
< |
link="http://java.sun.com/j2se/1.4.2/docs/api" |
261 |
< |
overview="${src.dir}/intro.html" |
262 |
< |
source="${build.sourcelevel}"> |
263 |
< |
|
264 |
< |
<packageset dir="${src.dir}"/> |
238 |
> |
<!-- the packagenames="none" hack below prevents scanning the --> |
239 |
> |
<!-- sourcepath for packages --> |
240 |
|
|
241 |
+ |
<javadoc destdir="${dist.javadocs.dir}" |
242 |
+ |
packagenames="none" |
243 |
+ |
link="${jdkapidocs.url}" |
244 |
+ |
overview="${src.dir}/intro.html" |
245 |
+ |
sourcepath="${src.dir}:${jdksrc.dir}" |
246 |
+ |
additionalparam="-XDignore.symbol.file=true" > |
247 |
+ |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
248 |
+ |
<include name="**/*.java"/> |
249 |
+ |
</fileset> |
250 |
|
</javadoc> |
251 |
|
|
252 |
|
</target> |
274 |
|
</target> |
275 |
|
|
276 |
|
|
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 |
– |
|
277 |
|
<target name="compile-tests" |
278 |
|
depends="jar"> |
279 |
|
|
289 |
|
|
290 |
|
<compilerarg value="${bootclasspath.args}"/> |
291 |
|
<compilerarg line="${build.args}"/> |
292 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
293 |
|
|
294 |
|
<classpath refid="test.classpath"/> |
295 |
|
|
307 |
|
|
308 |
|
<compilerarg value="${bootclasspath.args}"/> |
309 |
|
<compilerarg line="${build.args}"/> |
310 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
311 |
|
|
312 |
|
<classpath refid="test.classpath"/> |
313 |
|
|
324 |
|
|
325 |
|
<compilerarg value="${bootclasspath.args}"/> |
326 |
|
<compilerarg line="${build.args}"/> |
327 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
328 |
|
|
329 |
|
<classpath refid="test.classpath"/> |
330 |
|
|
397 |
|
<fileset dir="${build.reports.dir}"> |
398 |
|
<include name="TEST-*.xml"/> |
399 |
|
</fileset> |
400 |
< |
<report styledir="${stylesheet.dir}" |
525 |
< |
format="${junit.report.format}" |
526 |
< |
todir="${build.reports.dir}" |
400 |
> |
<report format="${junit.report.format}" todir="${build.reports.dir}" |
401 |
|
/> |
402 |
|
</junitreport> |
403 |
|
|
447 |
|
</target> |
448 |
|
|
449 |
|
|
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 |
– |
|
450 |
|
<!-- Various demos and test programs --> |
451 |
|
|
452 |
|
|
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 |
– |
|
453 |
|
<target name="loops" depends="init, configure-compiler" |
454 |
|
description="Benchmark from Doug Lea's AQS paper"> |
455 |
|
|
465 |
|
|
466 |
|
<compilerarg line="${build.args}"/> |
467 |
|
<classpath refid="loops.classpath"/> |
468 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
469 |
|
|
470 |
|
</javac> |
471 |
|
|
476 |
|
</target> |
477 |
|
|
478 |
|
|
479 |
< |
<target name="compile-j1" depends="init, configure-compiler, compile"> |
479 |
> |
<!-- jsr166x --> |
480 |
> |
|
481 |
|
|
482 |
< |
<mkdir dir="${build.j1.dir}"/> |
482 |
> |
<target name="jsr166xcompile" |
483 |
> |
depends="init, configure-compiler" |
484 |
> |
description="Compiles jsr166x sources"> |
485 |
|
|
486 |
< |
<javac srcdir="${j1.src.dir}" |
487 |
< |
destdir="${build.j1.dir}" |
486 |
> |
<mkdir dir="${build.jsr166x.dir}"/> |
487 |
> |
|
488 |
> |
<javac srcdir="${jsr166xsrc.dir}" |
489 |
> |
destdir="${build.jsr166x.dir}" |
490 |
|
debug="${build.debug}" |
491 |
|
debuglevel="${build.debuglevel}" |
492 |
|
deprecation="${build.deprecation}" |
493 |
< |
source="${build.sourcelevel}" > |
493 |
> |
source="${build.sourcelevel}" |
494 |
> |
fork="true"> |
495 |
|
|
496 |
|
<include name="**/*.java"/> |
697 |
– |
<exclude name="**/dijkstra/**"/> |
698 |
– |
|
497 |
|
<compilerarg line="${build.args}"/> |
498 |
< |
<classpath refid="j1.classpath"/> |
498 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
499 |
|
|
500 |
|
</javac> |
501 |
|
|
502 |
|
</target> |
503 |
|
|
504 |
|
|
707 |
– |
<target name="sw" depends="compile-j1" |
708 |
– |
description="Runs the SwingWorker demo"> |
505 |
|
|
506 |
< |
<!-- |
507 |
< |
<java classname="jsr166.swing.SwingWorkerDemo" fork="true"> |
508 |
< |
<classpath refid="j1.classpath"/> |
713 |
< |
</java> |
714 |
< |
--> |
506 |
> |
<target name="jsr166xjar" |
507 |
> |
depends="jsr166xcompile" |
508 |
> |
description="Builds library jar from compiled sources"> |
509 |
|
|
510 |
< |
<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/> |
510 |
> |
<mkdir dir="${build.jsr166xlib.dir}"/> |
511 |
|
|
512 |
< |
<exec dir="${build.j1.dir}" executable="appletviewer.exe"> |
513 |
< |
<arg value="${build.j1.dir}/SwingWorker.html"/> |
514 |
< |
</exec> |
512 |
> |
<jar destfile="${jsr166xproduct.jar}"> |
513 |
> |
<fileset dir="${build.jsr166x.dir}"/> |
514 |
> |
</jar> |
515 |
|
|
516 |
|
</target> |
517 |
|
|
724 |
– |
<target name="j1" depends="compile-j1" |
725 |
– |
description="Runs a standalone JavaOne program"> |
518 |
|
|
727 |
– |
<java classname="${j1.test}" fork="true"> |
728 |
– |
<classpath refid="j1.classpath"/> |
729 |
– |
<jvmarg value="-client"/> |
519 |
|
|
520 |
< |
<!-- TestPseudoRandom args --> |
521 |
< |
<arg value="2"/> |
733 |
< |
<arg value="25"/> |
734 |
< |
<arg value="100000"/> |
520 |
> |
<target name="jsr166xdocs" |
521 |
> |
description="Builds javadocs with custom tags to build folder"> |
522 |
|
|
523 |
< |
<!-- WebCrawler args --> |
524 |
< |
<!-- |
738 |
< |
<arg value="jsr166.webcrawler.WebCrawler3"/> |
739 |
< |
<arg value="http://www.priorartisans.com"/> |
740 |
< |
<arg value="25"/> |
741 |
< |
--> |
523 |
> |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
524 |
> |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
525 |
|
|
526 |
< |
</java> |
526 |
> |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
527 |
> |
packagenames="jsr166x" |
528 |
> |
link="${jdkapidocs.url}" |
529 |
> |
source="${build.sourcelevel}" |
530 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
531 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
532 |
|
|
533 |
|
</target> |
534 |
|
|
535 |
|
|
536 |
< |
<target name="test-j1" depends="compile-j1" |
537 |
< |
description="Runs testcases from the JavaOne source directories"> |
538 |
< |
|
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> |
536 |
> |
<target name="jsr166xdist" |
537 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
538 |
> |
description="Puts all distributable products in single hierarchy"/> |
539 |
|
|
768 |
– |
</junit> |
540 |
|
|
770 |
– |
<available property="junit.report.format" |
771 |
– |
value="frames" |
772 |
– |
classname="org.apache.xalan.lib.Redirect"/> |
773 |
– |
<property name="junit.report.format" value="noframes"/> |
541 |
|
|
542 |
< |
<junitreport todir="${build.j1.dir}"> |
543 |
< |
<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> |
542 |
> |
<target name="jsr166xclean" |
543 |
> |
description="Removes all build products"> |
544 |
|
|
545 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
545 |
> |
<delete dir="${build.jsr166x.dir}"/> |
546 |
> |
<delete dir="${build.jsr166xlib.dir}"/> |
547 |
|
|
548 |
|
</target> |
549 |
|
|
550 |
|
|
551 |
|
|
552 |
< |
<!-- C++ and JNI definitions and demos --> |
553 |
< |
|
793 |
< |
<target name="configure-cpp"> |
794 |
< |
|
795 |
< |
<!-- Define tasks and types --> |
552 |
> |
<target name="jsr166xdist-clean" |
553 |
> |
description="Removes all build and distribution products"> |
554 |
|
|
555 |
< |
<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"/> |
555 |
> |
</target> |
556 |
|
|
803 |
– |
<!-- Set platform property for JNI includes --> |
557 |
|
|
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> |
558 |
|
|
559 |
< |
</target> |
559 |
> |
<target name="jsr166xdist-docs" |
560 |
> |
description="Builds javadocs without custom tags to dist folder"> |
561 |
|
|
562 |
+ |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
563 |
+ |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
564 |
|
|
565 |
< |
<target name="cppdemo" depends="configure-cpp"> |
565 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
566 |
> |
packagenames="jsr166x" |
567 |
> |
link="${jdkapidocs.url}" |
568 |
> |
source="${build.sourcelevel}" |
569 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
570 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
571 |
|
|
572 |
< |
<mkdir dir="${build.dir}"/> |
572 |
> |
</target> |
573 |
|
|
574 |
< |
<cc multithreaded="true" |
575 |
< |
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> |
574 |
> |
<target name="jsr166xdist-jar" |
575 |
> |
depends="jsr166xclean, jsr166xjar"> |
576 |
|
|
577 |
< |
<exec executable="${build.dir}/CppDemo"> |
831 |
< |
<arg line="count in word frequency of word in command line count"/> |
832 |
< |
</exec> |
577 |
> |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
578 |
|
|
579 |
|
</target> |
580 |
|
|
581 |
+ |
<!-- jsr166y --> |
582 |
|
|
837 |
– |
<target name="jnidemo" depends="init, configure-compiler, configure-cpp"> |
583 |
|
|
584 |
< |
<mkdir dir="${build.testcases.dir}"/> |
584 |
> |
<target name="jsr166ycompile" |
585 |
> |
depends="init, configure-compiler" |
586 |
> |
description="Compiles jsr166y sources"> |
587 |
|
|
588 |
< |
<javac srcdir="${test.src.dir}" |
589 |
< |
destdir="${build.testcases.dir}" |
588 |
> |
<mkdir dir="${build.jsr166y.dir}"/> |
589 |
> |
|
590 |
> |
<javac srcdir="${jsr166ysrc.dir}" |
591 |
> |
destdir="${build.jsr166y.dir}" |
592 |
|
debug="${build.debug}" |
593 |
|
debuglevel="${build.debuglevel}" |
594 |
|
deprecation="${build.deprecation}" |
595 |
|
source="${build.sourcelevel}" |
596 |
|
fork="true"> |
597 |
< |
<compilerarg value="${bootclasspath.args}"/> |
597 |
> |
|
598 |
> |
<include name="**/*.java"/> |
599 |
|
<compilerarg line="${build.args}"/> |
600 |
< |
<classpath refid="test.classpath"/> |
601 |
< |
<include name="JniDemo.java"/> |
600 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
601 |
> |
<compilerarg value="${bootclasspath.args}"/> |
602 |
> |
|
603 |
> |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
604 |
> |
|
605 |
|
</javac> |
606 |
|
|
607 |
< |
<javah destdir="${build.testcases.dir}" |
608 |
< |
classpathref="test.classpath"> |
609 |
< |
<class name="JniDemo"/> |
610 |
< |
</javah> |
611 |
< |
|
612 |
< |
<cc multithreaded="true" |
613 |
< |
name="g++" |
614 |
< |
objdir="${build.dir}" |
615 |
< |
outfile="${build.dir}/JniDemo" |
616 |
< |
outtype="shared"> |
617 |
< |
|
618 |
< |
<compiler> |
619 |
< |
<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> |
607 |
> |
</target> |
608 |
> |
|
609 |
> |
|
610 |
> |
|
611 |
> |
<target name="jsr166yjar" |
612 |
> |
depends="jsr166ycompile" |
613 |
> |
description="Builds library jar from compiled sources"> |
614 |
> |
|
615 |
> |
<mkdir dir="${build.jsr166ylib.dir}"/> |
616 |
> |
|
617 |
> |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
618 |
> |
<fileset dir="${build.jsr166y.dir}"/> |
619 |
> |
</jar> |
620 |
|
|
621 |
|
</target> |
622 |
|
|
623 |
|
|
624 |
|
|
625 |
< |
<!-- Backward compatibility, work in progress (some files not checked in) --> |
625 |
> |
<target name="jsr166ydocs" |
626 |
> |
description="Builds javadocs with custom tags to build folder"> |
627 |
> |
|
628 |
> |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
629 |
> |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
630 |
> |
|
631 |
> |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
632 |
> |
packagenames="jsr166y" |
633 |
> |
link="${jdkapidocs.url}" |
634 |
> |
source="${build.sourcelevel}" |
635 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
636 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
637 |
|
|
638 |
+ |
</target> |
639 |
|
|
640 |
|
|
641 |
< |
<property name="pretiger.src.dir" location="${build.dir}/pretiger/src"/> |
642 |
< |
<property name="build.pretiger.dir" location="${build.dir}/pretiger/classes"/> |
643 |
< |
<property name="pretiger.jar" location="${build.lib.dir}/jsr166-pretiger.jar"/> |
907 |
< |
<property name="pretiger.sourcelevel" value="1.4"/> |
641 |
> |
<target name="jsr166ydist" |
642 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
643 |
> |
description="Puts all distributable products in single hierarchy"/> |
644 |
|
|
909 |
– |
<target name="defang" |
910 |
– |
depends="init" |
911 |
– |
description="Generates pre-Tiger compatible source"> |
645 |
|
|
913 |
– |
<delete dir="${pretiger.src.dir}"/> |
914 |
– |
<mkdir dir="${pretiger.src.dir}"/> |
646 |
|
|
647 |
< |
<exec executable="perl"> |
648 |
< |
<arg file="etc/defang.pl"/> |
649 |
< |
<!-- <arg value="-v"/> --> |
650 |
< |
<arg value="-s"/> <arg file="${src.dir}"/> |
651 |
< |
<arg value="-t"/> <arg file="${pretiger.src.dir}"/> |
921 |
< |
</exec> |
647 |
> |
<target name="jsr166yclean" |
648 |
> |
description="Removes all build products"> |
649 |
> |
|
650 |
> |
<delete dir="${build.jsr166y.dir}"/> |
651 |
> |
<delete dir="${build.jsr166ylib.dir}"/> |
652 |
|
|
653 |
|
</target> |
654 |
|
|
925 |
– |
<target name="compile-pretiger" |
926 |
– |
depends="init, configure-compiler, defang" |
927 |
– |
description="Compiles pre-Tiger sources to build folder"> |
655 |
|
|
929 |
– |
<mkdir dir="${build.pretiger.dir}"/> |
656 |
|
|
657 |
< |
<javac srcdir="${pretiger.src.dir}" |
658 |
< |
destdir="${build.pretiger.dir}" |
657 |
> |
<target name="jsr166ydist-clean" |
658 |
> |
description="Removes all build and distribution products"> |
659 |
> |
|
660 |
> |
</target> |
661 |
> |
|
662 |
> |
<target name="jsr166ydist-docs" |
663 |
> |
description="Builds javadocs without custom tags to dist folder"> |
664 |
> |
|
665 |
> |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
666 |
> |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
667 |
> |
|
668 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
669 |
> |
packagenames="jsr166y" |
670 |
> |
link="${jdkapidocs.url}" |
671 |
> |
source="${build.sourcelevel}" |
672 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
673 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
674 |
> |
|
675 |
> |
</target> |
676 |
> |
|
677 |
> |
<target name="jsr166ydist-jar" |
678 |
> |
depends="jsr166yclean, jsr166yjar"> |
679 |
> |
|
680 |
> |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
681 |
> |
|
682 |
> |
</target> |
683 |
> |
|
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="${pretiger.sourcelevel}" |
700 |
> |
source="${build.sourcelevel}" |
701 |
|
fork="true"> |
702 |
|
|
703 |
+ |
<include name="**/*.java"/> |
704 |
|
<compilerarg line="${build.args}"/> |
705 |
< |
<exclude name="**/Thread.java"/> |
705 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
706 |
> |
<compilerarg value="${bootclasspath.args}"/> |
707 |
> |
|
708 |
> |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
709 |
|
|
710 |
|
</javac> |
711 |
|
|
712 |
|
</target> |
713 |
|
|
946 |
– |
<target name="pretiger" depends="compile-pretiger"> |
714 |
|
|
948 |
– |
<mkdir dir="${build.lib.dir}"/> |
715 |
|
|
716 |
< |
<jar destfile="${pretiger.jar}"> |
717 |
< |
<fileset dir="${build.pretiger.dir}"> |
718 |
< |
</fileset> |
716 |
> |
<target name="extra166yjar" |
717 |
> |
depends="extra166ycompile" |
718 |
> |
description="Builds library jar from compiled sources"> |
719 |
> |
|
720 |
> |
<mkdir dir="${build.extra166ylib.dir}"/> |
721 |
> |
|
722 |
> |
<jar destfile="${extra166yproduct.jar}" index="true"> |
723 |
> |
<fileset dir="${build.extra166y.dir}"/> |
724 |
|
</jar> |
725 |
|
|
726 |
|
</target> |
727 |
|
|
957 |
– |
<!-- jsr166x --> |
728 |
|
|
729 |
|
|
730 |
< |
<target name="jsr166xcompile" |
730 |
> |
<target name="extra166ydocs" |
731 |
> |
description="Builds javadocs with custom tags to build folder"> |
732 |
> |
|
733 |
> |
<delete dir="${build.extra166yjavadocs.dir}"/> |
734 |
> |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
735 |
> |
|
736 |
> |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
737 |
> |
packagenames="extra166y" |
738 |
> |
link="${jdkapidocs.url}" |
739 |
> |
source="${build.sourcelevel}" |
740 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
741 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
742 |
> |
|
743 |
> |
</target> |
744 |
> |
|
745 |
> |
|
746 |
> |
<target name="extra166ydist" |
747 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
748 |
> |
description="Puts all distributable products in single hierarchy"/> |
749 |
> |
|
750 |
> |
|
751 |
> |
|
752 |
> |
<target name="extra166yclean" |
753 |
> |
description="Removes all build products"> |
754 |
> |
|
755 |
> |
<delete dir="${build.extra166y.dir}"/> |
756 |
> |
<delete dir="${build.extra166ylib.dir}"/> |
757 |
> |
|
758 |
> |
</target> |
759 |
> |
|
760 |
> |
|
761 |
> |
|
762 |
> |
<target name="extra166ydist-clean" |
763 |
> |
description="Removes all build and distribution products"> |
764 |
> |
|
765 |
> |
</target> |
766 |
> |
|
767 |
> |
<target name="extra166ydist-docs" |
768 |
> |
description="Builds javadocs without custom tags to dist folder"> |
769 |
> |
|
770 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
771 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
772 |
> |
|
773 |
> |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
774 |
> |
packagenames="extra166y" |
775 |
> |
link="${jdkapidocs.url}" |
776 |
> |
source="${build.sourcelevel}" |
777 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
778 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
779 |
> |
|
780 |
> |
</target> |
781 |
> |
|
782 |
> |
<target name="extra166ydist-jar" |
783 |
> |
depends="extra166yclean, extra166yjar"> |
784 |
> |
|
785 |
> |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
786 |
> |
|
787 |
> |
</target> |
788 |
> |
|
789 |
> |
<!-- jsr166e --> |
790 |
> |
|
791 |
> |
|
792 |
> |
<target name="jsr166ecompile" |
793 |
|
depends="init, configure-compiler" |
794 |
< |
description="Compiles jsr166x sources"> |
794 |
> |
description="Compiles jsr166e sources"> |
795 |
|
|
796 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
796 |
> |
<mkdir dir="${build.jsr166e.dir}"/> |
797 |
|
|
798 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
799 |
< |
destdir="${build.jsr166x.dir}" |
798 |
> |
<javac srcdir="${jsr166esrc.dir}" |
799 |
> |
destdir="${build.jsr166e.dir}" |
800 |
|
debug="${build.debug}" |
801 |
|
debuglevel="${build.debuglevel}" |
802 |
|
deprecation="${build.deprecation}" |
803 |
< |
source="${build.sourcelevel}" |
803 |
> |
source="1.7" |
804 |
|
fork="true"> |
805 |
|
|
806 |
|
<include name="**/*.java"/> |
807 |
|
<compilerarg line="${build.args}"/> |
808 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
809 |
+ |
<compilerarg value="${bootclasspath.args}"/> |
810 |
+ |
|
811 |
+ |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
812 |
|
|
813 |
|
</javac> |
814 |
|
|
816 |
|
|
817 |
|
|
818 |
|
|
819 |
< |
<target name="jsr166xjar" |
820 |
< |
depends="jsr166xcompile" |
819 |
> |
<target name="jsr166ejar" |
820 |
> |
depends="jsr166ecompile" |
821 |
|
description="Builds library jar from compiled sources"> |
822 |
|
|
823 |
< |
<mkdir dir="${build.jsr166xlib.dir}"/> |
823 |
> |
<mkdir dir="${build.jsr166elib.dir}"/> |
824 |
|
|
825 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
826 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
825 |
> |
<jar destfile="${jsr166eproduct.jar}" index="true"> |
826 |
> |
<fileset dir="${build.jsr166e.dir}"/> |
827 |
|
</jar> |
828 |
|
|
829 |
|
</target> |
830 |
|
|
831 |
|
|
832 |
|
|
833 |
< |
<target name="jsr166xdocs" |
833 |
> |
<target name="jsr166edocs" |
834 |
|
description="Builds javadocs with custom tags to build folder"> |
835 |
|
|
836 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
837 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
836 |
> |
<delete dir="${build.jsr166ejavadocs.dir}"/> |
837 |
> |
<mkdir dir="${build.jsr166ejavadocs.dir}"/> |
838 |
|
|
839 |
< |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
840 |
< |
link="http://java.sun.com/j2se/1.5.0/docs/api/" |
841 |
< |
> |
842 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
843 |
< |
<include name="jsr166x"/> |
844 |
< |
</packageset> |
1009 |
< |
|
1010 |
< |
|
1011 |
< |
</javadoc> |
839 |
> |
<javadoc destdir="${build.jsr166ejavadocs.dir}" |
840 |
> |
packagenames="jsr166e,jsr166e.extra" |
841 |
> |
link="${jdkapidocs.url}" |
842 |
> |
source="1.7" |
843 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
844 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
845 |
|
|
846 |
|
</target> |
847 |
|
|
848 |
|
|
849 |
< |
<target name="jsr166xdist" |
850 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
849 |
> |
<target name="jsr166edist" |
850 |
> |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs" |
851 |
|
description="Puts all distributable products in single hierarchy"/> |
852 |
|
|
853 |
|
|
854 |
|
|
855 |
< |
<target name="jsr166xclean" |
855 |
> |
<target name="jsr166eclean" |
856 |
|
description="Removes all build products"> |
857 |
|
|
858 |
< |
<delete dir="${build.jsr166x.dir}"/> |
859 |
< |
<delete dir="${build.jsr166xlib.dir}"/> |
858 |
> |
<delete dir="${build.jsr166e.dir}"/> |
859 |
> |
<delete dir="${build.jsr166elib.dir}"/> |
860 |
|
|
861 |
|
</target> |
862 |
|
|
863 |
|
|
864 |
|
|
865 |
< |
<target name="jsr166xdist-clean" |
865 |
> |
<target name="jsr166edist-clean" |
866 |
|
description="Removes all build and distribution products"> |
867 |
|
|
868 |
|
</target> |
869 |
|
|
870 |
< |
|
1038 |
< |
|
1039 |
< |
<target name="jsr166xdist-docs" |
870 |
> |
<target name="jsr166edist-docs" |
871 |
|
description="Builds javadocs without custom tags to dist folder"> |
872 |
|
|
873 |
< |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
874 |
< |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
873 |
> |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
874 |
> |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
875 |
|
|
876 |
< |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
877 |
< |
link="http://java.sun.com/j2se/1.5.0/docs/api/" |
878 |
< |
source="${build.sourcelevel}"> |
879 |
< |
|
880 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
881 |
< |
<include name="jsr166x"/> |
1051 |
< |
</packageset> |
1052 |
< |
|
1053 |
< |
</javadoc> |
876 |
> |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
877 |
> |
packagenames="jsr166e,jsr166e.extra" |
878 |
> |
link="${jdkapidocs.url}" |
879 |
> |
source="1.7" |
880 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
881 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
882 |
|
|
883 |
|
</target> |
884 |
|
|
885 |
< |
<target name="jsr166xdist-jar" |
886 |
< |
depends="jsr166xclean, jsr166xjar"> |
885 |
> |
<target name="jsr166edist-jar" |
886 |
> |
depends="jsr166eclean, jsr166ejar"> |
887 |
|
|
888 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
888 |
> |
<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/> |
889 |
|
|
890 |
|
</target> |
891 |
|
|