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"/> |
49 |
|
|
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"/> |
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"/> |
57 |
|
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
58 |
|
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
59 |
|
|
60 |
< |
<!-- JDK binary locations --> |
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 locations --> |
66 |
|
<property name="jdks.home" location="${user.home}/jdk"/> |
67 |
|
|
68 |
|
<macrodef name="defjdklocations"> |
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"/> |
70 |
– |
<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
75 |
|
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/> |
76 |
< |
<property name="bootclasspath@{v}" |
77 |
< |
value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/> |
76 |
> |
<local name="boot.jar.dir"/> |
77 |
> |
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib"/> |
78 |
> |
<path id="bootclasspath@{v}"> |
79 |
> |
<pathelement path="${boot.jar.dir}/resources.jar"/> |
80 |
> |
<pathelement path="${boot.jar.dir}/rt.jar"/> |
81 |
> |
<pathelement path="${boot.jar.dir}/jsse.jar"/> |
82 |
> |
<pathelement path="${boot.jar.dir}/jce.jar"/> |
83 |
> |
<pathelement path="${boot.jar.dir}/charsets.jar"/> |
84 |
> |
</path> |
85 |
> |
<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/> |
86 |
|
</sequential> |
87 |
|
</macrodef> |
88 |
|
|
90 |
|
<defjdklocations v="7"/> |
91 |
|
<defjdklocations v="8"/> |
92 |
|
|
81 |
– |
<macrodef name="run-tck-tests"> |
82 |
– |
<attribute name="jvm"/> |
83 |
– |
<attribute name="tck.classes"/> |
84 |
– |
<attribute name="product.jar" default="${product.jar}"/> |
85 |
– |
<attribute name="jvmflags" default=""/> |
86 |
– |
<sequential> |
87 |
– |
<java classname="JSR166TestCase" |
88 |
– |
jvm="@{jvm}" fork="true"> |
89 |
– |
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
90 |
– |
<jvmarg line="@{jvmflags}"/> |
91 |
– |
<classpath> |
92 |
– |
<pathelement location="${junit.jar}"/> |
93 |
– |
<pathelement location="@{tck.classes}"/> |
94 |
– |
</classpath> |
95 |
– |
</java> |
96 |
– |
</sequential> |
97 |
– |
</macrodef> |
98 |
– |
|
93 |
|
<!-- Source locations --> |
94 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
95 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
122 |
|
<property name="extra166y.jar" location="${build.extra166y.dir}/extra166y.jar"/> |
123 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
124 |
|
|
131 |
– |
<!-- Bootclasspath argument --> |
132 |
– |
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
133 |
– |
|
125 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
126 |
|
<property name="jdkapi5docs.url" value="http://docs.oracle.com/javase/1.5.0/docs/api/"/> |
127 |
|
<property name="jdkapi6docs.url" value="http://docs.oracle.com/javase/6/docs/api/"/> |
134 |
|
<!-- Default jdk api doc location (latest stable release seems best) --> |
135 |
|
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
136 |
|
|
137 |
+ |
<!-- Define the "jtreg" task --> |
138 |
+ |
<!-- See the docs in "jtreg -onlineHelp" --> |
139 |
+ |
<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant" |
140 |
+ |
classpath="${lib.dir}/jtreg.jar" /> |
141 |
+ |
|
142 |
|
<!-- Test classpath --> |
143 |
|
<path id="test.classpath"> |
144 |
|
<pathelement location="${build.testcases.dir}"/> |
145 |
|
<pathelement location="${junit.jar}"/> |
146 |
|
</path> |
147 |
|
|
148 |
+ |
<macrodef name="run-tck-tests"> |
149 |
+ |
<attribute name="tck.src.dir" default="${tck.src.dir}"/> |
150 |
+ |
<attribute name="source" default="6"/> |
151 |
+ |
<attribute name="target"/> |
152 |
+ |
<attribute name="workdir"/> |
153 |
+ |
<attribute name="classes"/> |
154 |
+ |
<attribute name="jvmflags" default=""/> |
155 |
+ |
<sequential> |
156 |
+ |
|
157 |
+ |
<mkdir dir="@{workdir}/tck-classes"/> |
158 |
+ |
|
159 |
+ |
<javac srcdir="@{tck.src.dir}" |
160 |
+ |
destdir="@{workdir}/tck-classes" |
161 |
+ |
debug="${build.debug}" |
162 |
+ |
debuglevel="${build.debuglevel}" |
163 |
+ |
deprecation="${build.deprecation}" |
164 |
+ |
source="@{source}" |
165 |
+ |
classpath="${junit.jar}" |
166 |
+ |
bootclasspath="@{classes}:${bootclasspath@{source}}" |
167 |
+ |
includeAntRuntime="false" |
168 |
+ |
includeJavaRuntime="false" |
169 |
+ |
executable="${javac@{target}}" |
170 |
+ |
fork="true"> |
171 |
+ |
|
172 |
+ |
<include name="*.java"/> |
173 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
174 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
175 |
+ |
<compilerarg line="${build.args}"/> |
176 |
+ |
|
177 |
+ |
</javac> |
178 |
+ |
|
179 |
+ |
<java classname="JSR166TestCase" |
180 |
+ |
failonerror="true" |
181 |
+ |
jvm="${java@{target}}" |
182 |
+ |
fork="true"> |
183 |
+ |
<jvmarg value="-Xbootclasspath/p:@{classes}"/> |
184 |
+ |
<jvmarg line="@{jvmflags}"/> |
185 |
+ |
<classpath> |
186 |
+ |
<pathelement location="${junit.jar}"/> |
187 |
+ |
<pathelement location="@{workdir}/tck-classes"/> |
188 |
+ |
</classpath> |
189 |
+ |
</java> |
190 |
+ |
|
191 |
+ |
</sequential> |
192 |
+ |
</macrodef> |
193 |
+ |
|
194 |
|
<!-- ALoops classpath --> |
195 |
|
<path id="loops.classpath"> |
196 |
|
<pathelement location="${build.loops.dir}"/> |
197 |
|
</path> |
198 |
|
|
199 |
|
<!-- Support @jls tag, used in jdk8+ javadoc --> |
200 |
< |
<!-- TODO: How do we get &trade to work? --> |
159 |
< |
<!-- TODO: Why isn't @jls a "standard" tag? --> |
160 |
< |
<!-- property name="javadoc.jls.cite" value="The Java™ Language Specification" --> |
161 |
< |
<property name="javadoc.jls.cite" value="The Java Language Specification"/> |
200 |
> |
<property name="javadoc.jls.cite" value="The Java&trade; Language Specification"/> |
201 |
|
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
202 |
|
|
203 |
|
<!-- Main targets --> |
224 |
|
fork="true"> |
225 |
|
|
226 |
|
<include name="**/*.java"/> |
188 |
– |
<compilerarg line="${build.args}"/> |
227 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
228 |
|
<compilerarg value="-Xlint:all"/> |
191 |
– |
|
192 |
– |
<!-- |
193 |
– |
<exclude name="java/lang/**"/> |
229 |
|
<compilerarg line="${build.args}"/> |
195 |
– |
<compilerarg line="-Xlint -Xmaxwarns 1000"/> |
196 |
– |
--> |
230 |
|
|
231 |
|
</javac> |
199 |
– |
|
232 |
|
</target> |
233 |
|
|
234 |
|
|
203 |
– |
|
235 |
|
<target name="jar" |
236 |
|
depends="compile" |
237 |
|
description="Builds library jar from compiled sources"> |
239 |
|
<jar destfile="${product.jar}"> |
240 |
|
<fileset dir="${build.classes.dir}"/> |
241 |
|
</jar> |
211 |
– |
|
242 |
|
</target> |
243 |
|
|
244 |
|
|
215 |
– |
|
245 |
|
<target name="test" |
246 |
|
depends="configure-tests, report-tests" |
247 |
|
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
248 |
|
|
249 |
|
|
221 |
– |
|
250 |
|
<target name="docs" |
251 |
|
description="Builds javadocs for src/main to dist dir"> |
252 |
|
|
263 |
|
sourcepath="${src.dir}:${jdk8src.dir}" |
264 |
|
classpath="" |
265 |
|
executable="${javadoc8}"> |
238 |
– |
<arg value="-XDignore.symbol.file=true"/> |
239 |
– |
<arg value="-tag"/> |
240 |
– |
<arg value="${javadoc.jls.option}"/> |
266 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
267 |
|
<include name="**/*.java"/> |
268 |
|
</fileset> |
269 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
270 |
+ |
<arg value="-tag"/> |
271 |
+ |
<arg value="${javadoc.jls.option}"/> |
272 |
|
</javadoc> |
245 |
– |
|
273 |
|
</target> |
274 |
|
|
275 |
|
|
249 |
– |
|
276 |
|
<target name="dist" |
277 |
|
depends="dist-clean, dist-jar, docs" |
278 |
|
description="Puts all distributable products in single hierarchy"/> |
293 |
|
<exclude name="**/SyntaxTest.java"/> |
294 |
|
<exclude name="**/SuperfluousAbstract.java"/> |
295 |
|
</jar> |
270 |
– |
|
296 |
|
</target> |
297 |
|
|
298 |
|
|
274 |
– |
|
299 |
|
<target name="clean" |
300 |
|
description="Removes all build products"> |
301 |
|
|
304 |
|
</target> |
305 |
|
|
306 |
|
|
283 |
– |
|
307 |
|
<target name="dist-clean" |
308 |
|
description="Removes all build and distribution products"> |
309 |
|
|
312 |
|
</target> |
313 |
|
|
314 |
|
|
292 |
– |
|
315 |
|
<!-- Internal targets --> |
316 |
|
|
317 |
|
|
329 |
|
<mkdir dir="${build.testcases.dir}"/> |
330 |
|
|
331 |
|
<javac srcdir="${tck.src.dir}" |
332 |
< |
destdir="${build.testcases.dir}" |
333 |
< |
debug="${build.debug}" |
334 |
< |
debuglevel="${build.debuglevel}" |
335 |
< |
deprecation="${build.deprecation}" |
336 |
< |
source="${build.sourcelevel}" |
337 |
< |
fork="true"> |
332 |
> |
destdir="${build.testcases.dir}" |
333 |
> |
debug="${build.debug}" |
334 |
> |
debuglevel="${build.debuglevel}" |
335 |
> |
deprecation="${build.deprecation}" |
336 |
> |
source="6" |
337 |
> |
classpath="${junit.jar}" |
338 |
> |
bootclasspath="@{product.jar}:${bootclasspath6}" |
339 |
> |
includeAntRuntime="false" |
340 |
> |
includeJavaRuntime="false" |
341 |
> |
executable="${javac8}" |
342 |
> |
fork="true"> |
343 |
|
|
344 |
< |
<compilerarg value="${bootclasspath.args}"/> |
318 |
< |
<compilerarg line="${build.args}"/> |
344 |
> |
<include name="**/*.java"/> |
345 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
346 |
< |
|
347 |
< |
<classpath refid="test.classpath"/> |
346 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
347 |
> |
<compilerarg line="${build.args}"/> |
348 |
|
|
349 |
|
</javac> |
350 |
|
|
351 |
|
<javac srcdir="${test.src.dir}" |
352 |
< |
destdir="${build.testcases.dir}" |
353 |
< |
debug="${build.debug}" |
354 |
< |
debuglevel="${build.debuglevel}" |
355 |
< |
deprecation="${build.deprecation}" |
356 |
< |
source="${build.sourcelevel}" |
357 |
< |
fork="true"> |
358 |
< |
|
359 |
< |
<include name="jsr166/test/**"/> |
352 |
> |
destdir="${build.testcases.dir}" |
353 |
> |
debug="${build.debug}" |
354 |
> |
debuglevel="${build.debuglevel}" |
355 |
> |
deprecation="${build.deprecation}" |
356 |
> |
source="6" |
357 |
> |
classpath="" |
358 |
> |
bootclasspath="@{product.jar}:${bootclasspath6}" |
359 |
> |
includeAntRuntime="false" |
360 |
> |
includeJavaRuntime="false" |
361 |
> |
executable="${javac8}" |
362 |
> |
fork="true"> |
363 |
|
|
364 |
< |
<compilerarg value="${bootclasspath.args}"/> |
336 |
< |
<compilerarg line="${build.args}"/> |
364 |
> |
<include name="jsr166/test/**/*.java"/> |
365 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
366 |
< |
|
367 |
< |
<classpath refid="test.classpath"/> |
366 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
367 |
> |
<compilerarg line="${build.args}"/> |
368 |
|
|
369 |
|
</javac> |
370 |
|
|
377 |
|
source="${build.sourcelevel}" |
378 |
|
fork="true"> |
379 |
|
|
380 |
< |
<compilerarg value="${bootclasspath.args}"/> |
353 |
< |
<compilerarg line="${build.args}"/> |
380 |
> |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
381 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
382 |
< |
|
356 |
< |
<classpath refid="test.classpath"/> |
382 |
> |
<compilerarg line="${build.args}"/> |
383 |
|
|
384 |
|
</javac> |
385 |
|
--> |
400 |
|
errorProperty="junit.failed" |
401 |
|
failureProperty="junit.failed" |
402 |
|
dir="${build.reports.dir}" |
403 |
+ |
jvm="${java8}" |
404 |
|
fork="true"> |
405 |
|
|
406 |
< |
<jvmarg value="${bootclasspath.args}"/> |
406 |
> |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
407 |
|
<jvmarg value="-server"/> |
408 |
|
<jvmarg value="-showversion"/> |
409 |
|
|
532 |
|
|
533 |
|
<!-- jsr166 4jdk7 --> |
534 |
|
|
508 |
– |
|
535 |
|
<target name="4jdk7compile" |
536 |
|
depends="configure-compiler" |
537 |
|
description="Compiles src/jdk7 sources, targeting jdk7"> |
552 |
|
fork="true"> |
553 |
|
|
554 |
|
<include name="**/*.java"/> |
529 |
– |
<compilerarg line="${build.args}"/> |
555 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
556 |
|
<compilerarg value="-Xlint:all"/> |
557 |
+ |
<compilerarg line="${build.args}"/> |
558 |
|
|
559 |
|
</javac> |
560 |
+ |
</target> |
561 |
|
|
535 |
– |
<jar destfile="${4jdk7product.jar}" index="true"> |
536 |
– |
<fileset dir="${build.4jdk7.classes.dir}"/> |
537 |
– |
</jar> |
538 |
– |
|
539 |
– |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
540 |
– |
|
541 |
– |
<javac srcdir="${tck.src.dir}" |
542 |
– |
destdir="${build.4jdk7.tck.classes.dir}" |
543 |
– |
debug="${build.debug}" |
544 |
– |
debuglevel="${build.debuglevel}" |
545 |
– |
deprecation="${build.deprecation}" |
546 |
– |
source="6" |
547 |
– |
classpath="${junit.jar}" |
548 |
– |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
549 |
– |
includeAntRuntime="false" |
550 |
– |
includeJavaRuntime="false" |
551 |
– |
executable="${javac7}" |
552 |
– |
fork="true"> |
562 |
|
|
563 |
< |
<include name="**/*.java"/> |
564 |
< |
<compilerarg line="${build.args}"/> |
565 |
< |
<compilerarg value="-XDignore.symbol.file=true"/> |
557 |
< |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
563 |
> |
<target name="4jdk7-jar" |
564 |
> |
depends="4jdk7compile" |
565 |
> |
description="Builds library jar from compiled sources"> |
566 |
|
|
567 |
< |
</javac> |
567 |
> |
<jar destfile="${4jdk7product.jar}"> |
568 |
> |
<fileset dir="${build.4jdk7.classes.dir}"/> |
569 |
> |
</jar> |
570 |
|
|
571 |
|
</target> |
572 |
|
|
573 |
|
|
574 |
|
<target name="4jdk7-test-tck" |
575 |
< |
depends="4jdk7compile" |
575 |
> |
depends="4jdk7-jar" |
576 |
|
description="Runs tck tests for jsr166-4jdk7 directly"> |
577 |
+ |
|
578 |
|
<run-tck-tests |
579 |
< |
jvm="${java7}" |
580 |
< |
tck.classes="${build.4jdk7.tck.classes.dir}" |
581 |
< |
product.jar="${4jdk7product.jar}"/> |
579 |
> |
target="7" |
580 |
> |
workdir="${build.4jdk7.dir}" |
581 |
> |
classes="${4jdk7product.jar}"/> |
582 |
|
</target> |
583 |
|
|
584 |
|
|
610 |
|
</junit> |
611 |
|
</target> |
612 |
|
|
613 |
+ |
<target name="4jdk7-test-jtreg" |
614 |
+ |
depends="4jdk7compile" |
615 |
+ |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
616 |
+ |
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
617 |
+ |
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
618 |
+ |
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
619 |
+ |
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
620 |
+ |
<jtreg dir="${jtreg.src.dir}" |
621 |
+ |
jdk="${jdk7.home}" |
622 |
+ |
workDir="${build.4jdk7.dir}/JTwork" |
623 |
+ |
reportDir="${build.4jdk7.dir}/JTreport"> |
624 |
+ |
|
625 |
+ |
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
626 |
+ |
<arg value="-agentvm"/> |
627 |
+ |
<arg value="-v:nopass,fail"/> |
628 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
629 |
+ |
<arg value="-automatic"/> |
630 |
+ |
<arg value="-k:!ignore"/> |
631 |
+ |
</jtreg> |
632 |
+ |
</target> |
633 |
+ |
|
634 |
+ |
|
635 |
+ |
<target name="4jdk7-test" |
636 |
+ |
depends="4jdk7-test-tck, 4jdk7-test-jtreg" |
637 |
+ |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
638 |
+ |
</target> |
639 |
+ |
|
640 |
|
|
641 |
|
<target name="4jdk7docs" |
642 |
|
description="Builds javadocs for src/jdk7 to dist dir"> |
651 |
|
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
652 |
|
classpath="" |
653 |
|
executable="${javadoc7}"> |
616 |
– |
<arg value="-XDignore.symbol.file=true"/> |
654 |
|
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
655 |
|
<include name="**/*.java"/> |
656 |
|
</fileset> |
657 |
+ |
<arg value="-XDignore.symbol.file=true"/> |
658 |
|
</javadoc> |
621 |
– |
|
659 |
|
</target> |
660 |
|
|
661 |
|
|
664 |
|
description="Puts all distributable products in single hierarchy"/> |
665 |
|
|
666 |
|
|
630 |
– |
|
667 |
|
<target name="4jdk7clean" |
668 |
|
description="Removes all 4jdk7 build products"> |
669 |
|
|
672 |
|
</target> |
673 |
|
|
674 |
|
|
639 |
– |
|
675 |
|
<target name="4jdk7dist-clean" |
676 |
|
description="Removes all build and distribution products"> |
677 |
|
|
678 |
|
</target> |
679 |
|
|
680 |
|
<target name="4jdk7dist-jar" |
681 |
< |
depends="4jdk7clean, 4jdk7compile"> |
681 |
> |
depends="4jdk7clean, 4jdk7-jar"> |
682 |
|
|
683 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
684 |
|
|
691 |
|
depends="configure-compiler" |
692 |
|
description="Compiles jsr166x sources to build dir"> |
693 |
|
|
694 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
694 |
> |
<mkdir dir="${build.jsr166x.classes.dir}"/> |
695 |
|
|
696 |
|
<javac srcdir="${topsrc.dir}" |
697 |
< |
destdir="${build.jsr166x.dir}" |
697 |
> |
destdir="${build.jsr166x.classes.dir}" |
698 |
|
debug="${build.debug}" |
699 |
|
debuglevel="${build.debuglevel}" |
700 |
|
deprecation="${build.deprecation}" |
701 |
|
classpath="" |
667 |
– |
source="5" |
702 |
|
bootclasspath="${bootclasspath6}" |
703 |
+ |
source="5" |
704 |
|
includeAntRuntime="false" |
705 |
|
includeJavaRuntime="false" |
706 |
|
executable="${javac7}" |
707 |
|
fork="true"> |
708 |
|
|
709 |
|
<include name="jsr166x/**/*.java"/> |
675 |
– |
<compilerarg line="${build.args}"/> |
710 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
711 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
712 |
+ |
<compilerarg line="${build.args}"/> |
713 |
|
|
714 |
|
</javac> |
680 |
– |
|
715 |
|
</target> |
716 |
|
|
717 |
|
|
718 |
< |
|
685 |
< |
<target name="jsr166xjar" |
718 |
> |
<target name="jsr166x-jar" |
719 |
|
depends="jsr166xcompile" |
720 |
|
description="Builds library jar from compiled sources"> |
721 |
|
|
722 |
|
<jar destfile="${jsr166x.jar}"> |
723 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
723 |
> |
<fileset dir="${build.jsr166x.classes.dir}"/> |
724 |
|
</jar> |
725 |
|
|
726 |
|
</target> |
727 |
|
|
728 |
|
|
696 |
– |
|
729 |
|
<target name="jsr166xdocs" |
730 |
|
description="Builds javadocs to dist dir"> |
731 |
|
|
735 |
|
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
736 |
|
packagenames="jsr166x.*" |
737 |
|
link="${jdkapidocs.url}" |
706 |
– |
source="5" |
707 |
– |
bootclasspath="${bootclasspath6}" |
738 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
739 |
< |
executable="${javadoc7}" |
740 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
739 |
> |
bootclasspath="${bootclasspath6}" |
740 |
> |
source="5" |
741 |
> |
executable="${javadoc7}"> |
742 |
> |
<arg value="-XDignore.symbol.file=true"/> |
743 |
|
|
744 |
+ |
</javadoc> |
745 |
|
</target> |
746 |
|
|
747 |
|
|
750 |
|
description="Puts all distributable products in single hierarchy"/> |
751 |
|
|
752 |
|
|
720 |
– |
|
753 |
|
<target name="jsr166xclean" |
754 |
|
description="Removes all jsr166x build products"> |
755 |
|
|
758 |
|
</target> |
759 |
|
|
760 |
|
|
729 |
– |
|
761 |
|
<target name="jsr166xdist-clean" |
762 |
|
description="Removes all build and distribution products"> |
763 |
|
|
765 |
|
|
766 |
|
|
767 |
|
<target name="jsr166xdist-jar" |
768 |
< |
depends="jsr166xclean, jsr166xjar"> |
768 |
> |
depends="jsr166xclean, jsr166x-jar"> |
769 |
|
|
770 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
771 |
|
|
778 |
|
depends="configure-compiler" |
779 |
|
description="Compiles jsr166y sources"> |
780 |
|
|
781 |
< |
<mkdir dir="${build.jsr166y.dir}"/> |
781 |
> |
<mkdir dir="${build.jsr166y.classes.dir}"/> |
782 |
|
|
783 |
|
<javac srcdir="${topsrc.dir}" |
784 |
< |
destdir="${build.jsr166y.dir}" |
784 |
> |
destdir="${build.jsr166y.classes.dir}" |
785 |
|
debug="${build.debug}" |
786 |
|
debuglevel="${build.debuglevel}" |
787 |
|
deprecation="${build.deprecation}" |
794 |
|
fork="true"> |
795 |
|
|
796 |
|
<include name="jsr166y/**/*.java"/> |
766 |
– |
<compilerarg line="${build.args}"/> |
797 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
798 |
|
<compilerarg value="-Xlint:all"/> |
799 |
+ |
<compilerarg line="${build.args}"/> |
800 |
+ |
|
801 |
|
</javac> |
802 |
|
</target> |
803 |
|
|
804 |
|
|
805 |
< |
<target name="jsr166yjar" |
805 |
> |
<target name="jsr166y-jar" |
806 |
|
depends="jsr166ycompile" |
807 |
|
description="Builds library jar from compiled sources"> |
808 |
|
|
809 |
|
<jar destfile="${jsr166y.jar}" index="true"> |
810 |
< |
<fileset dir="${build.jsr166y.dir}"/> |
810 |
> |
<fileset dir="${build.jsr166y.classes.dir}"/> |
811 |
|
</jar> |
812 |
|
|
813 |
|
</target> |
814 |
|
|
815 |
|
|
784 |
– |
|
816 |
|
<target name="jsr166ydocs" |
817 |
|
description="Builds javadocs to dist dir"> |
818 |
|
|
822 |
|
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
823 |
|
packagenames="jsr166y.*" |
824 |
|
link="${jdkapidocs.url}" |
794 |
– |
source="6" |
795 |
– |
bootclasspath="${bootclasspath6}" |
825 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
826 |
< |
executable="${javadoc7}" |
827 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
826 |
> |
bootclasspath="${bootclasspath6}" |
827 |
> |
source="6" |
828 |
> |
executable="${javadoc7}"> |
829 |
> |
<arg value="-XDignore.symbol.file=true"/> |
830 |
|
|
831 |
+ |
</javadoc> |
832 |
|
</target> |
833 |
|
|
834 |
|
|
837 |
|
description="Puts all distributable products in single hierarchy"/> |
838 |
|
|
839 |
|
|
808 |
– |
|
840 |
|
<target name="jsr166yclean" |
841 |
|
description="Removes all jsr166y build products"> |
842 |
|
|
845 |
|
</target> |
846 |
|
|
847 |
|
|
817 |
– |
|
848 |
|
<target name="jsr166ydist-clean" |
849 |
|
description="Removes all build and distribution products"> |
850 |
|
|
851 |
|
</target> |
852 |
|
|
853 |
|
<target name="jsr166ydist-jar" |
854 |
< |
depends="jsr166yclean, jsr166yjar"> |
854 |
> |
depends="jsr166yclean, jsr166y-jar"> |
855 |
|
|
856 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
857 |
|
|
862 |
|
|
863 |
|
|
864 |
|
<target name="extra166ycompile" |
865 |
< |
depends="configure-compiler, jsr166yjar" |
865 |
> |
depends="configure-compiler, jsr166y-jar" |
866 |
|
description="Compiles extra166y sources"> |
867 |
|
|
868 |
< |
<mkdir dir="${build.extra166y.dir}"/> |
868 |
> |
<mkdir dir="${build.extra166y.classes.dir}"/> |
869 |
|
|
870 |
|
<javac srcdir="${topsrc.dir}" |
871 |
< |
destdir="${build.extra166y.dir}" |
871 |
> |
destdir="${build.extra166y.classes.dir}" |
872 |
|
debug="${build.debug}" |
873 |
|
debuglevel="${build.debuglevel}" |
874 |
|
deprecation="${build.deprecation}" |
875 |
+ |
bootclasspath="@{jsr166y.jar}:${bootclasspath6}" |
876 |
|
classpath="" |
877 |
|
source="6" |
847 |
– |
bootclasspath="${jsr166y.jar}:${bootclasspath6}" |
878 |
|
includeAntRuntime="false" |
879 |
|
includeJavaRuntime="false" |
880 |
|
executable="${javac7}" |
881 |
|
fork="true"> |
882 |
|
|
883 |
|
<include name="extra166y/**/*.java"/> |
854 |
– |
<compilerarg line="${build.args}"/> |
884 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
885 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
886 |
+ |
<compilerarg line="${build.args}"/> |
887 |
|
|
888 |
|
</javac> |
859 |
– |
|
889 |
|
</target> |
890 |
|
|
891 |
|
|
892 |
< |
|
864 |
< |
<target name="extra166yjar" |
892 |
> |
<target name="extra166y-jar" |
893 |
|
depends="extra166ycompile" |
894 |
|
description="Builds library jar from compiled sources"> |
895 |
|
|
896 |
|
<jar destfile="${extra166y.jar}" index="true"> |
897 |
< |
<fileset dir="${build.extra166y.dir}"/> |
897 |
> |
<fileset dir="${build.extra166y.classes.dir}"/> |
898 |
|
</jar> |
899 |
|
|
900 |
|
</target> |
901 |
|
|
902 |
|
|
875 |
– |
|
903 |
|
<target name="extra166ydocs" |
904 |
|
description="Builds javadocs to build dir"> |
905 |
|
|
909 |
|
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
910 |
|
packagenames="extra166y.*" |
911 |
|
link="${jdkapidocs.url}" |
885 |
– |
source="6" |
886 |
– |
bootclasspath="${bootclasspath6}" |
912 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
913 |
< |
executable="${javadoc7}" |
914 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
913 |
> |
bootclasspath="${bootclasspath6}" |
914 |
> |
source="6" |
915 |
> |
executable="${javadoc7}"> |
916 |
> |
<arg value="-XDignore.symbol.file=true"/> |
917 |
|
|
918 |
+ |
</javadoc> |
919 |
|
</target> |
920 |
|
|
921 |
|
|
924 |
|
description="Puts all distributable products in single hierarchy"/> |
925 |
|
|
926 |
|
|
899 |
– |
|
927 |
|
<target name="extra166yclean" |
928 |
|
description="Removes all extra166y build products"> |
929 |
|
|
932 |
|
</target> |
933 |
|
|
934 |
|
|
908 |
– |
|
935 |
|
<target name="extra166ydist-clean" |
936 |
|
description="Removes all build and distribution products"> |
937 |
|
|
938 |
|
</target> |
939 |
|
|
940 |
|
<target name="extra166ydist-jar" |
941 |
< |
depends="extra166yclean, extra166yjar"> |
941 |
> |
depends="extra166yclean, extra166y-jar"> |
942 |
|
|
943 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
944 |
|
|
950 |
|
depends="configure-compiler" |
951 |
|
description="Compiles jsr166e sources"> |
952 |
|
|
953 |
< |
<mkdir dir="${build.jsr166e.dir}"/> |
953 |
> |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
954 |
|
|
955 |
|
<javac srcdir="${topsrc.dir}" |
956 |
< |
destdir="${build.jsr166e.dir}" |
956 |
> |
destdir="${build.jsr166e.classes.dir}" |
957 |
|
debug="${build.debug}" |
958 |
|
debuglevel="${build.debuglevel}" |
959 |
|
deprecation="${build.deprecation}" |
965 |
|
fork="true"> |
966 |
|
|
967 |
|
<include name="jsr166e/**/*.java"/> |
942 |
– |
<compilerarg line="${build.args}"/> |
968 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
969 |
|
<compilerarg value="-Xlint:all"/> |
970 |
+ |
<compilerarg line="${build.args}"/> |
971 |
|
|
972 |
|
</javac> |
947 |
– |
|
973 |
|
</target> |
974 |
|
|
975 |
|
|
976 |
< |
|
952 |
< |
<target name="jsr166ejar" |
976 |
> |
<target name="jsr166e-jar" |
977 |
|
depends="jsr166ecompile" |
978 |
|
description="Builds library jar from compiled sources"> |
979 |
|
|
980 |
|
<jar destfile="${jsr166e.jar}" index="true"> |
981 |
< |
<fileset dir="${build.jsr166e.dir}"/> |
981 |
> |
<fileset dir="${build.jsr166e.classes.dir}"/> |
982 |
|
</jar> |
983 |
|
|
984 |
|
</target> |
985 |
|
|
986 |
|
|
963 |
– |
|
987 |
|
<target name="jsr166edocs" |
988 |
|
description="Builds javadocs to build dir"> |
989 |
|
|
993 |
|
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
994 |
|
packagenames="jsr166e.*" |
995 |
|
link="${jdkapidocs.url}" |
973 |
– |
source="7" |
996 |
|
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
997 |
< |
executable="${javadoc7}" |
998 |
< |
additionalparam="-XDignore.symbol.file=true" > |
997 |
> |
source="7" |
998 |
> |
executable="${javadoc7}"> |
999 |
> |
<arg value="-XDignore.symbol.file=true"/> |
1000 |
> |
|
1001 |
|
</javadoc> |
1002 |
+ |
</target> |
1003 |
+ |
|
1004 |
|
|
1005 |
+ |
<target name="jsr166e-test-tck" |
1006 |
+ |
depends="jsr166e-jar" |
1007 |
+ |
description="Runs tck tests for jsr166e"> |
1008 |
+ |
|
1009 |
+ |
<run-tck-tests |
1010 |
+ |
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1011 |
+ |
source="7" |
1012 |
+ |
target="8" |
1013 |
+ |
workdir="${build.jsr166e.dir}" |
1014 |
+ |
classes="${jsr166e.jar}"/> |
1015 |
|
</target> |
1016 |
|
|
1017 |
|
|
1020 |
|
description="Puts all distributable products in single hierarchy"/> |
1021 |
|
|
1022 |
|
|
987 |
– |
|
1023 |
|
<target name="jsr166eclean" |
1024 |
|
description="Removes all jsr166e build products"> |
1025 |
|
|
1034 |
|
</target> |
1035 |
|
|
1036 |
|
<target name="jsr166edist-jar" |
1037 |
< |
depends="jsr166eclean, jsr166ejar"> |
1037 |
> |
depends="jsr166eclean, jsr166e-jar"> |
1038 |
|
|
1039 |
|
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1040 |
|
|