8 |
|
|
9 |
|
User-specific settings are read from user.properties. |
10 |
|
See user.properties.sample for an explanation of some useful settings. |
11 |
+ |
|
12 |
+ |
The repository contains all dependencies except for ant and the JDK |
13 |
+ |
itself. Because the JDK version matters and because different |
14 |
+ |
targets require different JDKs, we assume that users have created a |
15 |
+ |
hierarchy containing: |
16 |
+ |
$HOME/jdk/jdk6 |
17 |
+ |
$HOME/jdk/jdk7 |
18 |
+ |
$HOME/jdk/jdk8 |
19 |
+ |
where each of the above is a JDK or a symlink to same, and |
20 |
+ |
$HOME/jdk/src/jdk6 |
21 |
+ |
$HOME/jdk/src/jdk7 |
22 |
+ |
$HOME/jdk/src/jdk8 |
23 |
+ |
where each of the above is a complete JDK source tree |
24 |
+ |
(e.g. mercurial forest) or a symlink to same. |
25 |
|
------------------------------------------------------------------------------ |
26 |
|
</description> |
27 |
|
|
35 |
|
|
36 |
|
|
37 |
|
<!-- Compilation options --> |
38 |
< |
<property name="build.sourcelevel" value="1.6"/> |
38 |
> |
<property name="build.sourcelevel" value="6"/> |
39 |
|
<property name="build.debug" value="true"/> |
40 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
41 |
|
<property name="build.deprecation" value="false"/> |
45 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
46 |
|
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
47 |
|
<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"/> |
48 |
|
<property name="build.reports.dir" location="${build.dir}/reports"/> |
49 |
|
|
50 |
< |
<property name="build.jdk7.dir" location="${build.dir}/jdk7"/> |
51 |
< |
<property name="build.jdk7.lib.dir" location="${build.jdk7.dir}"/> |
52 |
< |
<property name="build.jdk7.classes.dir" location="${build.jdk7.dir}/classes"/> |
53 |
< |
<property name="build.jdk7.docs.dir" location="${build.jdk7.dir}/docs"/> |
50 |
> |
<property name="build.4jdk7.dir" location="${build.dir}/jsr166-4jdk7"/> |
51 |
> |
<property name="build.4jdk7.classes.dir" location="${build.4jdk7.dir}/classes"/> |
52 |
> |
<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/> |
53 |
> |
<property name="build.4jdk7.docs.dir" location="${build.4jdk7.dir}/docs"/> |
54 |
|
|
55 |
|
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
44 |
– |
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
45 |
– |
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
46 |
– |
|
56 |
|
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
48 |
– |
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
49 |
– |
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
50 |
– |
|
57 |
|
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
52 |
– |
<property name="build.jsr166elib.dir" location="${build.dir}/jsr166elib"/> |
53 |
– |
<property name="build.jsr166ejavadocs.dir" location="${build.dir}/jsr166ejavadocs"/> |
54 |
– |
|
58 |
|
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
59 |
< |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
60 |
< |
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
59 |
> |
|
60 |
> |
<property name="build.jsr166x.classes.dir" location="${build.jsr166x.dir}/classes"/> |
61 |
> |
<property name="build.jsr166y.classes.dir" location="${build.jsr166y.dir}/classes"/> |
62 |
> |
<property name="build.jsr166e.classes.dir" location="${build.jsr166e.dir}/classes"/> |
63 |
> |
<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/> |
64 |
|
|
65 |
|
<!-- JDK binary locations --> |
66 |
|
<property name="jdks.home" location="${user.home}/jdk"/> |
68 |
|
<macrodef name="defjdklocations"> |
69 |
|
<attribute name="v"/> |
70 |
|
<sequential> |
71 |
< |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
72 |
< |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
73 |
< |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
74 |
< |
<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
75 |
< |
<property name="bootclasspath@{v}" |
71 |
> |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
72 |
> |
<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/> |
73 |
> |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
74 |
> |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
75 |
> |
<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
76 |
> |
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/> |
77 |
> |
<property name="bootclasspath@{v}" |
78 |
|
value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/> |
79 |
|
</sequential> |
80 |
|
</macrodef> |
83 |
|
<defjdklocations v="7"/> |
84 |
|
<defjdklocations v="8"/> |
85 |
|
|
86 |
+ |
<macrodef name="run-tck-tests"> |
87 |
+ |
<attribute name="jvm"/> |
88 |
+ |
<attribute name="tck.classes"/> |
89 |
+ |
<attribute name="product.jar" default="${product.jar}"/> |
90 |
+ |
<attribute name="jvmflags" default=""/> |
91 |
+ |
<sequential> |
92 |
+ |
<java classname="JSR166TestCase" |
93 |
+ |
jvm="@{jvm}" fork="true"> |
94 |
+ |
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
95 |
+ |
<jvmarg line="@{jvmflags}"/> |
96 |
+ |
<classpath> |
97 |
+ |
<pathelement location="${junit.jar}"/> |
98 |
+ |
<pathelement location="@{tck.classes}"/> |
99 |
+ |
</classpath> |
100 |
+ |
</java> |
101 |
+ |
</sequential> |
102 |
+ |
</macrodef> |
103 |
+ |
|
104 |
|
<!-- Source locations --> |
105 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
106 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
110 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
111 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
112 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
113 |
< |
<property name="jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
113 |
> |
<property name="4jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
114 |
|
<property name="jsr166xsrc.dir" location="${topsrc.dir}/jsr166x"/> |
115 |
|
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
116 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
117 |
|
<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/> |
92 |
– |
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
118 |
|
|
119 |
|
<!-- Distribution locations --> |
120 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
121 |
< |
<property name="dist.jdk7.docs.dir" location="${dist.dir}/jsr166-jdk7docs"/> |
122 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
123 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
124 |
< |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
125 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
120 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/jsr166.docs"/> |
121 |
> |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7.docs"/> |
122 |
> |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166x.docs"/> |
123 |
> |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166y.docs"/> |
124 |
> |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166e.docs"/> |
125 |
> |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/> |
126 |
|
|
127 |
|
<!-- Jar locations --> |
128 |
< |
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
129 |
< |
<property name="jdk7product.jar" location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/> |
130 |
< |
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
131 |
< |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
132 |
< |
<property name="jsr166eproduct.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
133 |
< |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
134 |
< |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
128 |
> |
<property name="product.jar" location="${build.dir}/jsr166.jar"/> |
129 |
> |
<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/> |
130 |
> |
<property name="jsr166x.jar" location="${build.jsr166x.dir}/jsr166x.jar"/> |
131 |
> |
<property name="jsr166y.jar" location="${build.jsr166y.dir}/jsr166y.jar"/> |
132 |
> |
<property name="jsr166e.jar" location="${build.jsr166e.dir}/jsr166e.jar"/> |
133 |
> |
<property name="extra166y.jar" location="${build.extra166y.dir}/extra166y.jar"/> |
134 |
> |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
135 |
|
|
136 |
|
<!-- Bootclasspath argument --> |
137 |
|
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
144 |
|
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
145 |
|
<!-- The below does not yet exist as of 2012-11 --> |
146 |
|
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
147 |
+ |
|
148 |
+ |
<!-- Default jdk api doc location (latest stable release seems best) --> |
149 |
|
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
150 |
|
|
151 |
|
<!-- Test classpath --> |
159 |
|
<pathelement location="${build.loops.dir}"/> |
160 |
|
</path> |
161 |
|
|
162 |
+ |
<!-- Support @jls tag, used in jdk8+ javadoc --> |
163 |
+ |
<!-- TODO: How do we get &trade to work? --> |
164 |
+ |
<!-- TODO: Why isn't @jls a "standard" tag? --> |
165 |
+ |
<!-- property name="javadoc.jls.cite" value="The Java™ Language Specification" --> |
166 |
+ |
<property name="javadoc.jls.cite" value="The Java Language Specification"/> |
167 |
+ |
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
168 |
|
|
169 |
|
<!-- Main targets --> |
170 |
|
|
171 |
|
<target name="dists" |
172 |
< |
depends="dist, jsr166xdist, jsr166ydist,jsr166edist, extra166ydist" |
172 |
> |
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
173 |
|
description="Builds all public jars and docs"/> |
174 |
|
|
175 |
|
<target name="compile" |
176 |
< |
depends="init, configure-compiler" |
177 |
< |
description="Compiles main sources to build folder"> |
176 |
> |
depends="configure-compiler" |
177 |
> |
description="Compiles src/main sources to build dir"> |
178 |
|
|
179 |
|
<mkdir dir="${build.classes.dir}"/> |
180 |
|
|
181 |
|
<javac srcdir="${src.dir}" |
182 |
< |
destdir="${build.classes.dir}" |
183 |
< |
debug="${build.debug}" |
184 |
< |
debuglevel="${build.debuglevel}" |
185 |
< |
deprecation="${build.deprecation}" |
186 |
< |
source="${build.sourcelevel}" |
187 |
< |
fork="true"> |
182 |
> |
destdir="${build.classes.dir}" |
183 |
> |
debug="${build.debug}" |
184 |
> |
debuglevel="${build.debuglevel}" |
185 |
> |
deprecation="${build.deprecation}" |
186 |
> |
classpath="" |
187 |
> |
includeAntRuntime="false" |
188 |
> |
includeJavaRuntime="false" |
189 |
> |
executable="${javac8}" |
190 |
> |
fork="true"> |
191 |
|
|
192 |
|
<include name="**/*.java"/> |
193 |
+ |
<compilerarg line="${build.args}"/> |
194 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
195 |
+ |
<compilerarg value="-Xlint:all"/> |
196 |
|
|
197 |
|
<!-- |
198 |
|
<exclude name="java/lang/**"/> |
210 |
|
depends="compile" |
211 |
|
description="Builds library jar from compiled sources"> |
212 |
|
|
175 |
– |
<mkdir dir="${build.lib.dir}"/> |
176 |
– |
|
213 |
|
<jar destfile="${product.jar}"> |
214 |
|
<fileset dir="${build.classes.dir}"/> |
215 |
|
</jar> |
219 |
|
|
220 |
|
|
221 |
|
<target name="test" |
222 |
< |
depends="init, configure-tests, report-tests" |
222 |
> |
depends="configure-tests, report-tests" |
223 |
|
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
224 |
|
|
225 |
|
|
226 |
|
|
227 |
|
<target name="docs" |
228 |
< |
description="Builds javadocs with custom tags to build folder"> |
228 |
> |
description="Builds javadocs for src/main to dist dir"> |
229 |
|
|
230 |
< |
<delete dir="${build.javadocs.dir}"/> |
231 |
< |
<mkdir dir="${build.javadocs.dir}"/> |
230 |
> |
<delete dir="${dist.javadocs.dir}"/> |
231 |
> |
<mkdir dir="${dist.javadocs.dir}"/> |
232 |
|
|
233 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
234 |
|
<!-- sourcepath for packages --> |
235 |
|
|
236 |
< |
<javadoc destdir="${build.javadocs.dir}" |
236 |
> |
<javadoc destdir="${dist.javadocs.dir}" |
237 |
|
packagenames="none" |
238 |
< |
link="${jdkapidocs.url}" |
238 |
> |
link="${jdkapi8docs.url}" |
239 |
|
overview="${src.dir}/intro.html" |
240 |
< |
sourcepath="${src.dir}:${jdksrc.dir}" |
241 |
< |
additionalparam="-XDignore.symbol.file=true" > |
240 |
> |
sourcepath="${src.dir}:${jdk8src.dir}" |
241 |
> |
classpath="" |
242 |
> |
executable="${javadoc8}"> |
243 |
> |
<arg value="-XDignore.symbol.file=true"/> |
244 |
> |
<arg value="-tag"/> |
245 |
> |
<arg value="${javadoc.jls.option}"/> |
246 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
247 |
|
<include name="**/*.java"/> |
248 |
|
</fileset> |
253 |
|
|
254 |
|
|
255 |
|
<target name="dist" |
256 |
< |
depends="init, dist-clean, dist-jar, dist-docs" |
256 |
> |
depends="dist-clean, dist-jar, docs" |
257 |
|
description="Puts all distributable products in single hierarchy"/> |
258 |
|
|
259 |
|
|
281 |
|
description="Removes all build products"> |
282 |
|
|
283 |
|
<delete dir="${build.dir}"/> |
244 |
– |
<delete dir="${build.classes.dir}"/> |
245 |
– |
<delete dir="${build.lib.dir}"/> |
284 |
|
|
285 |
|
</target> |
286 |
|
|
295 |
|
|
296 |
|
|
297 |
|
|
260 |
– |
<target name="dist-docs" |
261 |
– |
description="Builds javadocs without custom tags to dist folder"> |
262 |
– |
|
263 |
– |
<delete dir="${dist.javadocs.dir}"/> |
264 |
– |
<mkdir dir="${dist.javadocs.dir}"/> |
265 |
– |
|
266 |
– |
<!-- the packagenames="none" hack below prevents scanning the --> |
267 |
– |
<!-- sourcepath for packages --> |
268 |
– |
|
269 |
– |
<javadoc destdir="${dist.javadocs.dir}" |
270 |
– |
packagenames="none" |
271 |
– |
link="${jdkapidocs.url}" |
272 |
– |
overview="${src.dir}/intro.html" |
273 |
– |
sourcepath="${src.dir}:${jdksrc.dir}" |
274 |
– |
additionalparam="-XDignore.symbol.file=true" > |
275 |
– |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
276 |
– |
<include name="**/*.java"/> |
277 |
– |
</fileset> |
278 |
– |
</javadoc> |
279 |
– |
|
280 |
– |
</target> |
281 |
– |
|
282 |
– |
|
283 |
– |
|
298 |
|
<!-- Internal targets --> |
299 |
|
|
300 |
|
|
287 |
– |
<target name="init"> |
288 |
– |
|
289 |
– |
<!-- Version is kept in a separate file --> |
290 |
– |
<loadfile property="version" srcFile="version.properties"/> |
291 |
– |
<echo>Building JSR-166 version ${version}</echo> |
292 |
– |
<echo>java.home is ${java.home}</echo> |
293 |
– |
|
294 |
– |
</target> |
295 |
– |
|
296 |
– |
|
301 |
|
<target name="dist-jar" |
302 |
|
depends="clean, jar"> |
303 |
|
|
312 |
|
<mkdir dir="${build.testcases.dir}"/> |
313 |
|
|
314 |
|
<javac srcdir="${tck.src.dir}" |
315 |
< |
destdir="${build.testcases.dir}" |
316 |
< |
debug="${build.debug}" |
317 |
< |
debuglevel="${build.debuglevel}" |
318 |
< |
deprecation="${build.deprecation}" |
319 |
< |
source="${build.sourcelevel}" |
320 |
< |
fork="true"> |
315 |
> |
destdir="${build.testcases.dir}" |
316 |
> |
debug="${build.debug}" |
317 |
> |
debuglevel="${build.debuglevel}" |
318 |
> |
deprecation="${build.deprecation}" |
319 |
> |
source="6" |
320 |
> |
classpath="${junit.jar}" |
321 |
> |
bootclasspath="${product.jar}:${bootclasspath6}" |
322 |
> |
includeAntRuntime="false" |
323 |
> |
includeJavaRuntime="false" |
324 |
> |
executable="${javac8}" |
325 |
> |
fork="true"> |
326 |
|
|
327 |
< |
<compilerarg value="${bootclasspath.args}"/> |
327 |
> |
<include name="**/*.java"/> |
328 |
|
<compilerarg line="${build.args}"/> |
329 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
330 |
< |
|
322 |
< |
<classpath refid="test.classpath"/> |
330 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
331 |
|
|
332 |
|
</javac> |
333 |
|
|
334 |
|
<javac srcdir="${test.src.dir}" |
335 |
< |
destdir="${build.testcases.dir}" |
336 |
< |
debug="${build.debug}" |
337 |
< |
debuglevel="${build.debuglevel}" |
338 |
< |
deprecation="${build.deprecation}" |
339 |
< |
source="${build.sourcelevel}" |
340 |
< |
fork="true"> |
335 |
> |
destdir="${build.testcases.dir}" |
336 |
> |
debug="${build.debug}" |
337 |
> |
debuglevel="${build.debuglevel}" |
338 |
> |
deprecation="${build.deprecation}" |
339 |
> |
source="6" |
340 |
> |
classpath="" |
341 |
> |
bootclasspath="${product.jar}:${bootclasspath6}" |
342 |
> |
includeAntRuntime="false" |
343 |
> |
includeJavaRuntime="false" |
344 |
> |
executable="${javac8}" |
345 |
> |
fork="true"> |
346 |
|
|
347 |
< |
<include name="jsr166/test/**"/> |
347 |
> |
<include name="jsr166/test/**/*.java"/> |
348 |
|
|
336 |
– |
<compilerarg value="${bootclasspath.args}"/> |
349 |
|
<compilerarg line="${build.args}"/> |
350 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
351 |
< |
|
340 |
< |
<classpath refid="test.classpath"/> |
351 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
352 |
|
|
353 |
|
</javac> |
354 |
|
|
365 |
|
<compilerarg line="${build.args}"/> |
366 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
367 |
|
|
357 |
– |
<classpath refid="test.classpath"/> |
358 |
– |
|
368 |
|
</javac> |
369 |
|
--> |
370 |
|
|
384 |
|
errorProperty="junit.failed" |
385 |
|
failureProperty="junit.failed" |
386 |
|
dir="${build.reports.dir}" |
387 |
+ |
jvm="${java8}" |
388 |
|
fork="true"> |
389 |
|
|
390 |
< |
<jvmarg value="${bootclasspath.args}"/> |
390 |
> |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
391 |
|
<jvmarg value="-server"/> |
392 |
|
<jvmarg value="-showversion"/> |
393 |
|
|
488 |
|
<!-- Various demos and test programs --> |
489 |
|
|
490 |
|
|
491 |
< |
<target name="loops" depends="init, configure-compiler" |
491 |
> |
<target name="loops" depends="configure-compiler" |
492 |
|
description="Benchmark from Doug Lea's AQS paper"> |
493 |
|
|
494 |
|
<mkdir dir="${build.loops.dir}"/> |
514 |
|
</target> |
515 |
|
|
516 |
|
|
517 |
< |
<!-- jdk7 --> |
517 |
> |
<!-- jsr166 4jdk7 --> |
518 |
|
|
519 |
|
|
520 |
< |
<target name="jdk7compile" |
520 |
> |
<target name="4jdk7compile" |
521 |
|
depends="configure-compiler" |
522 |
< |
description="Compiles src/jdk7 sources"> |
522 |
> |
description="Compiles src/jdk7 sources, targeting jdk7"> |
523 |
|
|
524 |
< |
<mkdir dir="${build.jdk7.classes.dir}"/> |
524 |
> |
<mkdir dir="${build.4jdk7.classes.dir}"/> |
525 |
|
|
526 |
< |
<javac srcdir="${jdk7src.dir}" |
527 |
< |
destdir="${build.jdk7.classes.dir}" |
526 |
> |
<javac srcdir="${4jdk7src.dir}" |
527 |
> |
destdir="${build.4jdk7.classes.dir}" |
528 |
|
debug="${build.debug}" |
529 |
|
debuglevel="${build.debuglevel}" |
530 |
|
deprecation="${build.deprecation}" |
531 |
< |
source="1.6" |
531 |
> |
source="6" |
532 |
|
classpath="" |
533 |
|
bootclasspath="${bootclasspath6}" |
534 |
|
includeAntRuntime="false" |
535 |
|
includeJavaRuntime="false" |
536 |
< |
executable="${javac6}" |
536 |
> |
executable="${javac7}" |
537 |
|
fork="true"> |
538 |
|
|
539 |
|
<include name="**/*.java"/> |
543 |
|
|
544 |
|
</javac> |
545 |
|
|
546 |
< |
</target> |
546 |
> |
<jar destfile="${4jdk7product.jar}" index="true"> |
547 |
> |
<fileset dir="${build.4jdk7.classes.dir}"/> |
548 |
> |
</jar> |
549 |
> |
|
550 |
> |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
551 |
|
|
552 |
+ |
<javac srcdir="${tck.src.dir}" |
553 |
+ |
destdir="${build.4jdk7.tck.classes.dir}" |
554 |
+ |
debug="${build.debug}" |
555 |
+ |
debuglevel="${build.debuglevel}" |
556 |
+ |
deprecation="${build.deprecation}" |
557 |
+ |
source="6" |
558 |
+ |
classpath="${junit.jar}" |
559 |
+ |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
560 |
+ |
includeAntRuntime="false" |
561 |
+ |
includeJavaRuntime="false" |
562 |
+ |
executable="${javac7}" |
563 |
+ |
fork="true"> |
564 |
|
|
565 |
+ |
<include name="**/*.java"/> |
566 |
+ |
<compilerarg line="${build.args}"/> |
567 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
568 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
569 |
|
|
570 |
< |
<target name="jdk7jar" |
541 |
< |
depends="jdk7compile" |
542 |
< |
description="Builds library jar from compiled sources"> |
570 |
> |
</javac> |
571 |
|
|
572 |
< |
<mkdir dir="${build.jdk7.lib.dir}"/> |
572 |
> |
</target> |
573 |
|
|
546 |
– |
<jar destfile="${jdk7product.jar}" index="true"> |
547 |
– |
<fileset dir="${build.jdk7.classes.dir}"/> |
548 |
– |
</jar> |
574 |
|
|
575 |
+ |
<target name="4jdk7-test-tck" |
576 |
+ |
depends="4jdk7compile" |
577 |
+ |
description="Runs tck tests for jsr166-4jdk7 directly"> |
578 |
+ |
<run-tck-tests |
579 |
+ |
jvm="${java7}" |
580 |
+ |
tck.classes="${build.4jdk7.tck.classes.dir}" |
581 |
+ |
product.jar="${4jdk7product.jar}"/> |
582 |
|
</target> |
583 |
|
|
584 |
|
|
585 |
+ |
<target name="4jdk7-test-tck-junit" |
586 |
+ |
depends="4jdk7compile" |
587 |
+ |
description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)"> |
588 |
+ |
|
589 |
+ |
<junit printsummary="true" |
590 |
+ |
showoutput="true" |
591 |
+ |
errorProperty="junit.failed" |
592 |
+ |
failureProperty="junit.failed" |
593 |
+ |
includeantruntime="true" |
594 |
+ |
jvm="${java7}" |
595 |
+ |
fork="true"> |
596 |
+ |
|
597 |
+ |
<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
598 |
+ |
<jvmarg value="-server"/> |
599 |
+ |
|
600 |
+ |
<classpath> |
601 |
+ |
<pathelement location="${junit.jar}"/> |
602 |
+ |
<pathelement location="${build.4jdk7.tck.classes.dir}"/> |
603 |
+ |
</classpath> |
604 |
+ |
|
605 |
+ |
<formatter type="brief"/> |
606 |
+ |
|
607 |
+ |
<test name="JSR166TestCase" haltonfailure="no"> |
608 |
+ |
</test> |
609 |
+ |
|
610 |
+ |
</junit> |
611 |
+ |
</target> |
612 |
|
|
554 |
– |
<target name="jdk7docs" |
555 |
– |
description="Builds javadocs with custom tags to build folder"> |
613 |
|
|
614 |
< |
<delete dir="${build.jdk7.docs.dir}"/> |
615 |
< |
<mkdir dir="${build.jdk7.docs.dir}"/> |
614 |
> |
<target name="4jdk7docs" |
615 |
> |
description="Builds javadocs for src/jdk7 to dist dir"> |
616 |
|
|
617 |
< |
<javadoc destdir="${build.jdk7.docs.dir}" |
617 |
> |
<delete dir="${dist.4jdk7.docs.dir}"/> |
618 |
> |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
619 |
> |
|
620 |
> |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
621 |
|
packagenames="none" |
622 |
|
link="${jdkapi7docs.url}" |
623 |
< |
overview="${jdk7src.dir}/intro.html" |
624 |
< |
sourcepath="${jdk7src.dir}" |
565 |
< |
bootclasspath="${bootclasspath6}" |
623 |
> |
overview="${4jdk7src.dir}/intro.html" |
624 |
> |
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
625 |
|
classpath="" |
626 |
< |
source="1.6" |
627 |
< |
executable="${javadoc7}" |
628 |
< |
additionalparam="-XDignore.symbol.file=true" > |
570 |
< |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
626 |
> |
executable="${javadoc7}"> |
627 |
> |
<arg value="-XDignore.symbol.file=true"/> |
628 |
> |
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
629 |
|
<include name="**/*.java"/> |
630 |
|
</fileset> |
631 |
|
</javadoc> |
633 |
|
</target> |
634 |
|
|
635 |
|
|
636 |
< |
<target name="jdk7dist" |
637 |
< |
depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs" |
636 |
> |
<target name="4jdk7dist" |
637 |
> |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs" |
638 |
|
description="Puts all distributable products in single hierarchy"/> |
639 |
|
|
640 |
|
|
641 |
|
|
642 |
< |
<target name="jdk7clean" |
643 |
< |
description="Removes all build products"> |
642 |
> |
<target name="4jdk7clean" |
643 |
> |
description="Removes all 4jdk7 build products"> |
644 |
|
|
645 |
< |
<delete dir="${build.jdk7.dir}"/> |
645 |
> |
<delete dir="${build.4jdk7.dir}"/> |
646 |
|
|
647 |
|
</target> |
648 |
|
|
649 |
|
|
650 |
|
|
651 |
< |
<target name="jdk7dist-clean" |
651 |
> |
<target name="4jdk7dist-clean" |
652 |
|
description="Removes all build and distribution products"> |
653 |
|
|
654 |
|
</target> |
655 |
|
|
656 |
< |
<target name="jdk7dist-docs" |
657 |
< |
description="Builds javadocs without custom tags to dist folder"> |
656 |
> |
<target name="4jdk7dist-jar" |
657 |
> |
depends="4jdk7clean, 4jdk7compile"> |
658 |
|
|
659 |
< |
<delete dir="${dist.jdk7.docs.dir}"/> |
602 |
< |
<mkdir dir="${dist.jdk7.docs.dir}"/> |
603 |
< |
|
604 |
< |
<javadoc destdir="${dist.jdk7.docs.dir}" |
605 |
< |
packagenames="none" |
606 |
< |
link="${jdkapi7docs.url}" |
607 |
< |
overview="${jdk7src.dir}/intro.html" |
608 |
< |
sourcepath="${jdk7src.dir}" |
609 |
< |
classpath="" |
610 |
< |
executable="${javadoc7}" |
611 |
< |
bootclasspath="${bootclasspath6}" |
612 |
< |
source="1.6"> |
613 |
< |
<arg value="-XDignore.symbol.file=true"/> |
614 |
< |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
615 |
< |
<include name="**/*.java"/> |
616 |
< |
</fileset> |
617 |
< |
</javadoc> |
659 |
> |
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
660 |
|
|
661 |
|
</target> |
662 |
|
|
621 |
– |
<target name="jdk7dist-jar" |
622 |
– |
depends="jdk7clean, jdk7jar"> |
623 |
– |
|
624 |
– |
<copy file="${jdk7product.jar}" todir="${dist.dir}"/> |
625 |
– |
|
626 |
– |
</target> |
663 |
|
|
664 |
|
<!-- jsr166x --> |
665 |
|
|
630 |
– |
|
666 |
|
<target name="jsr166xcompile" |
667 |
< |
depends="init, configure-compiler" |
668 |
< |
description="Compiles jsr166x sources"> |
667 |
> |
depends="configure-compiler" |
668 |
> |
description="Compiles jsr166x sources to build dir"> |
669 |
|
|
670 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
670 |
> |
<mkdir dir="${build.jsr166x.classes.dir}"/> |
671 |
|
|
672 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
673 |
< |
destdir="${build.jsr166x.dir}" |
674 |
< |
debug="${build.debug}" |
675 |
< |
debuglevel="${build.debuglevel}" |
676 |
< |
deprecation="${build.deprecation}" |
677 |
< |
source="${build.sourcelevel}" |
678 |
< |
fork="true"> |
672 |
> |
<javac srcdir="${topsrc.dir}" |
673 |
> |
destdir="${build.jsr166x.classes.dir}" |
674 |
> |
debug="${build.debug}" |
675 |
> |
debuglevel="${build.debuglevel}" |
676 |
> |
deprecation="${build.deprecation}" |
677 |
> |
classpath="" |
678 |
> |
source="5" |
679 |
> |
bootclasspath="${bootclasspath6}" |
680 |
> |
includeAntRuntime="false" |
681 |
> |
includeJavaRuntime="false" |
682 |
> |
executable="${javac7}" |
683 |
> |
fork="true"> |
684 |
|
|
685 |
< |
<include name="**/*.java"/> |
685 |
> |
<include name="jsr166x/**/*.java"/> |
686 |
|
<compilerarg line="${build.args}"/> |
687 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
688 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
689 |
|
|
690 |
|
</javac> |
691 |
|
|
697 |
|
depends="jsr166xcompile" |
698 |
|
description="Builds library jar from compiled sources"> |
699 |
|
|
700 |
< |
<mkdir dir="${build.jsr166xlib.dir}"/> |
701 |
< |
|
661 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
662 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
700 |
> |
<jar destfile="${jsr166x.jar}"> |
701 |
> |
<fileset dir="${build.jsr166x.classes.dir}"/> |
702 |
|
</jar> |
703 |
|
|
704 |
|
</target> |
706 |
|
|
707 |
|
|
708 |
|
<target name="jsr166xdocs" |
709 |
< |
description="Builds javadocs with custom tags to build folder"> |
709 |
> |
description="Builds javadocs to dist dir"> |
710 |
|
|
711 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
712 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
711 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
712 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
713 |
|
|
714 |
< |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
715 |
< |
packagenames="jsr166x" |
714 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
715 |
> |
packagenames="jsr166x.*" |
716 |
|
link="${jdkapidocs.url}" |
717 |
< |
source="${build.sourcelevel}" |
718 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
717 |
> |
source="5" |
718 |
> |
bootclasspath="${bootclasspath6}" |
719 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
720 |
> |
executable="${javadoc7}" |
721 |
|
additionalparam="-XDignore.symbol.file=true" /> |
722 |
|
|
723 |
|
</target> |
724 |
|
|
725 |
|
|
726 |
|
<target name="jsr166xdist" |
727 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
727 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs" |
728 |
|
description="Puts all distributable products in single hierarchy"/> |
729 |
|
|
730 |
|
|
731 |
|
|
732 |
|
<target name="jsr166xclean" |
733 |
< |
description="Removes all build products"> |
733 |
> |
description="Removes all jsr166x build products"> |
734 |
|
|
735 |
|
<delete dir="${build.jsr166x.dir}"/> |
695 |
– |
<delete dir="${build.jsr166xlib.dir}"/> |
736 |
|
|
737 |
|
</target> |
738 |
|
|
744 |
|
</target> |
745 |
|
|
746 |
|
|
707 |
– |
|
708 |
– |
<target name="jsr166xdist-docs" |
709 |
– |
description="Builds javadocs without custom tags to dist folder"> |
710 |
– |
|
711 |
– |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
712 |
– |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
713 |
– |
|
714 |
– |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
715 |
– |
packagenames="jsr166x" |
716 |
– |
link="${jdkapidocs.url}" |
717 |
– |
source="${build.sourcelevel}" |
718 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
719 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
720 |
– |
|
721 |
– |
</target> |
722 |
– |
|
747 |
|
<target name="jsr166xdist-jar" |
748 |
|
depends="jsr166xclean, jsr166xjar"> |
749 |
|
|
750 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
750 |
> |
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
751 |
|
|
752 |
|
</target> |
753 |
|
|
755 |
|
|
756 |
|
|
757 |
|
<target name="jsr166ycompile" |
758 |
< |
depends="init, configure-compiler" |
758 |
> |
depends="configure-compiler" |
759 |
|
description="Compiles jsr166y sources"> |
760 |
|
|
761 |
< |
<mkdir dir="${build.jsr166y.dir}"/> |
761 |
> |
<mkdir dir="${build.jsr166y.classes.dir}"/> |
762 |
|
|
763 |
< |
<javac srcdir="${jsr166ysrc.dir}" |
764 |
< |
destdir="${build.jsr166y.dir}" |
765 |
< |
debug="${build.debug}" |
766 |
< |
debuglevel="${build.debuglevel}" |
767 |
< |
deprecation="${build.deprecation}" |
768 |
< |
source="${build.sourcelevel}" |
769 |
< |
fork="true"> |
763 |
> |
<javac srcdir="${topsrc.dir}" |
764 |
> |
destdir="${build.jsr166y.classes.dir}" |
765 |
> |
debug="${build.debug}" |
766 |
> |
debuglevel="${build.debuglevel}" |
767 |
> |
deprecation="${build.deprecation}" |
768 |
> |
source="6" |
769 |
> |
classpath="" |
770 |
> |
bootclasspath="${bootclasspath6}" |
771 |
> |
includeAntRuntime="false" |
772 |
> |
includeJavaRuntime="false" |
773 |
> |
executable="${javac7}" |
774 |
> |
fork="true"> |
775 |
|
|
776 |
< |
<include name="**/*.java"/> |
776 |
> |
<include name="jsr166y/**/*.java"/> |
777 |
|
<compilerarg line="${build.args}"/> |
778 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
779 |
< |
<compilerarg value="${bootclasspath.args}"/> |
751 |
< |
|
752 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
753 |
< |
|
779 |
> |
<compilerarg value="-Xlint:all"/> |
780 |
|
</javac> |
755 |
– |
|
781 |
|
</target> |
782 |
|
|
783 |
|
|
759 |
– |
|
784 |
|
<target name="jsr166yjar" |
785 |
|
depends="jsr166ycompile" |
786 |
|
description="Builds library jar from compiled sources"> |
787 |
|
|
788 |
< |
<mkdir dir="${build.jsr166ylib.dir}"/> |
789 |
< |
|
766 |
< |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
767 |
< |
<fileset dir="${build.jsr166y.dir}"/> |
788 |
> |
<jar destfile="${jsr166y.jar}" index="true"> |
789 |
> |
<fileset dir="${build.jsr166y.classes.dir}"/> |
790 |
|
</jar> |
791 |
|
|
792 |
|
</target> |
794 |
|
|
795 |
|
|
796 |
|
<target name="jsr166ydocs" |
797 |
< |
description="Builds javadocs with custom tags to build folder"> |
797 |
> |
description="Builds javadocs to dist dir"> |
798 |
|
|
799 |
< |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
800 |
< |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
799 |
> |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
800 |
> |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
801 |
|
|
802 |
< |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
803 |
< |
packagenames="jsr166y" |
802 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
803 |
> |
packagenames="jsr166y.*" |
804 |
|
link="${jdkapidocs.url}" |
805 |
< |
source="${build.sourcelevel}" |
806 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
805 |
> |
source="6" |
806 |
> |
bootclasspath="${bootclasspath6}" |
807 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
808 |
> |
executable="${javadoc7}" |
809 |
|
additionalparam="-XDignore.symbol.file=true" /> |
810 |
|
|
811 |
|
</target> |
812 |
|
|
813 |
|
|
814 |
|
<target name="jsr166ydist" |
815 |
< |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
815 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs" |
816 |
|
description="Puts all distributable products in single hierarchy"/> |
817 |
|
|
818 |
|
|
819 |
|
|
820 |
|
<target name="jsr166yclean" |
821 |
< |
description="Removes all build products"> |
821 |
> |
description="Removes all jsr166y build products"> |
822 |
|
|
823 |
|
<delete dir="${build.jsr166y.dir}"/> |
800 |
– |
<delete dir="${build.jsr166ylib.dir}"/> |
824 |
|
|
825 |
|
</target> |
826 |
|
|
831 |
|
|
832 |
|
</target> |
833 |
|
|
811 |
– |
<target name="jsr166ydist-docs" |
812 |
– |
description="Builds javadocs without custom tags to dist folder"> |
813 |
– |
|
814 |
– |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
815 |
– |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
816 |
– |
|
817 |
– |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
818 |
– |
packagenames="jsr166y" |
819 |
– |
link="${jdkapidocs.url}" |
820 |
– |
source="${build.sourcelevel}" |
821 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
822 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
823 |
– |
|
824 |
– |
</target> |
825 |
– |
|
834 |
|
<target name="jsr166ydist-jar" |
835 |
|
depends="jsr166yclean, jsr166yjar"> |
836 |
|
|
837 |
< |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
837 |
> |
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
838 |
|
|
839 |
|
</target> |
840 |
|
|
843 |
|
|
844 |
|
|
845 |
|
<target name="extra166ycompile" |
846 |
< |
depends="init, configure-compiler, jsr166ycompile" |
846 |
> |
depends="configure-compiler, jsr166yjar" |
847 |
|
description="Compiles extra166y sources"> |
848 |
|
|
849 |
< |
<mkdir dir="${build.extra166y.dir}"/> |
849 |
> |
<mkdir dir="${build.extra166y.classes.dir}"/> |
850 |
|
|
851 |
< |
<javac srcdir="${extra166ysrc.dir}" |
852 |
< |
destdir="${build.extra166y.dir}" |
853 |
< |
debug="${build.debug}" |
854 |
< |
classpath="${jsr166yproduct.jar}" |
855 |
< |
debuglevel="${build.debuglevel}" |
856 |
< |
deprecation="${build.deprecation}" |
857 |
< |
source="${build.sourcelevel}" |
858 |
< |
fork="true"> |
851 |
> |
<javac srcdir="${topsrc.dir}" |
852 |
> |
destdir="${build.extra166y.classes.dir}" |
853 |
> |
debug="${build.debug}" |
854 |
> |
debuglevel="${build.debuglevel}" |
855 |
> |
deprecation="${build.deprecation}" |
856 |
> |
classpath="" |
857 |
> |
source="6" |
858 |
> |
bootclasspath="${jsr166y.jar}:${bootclasspath6}" |
859 |
> |
includeAntRuntime="false" |
860 |
> |
includeJavaRuntime="false" |
861 |
> |
executable="${javac7}" |
862 |
> |
fork="true"> |
863 |
|
|
864 |
< |
<include name="**/*.java"/> |
864 |
> |
<include name="extra166y/**/*.java"/> |
865 |
|
<compilerarg line="${build.args}"/> |
866 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
867 |
< |
<compilerarg value="${bootclasspath.args}"/> |
856 |
< |
|
857 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
867 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
868 |
|
|
869 |
|
</javac> |
870 |
|
|
876 |
|
depends="extra166ycompile" |
877 |
|
description="Builds library jar from compiled sources"> |
878 |
|
|
879 |
< |
<mkdir dir="${build.extra166ylib.dir}"/> |
880 |
< |
|
871 |
< |
<jar destfile="${extra166yproduct.jar}" index="true"> |
872 |
< |
<fileset dir="${build.extra166y.dir}"/> |
879 |
> |
<jar destfile="${extra166y.jar}" index="true"> |
880 |
> |
<fileset dir="${build.extra166y.classes.dir}"/> |
881 |
|
</jar> |
882 |
|
|
883 |
|
</target> |
885 |
|
|
886 |
|
|
887 |
|
<target name="extra166ydocs" |
888 |
< |
description="Builds javadocs with custom tags to build folder"> |
888 |
> |
description="Builds javadocs to build dir"> |
889 |
|
|
890 |
< |
<delete dir="${build.extra166yjavadocs.dir}"/> |
891 |
< |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
890 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
891 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
892 |
|
|
893 |
< |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
894 |
< |
packagenames="extra166y" |
893 |
> |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
894 |
> |
packagenames="extra166y.*" |
895 |
|
link="${jdkapidocs.url}" |
896 |
< |
source="${build.sourcelevel}" |
897 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
896 |
> |
source="6" |
897 |
> |
bootclasspath="${bootclasspath6}" |
898 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
899 |
> |
executable="${javadoc7}" |
900 |
|
additionalparam="-XDignore.symbol.file=true" /> |
901 |
|
|
902 |
|
</target> |
903 |
|
|
904 |
|
|
905 |
|
<target name="extra166ydist" |
906 |
< |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
906 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs" |
907 |
|
description="Puts all distributable products in single hierarchy"/> |
908 |
|
|
909 |
|
|
910 |
|
|
911 |
|
<target name="extra166yclean" |
912 |
< |
description="Removes all build products"> |
912 |
> |
description="Removes all extra166y build products"> |
913 |
|
|
914 |
|
<delete dir="${build.extra166y.dir}"/> |
905 |
– |
<delete dir="${build.extra166ylib.dir}"/> |
915 |
|
|
916 |
|
</target> |
917 |
|
|
922 |
|
|
923 |
|
</target> |
924 |
|
|
916 |
– |
<target name="extra166ydist-docs" |
917 |
– |
description="Builds javadocs without custom tags to dist folder"> |
918 |
– |
|
919 |
– |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
920 |
– |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
921 |
– |
|
922 |
– |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
923 |
– |
packagenames="extra166y" |
924 |
– |
link="${jdkapidocs.url}" |
925 |
– |
source="${build.sourcelevel}" |
926 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
927 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
928 |
– |
|
929 |
– |
</target> |
930 |
– |
|
925 |
|
<target name="extra166ydist-jar" |
926 |
|
depends="extra166yclean, extra166yjar"> |
927 |
|
|
928 |
< |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
928 |
> |
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
929 |
|
|
930 |
|
</target> |
931 |
|
|
935 |
|
depends="configure-compiler" |
936 |
|
description="Compiles jsr166e sources"> |
937 |
|
|
938 |
< |
<mkdir dir="${build.jsr166e.dir}"/> |
938 |
> |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
939 |
|
|
940 |
|
<javac srcdir="${topsrc.dir}" |
941 |
< |
destdir="${build.jsr166e.dir}" |
941 |
> |
destdir="${build.jsr166e.classes.dir}" |
942 |
|
debug="${build.debug}" |
943 |
|
debuglevel="${build.debuglevel}" |
944 |
|
deprecation="${build.deprecation}" |
945 |
< |
source="1.7" |
945 |
> |
source="7" |
946 |
|
classpath="" |
947 |
|
includeAntRuntime="false" |
948 |
|
includeJavaRuntime="false" |
964 |
|
depends="jsr166ecompile" |
965 |
|
description="Builds library jar from compiled sources"> |
966 |
|
|
967 |
< |
<mkdir dir="${build.jsr166elib.dir}"/> |
968 |
< |
|
975 |
< |
<jar destfile="${jsr166eproduct.jar}" index="true"> |
976 |
< |
<fileset dir="${build.jsr166e.dir}"/> |
967 |
> |
<jar destfile="${jsr166e.jar}" index="true"> |
968 |
> |
<fileset dir="${build.jsr166e.classes.dir}"/> |
969 |
|
</jar> |
970 |
|
|
971 |
|
</target> |
973 |
|
|
974 |
|
|
975 |
|
<target name="jsr166edocs" |
976 |
< |
description="Builds javadocs with custom tags to build folder"> |
976 |
> |
description="Builds javadocs to build dir"> |
977 |
|
|
978 |
< |
<delete dir="${build.jsr166ejavadocs.dir}"/> |
979 |
< |
<mkdir dir="${build.jsr166ejavadocs.dir}"/> |
978 |
> |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
979 |
> |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
980 |
|
|
981 |
< |
<javadoc destdir="${build.jsr166ejavadocs.dir}" |
982 |
< |
packagenames="jsr166e,jsr166e.extra" |
983 |
< |
link="${jdkapi7docs.url}" |
984 |
< |
source="1.7" |
985 |
< |
sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}" |
981 |
> |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
982 |
> |
packagenames="jsr166e.*" |
983 |
> |
link="${jdkapidocs.url}" |
984 |
> |
source="7" |
985 |
> |
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
986 |
|
executable="${javadoc7}" |
987 |
|
additionalparam="-XDignore.symbol.file=true" > |
996 |
– |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
997 |
– |
<include name="jsr166e/**/*.java"/> |
998 |
– |
</fileset> |
988 |
|
</javadoc> |
989 |
|
|
990 |
|
</target> |
991 |
|
|
992 |
|
|
993 |
|
<target name="jsr166edist" |
994 |
< |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs" |
994 |
> |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs" |
995 |
|
description="Puts all distributable products in single hierarchy"/> |
996 |
|
|
997 |
|
|
998 |
|
|
999 |
|
<target name="jsr166eclean" |
1000 |
< |
description="Removes all build products"> |
1000 |
> |
description="Removes all jsr166e build products"> |
1001 |
|
|
1002 |
|
<delete dir="${build.jsr166e.dir}"/> |
1014 |
– |
<delete dir="${build.jsr166elib.dir}"/> |
1003 |
|
|
1004 |
|
</target> |
1005 |
|
|
1006 |
|
|
1019 |
– |
|
1007 |
|
<target name="jsr166edist-clean" |
1008 |
|
description="Removes all build and distribution products"> |
1009 |
|
|
1010 |
|
</target> |
1011 |
|
|
1025 |
– |
<target name="jsr166edist-docs" |
1026 |
– |
description="Builds javadocs without custom tags to dist folder"> |
1027 |
– |
|
1028 |
– |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1029 |
– |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
1030 |
– |
|
1031 |
– |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
1032 |
– |
packagenames="jsr166e,jsr166e.extra" |
1033 |
– |
link="${jdkapidocs.url}" |
1034 |
– |
source="1.7" |
1035 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
1036 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
1037 |
– |
|
1038 |
– |
</target> |
1039 |
– |
|
1012 |
|
<target name="jsr166edist-jar" |
1013 |
|
depends="jsr166eclean, jsr166ejar"> |
1014 |
|
|
1015 |
< |
<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/> |
1015 |
> |
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1016 |
|
|
1017 |
|
</target> |
1018 |
|
|