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 --> |
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"/> |
75 |
– |
<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 |
|
|
86 |
– |
<macrodef name="run-tck-tests"> |
87 |
– |
<attribute name="jvm"/> |
88 |
– |
<attribute name="tck.classes"/> |
89 |
– |
<attribute name="product.jar" default="${product.jar}"/> |
90 |
– |
<attribute name="jvmflags" default=""/> |
91 |
– |
<sequential> |
92 |
– |
<java classname="JSR166TestCase" |
93 |
– |
jvm="@{jvm}" fork="true"> |
94 |
– |
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
95 |
– |
<jvmarg line="@{jvmflags}"/> |
96 |
– |
<classpath> |
97 |
– |
<pathelement location="${junit.jar}"/> |
98 |
– |
<pathelement location="@{tck.classes}"/> |
99 |
– |
</classpath> |
100 |
– |
</java> |
101 |
– |
</sequential> |
102 |
– |
</macrodef> |
103 |
– |
|
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 |
|
|
136 |
– |
<!-- Bootclasspath argument --> |
137 |
– |
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
138 |
– |
|
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="target"/> |
150 |
+ |
<attribute name="workdir"/> |
151 |
+ |
<attribute name="product.jar" default="${product.jar}"/> |
152 |
+ |
<attribute name="jvmflags" default=""/> |
153 |
+ |
<sequential> |
154 |
+ |
|
155 |
+ |
<mkdir dir="@{workdir}/tck-classes"/> |
156 |
+ |
|
157 |
+ |
<javac srcdir="${tck.src.dir}" |
158 |
+ |
destdir="@{workdir}/tck-classes" |
159 |
+ |
debug="${build.debug}" |
160 |
+ |
debuglevel="${build.debuglevel}" |
161 |
+ |
deprecation="${build.deprecation}" |
162 |
+ |
source="6" |
163 |
+ |
classpath="${junit.jar}" |
164 |
+ |
includeAntRuntime="false" |
165 |
+ |
includeJavaRuntime="false" |
166 |
+ |
executable="${javac@{target}}" |
167 |
+ |
fork="true"> |
168 |
+ |
|
169 |
+ |
<include name="**/*.java"/> |
170 |
+ |
<bootclasspath path="@{product.jar}"/> |
171 |
+ |
<bootclasspath path="${bootclasspath6}"/> |
172 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
173 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
174 |
+ |
<compilerarg line="${build.args}"/> |
175 |
+ |
|
176 |
+ |
</javac> |
177 |
+ |
|
178 |
+ |
<java classname="JSR166TestCase" |
179 |
+ |
failonerror="true" |
180 |
+ |
jvm="${java@{target}}" |
181 |
+ |
fork="true"> |
182 |
+ |
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
183 |
+ |
<jvmarg line="@{jvmflags}"/> |
184 |
+ |
<classpath> |
185 |
+ |
<pathelement location="${junit.jar}"/> |
186 |
+ |
<pathelement location="@{workdir}/tck-classes"/> |
187 |
+ |
</classpath> |
188 |
+ |
</java> |
189 |
+ |
|
190 |
+ |
</sequential> |
191 |
+ |
</macrodef> |
192 |
+ |
|
193 |
|
<!-- ALoops classpath --> |
194 |
|
<path id="loops.classpath"> |
195 |
|
<pathelement location="${build.loops.dir}"/> |
226 |
|
fork="true"> |
227 |
|
|
228 |
|
<include name="**/*.java"/> |
193 |
– |
<compilerarg line="${build.args}"/> |
229 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
230 |
|
<compilerarg value="-Xlint:all"/> |
196 |
– |
|
197 |
– |
<!-- |
198 |
– |
<exclude name="java/lang/**"/> |
231 |
|
<compilerarg line="${build.args}"/> |
200 |
– |
<compilerarg line="-Xlint -Xmaxwarns 1000"/> |
201 |
– |
--> |
232 |
|
|
233 |
|
</javac> |
204 |
– |
|
234 |
|
</target> |
235 |
|
|
236 |
|
|
208 |
– |
|
237 |
|
<target name="jar" |
238 |
|
depends="compile" |
239 |
|
description="Builds library jar from compiled sources"> |
241 |
|
<jar destfile="${product.jar}"> |
242 |
|
<fileset dir="${build.classes.dir}"/> |
243 |
|
</jar> |
216 |
– |
|
244 |
|
</target> |
245 |
|
|
246 |
|
|
220 |
– |
|
247 |
|
<target name="test" |
248 |
|
depends="configure-tests, report-tests" |
249 |
|
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
250 |
|
|
251 |
|
|
226 |
– |
|
252 |
|
<target name="docs" |
253 |
|
description="Builds javadocs for src/main to dist dir"> |
254 |
|
|
262 |
|
packagenames="none" |
263 |
|
link="${jdkapi8docs.url}" |
264 |
|
overview="${src.dir}/intro.html" |
240 |
– |
sourcepath="${src.dir}:${jdk8src.dir}" |
265 |
|
classpath="" |
266 |
|
executable="${javadoc8}"> |
267 |
+ |
<sourcepath path="${src.dir}"/> |
268 |
+ |
<sourcepath path="${jdk8src.dir}"/> |
269 |
|
<arg value="-XDignore.symbol.file=true"/> |
270 |
|
<arg value="-tag"/> |
271 |
|
<arg value="${javadoc.jls.option}"/> |
273 |
|
<include name="**/*.java"/> |
274 |
|
</fileset> |
275 |
|
</javadoc> |
250 |
– |
|
276 |
|
</target> |
277 |
|
|
278 |
|
|
254 |
– |
|
279 |
|
<target name="dist" |
280 |
|
depends="dist-clean, dist-jar, docs" |
281 |
|
description="Puts all distributable products in single hierarchy"/> |
296 |
|
<exclude name="**/SyntaxTest.java"/> |
297 |
|
<exclude name="**/SuperfluousAbstract.java"/> |
298 |
|
</jar> |
275 |
– |
|
299 |
|
</target> |
300 |
|
|
301 |
|
|
279 |
– |
|
302 |
|
<target name="clean" |
303 |
|
description="Removes all build products"> |
304 |
|
|
307 |
|
</target> |
308 |
|
|
309 |
|
|
288 |
– |
|
310 |
|
<target name="dist-clean" |
311 |
|
description="Removes all build and distribution products"> |
312 |
|
|
315 |
|
</target> |
316 |
|
|
317 |
|
|
297 |
– |
|
318 |
|
<!-- Internal targets --> |
319 |
|
|
320 |
|
|
338 |
|
deprecation="${build.deprecation}" |
339 |
|
source="6" |
340 |
|
classpath="${junit.jar}" |
321 |
– |
bootclasspath="${product.jar}:${bootclasspath6}" |
341 |
|
includeAntRuntime="false" |
342 |
|
includeJavaRuntime="false" |
343 |
|
executable="${javac8}" |
344 |
|
fork="true"> |
345 |
|
|
346 |
|
<include name="**/*.java"/> |
347 |
< |
<compilerarg line="${build.args}"/> |
347 |
> |
<bootclasspath path="@{product.jar}"/> |
348 |
> |
<bootclasspath path="${bootclasspath6}"/> |
349 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
350 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
351 |
+ |
<compilerarg line="${build.args}"/> |
352 |
|
|
353 |
|
</javac> |
354 |
|
|
359 |
|
deprecation="${build.deprecation}" |
360 |
|
source="6" |
361 |
|
classpath="" |
341 |
– |
bootclasspath="${product.jar}:${bootclasspath6}" |
362 |
|
includeAntRuntime="false" |
363 |
|
includeJavaRuntime="false" |
364 |
|
executable="${javac8}" |
365 |
|
fork="true"> |
366 |
|
|
367 |
|
<include name="jsr166/test/**/*.java"/> |
368 |
< |
|
369 |
< |
<compilerarg line="${build.args}"/> |
368 |
> |
<bootclasspath path="${product.jar}"/> |
369 |
> |
<bootclasspath path="${bootclasspath6}"/> |
370 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
371 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
372 |
+ |
<compilerarg line="${build.args}"/> |
373 |
|
|
374 |
|
</javac> |
375 |
|
|
382 |
|
source="${build.sourcelevel}" |
383 |
|
fork="true"> |
384 |
|
|
385 |
< |
<compilerarg value="${bootclasspath.args}"/> |
365 |
< |
<compilerarg line="${build.args}"/> |
385 |
> |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
386 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
387 |
+ |
<compilerarg line="${build.args}"/> |
388 |
|
|
389 |
|
</javac> |
390 |
|
--> |
537 |
|
|
538 |
|
<!-- jsr166 4jdk7 --> |
539 |
|
|
519 |
– |
|
540 |
|
<target name="4jdk7compile" |
541 |
|
depends="configure-compiler" |
542 |
|
description="Compiles src/jdk7 sources, targeting jdk7"> |
550 |
|
deprecation="${build.deprecation}" |
551 |
|
source="6" |
552 |
|
classpath="" |
533 |
– |
bootclasspath="${bootclasspath6}" |
553 |
|
includeAntRuntime="false" |
554 |
|
includeJavaRuntime="false" |
555 |
|
executable="${javac7}" |
556 |
|
fork="true"> |
557 |
|
|
558 |
|
<include name="**/*.java"/> |
559 |
< |
<compilerarg line="${build.args}"/> |
559 |
> |
<bootclasspath path="${bootclasspath6}"/> |
560 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
561 |
|
<compilerarg value="-Xlint:all"/> |
562 |
+ |
<compilerarg line="${build.args}"/> |
563 |
|
|
564 |
|
</javac> |
565 |
+ |
</target> |
566 |
|
|
546 |
– |
<jar destfile="${4jdk7product.jar}" index="true"> |
547 |
– |
<fileset dir="${build.4jdk7.classes.dir}"/> |
548 |
– |
</jar> |
549 |
– |
|
550 |
– |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
567 |
|
|
568 |
< |
<javac srcdir="${tck.src.dir}" |
569 |
< |
destdir="${build.4jdk7.tck.classes.dir}" |
570 |
< |
debug="${build.debug}" |
555 |
< |
debuglevel="${build.debuglevel}" |
556 |
< |
deprecation="${build.deprecation}" |
557 |
< |
source="6" |
558 |
< |
classpath="${junit.jar}" |
559 |
< |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
560 |
< |
includeAntRuntime="false" |
561 |
< |
includeJavaRuntime="false" |
562 |
< |
executable="${javac7}" |
563 |
< |
fork="true"> |
564 |
< |
|
565 |
< |
<include name="**/*.java"/> |
566 |
< |
<compilerarg line="${build.args}"/> |
567 |
< |
<compilerarg value="-XDignore.symbol.file=true"/> |
568 |
< |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
568 |
> |
<target name="4jdk7-jar" |
569 |
> |
depends="4jdk7compile" |
570 |
> |
description="Builds library jar from compiled sources"> |
571 |
|
|
572 |
< |
</javac> |
572 |
> |
<jar destfile="${4jdk7product.jar}"> |
573 |
> |
<fileset dir="${build.4jdk7.classes.dir}"/> |
574 |
> |
</jar> |
575 |
|
|
576 |
|
</target> |
577 |
|
|
578 |
|
|
579 |
|
<target name="4jdk7-test-tck" |
580 |
< |
depends="4jdk7compile" |
580 |
> |
depends="4jdk7-jar" |
581 |
|
description="Runs tck tests for jsr166-4jdk7 directly"> |
582 |
+ |
|
583 |
|
<run-tck-tests |
584 |
< |
jvm="${java7}" |
585 |
< |
tck.classes="${build.4jdk7.tck.classes.dir}" |
584 |
> |
target="7" |
585 |
> |
workdir="${build.4jdk7.dir}" |
586 |
|
product.jar="${4jdk7product.jar}"/> |
587 |
|
</target> |
588 |
|
|
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="4jdk7docs" |
647 |
|
description="Builds javadocs for src/jdk7 to dist dir"> |
653 |
|
packagenames="none" |
654 |
|
link="${jdkapi7docs.url}" |
655 |
|
overview="${4jdk7src.dir}/intro.html" |
624 |
– |
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
656 |
|
classpath="" |
657 |
|
executable="${javadoc7}"> |
658 |
+ |
<sourcepath path="${4jdk7src.dir}"/> |
659 |
+ |
<sourcepath path="${jdk7src.dir}"/> |
660 |
|
<arg value="-XDignore.symbol.file=true"/> |
661 |
|
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
662 |
|
<include name="**/*.java"/> |
663 |
|
</fileset> |
664 |
|
</javadoc> |
632 |
– |
|
665 |
|
</target> |
666 |
|
|
667 |
|
|
670 |
|
description="Puts all distributable products in single hierarchy"/> |
671 |
|
|
672 |
|
|
641 |
– |
|
673 |
|
<target name="4jdk7clean" |
674 |
|
description="Removes all 4jdk7 build products"> |
675 |
|
|
678 |
|
</target> |
679 |
|
|
680 |
|
|
650 |
– |
|
681 |
|
<target name="4jdk7dist-clean" |
682 |
|
description="Removes all build and distribution products"> |
683 |
|
|
684 |
|
</target> |
685 |
|
|
686 |
|
<target name="4jdk7dist-jar" |
687 |
< |
depends="4jdk7clean, 4jdk7compile"> |
687 |
> |
depends="4jdk7clean, 4jdk7-jar"> |
688 |
|
|
689 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
690 |
|
|
706 |
|
deprecation="${build.deprecation}" |
707 |
|
classpath="" |
708 |
|
source="5" |
679 |
– |
bootclasspath="${bootclasspath6}" |
709 |
|
includeAntRuntime="false" |
710 |
|
includeJavaRuntime="false" |
711 |
|
executable="${javac7}" |
712 |
|
fork="true"> |
713 |
|
|
714 |
|
<include name="jsr166x/**/*.java"/> |
715 |
< |
<compilerarg line="${build.args}"/> |
715 |
> |
<bootclasspath path="${bootclasspath6}"/> |
716 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
717 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
718 |
+ |
<compilerarg line="${build.args}"/> |
719 |
|
|
720 |
|
</javac> |
691 |
– |
|
721 |
|
</target> |
722 |
|
|
723 |
|
|
724 |
< |
|
696 |
< |
<target name="jsr166xjar" |
724 |
> |
<target name="jsr166x-jar" |
725 |
|
depends="jsr166xcompile" |
726 |
|
description="Builds library jar from compiled sources"> |
727 |
|
|
732 |
|
</target> |
733 |
|
|
734 |
|
|
707 |
– |
|
735 |
|
<target name="jsr166xdocs" |
736 |
|
description="Builds javadocs to dist dir"> |
737 |
|
|
742 |
|
packagenames="jsr166x.*" |
743 |
|
link="${jdkapidocs.url}" |
744 |
|
source="5" |
745 |
< |
bootclasspath="${bootclasspath6}" |
746 |
< |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
747 |
< |
executable="${javadoc7}" |
748 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
745 |
> |
executable="${javadoc7}"> |
746 |
> |
<sourcepath path="${topsrc.dir}"/> |
747 |
> |
<sourcepath path="${jdk6src.dir}"/> |
748 |
> |
<bootclasspath path="${bootclasspath6}"/> |
749 |
> |
<arg value="-XDignore.symbol.file=true"/> |
750 |
|
|
751 |
+ |
</javadoc> |
752 |
|
</target> |
753 |
|
|
754 |
|
|
757 |
|
description="Puts all distributable products in single hierarchy"/> |
758 |
|
|
759 |
|
|
731 |
– |
|
760 |
|
<target name="jsr166xclean" |
761 |
|
description="Removes all jsr166x build products"> |
762 |
|
|
765 |
|
</target> |
766 |
|
|
767 |
|
|
740 |
– |
|
768 |
|
<target name="jsr166xdist-clean" |
769 |
|
description="Removes all build and distribution products"> |
770 |
|
|
772 |
|
|
773 |
|
|
774 |
|
<target name="jsr166xdist-jar" |
775 |
< |
depends="jsr166xclean, jsr166xjar"> |
775 |
> |
depends="jsr166xclean, jsr166x-jar"> |
776 |
|
|
777 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
778 |
|
|
794 |
|
deprecation="${build.deprecation}" |
795 |
|
source="6" |
796 |
|
classpath="" |
770 |
– |
bootclasspath="${bootclasspath6}" |
797 |
|
includeAntRuntime="false" |
798 |
|
includeJavaRuntime="false" |
799 |
|
executable="${javac7}" |
800 |
|
fork="true"> |
801 |
|
|
802 |
|
<include name="jsr166y/**/*.java"/> |
803 |
< |
<compilerarg line="${build.args}"/> |
803 |
> |
<bootclasspath path="${bootclasspath6}"/> |
804 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
805 |
|
<compilerarg value="-Xlint:all"/> |
806 |
+ |
<compilerarg line="${build.args}"/> |
807 |
+ |
|
808 |
|
</javac> |
809 |
|
</target> |
810 |
|
|
811 |
|
|
812 |
< |
<target name="jsr166yjar" |
812 |
> |
<target name="jsr166y-jar" |
813 |
|
depends="jsr166ycompile" |
814 |
|
description="Builds library jar from compiled sources"> |
815 |
|
|
820 |
|
</target> |
821 |
|
|
822 |
|
|
795 |
– |
|
823 |
|
<target name="jsr166ydocs" |
824 |
|
description="Builds javadocs to dist dir"> |
825 |
|
|
830 |
|
packagenames="jsr166y.*" |
831 |
|
link="${jdkapidocs.url}" |
832 |
|
source="6" |
833 |
< |
bootclasspath="${bootclasspath6}" |
834 |
< |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
835 |
< |
executable="${javadoc7}" |
836 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
833 |
> |
executable="${javadoc7}"> |
834 |
> |
<sourcepath path="${topsrc.dir}"/> |
835 |
> |
<sourcepath path="${jdk6src.dir}"/> |
836 |
> |
<bootclasspath path="${bootclasspath6}"/> |
837 |
> |
<arg value="-XDignore.symbol.file=true"/> |
838 |
|
|
839 |
+ |
</javadoc> |
840 |
|
</target> |
841 |
|
|
842 |
|
|
845 |
|
description="Puts all distributable products in single hierarchy"/> |
846 |
|
|
847 |
|
|
819 |
– |
|
848 |
|
<target name="jsr166yclean" |
849 |
|
description="Removes all jsr166y build products"> |
850 |
|
|
853 |
|
</target> |
854 |
|
|
855 |
|
|
828 |
– |
|
856 |
|
<target name="jsr166ydist-clean" |
857 |
|
description="Removes all build and distribution products"> |
858 |
|
|
859 |
|
</target> |
860 |
|
|
861 |
|
<target name="jsr166ydist-jar" |
862 |
< |
depends="jsr166yclean, jsr166yjar"> |
862 |
> |
depends="jsr166yclean, jsr166y-jar"> |
863 |
|
|
864 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
865 |
|
|
870 |
|
|
871 |
|
|
872 |
|
<target name="extra166ycompile" |
873 |
< |
depends="configure-compiler, jsr166yjar" |
873 |
> |
depends="configure-compiler, jsr166y-jar" |
874 |
|
description="Compiles extra166y sources"> |
875 |
|
|
876 |
|
<mkdir dir="${build.extra166y.classes.dir}"/> |
882 |
|
deprecation="${build.deprecation}" |
883 |
|
classpath="" |
884 |
|
source="6" |
858 |
– |
bootclasspath="${jsr166y.jar}:${bootclasspath6}" |
885 |
|
includeAntRuntime="false" |
886 |
|
includeJavaRuntime="false" |
887 |
|
executable="${javac7}" |
888 |
|
fork="true"> |
889 |
|
|
890 |
|
<include name="extra166y/**/*.java"/> |
891 |
< |
<compilerarg line="${build.args}"/> |
891 |
> |
<bootclasspath path="${jsr166y.jar}"/> |
892 |
> |
<bootclasspath path="${bootclasspath6}"/> |
893 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
894 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
895 |
+ |
<compilerarg line="${build.args}"/> |
896 |
|
|
897 |
|
</javac> |
870 |
– |
|
898 |
|
</target> |
899 |
|
|
900 |
|
|
901 |
< |
|
875 |
< |
<target name="extra166yjar" |
901 |
> |
<target name="extra166y-jar" |
902 |
|
depends="extra166ycompile" |
903 |
|
description="Builds library jar from compiled sources"> |
904 |
|
|
909 |
|
</target> |
910 |
|
|
911 |
|
|
886 |
– |
|
912 |
|
<target name="extra166ydocs" |
913 |
|
description="Builds javadocs to build dir"> |
914 |
|
|
919 |
|
packagenames="extra166y.*" |
920 |
|
link="${jdkapidocs.url}" |
921 |
|
source="6" |
922 |
< |
bootclasspath="${bootclasspath6}" |
923 |
< |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
924 |
< |
executable="${javadoc7}" |
925 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
922 |
> |
executable="${javadoc7}"> |
923 |
> |
<sourcepath path="${topsrc.dir}"/> |
924 |
> |
<sourcepath path="${jdk6src.dir}"/> |
925 |
> |
<bootclasspath path="${bootclasspath6}"/> |
926 |
> |
<arg value="-XDignore.symbol.file=true"/> |
927 |
|
|
928 |
+ |
</javadoc> |
929 |
|
</target> |
930 |
|
|
931 |
|
|
934 |
|
description="Puts all distributable products in single hierarchy"/> |
935 |
|
|
936 |
|
|
910 |
– |
|
937 |
|
<target name="extra166yclean" |
938 |
|
description="Removes all extra166y build products"> |
939 |
|
|
942 |
|
</target> |
943 |
|
|
944 |
|
|
919 |
– |
|
945 |
|
<target name="extra166ydist-clean" |
946 |
|
description="Removes all build and distribution products"> |
947 |
|
|
948 |
|
</target> |
949 |
|
|
950 |
|
<target name="extra166ydist-jar" |
951 |
< |
depends="extra166yclean, extra166yjar"> |
951 |
> |
depends="extra166yclean, extra166y-jar"> |
952 |
|
|
953 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
954 |
|
|
975 |
|
fork="true"> |
976 |
|
|
977 |
|
<include name="jsr166e/**/*.java"/> |
953 |
– |
<compilerarg line="${build.args}"/> |
978 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
979 |
|
<compilerarg value="-Xlint:all"/> |
980 |
+ |
<compilerarg line="${build.args}"/> |
981 |
|
|
982 |
|
</javac> |
958 |
– |
|
983 |
|
</target> |
984 |
|
|
985 |
|
|
986 |
< |
|
963 |
< |
<target name="jsr166ejar" |
986 |
> |
<target name="jsr166e-jar" |
987 |
|
depends="jsr166ecompile" |
988 |
|
description="Builds library jar from compiled sources"> |
989 |
|
|
994 |
|
</target> |
995 |
|
|
996 |
|
|
974 |
– |
|
997 |
|
<target name="jsr166edocs" |
998 |
|
description="Builds javadocs to build dir"> |
999 |
|
|
1004 |
|
packagenames="jsr166e.*" |
1005 |
|
link="${jdkapidocs.url}" |
1006 |
|
source="7" |
1007 |
< |
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
1008 |
< |
executable="${javadoc7}" |
1009 |
< |
additionalparam="-XDignore.symbol.file=true" > |
1010 |
< |
</javadoc> |
1007 |
> |
executable="${javadoc7}"> |
1008 |
> |
<sourcepath path="${topsrc.dir}"/> |
1009 |
> |
<sourcepath path="${jdk7src.dir}"/> |
1010 |
> |
<arg value="-XDignore.symbol.file=true"/> |
1011 |
|
|
1012 |
+ |
</javadoc> |
1013 |
|
</target> |
1014 |
|
|
1015 |
|
|
1018 |
|
description="Puts all distributable products in single hierarchy"/> |
1019 |
|
|
1020 |
|
|
998 |
– |
|
1021 |
|
<target name="jsr166eclean" |
1022 |
|
description="Removes all jsr166e build products"> |
1023 |
|
|
1032 |
|
</target> |
1033 |
|
|
1034 |
|
<target name="jsr166edist-jar" |
1035 |
< |
depends="jsr166eclean, jsr166ejar"> |
1035 |
> |
depends="jsr166eclean, jsr166e-jar"> |
1036 |
|
|
1037 |
|
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1038 |
|
|