8 |
|
|
9 |
|
User-specific settings are read from user.properties. |
10 |
|
See user.properties.sample for an explanation of some useful settings. |
11 |
+ |
|
12 |
+ |
The repository contains all dependencies except for ant and the JDK |
13 |
+ |
itself. Because the JDK version matters and because different |
14 |
+ |
targets require different JDKs, we assume that users have created a |
15 |
+ |
hierarchy containing: |
16 |
+ |
$HOME/jdk/jdk6 |
17 |
+ |
$HOME/jdk/jdk7 |
18 |
+ |
$HOME/jdk/jdk8 |
19 |
+ |
where each of the above is a JDK or a symlink to same, and |
20 |
+ |
$HOME/jdk/src/jdk6 |
21 |
+ |
$HOME/jdk/src/jdk7 |
22 |
+ |
$HOME/jdk/src/jdk8 |
23 |
+ |
where each of the above is a complete JDK source tree |
24 |
+ |
(e.g. mercurial forest) or a symlink to same. |
25 |
|
------------------------------------------------------------------------------ |
26 |
|
</description> |
27 |
|
|
49 |
|
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
50 |
|
<property name="build.reports.dir" location="${build.dir}/reports"/> |
51 |
|
|
52 |
< |
<property name="build.jdk7.dir" location="${build.dir}/jdk7"/> |
53 |
< |
<property name="build.jdk7.lib.dir" location="${build.jdk7.dir}"/> |
54 |
< |
<property name="build.jdk7.classes.dir" location="${build.jdk7.dir}/classes"/> |
55 |
< |
<property name="build.jdk7.docs.dir" location="${build.jdk7.dir}/docs"/> |
52 |
> |
<property name="build.4jdk7.dir" location="${build.dir}/4jdk7"/> |
53 |
> |
<property name="build.4jdk7.lib.dir" location="${build.4jdk7.dir}"/> |
54 |
> |
<property name="build.4jdk7.classes.dir" location="${build.4jdk7.dir}/classes"/> |
55 |
> |
<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"/> |
57 |
|
|
58 |
|
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
59 |
|
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
77 |
|
<macrodef name="defjdklocations"> |
78 |
|
<attribute name="v"/> |
79 |
|
<sequential> |
80 |
< |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
81 |
< |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
82 |
< |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
83 |
< |
<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
84 |
< |
<property name="bootclasspath@{v}" |
80 |
> |
<property name="jdk@{v}.home" location="${jdks.home}/jdk@{v}"/> |
81 |
> |
<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/> |
82 |
> |
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
83 |
> |
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
84 |
> |
<property name="bootdir@{v}" location="${jdk@{v}.home}/jre/lib"/> |
85 |
> |
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/> |
86 |
> |
<property name="bootclasspath@{v}" |
87 |
|
value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/> |
88 |
|
</sequential> |
89 |
|
</macrodef> |
92 |
|
<defjdklocations v="7"/> |
93 |
|
<defjdklocations v="8"/> |
94 |
|
|
95 |
+ |
<macrodef name="run-tck-tests"> |
96 |
+ |
<attribute name="jvm"/> |
97 |
+ |
<attribute name="tck.classes"/> |
98 |
+ |
<attribute name="product.jar" default="${product.jar}"/> |
99 |
+ |
<attribute name="jvmflags" default=""/> |
100 |
+ |
<sequential> |
101 |
+ |
<java classname="JSR166TestCase" |
102 |
+ |
jvm="@{jvm}" fork="true"> |
103 |
+ |
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
104 |
+ |
<jvmarg line="@{jvmflags}"/> |
105 |
+ |
<classpath> |
106 |
+ |
<pathelement location="${junit.jar}"/> |
107 |
+ |
<pathelement location="@{tck.classes}"/> |
108 |
+ |
</classpath> |
109 |
+ |
</java> |
110 |
+ |
</sequential> |
111 |
+ |
</macrodef> |
112 |
+ |
|
113 |
|
<!-- Source locations --> |
114 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
115 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
119 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
120 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
121 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
122 |
< |
<property name="jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
122 |
> |
<property name="4jdk7src.dir" location="${topsrc.dir}/jdk7"/> |
123 |
|
<property name="jsr166xsrc.dir" location="${topsrc.dir}/jsr166x"/> |
124 |
|
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
125 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
128 |
|
|
129 |
|
<!-- Distribution locations --> |
130 |
|
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
131 |
< |
<property name="dist.jdk7.docs.dir" location="${dist.dir}/jsr166-jdk7docs"/> |
131 |
> |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
132 |
|
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
133 |
|
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
134 |
|
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
136 |
|
|
137 |
|
<!-- Jar locations --> |
138 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
139 |
< |
<property name="jdk7product.jar" location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/> |
139 |
> |
<property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/> |
140 |
|
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
141 |
|
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
142 |
|
<property name="jsr166eproduct.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
167 |
|
<pathelement location="${build.loops.dir}"/> |
168 |
|
</path> |
169 |
|
|
170 |
+ |
<!-- Support @jls tag, used in jdk8+ javadoc --> |
171 |
+ |
<!-- TODO: How do we get &trade to work? --> |
172 |
+ |
<!-- TODO: Why isn't @jls a "standard" tag? --> |
173 |
+ |
<!-- property name="javadoc.jls.cite" value="The Java™ Language Specification" --> |
174 |
+ |
<property name="javadoc.jls.cite" value="The Java Language Specification"/> |
175 |
+ |
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
176 |
|
|
177 |
|
<!-- Main targets --> |
178 |
|
|
181 |
|
description="Builds all public jars and docs"/> |
182 |
|
|
183 |
|
<target name="compile" |
184 |
< |
depends="init, configure-compiler" |
185 |
< |
description="Compiles main sources to build folder"> |
184 |
> |
depends="configure-compiler" |
185 |
> |
description="Compiles src/main sources to build dir"> |
186 |
|
|
187 |
|
<mkdir dir="${build.classes.dir}"/> |
188 |
|
|
189 |
|
<javac srcdir="${src.dir}" |
190 |
< |
destdir="${build.classes.dir}" |
191 |
< |
debug="${build.debug}" |
192 |
< |
debuglevel="${build.debuglevel}" |
193 |
< |
deprecation="${build.deprecation}" |
194 |
< |
source="${build.sourcelevel}" |
195 |
< |
fork="true"> |
190 |
> |
destdir="${build.classes.dir}" |
191 |
> |
debug="${build.debug}" |
192 |
> |
debuglevel="${build.debuglevel}" |
193 |
> |
deprecation="${build.deprecation}" |
194 |
> |
classpath="" |
195 |
> |
includeAntRuntime="false" |
196 |
> |
includeJavaRuntime="false" |
197 |
> |
executable="${javac8}" |
198 |
> |
fork="true"> |
199 |
|
|
200 |
|
<include name="**/*.java"/> |
201 |
+ |
<compilerarg line="${build.args}"/> |
202 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
203 |
+ |
<compilerarg value="-Xlint:all"/> |
204 |
|
|
205 |
|
<!-- |
206 |
|
<exclude name="java/lang/**"/> |
229 |
|
|
230 |
|
|
231 |
|
<target name="test" |
232 |
< |
depends="init, configure-tests, report-tests" |
232 |
> |
depends="configure-tests, report-tests" |
233 |
|
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
234 |
|
|
235 |
|
|
236 |
|
|
237 |
|
<target name="docs" |
238 |
< |
description="Builds javadocs with custom tags to build folder"> |
238 |
> |
description="Builds javadocs for src/main to dist dir"> |
239 |
|
|
240 |
< |
<delete dir="${build.javadocs.dir}"/> |
241 |
< |
<mkdir dir="${build.javadocs.dir}"/> |
240 |
> |
<delete dir="${dist.javadocs.dir}"/> |
241 |
> |
<mkdir dir="${dist.javadocs.dir}"/> |
242 |
|
|
243 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
244 |
|
<!-- sourcepath for packages --> |
245 |
|
|
246 |
< |
<javadoc destdir="${build.javadocs.dir}" |
246 |
> |
<javadoc destdir="${dist.javadocs.dir}" |
247 |
|
packagenames="none" |
248 |
< |
link="${jdkapidocs.url}" |
248 |
> |
link="${jdkapi8docs.url}" |
249 |
|
overview="${src.dir}/intro.html" |
250 |
< |
sourcepath="${src.dir}:${jdksrc.dir}" |
251 |
< |
additionalparam="-XDignore.symbol.file=true" > |
250 |
> |
sourcepath="${src.dir}:${jdk8src.dir}" |
251 |
> |
classpath="" |
252 |
> |
executable="${javadoc8}"> |
253 |
> |
<arg value="-XDignore.symbol.file=true"/> |
254 |
> |
<arg value="-tag"/> |
255 |
> |
<arg value="${javadoc.jls.option}"/> |
256 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
257 |
|
<include name="**/*.java"/> |
258 |
|
</fileset> |
263 |
|
|
264 |
|
|
265 |
|
<target name="dist" |
266 |
< |
depends="init, dist-clean, dist-jar, dist-docs" |
266 |
> |
depends="dist-clean, dist-jar, docs" |
267 |
|
description="Puts all distributable products in single hierarchy"/> |
268 |
|
|
269 |
|
|
307 |
|
|
308 |
|
|
309 |
|
|
260 |
– |
<target name="dist-docs" |
261 |
– |
description="Builds javadocs without custom tags to dist folder"> |
262 |
– |
|
263 |
– |
<delete dir="${dist.javadocs.dir}"/> |
264 |
– |
<mkdir dir="${dist.javadocs.dir}"/> |
265 |
– |
|
266 |
– |
<!-- the packagenames="none" hack below prevents scanning the --> |
267 |
– |
<!-- sourcepath for packages --> |
268 |
– |
|
269 |
– |
<javadoc destdir="${dist.javadocs.dir}" |
270 |
– |
packagenames="none" |
271 |
– |
link="${jdkapidocs.url}" |
272 |
– |
overview="${src.dir}/intro.html" |
273 |
– |
sourcepath="${src.dir}:${jdksrc.dir}" |
274 |
– |
additionalparam="-XDignore.symbol.file=true" > |
275 |
– |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
276 |
– |
<include name="**/*.java"/> |
277 |
– |
</fileset> |
278 |
– |
</javadoc> |
279 |
– |
|
280 |
– |
</target> |
281 |
– |
|
282 |
– |
|
283 |
– |
|
310 |
|
<!-- Internal targets --> |
311 |
|
|
312 |
|
|
287 |
– |
<target name="init"> |
288 |
– |
|
289 |
– |
<!-- Version is kept in a separate file --> |
290 |
– |
<loadfile property="version" srcFile="version.properties"/> |
291 |
– |
<echo>Building JSR-166 version ${version}</echo> |
292 |
– |
<echo>java.home is ${java.home}</echo> |
293 |
– |
|
294 |
– |
</target> |
295 |
– |
|
296 |
– |
|
313 |
|
<target name="dist-jar" |
314 |
|
depends="clean, jar"> |
315 |
|
|
494 |
|
<!-- Various demos and test programs --> |
495 |
|
|
496 |
|
|
497 |
< |
<target name="loops" depends="init, configure-compiler" |
497 |
> |
<target name="loops" depends="configure-compiler" |
498 |
|
description="Benchmark from Doug Lea's AQS paper"> |
499 |
|
|
500 |
|
<mkdir dir="${build.loops.dir}"/> |
520 |
|
</target> |
521 |
|
|
522 |
|
|
523 |
< |
<!-- jdk7 --> |
523 |
> |
<!-- jsr166 4jdk7 --> |
524 |
|
|
525 |
|
|
526 |
< |
<target name="jdk7compile" |
526 |
> |
<target name="4jdk7compile" |
527 |
|
depends="configure-compiler" |
528 |
< |
description="Compiles src/jdk7 sources"> |
528 |
> |
description="Compiles src/jdk7 sources, targeting jdk7"> |
529 |
|
|
530 |
< |
<mkdir dir="${build.jdk7.classes.dir}"/> |
530 |
> |
<mkdir dir="${build.4jdk7.classes.dir}"/> |
531 |
|
|
532 |
< |
<javac srcdir="${jdk7src.dir}" |
533 |
< |
destdir="${build.jdk7.classes.dir}" |
532 |
> |
<javac srcdir="${4jdk7src.dir}" |
533 |
> |
destdir="${build.4jdk7.classes.dir}" |
534 |
|
debug="${build.debug}" |
535 |
|
debuglevel="${build.debuglevel}" |
536 |
|
deprecation="${build.deprecation}" |
539 |
|
bootclasspath="${bootclasspath6}" |
540 |
|
includeAntRuntime="false" |
541 |
|
includeJavaRuntime="false" |
542 |
< |
executable="${javac6}" |
542 |
> |
executable="${javac7}" |
543 |
|
fork="true"> |
544 |
|
|
545 |
|
<include name="**/*.java"/> |
549 |
|
|
550 |
|
</javac> |
551 |
|
|
552 |
< |
</target> |
552 |
> |
<mkdir dir="${build.4jdk7.lib.dir}"/> |
553 |
|
|
554 |
+ |
<jar destfile="${4jdk7product.jar}" index="true"> |
555 |
+ |
<fileset dir="${build.4jdk7.classes.dir}"/> |
556 |
+ |
</jar> |
557 |
|
|
558 |
+ |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
559 |
|
|
560 |
< |
<target name="jdk7jar" |
561 |
< |
depends="jdk7compile" |
562 |
< |
description="Builds library jar from compiled sources"> |
560 |
> |
<javac srcdir="${tck.src.dir}" |
561 |
> |
destdir="${build.4jdk7.tck.classes.dir}" |
562 |
> |
debug="${build.debug}" |
563 |
> |
debuglevel="${build.debuglevel}" |
564 |
> |
deprecation="${build.deprecation}" |
565 |
> |
source="1.6" |
566 |
> |
classpath="${junit.jar}" |
567 |
> |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
568 |
> |
includeAntRuntime="false" |
569 |
> |
includeJavaRuntime="false" |
570 |
> |
executable="${javac7}" |
571 |
> |
fork="true"> |
572 |
|
|
573 |
< |
<mkdir dir="${build.jdk7.lib.dir}"/> |
573 |
> |
<include name="**/*.java"/> |
574 |
> |
<compilerarg line="${build.args}"/> |
575 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
576 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
577 |
|
|
578 |
< |
<jar destfile="${jdk7product.jar}" index="true"> |
547 |
< |
<fileset dir="${build.jdk7.classes.dir}"/> |
548 |
< |
</jar> |
578 |
> |
</javac> |
579 |
|
|
580 |
|
</target> |
581 |
|
|
582 |
|
|
583 |
+ |
<target name="4jdk7-test-tck" |
584 |
+ |
depends="4jdk7compile" |
585 |
+ |
description="Runs tck tests for jsr166-4jdk7 directly"> |
586 |
+ |
<run-tck-tests |
587 |
+ |
jvm="${java7}" |
588 |
+ |
tck.classes="${build.4jdk7.tck.classes.dir}" |
589 |
+ |
product.jar="${4jdk7product.jar}"/> |
590 |
+ |
</target> |
591 |
+ |
|
592 |
+ |
|
593 |
+ |
<target name="4jdk7-test-tck-junit" |
594 |
+ |
depends="4jdk7compile" |
595 |
+ |
description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)"> |
596 |
+ |
|
597 |
+ |
<junit printsummary="true" |
598 |
+ |
showoutput="true" |
599 |
+ |
errorProperty="junit.failed" |
600 |
+ |
failureProperty="junit.failed" |
601 |
+ |
includeantruntime="true" |
602 |
+ |
jvm="${java7}" |
603 |
+ |
fork="true"> |
604 |
+ |
|
605 |
+ |
<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
606 |
+ |
<jvmarg value="-server"/> |
607 |
+ |
|
608 |
+ |
<classpath> |
609 |
+ |
<pathelement location="${junit.jar}"/> |
610 |
+ |
<pathelement location="${build.4jdk7.tck.classes.dir}"/> |
611 |
+ |
</classpath> |
612 |
+ |
|
613 |
+ |
<formatter type="brief"/> |
614 |
+ |
|
615 |
+ |
<test name="JSR166TestCase" haltonfailure="no"> |
616 |
+ |
</test> |
617 |
+ |
|
618 |
+ |
</junit> |
619 |
+ |
</target> |
620 |
+ |
|
621 |
|
|
622 |
< |
<target name="jdk7docs" |
623 |
< |
description="Builds javadocs with custom tags to build folder"> |
622 |
> |
<target name="4jdk7docs" |
623 |
> |
description="Builds javadocs for src/jdk7 to dist dir"> |
624 |
|
|
625 |
< |
<delete dir="${build.jdk7.docs.dir}"/> |
626 |
< |
<mkdir dir="${build.jdk7.docs.dir}"/> |
625 |
> |
<delete dir="${dist.4jdk7.docs.dir}"/> |
626 |
> |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
627 |
|
|
628 |
< |
<javadoc destdir="${build.jdk7.docs.dir}" |
628 |
> |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
629 |
|
packagenames="none" |
630 |
|
link="${jdkapi7docs.url}" |
631 |
< |
overview="${jdk7src.dir}/intro.html" |
632 |
< |
sourcepath="${jdk7src.dir}" |
565 |
< |
bootclasspath="${bootclasspath6}" |
631 |
> |
overview="${4jdk7src.dir}/intro.html" |
632 |
> |
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
633 |
|
classpath="" |
634 |
< |
source="1.6" |
635 |
< |
executable="${javadoc7}" |
636 |
< |
additionalparam="-XDignore.symbol.file=true" > |
570 |
< |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
634 |
> |
executable="${javadoc7}"> |
635 |
> |
<arg value="-XDignore.symbol.file=true"/> |
636 |
> |
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
637 |
|
<include name="**/*.java"/> |
638 |
|
</fileset> |
639 |
|
</javadoc> |
641 |
|
</target> |
642 |
|
|
643 |
|
|
644 |
< |
<target name="jdk7dist" |
645 |
< |
depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs" |
644 |
> |
<target name="4jdk7dist" |
645 |
> |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs" |
646 |
|
description="Puts all distributable products in single hierarchy"/> |
647 |
|
|
648 |
|
|
649 |
|
|
650 |
< |
<target name="jdk7clean" |
650 |
> |
<target name="4jdk7clean" |
651 |
|
description="Removes all build products"> |
652 |
|
|
653 |
< |
<delete dir="${build.jdk7.dir}"/> |
653 |
> |
<delete dir="${build.4jdk7.dir}"/> |
654 |
|
|
655 |
|
</target> |
656 |
|
|
657 |
|
|
658 |
|
|
659 |
< |
<target name="jdk7dist-clean" |
659 |
> |
<target name="4jdk7dist-clean" |
660 |
|
description="Removes all build and distribution products"> |
661 |
|
|
662 |
|
</target> |
663 |
|
|
664 |
< |
<target name="jdk7dist-docs" |
665 |
< |
description="Builds javadocs without custom tags to dist folder"> |
664 |
> |
<target name="4jdk7dist-jar" |
665 |
> |
depends="4jdk7clean, 4jdk7compile"> |
666 |
|
|
667 |
< |
<delete dir="${dist.jdk7.docs.dir}"/> |
602 |
< |
<mkdir dir="${dist.jdk7.docs.dir}"/> |
603 |
< |
|
604 |
< |
<javadoc destdir="${dist.jdk7.docs.dir}" |
605 |
< |
packagenames="none" |
606 |
< |
link="${jdkapi7docs.url}" |
607 |
< |
overview="${jdk7src.dir}/intro.html" |
608 |
< |
sourcepath="${jdk7src.dir}" |
609 |
< |
classpath="" |
610 |
< |
executable="${javadoc7}" |
611 |
< |
bootclasspath="${bootclasspath6}" |
612 |
< |
source="1.6"> |
613 |
< |
<arg value="-XDignore.symbol.file=true"/> |
614 |
< |
<fileset dir="${jdk7src.dir}" defaultexcludes="yes"> |
615 |
< |
<include name="**/*.java"/> |
616 |
< |
</fileset> |
617 |
< |
</javadoc> |
618 |
< |
|
619 |
< |
</target> |
620 |
< |
|
621 |
< |
<target name="jdk7dist-jar" |
622 |
< |
depends="jdk7clean, jdk7jar"> |
623 |
< |
|
624 |
< |
<copy file="${jdk7product.jar}" todir="${dist.dir}"/> |
667 |
> |
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
668 |
|
|
669 |
|
</target> |
670 |
|
|
672 |
|
|
673 |
|
|
674 |
|
<target name="jsr166xcompile" |
675 |
< |
depends="init, configure-compiler" |
676 |
< |
description="Compiles jsr166x sources"> |
675 |
> |
depends="configure-compiler" |
676 |
> |
description="Compiles jsr166x sources to build dir"> |
677 |
|
|
678 |
|
<mkdir dir="${build.jsr166x.dir}"/> |
679 |
|
|
680 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
681 |
< |
destdir="${build.jsr166x.dir}" |
682 |
< |
debug="${build.debug}" |
683 |
< |
debuglevel="${build.debuglevel}" |
684 |
< |
deprecation="${build.deprecation}" |
685 |
< |
source="${build.sourcelevel}" |
686 |
< |
fork="true"> |
680 |
> |
<javac srcdir="${topsrc.dir}" |
681 |
> |
destdir="${build.jsr166x.dir}" |
682 |
> |
debug="${build.debug}" |
683 |
> |
debuglevel="${build.debuglevel}" |
684 |
> |
deprecation="${build.deprecation}" |
685 |
> |
classpath="" |
686 |
> |
source="1.5" |
687 |
> |
bootclasspath="${bootclasspath6}" |
688 |
> |
includeAntRuntime="false" |
689 |
> |
includeJavaRuntime="false" |
690 |
> |
executable="${javac7}" |
691 |
> |
fork="true"> |
692 |
|
|
693 |
< |
<include name="**/*.java"/> |
693 |
> |
<include name="jsr166x/**/*.java"/> |
694 |
|
<compilerarg line="${build.args}"/> |
695 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
696 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
697 |
|
|
698 |
|
</javac> |
699 |
|
|
716 |
|
|
717 |
|
|
718 |
|
<target name="jsr166xdocs" |
719 |
< |
description="Builds javadocs with custom tags to build folder"> |
719 |
> |
description="Builds javadocs to dist dir"> |
720 |
|
|
721 |
|
<delete dir="${build.jsr166xjavadocs.dir}"/> |
722 |
|
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
755 |
|
|
756 |
|
|
757 |
|
<target name="jsr166xdist-docs" |
758 |
< |
description="Builds javadocs without custom tags to dist folder"> |
758 |
> |
description="Builds javadocs to dist dir"> |
759 |
|
|
760 |
|
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
761 |
|
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
780 |
|
|
781 |
|
|
782 |
|
<target name="jsr166ycompile" |
783 |
< |
depends="init, configure-compiler" |
783 |
> |
depends="configure-compiler" |
784 |
|
description="Compiles jsr166y sources"> |
785 |
|
|
786 |
|
<mkdir dir="${build.jsr166y.dir}"/> |
787 |
|
|
788 |
< |
<javac srcdir="${jsr166ysrc.dir}" |
789 |
< |
destdir="${build.jsr166y.dir}" |
790 |
< |
debug="${build.debug}" |
791 |
< |
debuglevel="${build.debuglevel}" |
792 |
< |
deprecation="${build.deprecation}" |
793 |
< |
source="${build.sourcelevel}" |
794 |
< |
fork="true"> |
788 |
> |
<javac srcdir="${topsrc.dir}" |
789 |
> |
destdir="${build.jsr166y.dir}" |
790 |
> |
debug="${build.debug}" |
791 |
> |
debuglevel="${build.debuglevel}" |
792 |
> |
deprecation="${build.deprecation}" |
793 |
> |
source="1.6" |
794 |
> |
classpath="" |
795 |
> |
bootclasspath="${bootclasspath6}" |
796 |
> |
includeAntRuntime="false" |
797 |
> |
includeJavaRuntime="false" |
798 |
> |
executable="${javac7}" |
799 |
> |
fork="true"> |
800 |
|
|
801 |
< |
<include name="**/*.java"/> |
801 |
> |
<include name="jsr166y/**/*.java"/> |
802 |
|
<compilerarg line="${build.args}"/> |
803 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
804 |
< |
<compilerarg value="${bootclasspath.args}"/> |
751 |
< |
|
752 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
753 |
< |
|
804 |
> |
<compilerarg value="-Xlint:all"/> |
805 |
|
</javac> |
755 |
– |
|
806 |
|
</target> |
807 |
|
|
808 |
|
|
759 |
– |
|
809 |
|
<target name="jsr166yjar" |
810 |
|
depends="jsr166ycompile" |
811 |
|
description="Builds library jar from compiled sources"> |
821 |
|
|
822 |
|
|
823 |
|
<target name="jsr166ydocs" |
824 |
< |
description="Builds javadocs with custom tags to build folder"> |
824 |
> |
description="Builds javadocs to dist dir"> |
825 |
|
|
826 |
|
<delete dir="${build.jsr166yjavadocs.dir}"/> |
827 |
|
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
858 |
|
</target> |
859 |
|
|
860 |
|
<target name="jsr166ydist-docs" |
861 |
< |
description="Builds javadocs without custom tags to dist folder"> |
861 |
> |
description="Builds javadocs to dist dir"> |
862 |
|
|
863 |
|
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
864 |
|
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
884 |
|
|
885 |
|
|
886 |
|
<target name="extra166ycompile" |
887 |
< |
depends="init, configure-compiler, jsr166ycompile" |
887 |
> |
depends="configure-compiler, jsr166yjar" |
888 |
|
description="Compiles extra166y sources"> |
889 |
|
|
890 |
|
<mkdir dir="${build.extra166y.dir}"/> |
891 |
|
|
892 |
< |
<javac srcdir="${extra166ysrc.dir}" |
893 |
< |
destdir="${build.extra166y.dir}" |
894 |
< |
debug="${build.debug}" |
895 |
< |
classpath="${jsr166yproduct.jar}" |
896 |
< |
debuglevel="${build.debuglevel}" |
897 |
< |
deprecation="${build.deprecation}" |
898 |
< |
source="${build.sourcelevel}" |
899 |
< |
fork="true"> |
892 |
> |
<javac srcdir="${topsrc.dir}" |
893 |
> |
destdir="${build.extra166y.dir}" |
894 |
> |
debug="${build.debug}" |
895 |
> |
debuglevel="${build.debuglevel}" |
896 |
> |
deprecation="${build.deprecation}" |
897 |
> |
classpath="" |
898 |
> |
source="1.6" |
899 |
> |
bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}" |
900 |
> |
includeAntRuntime="false" |
901 |
> |
includeJavaRuntime="false" |
902 |
> |
executable="${javac7}" |
903 |
> |
fork="true"> |
904 |
|
|
905 |
< |
<include name="**/*.java"/> |
905 |
> |
<include name="extra166y/**/*.java"/> |
906 |
|
<compilerarg line="${build.args}"/> |
907 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
908 |
< |
<compilerarg value="${bootclasspath.args}"/> |
856 |
< |
|
857 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
908 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
909 |
|
|
910 |
|
</javac> |
911 |
|
|
928 |
|
|
929 |
|
|
930 |
|
<target name="extra166ydocs" |
931 |
< |
description="Builds javadocs with custom tags to build folder"> |
931 |
> |
description="Builds javadocs with custom tags to build dir"> |
932 |
|
|
933 |
|
<delete dir="${build.extra166yjavadocs.dir}"/> |
934 |
|
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
965 |
|
</target> |
966 |
|
|
967 |
|
<target name="extra166ydist-docs" |
968 |
< |
description="Builds javadocs without custom tags to dist folder"> |
968 |
> |
description="Builds javadocs to dist dir"> |
969 |
|
|
970 |
|
<delete dir="${dist.extra166yjavadocs.dir}"/> |
971 |
|
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
1032 |
|
|
1033 |
|
|
1034 |
|
<target name="jsr166edocs" |
1035 |
< |
description="Builds javadocs with custom tags to build folder"> |
1035 |
> |
description="Builds javadocs with custom tags to build dir"> |
1036 |
|
|
1037 |
|
<delete dir="${build.jsr166ejavadocs.dir}"/> |
1038 |
|
<mkdir dir="${build.jsr166ejavadocs.dir}"/> |
1041 |
|
packagenames="jsr166e,jsr166e.extra" |
1042 |
|
link="${jdkapi7docs.url}" |
1043 |
|
source="1.7" |
1044 |
< |
sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}" |
1044 |
> |
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
1045 |
|
executable="${javadoc7}" |
1046 |
|
additionalparam="-XDignore.symbol.file=true" > |
1047 |
|
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
1074 |
|
</target> |
1075 |
|
|
1076 |
|
<target name="jsr166edist-docs" |
1077 |
< |
description="Builds javadocs without custom tags to dist folder"> |
1077 |
> |
description="Builds javadocs to dist dir"> |
1078 |
|
|
1079 |
|
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1080 |
|
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |