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 |
> |
|
38 |
> |
<property name="build.jdk7.dir" location="${build.dir}/jdk7"/> |
39 |
> |
<property name="build.jdk7.lib.dir" location="${build.jdk7.dir}"/> |
40 |
> |
<property name="build.jdk7.classes.dir" location="${build.jdk7.dir}/classes"/> |
41 |
> |
<property name="build.jdk7.docs.dir" location="${build.jdk7.dir}/docs"/> |
42 |
> |
|
43 |
> |
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
44 |
|
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
45 |
|
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
46 |
|
|
47 |
+ |
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
48 |
+ |
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
49 |
+ |
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
50 |
+ |
|
51 |
+ |
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
52 |
+ |
<property name="build.jsr166elib.dir" location="${build.dir}/jsr166elib"/> |
53 |
+ |
<property name="build.jsr166ejavadocs.dir" location="${build.dir}/jsr166ejavadocs"/> |
54 |
+ |
|
55 |
+ |
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
56 |
+ |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
57 |
+ |
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
58 |
+ |
|
59 |
+ |
<!-- JDK binary locations --> |
60 |
+ |
<property name="jdks.home" location="${user.home}/jdk"/> |
61 |
+ |
<property name="jdk6.home" location="${jdks.home}/jdk1.6.0"/> |
62 |
+ |
<property name="jdk7.home" location="${jdks.home}/jdk1.7.0"/> |
63 |
+ |
<property name="jdk8.home" location="${jdks.home}/jdk1.8.0"/> |
64 |
+ |
<property name="javac6" location="${jdk6.home}/bin/javac"/> |
65 |
+ |
<property name="javac7" location="${jdk7.home}/bin/javac"/> |
66 |
+ |
<property name="javac8" location="${jdk8.home}/bin/javac"/> |
67 |
+ |
<property name="javadoc6" location="${jdk6.home}/bin/javadoc"/> |
68 |
+ |
<property name="javadoc7" location="${jdk7.home}/bin/javadoc"/> |
69 |
+ |
<property name="javadoc8" location="${jdk8.home}/bin/javadoc"/> |
70 |
+ |
<property name="bootdir6" location="${jdk6.home}/jre/lib"/> |
71 |
+ |
<property name="bootdir7" location="${jdk7.home}/jre/lib"/> |
72 |
+ |
<property name="bootdir8" location="${jdk8.home}/jre/lib"/> |
73 |
+ |
<property name="bootclasspath6" value="${bootdir6}/resources.jar:${bootdir6}/rt.jar:${bootdir6}/jsse.jar:${bootdir6}/jce.jar:${bootdir6}/:${bootdir6}/charsets.jar"/> |
74 |
+ |
<property name="bootclasspath7" value="${bootdir7}/resources.jar:${bootdir7}/rt.jar:${bootdir7}/jsse.jar:${bootdir7}/jce.jar:${bootdir7}/:${bootdir7}/charsets.jar"/> |
75 |
+ |
<property name="bootclasspath8" value="${bootdir8}/resources.jar:${bootdir8}/rt.jar:${bootdir8}/jsse.jar:${bootdir8}/jce.jar:${bootdir8}/:${bootdir8}/charsets.jar"/> |
76 |
+ |
|
77 |
|
<!-- Source locations --> |
78 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
79 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
50 |
– |
<property name="j1.src.dir" location="${basedir}/src/javaone"/> |
80 |
|
<property name="loops.src.dir" location="${basedir}/src/loops"/> |
81 |
|
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
82 |
|
<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"/> |
83 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
84 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
85 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
86 |
< |
<property name="jsr166xsrc.dir" location="${basedir}/src/jsr166x"/> |
86 |
> |
<property name="jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
87 |
> |
<property name="jsr166xsrc.dir" location="${topsrc.dir}/jsr166x"/> |
88 |
> |
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
89 |
> |
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
90 |
> |
<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/> |
91 |
> |
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
92 |
|
|
93 |
|
<!-- Distribution locations --> |
94 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
94 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
95 |
> |
<property name="dist.jdk7.docs.dir" location="${dist.dir}/jsr166-jdk7docs"/> |
96 |
|
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
97 |
+ |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
98 |
+ |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
99 |
+ |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
100 |
|
|
101 |
|
<!-- Jar locations --> |
102 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
103 |
+ |
<property name="jdk7product.jar" location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/> |
104 |
|
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
105 |
+ |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
106 |
+ |
<property name="jsr166eproduct.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
107 |
+ |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
108 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
69 |
– |
<property name="concurrent.jar" location="${lib.dir}/concurrent.jar"/> |
109 |
|
|
110 |
|
<!-- Bootclasspath argument --> |
111 |
|
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
112 |
|
|
113 |
+ |
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
114 |
+ |
<property name="jdkapi5docs.url" value="http://docs.oracle.com/javase/1.5.0/docs/api/"/> |
115 |
+ |
<property name="jdkapi6docs.url" value="http://docs.oracle.com/javase/6/docs/api/"/> |
116 |
+ |
<property name="jdkapi7docs.url" value="http://docs.oracle.com/javase/7/docs/api/"/> |
117 |
+ |
|
118 |
+ |
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
119 |
+ |
<!-- The below does not yet exist as of 2012-11 --> |
120 |
+ |
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
121 |
+ |
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
122 |
+ |
|
123 |
|
<!-- Test classpath --> |
124 |
|
<path id="test.classpath"> |
125 |
|
<pathelement location="${build.testcases.dir}"/> |
131 |
|
<pathelement location="${build.loops.dir}"/> |
132 |
|
</path> |
133 |
|
|
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 |
– |
|
134 |
|
|
135 |
|
<!-- Main targets --> |
136 |
|
|
137 |
+ |
<target name="dists" |
138 |
+ |
depends="dist, jsr166xdist, jsr166ydist,jsr166edist, extra166ydist" |
139 |
+ |
description="Builds all public jars and docs"/> |
140 |
|
|
141 |
|
<target name="compile" |
142 |
|
depends="init, configure-compiler" |
153 |
|
fork="true"> |
154 |
|
|
155 |
|
<include name="**/*.java"/> |
156 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
157 |
+ |
|
158 |
|
<!-- |
159 |
|
<exclude name="java/lang/**"/> |
116 |
– |
--> |
160 |
|
<compilerarg line="${build.args}"/> |
161 |
+ |
<compilerarg line="-Xlint -Xmaxwarns 1000"/> |
162 |
+ |
--> |
163 |
|
|
164 |
|
</javac> |
165 |
|
|
193 |
|
<delete dir="${build.javadocs.dir}"/> |
194 |
|
<mkdir dir="${build.javadocs.dir}"/> |
195 |
|
|
196 |
< |
<javadoc destdir="${build.javadocs.dir}" |
197 |
< |
link="http://java.sun.com/j2se/1.5.0/docs/api" |
153 |
< |
overview="${src.dir}/intro.html" |
154 |
< |
sourcepath="${src.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
155 |
< |
> |
156 |
< |
|
157 |
< |
<packageset dir="${src.dir}"/> |
158 |
< |
|
159 |
< |
</javadoc> |
160 |
< |
|
161 |
< |
</target> |
162 |
< |
|
196 |
> |
<!-- the packagenames="none" hack below prevents scanning the --> |
197 |
> |
<!-- sourcepath for packages --> |
198 |
|
|
199 |
< |
|
200 |
< |
<target name="doccheck" |
201 |
< |
depends="filter-doccheck" |
202 |
< |
description="Reports on javadoc style errors"> |
203 |
< |
|
204 |
< |
<delete dir="${build.doccheck.dir}"/> |
205 |
< |
<mkdir dir="${build.doccheck.dir}"/> |
206 |
< |
|
207 |
< |
<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}"/> |
199 |
> |
<javadoc destdir="${build.javadocs.dir}" |
200 |
> |
packagenames="none" |
201 |
> |
link="${jdkapidocs.url}" |
202 |
> |
overview="${src.dir}/intro.html" |
203 |
> |
sourcepath="${src.dir}:${jdksrc.dir}" |
204 |
> |
additionalparam="-XDignore.symbol.file=true" > |
205 |
> |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
206 |
> |
<include name="**/*.java"/> |
207 |
> |
</fileset> |
208 |
|
</javadoc> |
209 |
|
|
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 |
– |
|
210 |
|
</target> |
211 |
|
|
212 |
|
|
216 |
|
description="Puts all distributable products in single hierarchy"/> |
217 |
|
|
218 |
|
|
212 |
– |
|
219 |
|
<target name="release" |
220 |
|
depends="dist" |
221 |
|
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
262 |
|
<delete dir="${dist.javadocs.dir}"/> |
263 |
|
<mkdir dir="${dist.javadocs.dir}"/> |
264 |
|
|
265 |
< |
<javadoc destdir="${dist.javadocs.dir}" |
266 |
< |
link="http://java.sun.com/j2se/1.5.0/docs/api" |
261 |
< |
overview="${src.dir}/intro.html" |
265 |
> |
<!-- the packagenames="none" hack below prevents scanning the --> |
266 |
> |
<!-- sourcepath for packages --> |
267 |
|
|
268 |
< |
sourcepath="${src.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
269 |
< |
> |
270 |
< |
<packageset dir="${src.dir}" defaultexcludes="yes"> |
271 |
< |
<include name="java/util/concurrent"/> |
272 |
< |
<include name="java/util/concurrent/atomic"/> |
273 |
< |
<include name="java/util/concurrent/locks"/> |
274 |
< |
</packageset> |
275 |
< |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
271 |
< |
<include name="main/java/util/*.java"/> |
272 |
< |
<!-- <include name="jsr166x/*.java"/> --> |
268 |
> |
<javadoc destdir="${dist.javadocs.dir}" |
269 |
> |
packagenames="none" |
270 |
> |
link="${jdkapidocs.url}" |
271 |
> |
overview="${src.dir}/intro.html" |
272 |
> |
sourcepath="${src.dir}:${jdksrc.dir}" |
273 |
> |
additionalparam="-XDignore.symbol.file=true" > |
274 |
> |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
275 |
> |
<include name="**/*.java"/> |
276 |
|
</fileset> |
277 |
|
</javadoc> |
278 |
|
|
301 |
|
</target> |
302 |
|
|
303 |
|
|
301 |
– |
<target name="compile-ant-filter" |
302 |
– |
depends="init"> |
303 |
– |
|
304 |
– |
<mkdir dir="${build.ant.dir}"/> |
305 |
– |
|
306 |
– |
<javac srcdir="${ant.src.dir}" |
307 |
– |
destdir="${build.ant.dir}" |
308 |
– |
source="1.4"/> |
309 |
– |
|
310 |
– |
</target> |
311 |
– |
|
312 |
– |
|
313 |
– |
<target name="filter-src" |
314 |
– |
depends="compile-ant-filter"> |
315 |
– |
|
316 |
– |
<mkdir dir="${build.filter.src.dir}"/> |
317 |
– |
|
318 |
– |
<copy todir="${build.filter.src.dir}"> |
319 |
– |
<fileset dir="${src.dir}"> |
320 |
– |
<include name="**/*.html"/> |
321 |
– |
</fileset> |
322 |
– |
</copy> |
323 |
– |
|
324 |
– |
<copy todir="${build.filter.src.dir}"> |
325 |
– |
<fileset dir="${src.dir}"> |
326 |
– |
<exclude name="**/*.html"/> |
327 |
– |
<!-- Files excluded from dist-docs --> |
328 |
– |
<exclude name="java/util/Random.*"/> |
329 |
– |
<exclude name="sun/misc/Unsafe.*"/> |
330 |
– |
</fileset> |
331 |
– |
<!-- |
332 |
– |
<filterchain> |
333 |
– |
--> |
334 |
– |
|
335 |
– |
<!-- |
336 |
– |
# This filter gets rid of angle-bracketed type parameters |
337 |
– |
# so that javadoc can run on the result. The following |
338 |
– |
# heuristic seems to work: |
339 |
– |
# |
340 |
– |
# For all lines not starting with space(s)-asterisk-space(s), |
341 |
– |
# replace <something> with a space, where there may be more |
342 |
– |
# than one right angle bracket at the end, and "something" |
343 |
– |
# must not contain parens or pipes. (This may need some |
344 |
– |
# tweaking.) |
345 |
– |
--> |
346 |
– |
|
347 |
– |
<!-- |
348 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
349 |
– |
classpath="${build.ant.dir}"> |
350 |
– |
<param name="notmatching" value="^\s+\*\s.*$"/> |
351 |
– |
<param name="pattern" value="<[^|>()]+?>+"/> |
352 |
– |
<param name="replacement" value=" "/> |
353 |
– |
</filterreader> |
354 |
– |
--> |
355 |
– |
|
356 |
– |
<!-- |
357 |
– |
</filterchain> |
358 |
– |
--> |
359 |
– |
</copy> |
360 |
– |
|
361 |
– |
</target> |
362 |
– |
|
363 |
– |
|
364 |
– |
<target name="filter-doccheck" |
365 |
– |
depends="filter-src"> |
366 |
– |
|
367 |
– |
<mkdir dir="${build.dc-filter.dir}"/> |
368 |
– |
|
369 |
– |
<copy todir="${build.dc-filter.dir}"> |
370 |
– |
<fileset dir="${build.filter.src.dir}"> |
371 |
– |
<include name="**/*.html"/> |
372 |
– |
</fileset> |
373 |
– |
</copy> |
374 |
– |
|
375 |
– |
<property name="generic.declarations" |
376 |
– |
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 {}" |
377 |
– |
/> |
378 |
– |
|
379 |
– |
<copy todir="${build.dc-filter.dir}"> |
380 |
– |
<fileset dir="${build.filter.src.dir}"> |
381 |
– |
<exclude name="**/*.html"/> |
382 |
– |
</fileset> |
383 |
– |
<filterchain> |
384 |
– |
<!-- |
385 |
– |
# These two filters try to make the source look like |
386 |
– |
# something that doccheck can process. The first removes |
387 |
– |
# -source 1.4 assertions and the second adds in a bunch |
388 |
– |
# of single letter public nested marker interfaces so that |
389 |
– |
# the generic type parameters are recognized. |
390 |
– |
--> |
391 |
– |
|
392 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
393 |
– |
classpath="${build.ant.dir}"> |
394 |
– |
<param name="matching" value="^\s*assert[\s ].*$"/> |
395 |
– |
<param name="pattern" value="assert"/> |
396 |
– |
<param name="replacement" value="//assert"/> |
397 |
– |
</filterreader> |
398 |
– |
|
399 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
400 |
– |
classpath="${build.ant.dir}"> |
401 |
– |
<param name="matching" value="^([^*]*(class|interface|implements) .*|)\{.*$"/> |
402 |
– |
<param name="pattern" value="$"/> |
403 |
– |
<param name="replacement" value=" ${generic.declarations}"/> |
404 |
– |
</filterreader> |
405 |
– |
|
406 |
– |
</filterchain> |
407 |
– |
</copy> |
408 |
– |
|
409 |
– |
</target> |
410 |
– |
|
411 |
– |
|
304 |
|
<target name="compile-tests" |
305 |
|
depends="jar"> |
306 |
|
|
316 |
|
|
317 |
|
<compilerarg value="${bootclasspath.args}"/> |
318 |
|
<compilerarg line="${build.args}"/> |
319 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
320 |
|
|
321 |
|
<classpath refid="test.classpath"/> |
322 |
|
|
334 |
|
|
335 |
|
<compilerarg value="${bootclasspath.args}"/> |
336 |
|
<compilerarg line="${build.args}"/> |
337 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
338 |
|
|
339 |
|
<classpath refid="test.classpath"/> |
340 |
|
|
351 |
|
|
352 |
|
<compilerarg value="${bootclasspath.args}"/> |
353 |
|
<compilerarg line="${build.args}"/> |
354 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
355 |
|
|
356 |
|
<classpath refid="test.classpath"/> |
357 |
|
|
424 |
|
<fileset dir="${build.reports.dir}"> |
425 |
|
<include name="TEST-*.xml"/> |
426 |
|
</fileset> |
427 |
< |
<report styledir="${stylesheet.dir}" |
533 |
< |
format="${junit.report.format}" |
534 |
< |
todir="${build.reports.dir}" |
427 |
> |
<report format="${junit.report.format}" todir="${build.reports.dir}" |
428 |
|
/> |
429 |
|
</junitreport> |
430 |
|
|
474 |
|
</target> |
475 |
|
|
476 |
|
|
584 |
– |
|
585 |
– |
<!-- Anthill targets --> |
586 |
– |
|
587 |
– |
<target name="anthill-build"> |
588 |
– |
|
589 |
– |
<!-- Override this in user.properties --> |
590 |
– |
<property name="tiger.home" location="e:/j2sdk1.5.0"/> |
591 |
– |
|
592 |
– |
<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java"> |
593 |
– |
<arg value="-Xmx256000000"/> |
594 |
– |
<!-- classpath of new JVM --> |
595 |
– |
<arg value="-classpath"/> <arg path="${java.class.path}"/> |
596 |
– |
<!-- location of Ant home directory --> |
597 |
– |
<arg value="-Dant.home=${ant.home}"/> |
598 |
– |
<!-- the Ant main class --> |
599 |
– |
<arg value="org.apache.tools.ant.Main"/> |
600 |
– |
<!-- The build file --> |
601 |
– |
<arg value="-buildfile"/> <arg value="build.xml"/> |
602 |
– |
<!-- the target to build on the new Ant instance --> |
603 |
– |
<arg value="-DJAVA_HOME=${tiger.home}"/> |
604 |
– |
<arg value="do-anthill-build"/> |
605 |
– |
</exec> |
606 |
– |
</target> |
607 |
– |
|
608 |
– |
<target name="do-anthill-build" |
609 |
– |
depends="jar, test, docs, dist-docs"/> |
610 |
– |
|
611 |
– |
<target name="anthill-publish"> |
612 |
– |
|
613 |
– |
<copy todir="${deployDir}/docs/private"> |
614 |
– |
<fileset dir="${build.javadocs.dir}"/> |
615 |
– |
</copy> |
616 |
– |
|
617 |
– |
<copy todir="${deployDir}/docs/public"> |
618 |
– |
<fileset dir="${dist.javadocs.dir}"/> |
619 |
– |
</copy> |
620 |
– |
|
621 |
– |
<copy tofile="${deployDir}/index.html" |
622 |
– |
file="${basedir}/etc/anthill-index.html"/> |
623 |
– |
|
624 |
– |
<copy todir="${deployDir}/notes"> |
625 |
– |
<fileset dir="${basedir}/etc/notes"/> |
626 |
– |
</copy> |
627 |
– |
|
628 |
– |
</target> |
629 |
– |
|
630 |
– |
|
631 |
– |
|
477 |
|
<!-- Various demos and test programs --> |
478 |
|
|
479 |
|
|
635 |
– |
<target name="sample" depends="init, configure-compiler" |
636 |
– |
description="Standalone demo program"> |
637 |
– |
|
638 |
– |
<mkdir dir="${build.testcases.dir}"/> |
639 |
– |
|
640 |
– |
<javac srcdir="${test.src.dir}" |
641 |
– |
destdir="${build.testcases.dir}" |
642 |
– |
debug="${build.debug}" |
643 |
– |
debuglevel="${build.debuglevel}" |
644 |
– |
deprecation="${build.deprecation}" |
645 |
– |
source="${build.sourcelevel}" |
646 |
– |
fork="true"> |
647 |
– |
|
648 |
– |
<include name="jsr166/test/Sample.java"/> |
649 |
– |
|
650 |
– |
</javac> |
651 |
– |
|
652 |
– |
<copy todir="${build.testcases.dir}"> |
653 |
– |
<fileset dir="${test.src.dir}"> |
654 |
– |
<include name="**/*.properties"/> |
655 |
– |
</fileset> |
656 |
– |
</copy> |
657 |
– |
|
658 |
– |
|
659 |
– |
<java classname="jsr166.test.Sample" fork="true"> |
660 |
– |
<classpath refid="test.classpath"/> |
661 |
– |
<!-- <jvmarg value="-ea"/> --> |
662 |
– |
<!-- <jvmarg value="-server"/> --> |
663 |
– |
<!-- <arg value="1000"/> --> |
664 |
– |
</java> |
665 |
– |
</target> |
666 |
– |
|
667 |
– |
|
480 |
|
<target name="loops" depends="init, configure-compiler" |
481 |
|
description="Benchmark from Doug Lea's AQS paper"> |
482 |
|
|
492 |
|
|
493 |
|
<compilerarg line="${build.args}"/> |
494 |
|
<classpath refid="loops.classpath"/> |
495 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
496 |
|
|
497 |
|
</javac> |
498 |
|
|
503 |
|
</target> |
504 |
|
|
505 |
|
|
506 |
< |
<target name="compile-j1" depends="init, configure-compiler, compile"> |
506 |
> |
<!-- jdk7 --> |
507 |
|
|
695 |
– |
<mkdir dir="${build.j1.dir}"/> |
508 |
|
|
509 |
< |
<javac srcdir="${j1.src.dir}" |
510 |
< |
destdir="${build.j1.dir}" |
511 |
< |
debug="${build.debug}" |
512 |
< |
debuglevel="${build.debuglevel}" |
513 |
< |
deprecation="${build.deprecation}" |
514 |
< |
source="${build.sourcelevel}" > |
509 |
> |
<target name="jdk7compile" |
510 |
> |
depends="configure-compiler" |
511 |
> |
description="Compiles src/jdk7 sources"> |
512 |
> |
|
513 |
> |
<mkdir dir="${build.jdk7.classes.dir}"/> |
514 |
> |
|
515 |
> |
<javac srcdir="${jdk7src.dir}" |
516 |
> |
destdir="${build.jdk7.classes.dir}" |
517 |
> |
debug="${build.debug}" |
518 |
> |
debuglevel="${build.debuglevel}" |
519 |
> |
deprecation="${build.deprecation}" |
520 |
> |
source="1.6" |
521 |
> |
classpath="" |
522 |
> |
bootclasspath="${bootclasspath6}" |
523 |
> |
includeAntRuntime="false" |
524 |
> |
includeJavaRuntime="false" |
525 |
> |
executable="${javac6}" |
526 |
> |
fork="true"> |
527 |
|
|
528 |
|
<include name="**/*.java"/> |
705 |
– |
<exclude name="**/dijkstra/**"/> |
706 |
– |
|
529 |
|
<compilerarg line="${build.args}"/> |
530 |
< |
<classpath refid="j1.classpath"/> |
530 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
531 |
> |
<compilerarg value="-Xlint:all"/> |
532 |
|
|
533 |
|
</javac> |
534 |
|
|
535 |
|
</target> |
536 |
|
|
537 |
|
|
715 |
– |
<target name="sw" depends="compile-j1" |
716 |
– |
description="Runs the SwingWorker demo"> |
538 |
|
|
539 |
< |
<!-- |
540 |
< |
<java classname="jsr166.swing.SwingWorkerDemo" fork="true"> |
541 |
< |
<classpath refid="j1.classpath"/> |
721 |
< |
</java> |
722 |
< |
--> |
539 |
> |
<target name="jdk7jar" |
540 |
> |
depends="jdk7compile" |
541 |
> |
description="Builds library jar from compiled sources"> |
542 |
|
|
543 |
< |
<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/> |
543 |
> |
<mkdir dir="${build.jdk7.lib.dir}"/> |
544 |
|
|
545 |
< |
<exec dir="${build.j1.dir}" executable="appletviewer.exe"> |
546 |
< |
<arg value="${build.j1.dir}/SwingWorker.html"/> |
547 |
< |
</exec> |
545 |
> |
<jar destfile="${jdk7product.jar}" index="true"> |
546 |
> |
<fileset dir="${build.jdk7.classes.dir}"/> |
547 |
> |
</jar> |
548 |
|
|
549 |
|
</target> |
550 |
|
|
732 |
– |
<target name="j1" depends="compile-j1" |
733 |
– |
description="Runs a standalone JavaOne program"> |
551 |
|
|
735 |
– |
<java classname="${j1.test}" fork="true"> |
736 |
– |
<classpath refid="j1.classpath"/> |
737 |
– |
<jvmarg value="-client"/> |
552 |
|
|
553 |
< |
<!-- TestPseudoRandom args --> |
554 |
< |
<arg value="2"/> |
741 |
< |
<arg value="25"/> |
742 |
< |
<arg value="100000"/> |
553 |
> |
<target name="jdk7docs" |
554 |
> |
description="Builds javadocs with custom tags to build folder"> |
555 |
|
|
556 |
< |
<!-- WebCrawler args --> |
557 |
< |
<!-- |
746 |
< |
<arg value="jsr166.webcrawler.WebCrawler3"/> |
747 |
< |
<arg value="http://www.priorartisans.com"/> |
748 |
< |
<arg value="25"/> |
749 |
< |
--> |
556 |
> |
<delete dir="${build.jdk7.docs.dir}"/> |
557 |
> |
<mkdir dir="${build.jdk7.docs.dir}"/> |
558 |
|
|
559 |
< |
</java> |
559 |
> |
<javadoc destdir="${build.jdk7.docs.dir}" |
560 |
> |
packagenames="none" |
561 |
> |
link="${jdkapi7docs.url}" |
562 |
> |
overview="${jdk7src.dir}/intro.html" |
563 |
> |
sourcepath="${jdk7src.dir}" |
564 |
> |
bootclasspath="${bootclasspath6}" |
565 |
> |
classpath="" |
566 |
> |
source="1.6" |
567 |
> |
executable="${javadoc7}" |
568 |
> |
additionalparam="-XDignore.symbol.file=true" > |
569 |
> |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
570 |
> |
<include name="**/*.java"/> |
571 |
> |
</fileset> |
572 |
> |
</javadoc> |
573 |
|
|
574 |
|
</target> |
575 |
|
|
576 |
|
|
577 |
< |
<target name="test-j1" depends="compile-j1" |
578 |
< |
description="Runs testcases from the JavaOne source directories"> |
577 |
> |
<target name="jdk7dist" |
578 |
> |
depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs" |
579 |
> |
description="Puts all distributable products in single hierarchy"/> |
580 |
|
|
759 |
– |
<junit printsummary="true" |
760 |
– |
showoutput="true" |
761 |
– |
errorProperty="junit.failed" |
762 |
– |
failureProperty="junit.failed" |
763 |
– |
dir="${build.j1.dir}" |
764 |
– |
fork="true"> |
581 |
|
|
766 |
– |
<!-- <jvmarg value="-server"/> --> |
767 |
– |
<classpath refid="j1.classpath"/> |
768 |
– |
<formatter type="xml"/> |
582 |
|
|
583 |
< |
<batchtest todir="${build.j1.dir}"> |
584 |
< |
<fileset dir="${j1.src.dir}"> |
772 |
< |
<include name="**/*Test.java"/> |
773 |
< |
</fileset> |
774 |
< |
</batchtest> |
583 |
> |
<target name="jdk7clean" |
584 |
> |
description="Removes all build products"> |
585 |
|
|
586 |
< |
</junit> |
586 |
> |
<delete dir="${build.jdk7.dir}"/> |
587 |
|
|
588 |
< |
<available property="junit.report.format" |
779 |
< |
value="frames" |
780 |
< |
classname="org.apache.xalan.lib.Redirect"/> |
781 |
< |
<property name="junit.report.format" value="noframes"/> |
588 |
> |
</target> |
589 |
|
|
590 |
< |
<junitreport todir="${build.j1.dir}"> |
591 |
< |
<fileset dir="${build.j1.dir}"> |
592 |
< |
<include name="TEST-*.xml"/> |
590 |
> |
|
591 |
> |
|
592 |
> |
<target name="jdk7dist-clean" |
593 |
> |
description="Removes all build and distribution products"> |
594 |
> |
|
595 |
> |
</target> |
596 |
> |
|
597 |
> |
<target name="jdk7dist-docs" |
598 |
> |
description="Builds javadocs without custom tags to dist folder"> |
599 |
> |
|
600 |
> |
<delete dir="${dist.jdk7.docs.dir}"/> |
601 |
> |
<mkdir dir="${dist.jdk7.docs.dir}"/> |
602 |
> |
|
603 |
> |
<javadoc destdir="${dist.jdk7.docs.dir}" |
604 |
> |
packagenames="none" |
605 |
> |
link="${jdkapi7docs.url}" |
606 |
> |
overview="${jdk7src.dir}/intro.html" |
607 |
> |
sourcepath="${jdk7src.dir}" |
608 |
> |
classpath="" |
609 |
> |
executable="${javadoc7}" |
610 |
> |
bootclasspath="${bootclasspath6}" |
611 |
> |
source="1.6"> |
612 |
> |
<arg value="-XDignore.symbol.file=true"/> |
613 |
> |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
614 |
> |
<include name="**/*.java"/> |
615 |
|
</fileset> |
616 |
< |
<report styledir="${stylesheet.dir}" |
788 |
< |
format="${junit.report.format}" |
789 |
< |
todir="${build.j1.dir}" |
790 |
< |
/> |
791 |
< |
</junitreport> |
616 |
> |
</javadoc> |
617 |
|
|
618 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
618 |
> |
</target> |
619 |
> |
|
620 |
> |
<target name="jdk7dist-jar" |
621 |
> |
depends="jdk7clean, jdk7jar"> |
622 |
> |
|
623 |
> |
<copy file="${jdk7product.jar}" todir="${dist.dir}"/> |
624 |
|
|
625 |
|
</target> |
626 |
|
|
627 |
+ |
<!-- jsr166x --> |
628 |
|
|
629 |
|
|
630 |
< |
<!-- C++ and JNI definitions and demos --> |
630 |
> |
<target name="jsr166xcompile" |
631 |
> |
depends="init, configure-compiler" |
632 |
> |
description="Compiles jsr166x sources"> |
633 |
|
|
634 |
< |
<target name="configure-cpp"> |
634 |
> |
<mkdir dir="${build.jsr166x.dir}"/> |
635 |
|
|
636 |
< |
<!-- Define tasks and types --> |
636 |
> |
<javac srcdir="${jsr166xsrc.dir}" |
637 |
> |
destdir="${build.jsr166x.dir}" |
638 |
> |
debug="${build.debug}" |
639 |
> |
debuglevel="${build.debuglevel}" |
640 |
> |
deprecation="${build.deprecation}" |
641 |
> |
source="${build.sourcelevel}" |
642 |
> |
fork="true"> |
643 |
|
|
644 |
< |
<path id="cpptasks.path"> |
645 |
< |
<pathelement location="${lib.dir}/cpptasks.jar"/> |
646 |
< |
</path> |
808 |
< |
<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/> |
809 |
< |
<typedef resource="cpptasks.types" classpathref="cpptasks.path"/> |
644 |
> |
<include name="**/*.java"/> |
645 |
> |
<compilerarg line="${build.args}"/> |
646 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
647 |
|
|
648 |
< |
<!-- Set platform property for JNI includes --> |
648 |
> |
</javac> |
649 |
|
|
650 |
< |
<condition property="platform" value="linux"> |
651 |
< |
<os name="Linux"/> |
652 |
< |
</condition> |
653 |
< |
<condition property="platform" value="win32"> |
654 |
< |
<os family="windows"/> |
655 |
< |
</condition> |
656 |
< |
<condition property="platform" value="solaris"> |
657 |
< |
<os name="SunOS"/> |
658 |
< |
</condition> |
650 |
> |
</target> |
651 |
> |
|
652 |
> |
|
653 |
> |
|
654 |
> |
<target name="jsr166xjar" |
655 |
> |
depends="jsr166xcompile" |
656 |
> |
description="Builds library jar from compiled sources"> |
657 |
> |
|
658 |
> |
<mkdir dir="${build.jsr166xlib.dir}"/> |
659 |
> |
|
660 |
> |
<jar destfile="${jsr166xproduct.jar}"> |
661 |
> |
<fileset dir="${build.jsr166x.dir}"/> |
662 |
> |
</jar> |
663 |
> |
|
664 |
> |
</target> |
665 |
> |
|
666 |
> |
|
667 |
> |
|
668 |
> |
<target name="jsr166xdocs" |
669 |
> |
description="Builds javadocs with custom tags to build folder"> |
670 |
> |
|
671 |
> |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
672 |
> |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
673 |
> |
|
674 |
> |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
675 |
> |
packagenames="jsr166x" |
676 |
> |
link="${jdkapidocs.url}" |
677 |
> |
source="${build.sourcelevel}" |
678 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
679 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
680 |
|
|
681 |
|
</target> |
682 |
|
|
683 |
|
|
684 |
< |
<target name="cppdemo" depends="configure-cpp"> |
684 |
> |
<target name="jsr166xdist" |
685 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
686 |
> |
description="Puts all distributable products in single hierarchy"/> |
687 |
|
|
828 |
– |
<mkdir dir="${build.dir}"/> |
688 |
|
|
830 |
– |
<cc multithreaded="true" |
831 |
– |
name="g++" |
832 |
– |
objdir="${build.dir}" |
833 |
– |
outfile="${build.dir}/CppDemo"> |
834 |
– |
<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/> |
835 |
– |
<libset libs="stdc++"/> |
836 |
– |
</cc> |
689 |
|
|
690 |
< |
<exec executable="${build.dir}/CppDemo"> |
691 |
< |
<arg line="count in word frequency of word in command line count"/> |
692 |
< |
</exec> |
690 |
> |
<target name="jsr166xclean" |
691 |
> |
description="Removes all build products"> |
692 |
> |
|
693 |
> |
<delete dir="${build.jsr166x.dir}"/> |
694 |
> |
<delete dir="${build.jsr166xlib.dir}"/> |
695 |
|
|
696 |
|
</target> |
697 |
|
|
698 |
|
|
845 |
– |
<target name="jnidemo" depends="init, configure-compiler, configure-cpp"> |
699 |
|
|
700 |
< |
<mkdir dir="${build.testcases.dir}"/> |
700 |
> |
<target name="jsr166xdist-clean" |
701 |
> |
description="Removes all build and distribution products"> |
702 |
|
|
703 |
< |
<javac srcdir="${test.src.dir}" |
704 |
< |
destdir="${build.testcases.dir}" |
703 |
> |
</target> |
704 |
> |
|
705 |
> |
|
706 |
> |
|
707 |
> |
<target name="jsr166xdist-docs" |
708 |
> |
description="Builds javadocs without custom tags to dist folder"> |
709 |
> |
|
710 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
711 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
712 |
> |
|
713 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
714 |
> |
packagenames="jsr166x" |
715 |
> |
link="${jdkapidocs.url}" |
716 |
> |
source="${build.sourcelevel}" |
717 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
718 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
719 |
> |
|
720 |
> |
</target> |
721 |
> |
|
722 |
> |
<target name="jsr166xdist-jar" |
723 |
> |
depends="jsr166xclean, jsr166xjar"> |
724 |
> |
|
725 |
> |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
726 |
> |
|
727 |
> |
</target> |
728 |
> |
|
729 |
> |
<!-- jsr166y --> |
730 |
> |
|
731 |
> |
|
732 |
> |
<target name="jsr166ycompile" |
733 |
> |
depends="init, configure-compiler" |
734 |
> |
description="Compiles jsr166y sources"> |
735 |
> |
|
736 |
> |
<mkdir dir="${build.jsr166y.dir}"/> |
737 |
> |
|
738 |
> |
<javac srcdir="${jsr166ysrc.dir}" |
739 |
> |
destdir="${build.jsr166y.dir}" |
740 |
|
debug="${build.debug}" |
741 |
|
debuglevel="${build.debuglevel}" |
742 |
|
deprecation="${build.deprecation}" |
743 |
|
source="${build.sourcelevel}" |
744 |
|
fork="true"> |
745 |
< |
<compilerarg value="${bootclasspath.args}"/> |
745 |
> |
|
746 |
> |
<include name="**/*.java"/> |
747 |
|
<compilerarg line="${build.args}"/> |
748 |
< |
<classpath refid="test.classpath"/> |
749 |
< |
<include name="JniDemo.java"/> |
748 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
749 |
> |
<compilerarg value="${bootclasspath.args}"/> |
750 |
> |
|
751 |
> |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
752 |
> |
|
753 |
|
</javac> |
754 |
|
|
755 |
< |
<javah destdir="${build.testcases.dir}" |
756 |
< |
classpathref="test.classpath"> |
757 |
< |
<class name="JniDemo"/> |
758 |
< |
</javah> |
759 |
< |
|
760 |
< |
<cc multithreaded="true" |
761 |
< |
name="g++" |
762 |
< |
objdir="${build.dir}" |
763 |
< |
outfile="${build.dir}/JniDemo" |
764 |
< |
outtype="shared"> |
765 |
< |
|
766 |
< |
<compiler> |
767 |
< |
<defineset> |
875 |
< |
<define name="__int64" value="long long"/> |
876 |
< |
</defineset> |
877 |
< |
<includepath location="${java.home}/../include"/> |
878 |
< |
<includepath location="${java.home}/../include/${platform}"/> |
879 |
< |
<compilerarg value="-mno-cygwin"/> |
880 |
< |
</compiler> |
881 |
< |
|
882 |
< |
<linker> |
883 |
< |
<linkerarg value="--add-stdcall-alias"/> |
884 |
< |
</linker> |
885 |
< |
|
886 |
< |
<includepath location="${build.testcases.dir}"/> |
887 |
< |
|
888 |
< |
<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/> |
889 |
< |
|
890 |
< |
<libset libs="stdc++"/> |
891 |
< |
|
892 |
< |
</cc> |
893 |
< |
|
894 |
< |
<!-- Necessary if windows, harmless if not --> |
895 |
< |
<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/> |
896 |
< |
|
897 |
< |
<java classname="JniDemo" fork="true"> |
898 |
< |
<!-- Watch out: path separator hardwired to semicolon here! --> |
899 |
< |
<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/> |
900 |
< |
<classpath refid="test.classpath"/> |
901 |
< |
<arg line="count in word frequency of word in command line count"/> |
902 |
< |
</java> |
755 |
> |
</target> |
756 |
> |
|
757 |
> |
|
758 |
> |
|
759 |
> |
<target name="jsr166yjar" |
760 |
> |
depends="jsr166ycompile" |
761 |
> |
description="Builds library jar from compiled sources"> |
762 |
> |
|
763 |
> |
<mkdir dir="${build.jsr166ylib.dir}"/> |
764 |
> |
|
765 |
> |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
766 |
> |
<fileset dir="${build.jsr166y.dir}"/> |
767 |
> |
</jar> |
768 |
|
|
769 |
|
</target> |
770 |
|
|
771 |
|
|
772 |
|
|
773 |
< |
<!-- Backward compatibility, work in progress (some files not checked in) --> |
773 |
> |
<target name="jsr166ydocs" |
774 |
> |
description="Builds javadocs with custom tags to build folder"> |
775 |
|
|
776 |
+ |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
777 |
+ |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
778 |
|
|
779 |
+ |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
780 |
+ |
packagenames="jsr166y" |
781 |
+ |
link="${jdkapidocs.url}" |
782 |
+ |
source="${build.sourcelevel}" |
783 |
+ |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
784 |
+ |
additionalparam="-XDignore.symbol.file=true" /> |
785 |
|
|
786 |
< |
<property name="pretiger.src.dir" location="${build.dir}/pretiger/src"/> |
913 |
< |
<property name="build.pretiger.dir" location="${build.dir}/pretiger/classes"/> |
914 |
< |
<property name="pretiger.jar" location="${build.lib.dir}/jsr166-pretiger.jar"/> |
915 |
< |
<property name="pretiger.sourcelevel" value="1.4"/> |
786 |
> |
</target> |
787 |
|
|
917 |
– |
<target name="defang" |
918 |
– |
depends="init" |
919 |
– |
description="Generates pre-Tiger compatible source"> |
788 |
|
|
789 |
< |
<delete dir="${pretiger.src.dir}"/> |
790 |
< |
<mkdir dir="${pretiger.src.dir}"/> |
789 |
> |
<target name="jsr166ydist" |
790 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
791 |
> |
description="Puts all distributable products in single hierarchy"/> |
792 |
|
|
793 |
< |
<exec executable="perl"> |
794 |
< |
<arg file="etc/defang.pl"/> |
795 |
< |
<!-- <arg value="-v"/> --> |
796 |
< |
<arg value="-s"/> <arg file="${src.dir}"/> |
797 |
< |
<arg value="-t"/> <arg file="${pretiger.src.dir}"/> |
798 |
< |
</exec> |
793 |
> |
|
794 |
> |
|
795 |
> |
<target name="jsr166yclean" |
796 |
> |
description="Removes all build products"> |
797 |
> |
|
798 |
> |
<delete dir="${build.jsr166y.dir}"/> |
799 |
> |
<delete dir="${build.jsr166ylib.dir}"/> |
800 |
|
|
801 |
|
</target> |
802 |
|
|
933 |
– |
<target name="compile-pretiger" |
934 |
– |
depends="init, configure-compiler, defang" |
935 |
– |
description="Compiles pre-Tiger sources to build folder"> |
803 |
|
|
937 |
– |
<mkdir dir="${build.pretiger.dir}"/> |
804 |
|
|
805 |
< |
<javac srcdir="${pretiger.src.dir}" |
806 |
< |
destdir="${build.pretiger.dir}" |
805 |
> |
<target name="jsr166ydist-clean" |
806 |
> |
description="Removes all build and distribution products"> |
807 |
> |
|
808 |
> |
</target> |
809 |
> |
|
810 |
> |
<target name="jsr166ydist-docs" |
811 |
> |
description="Builds javadocs without custom tags to dist folder"> |
812 |
> |
|
813 |
> |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
814 |
> |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
815 |
> |
|
816 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
817 |
> |
packagenames="jsr166y" |
818 |
> |
link="${jdkapidocs.url}" |
819 |
> |
source="${build.sourcelevel}" |
820 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
821 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
822 |
> |
|
823 |
> |
</target> |
824 |
> |
|
825 |
> |
<target name="jsr166ydist-jar" |
826 |
> |
depends="jsr166yclean, jsr166yjar"> |
827 |
> |
|
828 |
> |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
829 |
> |
|
830 |
> |
</target> |
831 |
> |
|
832 |
> |
|
833 |
> |
<!-- extra166y --> |
834 |
> |
|
835 |
> |
|
836 |
> |
<target name="extra166ycompile" |
837 |
> |
depends="init, configure-compiler, jsr166ycompile" |
838 |
> |
description="Compiles extra166y sources"> |
839 |
> |
|
840 |
> |
<mkdir dir="${build.extra166y.dir}"/> |
841 |
> |
|
842 |
> |
<javac srcdir="${extra166ysrc.dir}" |
843 |
> |
destdir="${build.extra166y.dir}" |
844 |
|
debug="${build.debug}" |
845 |
+ |
classpath="${jsr166yproduct.jar}" |
846 |
|
debuglevel="${build.debuglevel}" |
847 |
|
deprecation="${build.deprecation}" |
848 |
< |
source="${pretiger.sourcelevel}" |
848 |
> |
source="${build.sourcelevel}" |
849 |
|
fork="true"> |
850 |
|
|
851 |
+ |
<include name="**/*.java"/> |
852 |
|
<compilerarg line="${build.args}"/> |
853 |
< |
<exclude name="**/Thread.java"/> |
853 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
854 |
> |
<compilerarg value="${bootclasspath.args}"/> |
855 |
> |
|
856 |
> |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
857 |
|
|
858 |
|
</javac> |
859 |
|
|
860 |
|
</target> |
861 |
|
|
954 |
– |
<target name="pretiger" depends="compile-pretiger"> |
862 |
|
|
956 |
– |
<mkdir dir="${build.lib.dir}"/> |
863 |
|
|
864 |
< |
<jar destfile="${pretiger.jar}"> |
865 |
< |
<fileset dir="${build.pretiger.dir}"> |
866 |
< |
</fileset> |
864 |
> |
<target name="extra166yjar" |
865 |
> |
depends="extra166ycompile" |
866 |
> |
description="Builds library jar from compiled sources"> |
867 |
> |
|
868 |
> |
<mkdir dir="${build.extra166ylib.dir}"/> |
869 |
> |
|
870 |
> |
<jar destfile="${extra166yproduct.jar}" index="true"> |
871 |
> |
<fileset dir="${build.extra166y.dir}"/> |
872 |
|
</jar> |
873 |
|
|
874 |
|
</target> |
875 |
|
|
965 |
– |
<!-- jsr166x --> |
876 |
|
|
877 |
|
|
878 |
< |
<target name="jsr166xcompile" |
878 |
> |
<target name="extra166ydocs" |
879 |
> |
description="Builds javadocs with custom tags to build folder"> |
880 |
> |
|
881 |
> |
<delete dir="${build.extra166yjavadocs.dir}"/> |
882 |
> |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
883 |
> |
|
884 |
> |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
885 |
> |
packagenames="extra166y" |
886 |
> |
link="${jdkapidocs.url}" |
887 |
> |
source="${build.sourcelevel}" |
888 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
889 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
890 |
> |
|
891 |
> |
</target> |
892 |
> |
|
893 |
> |
|
894 |
> |
<target name="extra166ydist" |
895 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
896 |
> |
description="Puts all distributable products in single hierarchy"/> |
897 |
> |
|
898 |
> |
|
899 |
> |
|
900 |
> |
<target name="extra166yclean" |
901 |
> |
description="Removes all build products"> |
902 |
> |
|
903 |
> |
<delete dir="${build.extra166y.dir}"/> |
904 |
> |
<delete dir="${build.extra166ylib.dir}"/> |
905 |
> |
|
906 |
> |
</target> |
907 |
> |
|
908 |
> |
|
909 |
> |
|
910 |
> |
<target name="extra166ydist-clean" |
911 |
> |
description="Removes all build and distribution products"> |
912 |
> |
|
913 |
> |
</target> |
914 |
> |
|
915 |
> |
<target name="extra166ydist-docs" |
916 |
> |
description="Builds javadocs without custom tags to dist folder"> |
917 |
> |
|
918 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
919 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
920 |
> |
|
921 |
> |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
922 |
> |
packagenames="extra166y" |
923 |
> |
link="${jdkapidocs.url}" |
924 |
> |
source="${build.sourcelevel}" |
925 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
926 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
927 |
> |
|
928 |
> |
</target> |
929 |
> |
|
930 |
> |
<target name="extra166ydist-jar" |
931 |
> |
depends="extra166yclean, extra166yjar"> |
932 |
> |
|
933 |
> |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
934 |
> |
|
935 |
> |
</target> |
936 |
> |
|
937 |
> |
<!-- jsr166e --> |
938 |
> |
|
939 |
> |
|
940 |
> |
<target name="jsr166ecompile" |
941 |
|
depends="init, configure-compiler" |
942 |
< |
description="Compiles jsr166x sources"> |
942 |
> |
description="Compiles jsr166e sources"> |
943 |
|
|
944 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
944 |
> |
<mkdir dir="${build.jsr166e.dir}"/> |
945 |
|
|
946 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
947 |
< |
destdir="${build.jsr166x.dir}" |
946 |
> |
<javac srcdir="${jsr166esrc.dir}" |
947 |
> |
destdir="${build.jsr166e.dir}" |
948 |
|
debug="${build.debug}" |
949 |
|
debuglevel="${build.debuglevel}" |
950 |
|
deprecation="${build.deprecation}" |
951 |
< |
source="${build.sourcelevel}" |
951 |
> |
source="1.7" |
952 |
|
fork="true"> |
953 |
|
|
954 |
|
<include name="**/*.java"/> |
955 |
|
<compilerarg line="${build.args}"/> |
956 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
957 |
+ |
<compilerarg value="${bootclasspath.args}"/> |
958 |
+ |
|
959 |
+ |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
960 |
|
|
961 |
|
</javac> |
962 |
|
|
964 |
|
|
965 |
|
|
966 |
|
|
967 |
< |
<target name="jsr166xjar" |
968 |
< |
depends="jsr166xcompile" |
967 |
> |
<target name="jsr166ejar" |
968 |
> |
depends="jsr166ecompile" |
969 |
|
description="Builds library jar from compiled sources"> |
970 |
|
|
971 |
< |
<mkdir dir="${build.jsr166xlib.dir}"/> |
971 |
> |
<mkdir dir="${build.jsr166elib.dir}"/> |
972 |
|
|
973 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
974 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
973 |
> |
<jar destfile="${jsr166eproduct.jar}" index="true"> |
974 |
> |
<fileset dir="${build.jsr166e.dir}"/> |
975 |
|
</jar> |
976 |
|
|
977 |
|
</target> |
978 |
|
|
979 |
|
|
980 |
|
|
981 |
< |
<target name="jsr166xdocs" |
981 |
> |
<target name="jsr166edocs" |
982 |
|
description="Builds javadocs with custom tags to build folder"> |
983 |
|
|
984 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
985 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
1010 |
< |
|
1011 |
< |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
1012 |
< |
link="http://java.sun.com/j2se/1.5.0/docs/api/" |
1013 |
< |
sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
1014 |
< |
|
1015 |
< |
> |
1016 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
1017 |
< |
<include name="jsr166x"/> |
1018 |
< |
</packageset> |
1019 |
< |
|
984 |
> |
<delete dir="${build.jsr166ejavadocs.dir}"/> |
985 |
> |
<mkdir dir="${build.jsr166ejavadocs.dir}"/> |
986 |
|
|
987 |
< |
</javadoc> |
987 |
> |
<javadoc destdir="${build.jsr166ejavadocs.dir}" |
988 |
> |
packagenames="jsr166e,jsr166e.extra" |
989 |
> |
link="${jdkapidocs.url}" |
990 |
> |
source="1.7" |
991 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
992 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
993 |
|
|
994 |
|
</target> |
995 |
|
|
996 |
|
|
997 |
< |
<target name="jsr166xdist" |
998 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
997 |
> |
<target name="jsr166edist" |
998 |
> |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs" |
999 |
|
description="Puts all distributable products in single hierarchy"/> |
1000 |
|
|
1001 |
|
|
1002 |
|
|
1003 |
< |
<target name="jsr166xclean" |
1003 |
> |
<target name="jsr166eclean" |
1004 |
|
description="Removes all build products"> |
1005 |
|
|
1006 |
< |
<delete dir="${build.jsr166x.dir}"/> |
1007 |
< |
<delete dir="${build.jsr166xlib.dir}"/> |
1006 |
> |
<delete dir="${build.jsr166e.dir}"/> |
1007 |
> |
<delete dir="${build.jsr166elib.dir}"/> |
1008 |
|
|
1009 |
|
</target> |
1010 |
|
|
1011 |
|
|
1012 |
|
|
1013 |
< |
<target name="jsr166xdist-clean" |
1013 |
> |
<target name="jsr166edist-clean" |
1014 |
|
description="Removes all build and distribution products"> |
1015 |
|
|
1016 |
|
</target> |
1017 |
|
|
1018 |
< |
|
1048 |
< |
|
1049 |
< |
<target name="jsr166xdist-docs" |
1018 |
> |
<target name="jsr166edist-docs" |
1019 |
|
description="Builds javadocs without custom tags to dist folder"> |
1020 |
|
|
1021 |
< |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
1022 |
< |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
1054 |
< |
|
1055 |
< |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
1056 |
< |
link="http://java.sun.com/j2se/1.5.0/docs/api/" |
1057 |
< |
source="${build.sourcelevel}"> |
1058 |
< |
|
1059 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
1060 |
< |
<include name="jsr166x"/> |
1061 |
< |
</packageset> |
1021 |
> |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1022 |
> |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
1023 |
|
|
1024 |
< |
</javadoc> |
1024 |
> |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
1025 |
> |
packagenames="jsr166e,jsr166e.extra" |
1026 |
> |
link="${jdkapidocs.url}" |
1027 |
> |
source="1.7" |
1028 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
1029 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
1030 |
|
|
1031 |
|
</target> |
1032 |
|
|
1033 |
< |
<target name="jsr166xdist-jar" |
1034 |
< |
depends="jsr166xclean, jsr166xjar"> |
1033 |
> |
<target name="jsr166edist-jar" |
1034 |
> |
depends="jsr166eclean, jsr166ejar"> |
1035 |
|
|
1036 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
1036 |
> |
<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/> |
1037 |
|
|
1038 |
|
</target> |
1039 |
|
|