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"/> |
48 |
– |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
49 |
– |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
48 |
|
<property name="build.reports.dir" location="${build.dir}/reports"/> |
49 |
|
|
50 |
< |
<property name="build.4jdk7.dir" location="${build.dir}/4jdk7"/> |
51 |
< |
<property name="build.4jdk7.lib.dir" location="${build.4jdk7.dir}"/> |
52 |
< |
<property name="build.4jdk7.classes.dir" location="${build.4jdk7.dir}/classes"/> |
53 |
< |
<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/> |
56 |
< |
<property name="build.4jdk7.docs.dir" location="${build.4jdk7.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"/> |
59 |
– |
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
60 |
– |
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
61 |
– |
|
56 |
|
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
63 |
– |
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
64 |
– |
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
65 |
– |
|
57 |
|
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
67 |
– |
<property name="build.jsr166elib.dir" location="${build.dir}/jsr166elib"/> |
68 |
– |
<property name="build.jsr166ejavadocs.dir" location="${build.dir}/jsr166ejavadocs"/> |
69 |
– |
|
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"/> |
84 |
|
<defjdklocations v="8"/> |
85 |
|
|
86 |
|
<macrodef name="run-tck-tests"> |
87 |
< |
<attribute name="jvm"/> |
88 |
< |
<attribute name="tck.classes"/> |
87 |
> |
<attribute name="target"/> |
88 |
> |
<attribute name="workdir"/> |
89 |
|
<attribute name="product.jar" default="${product.jar}"/> |
90 |
|
<attribute name="jvmflags" default=""/> |
91 |
|
<sequential> |
92 |
< |
<java classname="JSR166TestCase" |
93 |
< |
jvm="@{jvm}" fork="true"> |
92 |
> |
|
93 |
> |
<mkdir dir="@{workdir}/tck-classes"/> |
94 |
> |
|
95 |
> |
<javac srcdir="${tck.src.dir}" |
96 |
> |
destdir="@{workdir}/tck-classes" |
97 |
> |
debug="${build.debug}" |
98 |
> |
debuglevel="${build.debuglevel}" |
99 |
> |
deprecation="${build.deprecation}" |
100 |
> |
source="6" |
101 |
> |
classpath="${junit.jar}" |
102 |
> |
bootclasspath="@{product.jar}:${bootclasspath6}" |
103 |
> |
includeAntRuntime="false" |
104 |
> |
includeJavaRuntime="false" |
105 |
> |
executable="${javac@{target}}" |
106 |
> |
fork="true"> |
107 |
> |
|
108 |
> |
<include name="**/*.java"/> |
109 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
110 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
111 |
> |
<compilerarg line="${build.args}"/> |
112 |
> |
</javac> |
113 |
> |
|
114 |
> |
<java classname="JSR166TestCase" jvm="${java@{target}}" fork="true"> |
115 |
|
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
116 |
|
<jvmarg line="@{jvmflags}"/> |
117 |
|
<classpath> |
118 |
|
<pathelement location="${junit.jar}"/> |
119 |
< |
<pathelement location="@{tck.classes}"/> |
119 |
> |
<pathelement location="@{workdir}/tck-classes"/> |
120 |
|
</classpath> |
121 |
|
</java> |
122 |
+ |
|
123 |
|
</sequential> |
124 |
|
</macrodef> |
125 |
|
|
137 |
|
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
138 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
139 |
|
<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/> |
127 |
– |
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
140 |
|
|
141 |
|
<!-- Distribution locations --> |
142 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
143 |
< |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
144 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
145 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
146 |
< |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
147 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
142 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/jsr166.docs"/> |
143 |
> |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7.docs"/> |
144 |
> |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166x.docs"/> |
145 |
> |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166y.docs"/> |
146 |
> |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166e.docs"/> |
147 |
> |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/> |
148 |
|
|
149 |
|
<!-- Jar locations --> |
150 |
< |
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
151 |
< |
<property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/> |
152 |
< |
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
153 |
< |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
154 |
< |
<property name="jsr166eproduct.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
155 |
< |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
156 |
< |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
150 |
> |
<property name="product.jar" location="${build.dir}/jsr166.jar"/> |
151 |
> |
<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/> |
152 |
> |
<property name="jsr166x.jar" location="${build.jsr166x.dir}/jsr166x.jar"/> |
153 |
> |
<property name="jsr166y.jar" location="${build.jsr166y.dir}/jsr166y.jar"/> |
154 |
> |
<property name="jsr166e.jar" location="${build.jsr166e.dir}/jsr166e.jar"/> |
155 |
> |
<property name="extra166y.jar" location="${build.extra166y.dir}/extra166y.jar"/> |
156 |
> |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
157 |
|
|
158 |
|
<!-- Bootclasspath argument --> |
159 |
|
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
166 |
|
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
167 |
|
<!-- The below does not yet exist as of 2012-11 --> |
168 |
|
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
169 |
+ |
|
170 |
+ |
<!-- Default jdk api doc location (latest stable release seems best) --> |
171 |
|
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
172 |
|
|
173 |
+ |
<!-- Define the "jtreg" task --> |
174 |
+ |
<!-- See the docs in "jtreg -onlineHelp" --> |
175 |
+ |
<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant" |
176 |
+ |
classpath="${lib.dir}/jtreg.jar" /> |
177 |
+ |
|
178 |
|
<!-- Test classpath --> |
179 |
|
<path id="test.classpath"> |
180 |
|
<pathelement location="${build.testcases.dir}"/> |
196 |
|
<!-- Main targets --> |
197 |
|
|
198 |
|
<target name="dists" |
199 |
< |
depends="dist, jsr166xdist, jsr166ydist,jsr166edist, extra166ydist" |
199 |
> |
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
200 |
|
description="Builds all public jars and docs"/> |
201 |
|
|
202 |
|
<target name="compile" |
237 |
|
depends="compile" |
238 |
|
description="Builds library jar from compiled sources"> |
239 |
|
|
221 |
– |
<mkdir dir="${build.lib.dir}"/> |
222 |
– |
|
240 |
|
<jar destfile="${product.jar}"> |
241 |
|
<fileset dir="${build.classes.dir}"/> |
242 |
|
</jar> |
246 |
|
|
247 |
|
|
248 |
|
<target name="test" |
249 |
< |
depends="init, configure-tests, report-tests" |
249 |
> |
depends="configure-tests, report-tests" |
250 |
|
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
251 |
|
|
252 |
|
|
280 |
|
|
281 |
|
|
282 |
|
<target name="dist" |
283 |
< |
depends="init, dist-clean, dist-jar, docs" |
283 |
> |
depends="dist-clean, dist-jar, docs" |
284 |
|
description="Puts all distributable products in single hierarchy"/> |
285 |
|
|
286 |
|
|
308 |
|
description="Removes all build products"> |
309 |
|
|
310 |
|
<delete dir="${build.dir}"/> |
294 |
– |
<delete dir="${build.classes.dir}"/> |
295 |
– |
<delete dir="${build.lib.dir}"/> |
311 |
|
|
312 |
|
</target> |
313 |
|
|
325 |
|
<!-- Internal targets --> |
326 |
|
|
327 |
|
|
313 |
– |
<target name="init"> |
314 |
– |
|
315 |
– |
<!-- Version is kept in a separate file --> |
316 |
– |
<loadfile property="version" srcFile="version.properties"/> |
317 |
– |
<echo>Building JSR-166 version ${version}</echo> |
318 |
– |
<echo>java.home is ${java.home}</echo> |
319 |
– |
|
320 |
– |
</target> |
321 |
– |
|
322 |
– |
|
328 |
|
<target name="dist-jar" |
329 |
|
depends="clean, jar"> |
330 |
|
|
339 |
|
<mkdir dir="${build.testcases.dir}"/> |
340 |
|
|
341 |
|
<javac srcdir="${tck.src.dir}" |
342 |
< |
destdir="${build.testcases.dir}" |
343 |
< |
debug="${build.debug}" |
344 |
< |
debuglevel="${build.debuglevel}" |
345 |
< |
deprecation="${build.deprecation}" |
346 |
< |
source="${build.sourcelevel}" |
347 |
< |
fork="true"> |
342 |
> |
destdir="${build.testcases.dir}" |
343 |
> |
debug="${build.debug}" |
344 |
> |
debuglevel="${build.debuglevel}" |
345 |
> |
deprecation="${build.deprecation}" |
346 |
> |
source="6" |
347 |
> |
classpath="${junit.jar}" |
348 |
> |
bootclasspath="${product.jar}:${bootclasspath6}" |
349 |
> |
includeAntRuntime="false" |
350 |
> |
includeJavaRuntime="false" |
351 |
> |
executable="${javac8}" |
352 |
> |
fork="true"> |
353 |
|
|
354 |
< |
<compilerarg value="${bootclasspath.args}"/> |
354 |
> |
<include name="**/*.java"/> |
355 |
|
<compilerarg line="${build.args}"/> |
356 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
357 |
< |
|
348 |
< |
<classpath refid="test.classpath"/> |
357 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
358 |
|
|
359 |
|
</javac> |
360 |
|
|
361 |
|
<javac srcdir="${test.src.dir}" |
362 |
< |
destdir="${build.testcases.dir}" |
363 |
< |
debug="${build.debug}" |
364 |
< |
debuglevel="${build.debuglevel}" |
365 |
< |
deprecation="${build.deprecation}" |
366 |
< |
source="${build.sourcelevel}" |
367 |
< |
fork="true"> |
362 |
> |
destdir="${build.testcases.dir}" |
363 |
> |
debug="${build.debug}" |
364 |
> |
debuglevel="${build.debuglevel}" |
365 |
> |
deprecation="${build.deprecation}" |
366 |
> |
source="6" |
367 |
> |
classpath="" |
368 |
> |
bootclasspath="${product.jar}:${bootclasspath6}" |
369 |
> |
includeAntRuntime="false" |
370 |
> |
includeJavaRuntime="false" |
371 |
> |
executable="${javac8}" |
372 |
> |
fork="true"> |
373 |
|
|
374 |
< |
<include name="jsr166/test/**"/> |
374 |
> |
<include name="jsr166/test/**/*.java"/> |
375 |
|
|
362 |
– |
<compilerarg value="${bootclasspath.args}"/> |
376 |
|
<compilerarg line="${build.args}"/> |
377 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
378 |
< |
|
366 |
< |
<classpath refid="test.classpath"/> |
378 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
379 |
|
|
380 |
|
</javac> |
381 |
|
|
392 |
|
<compilerarg line="${build.args}"/> |
393 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
394 |
|
|
383 |
– |
<classpath refid="test.classpath"/> |
384 |
– |
|
395 |
|
</javac> |
396 |
|
--> |
397 |
|
|
411 |
|
errorProperty="junit.failed" |
412 |
|
failureProperty="junit.failed" |
413 |
|
dir="${build.reports.dir}" |
414 |
+ |
jvm="${java8}" |
415 |
|
fork="true"> |
416 |
|
|
417 |
< |
<jvmarg value="${bootclasspath.args}"/> |
417 |
> |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
418 |
|
<jvmarg value="-server"/> |
419 |
|
<jvmarg value="-showversion"/> |
420 |
|
|
515 |
|
<!-- Various demos and test programs --> |
516 |
|
|
517 |
|
|
518 |
< |
<target name="loops" depends="init, configure-compiler" |
518 |
> |
<target name="loops" depends="configure-compiler" |
519 |
|
description="Benchmark from Doug Lea's AQS paper"> |
520 |
|
|
521 |
|
<mkdir dir="${build.loops.dir}"/> |
555 |
|
debug="${build.debug}" |
556 |
|
debuglevel="${build.debuglevel}" |
557 |
|
deprecation="${build.deprecation}" |
558 |
< |
source="1.6" |
558 |
> |
source="6" |
559 |
|
classpath="" |
560 |
|
bootclasspath="${bootclasspath6}" |
561 |
|
includeAntRuntime="false" |
570 |
|
|
571 |
|
</javac> |
572 |
|
|
573 |
< |
<mkdir dir="${build.4jdk7.lib.dir}"/> |
573 |
> |
</target> |
574 |
|
|
575 |
< |
<jar destfile="${4jdk7product.jar}" index="true"> |
575 |
> |
<target name="4jdk7-jar" |
576 |
> |
depends="4jdk7compile" |
577 |
> |
description="Builds library jar from compiled sources"> |
578 |
> |
|
579 |
> |
<jar destfile="${4jdk7product.jar}"> |
580 |
|
<fileset dir="${build.4jdk7.classes.dir}"/> |
581 |
|
</jar> |
582 |
|
|
568 |
– |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
569 |
– |
|
570 |
– |
<javac srcdir="${tck.src.dir}" |
571 |
– |
destdir="${build.4jdk7.tck.classes.dir}" |
572 |
– |
debug="${build.debug}" |
573 |
– |
debuglevel="${build.debuglevel}" |
574 |
– |
deprecation="${build.deprecation}" |
575 |
– |
source="1.6" |
576 |
– |
classpath="${junit.jar}" |
577 |
– |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
578 |
– |
includeAntRuntime="false" |
579 |
– |
includeJavaRuntime="false" |
580 |
– |
executable="${javac7}" |
581 |
– |
fork="true"> |
582 |
– |
|
583 |
– |
<include name="**/*.java"/> |
584 |
– |
<compilerarg line="${build.args}"/> |
585 |
– |
<compilerarg value="-XDignore.symbol.file=true"/> |
586 |
– |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
587 |
– |
|
588 |
– |
</javac> |
589 |
– |
|
583 |
|
</target> |
584 |
|
|
585 |
|
|
586 |
|
<target name="4jdk7-test-tck" |
587 |
< |
depends="4jdk7compile" |
587 |
> |
depends="4jdk7-jar" |
588 |
|
description="Runs tck tests for jsr166-4jdk7 directly"> |
589 |
+ |
|
590 |
|
<run-tck-tests |
591 |
< |
jvm="${java7}" |
592 |
< |
tck.classes="${build.4jdk7.tck.classes.dir}" |
591 |
> |
target="7" |
592 |
> |
workdir="${build.4jdk7.dir}" |
593 |
|
product.jar="${4jdk7product.jar}"/> |
594 |
|
</target> |
595 |
|
|
622 |
|
</junit> |
623 |
|
</target> |
624 |
|
|
625 |
+ |
<target name="4jdk7-test-jtreg" |
626 |
+ |
depends="4jdk7compile" |
627 |
+ |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
628 |
+ |
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
629 |
+ |
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
630 |
+ |
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
631 |
+ |
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
632 |
+ |
<jtreg dir="${jtreg.src.dir}" |
633 |
+ |
jdk="${jdk7.home}" |
634 |
+ |
workDir="${build.4jdk7.dir}/JTwork" |
635 |
+ |
reportDir="${build.4jdk7.dir}/JTreport"> |
636 |
+ |
|
637 |
+ |
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
638 |
+ |
<arg value="-agentvm"/> |
639 |
+ |
<arg value="-v:nopass,fail"/> |
640 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
641 |
+ |
<arg value="-automatic"/> |
642 |
+ |
<arg value="-k:!ignore"/> |
643 |
+ |
</jtreg> |
644 |
+ |
</target> |
645 |
+ |
|
646 |
+ |
|
647 |
+ |
<target name="4jdk7-test" |
648 |
+ |
depends="4jdk7-test-tck, 4jdk7-test-jtreg" |
649 |
+ |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
650 |
+ |
</target> |
651 |
+ |
|
652 |
|
|
653 |
|
<target name="4jdk7docs" |
654 |
|
description="Builds javadocs for src/jdk7 to dist dir"> |
679 |
|
|
680 |
|
|
681 |
|
<target name="4jdk7clean" |
682 |
< |
description="Removes all build products"> |
682 |
> |
description="Removes all 4jdk7 build products"> |
683 |
|
|
684 |
|
<delete dir="${build.4jdk7.dir}"/> |
685 |
|
|
699 |
|
|
700 |
|
</target> |
701 |
|
|
681 |
– |
<!-- jsr166x --> |
702 |
|
|
703 |
+ |
<!-- jsr166x --> |
704 |
|
|
705 |
|
<target name="jsr166xcompile" |
706 |
< |
depends="init, configure-compiler" |
707 |
< |
description="Compiles jsr166x sources"> |
706 |
> |
depends="configure-compiler" |
707 |
> |
description="Compiles jsr166x sources to build dir"> |
708 |
|
|
709 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
709 |
> |
<mkdir dir="${build.jsr166x.classes.dir}"/> |
710 |
|
|
711 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
712 |
< |
destdir="${build.jsr166x.dir}" |
713 |
< |
debug="${build.debug}" |
714 |
< |
debuglevel="${build.debuglevel}" |
715 |
< |
deprecation="${build.deprecation}" |
716 |
< |
source="${build.sourcelevel}" |
717 |
< |
fork="true"> |
711 |
> |
<javac srcdir="${topsrc.dir}" |
712 |
> |
destdir="${build.jsr166x.classes.dir}" |
713 |
> |
debug="${build.debug}" |
714 |
> |
debuglevel="${build.debuglevel}" |
715 |
> |
deprecation="${build.deprecation}" |
716 |
> |
classpath="" |
717 |
> |
source="5" |
718 |
> |
bootclasspath="${bootclasspath6}" |
719 |
> |
includeAntRuntime="false" |
720 |
> |
includeJavaRuntime="false" |
721 |
> |
executable="${javac7}" |
722 |
> |
fork="true"> |
723 |
|
|
724 |
< |
<include name="**/*.java"/> |
724 |
> |
<include name="jsr166x/**/*.java"/> |
725 |
|
<compilerarg line="${build.args}"/> |
726 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
727 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
728 |
|
|
729 |
|
</javac> |
730 |
|
|
736 |
|
depends="jsr166xcompile" |
737 |
|
description="Builds library jar from compiled sources"> |
738 |
|
|
739 |
< |
<mkdir dir="${build.jsr166xlib.dir}"/> |
740 |
< |
|
714 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
715 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
739 |
> |
<jar destfile="${jsr166x.jar}"> |
740 |
> |
<fileset dir="${build.jsr166x.classes.dir}"/> |
741 |
|
</jar> |
742 |
|
|
743 |
|
</target> |
747 |
|
<target name="jsr166xdocs" |
748 |
|
description="Builds javadocs to dist dir"> |
749 |
|
|
750 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
751 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
750 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
751 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
752 |
|
|
753 |
< |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
754 |
< |
packagenames="jsr166x" |
753 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
754 |
> |
packagenames="jsr166x.*" |
755 |
|
link="${jdkapidocs.url}" |
756 |
< |
source="${build.sourcelevel}" |
757 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
758 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
756 |
> |
source="5" |
757 |
> |
bootclasspath="${bootclasspath6}" |
758 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
759 |
> |
executable="${javadoc7}" |
760 |
> |
additionalparam="-XDignore.symbol.file=true"/> |
761 |
|
|
762 |
|
</target> |
763 |
|
|
764 |
|
|
765 |
|
<target name="jsr166xdist" |
766 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
766 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs" |
767 |
|
description="Puts all distributable products in single hierarchy"/> |
768 |
|
|
769 |
|
|
770 |
|
|
771 |
|
<target name="jsr166xclean" |
772 |
< |
description="Removes all build products"> |
772 |
> |
description="Removes all jsr166x build products"> |
773 |
|
|
774 |
|
<delete dir="${build.jsr166x.dir}"/> |
748 |
– |
<delete dir="${build.jsr166xlib.dir}"/> |
775 |
|
|
776 |
|
</target> |
777 |
|
|
783 |
|
</target> |
784 |
|
|
785 |
|
|
760 |
– |
|
761 |
– |
<target name="jsr166xdist-docs" |
762 |
– |
description="Builds javadocs to dist dir"> |
763 |
– |
|
764 |
– |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
765 |
– |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
766 |
– |
|
767 |
– |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
768 |
– |
packagenames="jsr166x" |
769 |
– |
link="${jdkapidocs.url}" |
770 |
– |
source="${build.sourcelevel}" |
771 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
772 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
773 |
– |
|
774 |
– |
</target> |
775 |
– |
|
786 |
|
<target name="jsr166xdist-jar" |
787 |
|
depends="jsr166xclean, jsr166xjar"> |
788 |
|
|
789 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
789 |
> |
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
790 |
|
|
791 |
|
</target> |
792 |
|
|
794 |
|
|
795 |
|
|
796 |
|
<target name="jsr166ycompile" |
797 |
< |
depends="init, configure-compiler" |
797 |
> |
depends="configure-compiler" |
798 |
|
description="Compiles jsr166y sources"> |
799 |
|
|
800 |
< |
<mkdir dir="${build.jsr166y.dir}"/> |
800 |
> |
<mkdir dir="${build.jsr166y.classes.dir}"/> |
801 |
|
|
802 |
< |
<javac srcdir="${jsr166ysrc.dir}" |
803 |
< |
destdir="${build.jsr166y.dir}" |
804 |
< |
debug="${build.debug}" |
805 |
< |
debuglevel="${build.debuglevel}" |
806 |
< |
deprecation="${build.deprecation}" |
807 |
< |
source="${build.sourcelevel}" |
808 |
< |
fork="true"> |
802 |
> |
<javac srcdir="${topsrc.dir}" |
803 |
> |
destdir="${build.jsr166y.classes.dir}" |
804 |
> |
debug="${build.debug}" |
805 |
> |
debuglevel="${build.debuglevel}" |
806 |
> |
deprecation="${build.deprecation}" |
807 |
> |
source="6" |
808 |
> |
classpath="" |
809 |
> |
bootclasspath="${bootclasspath6}" |
810 |
> |
includeAntRuntime="false" |
811 |
> |
includeJavaRuntime="false" |
812 |
> |
executable="${javac7}" |
813 |
> |
fork="true"> |
814 |
|
|
815 |
< |
<include name="**/*.java"/> |
815 |
> |
<include name="jsr166y/**/*.java"/> |
816 |
|
<compilerarg line="${build.args}"/> |
817 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
818 |
< |
<compilerarg value="${bootclasspath.args}"/> |
804 |
< |
|
805 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
806 |
< |
|
818 |
> |
<compilerarg value="-Xlint:all"/> |
819 |
|
</javac> |
808 |
– |
|
820 |
|
</target> |
821 |
|
|
822 |
|
|
812 |
– |
|
823 |
|
<target name="jsr166yjar" |
824 |
|
depends="jsr166ycompile" |
825 |
|
description="Builds library jar from compiled sources"> |
826 |
|
|
827 |
< |
<mkdir dir="${build.jsr166ylib.dir}"/> |
828 |
< |
|
819 |
< |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
820 |
< |
<fileset dir="${build.jsr166y.dir}"/> |
827 |
> |
<jar destfile="${jsr166y.jar}" index="true"> |
828 |
> |
<fileset dir="${build.jsr166y.classes.dir}"/> |
829 |
|
</jar> |
830 |
|
|
831 |
|
</target> |
835 |
|
<target name="jsr166ydocs" |
836 |
|
description="Builds javadocs to dist dir"> |
837 |
|
|
838 |
< |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
839 |
< |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
838 |
> |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
839 |
> |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
840 |
|
|
841 |
< |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
842 |
< |
packagenames="jsr166y" |
841 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
842 |
> |
packagenames="jsr166y.*" |
843 |
|
link="${jdkapidocs.url}" |
844 |
< |
source="${build.sourcelevel}" |
845 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
846 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
844 |
> |
source="6" |
845 |
> |
bootclasspath="${bootclasspath6}" |
846 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
847 |
> |
executable="${javadoc7}" |
848 |
> |
additionalparam="-XDignore.symbol.file=true"/> |
849 |
|
|
850 |
|
</target> |
851 |
|
|
852 |
|
|
853 |
|
<target name="jsr166ydist" |
854 |
< |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
854 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs" |
855 |
|
description="Puts all distributable products in single hierarchy"/> |
856 |
|
|
857 |
|
|
858 |
|
|
859 |
|
<target name="jsr166yclean" |
860 |
< |
description="Removes all build products"> |
860 |
> |
description="Removes all jsr166y build products"> |
861 |
|
|
862 |
|
<delete dir="${build.jsr166y.dir}"/> |
853 |
– |
<delete dir="${build.jsr166ylib.dir}"/> |
863 |
|
|
864 |
|
</target> |
865 |
|
|
870 |
|
|
871 |
|
</target> |
872 |
|
|
864 |
– |
<target name="jsr166ydist-docs" |
865 |
– |
description="Builds javadocs to dist dir"> |
866 |
– |
|
867 |
– |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
868 |
– |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
869 |
– |
|
870 |
– |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
871 |
– |
packagenames="jsr166y" |
872 |
– |
link="${jdkapidocs.url}" |
873 |
– |
source="${build.sourcelevel}" |
874 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
875 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
876 |
– |
|
877 |
– |
</target> |
878 |
– |
|
873 |
|
<target name="jsr166ydist-jar" |
874 |
|
depends="jsr166yclean, jsr166yjar"> |
875 |
|
|
876 |
< |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
876 |
> |
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
877 |
|
|
878 |
|
</target> |
879 |
|
|
882 |
|
|
883 |
|
|
884 |
|
<target name="extra166ycompile" |
885 |
< |
depends="init, configure-compiler, jsr166ycompile" |
885 |
> |
depends="configure-compiler, jsr166yjar" |
886 |
|
description="Compiles extra166y sources"> |
887 |
|
|
888 |
< |
<mkdir dir="${build.extra166y.dir}"/> |
888 |
> |
<mkdir dir="${build.extra166y.classes.dir}"/> |
889 |
|
|
890 |
< |
<javac srcdir="${extra166ysrc.dir}" |
891 |
< |
destdir="${build.extra166y.dir}" |
892 |
< |
debug="${build.debug}" |
893 |
< |
classpath="${jsr166yproduct.jar}" |
894 |
< |
debuglevel="${build.debuglevel}" |
895 |
< |
deprecation="${build.deprecation}" |
896 |
< |
source="${build.sourcelevel}" |
897 |
< |
fork="true"> |
890 |
> |
<javac srcdir="${topsrc.dir}" |
891 |
> |
destdir="${build.extra166y.classes.dir}" |
892 |
> |
debug="${build.debug}" |
893 |
> |
debuglevel="${build.debuglevel}" |
894 |
> |
deprecation="${build.deprecation}" |
895 |
> |
classpath="" |
896 |
> |
source="6" |
897 |
> |
bootclasspath="${jsr166y.jar}:${bootclasspath6}" |
898 |
> |
includeAntRuntime="false" |
899 |
> |
includeJavaRuntime="false" |
900 |
> |
executable="${javac7}" |
901 |
> |
fork="true"> |
902 |
|
|
903 |
< |
<include name="**/*.java"/> |
903 |
> |
<include name="extra166y/**/*.java"/> |
904 |
|
<compilerarg line="${build.args}"/> |
905 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
906 |
< |
<compilerarg value="${bootclasspath.args}"/> |
909 |
< |
|
910 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
906 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
907 |
|
|
908 |
|
</javac> |
909 |
|
|
915 |
|
depends="extra166ycompile" |
916 |
|
description="Builds library jar from compiled sources"> |
917 |
|
|
918 |
< |
<mkdir dir="${build.extra166ylib.dir}"/> |
919 |
< |
|
924 |
< |
<jar destfile="${extra166yproduct.jar}" index="true"> |
925 |
< |
<fileset dir="${build.extra166y.dir}"/> |
918 |
> |
<jar destfile="${extra166y.jar}" index="true"> |
919 |
> |
<fileset dir="${build.extra166y.classes.dir}"/> |
920 |
|
</jar> |
921 |
|
|
922 |
|
</target> |
924 |
|
|
925 |
|
|
926 |
|
<target name="extra166ydocs" |
927 |
< |
description="Builds javadocs with custom tags to build dir"> |
927 |
> |
description="Builds javadocs to build dir"> |
928 |
|
|
929 |
< |
<delete dir="${build.extra166yjavadocs.dir}"/> |
930 |
< |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
929 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
930 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
931 |
|
|
932 |
< |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
933 |
< |
packagenames="extra166y" |
932 |
> |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
933 |
> |
packagenames="extra166y.*" |
934 |
|
link="${jdkapidocs.url}" |
935 |
< |
source="${build.sourcelevel}" |
936 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
937 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
935 |
> |
source="6" |
936 |
> |
bootclasspath="${bootclasspath6}" |
937 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
938 |
> |
executable="${javadoc7}" |
939 |
> |
additionalparam="-XDignore.symbol.file=true"/> |
940 |
|
|
941 |
|
</target> |
942 |
|
|
943 |
|
|
944 |
|
<target name="extra166ydist" |
945 |
< |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
945 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs" |
946 |
|
description="Puts all distributable products in single hierarchy"/> |
947 |
|
|
948 |
|
|
949 |
|
|
950 |
|
<target name="extra166yclean" |
951 |
< |
description="Removes all build products"> |
951 |
> |
description="Removes all extra166y build products"> |
952 |
|
|
953 |
|
<delete dir="${build.extra166y.dir}"/> |
958 |
– |
<delete dir="${build.extra166ylib.dir}"/> |
954 |
|
|
955 |
|
</target> |
956 |
|
|
961 |
|
|
962 |
|
</target> |
963 |
|
|
969 |
– |
<target name="extra166ydist-docs" |
970 |
– |
description="Builds javadocs to dist dir"> |
971 |
– |
|
972 |
– |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
973 |
– |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
974 |
– |
|
975 |
– |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
976 |
– |
packagenames="extra166y" |
977 |
– |
link="${jdkapidocs.url}" |
978 |
– |
source="${build.sourcelevel}" |
979 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
980 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
981 |
– |
|
982 |
– |
</target> |
983 |
– |
|
964 |
|
<target name="extra166ydist-jar" |
965 |
|
depends="extra166yclean, extra166yjar"> |
966 |
|
|
967 |
< |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
967 |
> |
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
968 |
|
|
969 |
|
</target> |
970 |
|
|
974 |
|
depends="configure-compiler" |
975 |
|
description="Compiles jsr166e sources"> |
976 |
|
|
977 |
< |
<mkdir dir="${build.jsr166e.dir}"/> |
977 |
> |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
978 |
|
|
979 |
|
<javac srcdir="${topsrc.dir}" |
980 |
< |
destdir="${build.jsr166e.dir}" |
980 |
> |
destdir="${build.jsr166e.classes.dir}" |
981 |
|
debug="${build.debug}" |
982 |
|
debuglevel="${build.debuglevel}" |
983 |
|
deprecation="${build.deprecation}" |
984 |
< |
source="1.7" |
984 |
> |
source="7" |
985 |
|
classpath="" |
986 |
|
includeAntRuntime="false" |
987 |
|
includeJavaRuntime="false" |
1003 |
|
depends="jsr166ecompile" |
1004 |
|
description="Builds library jar from compiled sources"> |
1005 |
|
|
1006 |
< |
<mkdir dir="${build.jsr166elib.dir}"/> |
1007 |
< |
|
1028 |
< |
<jar destfile="${jsr166eproduct.jar}" index="true"> |
1029 |
< |
<fileset dir="${build.jsr166e.dir}"/> |
1006 |
> |
<jar destfile="${jsr166e.jar}" index="true"> |
1007 |
> |
<fileset dir="${build.jsr166e.classes.dir}"/> |
1008 |
|
</jar> |
1009 |
|
|
1010 |
|
</target> |
1012 |
|
|
1013 |
|
|
1014 |
|
<target name="jsr166edocs" |
1015 |
< |
description="Builds javadocs with custom tags to build dir"> |
1015 |
> |
description="Builds javadocs to build dir"> |
1016 |
|
|
1017 |
< |
<delete dir="${build.jsr166ejavadocs.dir}"/> |
1018 |
< |
<mkdir dir="${build.jsr166ejavadocs.dir}"/> |
1017 |
> |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1018 |
> |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
1019 |
|
|
1020 |
< |
<javadoc destdir="${build.jsr166ejavadocs.dir}" |
1021 |
< |
packagenames="jsr166e,jsr166e.extra" |
1022 |
< |
link="${jdkapi7docs.url}" |
1023 |
< |
source="1.7" |
1020 |
> |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
1021 |
> |
packagenames="jsr166e.*" |
1022 |
> |
link="${jdkapidocs.url}" |
1023 |
> |
source="7" |
1024 |
|
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
1025 |
|
executable="${javadoc7}" |
1026 |
|
additionalparam="-XDignore.symbol.file=true" > |
1049 |
– |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
1050 |
– |
<include name="jsr166e/**/*.java"/> |
1051 |
– |
</fileset> |
1027 |
|
</javadoc> |
1028 |
|
|
1029 |
|
</target> |
1030 |
|
|
1031 |
|
|
1032 |
|
<target name="jsr166edist" |
1033 |
< |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs" |
1033 |
> |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs" |
1034 |
|
description="Puts all distributable products in single hierarchy"/> |
1035 |
|
|
1036 |
|
|
1037 |
|
|
1038 |
|
<target name="jsr166eclean" |
1039 |
< |
description="Removes all build products"> |
1039 |
> |
description="Removes all jsr166e build products"> |
1040 |
|
|
1041 |
|
<delete dir="${build.jsr166e.dir}"/> |
1067 |
– |
<delete dir="${build.jsr166elib.dir}"/> |
1042 |
|
|
1043 |
|
</target> |
1044 |
|
|
1045 |
|
|
1072 |
– |
|
1046 |
|
<target name="jsr166edist-clean" |
1047 |
|
description="Removes all build and distribution products"> |
1048 |
|
|
1049 |
|
</target> |
1050 |
|
|
1078 |
– |
<target name="jsr166edist-docs" |
1079 |
– |
description="Builds javadocs to dist dir"> |
1080 |
– |
|
1081 |
– |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1082 |
– |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
1083 |
– |
|
1084 |
– |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
1085 |
– |
packagenames="jsr166e,jsr166e.extra" |
1086 |
– |
link="${jdkapidocs.url}" |
1087 |
– |
source="1.7" |
1088 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
1089 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
1090 |
– |
|
1091 |
– |
</target> |
1092 |
– |
|
1051 |
|
<target name="jsr166edist-jar" |
1052 |
|
depends="jsr166eclean, jsr166ejar"> |
1053 |
|
|
1054 |
< |
<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/> |
1054 |
> |
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1055 |
|
|
1056 |
|
</target> |
1057 |
|
|