8 |
|
|
9 |
|
User-specific settings are read from user.properties. |
10 |
|
See user.properties.sample for an explanation of some useful settings. |
11 |
+ |
|
12 |
+ |
The repository contains all dependencies except for ant and the JDK |
13 |
+ |
itself. Because the JDK version matters and because different |
14 |
+ |
targets require different JDKs, we assume that users have created a |
15 |
+ |
hierarchy containing: |
16 |
+ |
$HOME/jdk/jdk6 |
17 |
+ |
$HOME/jdk/jdk7 |
18 |
+ |
$HOME/jdk/jdk8 |
19 |
+ |
where each of the above is a JDK or a symlink to same. |
20 |
|
------------------------------------------------------------------------------ |
21 |
|
</description> |
22 |
|
|
30 |
|
|
31 |
|
|
32 |
|
<!-- Compilation options --> |
33 |
< |
<property name="build.sourcelevel" value="1.5"/> |
33 |
> |
<property name="build.sourcelevel" value="1.6"/> |
34 |
|
<property name="build.debug" value="true"/> |
35 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
36 |
|
<property name="build.deprecation" value="false"/> |
37 |
|
|
38 |
|
<!-- Build locations --> |
39 |
< |
<property name="build.dir" location="build"/> |
40 |
< |
<property name="build.classes.dir" location="${build.dir}/classes"/> |
41 |
< |
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
42 |
< |
<property name="build.j1.dir" location="${build.dir}/j1"/> |
43 |
< |
<property name="build.loops.dir" location="${build.dir}/loops"/> |
44 |
< |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
45 |
< |
<property name="build.ant.dir" location="${build.dir}/ant"/> |
46 |
< |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
47 |
< |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
48 |
< |
<property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/> |
49 |
< |
<property name="build.doccheck.dir" location="${build.dir}/doccheck"/> |
50 |
< |
<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/> |
51 |
< |
<property name="build.dc-filter.dir" location="${build.dir}/filterdocchk"/> |
52 |
< |
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
39 |
> |
<property name="build.dir" location="build"/> |
40 |
> |
<property name="build.classes.dir" location="${build.dir}/classes"/> |
41 |
> |
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
42 |
> |
<property name="build.loops.dir" location="${build.dir}/loops"/> |
43 |
> |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
44 |
> |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
45 |
> |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
46 |
> |
|
47 |
> |
<property name="build.jdk7.dir" location="${build.dir}/jdk7"/> |
48 |
> |
<property name="build.jdk7.lib.dir" location="${build.jdk7.dir}"/> |
49 |
> |
<property name="build.jdk7.classes.dir" location="${build.jdk7.dir}/classes"/> |
50 |
> |
<property name="build.jdk7.tck.classes.dir" location="${build.jdk7.dir}/tck/classes"/> |
51 |
> |
<property name="build.jdk7.docs.dir" location="${build.jdk7.dir}/docs"/> |
52 |
> |
|
53 |
> |
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
54 |
|
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
55 |
|
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
56 |
|
|
57 |
+ |
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
58 |
+ |
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
59 |
+ |
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
60 |
+ |
|
61 |
+ |
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
62 |
+ |
<property name="build.jsr166elib.dir" location="${build.dir}/jsr166elib"/> |
63 |
+ |
<property name="build.jsr166ejavadocs.dir" location="${build.dir}/jsr166ejavadocs"/> |
64 |
+ |
|
65 |
+ |
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
66 |
+ |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
67 |
+ |
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
68 |
+ |
|
69 |
+ |
<!-- JDK binary locations --> |
70 |
+ |
<property name="jdks.home" location="${user.home}/jdk"/> |
71 |
+ |
|
72 |
+ |
<macrodef name="defjdklocations"> |
73 |
+ |
<attribute name="v"/> |
74 |
+ |
<sequential> |
75 |
+ |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
76 |
+ |
<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/> |
77 |
+ |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
78 |
+ |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
79 |
+ |
<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
80 |
+ |
<property name="bootclasspath@{v}" |
81 |
+ |
value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/> |
82 |
+ |
</sequential> |
83 |
+ |
</macrodef> |
84 |
+ |
|
85 |
+ |
<defjdklocations v="6"/> |
86 |
+ |
<defjdklocations v="7"/> |
87 |
+ |
<defjdklocations v="8"/> |
88 |
+ |
|
89 |
+ |
<macrodef name="run-tck-tests"> |
90 |
+ |
<attribute name="jvm"/> |
91 |
+ |
<attribute name="tck.classes"/> |
92 |
+ |
<attribute name="product.jar" default="${product.jar}"/> |
93 |
+ |
<attribute name="jvmflags" default=""/> |
94 |
+ |
<sequential> |
95 |
+ |
<java classname="JSR166TestCase" |
96 |
+ |
jvm="@{jvm}" fork="true"> |
97 |
+ |
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
98 |
+ |
<jvmarg line="@{jvmflags}"/> |
99 |
+ |
<classpath> |
100 |
+ |
<pathelement location="${junit.jar}"/> |
101 |
+ |
<pathelement location="@{tck.classes}"/> |
102 |
+ |
</classpath> |
103 |
+ |
</java> |
104 |
+ |
</sequential> |
105 |
+ |
</macrodef> |
106 |
+ |
|
107 |
|
<!-- Source locations --> |
108 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
109 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
50 |
– |
<property name="j1.src.dir" location="${basedir}/src/javaone"/> |
110 |
|
<property name="loops.src.dir" location="${basedir}/src/loops"/> |
111 |
|
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
112 |
|
<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"/> |
113 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
114 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
115 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
116 |
< |
<property name="jsr166xsrc.dir" location="${basedir}/src/jsr166x"/> |
116 |
> |
<property name="jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
117 |
> |
<property name="jsr166xsrc.dir" location="${topsrc.dir}/jsr166x"/> |
118 |
> |
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
119 |
> |
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
120 |
> |
<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/> |
121 |
> |
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
122 |
|
|
123 |
|
<!-- Distribution locations --> |
124 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
124 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
125 |
> |
<property name="dist.jdk7.docs.dir" location="${dist.dir}/jsr166-jdk7docs"/> |
126 |
|
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
127 |
+ |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
128 |
+ |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
129 |
+ |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
130 |
|
|
131 |
|
<!-- Jar locations --> |
132 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
133 |
+ |
<property name="jdk7product.jar" location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/> |
134 |
|
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
135 |
+ |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
136 |
+ |
<property name="jsr166eproduct.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
137 |
+ |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
138 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
69 |
– |
<property name="concurrent.jar" location="${lib.dir}/concurrent.jar"/> |
139 |
|
|
140 |
|
<!-- Bootclasspath argument --> |
141 |
|
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
142 |
|
|
143 |
+ |
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
144 |
+ |
<property name="jdkapi5docs.url" value="http://docs.oracle.com/javase/1.5.0/docs/api/"/> |
145 |
+ |
<property name="jdkapi6docs.url" value="http://docs.oracle.com/javase/6/docs/api/"/> |
146 |
+ |
<property name="jdkapi7docs.url" value="http://docs.oracle.com/javase/7/docs/api/"/> |
147 |
+ |
|
148 |
+ |
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
149 |
+ |
<!-- The below does not yet exist as of 2012-11 --> |
150 |
+ |
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
151 |
+ |
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
152 |
+ |
|
153 |
|
<!-- Test classpath --> |
154 |
|
<path id="test.classpath"> |
155 |
|
<pathelement location="${build.testcases.dir}"/> |
161 |
|
<pathelement location="${build.loops.dir}"/> |
162 |
|
</path> |
163 |
|
|
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 |
– |
|
164 |
|
|
165 |
|
<!-- Main targets --> |
166 |
|
|
167 |
+ |
<target name="dists" |
168 |
+ |
depends="dist, jsr166xdist, jsr166ydist,jsr166edist, extra166ydist" |
169 |
+ |
description="Builds all public jars and docs"/> |
170 |
|
|
171 |
|
<target name="compile" |
172 |
|
depends="init, configure-compiler" |
183 |
|
fork="true"> |
184 |
|
|
185 |
|
<include name="**/*.java"/> |
186 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
187 |
+ |
|
188 |
|
<!-- |
189 |
|
<exclude name="java/lang/**"/> |
190 |
|
<compilerarg line="${build.args}"/> |
223 |
|
<delete dir="${build.javadocs.dir}"/> |
224 |
|
<mkdir dir="${build.javadocs.dir}"/> |
225 |
|
|
226 |
< |
<javadoc destdir="${build.javadocs.dir}" |
227 |
< |
link="http://java.sun.com/j2se/1.5.0/docs/api" |
154 |
< |
overview="${src.dir}/intro.html" |
155 |
< |
sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
156 |
< |
> |
157 |
< |
|
158 |
< |
<packageset dir="${src.dir}"/> |
159 |
< |
|
160 |
< |
</javadoc> |
161 |
< |
|
162 |
< |
</target> |
163 |
< |
|
226 |
> |
<!-- the packagenames="none" hack below prevents scanning the --> |
227 |
> |
<!-- sourcepath for packages --> |
228 |
|
|
229 |
< |
|
230 |
< |
<target name="doccheck" |
231 |
< |
depends="filter-doccheck" |
232 |
< |
description="Reports on javadoc style errors"> |
233 |
< |
|
234 |
< |
<delete dir="${build.doccheck.dir}"/> |
235 |
< |
<mkdir dir="${build.doccheck.dir}"/> |
236 |
< |
|
237 |
< |
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
174 |
< |
docletpath="${lib.dir}/doccheck.jar" |
175 |
< |
destdir="${build.doccheck.dir}"> |
176 |
< |
<packageset dir="${build.dc-filter.dir}"/> |
229 |
> |
<javadoc destdir="${build.javadocs.dir}" |
230 |
> |
packagenames="none" |
231 |
> |
link="${jdkapidocs.url}" |
232 |
> |
overview="${src.dir}/intro.html" |
233 |
> |
sourcepath="${src.dir}:${jdksrc.dir}" |
234 |
> |
additionalparam="-XDignore.symbol.file=true" > |
235 |
> |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
236 |
> |
<include name="**/*.java"/> |
237 |
> |
</fileset> |
238 |
|
</javadoc> |
239 |
|
|
179 |
– |
<echo>DocCheck output is in ${build.doccheck.dir}</echo> |
180 |
– |
|
181 |
– |
</target> |
182 |
– |
|
183 |
– |
|
184 |
– |
|
185 |
– |
<target name="checkstyle" |
186 |
– |
depends="filter-src" |
187 |
– |
description="Reports on style errors in Java source (verbose, mostly chaff)"> |
188 |
– |
|
189 |
– |
<taskdef resource="checkstyletask.properties" |
190 |
– |
classpath="${lib.dir}/checkstyle-all-3.1.jar"/> |
191 |
– |
|
192 |
– |
<mkdir dir="${build.checkstyle.dir}"/> |
193 |
– |
|
194 |
– |
<checkstyle config="etc/checkstyle/sun_checks.xml" |
195 |
– |
failOnViolation="false"> |
196 |
– |
<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/> |
197 |
– |
<fileset dir="${build.filter.src.dir}" includes="**/*.java"/> |
198 |
– |
</checkstyle> |
199 |
– |
|
200 |
– |
<style in="${build.checkstyle.dir}/checkstyle-report.xml" |
201 |
– |
out="${build.checkstyle.dir}/checkstyle-report.html" |
202 |
– |
style="${stylesheet.dir}/checkstyle-frames.xsl"/> |
203 |
– |
|
240 |
|
</target> |
241 |
|
|
242 |
|
|
246 |
|
description="Puts all distributable products in single hierarchy"/> |
247 |
|
|
248 |
|
|
213 |
– |
|
249 |
|
<target name="release" |
250 |
|
depends="dist" |
251 |
|
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
292 |
|
<delete dir="${dist.javadocs.dir}"/> |
293 |
|
<mkdir dir="${dist.javadocs.dir}"/> |
294 |
|
|
295 |
< |
<javadoc destdir="${dist.javadocs.dir}" |
296 |
< |
link="http://java.sun.com/j2se/1.5.0/docs/api" |
262 |
< |
overview="${src.dir}/intro.html" |
295 |
> |
<!-- the packagenames="none" hack below prevents scanning the --> |
296 |
> |
<!-- sourcepath for packages --> |
297 |
|
|
298 |
< |
sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
299 |
< |
> |
300 |
< |
<packageset dir="${src.dir}" defaultexcludes="yes"> |
301 |
< |
<include name="java/util/concurrent"/> |
302 |
< |
<include name="java/util/concurrent/atomic"/> |
303 |
< |
<include name="java/util/concurrent/locks"/> |
304 |
< |
</packageset> |
305 |
< |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
272 |
< |
<include name="main/java/util/*.java"/> |
273 |
< |
<include name="main/java/util/*.html"/> |
274 |
< |
<!-- <include name="jsr166x/*.java"/> --> |
298 |
> |
<javadoc destdir="${dist.javadocs.dir}" |
299 |
> |
packagenames="none" |
300 |
> |
link="${jdkapidocs.url}" |
301 |
> |
overview="${src.dir}/intro.html" |
302 |
> |
sourcepath="${src.dir}:${jdksrc.dir}" |
303 |
> |
additionalparam="-XDignore.symbol.file=true" > |
304 |
> |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
305 |
> |
<include name="**/*.java"/> |
306 |
|
</fileset> |
307 |
|
</javadoc> |
308 |
|
|
331 |
|
</target> |
332 |
|
|
333 |
|
|
303 |
– |
<target name="compile-ant-filter" |
304 |
– |
depends="init"> |
305 |
– |
|
306 |
– |
<mkdir dir="${build.ant.dir}"/> |
307 |
– |
|
308 |
– |
<javac srcdir="${ant.src.dir}" |
309 |
– |
destdir="${build.ant.dir}" |
310 |
– |
source="1.4"/> |
311 |
– |
|
312 |
– |
</target> |
313 |
– |
|
314 |
– |
|
315 |
– |
<target name="filter-src" |
316 |
– |
depends="compile-ant-filter"> |
317 |
– |
|
318 |
– |
<mkdir dir="${build.filter.src.dir}"/> |
319 |
– |
|
320 |
– |
<copy todir="${build.filter.src.dir}"> |
321 |
– |
<fileset dir="${src.dir}"> |
322 |
– |
<include name="**/*.html"/> |
323 |
– |
</fileset> |
324 |
– |
</copy> |
325 |
– |
|
326 |
– |
<copy todir="${build.filter.src.dir}"> |
327 |
– |
<fileset dir="${src.dir}"> |
328 |
– |
<exclude name="**/*.html"/> |
329 |
– |
<!-- Files excluded from dist-docs --> |
330 |
– |
<exclude name="java/util/Random.*"/> |
331 |
– |
<exclude name="sun/misc/Unsafe.*"/> |
332 |
– |
</fileset> |
333 |
– |
<!-- |
334 |
– |
<filterchain> |
335 |
– |
--> |
336 |
– |
|
337 |
– |
<!-- |
338 |
– |
# This filter gets rid of angle-bracketed type parameters |
339 |
– |
# so that javadoc can run on the result. The following |
340 |
– |
# heuristic seems to work: |
341 |
– |
# |
342 |
– |
# For all lines not starting with space(s)-asterisk-space(s), |
343 |
– |
# replace <something> with a space, where there may be more |
344 |
– |
# than one right angle bracket at the end, and "something" |
345 |
– |
# must not contain parens or pipes. (This may need some |
346 |
– |
# tweaking.) |
347 |
– |
--> |
348 |
– |
|
349 |
– |
<!-- |
350 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
351 |
– |
classpath="${build.ant.dir}"> |
352 |
– |
<param name="notmatching" value="^\s+\*\s.*$"/> |
353 |
– |
<param name="pattern" value="<[^|>()]+?>+"/> |
354 |
– |
<param name="replacement" value=" "/> |
355 |
– |
</filterreader> |
356 |
– |
--> |
357 |
– |
|
358 |
– |
<!-- |
359 |
– |
</filterchain> |
360 |
– |
--> |
361 |
– |
</copy> |
362 |
– |
|
363 |
– |
</target> |
364 |
– |
|
365 |
– |
|
366 |
– |
<target name="filter-doccheck" |
367 |
– |
depends="filter-src"> |
368 |
– |
|
369 |
– |
<mkdir dir="${build.dc-filter.dir}"/> |
370 |
– |
|
371 |
– |
<copy todir="${build.dc-filter.dir}"> |
372 |
– |
<fileset dir="${build.filter.src.dir}"> |
373 |
– |
<include name="**/*.html"/> |
374 |
– |
</fileset> |
375 |
– |
</copy> |
376 |
– |
|
377 |
– |
<property name="generic.declarations" |
378 |
– |
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 {}" |
379 |
– |
/> |
380 |
– |
|
381 |
– |
<copy todir="${build.dc-filter.dir}"> |
382 |
– |
<fileset dir="${build.filter.src.dir}"> |
383 |
– |
<exclude name="**/*.html"/> |
384 |
– |
</fileset> |
385 |
– |
<filterchain> |
386 |
– |
<!-- |
387 |
– |
# These two filters try to make the source look like |
388 |
– |
# something that doccheck can process. The first removes |
389 |
– |
# -source 1.4 assertions and the second adds in a bunch |
390 |
– |
# of single letter public nested marker interfaces so that |
391 |
– |
# the generic type parameters are recognized. |
392 |
– |
--> |
393 |
– |
|
394 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
395 |
– |
classpath="${build.ant.dir}"> |
396 |
– |
<param name="matching" value="^\s*assert[\s ].*$"/> |
397 |
– |
<param name="pattern" value="assert"/> |
398 |
– |
<param name="replacement" value="//assert"/> |
399 |
– |
</filterreader> |
400 |
– |
|
401 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
402 |
– |
classpath="${build.ant.dir}"> |
403 |
– |
<param name="matching" value="^([^*]*(class|interface|implements) .*|)\{.*$"/> |
404 |
– |
<param name="pattern" value="$"/> |
405 |
– |
<param name="replacement" value=" ${generic.declarations}"/> |
406 |
– |
</filterreader> |
407 |
– |
|
408 |
– |
</filterchain> |
409 |
– |
</copy> |
410 |
– |
|
411 |
– |
</target> |
412 |
– |
|
413 |
– |
|
334 |
|
<target name="compile-tests" |
335 |
|
depends="jar"> |
336 |
|
|
346 |
|
|
347 |
|
<compilerarg value="${bootclasspath.args}"/> |
348 |
|
<compilerarg line="${build.args}"/> |
349 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
350 |
|
|
351 |
|
<classpath refid="test.classpath"/> |
352 |
|
|
364 |
|
|
365 |
|
<compilerarg value="${bootclasspath.args}"/> |
366 |
|
<compilerarg line="${build.args}"/> |
367 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
368 |
|
|
369 |
|
<classpath refid="test.classpath"/> |
370 |
|
|
381 |
|
|
382 |
|
<compilerarg value="${bootclasspath.args}"/> |
383 |
|
<compilerarg line="${build.args}"/> |
384 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
385 |
|
|
386 |
|
<classpath refid="test.classpath"/> |
387 |
|
|
454 |
|
<fileset dir="${build.reports.dir}"> |
455 |
|
<include name="TEST-*.xml"/> |
456 |
|
</fileset> |
457 |
< |
<report styledir="${stylesheet.dir}" |
535 |
< |
format="${junit.report.format}" |
536 |
< |
todir="${build.reports.dir}" |
457 |
> |
<report format="${junit.report.format}" todir="${build.reports.dir}" |
458 |
|
/> |
459 |
|
</junitreport> |
460 |
|
|
504 |
|
</target> |
505 |
|
|
506 |
|
|
586 |
– |
|
587 |
– |
<!-- Anthill targets --> |
588 |
– |
|
589 |
– |
<target name="anthill-build"> |
590 |
– |
|
591 |
– |
<!-- Override this in user.properties --> |
592 |
– |
<property name="tiger.home" location="e:/j2sdk1.5.0"/> |
593 |
– |
|
594 |
– |
<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java"> |
595 |
– |
<arg value="-Xmx256000000"/> |
596 |
– |
<!-- classpath of new JVM --> |
597 |
– |
<arg value="-classpath"/> <arg path="${java.class.path}"/> |
598 |
– |
<!-- location of Ant home directory --> |
599 |
– |
<arg value="-Dant.home=${ant.home}"/> |
600 |
– |
<!-- the Ant main class --> |
601 |
– |
<arg value="org.apache.tools.ant.Main"/> |
602 |
– |
<!-- The build file --> |
603 |
– |
<arg value="-buildfile"/> <arg value="build.xml"/> |
604 |
– |
<!-- the target to build on the new Ant instance --> |
605 |
– |
<arg value="-DJAVA_HOME=${tiger.home}"/> |
606 |
– |
<arg value="do-anthill-build"/> |
607 |
– |
</exec> |
608 |
– |
</target> |
609 |
– |
|
610 |
– |
<target name="do-anthill-build" |
611 |
– |
depends="jar, test, docs, dist-docs"/> |
612 |
– |
|
613 |
– |
<target name="anthill-publish"> |
614 |
– |
|
615 |
– |
<copy todir="${deployDir}/docs/private"> |
616 |
– |
<fileset dir="${build.javadocs.dir}"/> |
617 |
– |
</copy> |
618 |
– |
|
619 |
– |
<copy todir="${deployDir}/docs/public"> |
620 |
– |
<fileset dir="${dist.javadocs.dir}"/> |
621 |
– |
</copy> |
622 |
– |
|
623 |
– |
<copy tofile="${deployDir}/index.html" |
624 |
– |
file="${basedir}/etc/anthill-index.html"/> |
625 |
– |
|
626 |
– |
<copy todir="${deployDir}/notes"> |
627 |
– |
<fileset dir="${basedir}/etc/notes"/> |
628 |
– |
</copy> |
629 |
– |
|
630 |
– |
</target> |
631 |
– |
|
632 |
– |
|
633 |
– |
|
507 |
|
<!-- Various demos and test programs --> |
508 |
|
|
509 |
|
|
637 |
– |
<target name="sample" depends="init, configure-compiler" |
638 |
– |
description="Standalone demo program"> |
639 |
– |
|
640 |
– |
<mkdir dir="${build.testcases.dir}"/> |
641 |
– |
|
642 |
– |
<javac srcdir="${test.src.dir}" |
643 |
– |
destdir="${build.testcases.dir}" |
644 |
– |
debug="${build.debug}" |
645 |
– |
debuglevel="${build.debuglevel}" |
646 |
– |
deprecation="${build.deprecation}" |
647 |
– |
source="${build.sourcelevel}" |
648 |
– |
fork="true"> |
649 |
– |
|
650 |
– |
<include name="jsr166/test/Sample.java"/> |
651 |
– |
|
652 |
– |
</javac> |
653 |
– |
|
654 |
– |
<copy todir="${build.testcases.dir}"> |
655 |
– |
<fileset dir="${test.src.dir}"> |
656 |
– |
<include name="**/*.properties"/> |
657 |
– |
</fileset> |
658 |
– |
</copy> |
659 |
– |
|
660 |
– |
|
661 |
– |
<java classname="jsr166.test.Sample" fork="true"> |
662 |
– |
<classpath refid="test.classpath"/> |
663 |
– |
<!-- <jvmarg value="-ea"/> --> |
664 |
– |
<!-- <jvmarg value="-server"/> --> |
665 |
– |
<!-- <arg value="1000"/> --> |
666 |
– |
</java> |
667 |
– |
</target> |
668 |
– |
|
669 |
– |
|
510 |
|
<target name="loops" depends="init, configure-compiler" |
511 |
|
description="Benchmark from Doug Lea's AQS paper"> |
512 |
|
|
522 |
|
|
523 |
|
<compilerarg line="${build.args}"/> |
524 |
|
<classpath refid="loops.classpath"/> |
525 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
526 |
|
|
527 |
|
</javac> |
528 |
|
|
533 |
|
</target> |
534 |
|
|
535 |
|
|
536 |
< |
<target name="compile-j1" depends="init, configure-compiler, compile"> |
536 |
> |
<!-- jdk7 --> |
537 |
|
|
697 |
– |
<mkdir dir="${build.j1.dir}"/> |
538 |
|
|
539 |
< |
<javac srcdir="${j1.src.dir}" |
540 |
< |
destdir="${build.j1.dir}" |
541 |
< |
debug="${build.debug}" |
542 |
< |
debuglevel="${build.debuglevel}" |
543 |
< |
deprecation="${build.deprecation}" |
544 |
< |
source="${build.sourcelevel}" > |
539 |
> |
<target name="jdk7compile" |
540 |
> |
depends="configure-compiler" |
541 |
> |
description="Compiles src/jdk7 sources"> |
542 |
> |
|
543 |
> |
<mkdir dir="${build.jdk7.classes.dir}"/> |
544 |
> |
|
545 |
> |
<javac srcdir="${jdk7src.dir}" |
546 |
> |
destdir="${build.jdk7.classes.dir}" |
547 |
> |
debug="${build.debug}" |
548 |
> |
debuglevel="${build.debuglevel}" |
549 |
> |
deprecation="${build.deprecation}" |
550 |
> |
source="1.6" |
551 |
> |
classpath="" |
552 |
> |
bootclasspath="${bootclasspath6}" |
553 |
> |
includeAntRuntime="false" |
554 |
> |
includeJavaRuntime="false" |
555 |
> |
executable="${javac7}" |
556 |
> |
fork="true"> |
557 |
|
|
558 |
|
<include name="**/*.java"/> |
707 |
– |
<exclude name="**/dijkstra/**"/> |
708 |
– |
|
559 |
|
<compilerarg line="${build.args}"/> |
560 |
< |
<classpath refid="j1.classpath"/> |
560 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
561 |
> |
<compilerarg value="-Xlint:all"/> |
562 |
|
|
563 |
|
</javac> |
564 |
|
|
565 |
< |
</target> |
565 |
> |
<mkdir dir="${build.jdk7.lib.dir}"/> |
566 |
|
|
567 |
+ |
<jar destfile="${jdk7product.jar}" index="true"> |
568 |
+ |
<fileset dir="${build.jdk7.classes.dir}"/> |
569 |
+ |
</jar> |
570 |
|
|
571 |
< |
<target name="sw" depends="compile-j1" |
718 |
< |
description="Runs the SwingWorker demo"> |
571 |
> |
<mkdir dir="${build.jdk7.tck.classes.dir}"/> |
572 |
|
|
573 |
< |
<!-- |
574 |
< |
<java classname="jsr166.swing.SwingWorkerDemo" fork="true"> |
575 |
< |
<classpath refid="j1.classpath"/> |
576 |
< |
</java> |
577 |
< |
--> |
573 |
> |
<javac srcdir="${tck.src.dir}" |
574 |
> |
destdir="${build.jdk7.tck.classes.dir}" |
575 |
> |
debug="${build.debug}" |
576 |
> |
debuglevel="${build.debuglevel}" |
577 |
> |
deprecation="${build.deprecation}" |
578 |
> |
source="1.6" |
579 |
> |
classpath="${junit.jar}" |
580 |
> |
bootclasspath="${jdk7product.jar}:${bootclasspath6}" |
581 |
> |
includeAntRuntime="false" |
582 |
> |
includeJavaRuntime="false" |
583 |
> |
executable="${javac7}" |
584 |
> |
fork="true"> |
585 |
|
|
586 |
< |
<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/> |
586 |
> |
<include name="**/*.java"/> |
587 |
> |
<compilerarg line="${build.args}"/> |
588 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
589 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
590 |
|
|
591 |
< |
<exec dir="${build.j1.dir}" executable="appletviewer.exe"> |
729 |
< |
<arg value="${build.j1.dir}/SwingWorker.html"/> |
730 |
< |
</exec> |
591 |
> |
</javac> |
592 |
|
|
593 |
|
</target> |
594 |
|
|
734 |
– |
<target name="j1" depends="compile-j1" |
735 |
– |
description="Runs a standalone JavaOne program"> |
595 |
|
|
596 |
< |
<java classname="${j1.test}" fork="true"> |
597 |
< |
<classpath refid="j1.classpath"/> |
598 |
< |
<jvmarg value="-client"/> |
596 |
> |
<target name="run-jdk7-tck-tests" |
597 |
> |
depends="jdk7compile" |
598 |
> |
description="Runs tck tests for jsr166-jdk7 directly"> |
599 |
> |
<run-tck-tests |
600 |
> |
jvm="${java7}" |
601 |
> |
tck.classes="${build.jdk7.tck.classes.dir}" |
602 |
> |
product.jar="${jdk7product.jar}"/> |
603 |
> |
</target> |
604 |
|
|
741 |
– |
<!-- TestPseudoRandom args --> |
742 |
– |
<arg value="2"/> |
743 |
– |
<arg value="25"/> |
744 |
– |
<arg value="100000"/> |
605 |
|
|
606 |
< |
<!-- WebCrawler args --> |
607 |
< |
<!-- |
748 |
< |
<arg value="jsr166.webcrawler.WebCrawler3"/> |
749 |
< |
<arg value="http://www.priorartisans.com"/> |
750 |
< |
<arg value="25"/> |
751 |
< |
--> |
606 |
> |
<target name="run-jdk7-tck-tests-via-junit-task" |
607 |
> |
depends="jdk7compile"> |
608 |
|
|
609 |
< |
</java> |
609 |
> |
<junit printsummary="true" |
610 |
> |
showoutput="true" |
611 |
> |
errorProperty="junit.failed" |
612 |
> |
failureProperty="junit.failed" |
613 |
> |
includeantruntime="true" |
614 |
> |
jvm="${java7}" |
615 |
> |
fork="true"> |
616 |
|
|
617 |
< |
</target> |
617 |
> |
<jvmarg value="-Xbootclasspath/p:${jdk7product.jar}"/> |
618 |
> |
<jvmarg value="-server"/> |
619 |
|
|
620 |
+ |
<classpath> |
621 |
+ |
<pathelement location="${junit.jar}"/> |
622 |
+ |
<pathelement location="${build.jdk7.tck.classes.dir}"/> |
623 |
+ |
</classpath> |
624 |
|
|
625 |
< |
<target name="test-j1" depends="compile-j1" |
759 |
< |
description="Runs testcases from the JavaOne source directories"> |
625 |
> |
<formatter type="brief"/> |
626 |
|
|
627 |
< |
<junit printsummary="true" |
628 |
< |
showoutput="true" |
763 |
< |
errorProperty="junit.failed" |
764 |
< |
failureProperty="junit.failed" |
765 |
< |
dir="${build.j1.dir}" |
766 |
< |
fork="true"> |
627 |
> |
<test name="JSR166TestCase" haltonfailure="no"> |
628 |
> |
</test> |
629 |
|
|
630 |
< |
<!-- <jvmarg value="-server"/> --> |
631 |
< |
<classpath refid="j1.classpath"/> |
770 |
< |
<formatter type="xml"/> |
630 |
> |
</junit> |
631 |
> |
</target> |
632 |
|
|
772 |
– |
<batchtest todir="${build.j1.dir}"> |
773 |
– |
<fileset dir="${j1.src.dir}"> |
774 |
– |
<include name="**/*Test.java"/> |
775 |
– |
</fileset> |
776 |
– |
</batchtest> |
633 |
|
|
634 |
< |
</junit> |
634 |
> |
<target name="jdk7docs" |
635 |
> |
description="Builds javadocs with custom tags to build folder"> |
636 |
|
|
637 |
< |
<available property="junit.report.format" |
638 |
< |
value="frames" |
782 |
< |
classname="org.apache.xalan.lib.Redirect"/> |
783 |
< |
<property name="junit.report.format" value="noframes"/> |
637 |
> |
<delete dir="${build.jdk7.docs.dir}"/> |
638 |
> |
<mkdir dir="${build.jdk7.docs.dir}"/> |
639 |
|
|
640 |
< |
<junitreport todir="${build.j1.dir}"> |
641 |
< |
<fileset dir="${build.j1.dir}"> |
642 |
< |
<include name="TEST-*.xml"/> |
640 |
> |
<javadoc destdir="${build.jdk7.docs.dir}" |
641 |
> |
packagenames="none" |
642 |
> |
link="${jdkapi7docs.url}" |
643 |
> |
overview="${jdk7src.dir}/intro.html" |
644 |
> |
sourcepath="${jdk7src.dir}" |
645 |
> |
bootclasspath="${bootclasspath6}" |
646 |
> |
classpath="" |
647 |
> |
source="1.6" |
648 |
> |
executable="${javadoc7}" |
649 |
> |
additionalparam="-XDignore.symbol.file=true" > |
650 |
> |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
651 |
> |
<include name="**/*.java"/> |
652 |
|
</fileset> |
653 |
< |
<report styledir="${stylesheet.dir}" |
790 |
< |
format="${junit.report.format}" |
791 |
< |
todir="${build.j1.dir}" |
792 |
< |
/> |
793 |
< |
</junitreport> |
794 |
< |
|
795 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
653 |
> |
</javadoc> |
654 |
|
|
655 |
|
</target> |
656 |
|
|
657 |
|
|
658 |
+ |
<target name="jdk7dist" |
659 |
+ |
depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs" |
660 |
+ |
description="Puts all distributable products in single hierarchy"/> |
661 |
+ |
|
662 |
+ |
|
663 |
|
|
664 |
< |
<!-- C++ and JNI definitions and demos --> |
664 |
> |
<target name="jdk7clean" |
665 |
> |
description="Removes all build products"> |
666 |
|
|
667 |
< |
<target name="configure-cpp"> |
667 |
> |
<delete dir="${build.jdk7.dir}"/> |
668 |
|
|
669 |
< |
<!-- Define tasks and types --> |
669 |
> |
</target> |
670 |
|
|
807 |
– |
<path id="cpptasks.path"> |
808 |
– |
<pathelement location="${lib.dir}/cpptasks.jar"/> |
809 |
– |
</path> |
810 |
– |
<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/> |
811 |
– |
<typedef resource="cpptasks.types" classpathref="cpptasks.path"/> |
671 |
|
|
813 |
– |
<!-- Set platform property for JNI includes --> |
672 |
|
|
673 |
< |
<condition property="platform" value="linux"> |
674 |
< |
<os name="Linux"/> |
817 |
< |
</condition> |
818 |
< |
<condition property="platform" value="win32"> |
819 |
< |
<os family="windows"/> |
820 |
< |
</condition> |
821 |
< |
<condition property="platform" value="solaris"> |
822 |
< |
<os name="SunOS"/> |
823 |
< |
</condition> |
673 |
> |
<target name="jdk7dist-clean" |
674 |
> |
description="Removes all build and distribution products"> |
675 |
|
|
676 |
|
</target> |
677 |
|
|
678 |
+ |
<target name="jdk7dist-docs" |
679 |
+ |
description="Builds javadocs without custom tags to dist folder"> |
680 |
|
|
681 |
< |
<target name="cppdemo" depends="configure-cpp"> |
681 |
> |
<delete dir="${dist.jdk7.docs.dir}"/> |
682 |
> |
<mkdir dir="${dist.jdk7.docs.dir}"/> |
683 |
|
|
684 |
< |
<mkdir dir="${build.dir}"/> |
684 |
> |
<javadoc destdir="${dist.jdk7.docs.dir}" |
685 |
> |
packagenames="none" |
686 |
> |
link="${jdkapi7docs.url}" |
687 |
> |
overview="${jdk7src.dir}/intro.html" |
688 |
> |
sourcepath="${jdk7src.dir}" |
689 |
> |
classpath="" |
690 |
> |
executable="${javadoc7}" |
691 |
> |
bootclasspath="${bootclasspath6}" |
692 |
> |
source="1.6"> |
693 |
> |
<arg value="-XDignore.symbol.file=true"/> |
694 |
> |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
695 |
> |
<include name="**/*.java"/> |
696 |
> |
</fileset> |
697 |
> |
</javadoc> |
698 |
> |
|
699 |
> |
</target> |
700 |
|
|
701 |
< |
<cc multithreaded="true" |
702 |
< |
name="g++" |
834 |
< |
objdir="${build.dir}" |
835 |
< |
outfile="${build.dir}/CppDemo"> |
836 |
< |
<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/> |
837 |
< |
<libset libs="stdc++"/> |
838 |
< |
</cc> |
701 |
> |
<target name="jdk7dist-jar" |
702 |
> |
depends="jdk7clean, jdk7compile"> |
703 |
|
|
704 |
< |
<exec executable="${build.dir}/CppDemo"> |
841 |
< |
<arg line="count in word frequency of word in command line count"/> |
842 |
< |
</exec> |
704 |
> |
<copy file="${jdk7product.jar}" todir="${dist.dir}"/> |
705 |
|
|
706 |
|
</target> |
707 |
|
|
708 |
+ |
<!-- jsr166x --> |
709 |
|
|
847 |
– |
<target name="jnidemo" depends="init, configure-compiler, configure-cpp"> |
710 |
|
|
711 |
< |
<mkdir dir="${build.testcases.dir}"/> |
711 |
> |
<target name="jsr166xcompile" |
712 |
> |
depends="init, configure-compiler" |
713 |
> |
description="Compiles jsr166x sources"> |
714 |
|
|
715 |
< |
<javac srcdir="${test.src.dir}" |
716 |
< |
destdir="${build.testcases.dir}" |
715 |
> |
<mkdir dir="${build.jsr166x.dir}"/> |
716 |
> |
|
717 |
> |
<javac srcdir="${jsr166xsrc.dir}" |
718 |
> |
destdir="${build.jsr166x.dir}" |
719 |
|
debug="${build.debug}" |
720 |
|
debuglevel="${build.debuglevel}" |
721 |
|
deprecation="${build.deprecation}" |
722 |
|
source="${build.sourcelevel}" |
723 |
|
fork="true"> |
724 |
< |
<compilerarg value="${bootclasspath.args}"/> |
724 |
> |
|
725 |
> |
<include name="**/*.java"/> |
726 |
|
<compilerarg line="${build.args}"/> |
727 |
< |
<classpath refid="test.classpath"/> |
728 |
< |
<include name="JniDemo.java"/> |
727 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
728 |
> |
|
729 |
|
</javac> |
730 |
|
|
731 |
< |
<javah destdir="${build.testcases.dir}" |
732 |
< |
classpathref="test.classpath"> |
733 |
< |
<class name="JniDemo"/> |
734 |
< |
</javah> |
735 |
< |
|
736 |
< |
<cc multithreaded="true" |
737 |
< |
name="g++" |
738 |
< |
objdir="${build.dir}" |
739 |
< |
outfile="${build.dir}/JniDemo" |
740 |
< |
outtype="shared"> |
741 |
< |
|
742 |
< |
<compiler> |
743 |
< |
<defineset> |
877 |
< |
<define name="__int64" value="long long"/> |
878 |
< |
</defineset> |
879 |
< |
<includepath location="${java.home}/../include"/> |
880 |
< |
<includepath location="${java.home}/../include/${platform}"/> |
881 |
< |
<compilerarg value="-mno-cygwin"/> |
882 |
< |
</compiler> |
883 |
< |
|
884 |
< |
<linker> |
885 |
< |
<linkerarg value="--add-stdcall-alias"/> |
886 |
< |
</linker> |
887 |
< |
|
888 |
< |
<includepath location="${build.testcases.dir}"/> |
889 |
< |
|
890 |
< |
<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/> |
891 |
< |
|
892 |
< |
<libset libs="stdc++"/> |
893 |
< |
|
894 |
< |
</cc> |
895 |
< |
|
896 |
< |
<!-- Necessary if windows, harmless if not --> |
897 |
< |
<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/> |
898 |
< |
|
899 |
< |
<java classname="JniDemo" fork="true"> |
900 |
< |
<!-- Watch out: path separator hardwired to semicolon here! --> |
901 |
< |
<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/> |
902 |
< |
<classpath refid="test.classpath"/> |
903 |
< |
<arg line="count in word frequency of word in command line count"/> |
904 |
< |
</java> |
731 |
> |
</target> |
732 |
> |
|
733 |
> |
|
734 |
> |
|
735 |
> |
<target name="jsr166xjar" |
736 |
> |
depends="jsr166xcompile" |
737 |
> |
description="Builds library jar from compiled sources"> |
738 |
> |
|
739 |
> |
<mkdir dir="${build.jsr166xlib.dir}"/> |
740 |
> |
|
741 |
> |
<jar destfile="${jsr166xproduct.jar}"> |
742 |
> |
<fileset dir="${build.jsr166x.dir}"/> |
743 |
> |
</jar> |
744 |
|
|
745 |
|
</target> |
746 |
|
|
747 |
|
|
748 |
|
|
749 |
< |
<!-- Backward compatibility, work in progress (some files not checked in) --> |
749 |
> |
<target name="jsr166xdocs" |
750 |
> |
description="Builds javadocs with custom tags to build folder"> |
751 |
> |
|
752 |
> |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
753 |
> |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
754 |
> |
|
755 |
> |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
756 |
> |
packagenames="jsr166x" |
757 |
> |
link="${jdkapidocs.url}" |
758 |
> |
source="${build.sourcelevel}" |
759 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
760 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
761 |
> |
|
762 |
> |
</target> |
763 |
> |
|
764 |
> |
|
765 |
> |
<target name="jsr166xdist" |
766 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
767 |
> |
description="Puts all distributable products in single hierarchy"/> |
768 |
> |
|
769 |
> |
|
770 |
> |
|
771 |
> |
<target name="jsr166xclean" |
772 |
> |
description="Removes all build products"> |
773 |
> |
|
774 |
> |
<delete dir="${build.jsr166x.dir}"/> |
775 |
> |
<delete dir="${build.jsr166xlib.dir}"/> |
776 |
> |
|
777 |
> |
</target> |
778 |
|
|
779 |
|
|
780 |
|
|
781 |
< |
<property name="pretiger.src.dir" location="${build.dir}/pretiger/src"/> |
782 |
< |
<property name="build.pretiger.dir" location="${build.dir}/pretiger/classes"/> |
783 |
< |
<property name="pretiger.jar" location="${build.lib.dir}/jsr166-pretiger.jar"/> |
784 |
< |
<property name="pretiger.sourcelevel" value="1.4"/> |
781 |
> |
<target name="jsr166xdist-clean" |
782 |
> |
description="Removes all build and distribution products"> |
783 |
> |
|
784 |
> |
</target> |
785 |
> |
|
786 |
> |
|
787 |
> |
|
788 |
> |
<target name="jsr166xdist-docs" |
789 |
> |
description="Builds javadocs without custom tags to dist folder"> |
790 |
> |
|
791 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
792 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
793 |
|
|
794 |
< |
<target name="defang" |
795 |
< |
depends="init" |
796 |
< |
description="Generates pre-Tiger compatible source"> |
794 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
795 |
> |
packagenames="jsr166x" |
796 |
> |
link="${jdkapidocs.url}" |
797 |
> |
source="${build.sourcelevel}" |
798 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
799 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
800 |
|
|
801 |
< |
<delete dir="${pretiger.src.dir}"/> |
924 |
< |
<mkdir dir="${pretiger.src.dir}"/> |
801 |
> |
</target> |
802 |
|
|
803 |
< |
<exec executable="perl"> |
804 |
< |
<arg file="etc/defang.pl"/> |
805 |
< |
<!-- <arg value="-v"/> --> |
806 |
< |
<arg value="-s"/> <arg file="${src.dir}"/> |
930 |
< |
<arg value="-t"/> <arg file="${pretiger.src.dir}"/> |
931 |
< |
</exec> |
803 |
> |
<target name="jsr166xdist-jar" |
804 |
> |
depends="jsr166xclean, jsr166xjar"> |
805 |
> |
|
806 |
> |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
807 |
|
|
808 |
|
</target> |
809 |
|
|
810 |
< |
<target name="compile-pretiger" |
811 |
< |
depends="init, configure-compiler, defang" |
937 |
< |
description="Compiles pre-Tiger sources to build folder"> |
810 |
> |
<!-- jsr166y --> |
811 |
> |
|
812 |
|
|
813 |
< |
<mkdir dir="${build.pretiger.dir}"/> |
813 |
> |
<target name="jsr166ycompile" |
814 |
> |
depends="init, configure-compiler" |
815 |
> |
description="Compiles jsr166y sources"> |
816 |
|
|
817 |
< |
<javac srcdir="${pretiger.src.dir}" |
818 |
< |
destdir="${build.pretiger.dir}" |
817 |
> |
<mkdir dir="${build.jsr166y.dir}"/> |
818 |
> |
|
819 |
> |
<javac srcdir="${jsr166ysrc.dir}" |
820 |
> |
destdir="${build.jsr166y.dir}" |
821 |
|
debug="${build.debug}" |
822 |
|
debuglevel="${build.debuglevel}" |
823 |
|
deprecation="${build.deprecation}" |
824 |
< |
source="${pretiger.sourcelevel}" |
824 |
> |
source="${build.sourcelevel}" |
825 |
|
fork="true"> |
826 |
|
|
827 |
+ |
<include name="**/*.java"/> |
828 |
|
<compilerarg line="${build.args}"/> |
829 |
< |
<exclude name="**/Thread.java"/> |
829 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
830 |
> |
<compilerarg value="${bootclasspath.args}"/> |
831 |
> |
|
832 |
> |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
833 |
|
|
834 |
|
</javac> |
835 |
|
|
836 |
|
</target> |
837 |
|
|
956 |
– |
<target name="pretiger" depends="compile-pretiger"> |
838 |
|
|
958 |
– |
<mkdir dir="${build.lib.dir}"/> |
839 |
|
|
840 |
< |
<jar destfile="${pretiger.jar}"> |
841 |
< |
<fileset dir="${build.pretiger.dir}"> |
842 |
< |
</fileset> |
840 |
> |
<target name="jsr166yjar" |
841 |
> |
depends="jsr166ycompile" |
842 |
> |
description="Builds library jar from compiled sources"> |
843 |
> |
|
844 |
> |
<mkdir dir="${build.jsr166ylib.dir}"/> |
845 |
> |
|
846 |
> |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
847 |
> |
<fileset dir="${build.jsr166y.dir}"/> |
848 |
|
</jar> |
849 |
|
|
850 |
|
</target> |
851 |
|
|
967 |
– |
<!-- jsr166x --> |
852 |
|
|
853 |
|
|
854 |
< |
<target name="jsr166xcompile" |
855 |
< |
depends="init, configure-compiler" |
972 |
< |
description="Compiles jsr166x sources"> |
854 |
> |
<target name="jsr166ydocs" |
855 |
> |
description="Builds javadocs with custom tags to build folder"> |
856 |
|
|
857 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
857 |
> |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
858 |
> |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
859 |
|
|
860 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
861 |
< |
destdir="${build.jsr166x.dir}" |
860 |
> |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
861 |
> |
packagenames="jsr166y" |
862 |
> |
link="${jdkapidocs.url}" |
863 |
> |
source="${build.sourcelevel}" |
864 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
865 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
866 |
> |
|
867 |
> |
</target> |
868 |
> |
|
869 |
> |
|
870 |
> |
<target name="jsr166ydist" |
871 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
872 |
> |
description="Puts all distributable products in single hierarchy"/> |
873 |
> |
|
874 |
> |
|
875 |
> |
|
876 |
> |
<target name="jsr166yclean" |
877 |
> |
description="Removes all build products"> |
878 |
> |
|
879 |
> |
<delete dir="${build.jsr166y.dir}"/> |
880 |
> |
<delete dir="${build.jsr166ylib.dir}"/> |
881 |
> |
|
882 |
> |
</target> |
883 |
> |
|
884 |
> |
|
885 |
> |
|
886 |
> |
<target name="jsr166ydist-clean" |
887 |
> |
description="Removes all build and distribution products"> |
888 |
> |
|
889 |
> |
</target> |
890 |
> |
|
891 |
> |
<target name="jsr166ydist-docs" |
892 |
> |
description="Builds javadocs without custom tags to dist folder"> |
893 |
> |
|
894 |
> |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
895 |
> |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
896 |
> |
|
897 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
898 |
> |
packagenames="jsr166y" |
899 |
> |
link="${jdkapidocs.url}" |
900 |
> |
source="${build.sourcelevel}" |
901 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
902 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
903 |
> |
|
904 |
> |
</target> |
905 |
> |
|
906 |
> |
<target name="jsr166ydist-jar" |
907 |
> |
depends="jsr166yclean, jsr166yjar"> |
908 |
> |
|
909 |
> |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
910 |
> |
|
911 |
> |
</target> |
912 |
> |
|
913 |
> |
|
914 |
> |
<!-- extra166y --> |
915 |
> |
|
916 |
> |
|
917 |
> |
<target name="extra166ycompile" |
918 |
> |
depends="init, configure-compiler, jsr166ycompile" |
919 |
> |
description="Compiles extra166y sources"> |
920 |
> |
|
921 |
> |
<mkdir dir="${build.extra166y.dir}"/> |
922 |
> |
|
923 |
> |
<javac srcdir="${extra166ysrc.dir}" |
924 |
> |
destdir="${build.extra166y.dir}" |
925 |
|
debug="${build.debug}" |
926 |
+ |
classpath="${jsr166yproduct.jar}" |
927 |
|
debuglevel="${build.debuglevel}" |
928 |
|
deprecation="${build.deprecation}" |
929 |
|
source="${build.sourcelevel}" |
931 |
|
|
932 |
|
<include name="**/*.java"/> |
933 |
|
<compilerarg line="${build.args}"/> |
934 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
935 |
+ |
<compilerarg value="${bootclasspath.args}"/> |
936 |
+ |
|
937 |
+ |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
938 |
|
|
939 |
|
</javac> |
940 |
|
|
942 |
|
|
943 |
|
|
944 |
|
|
945 |
< |
<target name="jsr166xjar" |
946 |
< |
depends="jsr166xcompile" |
945 |
> |
<target name="extra166yjar" |
946 |
> |
depends="extra166ycompile" |
947 |
|
description="Builds library jar from compiled sources"> |
948 |
|
|
949 |
< |
<mkdir dir="${build.jsr166xlib.dir}"/> |
949 |
> |
<mkdir dir="${build.extra166ylib.dir}"/> |
950 |
|
|
951 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
952 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
951 |
> |
<jar destfile="${extra166yproduct.jar}" index="true"> |
952 |
> |
<fileset dir="${build.extra166y.dir}"/> |
953 |
|
</jar> |
954 |
|
|
955 |
|
</target> |
956 |
|
|
957 |
|
|
958 |
|
|
959 |
< |
<target name="jsr166xdocs" |
959 |
> |
<target name="extra166ydocs" |
960 |
|
description="Builds javadocs with custom tags to build folder"> |
961 |
|
|
962 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
963 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
962 |
> |
<delete dir="${build.extra166yjavadocs.dir}"/> |
963 |
> |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
964 |
|
|
965 |
< |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
966 |
< |
link="http://java.sun.com/j2se/1.5.0/docs/api/" |
967 |
< |
sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
968 |
< |
|
969 |
< |
> |
970 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
1019 |
< |
<include name="jsr166x"/> |
1020 |
< |
</packageset> |
1021 |
< |
|
1022 |
< |
|
1023 |
< |
</javadoc> |
965 |
> |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
966 |
> |
packagenames="extra166y" |
967 |
> |
link="${jdkapidocs.url}" |
968 |
> |
source="${build.sourcelevel}" |
969 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
970 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
971 |
|
|
972 |
|
</target> |
973 |
|
|
974 |
|
|
975 |
< |
<target name="jsr166xdist" |
976 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
975 |
> |
<target name="extra166ydist" |
976 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
977 |
|
description="Puts all distributable products in single hierarchy"/> |
978 |
|
|
979 |
|
|
980 |
|
|
981 |
< |
<target name="jsr166xclean" |
981 |
> |
<target name="extra166yclean" |
982 |
|
description="Removes all build products"> |
983 |
|
|
984 |
< |
<delete dir="${build.jsr166x.dir}"/> |
985 |
< |
<delete dir="${build.jsr166xlib.dir}"/> |
984 |
> |
<delete dir="${build.extra166y.dir}"/> |
985 |
> |
<delete dir="${build.extra166ylib.dir}"/> |
986 |
|
|
987 |
|
</target> |
988 |
|
|
989 |
|
|
990 |
|
|
991 |
< |
<target name="jsr166xdist-clean" |
991 |
> |
<target name="extra166ydist-clean" |
992 |
|
description="Removes all build and distribution products"> |
993 |
|
|
994 |
|
</target> |
995 |
|
|
996 |
+ |
<target name="extra166ydist-docs" |
997 |
+ |
description="Builds javadocs without custom tags to dist folder"> |
998 |
|
|
999 |
+ |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
1000 |
+ |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
1001 |
|
|
1002 |
< |
<target name="jsr166xdist-docs" |
1003 |
< |
description="Builds javadocs without custom tags to dist folder"> |
1002 |
> |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
1003 |
> |
packagenames="extra166y" |
1004 |
> |
link="${jdkapidocs.url}" |
1005 |
> |
source="${build.sourcelevel}" |
1006 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
1007 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
1008 |
|
|
1009 |
< |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
1055 |
< |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
1009 |
> |
</target> |
1010 |
|
|
1011 |
< |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
1012 |
< |
link="http://java.sun.com/j2se/1.5.0/docs/api/" |
1013 |
< |
source="${build.sourcelevel}"> |
1011 |
> |
<target name="extra166ydist-jar" |
1012 |
> |
depends="extra166yclean, extra166yjar"> |
1013 |
> |
|
1014 |
> |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
1015 |
> |
|
1016 |
> |
</target> |
1017 |
> |
|
1018 |
> |
<!-- jsr166e --> |
1019 |
> |
|
1020 |
> |
<target name="jsr166ecompile" |
1021 |
> |
depends="configure-compiler" |
1022 |
> |
description="Compiles jsr166e sources"> |
1023 |
|
|
1024 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
1025 |
< |
<include name="jsr166x"/> |
1026 |
< |
</packageset> |
1024 |
> |
<mkdir dir="${build.jsr166e.dir}"/> |
1025 |
> |
|
1026 |
> |
<javac srcdir="${topsrc.dir}" |
1027 |
> |
destdir="${build.jsr166e.dir}" |
1028 |
> |
debug="${build.debug}" |
1029 |
> |
debuglevel="${build.debuglevel}" |
1030 |
> |
deprecation="${build.deprecation}" |
1031 |
> |
source="1.7" |
1032 |
> |
classpath="" |
1033 |
> |
includeAntRuntime="false" |
1034 |
> |
includeJavaRuntime="false" |
1035 |
> |
executable="${javac7}" |
1036 |
> |
fork="true"> |
1037 |
> |
|
1038 |
> |
<include name="jsr166e/**/*.java"/> |
1039 |
> |
<compilerarg line="${build.args}"/> |
1040 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
1041 |
> |
<compilerarg value="-Xlint:all"/> |
1042 |
> |
|
1043 |
> |
</javac> |
1044 |
|
|
1045 |
+ |
</target> |
1046 |
+ |
|
1047 |
+ |
|
1048 |
+ |
|
1049 |
+ |
<target name="jsr166ejar" |
1050 |
+ |
depends="jsr166ecompile" |
1051 |
+ |
description="Builds library jar from compiled sources"> |
1052 |
+ |
|
1053 |
+ |
<mkdir dir="${build.jsr166elib.dir}"/> |
1054 |
+ |
|
1055 |
+ |
<jar destfile="${jsr166eproduct.jar}" index="true"> |
1056 |
+ |
<fileset dir="${build.jsr166e.dir}"/> |
1057 |
+ |
</jar> |
1058 |
+ |
|
1059 |
+ |
</target> |
1060 |
+ |
|
1061 |
+ |
|
1062 |
+ |
|
1063 |
+ |
<target name="jsr166edocs" |
1064 |
+ |
description="Builds javadocs with custom tags to build folder"> |
1065 |
+ |
|
1066 |
+ |
<delete dir="${build.jsr166ejavadocs.dir}"/> |
1067 |
+ |
<mkdir dir="${build.jsr166ejavadocs.dir}"/> |
1068 |
+ |
|
1069 |
+ |
<javadoc destdir="${build.jsr166ejavadocs.dir}" |
1070 |
+ |
packagenames="jsr166e,jsr166e.extra" |
1071 |
+ |
link="${jdkapi7docs.url}" |
1072 |
+ |
source="1.7" |
1073 |
+ |
sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}" |
1074 |
+ |
executable="${javadoc7}" |
1075 |
+ |
additionalparam="-XDignore.symbol.file=true" > |
1076 |
+ |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
1077 |
+ |
<include name="jsr166e/**/*.java"/> |
1078 |
+ |
</fileset> |
1079 |
|
</javadoc> |
1080 |
|
|
1081 |
|
</target> |
1082 |
|
|
1069 |
– |
<target name="jsr166xdist-jar" |
1070 |
– |
depends="jsr166xclean, jsr166xjar"> |
1083 |
|
|
1084 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
1084 |
> |
<target name="jsr166edist" |
1085 |
> |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs" |
1086 |
> |
description="Puts all distributable products in single hierarchy"/> |
1087 |
> |
|
1088 |
> |
|
1089 |
> |
|
1090 |
> |
<target name="jsr166eclean" |
1091 |
> |
description="Removes all build products"> |
1092 |
> |
|
1093 |
> |
<delete dir="${build.jsr166e.dir}"/> |
1094 |
> |
<delete dir="${build.jsr166elib.dir}"/> |
1095 |
> |
|
1096 |
> |
</target> |
1097 |
> |
|
1098 |
> |
|
1099 |
> |
|
1100 |
> |
<target name="jsr166edist-clean" |
1101 |
> |
description="Removes all build and distribution products"> |
1102 |
> |
|
1103 |
> |
</target> |
1104 |
> |
|
1105 |
> |
<target name="jsr166edist-docs" |
1106 |
> |
description="Builds javadocs without custom tags to dist folder"> |
1107 |
> |
|
1108 |
> |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1109 |
> |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
1110 |
> |
|
1111 |
> |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
1112 |
> |
packagenames="jsr166e,jsr166e.extra" |
1113 |
> |
link="${jdkapidocs.url}" |
1114 |
> |
source="1.7" |
1115 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
1116 |
> |
additionalparam="-XDignore.symbol.file=true" /> |
1117 |
> |
|
1118 |
> |
</target> |
1119 |
> |
|
1120 |
> |
<target name="jsr166edist-jar" |
1121 |
> |
depends="jsr166eclean, jsr166ejar"> |
1122 |
> |
|
1123 |
> |
<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/> |
1124 |
|
|
1125 |
|
</target> |
1126 |
|
|