21 |
|
|
22 |
|
|
23 |
|
<!-- Compilation options --> |
24 |
< |
<property name="build.sourcelevel" value="1.5"/> |
25 |
< |
<property name="build.docsourcelevel" value="1.4"/> |
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.emulation.dir" location="${build.dir}/emulation"/> |
33 |
< |
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
34 |
< |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
35 |
< |
<property name="build.ant.dir" location="${build.dir}/ant"/> |
36 |
< |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
37 |
< |
<property name="build.stripped.dir" location="${build.dir}/stripped"/> |
38 |
< |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
39 |
< |
<property name="build.doccheck.dir" location="${build.dir}/doccheck"/> |
40 |
< |
<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/> |
41 |
< |
<property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/> |
30 |
> |
<property name="build.dir" location="build"/> |
31 |
> |
<property name="build.classes.dir" location="${build.dir}/classes"/> |
32 |
> |
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
33 |
> |
<property name="build.loops.dir" location="${build.dir}/loops"/> |
34 |
> |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
35 |
> |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
36 |
> |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
37 |
> |
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
38 |
> |
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
39 |
> |
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
40 |
> |
|
41 |
> |
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
42 |
> |
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
43 |
> |
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
44 |
> |
|
45 |
> |
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
46 |
> |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
47 |
> |
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
48 |
|
|
49 |
|
<!-- Source locations --> |
50 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
46 |
– |
<property name="emulation.src.dir" location="${basedir}/src/emulation"/> |
51 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
52 |
< |
<property name="ant.src.dir" location="${basedir}/etc/ant"/> |
53 |
< |
<property name="stylesheet.dir" location="${basedir}/etc/xsl"/> |
52 |
> |
<property name="loops.src.dir" location="${basedir}/src/loops"/> |
53 |
> |
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
54 |
> |
<property name="jtreg.src.dir" location="${test.src.dir}/jtreg"/> |
55 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
56 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
57 |
< |
|
57 |
> |
<property name="topsrc.dir" location="${basedir}/src"/> |
58 |
> |
<property name="jsr166xsrc.dir" location="${basedir}/src/jsr166x"/> |
59 |
> |
<property name="jsr166ysrc.dir" location="${basedir}/src/jsr166y"/> |
60 |
> |
<property name="extra166ysrc.dir" location="${basedir}/src/extra166y"/> |
61 |
> |
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
62 |
|
<!-- Distribution locations --> |
63 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
63 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
64 |
> |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
65 |
> |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
66 |
> |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
67 |
|
|
68 |
|
<!-- Jar locations --> |
69 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
70 |
+ |
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
71 |
+ |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
72 |
+ |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
73 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
59 |
– |
<property name="rt.jar" location="${java.home}/lib/rt.jar"/> |
60 |
– |
|
61 |
– |
|
74 |
|
|
75 |
< |
<!-- Files excluded from dist-docs and emulation jar --> |
76 |
< |
<patternset id="unsafe.exclusion"> |
65 |
< |
<exclude name="java/util/Random.*"/> |
66 |
< |
<exclude name="sun/misc/Unsafe.*"/> |
67 |
< |
</patternset> |
68 |
< |
|
69 |
< |
<!-- Files excludes from emulation jar --> |
70 |
< |
<patternset id="atomic.exclusion"> |
71 |
< |
<exclude name="java/util/concurrent/atomic/AtomicBoolean*"/> |
72 |
< |
<exclude name="java/util/concurrent/atomic/AtomicInteger*"/> |
73 |
< |
<exclude name="java/util/concurrent/atomic/AtomicLong*"/> |
74 |
< |
<exclude name="java/util/concurrent/atomic/AtomicReference*"/> |
75 |
< |
</patternset> |
75 |
> |
<!-- Bootclasspath argument --> |
76 |
> |
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
77 |
|
|
78 |
+ |
<!-- Test classpath --> |
79 |
+ |
<path id="test.classpath"> |
80 |
+ |
<pathelement location="${build.testcases.dir}"/> |
81 |
+ |
<pathelement location="${junit.jar}"/> |
82 |
+ |
</path> |
83 |
+ |
|
84 |
+ |
<!-- ALoops classpath --> |
85 |
+ |
<path id="loops.classpath"> |
86 |
+ |
<pathelement location="${build.loops.dir}"/> |
87 |
+ |
</path> |
88 |
|
|
89 |
|
|
90 |
|
<!-- Main targets --> |
91 |
|
|
92 |
+ |
<target name="dists" |
93 |
+ |
depends="dist, jsr166xdist, jsr166ydist, extra166ydist" |
94 |
+ |
description="Builds all public jars and docs"/> |
95 |
+ |
|
96 |
|
<target name="compile" |
97 |
< |
depends="init, configure-compiler, prepare-src" |
97 |
> |
depends="init, configure-compiler" |
98 |
|
description="Compiles main sources to build folder"> |
99 |
|
|
85 |
– |
<property name="prepare.src.dir" value="${src.dir}"/> |
86 |
– |
|
100 |
|
<mkdir dir="${build.classes.dir}"/> |
101 |
|
|
102 |
< |
<!-- |
90 |
< |
<echo>javac ${gjc.args}</echo> |
91 |
< |
<echo>bootclasspath=${compile.bootclasspath}</echo> |
92 |
< |
--> |
93 |
< |
|
94 |
< |
<javac srcdir="${prepare.src.dir}" |
102 |
> |
<javac srcdir="${src.dir}" |
103 |
|
destdir="${build.classes.dir}" |
104 |
|
debug="${build.debug}" |
105 |
|
debuglevel="${build.debuglevel}" |
107 |
|
source="${build.sourcelevel}" |
108 |
|
fork="true"> |
109 |
|
|
110 |
< |
<compilerarg line="${gjc.args}"/> |
111 |
< |
<bootclasspath refid="compile.bootclasspath"/> |
110 |
> |
<include name="**/*.java"/> |
111 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
112 |
> |
|
113 |
> |
<!-- |
114 |
> |
<exclude name="java/lang/**"/> |
115 |
> |
<compilerarg line="${build.args}"/> |
116 |
> |
<compilerarg line="-Xlint -Xmaxwarns 1000"/> |
117 |
> |
--> |
118 |
|
|
119 |
|
</javac> |
120 |
|
|
121 |
|
</target> |
122 |
|
|
123 |
|
|
110 |
– |
<target name="jar" |
111 |
– |
depends="configure-emulation, init-jar, native-jar, emulation-jar" |
112 |
– |
description="Builds library jar from compiled sources"/> |
113 |
– |
|
114 |
– |
|
115 |
– |
<target name="test" |
116 |
– |
depends="init, configure-tests, report-tests" |
117 |
– |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
124 |
|
|
125 |
+ |
<target name="jar" |
126 |
+ |
depends="compile" |
127 |
+ |
description="Builds library jar from compiled sources"> |
128 |
|
|
129 |
< |
<target name="checkstyle" |
121 |
< |
depends="filter-src" |
122 |
< |
description="Reports on style errors in Java source (verbose, mostly chaff)"> |
123 |
< |
|
124 |
< |
<taskdef resource="checkstyletask.properties" |
125 |
< |
classpath="${lib.dir}/checkstyle-all-2.4.jar"/> |
129 |
> |
<mkdir dir="${build.lib.dir}"/> |
130 |
|
|
131 |
< |
<checkstyle> |
132 |
< |
<formatter type="plain"/> <!-- also available: type="xml" --> |
133 |
< |
<fileset dir="${build.filter.src.dir}" includes="**/*.java"/> |
130 |
< |
</checkstyle> |
131 |
> |
<jar destfile="${product.jar}"> |
132 |
> |
<fileset dir="${build.classes.dir}"/> |
133 |
> |
</jar> |
134 |
|
|
135 |
|
</target> |
136 |
|
|
137 |
|
|
135 |
– |
<target name="doccheck" |
136 |
– |
depends="filter-doccheck" |
137 |
– |
description="Reports on javadoc style errors"> |
138 |
|
|
139 |
< |
<delete dir="${build.doccheck.dir}"/> |
140 |
< |
<mkdir dir="${build.doccheck.dir}"/> |
141 |
< |
|
142 |
< |
<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck" |
143 |
< |
docletpath="${lib.dir}/doccheck.jar" |
144 |
< |
destdir="${build.doccheck.dir}"> |
145 |
< |
<packageset dir="${build.filter.doccheck.dir}"/> |
146 |
< |
</javadoc> |
147 |
< |
|
148 |
< |
<echo>DocCheck output is in ${build.doccheck.dir}</echo> |
139 |
> |
<target name="test" |
140 |
> |
depends="init, configure-tests, report-tests" |
141 |
> |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
142 |
|
|
150 |
– |
</target> |
143 |
|
|
144 |
|
|
145 |
|
<target name="docs" |
154 |
– |
depends="filter-src" |
146 |
|
description="Builds javadocs with custom tags to build folder"> |
147 |
|
|
148 |
|
<delete dir="${build.javadocs.dir}"/> |
149 |
|
<mkdir dir="${build.javadocs.dir}"/> |
150 |
|
|
151 |
|
<javadoc destdir="${build.javadocs.dir}" |
152 |
< |
link="http://java.sun.com/j2se/1.4.1/docs/api" |
152 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
153 |
|
overview="${src.dir}/intro.html" |
154 |
< |
source="${build.docsourcelevel}"> |
155 |
< |
|
165 |
< |
<tag name="revised" description="Last revised:"/> |
166 |
< |
<tag name="spec" description="Specified by:"/> |
167 |
< |
<tag name="editor" description="Last edited by:"/> |
168 |
< |
<tag name="fixme" description="FIX ME:"/> |
154 |
> |
sourcepath="${src.dir}:${jdksrc.dir}" |
155 |
> |
> |
156 |
|
|
157 |
< |
<packageset dir="${build.filter.src.dir}"/> |
157 |
> |
<packageset dir="${src.dir}"/> |
158 |
|
|
159 |
|
</javadoc> |
160 |
|
|
161 |
|
</target> |
162 |
|
|
163 |
|
|
177 |
– |
<target name="strip" |
178 |
– |
depends="init, configure-compiler" |
179 |
– |
description="Strip generics from java source (not working yet)"> |
180 |
– |
|
181 |
– |
<mkdir dir="${build.stripped.dir}"/> |
182 |
– |
|
183 |
– |
<!-- |
184 |
– |
# javac -s doesn't reliably generate compilable code. It generates |
185 |
– |
# bridge methods (marked as "synthetic") that can have identical |
186 |
– |
# signatures to existing methods except for the return value. |
187 |
– |
--> |
188 |
– |
<javac srcdir="${src.dir}" |
189 |
– |
destdir="${build.stripped.dir}" |
190 |
– |
debug="${build.debug}" |
191 |
– |
debuglevel="${build.debuglevel}" |
192 |
– |
deprecation="${build.deprecation}" |
193 |
– |
source="${build.sourcelevel}" |
194 |
– |
fork="true"> |
195 |
– |
|
196 |
– |
<compilerarg line="${gjc.args} -s"/> |
197 |
– |
<bootclasspath refid="compile.bootclasspath"/> |
198 |
– |
|
199 |
– |
</javac> |
200 |
– |
|
201 |
– |
</target> |
202 |
– |
|
164 |
|
|
165 |
|
<target name="dist" |
166 |
|
depends="init, dist-clean, dist-jar, dist-docs" |
167 |
|
description="Puts all distributable products in single hierarchy"/> |
168 |
|
|
169 |
+ |
|
170 |
|
<target name="release" |
171 |
|
depends="dist" |
172 |
|
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
173 |
|
|
212 |
– |
<!-- |
213 |
– |
#keep build dir? - dl |
214 |
– |
<delete dir="${build.dir}"/> |
215 |
– |
--> |
174 |
|
<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/> |
175 |
|
|
176 |
|
<jar basedir="${basedir}" destfile="${release.jar}"> |
177 |
+ |
<!-- <exclude name="build/**"/> --> |
178 |
|
<exclude name="${release.jar}"/> |
179 |
|
<exclude name="user.properties"/> |
180 |
|
<exclude name="etc/notes/**"/> |
181 |
< |
<exclude name="lib/gjc/2.1/**"/> |
181 |
> |
<exclude name="src/emulation/**"/> |
182 |
|
<exclude name="**/SyntaxTest.java"/> |
183 |
+ |
<exclude name="**/SuperfluousAbstract.java"/> |
184 |
|
</jar> |
185 |
|
|
186 |
|
</target> |
187 |
|
|
188 |
+ |
|
189 |
+ |
|
190 |
|
<target name="clean" |
191 |
|
description="Removes all build products"> |
192 |
|
|
197 |
|
</target> |
198 |
|
|
199 |
|
|
200 |
+ |
|
201 |
|
<target name="dist-clean" |
202 |
|
description="Removes all build and distribution products"> |
203 |
|
|
206 |
|
</target> |
207 |
|
|
208 |
|
|
209 |
+ |
|
210 |
|
<target name="dist-docs" |
247 |
– |
depends="filter-src" |
211 |
|
description="Builds javadocs without custom tags to dist folder"> |
212 |
|
|
213 |
|
<delete dir="${dist.javadocs.dir}"/> |
214 |
|
<mkdir dir="${dist.javadocs.dir}"/> |
215 |
|
|
216 |
|
<javadoc destdir="${dist.javadocs.dir}" |
217 |
< |
link="http://java.sun.com/j2se/1.4.1/docs/api" |
217 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
218 |
|
overview="${src.dir}/intro.html" |
256 |
– |
source="${build.docsourcelevel}"> |
257 |
– |
|
258 |
– |
<packageset dir="${build.filter.src.dir}"/> |
219 |
|
|
220 |
+ |
sourcepath="${src.dir}:${jdksrc.dir}" |
221 |
+ |
> |
222 |
+ |
<!-- |
223 |
+ |
<packageset dir="${src.dir}" defaultexcludes="yes"> |
224 |
+ |
<include name="java/util/concurrent"/> |
225 |
+ |
<include name="java/util/concurrent/atomic"/> |
226 |
+ |
<include name="java/util/concurrent/locks"/> |
227 |
+ |
</packageset> |
228 |
+ |
--> |
229 |
+ |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
230 |
+ |
<include name="main/java/util/concurrent/*.java"/> |
231 |
+ |
<include name="main/java/util/concurrent/atomic/*.java"/> |
232 |
+ |
<include name="main/java/util/concurrent/locks/*.java"/> |
233 |
+ |
<include name="main/java/util/*.java"/> |
234 |
+ |
<!-- |
235 |
+ |
<include name="main/java/util/concurrent/*.html"/> |
236 |
+ |
<include name="main/java/util/concurrent/atomic/*.html"/> |
237 |
+ |
<include name="main/java/util/concurrent/locks/*.html"/> |
238 |
+ |
<include name="main/java/util/*.html"/> |
239 |
+ |
--> |
240 |
+ |
<!-- <include name="jsr166x/*.java"/> --> |
241 |
+ |
</fileset> |
242 |
|
</javadoc> |
243 |
|
|
244 |
|
</target> |
253 |
|
<!-- Version is kept in a separate file --> |
254 |
|
<loadfile property="version" srcFile="version.properties"/> |
255 |
|
<echo>Building JSR-166 version ${version}</echo> |
256 |
+ |
<echo>java.home is ${java.home}</echo> |
257 |
|
|
258 |
|
</target> |
259 |
|
|
260 |
|
|
261 |
< |
<target name="init-jar"> |
261 |
> |
<target name="dist-jar" |
262 |
> |
depends="clean, jar"> |
263 |
|
|
264 |
< |
<mkdir dir="${build.lib.dir}"/> |
264 |
> |
<copy file="${product.jar}" todir="${dist.dir}"/> |
265 |
|
|
266 |
|
</target> |
267 |
|
|
268 |
|
|
269 |
< |
<target name="native-jar" |
270 |
< |
depends="compile" |
287 |
< |
unless="build.emulation.true"> |
269 |
> |
<target name="compile-tests" |
270 |
> |
depends="jar"> |
271 |
|
|
272 |
< |
<jar destfile="${product.jar}"> |
290 |
< |
<fileset dir="${build.classes.dir}"/> |
291 |
< |
</jar> |
272 |
> |
<mkdir dir="${build.testcases.dir}"/> |
273 |
|
|
274 |
< |
</target> |
274 |
> |
<javac srcdir="${tck.src.dir}" |
275 |
> |
destdir="${build.testcases.dir}" |
276 |
> |
debug="${build.debug}" |
277 |
> |
debuglevel="${build.debuglevel}" |
278 |
> |
deprecation="${build.deprecation}" |
279 |
> |
source="${build.sourcelevel}" |
280 |
> |
fork="true"> |
281 |
|
|
282 |
+ |
<compilerarg value="${bootclasspath.args}"/> |
283 |
+ |
<compilerarg line="${build.args}"/> |
284 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
285 |
|
|
286 |
< |
<target name="compile-emulation" |
297 |
< |
depends="init, configure-compiler" |
298 |
< |
if="build.emulation.true"> |
286 |
> |
<classpath refid="test.classpath"/> |
287 |
|
|
288 |
< |
<mkdir dir="${build.emulation.dir}"/> |
288 |
> |
</javac> |
289 |
|
|
290 |
< |
<javac srcdir="${emulation.src.dir}" |
291 |
< |
destdir="${build.emulation.dir}" |
290 |
> |
<javac srcdir="${test.src.dir}" |
291 |
> |
destdir="${build.testcases.dir}" |
292 |
|
debug="${build.debug}" |
293 |
|
debuglevel="${build.debuglevel}" |
294 |
|
deprecation="${build.deprecation}" |
295 |
|
source="${build.sourcelevel}" |
296 |
|
fork="true"> |
297 |
|
|
298 |
< |
<compilerarg line="${gjc.args}"/> |
299 |
< |
<bootclasspath refid="compile.bootclasspath"/> |
298 |
> |
<include name="jsr166/test/**"/> |
299 |
> |
|
300 |
> |
<compilerarg value="${bootclasspath.args}"/> |
301 |
> |
<compilerarg line="${build.args}"/> |
302 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
303 |
> |
|
304 |
> |
<classpath refid="test.classpath"/> |
305 |
|
|
306 |
|
</javac> |
307 |
|
|
308 |
+ |
<!-- |
309 |
+ |
<javac srcdir="${jtreg.src.dir}" |
310 |
+ |
destdir="${build.testcases.dir}" |
311 |
+ |
debug="${build.debug}" |
312 |
+ |
debuglevel="${build.debuglevel}" |
313 |
+ |
deprecation="${build.deprecation}" |
314 |
+ |
source="${build.sourcelevel}" |
315 |
+ |
fork="true"> |
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 |
+ |
|
323 |
+ |
</javac> |
324 |
+ |
--> |
325 |
+ |
|
326 |
|
</target> |
327 |
|
|
328 |
|
|
329 |
< |
<target name="emulation-jar" |
330 |
< |
depends="compile-emulation" |
320 |
< |
if="build.emulation.true"> |
329 |
> |
<target name="run-tests" |
330 |
> |
depends="compile-tests"> |
331 |
|
|
332 |
+ |
<!-- May be overridden by user.properties --> |
333 |
+ |
<property name="testcase" value="*"/> |
334 |
|
|
335 |
< |
<jar destfile="${product.jar}" duplicate="add"> |
324 |
< |
<fileset dir="${build.classes.dir}"> |
325 |
< |
<patternset refid="atomic.exclusion"/> |
326 |
< |
<patternset refid="unsafe.exclusion"/> |
327 |
< |
</fileset> |
328 |
< |
<fileset dir="${build.emulation.dir}"/> |
329 |
< |
</jar> |
335 |
> |
<mkdir dir="${build.reports.dir}"/> |
336 |
|
|
337 |
< |
</target> |
337 |
> |
<junit printsummary="true" |
338 |
> |
showoutput="true" |
339 |
> |
errorProperty="junit.failed" |
340 |
> |
failureProperty="junit.failed" |
341 |
> |
dir="${build.reports.dir}" |
342 |
> |
fork="true"> |
343 |
|
|
344 |
+ |
<jvmarg value="${bootclasspath.args}"/> |
345 |
+ |
<jvmarg value="-server"/> |
346 |
+ |
<jvmarg value="-showversion"/> |
347 |
|
|
348 |
< |
<target name="dist-jar" |
335 |
< |
depends="clean, jar"> |
348 |
> |
<classpath refid="test.classpath"/> |
349 |
|
|
350 |
< |
<copy file="${product.jar}" todir="${dist.dir}"/> |
350 |
> |
<formatter type="xml"/> |
351 |
|
|
352 |
< |
</target> |
352 |
> |
<batchtest todir="${build.reports.dir}" unless="no.test.tck"> |
353 |
> |
<fileset dir="${tck.src.dir}"> |
354 |
> |
<include name="**/${testcase}Test.java"/> |
355 |
> |
</fileset> |
356 |
> |
</batchtest> |
357 |
|
|
358 |
+ |
<batchtest todir="${build.reports.dir}" if="do.test.old"> |
359 |
+ |
<fileset dir="${test.src.dir}"> |
360 |
+ |
<include name="jsr166/test/**/${testcase}Test.java"/> |
361 |
+ |
</fileset> |
362 |
+ |
</batchtest> |
363 |
|
|
364 |
< |
<target name="compile-ant-filter" |
365 |
< |
depends="init"> |
364 |
> |
<!-- |
365 |
> |
<batchtest todir="${build.reports.dir}" if="do.test.jtreg"> |
366 |
> |
<fileset dir="${jtreg.src.dir}"> |
367 |
> |
<include name="**/${testcase}Test.java"/> |
368 |
> |
</fileset> |
369 |
> |
</batchtest> |
370 |
> |
--> |
371 |
|
|
372 |
< |
<mkdir dir="${build.ant.dir}"/> |
372 |
> |
</junit> |
373 |
> |
|
374 |
> |
</target> |
375 |
|
|
376 |
< |
<javac srcdir="${ant.src.dir}" |
377 |
< |
destdir="${build.ant.dir}" |
378 |
< |
source="1.4" |
376 |
> |
|
377 |
> |
<target name="report-tests" |
378 |
> |
depends="run-tests"> |
379 |
> |
|
380 |
> |
<!-- Sets junit.report.format to frames if redirection is present, |
381 |
> |
otherwise sets it to noframes. --> |
382 |
> |
<available property="junit.report.format" |
383 |
> |
value="frames" |
384 |
> |
classname="org.apache.xalan.lib.Redirect" |
385 |
|
/> |
386 |
+ |
<property name="junit.report.format" value="noframes"/> |
387 |
+ |
|
388 |
+ |
<junitreport todir="${build.reports.dir}"> |
389 |
+ |
<fileset dir="${build.reports.dir}"> |
390 |
+ |
<include name="TEST-*.xml"/> |
391 |
+ |
</fileset> |
392 |
+ |
<report format="${junit.report.format}" todir="${build.reports.dir}" |
393 |
+ |
/> |
394 |
+ |
</junitreport> |
395 |
+ |
|
396 |
+ |
<fail message="Test Cases Failed" if="junit.failed"/> |
397 |
|
|
398 |
|
</target> |
399 |
|
|
400 |
|
|
401 |
< |
<target name="filter-src" |
356 |
< |
depends="compile-ant-filter"> |
401 |
> |
<target name="configure-compiler"> |
402 |
|
|
403 |
< |
<mkdir dir="${build.filter.src.dir}"/> |
403 |
> |
<property name="unchecked.option" value="-Xlint:unchecked"/> |
404 |
|
|
405 |
< |
<copy todir="${build.filter.src.dir}"> |
406 |
< |
<fileset dir="${src.dir}"> |
407 |
< |
<include name="**/*.html"/> |
363 |
< |
</fileset> |
364 |
< |
</copy> |
405 |
> |
<condition property="warnunchecked.arg" value="${unchecked.option}"> |
406 |
> |
<istrue value="${build.warnunchecked}"/> |
407 |
> |
</condition> |
408 |
|
|
409 |
< |
<copy todir="${build.filter.src.dir}"> |
410 |
< |
<fileset dir="${src.dir}"> |
411 |
< |
<exclude name="**/*.html"/> |
412 |
< |
<patternset refid="unsafe.exclusion"/> |
413 |
< |
</fileset> |
414 |
< |
<filterchain> |
409 |
> |
<property name="warnunchecked.arg" value=""/> |
410 |
> |
|
411 |
> |
|
412 |
> |
<!-- Common options in javac invocations --> |
413 |
> |
<property name="build.args" value="${warnunchecked.arg}"/> |
414 |
> |
|
415 |
> |
</target> |
416 |
> |
|
417 |
> |
|
418 |
> |
<target name="configure-tests" |
419 |
> |
depends="configure-compiler"> |
420 |
|
|
421 |
< |
<!-- |
422 |
< |
# This filter gets rid of angle-bracketed type parameters |
423 |
< |
# so that javadoc can run on the result. The following |
376 |
< |
# heuristic seems to work: |
377 |
< |
# |
378 |
< |
# For all lines not starting with space(s)-asterisk-space(s), |
379 |
< |
# replace <something> with a space, where there may be more |
380 |
< |
# than one right angle bracket at the end, and "something" |
381 |
< |
# must not contain parens or pipes. (This may need some |
382 |
< |
# tweaking.) |
383 |
< |
--> |
421 |
> |
<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 --> |
422 |
> |
<available property="junit.available" |
423 |
> |
classname="junit.framework.Protectable"/> |
424 |
|
|
425 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
426 |
< |
classpath="${build.ant.dir}"> |
427 |
< |
<param name="notmatching" value="^\s+\*\s.*$"/> |
388 |
< |
<param name="pattern" value="<[^|>()]+?>+"/> |
389 |
< |
<param name="replacement" value=" "/> |
390 |
< |
</filterreader> |
425 |
> |
<!-- Xalan --> |
426 |
> |
<available property="xalan.available" |
427 |
> |
classname="org.apache.xalan.Version"/> |
428 |
|
|
429 |
|
|
430 |
< |
<!-- |
431 |
< |
# This filter uncomments lines beginning with "//@" so that |
432 |
< |
# javadoc can see imports that are needed to resolve links |
433 |
< |
# but that shouldn't be in the compiled code. |
397 |
< |
--> |
430 |
> |
<!-- Ant 1.6beta and later don't need or want this check --> |
431 |
> |
<!-- |
432 |
> |
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
433 |
> |
unless="junit.available"/> |
434 |
|
|
435 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
436 |
< |
classpath="${build.ant.dir}"> |
437 |
< |
<param name="matching" value="^//@.*$"/> |
402 |
< |
<param name="pattern" value="^//@"/> |
403 |
< |
<param name="replacement" value=""/> |
404 |
< |
</filterreader> |
405 |
< |
</filterchain> |
406 |
< |
</copy> |
435 |
> |
<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests" |
436 |
> |
unless="xalan.available"/> |
437 |
> |
--> |
438 |
|
|
439 |
|
</target> |
440 |
|
|
441 |
|
|
442 |
+ |
<!-- Various demos and test programs --> |
443 |
|
|
444 |
|
|
445 |
< |
<target name="filter-doccheck" |
446 |
< |
depends="filter-src"> |
445 |
> |
<target name="loops" depends="init, configure-compiler" |
446 |
> |
description="Benchmark from Doug Lea's AQS paper"> |
447 |
|
|
448 |
< |
<mkdir dir="${build.filter.doccheck.dir}"/> |
448 |
> |
<mkdir dir="${build.loops.dir}"/> |
449 |
|
|
450 |
< |
<copy todir="${build.filter.doccheck.dir}"> |
451 |
< |
<fileset dir="${build.filter.src.dir}"> |
452 |
< |
<include name="**/*.html"/> |
453 |
< |
</fileset> |
454 |
< |
</copy> |
450 |
> |
<javac srcdir="${loops.src.dir}" |
451 |
> |
destdir="${build.loops.dir}" |
452 |
> |
debug="${build.debug}" |
453 |
> |
debuglevel="${build.debuglevel}" |
454 |
> |
deprecation="${build.deprecation}" |
455 |
> |
source="${build.sourcelevel}" |
456 |
> |
fork="true"> |
457 |
|
|
458 |
< |
<property name="generic.declarations" |
459 |
< |
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 {}" |
460 |
< |
/> |
458 |
> |
<compilerarg line="${build.args}"/> |
459 |
> |
<classpath refid="loops.classpath"/> |
460 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
461 |
|
|
462 |
< |
<copy todir="${build.filter.doccheck.dir}"> |
429 |
< |
<fileset dir="${build.filter.src.dir}"> |
430 |
< |
<exclude name="**/*.html"/> |
431 |
< |
</fileset> |
432 |
< |
<filterchain> |
433 |
< |
<!-- |
434 |
< |
# These two filters try to make the source look like |
435 |
< |
# something that doccheck can process. The first removes |
436 |
< |
# -source 1.4 assertions and the second adds in a bunch |
437 |
< |
# of single letter public nested marker interfaces so that |
438 |
< |
# the generic type parameters are recognized. |
439 |
< |
--> |
440 |
< |
|
441 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
442 |
< |
classpath="${build.ant.dir}"> |
443 |
< |
<param name="matching" value="^\s*assert[\s ].*$"/> |
444 |
< |
<param name="pattern" value="assert"/> |
445 |
< |
<param name="replacement" value="//assert"/> |
446 |
< |
</filterreader> |
447 |
< |
|
448 |
< |
<filterreader classname="jsr166.ant.filters.ReplaceFilter" |
449 |
< |
classpath="${build.ant.dir}"> |
450 |
< |
<param name="matching" value="^([^*]*(class|interface|implements) .*|)\{.*$"/> |
451 |
< |
<param name="pattern" value="$"/> |
452 |
< |
<param name="replacement" value=" ${generic.declarations}"/> |
453 |
< |
</filterreader> |
462 |
> |
</javac> |
463 |
|
|
464 |
< |
</filterchain> |
465 |
< |
</copy> |
464 |
> |
<java classname="ALoops" fork="true"> |
465 |
> |
<classpath refid="loops.classpath"/> |
466 |
> |
</java> |
467 |
|
|
468 |
|
</target> |
469 |
|
|
470 |
|
|
471 |
< |
<target name="compile-tests" |
462 |
< |
depends="jar"> |
471 |
> |
<!-- jsr166x --> |
472 |
|
|
464 |
– |
<mkdir dir="${build.testcases.dir}"/> |
473 |
|
|
474 |
< |
<!-- |
475 |
< |
<echo>javac ${gjc.args}</echo> |
476 |
< |
<echo>bootclasspath=${test.compile.bootclasspath}</echo> |
469 |
< |
<echo>classpath="${test.classpath}"</echo> |
470 |
< |
--> |
474 |
> |
<target name="jsr166xcompile" |
475 |
> |
depends="init, configure-compiler" |
476 |
> |
description="Compiles jsr166x sources"> |
477 |
|
|
478 |
< |
<javac srcdir="${test.src.dir}" |
479 |
< |
destdir="${build.testcases.dir}" |
478 |
> |
<mkdir dir="${build.jsr166x.dir}"/> |
479 |
> |
|
480 |
> |
<javac srcdir="${jsr166xsrc.dir}" |
481 |
> |
destdir="${build.jsr166x.dir}" |
482 |
|
debug="${build.debug}" |
483 |
|
debuglevel="${build.debuglevel}" |
484 |
|
deprecation="${build.deprecation}" |
485 |
|
source="${build.sourcelevel}" |
486 |
|
fork="true"> |
487 |
|
|
488 |
< |
<compilerarg line="${gjc.args}"/> |
489 |
< |
<bootclasspath refid="test.compile.bootclasspath"/> |
490 |
< |
<classpath refid="test.classpath"/> |
488 |
> |
<include name="**/*.java"/> |
489 |
> |
<compilerarg line="${build.args}"/> |
490 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
491 |
|
|
492 |
|
</javac> |
493 |
|
|
494 |
|
</target> |
495 |
|
|
496 |
|
|
489 |
– |
<target name="run-tests" |
490 |
– |
depends="compile-tests"> |
497 |
|
|
498 |
< |
<!-- May be overridden by user.properties --> |
499 |
< |
<property name="testcase" value="*"/> |
498 |
> |
<target name="jsr166xjar" |
499 |
> |
depends="jsr166xcompile" |
500 |
> |
description="Builds library jar from compiled sources"> |
501 |
|
|
502 |
< |
<mkdir dir="${build.reports.dir}"/> |
502 |
> |
<mkdir dir="${build.jsr166xlib.dir}"/> |
503 |
|
|
504 |
< |
<junit printsummary="true" |
505 |
< |
showoutput="true" |
506 |
< |
errorProperty="junit.failed" |
500 |
< |
failureProperty="junit.failed" |
501 |
< |
dir="${build.reports.dir}" |
502 |
< |
fork="true"> |
504 |
> |
<jar destfile="${jsr166xproduct.jar}"> |
505 |
> |
<fileset dir="${build.jsr166x.dir}"/> |
506 |
> |
</jar> |
507 |
|
|
508 |
< |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
508 |
> |
</target> |
509 |
|
|
506 |
– |
<formatter type="xml"/> |
510 |
|
|
508 |
– |
<batchtest todir="${build.reports.dir}"> |
509 |
– |
<fileset dir="${test.src.dir}"> |
510 |
– |
<include name="**/${testcase}Test.java"/> |
511 |
– |
</fileset> |
512 |
– |
</batchtest> |
511 |
|
|
512 |
< |
</junit> |
512 |
> |
<target name="jsr166xdocs" |
513 |
> |
description="Builds javadocs with custom tags to build folder"> |
514 |
> |
|
515 |
> |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
516 |
> |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
517 |
> |
|
518 |
> |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
519 |
> |
packagenames="jsr166x" |
520 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
521 |
> |
source="${build.sourcelevel}" |
522 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
523 |
|
|
524 |
|
</target> |
525 |
|
|
526 |
|
|
527 |
< |
<target name="report-tests" |
528 |
< |
depends="run-tests"> |
527 |
> |
<target name="jsr166xdist" |
528 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
529 |
> |
description="Puts all distributable products in single hierarchy"/> |
530 |
|
|
522 |
– |
<!-- Sets junit.report.format to frames if Xalan is present, |
523 |
– |
otherwise sets it to noframes. --> |
524 |
– |
<available property="junit.report.format" |
525 |
– |
value="frames" |
526 |
– |
classname="org.apache.xalan.lib.Redirect" |
527 |
– |
/> |
528 |
– |
<property name="junit.report.format" value="noframes"/> |
531 |
|
|
530 |
– |
<junitreport todir="${build.reports.dir}"> |
531 |
– |
<fileset dir="${build.reports.dir}"> |
532 |
– |
<include name="TEST-*.xml"/> |
533 |
– |
</fileset> |
534 |
– |
<report styledir="${stylesheet.dir}" |
535 |
– |
format="${junit.report.format}" |
536 |
– |
todir="${build.reports.dir}" |
537 |
– |
/> |
538 |
– |
</junitreport> |
532 |
|
|
533 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
533 |
> |
<target name="jsr166xclean" |
534 |
> |
description="Removes all build products"> |
535 |
> |
|
536 |
> |
<delete dir="${build.jsr166x.dir}"/> |
537 |
> |
<delete dir="${build.jsr166xlib.dir}"/> |
538 |
|
|
539 |
|
</target> |
540 |
|
|
541 |
|
|
545 |
– |
<target name="configure-compiler"> |
542 |
|
|
543 |
< |
<property name="gjc.version" |
544 |
< |
value="2.2"/> |
543 |
> |
<target name="jsr166xdist-clean" |
544 |
> |
description="Removes all build and distribution products"> |
545 |
> |
|
546 |
> |
</target> |
547 |
|
|
550 |
– |
<condition property="novariance.arg" value="-novariance"> |
551 |
– |
<and> |
552 |
– |
<equals arg1="${gjc.version}" arg2="2.0"/> |
553 |
– |
<or> |
554 |
– |
<not><isset property="gjc.novariance"/></not> |
555 |
– |
<istrue value="${gjc.novariance}"/> |
556 |
– |
</or> |
557 |
– |
</and> |
558 |
– |
</condition> |
548 |
|
|
560 |
– |
<property name="novariance.arg" |
561 |
– |
value=""/> |
549 |
|
|
550 |
< |
<property name="gjc.dir" |
551 |
< |
value="${lib.dir}/gjc"/> |
550 |
> |
<target name="jsr166xdist-docs" |
551 |
> |
description="Builds javadocs without custom tags to dist folder"> |
552 |
|
|
553 |
< |
<property name="javac.jar" |
554 |
< |
location="${gjc.dir}/${gjc.version}/javac.jar"/> |
553 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
554 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
555 |
|
|
556 |
< |
<property name="collect.jar" |
557 |
< |
location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/> |
556 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
557 |
> |
packagenames="jsr166x" |
558 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
559 |
> |
source="${build.sourcelevel}" |
560 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
561 |
|
|
562 |
+ |
</target> |
563 |
|
|
564 |
< |
<condition property="warnunchecked.arg" value="-warnunchecked"> |
565 |
< |
<istrue value="${gjc.warnunchecked}"/> |
575 |
< |
</condition> |
564 |
> |
<target name="jsr166xdist-jar" |
565 |
> |
depends="jsr166xclean, jsr166xjar"> |
566 |
|
|
567 |
< |
<property name="warnunchecked.arg" value=""/> |
567 |
> |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
568 |
|
|
569 |
< |
<condition property="prepare.src.dir" value="${build.dir}/prepare-src"> |
580 |
< |
<istrue value="${build.nothreads}"/> |
581 |
< |
</condition> |
569 |
> |
</target> |
570 |
|
|
571 |
+ |
<!-- jsr166y --> |
572 |
|
|
584 |
– |
<!-- |
585 |
– |
! Bootclasspath munging for source compilation. |
586 |
– |
--> |
573 |
|
|
574 |
< |
<path id="pre.bootclasspath"> |
575 |
< |
<pathelement location="${javac.jar}"/> |
576 |
< |
</path> |
591 |
< |
|
592 |
< |
<path id="compile.bootclasspath"> |
593 |
< |
<pathelement location="${build.classes.dir}"/> |
594 |
< |
<pathelement location="${collect.jar}"/> |
595 |
< |
<pathelement location="${rt.jar}"/> |
596 |
< |
</path> |
597 |
< |
|
598 |
< |
<!-- Flatten paths into platform-appropriate strings --> |
599 |
< |
<property name="pre.bootclasspath" refid="pre.bootclasspath"/> |
600 |
< |
<property name="compile.bootclasspath" refid="compile.bootclasspath"/> |
574 |
> |
<target name="jsr166ycompile" |
575 |
> |
depends="init, configure-compiler" |
576 |
> |
description="Compiles jsr166y sources"> |
577 |
|
|
578 |
+ |
<mkdir dir="${build.jsr166y.dir}"/> |
579 |
|
|
580 |
< |
<!-- Common options in javac invocations --> |
581 |
< |
<property name="gjc.args" |
582 |
< |
value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}" |
583 |
< |
/> |
580 |
> |
<javac srcdir="${jsr166ysrc.dir}" |
581 |
> |
destdir="${build.jsr166y.dir}" |
582 |
> |
debug="${build.debug}" |
583 |
> |
debuglevel="${build.debuglevel}" |
584 |
> |
deprecation="${build.deprecation}" |
585 |
> |
source="${build.sourcelevel}" |
586 |
> |
fork="true"> |
587 |
> |
|
588 |
> |
<include name="**/*.java"/> |
589 |
> |
<compilerarg line="${build.args}"/> |
590 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
591 |
> |
<compilerarg value="${bootclasspath.args}"/> |
592 |
> |
|
593 |
> |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
594 |
> |
|
595 |
> |
</javac> |
596 |
|
|
597 |
|
</target> |
598 |
|
|
599 |
|
|
600 |
< |
<target name="prepare-src" |
601 |
< |
depends="configure-compiler" |
602 |
< |
if="prepare.src.dir"> |
603 |
< |
|
604 |
< |
<mkdir dir="${prepare.src.dir}"/> |
605 |
< |
<copy todir="${prepare.src.dir}"> |
606 |
< |
<fileset dir="${src.dir}"> |
607 |
< |
<exclude name="java/lang/**"/> |
608 |
< |
</fileset> |
609 |
< |
</copy> |
600 |
> |
|
601 |
> |
<target name="jsr166yjar" |
602 |
> |
depends="jsr166ycompile" |
603 |
> |
description="Builds library jar from compiled sources"> |
604 |
> |
|
605 |
> |
<mkdir dir="${build.jsr166ylib.dir}"/> |
606 |
> |
|
607 |
> |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
608 |
> |
<fileset dir="${build.jsr166y.dir}"/> |
609 |
> |
</jar> |
610 |
|
|
611 |
|
</target> |
612 |
|
|
613 |
|
|
625 |
– |
<target name="configure-emulation"> |
614 |
|
|
615 |
< |
<condition property="build.emulation.true"> |
616 |
< |
<or> |
617 |
< |
<and> |
618 |
< |
<os family="windows"/> |
619 |
< |
<not> |
620 |
< |
<isset property="build.emulation"/> |
621 |
< |
</not> |
622 |
< |
</and> |
623 |
< |
<istrue value="${build.emulation}"/> |
624 |
< |
</or> |
625 |
< |
</condition> |
615 |
> |
<target name="jsr166ydocs" |
616 |
> |
description="Builds javadocs with custom tags to build folder"> |
617 |
> |
|
618 |
> |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
619 |
> |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
620 |
> |
|
621 |
> |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
622 |
> |
packagenames="jsr166y" |
623 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
624 |
> |
source="${build.sourcelevel}" |
625 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
626 |
|
|
627 |
|
</target> |
628 |
|
|
629 |
|
|
630 |
< |
<target name="configure-tests" |
631 |
< |
depends="configure-compiler"> |
630 |
> |
<target name="jsr166ydist" |
631 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
632 |
> |
description="Puts all distributable products in single hierarchy"/> |
633 |
|
|
645 |
– |
<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 --> |
646 |
– |
<available property="junit.available" |
647 |
– |
classname="junit.framework.Protectable"/> |
634 |
|
|
649 |
– |
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
650 |
– |
unless="junit.available"/> |
635 |
|
|
636 |
+ |
<target name="jsr166yclean" |
637 |
+ |
description="Removes all build products"> |
638 |
|
|
639 |
< |
<!-- |
640 |
< |
! Bootclasspath munging for testing, so JUnit can test our local |
641 |
< |
! modifications to java.*. |
642 |
< |
--> |
639 |
> |
<delete dir="${build.jsr166y.dir}"/> |
640 |
> |
<delete dir="${build.jsr166ylib.dir}"/> |
641 |
> |
|
642 |
> |
</target> |
643 |
> |
|
644 |
> |
|
645 |
> |
|
646 |
> |
<target name="jsr166ydist-clean" |
647 |
> |
description="Removes all build and distribution products"> |
648 |
> |
|
649 |
> |
</target> |
650 |
> |
|
651 |
> |
<target name="jsr166ydist-docs" |
652 |
> |
description="Builds javadocs without custom tags to dist folder"> |
653 |
> |
|
654 |
> |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
655 |
> |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
656 |
> |
|
657 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
658 |
> |
packagenames="jsr166y" |
659 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
660 |
> |
source="${build.sourcelevel}" |
661 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
662 |
> |
|
663 |
> |
</target> |
664 |
> |
|
665 |
> |
<target name="jsr166ydist-jar" |
666 |
> |
depends="jsr166yclean, jsr166yjar"> |
667 |
> |
|
668 |
> |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
669 |
> |
|
670 |
> |
</target> |
671 |
> |
|
672 |
> |
<!-- extra166y --> |
673 |
|
|
658 |
– |
<path id="test.classpath"> |
659 |
– |
<pathelement location="${product.jar}"/> |
660 |
– |
<pathelement location="${build.testcases.dir}"/> |
661 |
– |
<pathelement location="${junit.jar}"/> |
662 |
– |
</path> |
674 |
|
|
675 |
< |
<path id="test.compile.bootclasspath"> |
676 |
< |
<pathelement location="${javac.jar}"/> |
677 |
< |
<pathelement location="${collect.jar}"/> |
667 |
< |
<pathelement location="${rt.jar}"/> |
668 |
< |
</path> |
675 |
> |
<target name="extra166ycompile" |
676 |
> |
depends="init, configure-compiler, jsr166ycompile" |
677 |
> |
description="Compiles extra166y sources"> |
678 |
|
|
679 |
< |
<path id="test.run.bootclasspath"> |
671 |
< |
<pathelement location="${javac.jar}"/> |
672 |
< |
<path refid="test.classpath"/> |
673 |
< |
</path> |
679 |
> |
<mkdir dir="${build.extra166y.dir}"/> |
680 |
|
|
681 |
< |
<!-- Flatten test classpaths into platform-appropriate strings --> |
682 |
< |
<property name="test.classpath" refid="test.classpath"/> |
683 |
< |
<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/> |
684 |
< |
<property name="test.run.bootclasspath" refid="test.run.bootclasspath"/> |
681 |
> |
<javac srcdir="${extra166ysrc.dir}" |
682 |
> |
destdir="${build.extra166y.dir}" |
683 |
> |
debug="${build.debug}" |
684 |
> |
classpath="${jsr166yproduct.jar}" |
685 |
> |
debuglevel="${build.debuglevel}" |
686 |
> |
deprecation="${build.deprecation}" |
687 |
> |
source="${build.sourcelevel}" |
688 |
> |
fork="true"> |
689 |
> |
|
690 |
> |
<include name="**/*.java"/> |
691 |
> |
<compilerarg line="${build.args}"/> |
692 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
693 |
> |
<compilerarg value="${bootclasspath.args}"/> |
694 |
> |
|
695 |
> |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
696 |
> |
|
697 |
> |
</javac> |
698 |
|
|
699 |
|
</target> |
700 |
|
|
701 |
|
|
702 |
|
|
703 |
< |
<!-- Anthill targets --> |
703 |
> |
<target name="extra166yjar" |
704 |
> |
depends="extra166ycompile" |
705 |
> |
description="Builds library jar from compiled sources"> |
706 |
> |
|
707 |
> |
<mkdir dir="${build.extra166ylib.dir}"/> |
708 |
|
|
709 |
< |
<target name="anthill-build" |
710 |
< |
depends="jar, test, docs, dist-docs"/> |
709 |
> |
<jar destfile="${extra166yproduct.jar}" index="true"> |
710 |
> |
<fileset dir="${build.extra166y.dir}"/> |
711 |
> |
</jar> |
712 |
|
|
713 |
< |
<target name="anthill-publish"> |
713 |
> |
</target> |
714 |
|
|
691 |
– |
<copy todir="${deployDir}/docs/private"> |
692 |
– |
<fileset dir="${build.javadocs.dir}"/> |
693 |
– |
</copy> |
715 |
|
|
695 |
– |
<copy todir="${deployDir}/docs/public"> |
696 |
– |
<fileset dir="${dist.javadocs.dir}"/> |
697 |
– |
</copy> |
716 |
|
|
717 |
< |
<copy tofile="${deployDir}/index.html" |
718 |
< |
file="${basedir}/etc/anthill-index.html"/> |
717 |
> |
<target name="extra166ydocs" |
718 |
> |
description="Builds javadocs with custom tags to build folder"> |
719 |
|
|
720 |
< |
<copy todir="${deployDir}/notes"> |
721 |
< |
<fileset dir="${basedir}/etc/notes"/> |
722 |
< |
</copy> |
720 |
> |
<delete dir="${build.extra166yjavadocs.dir}"/> |
721 |
> |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
722 |
> |
|
723 |
> |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
724 |
> |
packagenames="extra166y" |
725 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
726 |
> |
source="${build.sourcelevel}" |
727 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
728 |
|
|
729 |
|
</target> |
730 |
|
|
731 |
|
|
732 |
< |
<target name="ng" depends="test"> |
733 |
< |
<java classname="SuperfluousAbstract" fork="true"> |
732 |
> |
<target name="extra166ydist" |
733 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
734 |
> |
description="Puts all distributable products in single hierarchy"/> |
735 |
|
|
712 |
– |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
736 |
|
|
737 |
< |
</java> |
737 |
> |
|
738 |
> |
<target name="extra166yclean" |
739 |
> |
description="Removes all build products"> |
740 |
> |
|
741 |
> |
<delete dir="${build.extra166y.dir}"/> |
742 |
> |
<delete dir="${build.extra166ylib.dir}"/> |
743 |
> |
|
744 |
> |
</target> |
745 |
> |
|
746 |
> |
|
747 |
> |
|
748 |
> |
<target name="extra166ydist-clean" |
749 |
> |
description="Removes all build and distribution products"> |
750 |
> |
|
751 |
> |
</target> |
752 |
> |
|
753 |
> |
<target name="extra166ydist-docs" |
754 |
> |
description="Builds javadocs without custom tags to dist folder"> |
755 |
> |
|
756 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
757 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
758 |
> |
|
759 |
> |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
760 |
> |
packagenames="extra166y" |
761 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
762 |
> |
source="${build.sourcelevel}" |
763 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
764 |
> |
|
765 |
|
</target> |
766 |
|
|
767 |
+ |
<target name="extra166ydist-jar" |
768 |
+ |
depends="extra166yclean, extra166yjar"> |
769 |
+ |
|
770 |
+ |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
771 |
+ |
|
772 |
+ |
</target> |
773 |
|
|
774 |
|
</project> |