22 |
|
|
23 |
|
<!-- Compilation options --> |
24 |
|
<property name="build.sourcelevel" value="1.5"/> |
25 |
– |
<property name="build.docsourcelevel" value="1.4"/> |
25 |
|
<property name="build.debug" value="true"/> |
26 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
27 |
|
<property name="build.deprecation" value="false"/> |
29 |
|
<!-- Build locations --> |
30 |
|
<property name="build.dir" location="build"/> |
31 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
33 |
– |
<property name="build.emulation.dir" location="${build.dir}/emulation"/> |
32 |
|
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
33 |
|
<property name="build.lib.dir" location="${build.dir}/lib"/> |
34 |
|
<property name="build.ant.dir" location="${build.dir}/ant"/> |
35 |
|
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
38 |
– |
<property name="build.stripped.dir" location="${build.dir}/stripped"/> |
36 |
|
<property name="build.reports.dir" location="${build.dir}/reports"/> |
37 |
+ |
<property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/> |
38 |
|
<property name="build.doccheck.dir" location="${build.dir}/doccheck"/> |
39 |
|
<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/> |
40 |
+ |
<property name="build.dc-filter.dir" location="${build.dir}/filterdocchk"/> |
41 |
|
|
42 |
|
<!-- Source locations --> |
43 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
45 |
– |
<property name="emulation.src.dir" location="${basedir}/src/emulation"/> |
44 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
45 |
|
<property name="ant.src.dir" location="${basedir}/etc/ant"/> |
46 |
|
<property name="stylesheet.dir" location="${basedir}/etc/xsl"/> |
53 |
|
<!-- Jar locations --> |
54 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
55 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
56 |
< |
<property name="rt.jar" location="${java.home}/lib/rt.jar"/> |
57 |
< |
|
58 |
< |
|
59 |
< |
|
60 |
< |
<!-- Files excluded from emulation and dist-docs --> |
61 |
< |
<patternset id="emulation.excludes"> |
62 |
< |
<exclude name="java/util/Random.*"/> |
63 |
< |
<exclude name="sun/misc/Unsafe.*"/> |
64 |
< |
</patternset> |
56 |
> |
|
57 |
> |
<!-- Bootclasspath argument --> |
58 |
> |
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
59 |
> |
|
60 |
> |
<!-- Test classpath --> |
61 |
> |
<path id="test.classpath"> |
62 |
> |
<pathelement location="${build.testcases.dir}"/> |
63 |
> |
<pathelement location="${junit.jar}"/> |
64 |
> |
</path> |
65 |
|
|
66 |
|
|
67 |
|
|
68 |
|
<!-- Main targets --> |
69 |
|
|
70 |
+ |
|
71 |
|
<target name="compile" |
72 |
|
depends="init, configure-compiler, prepare-src" |
73 |
|
description="Compiles main sources to build folder"> |
74 |
|
|
76 |
– |
<property name="prepare.src.dir" value="${src.dir}"/> |
77 |
– |
|
75 |
|
<mkdir dir="${build.classes.dir}"/> |
76 |
|
|
77 |
|
<javac srcdir="${prepare.src.dir}" |
82 |
|
source="${build.sourcelevel}" |
83 |
|
fork="true"> |
84 |
|
|
85 |
< |
<bootclasspath refid="javac.bootclasspath"/> |
89 |
< |
<compilerarg line="${build.javac.args}"/> |
85 |
> |
<compilerarg line="${build.args}"/> |
86 |
|
|
87 |
|
</javac> |
88 |
|
|
89 |
|
</target> |
90 |
|
|
91 |
|
|
96 |
– |
<target name="jar" |
97 |
– |
depends="configure-emulation, init-jar, native-jar, emulation-jar" |
98 |
– |
description="Builds library jar from compiled sources"/> |
99 |
– |
|
100 |
– |
|
101 |
– |
<target name="test" |
102 |
– |
depends="init, configure-tests, report-tests" |
103 |
– |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
104 |
– |
|
92 |
|
|
93 |
< |
<target name="checkstyle" |
94 |
< |
depends="filter-src" |
95 |
< |
description="Reports on style errors in Java source (verbose, mostly chaff)"> |
93 |
> |
<target name="jar" |
94 |
> |
depends="compile" |
95 |
> |
description="Builds library jar from compiled sources"> |
96 |
|
|
97 |
< |
<taskdef resource="checkstyletask.properties" |
111 |
< |
classpath="${lib.dir}/checkstyle-all-2.4.jar"/> |
97 |
> |
<mkdir dir="${build.lib.dir}"/> |
98 |
|
|
99 |
< |
<checkstyle> |
100 |
< |
<formatter type="plain"/> <!-- also available: type="xml" --> |
101 |
< |
<fileset dir="${build.filter.src.dir}" includes="**/*.java"/> |
116 |
< |
</checkstyle> |
99 |
> |
<jar destfile="${product.jar}"> |
100 |
> |
<fileset dir="${build.classes.dir}"/> |
101 |
> |
</jar> |
102 |
|
|
103 |
|
</target> |
104 |
|
|
105 |
|
|
121 |
– |
<target name="doccheck" |
122 |
– |
depends="filter-src" |
123 |
– |
description="Reports on javadoc style errors (not working yet)"> |
106 |
|
|
107 |
< |
<delete dir="${build.doccheck.dir}"/> |
108 |
< |
<mkdir dir="${build.doccheck.dir}"/> |
109 |
< |
|
128 |
< |
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
129 |
< |
docletpath="${lib.dir}/doccheck.jar" |
130 |
< |
destdir="${build.doccheck.dir}"> |
131 |
< |
<packageset dir="${build.filter.src.dir}"/> |
132 |
< |
</javadoc> |
107 |
> |
<target name="test" |
108 |
> |
depends="init, configure-tests, report-tests" |
109 |
> |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
110 |
|
|
134 |
– |
</target> |
111 |
|
|
112 |
|
|
113 |
|
<target name="docs" |
138 |
– |
depends="filter-src" |
114 |
|
description="Builds javadocs with custom tags to build folder"> |
115 |
|
|
116 |
|
<delete dir="${build.javadocs.dir}"/> |
119 |
|
<javadoc destdir="${build.javadocs.dir}" |
120 |
|
link="http://java.sun.com/j2se/1.4.1/docs/api" |
121 |
|
overview="${src.dir}/intro.html" |
122 |
< |
source="${build.docsourcelevel}"> |
122 |
> |
source="${build.sourcelevel}"> |
123 |
|
|
124 |
|
<tag name="revised" description="Last revised:"/> |
125 |
|
<tag name="spec" description="Specified by:"/> |
151 |
– |
<tag name="editor" description="Last edited by:"/> |
152 |
– |
<tag name="fixme" description="FIX ME:"/> |
126 |
|
|
127 |
< |
<packageset dir="${build.filter.src.dir}"/> |
127 |
> |
<packageset dir="${src.dir}"/> |
128 |
|
|
129 |
|
</javadoc> |
130 |
|
|
131 |
|
</target> |
132 |
|
|
133 |
|
|
161 |
– |
<target name="strip" |
162 |
– |
depends="init, configure-compiler" |
163 |
– |
description="Strip generics from java source (not working yet)"> |
164 |
– |
|
165 |
– |
<mkdir dir="${build.stripped.dir}"/> |
166 |
– |
|
167 |
– |
<!-- |
168 |
– |
# javac -s doesn't reliably generate compilable code. It generates |
169 |
– |
# bridge methods (marked as "synthetic") that can have identical |
170 |
– |
# signatures to existing methods except for the return value. |
171 |
– |
--> |
172 |
– |
<javac srcdir="${src.dir}" |
173 |
– |
destdir="${build.stripped.dir}" |
174 |
– |
debug="${build.debug}" |
175 |
– |
debuglevel="${build.debuglevel}" |
176 |
– |
deprecation="${build.deprecation}" |
177 |
– |
source="${build.sourcelevel}" |
178 |
– |
fork="true"> |
134 |
|
|
135 |
< |
<bootclasspath refid="javac.bootclasspath"/> |
136 |
< |
<compilerarg line="${build.javac.args} -s"/> |
135 |
> |
<target name="checkstyle" |
136 |
> |
depends="filter-src" |
137 |
> |
description="Reports on style errors in Java source (verbose, mostly chaff)"> |
138 |
|
|
139 |
< |
</javac> |
139 |
> |
<taskdef resource="checkstyletask.properties" |
140 |
> |
classpath="${lib.dir}/checkstyle-all-3.1.jar"/> |
141 |
> |
|
142 |
> |
<mkdir dir="${build.checkstyle.dir}"/> |
143 |
> |
|
144 |
> |
<checkstyle config="etc/checkstyle/sun_checks.xml" |
145 |
> |
failOnViolation="false"> |
146 |
> |
<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/> |
147 |
> |
<fileset dir="${build.filter.src.dir}" includes="**/*.java"/> |
148 |
> |
</checkstyle> |
149 |
> |
|
150 |
> |
<style in="${build.checkstyle.dir}/checkstyle-report.xml" |
151 |
> |
out="${build.checkstyle.dir}/checkstyle-report.html" |
152 |
> |
style="${stylesheet.dir}/checkstyle-frames.xsl"/> |
153 |
|
|
154 |
|
</target> |
155 |
|
|
156 |
|
|
157 |
+ |
|
158 |
+ |
<target name="doccheck" |
159 |
+ |
depends="filter-doccheck" |
160 |
+ |
description="Reports on javadoc style errors"> |
161 |
+ |
|
162 |
+ |
<delete dir="${build.doccheck.dir}"/> |
163 |
+ |
<mkdir dir="${build.doccheck.dir}"/> |
164 |
+ |
|
165 |
+ |
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
166 |
+ |
docletpath="${lib.dir}/doccheck.jar" |
167 |
+ |
destdir="${build.doccheck.dir}"> |
168 |
+ |
<packageset dir="${build.dc-filter.dir}"/> |
169 |
+ |
</javadoc> |
170 |
+ |
|
171 |
+ |
<echo>DocCheck output is in ${build.doccheck.dir}</echo> |
172 |
+ |
|
173 |
+ |
</target> |
174 |
+ |
|
175 |
+ |
|
176 |
+ |
|
177 |
|
<target name="dist" |
178 |
|
depends="init, dist-clean, dist-jar, dist-docs" |
179 |
|
description="Puts all distributable products in single hierarchy"/> |
180 |
|
|
181 |
|
|
182 |
+ |
|
183 |
+ |
<target name="release" |
184 |
+ |
depends="dist" |
185 |
+ |
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
186 |
+ |
|
187 |
+ |
<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/> |
188 |
+ |
|
189 |
+ |
<jar basedir="${basedir}" destfile="${release.jar}"> |
190 |
+ |
<!-- <exclude name="build/**"/> --> |
191 |
+ |
<exclude name="${release.jar}"/> |
192 |
+ |
<exclude name="user.properties"/> |
193 |
+ |
<exclude name="etc/notes/**"/> |
194 |
+ |
<exclude name="src/emulation/**"/> |
195 |
+ |
<exclude name="**/SyntaxTest.java"/> |
196 |
+ |
<exclude name="**/SuperfluousAbstract.java"/> |
197 |
+ |
</jar> |
198 |
+ |
|
199 |
+ |
</target> |
200 |
+ |
|
201 |
+ |
|
202 |
+ |
|
203 |
|
<target name="clean" |
204 |
|
description="Removes all build products"> |
205 |
|
|
210 |
|
</target> |
211 |
|
|
212 |
|
|
213 |
+ |
|
214 |
|
<target name="dist-clean" |
215 |
|
description="Removes all build and distribution products"> |
216 |
|
|
219 |
|
</target> |
220 |
|
|
221 |
|
|
222 |
+ |
|
223 |
|
<target name="dist-docs" |
212 |
– |
depends="filter-src" |
224 |
|
description="Builds javadocs without custom tags to dist folder"> |
225 |
|
|
226 |
|
<delete dir="${dist.javadocs.dir}"/> |
227 |
|
<mkdir dir="${dist.javadocs.dir}"/> |
228 |
|
|
229 |
|
<javadoc destdir="${dist.javadocs.dir}" |
230 |
< |
link="http://java.sun.com/j2se/1.4.1/docs/api" |
230 |
> |
link="http://java.sun.com/j2se/1.4.2/docs/api" |
231 |
|
overview="${src.dir}/intro.html" |
232 |
< |
source="${build.docsourcelevel}"> |
232 |
> |
source="${build.sourcelevel}"> |
233 |
|
|
234 |
< |
<packageset dir="${build.filter.src.dir}"/> |
234 |
> |
<packageset dir="${src.dir}"/> |
235 |
|
|
236 |
|
</javadoc> |
237 |
|
|
247 |
|
<!-- Version is kept in a separate file --> |
248 |
|
<loadfile property="version" srcFile="version.properties"/> |
249 |
|
<echo>Building JSR-166 version ${version}</echo> |
250 |
< |
|
240 |
< |
</target> |
241 |
< |
|
242 |
< |
|
243 |
< |
<target name="init-jar"> |
244 |
< |
|
245 |
< |
<mkdir dir="${build.lib.dir}"/> |
246 |
< |
|
247 |
< |
</target> |
248 |
< |
|
249 |
< |
|
250 |
< |
<target name="native-jar" |
251 |
< |
depends="compile" |
252 |
< |
unless="build.emulation.true"> |
253 |
< |
|
254 |
< |
<jar destfile="${product.jar}"> |
255 |
< |
<fileset dir="${build.classes.dir}"/> |
256 |
< |
</jar> |
257 |
< |
|
258 |
< |
</target> |
259 |
< |
|
260 |
< |
|
261 |
< |
<target name="compile-emulation" |
262 |
< |
depends="init, configure-compiler" |
263 |
< |
if="build.emulation.true"> |
264 |
< |
|
265 |
< |
<mkdir dir="${build.emulation.dir}"/> |
266 |
< |
|
267 |
< |
<javac srcdir="${emulation.src.dir}" |
268 |
< |
destdir="${build.emulation.dir}" |
269 |
< |
debug="${build.debug}" |
270 |
< |
debuglevel="${build.debuglevel}" |
271 |
< |
deprecation="${build.deprecation}" |
272 |
< |
source="${build.sourcelevel}" |
273 |
< |
fork="true"> |
274 |
< |
|
275 |
< |
<bootclasspath refid="javac.bootclasspath"/> |
276 |
< |
<compilerarg line="${build.javac.args}"/> |
277 |
< |
|
278 |
< |
</javac> |
279 |
< |
|
280 |
< |
</target> |
281 |
< |
|
282 |
< |
|
283 |
< |
<target name="emulation-jar" |
284 |
< |
depends="compile-emulation" |
285 |
< |
if="build.emulation.true"> |
286 |
< |
|
287 |
< |
|
288 |
< |
<jar destfile="${product.jar}" duplicate="add"> |
289 |
< |
<fileset dir="${build.classes.dir}"> |
290 |
< |
<patternset refid="emulation.excludes"/> |
291 |
< |
</fileset> |
292 |
< |
<fileset dir="${build.emulation.dir}"/> |
293 |
< |
</jar> |
250 |
> |
<echo>java.home is ${java.home}</echo> |
251 |
|
|
252 |
|
</target> |
253 |
|
|
284 |
|
</fileset> |
285 |
|
</copy> |
286 |
|
|
330 |
– |
<!-- Not needed now, used for doccheck filtering: |
331 |
– |
<property name="generic.declarations" |
332 |
– |
value="public interface E {} public interface T {} public interface K {} public interface V {}" |
333 |
– |
/> |
334 |
– |
--> |
335 |
– |
|
287 |
|
<copy todir="${build.filter.src.dir}"> |
288 |
|
<fileset dir="${src.dir}"> |
289 |
|
<exclude name="**/*.html"/> |
290 |
< |
<patternset refid="emulation.excludes"/> |
290 |
> |
<!-- Files excluded from dist-docs --> |
291 |
> |
<exclude name="java/util/Random.*"/> |
292 |
> |
<exclude name="sun/misc/Unsafe.*"/> |
293 |
|
</fileset> |
294 |
+ |
<!-- |
295 |
|
<filterchain> |
296 |
+ |
--> |
297 |
|
|
298 |
|
<!-- |
299 |
|
# This filter gets rid of angle-bracketed type parameters |
307 |
|
# tweaking.) |
308 |
|
--> |
309 |
|
|
310 |
+ |
<!-- |
311 |
|
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
312 |
|
classpath="${build.ant.dir}"> |
313 |
|
<param name="notmatching" value="^\s+\*\s.*$"/> |
314 |
|
<param name="pattern" value="<[^|>()]+?>+"/> |
315 |
|
<param name="replacement" value=" "/> |
316 |
|
</filterreader> |
317 |
+ |
--> |
318 |
|
|
319 |
+ |
<!-- |
320 |
+ |
</filterchain> |
321 |
+ |
--> |
322 |
+ |
</copy> |
323 |
|
|
324 |
< |
<!-- |
364 |
< |
# This filter uncomments lines beginning with "//@" so that |
365 |
< |
# javadoc can see imports that are needed to resolve links |
366 |
< |
# but that shouldn't be in the compiled code. |
367 |
< |
--> |
324 |
> |
</target> |
325 |
|
|
369 |
– |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
370 |
– |
classpath="${build.ant.dir}"> |
371 |
– |
<param name="matching" value="^//@.*$"/> |
372 |
– |
<param name="pattern" value="^//@"/> |
373 |
– |
<param name="replacement" value=""/> |
374 |
– |
</filterreader> |
326 |
|
|
327 |
+ |
<target name="filter-doccheck" |
328 |
+ |
depends="filter-src"> |
329 |
|
|
330 |
+ |
<mkdir dir="${build.dc-filter.dir}"/> |
331 |
+ |
|
332 |
+ |
<copy todir="${build.dc-filter.dir}"> |
333 |
+ |
<fileset dir="${build.filter.src.dir}"> |
334 |
+ |
<include name="**/*.html"/> |
335 |
+ |
</fileset> |
336 |
+ |
</copy> |
337 |
+ |
|
338 |
+ |
<property name="generic.declarations" |
339 |
+ |
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 {}" |
340 |
+ |
/> |
341 |
+ |
|
342 |
+ |
<copy todir="${build.dc-filter.dir}"> |
343 |
+ |
<fileset dir="${build.filter.src.dir}"> |
344 |
+ |
<exclude name="**/*.html"/> |
345 |
+ |
</fileset> |
346 |
+ |
<filterchain> |
347 |
|
<!-- |
348 |
< |
# The next two filters try to make the source look like |
348 |
> |
# These two filters try to make the source look like |
349 |
|
# something that doccheck can process. The first removes |
350 |
|
# -source 1.4 assertions and the second adds in a bunch |
351 |
|
# of single letter public nested marker interfaces so that |
352 |
|
# the generic type parameters are recognized. |
383 |
– |
# |
384 |
– |
# Currently commented out because doccheck doesn't work. :-( |
353 |
|
--> |
354 |
|
|
387 |
– |
<!-- |
355 |
|
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
356 |
|
classpath="${build.ant.dir}"> |
357 |
|
<param name="matching" value="^\s*assert[\s ].*$"/> |
361 |
|
|
362 |
|
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
363 |
|
classpath="${build.ant.dir}"> |
364 |
< |
<param name="matching" value="^(.*(class|interface|implements) .*|)\{.*$"/> |
364 |
> |
<param name="matching" value="^([^*]*(class|interface|implements) .*|)\{.*$"/> |
365 |
|
<param name="pattern" value="$"/> |
366 |
|
<param name="replacement" value=" ${generic.declarations}"/> |
367 |
|
</filterreader> |
401 |
– |
--> |
368 |
|
|
369 |
|
</filterchain> |
370 |
|
</copy> |
377 |
|
|
378 |
|
<mkdir dir="${build.testcases.dir}"/> |
379 |
|
|
380 |
< |
<javac srcdir="${test.src.dir}" |
380 |
> |
<javac srcdir="${test.src.dir}/tck" |
381 |
|
destdir="${build.testcases.dir}" |
382 |
|
debug="${build.debug}" |
383 |
|
debuglevel="${build.debuglevel}" |
385 |
|
source="${build.sourcelevel}" |
386 |
|
fork="true"> |
387 |
|
|
388 |
+ |
<compilerarg value="${bootclasspath.args}"/> |
389 |
+ |
<compilerarg line="${build.args}"/> |
390 |
+ |
|
391 |
|
<classpath refid="test.classpath"/> |
423 |
– |
<bootclasspath refid="javac.bootclasspath"/> |
424 |
– |
<compilerarg line="${build.javac.args}"/> |
392 |
|
|
393 |
|
</javac> |
394 |
|
|
410 |
|
dir="${build.reports.dir}" |
411 |
|
fork="true"> |
412 |
|
|
413 |
< |
<jvmarg value="${test.bootclasspath.arg}"/> |
413 |
> |
<jvmarg value="${bootclasspath.args}"/> |
414 |
> |
|
415 |
> |
<classpath refid="test.classpath"/> |
416 |
|
|
417 |
|
<formatter type="xml"/> |
418 |
|
|
419 |
|
<batchtest todir="${build.reports.dir}"> |
420 |
< |
<fileset dir="${test.src.dir}"> |
421 |
< |
<include name="**/${testcase}Test.java"/> |
420 |
> |
<fileset dir="${test.src.dir}/tck"> |
421 |
> |
<include name="${testcase}Test.java"/> |
422 |
|
</fileset> |
423 |
|
</batchtest> |
424 |
|
|
430 |
|
<target name="report-tests" |
431 |
|
depends="run-tests"> |
432 |
|
|
433 |
< |
<!-- Sets junit.report.format to frames if Xalan is present, |
433 |
> |
<!-- Sets junit.report.format to frames if redirection is present, |
434 |
|
otherwise sets it to noframes. --> |
435 |
|
<available property="junit.report.format" |
436 |
|
value="frames" |
455 |
|
|
456 |
|
<target name="configure-compiler"> |
457 |
|
|
458 |
< |
<property name="gjc.version" |
490 |
< |
value="2.0"/> |
491 |
< |
|
492 |
< |
<condition property="build.novariance" value="-novariance"> |
493 |
< |
<and> |
494 |
< |
<equals arg1="${gjc.version}" arg2="2.0"/> |
495 |
< |
<or> |
496 |
< |
<not><isset property="gjc.novariance"/></not> |
497 |
< |
<istrue value="${gjc.novariance}"/> |
498 |
< |
</or> |
499 |
< |
</and> |
500 |
< |
</condition> |
501 |
< |
|
502 |
< |
<property name="build.novariance" |
503 |
< |
value=""/> |
504 |
< |
|
505 |
< |
<property name="gjc.dir" |
506 |
< |
value="${lib.dir}/gjc"/> |
507 |
< |
|
508 |
< |
<property name="javac.jar" |
509 |
< |
location="${gjc.dir}/${gjc.version}/javac.jar"/> |
458 |
> |
<property name="unchecked.option" value="-Xlint:unchecked"/> |
459 |
|
|
460 |
< |
<property name="collect.jar" |
461 |
< |
location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/> |
513 |
< |
|
514 |
< |
|
515 |
< |
<condition property="build.warnunchecked" value="-warnunchecked"> |
516 |
< |
<istrue value="${gjc.warnunchecked}"/> |
460 |
> |
<condition property="warnunchecked.arg" value="${unchecked.option}"> |
461 |
> |
<istrue value="${build.warnunchecked}"/> |
462 |
|
</condition> |
463 |
|
|
464 |
< |
<property name="build.warnunchecked" value=""/> |
465 |
< |
|
464 |
> |
<property name="warnunchecked.arg" value=""/> |
465 |
> |
|
466 |
|
<condition property="prepare.src.dir" value="${build.dir}/prepare-src"> |
467 |
|
<istrue value="${build.nothreads}"/> |
468 |
|
</condition> |
469 |
+ |
|
470 |
+ |
<property name="prepare.src.dir" value="${src.dir}"/> |
471 |
|
|
472 |
|
|
526 |
– |
<!-- |
527 |
– |
! Bootclasspath munging for source compilation. |
528 |
– |
--> |
529 |
– |
|
530 |
– |
<path id="javac.bootclasspath.prefix"> |
531 |
– |
<!-- <pathelement location="${src.dir}"/> --> |
532 |
– |
<pathelement location="${javac.jar}"/> |
533 |
– |
</path> |
534 |
– |
|
535 |
– |
<path id="javac.bootclasspath"> |
536 |
– |
<!-- <pathelement location="${src.dir}"/> --> |
537 |
– |
<pathelement location="${collect.jar}"/> |
538 |
– |
<pathelement location="${rt.jar}"/> |
539 |
– |
</path> |
540 |
– |
|
541 |
– |
<!-- Flatten bootclasspath prefix into a platform-appropriate string --> |
542 |
– |
<property name="javac.bootclasspath.prefix" |
543 |
– |
refid="javac.bootclasspath.prefix"/> |
544 |
– |
|
545 |
– |
<!-- Turn the flattened bootclasspath prefix into a javac argument --> |
546 |
– |
<property name="build.bootclasspath.arg" |
547 |
– |
value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/> |
548 |
– |
|
549 |
– |
<!-- Flatten bootclasspath for trace message --> |
550 |
– |
<property name="javac.bootclasspath" |
551 |
– |
refid="javac.bootclasspath"/> |
552 |
– |
|
473 |
|
<!-- Common options in javac invocations --> |
474 |
< |
<property name="build.javac.args" |
555 |
< |
value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/> |
556 |
< |
|
557 |
< |
<echo>javac ${build.javac.args}</echo> |
558 |
< |
<echo>bootclasspath=${javac.bootclasspath}</echo> |
474 |
> |
<property name="build.args" value="${warnunchecked.arg}"/> |
475 |
|
|
476 |
|
</target> |
477 |
|
|
490 |
|
</target> |
491 |
|
|
492 |
|
|
493 |
< |
<target name="configure-emulation"> |
494 |
< |
|
579 |
< |
<condition property="build.emulation.true"> |
580 |
< |
<or> |
581 |
< |
<and> |
582 |
< |
<os family="windows"/> |
583 |
< |
<not> |
584 |
< |
<isset property="build.emulation"/> |
585 |
< |
</not> |
586 |
< |
</and> |
587 |
< |
<istrue value="${build.emulation}"/> |
588 |
< |
</or> |
589 |
< |
</condition> |
590 |
< |
|
591 |
< |
</target> |
592 |
< |
|
593 |
< |
|
594 |
< |
<target name="configure-tests"> |
493 |
> |
<target name="configure-tests" |
494 |
> |
depends="configure-compiler"> |
495 |
|
|
496 |
|
<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 --> |
497 |
|
<available property="junit.available" |
498 |
|
classname="junit.framework.Protectable"/> |
499 |
|
|
500 |
+ |
<!-- Xalan --> |
501 |
+ |
<available property="xalan.available" |
502 |
+ |
classname="org.apache.xalan.Version"/> |
503 |
+ |
|
504 |
+ |
|
505 |
+ |
<!-- Ant 1.6beta and later don't need or want this check --> |
506 |
+ |
<!-- |
507 |
|
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
508 |
|
unless="junit.available"/> |
509 |
|
|
510 |
< |
|
511 |
< |
<!-- |
512 |
< |
! Bootclasspath munging for testing, so JUnit can test our local |
606 |
< |
! modifications to java.*. |
607 |
< |
--> |
608 |
< |
|
609 |
< |
<path id="test.classpath"> |
610 |
< |
<pathelement location="${product.jar}"/> |
611 |
< |
<pathelement location="${build.testcases.dir}"/> |
612 |
< |
<pathelement location="${junit.jar}"/> |
613 |
< |
</path> |
614 |
< |
|
615 |
< |
<!-- Flatten test classpath into a platform-appropriate string --> |
616 |
< |
<property name="test.classpath" refid="test.classpath"/> |
617 |
< |
|
618 |
< |
<!-- Turn the flattened test classpath into a javac argument --> |
619 |
< |
<property name="test.bootclasspath.arg" |
620 |
< |
value='-Xbootclasspath/p:${test.classpath}'/> |
510 |
> |
<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests" |
511 |
> |
unless="xalan.available"/> |
512 |
> |
--> |
513 |
|
|
514 |
|
</target> |
515 |
|
|
517 |
|
|
518 |
|
<!-- Anthill targets --> |
519 |
|
|
520 |
< |
<target name="anthill-build" |
520 |
> |
<target name="anthill-build"> |
521 |
> |
|
522 |
> |
<!-- Override this in user.properties --> |
523 |
> |
<property name="tiger.home" location="e:/j2sdk1.5.0"/> |
524 |
> |
|
525 |
> |
<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java"> |
526 |
> |
<arg value="-Xmx256000000"/> |
527 |
> |
<!-- classpath of new JVM --> |
528 |
> |
<arg value="-classpath"/> <arg path="${java.class.path}"/> |
529 |
> |
<!-- location of Ant home directory --> |
530 |
> |
<arg value="-Dant.home=${ant.home}"/> |
531 |
> |
<!-- the Ant main class --> |
532 |
> |
<arg value="org.apache.tools.ant.Main"/> |
533 |
> |
<!-- The build file --> |
534 |
> |
<arg value="-buildfile"/> <arg value="build.xml"/> |
535 |
> |
<!-- the target to build on the new Ant instance --> |
536 |
> |
<arg value="-DJAVA_HOME=${tiger.home}"/> |
537 |
> |
<arg value="do-anthill-build"/> |
538 |
> |
</exec> |
539 |
> |
</target> |
540 |
> |
|
541 |
> |
<target name="do-anthill-build" |
542 |
|
depends="jar, test, docs, dist-docs"/> |
543 |
|
|
544 |
|
<target name="anthill-publish"> |
561 |
|
</target> |
562 |
|
|
563 |
|
|
564 |
+ |
|
565 |
+ |
<!-- Backward compatibility, work in progress --> |
566 |
+ |
|
567 |
+ |
|
568 |
+ |
<target name="compat" depends="jar"> |
569 |
+ |
|
570 |
+ |
<mkdir dir="${build.testcases.dir}"/> |
571 |
+ |
|
572 |
+ |
<javac srcdir="${test.src.dir}" |
573 |
+ |
destdir="${build.testcases.dir}" |
574 |
+ |
debug="${build.debug}" |
575 |
+ |
debuglevel="${build.debuglevel}" |
576 |
+ |
deprecation="${build.deprecation}" |
577 |
+ |
source="${build.sourcelevel}" |
578 |
+ |
fork="true"> |
579 |
+ |
|
580 |
+ |
<compilerarg value="${bootclasspath.args}"/> |
581 |
+ |
<compilerarg line="${build.args}"/> |
582 |
+ |
|
583 |
+ |
<classpath refid="test.classpath"/> |
584 |
+ |
|
585 |
+ |
<include name="Compatibility.java"/> |
586 |
+ |
|
587 |
+ |
</javac> |
588 |
+ |
|
589 |
+ |
|
590 |
+ |
<java classname="Compatibility" fork="true"> |
591 |
+ |
<jvmarg value="${bootclasspath.args}"/> |
592 |
+ |
<classpath refid="test.classpath"/> |
593 |
+ |
</java> |
594 |
+ |
</target> |
595 |
+ |
|
596 |
+ |
|
597 |
+ |
|
598 |
+ |
<property name="pretiger.src.dir" location="${build.dir}/pretiger/src"/> |
599 |
+ |
<property name="build.pretiger.dir" location="${build.dir}/pretiger/classes"/> |
600 |
+ |
<property name="pretiger.jar" location="${build.lib.dir}/jsr166-pretiger.jar"/> |
601 |
+ |
<property name="pretiger.sourcelevel" value="1.4"/> |
602 |
+ |
|
603 |
+ |
<target name="defang" |
604 |
+ |
depends="init" |
605 |
+ |
description="Generates pre-Tiger compatible source"> |
606 |
+ |
|
607 |
+ |
<delete dir="${pretiger.src.dir}"/> |
608 |
+ |
<mkdir dir="${pretiger.src.dir}"/> |
609 |
+ |
|
610 |
+ |
<exec executable="perl"> |
611 |
+ |
<arg file="etc/defang.pl"/> |
612 |
+ |
<!-- <arg value="-v"/> --> |
613 |
+ |
<arg value="-s"/> <arg file="${src.dir}"/> |
614 |
+ |
<arg value="-t"/> <arg file="${pretiger.src.dir}"/> |
615 |
+ |
</exec> |
616 |
+ |
|
617 |
+ |
</target> |
618 |
+ |
|
619 |
+ |
<target name="compile-pretiger" |
620 |
+ |
depends="init, configure-compiler, defang" |
621 |
+ |
description="Compiles pre-Tiger sources to build folder"> |
622 |
+ |
|
623 |
+ |
<mkdir dir="${build.pretiger.dir}"/> |
624 |
+ |
|
625 |
+ |
<javac srcdir="${pretiger.src.dir}" |
626 |
+ |
destdir="${build.pretiger.dir}" |
627 |
+ |
debug="${build.debug}" |
628 |
+ |
debuglevel="${build.debuglevel}" |
629 |
+ |
deprecation="${build.deprecation}" |
630 |
+ |
source="${pretiger.sourcelevel}" |
631 |
+ |
fork="true"> |
632 |
+ |
|
633 |
+ |
<compilerarg line="${build.args}"/> |
634 |
+ |
<exclude name="**/Thread.java"/> |
635 |
+ |
|
636 |
+ |
</javac> |
637 |
+ |
|
638 |
+ |
</target> |
639 |
+ |
|
640 |
+ |
<target name="pretiger" depends="compile-pretiger"> |
641 |
+ |
|
642 |
+ |
<mkdir dir="${build.lib.dir}"/> |
643 |
+ |
|
644 |
+ |
<jar destfile="${pretiger.jar}"> |
645 |
+ |
<fileset dir="${build.pretiger.dir}"> |
646 |
+ |
</fileset> |
647 |
+ |
</jar> |
648 |
+ |
|
649 |
+ |
</target> |
650 |
+ |
|
651 |
|
</project> |