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