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. |
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"/> |
43 |
– |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
44 |
– |
<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.tck.classes.dir" location="${build.jdk7.dir}/tck/classes"/> |
51 |
< |
<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"/> |
54 |
– |
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
55 |
– |
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
56 |
– |
|
56 |
|
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
58 |
– |
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
59 |
– |
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
60 |
– |
|
57 |
|
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
62 |
– |
<property name="build.jsr166elib.dir" location="${build.dir}/jsr166elib"/> |
63 |
– |
<property name="build.jsr166ejavadocs.dir" location="${build.dir}/jsr166ejavadocs"/> |
64 |
– |
|
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="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"/> |
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> |
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"/> |
121 |
– |
<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 |
+ |
<!-- Define the "jtreg" task --> |
152 |
+ |
<!-- See the docs in "jtreg -onlineHelp" --> |
153 |
+ |
<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant" |
154 |
+ |
classpath="${lib.dir}/jtreg.jar" /> |
155 |
+ |
|
156 |
|
<!-- Test classpath --> |
157 |
|
<path id="test.classpath"> |
158 |
|
<pathelement location="${build.testcases.dir}"/> |
164 |
|
<pathelement location="${build.loops.dir}"/> |
165 |
|
</path> |
166 |
|
|
167 |
+ |
<!-- Support @jls tag, used in jdk8+ javadoc --> |
168 |
+ |
<!-- TODO: How do we get &trade to work? --> |
169 |
+ |
<!-- TODO: Why isn't @jls a "standard" tag? --> |
170 |
+ |
<!-- property name="javadoc.jls.cite" value="The Java™ Language Specification" --> |
171 |
+ |
<property name="javadoc.jls.cite" value="The Java Language Specification"/> |
172 |
+ |
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
173 |
|
|
174 |
|
<!-- Main targets --> |
175 |
|
|
176 |
|
<target name="dists" |
177 |
< |
depends="dist, jsr166xdist, jsr166ydist,jsr166edist, extra166ydist" |
177 |
> |
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
178 |
|
description="Builds all public jars and docs"/> |
179 |
|
|
180 |
|
<target name="compile" |
181 |
< |
depends="init, configure-compiler" |
182 |
< |
description="Compiles main sources to build folder"> |
181 |
> |
depends="configure-compiler" |
182 |
> |
description="Compiles src/main sources to build dir"> |
183 |
|
|
184 |
|
<mkdir dir="${build.classes.dir}"/> |
185 |
|
|
186 |
|
<javac srcdir="${src.dir}" |
187 |
< |
destdir="${build.classes.dir}" |
188 |
< |
debug="${build.debug}" |
189 |
< |
debuglevel="${build.debuglevel}" |
190 |
< |
deprecation="${build.deprecation}" |
191 |
< |
source="${build.sourcelevel}" |
192 |
< |
fork="true"> |
187 |
> |
destdir="${build.classes.dir}" |
188 |
> |
debug="${build.debug}" |
189 |
> |
debuglevel="${build.debuglevel}" |
190 |
> |
deprecation="${build.deprecation}" |
191 |
> |
classpath="" |
192 |
> |
includeAntRuntime="false" |
193 |
> |
includeJavaRuntime="false" |
194 |
> |
executable="${javac8}" |
195 |
> |
fork="true"> |
196 |
|
|
197 |
|
<include name="**/*.java"/> |
198 |
+ |
<compilerarg line="${build.args}"/> |
199 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
200 |
+ |
<compilerarg value="-Xlint:all"/> |
201 |
|
|
202 |
|
<!-- |
203 |
|
<exclude name="java/lang/**"/> |
215 |
|
depends="compile" |
216 |
|
description="Builds library jar from compiled sources"> |
217 |
|
|
204 |
– |
<mkdir dir="${build.lib.dir}"/> |
205 |
– |
|
218 |
|
<jar destfile="${product.jar}"> |
219 |
|
<fileset dir="${build.classes.dir}"/> |
220 |
|
</jar> |
224 |
|
|
225 |
|
|
226 |
|
<target name="test" |
227 |
< |
depends="init, configure-tests, report-tests" |
227 |
> |
depends="configure-tests, report-tests" |
228 |
|
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
229 |
|
|
230 |
|
|
231 |
|
|
232 |
|
<target name="docs" |
233 |
< |
description="Builds javadocs with custom tags to build folder"> |
233 |
> |
description="Builds javadocs for src/main to dist dir"> |
234 |
|
|
235 |
< |
<delete dir="${build.javadocs.dir}"/> |
236 |
< |
<mkdir dir="${build.javadocs.dir}"/> |
235 |
> |
<delete dir="${dist.javadocs.dir}"/> |
236 |
> |
<mkdir dir="${dist.javadocs.dir}"/> |
237 |
|
|
238 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
239 |
|
<!-- sourcepath for packages --> |
240 |
|
|
241 |
< |
<javadoc destdir="${build.javadocs.dir}" |
241 |
> |
<javadoc destdir="${dist.javadocs.dir}" |
242 |
|
packagenames="none" |
243 |
< |
link="${jdkapidocs.url}" |
243 |
> |
link="${jdkapi8docs.url}" |
244 |
|
overview="${src.dir}/intro.html" |
245 |
< |
sourcepath="${src.dir}:${jdksrc.dir}" |
246 |
< |
additionalparam="-XDignore.symbol.file=true" > |
245 |
> |
sourcepath="${src.dir}:${jdk8src.dir}" |
246 |
> |
classpath="" |
247 |
> |
executable="${javadoc8}"> |
248 |
> |
<arg value="-XDignore.symbol.file=true"/> |
249 |
> |
<arg value="-tag"/> |
250 |
> |
<arg value="${javadoc.jls.option}"/> |
251 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
252 |
|
<include name="**/*.java"/> |
253 |
|
</fileset> |
258 |
|
|
259 |
|
|
260 |
|
<target name="dist" |
261 |
< |
depends="init, dist-clean, dist-jar, dist-docs" |
261 |
> |
depends="dist-clean, dist-jar, docs" |
262 |
|
description="Puts all distributable products in single hierarchy"/> |
263 |
|
|
264 |
|
|
286 |
|
description="Removes all build products"> |
287 |
|
|
288 |
|
<delete dir="${build.dir}"/> |
273 |
– |
<delete dir="${build.classes.dir}"/> |
274 |
– |
<delete dir="${build.lib.dir}"/> |
289 |
|
|
290 |
|
</target> |
291 |
|
|
300 |
|
|
301 |
|
|
302 |
|
|
289 |
– |
<target name="dist-docs" |
290 |
– |
description="Builds javadocs without custom tags to dist folder"> |
291 |
– |
|
292 |
– |
<delete dir="${dist.javadocs.dir}"/> |
293 |
– |
<mkdir dir="${dist.javadocs.dir}"/> |
294 |
– |
|
295 |
– |
<!-- the packagenames="none" hack below prevents scanning the --> |
296 |
– |
<!-- sourcepath for packages --> |
297 |
– |
|
298 |
– |
<javadoc destdir="${dist.javadocs.dir}" |
299 |
– |
packagenames="none" |
300 |
– |
link="${jdkapidocs.url}" |
301 |
– |
overview="${src.dir}/intro.html" |
302 |
– |
sourcepath="${src.dir}:${jdksrc.dir}" |
303 |
– |
additionalparam="-XDignore.symbol.file=true" > |
304 |
– |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
305 |
– |
<include name="**/*.java"/> |
306 |
– |
</fileset> |
307 |
– |
</javadoc> |
308 |
– |
|
309 |
– |
</target> |
310 |
– |
|
311 |
– |
|
312 |
– |
|
303 |
|
<!-- Internal targets --> |
304 |
|
|
305 |
|
|
316 |
– |
<target name="init"> |
317 |
– |
|
318 |
– |
<!-- Version is kept in a separate file --> |
319 |
– |
<loadfile property="version" srcFile="version.properties"/> |
320 |
– |
<echo>Building JSR-166 version ${version}</echo> |
321 |
– |
<echo>java.home is ${java.home}</echo> |
322 |
– |
|
323 |
– |
</target> |
324 |
– |
|
325 |
– |
|
306 |
|
<target name="dist-jar" |
307 |
|
depends="clean, jar"> |
308 |
|
|
317 |
|
<mkdir dir="${build.testcases.dir}"/> |
318 |
|
|
319 |
|
<javac srcdir="${tck.src.dir}" |
320 |
< |
destdir="${build.testcases.dir}" |
321 |
< |
debug="${build.debug}" |
322 |
< |
debuglevel="${build.debuglevel}" |
323 |
< |
deprecation="${build.deprecation}" |
324 |
< |
source="${build.sourcelevel}" |
325 |
< |
fork="true"> |
320 |
> |
destdir="${build.testcases.dir}" |
321 |
> |
debug="${build.debug}" |
322 |
> |
debuglevel="${build.debuglevel}" |
323 |
> |
deprecation="${build.deprecation}" |
324 |
> |
source="6" |
325 |
> |
classpath="${junit.jar}" |
326 |
> |
bootclasspath="${product.jar}:${bootclasspath6}" |
327 |
> |
includeAntRuntime="false" |
328 |
> |
includeJavaRuntime="false" |
329 |
> |
executable="${javac8}" |
330 |
> |
fork="true"> |
331 |
|
|
332 |
< |
<compilerarg value="${bootclasspath.args}"/> |
332 |
> |
<include name="**/*.java"/> |
333 |
|
<compilerarg line="${build.args}"/> |
334 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
335 |
< |
|
351 |
< |
<classpath refid="test.classpath"/> |
335 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
336 |
|
|
337 |
|
</javac> |
338 |
|
|
339 |
|
<javac srcdir="${test.src.dir}" |
340 |
< |
destdir="${build.testcases.dir}" |
341 |
< |
debug="${build.debug}" |
342 |
< |
debuglevel="${build.debuglevel}" |
343 |
< |
deprecation="${build.deprecation}" |
344 |
< |
source="${build.sourcelevel}" |
345 |
< |
fork="true"> |
340 |
> |
destdir="${build.testcases.dir}" |
341 |
> |
debug="${build.debug}" |
342 |
> |
debuglevel="${build.debuglevel}" |
343 |
> |
deprecation="${build.deprecation}" |
344 |
> |
source="6" |
345 |
> |
classpath="" |
346 |
> |
bootclasspath="${product.jar}:${bootclasspath6}" |
347 |
> |
includeAntRuntime="false" |
348 |
> |
includeJavaRuntime="false" |
349 |
> |
executable="${javac8}" |
350 |
> |
fork="true"> |
351 |
|
|
352 |
< |
<include name="jsr166/test/**"/> |
352 |
> |
<include name="jsr166/test/**/*.java"/> |
353 |
|
|
365 |
– |
<compilerarg value="${bootclasspath.args}"/> |
354 |
|
<compilerarg line="${build.args}"/> |
355 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
356 |
< |
|
369 |
< |
<classpath refid="test.classpath"/> |
356 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
357 |
|
|
358 |
|
</javac> |
359 |
|
|
370 |
|
<compilerarg line="${build.args}"/> |
371 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
372 |
|
|
386 |
– |
<classpath refid="test.classpath"/> |
387 |
– |
|
373 |
|
</javac> |
374 |
|
--> |
375 |
|
|
389 |
|
errorProperty="junit.failed" |
390 |
|
failureProperty="junit.failed" |
391 |
|
dir="${build.reports.dir}" |
392 |
+ |
jvm="${java8}" |
393 |
|
fork="true"> |
394 |
|
|
395 |
< |
<jvmarg value="${bootclasspath.args}"/> |
395 |
> |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
396 |
|
<jvmarg value="-server"/> |
397 |
|
<jvmarg value="-showversion"/> |
398 |
|
|
493 |
|
<!-- Various demos and test programs --> |
494 |
|
|
495 |
|
|
496 |
< |
<target name="loops" depends="init, configure-compiler" |
496 |
> |
<target name="loops" depends="configure-compiler" |
497 |
|
description="Benchmark from Doug Lea's AQS paper"> |
498 |
|
|
499 |
|
<mkdir dir="${build.loops.dir}"/> |
519 |
|
</target> |
520 |
|
|
521 |
|
|
522 |
< |
<!-- jdk7 --> |
522 |
> |
<!-- jsr166 4jdk7 --> |
523 |
|
|
524 |
|
|
525 |
< |
<target name="jdk7compile" |
525 |
> |
<target name="4jdk7compile" |
526 |
|
depends="configure-compiler" |
527 |
< |
description="Compiles src/jdk7 sources"> |
527 |
> |
description="Compiles src/jdk7 sources, targeting jdk7"> |
528 |
|
|
529 |
< |
<mkdir dir="${build.jdk7.classes.dir}"/> |
529 |
> |
<mkdir dir="${build.4jdk7.classes.dir}"/> |
530 |
|
|
531 |
< |
<javac srcdir="${jdk7src.dir}" |
532 |
< |
destdir="${build.jdk7.classes.dir}" |
531 |
> |
<javac srcdir="${4jdk7src.dir}" |
532 |
> |
destdir="${build.4jdk7.classes.dir}" |
533 |
|
debug="${build.debug}" |
534 |
|
debuglevel="${build.debuglevel}" |
535 |
|
deprecation="${build.deprecation}" |
536 |
< |
source="1.6" |
536 |
> |
source="6" |
537 |
|
classpath="" |
538 |
|
bootclasspath="${bootclasspath6}" |
539 |
|
includeAntRuntime="false" |
548 |
|
|
549 |
|
</javac> |
550 |
|
|
551 |
< |
<mkdir dir="${build.jdk7.lib.dir}"/> |
552 |
< |
|
567 |
< |
<jar destfile="${jdk7product.jar}" index="true"> |
568 |
< |
<fileset dir="${build.jdk7.classes.dir}"/> |
551 |
> |
<jar destfile="${4jdk7product.jar}" index="true"> |
552 |
> |
<fileset dir="${build.4jdk7.classes.dir}"/> |
553 |
|
</jar> |
554 |
|
|
555 |
< |
<mkdir dir="${build.jdk7.tck.classes.dir}"/> |
555 |
> |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
556 |
|
|
557 |
|
<javac srcdir="${tck.src.dir}" |
558 |
< |
destdir="${build.jdk7.tck.classes.dir}" |
558 |
> |
destdir="${build.4jdk7.tck.classes.dir}" |
559 |
|
debug="${build.debug}" |
560 |
|
debuglevel="${build.debuglevel}" |
561 |
|
deprecation="${build.deprecation}" |
562 |
< |
source="1.6" |
562 |
> |
source="6" |
563 |
|
classpath="${junit.jar}" |
564 |
< |
bootclasspath="${jdk7product.jar}:${bootclasspath6}" |
564 |
> |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
565 |
|
includeAntRuntime="false" |
566 |
|
includeJavaRuntime="false" |
567 |
|
executable="${javac7}" |
577 |
|
</target> |
578 |
|
|
579 |
|
|
580 |
< |
<target name="run-jdk7-tck-tests" |
581 |
< |
depends="jdk7compile" |
582 |
< |
description="Runs tck tests for jsr166-jdk7 directly"> |
580 |
> |
<target name="4jdk7-test-tck" |
581 |
> |
depends="4jdk7compile" |
582 |
> |
description="Runs tck tests for jsr166-4jdk7 directly"> |
583 |
|
<run-tck-tests |
584 |
|
jvm="${java7}" |
585 |
< |
tck.classes="${build.jdk7.tck.classes.dir}" |
586 |
< |
product.jar="${jdk7product.jar}"/> |
585 |
> |
tck.classes="${build.4jdk7.tck.classes.dir}" |
586 |
> |
product.jar="${4jdk7product.jar}"/> |
587 |
|
</target> |
588 |
|
|
589 |
|
|
590 |
< |
<target name="run-jdk7-tck-tests-via-junit-task" |
591 |
< |
depends="jdk7compile"> |
590 |
> |
<target name="4jdk7-test-tck-junit" |
591 |
> |
depends="4jdk7compile" |
592 |
> |
description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)"> |
593 |
|
|
594 |
|
<junit printsummary="true" |
595 |
|
showoutput="true" |
599 |
|
jvm="${java7}" |
600 |
|
fork="true"> |
601 |
|
|
602 |
< |
<jvmarg value="-Xbootclasspath/p:${jdk7product.jar}"/> |
602 |
> |
<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
603 |
|
<jvmarg value="-server"/> |
604 |
|
|
605 |
|
<classpath> |
606 |
|
<pathelement location="${junit.jar}"/> |
607 |
< |
<pathelement location="${build.jdk7.tck.classes.dir}"/> |
607 |
> |
<pathelement location="${build.4jdk7.tck.classes.dir}"/> |
608 |
|
</classpath> |
609 |
|
|
610 |
|
<formatter type="brief"/> |
615 |
|
</junit> |
616 |
|
</target> |
617 |
|
|
618 |
+ |
<target name="4jdk7-test-jtreg" |
619 |
+ |
depends="4jdk7compile" |
620 |
+ |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
621 |
+ |
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
622 |
+ |
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
623 |
+ |
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
624 |
+ |
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
625 |
+ |
<jtreg dir="${jtreg.src.dir}" |
626 |
+ |
jdk="${jdk7.home}" |
627 |
+ |
workDir="${build.4jdk7.dir}/JTwork" |
628 |
+ |
reportDir="${build.4jdk7.dir}/JTreport"> |
629 |
+ |
|
630 |
+ |
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
631 |
+ |
<arg value="-agentvm"/> |
632 |
+ |
<arg value="-v:nopass,fail"/> |
633 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
634 |
+ |
<arg value="-automatic"/> |
635 |
+ |
<arg value="-k:!ignore"/> |
636 |
+ |
</jtreg> |
637 |
+ |
</target> |
638 |
+ |
|
639 |
+ |
|
640 |
+ |
<target name="4jdk7-test" |
641 |
+ |
depends="4jdk7-test-tck, 4jdk7-test-jtreg" |
642 |
+ |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
643 |
+ |
</target> |
644 |
+ |
|
645 |
|
|
646 |
< |
<target name="jdk7docs" |
647 |
< |
description="Builds javadocs with custom tags to build folder"> |
646 |
> |
<target name="4jdk7docs" |
647 |
> |
description="Builds javadocs for src/jdk7 to dist dir"> |
648 |
|
|
649 |
< |
<delete dir="${build.jdk7.docs.dir}"/> |
650 |
< |
<mkdir dir="${build.jdk7.docs.dir}"/> |
649 |
> |
<delete dir="${dist.4jdk7.docs.dir}"/> |
650 |
> |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
651 |
|
|
652 |
< |
<javadoc destdir="${build.jdk7.docs.dir}" |
652 |
> |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
653 |
|
packagenames="none" |
654 |
|
link="${jdkapi7docs.url}" |
655 |
< |
overview="${jdk7src.dir}/intro.html" |
656 |
< |
sourcepath="${jdk7src.dir}" |
645 |
< |
bootclasspath="${bootclasspath6}" |
655 |
> |
overview="${4jdk7src.dir}/intro.html" |
656 |
> |
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
657 |
|
classpath="" |
658 |
< |
source="1.6" |
659 |
< |
executable="${javadoc7}" |
660 |
< |
additionalparam="-XDignore.symbol.file=true" > |
650 |
< |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
658 |
> |
executable="${javadoc7}"> |
659 |
> |
<arg value="-XDignore.symbol.file=true"/> |
660 |
> |
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
661 |
|
<include name="**/*.java"/> |
662 |
|
</fileset> |
663 |
|
</javadoc> |
665 |
|
</target> |
666 |
|
|
667 |
|
|
668 |
< |
<target name="jdk7dist" |
669 |
< |
depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs" |
668 |
> |
<target name="4jdk7dist" |
669 |
> |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs" |
670 |
|
description="Puts all distributable products in single hierarchy"/> |
671 |
|
|
672 |
|
|
673 |
|
|
674 |
< |
<target name="jdk7clean" |
675 |
< |
description="Removes all build products"> |
674 |
> |
<target name="4jdk7clean" |
675 |
> |
description="Removes all 4jdk7 build products"> |
676 |
|
|
677 |
< |
<delete dir="${build.jdk7.dir}"/> |
677 |
> |
<delete dir="${build.4jdk7.dir}"/> |
678 |
|
|
679 |
|
</target> |
680 |
|
|
681 |
|
|
682 |
|
|
683 |
< |
<target name="jdk7dist-clean" |
683 |
> |
<target name="4jdk7dist-clean" |
684 |
|
description="Removes all build and distribution products"> |
685 |
|
|
686 |
|
</target> |
687 |
|
|
688 |
< |
<target name="jdk7dist-docs" |
689 |
< |
description="Builds javadocs without custom tags to dist folder"> |
680 |
< |
|
681 |
< |
<delete dir="${dist.jdk7.docs.dir}"/> |
682 |
< |
<mkdir dir="${dist.jdk7.docs.dir}"/> |
688 |
> |
<target name="4jdk7dist-jar" |
689 |
> |
depends="4jdk7clean, 4jdk7compile"> |
690 |
|
|
691 |
< |
<javadoc destdir="${dist.jdk7.docs.dir}" |
685 |
< |
packagenames="none" |
686 |
< |
link="${jdkapi7docs.url}" |
687 |
< |
overview="${jdk7src.dir}/intro.html" |
688 |
< |
sourcepath="${jdk7src.dir}" |
689 |
< |
classpath="" |
690 |
< |
executable="${javadoc7}" |
691 |
< |
bootclasspath="${bootclasspath6}" |
692 |
< |
source="1.6"> |
693 |
< |
<arg value="-XDignore.symbol.file=true"/> |
694 |
< |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
695 |
< |
<include name="**/*.java"/> |
696 |
< |
</fileset> |
697 |
< |
</javadoc> |
691 |
> |
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
692 |
|
|
693 |
|
</target> |
694 |
|
|
701 |
– |
<target name="jdk7dist-jar" |
702 |
– |
depends="jdk7clean, jdk7compile"> |
703 |
– |
|
704 |
– |
<copy file="${jdk7product.jar}" todir="${dist.dir}"/> |
705 |
– |
|
706 |
– |
</target> |
695 |
|
|
696 |
|
<!-- jsr166x --> |
697 |
|
|
710 |
– |
|
698 |
|
<target name="jsr166xcompile" |
699 |
< |
depends="init, configure-compiler" |
700 |
< |
description="Compiles jsr166x sources"> |
699 |
> |
depends="configure-compiler" |
700 |
> |
description="Compiles jsr166x sources to build dir"> |
701 |
|
|
702 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
702 |
> |
<mkdir dir="${build.jsr166x.classes.dir}"/> |
703 |
|
|
704 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
705 |
< |
destdir="${build.jsr166x.dir}" |
706 |
< |
debug="${build.debug}" |
707 |
< |
debuglevel="${build.debuglevel}" |
708 |
< |
deprecation="${build.deprecation}" |
709 |
< |
source="${build.sourcelevel}" |
710 |
< |
fork="true"> |
704 |
> |
<javac srcdir="${topsrc.dir}" |
705 |
> |
destdir="${build.jsr166x.classes.dir}" |
706 |
> |
debug="${build.debug}" |
707 |
> |
debuglevel="${build.debuglevel}" |
708 |
> |
deprecation="${build.deprecation}" |
709 |
> |
classpath="" |
710 |
> |
source="5" |
711 |
> |
bootclasspath="${bootclasspath6}" |
712 |
> |
includeAntRuntime="false" |
713 |
> |
includeJavaRuntime="false" |
714 |
> |
executable="${javac7}" |
715 |
> |
fork="true"> |
716 |
|
|
717 |
< |
<include name="**/*.java"/> |
717 |
> |
<include name="jsr166x/**/*.java"/> |
718 |
|
<compilerarg line="${build.args}"/> |
719 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
720 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
721 |
|
|
722 |
|
</javac> |
723 |
|
|
729 |
|
depends="jsr166xcompile" |
730 |
|
description="Builds library jar from compiled sources"> |
731 |
|
|
732 |
< |
<mkdir dir="${build.jsr166xlib.dir}"/> |
733 |
< |
|
741 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
742 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
732 |
> |
<jar destfile="${jsr166x.jar}"> |
733 |
> |
<fileset dir="${build.jsr166x.classes.dir}"/> |
734 |
|
</jar> |
735 |
|
|
736 |
|
</target> |
738 |
|
|
739 |
|
|
740 |
|
<target name="jsr166xdocs" |
741 |
< |
description="Builds javadocs with custom tags to build folder"> |
741 |
> |
description="Builds javadocs to dist dir"> |
742 |
|
|
743 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
744 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
743 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
744 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
745 |
|
|
746 |
< |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
747 |
< |
packagenames="jsr166x" |
746 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
747 |
> |
packagenames="jsr166x.*" |
748 |
|
link="${jdkapidocs.url}" |
749 |
< |
source="${build.sourcelevel}" |
750 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
751 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
749 |
> |
source="5" |
750 |
> |
bootclasspath="${bootclasspath6}" |
751 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
752 |
> |
executable="${javadoc7}" |
753 |
> |
additionalparam="-XDignore.symbol.file=true"/> |
754 |
|
|
755 |
|
</target> |
756 |
|
|
757 |
|
|
758 |
|
<target name="jsr166xdist" |
759 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
759 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs" |
760 |
|
description="Puts all distributable products in single hierarchy"/> |
761 |
|
|
762 |
|
|
763 |
|
|
764 |
|
<target name="jsr166xclean" |
765 |
< |
description="Removes all build products"> |
765 |
> |
description="Removes all jsr166x build products"> |
766 |
|
|
767 |
|
<delete dir="${build.jsr166x.dir}"/> |
775 |
– |
<delete dir="${build.jsr166xlib.dir}"/> |
768 |
|
|
769 |
|
</target> |
770 |
|
|
776 |
|
</target> |
777 |
|
|
778 |
|
|
787 |
– |
|
788 |
– |
<target name="jsr166xdist-docs" |
789 |
– |
description="Builds javadocs without custom tags to dist folder"> |
790 |
– |
|
791 |
– |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
792 |
– |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
793 |
– |
|
794 |
– |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
795 |
– |
packagenames="jsr166x" |
796 |
– |
link="${jdkapidocs.url}" |
797 |
– |
source="${build.sourcelevel}" |
798 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
799 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
800 |
– |
|
801 |
– |
</target> |
802 |
– |
|
779 |
|
<target name="jsr166xdist-jar" |
780 |
|
depends="jsr166xclean, jsr166xjar"> |
781 |
|
|
782 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
782 |
> |
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
783 |
|
|
784 |
|
</target> |
785 |
|
|
787 |
|
|
788 |
|
|
789 |
|
<target name="jsr166ycompile" |
790 |
< |
depends="init, configure-compiler" |
790 |
> |
depends="configure-compiler" |
791 |
|
description="Compiles jsr166y sources"> |
792 |
|
|
793 |
< |
<mkdir dir="${build.jsr166y.dir}"/> |
793 |
> |
<mkdir dir="${build.jsr166y.classes.dir}"/> |
794 |
|
|
795 |
< |
<javac srcdir="${jsr166ysrc.dir}" |
796 |
< |
destdir="${build.jsr166y.dir}" |
797 |
< |
debug="${build.debug}" |
798 |
< |
debuglevel="${build.debuglevel}" |
799 |
< |
deprecation="${build.deprecation}" |
800 |
< |
source="${build.sourcelevel}" |
801 |
< |
fork="true"> |
795 |
> |
<javac srcdir="${topsrc.dir}" |
796 |
> |
destdir="${build.jsr166y.classes.dir}" |
797 |
> |
debug="${build.debug}" |
798 |
> |
debuglevel="${build.debuglevel}" |
799 |
> |
deprecation="${build.deprecation}" |
800 |
> |
source="6" |
801 |
> |
classpath="" |
802 |
> |
bootclasspath="${bootclasspath6}" |
803 |
> |
includeAntRuntime="false" |
804 |
> |
includeJavaRuntime="false" |
805 |
> |
executable="${javac7}" |
806 |
> |
fork="true"> |
807 |
|
|
808 |
< |
<include name="**/*.java"/> |
808 |
> |
<include name="jsr166y/**/*.java"/> |
809 |
|
<compilerarg line="${build.args}"/> |
810 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
811 |
< |
<compilerarg value="${bootclasspath.args}"/> |
831 |
< |
|
832 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
833 |
< |
|
811 |
> |
<compilerarg value="-Xlint:all"/> |
812 |
|
</javac> |
835 |
– |
|
813 |
|
</target> |
814 |
|
|
815 |
|
|
839 |
– |
|
816 |
|
<target name="jsr166yjar" |
817 |
|
depends="jsr166ycompile" |
818 |
|
description="Builds library jar from compiled sources"> |
819 |
|
|
820 |
< |
<mkdir dir="${build.jsr166ylib.dir}"/> |
821 |
< |
|
846 |
< |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
847 |
< |
<fileset dir="${build.jsr166y.dir}"/> |
820 |
> |
<jar destfile="${jsr166y.jar}" index="true"> |
821 |
> |
<fileset dir="${build.jsr166y.classes.dir}"/> |
822 |
|
</jar> |
823 |
|
|
824 |
|
</target> |
826 |
|
|
827 |
|
|
828 |
|
<target name="jsr166ydocs" |
829 |
< |
description="Builds javadocs with custom tags to build folder"> |
829 |
> |
description="Builds javadocs to dist dir"> |
830 |
|
|
831 |
< |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
832 |
< |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
831 |
> |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
832 |
> |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
833 |
|
|
834 |
< |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
835 |
< |
packagenames="jsr166y" |
834 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
835 |
> |
packagenames="jsr166y.*" |
836 |
|
link="${jdkapidocs.url}" |
837 |
< |
source="${build.sourcelevel}" |
838 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
839 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
837 |
> |
source="6" |
838 |
> |
bootclasspath="${bootclasspath6}" |
839 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
840 |
> |
executable="${javadoc7}" |
841 |
> |
additionalparam="-XDignore.symbol.file=true"/> |
842 |
|
|
843 |
|
</target> |
844 |
|
|
845 |
|
|
846 |
|
<target name="jsr166ydist" |
847 |
< |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
847 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs" |
848 |
|
description="Puts all distributable products in single hierarchy"/> |
849 |
|
|
850 |
|
|
851 |
|
|
852 |
|
<target name="jsr166yclean" |
853 |
< |
description="Removes all build products"> |
853 |
> |
description="Removes all jsr166y build products"> |
854 |
|
|
855 |
|
<delete dir="${build.jsr166y.dir}"/> |
880 |
– |
<delete dir="${build.jsr166ylib.dir}"/> |
856 |
|
|
857 |
|
</target> |
858 |
|
|
863 |
|
|
864 |
|
</target> |
865 |
|
|
891 |
– |
<target name="jsr166ydist-docs" |
892 |
– |
description="Builds javadocs without custom tags to dist folder"> |
893 |
– |
|
894 |
– |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
895 |
– |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
896 |
– |
|
897 |
– |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
898 |
– |
packagenames="jsr166y" |
899 |
– |
link="${jdkapidocs.url}" |
900 |
– |
source="${build.sourcelevel}" |
901 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
902 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
903 |
– |
|
904 |
– |
</target> |
905 |
– |
|
866 |
|
<target name="jsr166ydist-jar" |
867 |
|
depends="jsr166yclean, jsr166yjar"> |
868 |
|
|
869 |
< |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
869 |
> |
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
870 |
|
|
871 |
|
</target> |
872 |
|
|
875 |
|
|
876 |
|
|
877 |
|
<target name="extra166ycompile" |
878 |
< |
depends="init, configure-compiler, jsr166ycompile" |
878 |
> |
depends="configure-compiler, jsr166yjar" |
879 |
|
description="Compiles extra166y sources"> |
880 |
|
|
881 |
< |
<mkdir dir="${build.extra166y.dir}"/> |
881 |
> |
<mkdir dir="${build.extra166y.classes.dir}"/> |
882 |
|
|
883 |
< |
<javac srcdir="${extra166ysrc.dir}" |
884 |
< |
destdir="${build.extra166y.dir}" |
885 |
< |
debug="${build.debug}" |
886 |
< |
classpath="${jsr166yproduct.jar}" |
887 |
< |
debuglevel="${build.debuglevel}" |
888 |
< |
deprecation="${build.deprecation}" |
889 |
< |
source="${build.sourcelevel}" |
890 |
< |
fork="true"> |
883 |
> |
<javac srcdir="${topsrc.dir}" |
884 |
> |
destdir="${build.extra166y.classes.dir}" |
885 |
> |
debug="${build.debug}" |
886 |
> |
debuglevel="${build.debuglevel}" |
887 |
> |
deprecation="${build.deprecation}" |
888 |
> |
classpath="" |
889 |
> |
source="6" |
890 |
> |
bootclasspath="${jsr166y.jar}:${bootclasspath6}" |
891 |
> |
includeAntRuntime="false" |
892 |
> |
includeJavaRuntime="false" |
893 |
> |
executable="${javac7}" |
894 |
> |
fork="true"> |
895 |
|
|
896 |
< |
<include name="**/*.java"/> |
896 |
> |
<include name="extra166y/**/*.java"/> |
897 |
|
<compilerarg line="${build.args}"/> |
898 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
899 |
< |
<compilerarg value="${bootclasspath.args}"/> |
936 |
< |
|
937 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
899 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
900 |
|
|
901 |
|
</javac> |
902 |
|
|
908 |
|
depends="extra166ycompile" |
909 |
|
description="Builds library jar from compiled sources"> |
910 |
|
|
911 |
< |
<mkdir dir="${build.extra166ylib.dir}"/> |
912 |
< |
|
951 |
< |
<jar destfile="${extra166yproduct.jar}" index="true"> |
952 |
< |
<fileset dir="${build.extra166y.dir}"/> |
911 |
> |
<jar destfile="${extra166y.jar}" index="true"> |
912 |
> |
<fileset dir="${build.extra166y.classes.dir}"/> |
913 |
|
</jar> |
914 |
|
|
915 |
|
</target> |
917 |
|
|
918 |
|
|
919 |
|
<target name="extra166ydocs" |
920 |
< |
description="Builds javadocs with custom tags to build folder"> |
920 |
> |
description="Builds javadocs to build dir"> |
921 |
|
|
922 |
< |
<delete dir="${build.extra166yjavadocs.dir}"/> |
923 |
< |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
922 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
923 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
924 |
|
|
925 |
< |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
926 |
< |
packagenames="extra166y" |
925 |
> |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
926 |
> |
packagenames="extra166y.*" |
927 |
|
link="${jdkapidocs.url}" |
928 |
< |
source="${build.sourcelevel}" |
929 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
930 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
928 |
> |
source="6" |
929 |
> |
bootclasspath="${bootclasspath6}" |
930 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
931 |
> |
executable="${javadoc7}" |
932 |
> |
additionalparam="-XDignore.symbol.file=true"/> |
933 |
|
|
934 |
|
</target> |
935 |
|
|
936 |
|
|
937 |
|
<target name="extra166ydist" |
938 |
< |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
938 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs" |
939 |
|
description="Puts all distributable products in single hierarchy"/> |
940 |
|
|
941 |
|
|
942 |
|
|
943 |
|
<target name="extra166yclean" |
944 |
< |
description="Removes all build products"> |
944 |
> |
description="Removes all extra166y build products"> |
945 |
|
|
946 |
|
<delete dir="${build.extra166y.dir}"/> |
985 |
– |
<delete dir="${build.extra166ylib.dir}"/> |
947 |
|
|
948 |
|
</target> |
949 |
|
|
954 |
|
|
955 |
|
</target> |
956 |
|
|
996 |
– |
<target name="extra166ydist-docs" |
997 |
– |
description="Builds javadocs without custom tags to dist folder"> |
998 |
– |
|
999 |
– |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
1000 |
– |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
1001 |
– |
|
1002 |
– |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
1003 |
– |
packagenames="extra166y" |
1004 |
– |
link="${jdkapidocs.url}" |
1005 |
– |
source="${build.sourcelevel}" |
1006 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
1007 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
1008 |
– |
|
1009 |
– |
</target> |
1010 |
– |
|
957 |
|
<target name="extra166ydist-jar" |
958 |
|
depends="extra166yclean, extra166yjar"> |
959 |
|
|
960 |
< |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
960 |
> |
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
961 |
|
|
962 |
|
</target> |
963 |
|
|
967 |
|
depends="configure-compiler" |
968 |
|
description="Compiles jsr166e sources"> |
969 |
|
|
970 |
< |
<mkdir dir="${build.jsr166e.dir}"/> |
970 |
> |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
971 |
|
|
972 |
|
<javac srcdir="${topsrc.dir}" |
973 |
< |
destdir="${build.jsr166e.dir}" |
973 |
> |
destdir="${build.jsr166e.classes.dir}" |
974 |
|
debug="${build.debug}" |
975 |
|
debuglevel="${build.debuglevel}" |
976 |
|
deprecation="${build.deprecation}" |
977 |
< |
source="1.7" |
977 |
> |
source="7" |
978 |
|
classpath="" |
979 |
|
includeAntRuntime="false" |
980 |
|
includeJavaRuntime="false" |
996 |
|
depends="jsr166ecompile" |
997 |
|
description="Builds library jar from compiled sources"> |
998 |
|
|
999 |
< |
<mkdir dir="${build.jsr166elib.dir}"/> |
1000 |
< |
|
1055 |
< |
<jar destfile="${jsr166eproduct.jar}" index="true"> |
1056 |
< |
<fileset dir="${build.jsr166e.dir}"/> |
999 |
> |
<jar destfile="${jsr166e.jar}" index="true"> |
1000 |
> |
<fileset dir="${build.jsr166e.classes.dir}"/> |
1001 |
|
</jar> |
1002 |
|
|
1003 |
|
</target> |
1005 |
|
|
1006 |
|
|
1007 |
|
<target name="jsr166edocs" |
1008 |
< |
description="Builds javadocs with custom tags to build folder"> |
1008 |
> |
description="Builds javadocs to build dir"> |
1009 |
|
|
1010 |
< |
<delete dir="${build.jsr166ejavadocs.dir}"/> |
1011 |
< |
<mkdir dir="${build.jsr166ejavadocs.dir}"/> |
1010 |
> |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1011 |
> |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
1012 |
|
|
1013 |
< |
<javadoc destdir="${build.jsr166ejavadocs.dir}" |
1014 |
< |
packagenames="jsr166e,jsr166e.extra" |
1015 |
< |
link="${jdkapi7docs.url}" |
1016 |
< |
source="1.7" |
1017 |
< |
sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}" |
1013 |
> |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
1014 |
> |
packagenames="jsr166e.*" |
1015 |
> |
link="${jdkapidocs.url}" |
1016 |
> |
source="7" |
1017 |
> |
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
1018 |
|
executable="${javadoc7}" |
1019 |
|
additionalparam="-XDignore.symbol.file=true" > |
1076 |
– |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
1077 |
– |
<include name="jsr166e/**/*.java"/> |
1078 |
– |
</fileset> |
1020 |
|
</javadoc> |
1021 |
|
|
1022 |
|
</target> |
1023 |
|
|
1024 |
|
|
1025 |
|
<target name="jsr166edist" |
1026 |
< |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs" |
1026 |
> |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs" |
1027 |
|
description="Puts all distributable products in single hierarchy"/> |
1028 |
|
|
1029 |
|
|
1030 |
|
|
1031 |
|
<target name="jsr166eclean" |
1032 |
< |
description="Removes all build products"> |
1032 |
> |
description="Removes all jsr166e build products"> |
1033 |
|
|
1034 |
|
<delete dir="${build.jsr166e.dir}"/> |
1094 |
– |
<delete dir="${build.jsr166elib.dir}"/> |
1035 |
|
|
1036 |
|
</target> |
1037 |
|
|
1038 |
|
|
1099 |
– |
|
1039 |
|
<target name="jsr166edist-clean" |
1040 |
|
description="Removes all build and distribution products"> |
1041 |
|
|
1042 |
|
</target> |
1043 |
|
|
1105 |
– |
<target name="jsr166edist-docs" |
1106 |
– |
description="Builds javadocs without custom tags to dist folder"> |
1107 |
– |
|
1108 |
– |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1109 |
– |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
1110 |
– |
|
1111 |
– |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
1112 |
– |
packagenames="jsr166e,jsr166e.extra" |
1113 |
– |
link="${jdkapidocs.url}" |
1114 |
– |
source="1.7" |
1115 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
1116 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
1117 |
– |
|
1118 |
– |
</target> |
1119 |
– |
|
1044 |
|
<target name="jsr166edist-jar" |
1045 |
|
depends="jsr166eclean, jsr166ejar"> |
1046 |
|
|
1047 |
< |
<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/> |
1047 |
> |
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1048 |
|
|
1049 |
|
</target> |
1050 |
|
|