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"/> |
115 |
|
<property name="jsr166ysrc.dir" location="${topsrc.dir}/jsr166y"/> |
116 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
117 |
|
<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/> |
127 |
– |
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
118 |
|
|
119 |
|
<!-- Distribution locations --> |
120 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
121 |
< |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
122 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
123 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
124 |
< |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
125 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
120 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/jsr166.docs"/> |
121 |
> |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7.docs"/> |
122 |
> |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166x.docs"/> |
123 |
> |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166y.docs"/> |
124 |
> |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166e.docs"/> |
125 |
> |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/> |
126 |
|
|
127 |
|
<!-- Jar locations --> |
128 |
< |
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
129 |
< |
<property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/> |
130 |
< |
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
131 |
< |
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
132 |
< |
<property name="jsr166eproduct.jar" location="${build.jsr166elib.dir}/jsr166e.jar"/> |
133 |
< |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
134 |
< |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
128 |
> |
<property name="product.jar" location="${build.dir}/jsr166.jar"/> |
129 |
> |
<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/> |
130 |
> |
<property name="jsr166x.jar" location="${build.jsr166x.dir}/jsr166x.jar"/> |
131 |
> |
<property name="jsr166y.jar" location="${build.jsr166y.dir}/jsr166y.jar"/> |
132 |
> |
<property name="jsr166e.jar" location="${build.jsr166e.dir}/jsr166e.jar"/> |
133 |
> |
<property name="extra166y.jar" location="${build.extra166y.dir}/extra166y.jar"/> |
134 |
> |
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
135 |
|
|
136 |
|
<!-- Bootclasspath argument --> |
137 |
|
<property name="bootclasspath.args" value="-Xbootclasspath/p:${product.jar}"/> |
144 |
|
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
145 |
|
<!-- The below does not yet exist as of 2012-11 --> |
146 |
|
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
147 |
+ |
|
148 |
+ |
<!-- Default jdk api doc location (latest stable release seems best) --> |
149 |
|
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
150 |
|
|
151 |
|
<!-- Test classpath --> |
161 |
|
|
162 |
|
<!-- Support @jls tag, used in jdk8+ javadoc --> |
163 |
|
<!-- TODO: How do we get &trade to work? --> |
164 |
+ |
<!-- TODO: Why isn't @jls a "standard" tag? --> |
165 |
|
<!-- property name="javadoc.jls.cite" value="The Java™ Language Specification" --> |
166 |
|
<property name="javadoc.jls.cite" value="The Java Language Specification"/> |
167 |
|
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
169 |
|
<!-- Main targets --> |
170 |
|
|
171 |
|
<target name="dists" |
172 |
< |
depends="dist, jsr166xdist, jsr166ydist,jsr166edist, extra166ydist" |
172 |
> |
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
173 |
|
description="Builds all public jars and docs"/> |
174 |
|
|
175 |
|
<target name="compile" |
176 |
|
depends="configure-compiler" |
177 |
< |
description="Compiles src/main sources to build folder"> |
177 |
> |
description="Compiles src/main sources to build dir"> |
178 |
|
|
179 |
|
<mkdir dir="${build.classes.dir}"/> |
180 |
|
|
210 |
|
depends="compile" |
211 |
|
description="Builds library jar from compiled sources"> |
212 |
|
|
220 |
– |
<mkdir dir="${build.lib.dir}"/> |
221 |
– |
|
213 |
|
<jar destfile="${product.jar}"> |
214 |
|
<fileset dir="${build.classes.dir}"/> |
215 |
|
</jar> |
219 |
|
|
220 |
|
|
221 |
|
<target name="test" |
222 |
< |
depends="init, configure-tests, report-tests" |
222 |
> |
depends="configure-tests, report-tests" |
223 |
|
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
224 |
|
|
225 |
|
|
226 |
|
|
227 |
|
<target name="docs" |
228 |
< |
description="Builds javadocs for src/main"> |
228 |
> |
description="Builds javadocs for src/main to dist dir"> |
229 |
|
|
230 |
|
<delete dir="${dist.javadocs.dir}"/> |
231 |
|
<mkdir dir="${dist.javadocs.dir}"/> |
253 |
|
|
254 |
|
|
255 |
|
<target name="dist" |
256 |
< |
depends="init, dist-clean, dist-jar, docs" |
256 |
> |
depends="dist-clean, dist-jar, docs" |
257 |
|
description="Puts all distributable products in single hierarchy"/> |
258 |
|
|
259 |
|
|
281 |
|
description="Removes all build products"> |
282 |
|
|
283 |
|
<delete dir="${build.dir}"/> |
293 |
– |
<delete dir="${build.classes.dir}"/> |
294 |
– |
<delete dir="${build.lib.dir}"/> |
284 |
|
|
285 |
|
</target> |
286 |
|
|
298 |
|
<!-- Internal targets --> |
299 |
|
|
300 |
|
|
312 |
– |
<target name="init"> |
313 |
– |
|
314 |
– |
<!-- Version is kept in a separate file --> |
315 |
– |
<loadfile property="version" srcFile="version.properties"/> |
316 |
– |
<echo>Building JSR-166 version ${version}</echo> |
317 |
– |
<echo>java.home is ${java.home}</echo> |
318 |
– |
|
319 |
– |
</target> |
320 |
– |
|
321 |
– |
|
301 |
|
<target name="dist-jar" |
302 |
|
depends="clean, jar"> |
303 |
|
|
312 |
|
<mkdir dir="${build.testcases.dir}"/> |
313 |
|
|
314 |
|
<javac srcdir="${tck.src.dir}" |
315 |
< |
destdir="${build.testcases.dir}" |
316 |
< |
debug="${build.debug}" |
317 |
< |
debuglevel="${build.debuglevel}" |
318 |
< |
deprecation="${build.deprecation}" |
319 |
< |
source="${build.sourcelevel}" |
320 |
< |
fork="true"> |
315 |
> |
destdir="${build.testcases.dir}" |
316 |
> |
debug="${build.debug}" |
317 |
> |
debuglevel="${build.debuglevel}" |
318 |
> |
deprecation="${build.deprecation}" |
319 |
> |
source="6" |
320 |
> |
classpath="${junit.jar}" |
321 |
> |
bootclasspath="${product.jar}:${bootclasspath6}" |
322 |
> |
includeAntRuntime="false" |
323 |
> |
includeJavaRuntime="false" |
324 |
> |
executable="${javac8}" |
325 |
> |
fork="true"> |
326 |
|
|
327 |
< |
<compilerarg value="${bootclasspath.args}"/> |
327 |
> |
<include name="**/*.java"/> |
328 |
|
<compilerarg line="${build.args}"/> |
329 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
330 |
< |
|
347 |
< |
<classpath refid="test.classpath"/> |
330 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
331 |
|
|
332 |
|
</javac> |
333 |
|
|
334 |
|
<javac srcdir="${test.src.dir}" |
335 |
< |
destdir="${build.testcases.dir}" |
336 |
< |
debug="${build.debug}" |
337 |
< |
debuglevel="${build.debuglevel}" |
338 |
< |
deprecation="${build.deprecation}" |
339 |
< |
source="${build.sourcelevel}" |
340 |
< |
fork="true"> |
335 |
> |
destdir="${build.testcases.dir}" |
336 |
> |
debug="${build.debug}" |
337 |
> |
debuglevel="${build.debuglevel}" |
338 |
> |
deprecation="${build.deprecation}" |
339 |
> |
source="6" |
340 |
> |
classpath="" |
341 |
> |
bootclasspath="${product.jar}:${bootclasspath6}" |
342 |
> |
includeAntRuntime="false" |
343 |
> |
includeJavaRuntime="false" |
344 |
> |
executable="${javac8}" |
345 |
> |
fork="true"> |
346 |
|
|
347 |
< |
<include name="jsr166/test/**"/> |
347 |
> |
<include name="jsr166/test/**/*.java"/> |
348 |
|
|
361 |
– |
<compilerarg value="${bootclasspath.args}"/> |
349 |
|
<compilerarg line="${build.args}"/> |
350 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
351 |
< |
|
365 |
< |
<classpath refid="test.classpath"/> |
351 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
352 |
|
|
353 |
|
</javac> |
354 |
|
|
365 |
|
<compilerarg line="${build.args}"/> |
366 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
367 |
|
|
382 |
– |
<classpath refid="test.classpath"/> |
383 |
– |
|
368 |
|
</javac> |
369 |
|
--> |
370 |
|
|
384 |
|
errorProperty="junit.failed" |
385 |
|
failureProperty="junit.failed" |
386 |
|
dir="${build.reports.dir}" |
387 |
+ |
jvm="${java8}" |
388 |
|
fork="true"> |
389 |
|
|
390 |
< |
<jvmarg value="${bootclasspath.args}"/> |
390 |
> |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
391 |
|
<jvmarg value="-server"/> |
392 |
|
<jvmarg value="-showversion"/> |
393 |
|
|
488 |
|
<!-- Various demos and test programs --> |
489 |
|
|
490 |
|
|
491 |
< |
<target name="loops" depends="init, configure-compiler" |
491 |
> |
<target name="loops" depends="configure-compiler" |
492 |
|
description="Benchmark from Doug Lea's AQS paper"> |
493 |
|
|
494 |
|
<mkdir dir="${build.loops.dir}"/> |
528 |
|
debug="${build.debug}" |
529 |
|
debuglevel="${build.debuglevel}" |
530 |
|
deprecation="${build.deprecation}" |
531 |
< |
source="1.6" |
531 |
> |
source="6" |
532 |
|
classpath="" |
533 |
|
bootclasspath="${bootclasspath6}" |
534 |
|
includeAntRuntime="false" |
543 |
|
|
544 |
|
</javac> |
545 |
|
|
561 |
– |
<mkdir dir="${build.4jdk7.lib.dir}"/> |
562 |
– |
|
546 |
|
<jar destfile="${4jdk7product.jar}" index="true"> |
547 |
|
<fileset dir="${build.4jdk7.classes.dir}"/> |
548 |
|
</jar> |
554 |
|
debug="${build.debug}" |
555 |
|
debuglevel="${build.debuglevel}" |
556 |
|
deprecation="${build.deprecation}" |
557 |
< |
source="1.6" |
557 |
> |
source="6" |
558 |
|
classpath="${junit.jar}" |
559 |
|
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
560 |
|
includeAntRuntime="false" |
612 |
|
|
613 |
|
|
614 |
|
<target name="4jdk7docs" |
615 |
< |
description="Builds javadocs with custom tags to build folder"> |
615 |
> |
description="Builds javadocs for src/jdk7 to dist dir"> |
616 |
|
|
617 |
< |
<delete dir="${build.4jdk7.docs.dir}"/> |
618 |
< |
<mkdir dir="${build.4jdk7.docs.dir}"/> |
617 |
> |
<delete dir="${dist.4jdk7.docs.dir}"/> |
618 |
> |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
619 |
|
|
620 |
< |
<javadoc destdir="${build.4jdk7.docs.dir}" |
620 |
> |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
621 |
|
packagenames="none" |
622 |
|
link="${jdkapi7docs.url}" |
623 |
|
overview="${4jdk7src.dir}/intro.html" |
634 |
|
|
635 |
|
|
636 |
|
<target name="4jdk7dist" |
637 |
< |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs" |
637 |
> |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs" |
638 |
|
description="Puts all distributable products in single hierarchy"/> |
639 |
|
|
640 |
|
|
641 |
|
|
642 |
|
<target name="4jdk7clean" |
643 |
< |
description="Removes all build products"> |
643 |
> |
description="Removes all 4jdk7 build products"> |
644 |
|
|
645 |
|
<delete dir="${build.4jdk7.dir}"/> |
646 |
|
|
653 |
|
|
654 |
|
</target> |
655 |
|
|
673 |
– |
<target name="4jdk7dist-docs" |
674 |
– |
description="Builds javadocs without custom tags to dist folder"> |
675 |
– |
|
676 |
– |
<delete dir="${dist.4jdk7.docs.dir}"/> |
677 |
– |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
678 |
– |
|
679 |
– |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
680 |
– |
packagenames="none" |
681 |
– |
link="${jdkapi7docs.url}" |
682 |
– |
overview="${4jdk7src.dir}/intro.html" |
683 |
– |
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
684 |
– |
classpath="" |
685 |
– |
executable="${javadoc7}"> |
686 |
– |
<arg value="-XDignore.symbol.file=true"/> |
687 |
– |
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
688 |
– |
<include name="**/*.java"/> |
689 |
– |
</fileset> |
690 |
– |
</javadoc> |
691 |
– |
|
692 |
– |
</target> |
693 |
– |
|
656 |
|
<target name="4jdk7dist-jar" |
657 |
|
depends="4jdk7clean, 4jdk7compile"> |
658 |
|
|
660 |
|
|
661 |
|
</target> |
662 |
|
|
701 |
– |
<!-- jsr166x --> |
663 |
|
|
664 |
+ |
<!-- jsr166x --> |
665 |
|
|
666 |
|
<target name="jsr166xcompile" |
667 |
< |
depends="init, configure-compiler" |
668 |
< |
description="Compiles jsr166x sources"> |
667 |
> |
depends="configure-compiler" |
668 |
> |
description="Compiles jsr166x sources to build dir"> |
669 |
|
|
670 |
< |
<mkdir dir="${build.jsr166x.dir}"/> |
670 |
> |
<mkdir dir="${build.jsr166x.classes.dir}"/> |
671 |
|
|
672 |
< |
<javac srcdir="${jsr166xsrc.dir}" |
673 |
< |
destdir="${build.jsr166x.dir}" |
674 |
< |
debug="${build.debug}" |
675 |
< |
debuglevel="${build.debuglevel}" |
676 |
< |
deprecation="${build.deprecation}" |
677 |
< |
source="${build.sourcelevel}" |
678 |
< |
fork="true"> |
672 |
> |
<javac srcdir="${topsrc.dir}" |
673 |
> |
destdir="${build.jsr166x.classes.dir}" |
674 |
> |
debug="${build.debug}" |
675 |
> |
debuglevel="${build.debuglevel}" |
676 |
> |
deprecation="${build.deprecation}" |
677 |
> |
classpath="" |
678 |
> |
source="5" |
679 |
> |
bootclasspath="${bootclasspath6}" |
680 |
> |
includeAntRuntime="false" |
681 |
> |
includeJavaRuntime="false" |
682 |
> |
executable="${javac7}" |
683 |
> |
fork="true"> |
684 |
|
|
685 |
< |
<include name="**/*.java"/> |
685 |
> |
<include name="jsr166x/**/*.java"/> |
686 |
|
<compilerarg line="${build.args}"/> |
687 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
688 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
689 |
|
|
690 |
|
</javac> |
691 |
|
|
697 |
|
depends="jsr166xcompile" |
698 |
|
description="Builds library jar from compiled sources"> |
699 |
|
|
700 |
< |
<mkdir dir="${build.jsr166xlib.dir}"/> |
701 |
< |
|
734 |
< |
<jar destfile="${jsr166xproduct.jar}"> |
735 |
< |
<fileset dir="${build.jsr166x.dir}"/> |
700 |
> |
<jar destfile="${jsr166x.jar}"> |
701 |
> |
<fileset dir="${build.jsr166x.classes.dir}"/> |
702 |
|
</jar> |
703 |
|
|
704 |
|
</target> |
706 |
|
|
707 |
|
|
708 |
|
<target name="jsr166xdocs" |
709 |
< |
description="Builds javadocs with custom tags to build folder"> |
709 |
> |
description="Builds javadocs to dist dir"> |
710 |
|
|
711 |
< |
<delete dir="${build.jsr166xjavadocs.dir}"/> |
712 |
< |
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
711 |
> |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
712 |
> |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
713 |
|
|
714 |
< |
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
715 |
< |
packagenames="jsr166x" |
714 |
> |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
715 |
> |
packagenames="jsr166x.*" |
716 |
|
link="${jdkapidocs.url}" |
717 |
< |
source="${build.sourcelevel}" |
718 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
717 |
> |
source="5" |
718 |
> |
bootclasspath="${bootclasspath6}" |
719 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
720 |
> |
executable="${javadoc7}" |
721 |
|
additionalparam="-XDignore.symbol.file=true" /> |
722 |
|
|
723 |
|
</target> |
724 |
|
|
725 |
|
|
726 |
|
<target name="jsr166xdist" |
727 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs" |
727 |
> |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs" |
728 |
|
description="Puts all distributable products in single hierarchy"/> |
729 |
|
|
730 |
|
|
731 |
|
|
732 |
|
<target name="jsr166xclean" |
733 |
< |
description="Removes all build products"> |
733 |
> |
description="Removes all jsr166x build products"> |
734 |
|
|
735 |
|
<delete dir="${build.jsr166x.dir}"/> |
768 |
– |
<delete dir="${build.jsr166xlib.dir}"/> |
736 |
|
|
737 |
|
</target> |
738 |
|
|
744 |
|
</target> |
745 |
|
|
746 |
|
|
780 |
– |
|
781 |
– |
<target name="jsr166xdist-docs" |
782 |
– |
description="Builds javadocs without custom tags to dist folder"> |
783 |
– |
|
784 |
– |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
785 |
– |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
786 |
– |
|
787 |
– |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
788 |
– |
packagenames="jsr166x" |
789 |
– |
link="${jdkapidocs.url}" |
790 |
– |
source="${build.sourcelevel}" |
791 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
792 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
793 |
– |
|
794 |
– |
</target> |
795 |
– |
|
747 |
|
<target name="jsr166xdist-jar" |
748 |
|
depends="jsr166xclean, jsr166xjar"> |
749 |
|
|
750 |
< |
<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/> |
750 |
> |
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
751 |
|
|
752 |
|
</target> |
753 |
|
|
755 |
|
|
756 |
|
|
757 |
|
<target name="jsr166ycompile" |
758 |
< |
depends="init, configure-compiler" |
758 |
> |
depends="configure-compiler" |
759 |
|
description="Compiles jsr166y sources"> |
760 |
|
|
761 |
< |
<mkdir dir="${build.jsr166y.dir}"/> |
761 |
> |
<mkdir dir="${build.jsr166y.classes.dir}"/> |
762 |
|
|
763 |
< |
<javac srcdir="${jsr166ysrc.dir}" |
764 |
< |
destdir="${build.jsr166y.dir}" |
765 |
< |
debug="${build.debug}" |
766 |
< |
debuglevel="${build.debuglevel}" |
767 |
< |
deprecation="${build.deprecation}" |
768 |
< |
source="${build.sourcelevel}" |
769 |
< |
fork="true"> |
763 |
> |
<javac srcdir="${topsrc.dir}" |
764 |
> |
destdir="${build.jsr166y.classes.dir}" |
765 |
> |
debug="${build.debug}" |
766 |
> |
debuglevel="${build.debuglevel}" |
767 |
> |
deprecation="${build.deprecation}" |
768 |
> |
source="6" |
769 |
> |
classpath="" |
770 |
> |
bootclasspath="${bootclasspath6}" |
771 |
> |
includeAntRuntime="false" |
772 |
> |
includeJavaRuntime="false" |
773 |
> |
executable="${javac7}" |
774 |
> |
fork="true"> |
775 |
|
|
776 |
< |
<include name="**/*.java"/> |
776 |
> |
<include name="jsr166y/**/*.java"/> |
777 |
|
<compilerarg line="${build.args}"/> |
778 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
779 |
< |
<compilerarg value="${bootclasspath.args}"/> |
824 |
< |
|
825 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
826 |
< |
|
779 |
> |
<compilerarg value="-Xlint:all"/> |
780 |
|
</javac> |
828 |
– |
|
781 |
|
</target> |
782 |
|
|
783 |
|
|
832 |
– |
|
784 |
|
<target name="jsr166yjar" |
785 |
|
depends="jsr166ycompile" |
786 |
|
description="Builds library jar from compiled sources"> |
787 |
|
|
788 |
< |
<mkdir dir="${build.jsr166ylib.dir}"/> |
789 |
< |
|
839 |
< |
<jar destfile="${jsr166yproduct.jar}" index="true"> |
840 |
< |
<fileset dir="${build.jsr166y.dir}"/> |
788 |
> |
<jar destfile="${jsr166y.jar}" index="true"> |
789 |
> |
<fileset dir="${build.jsr166y.classes.dir}"/> |
790 |
|
</jar> |
791 |
|
|
792 |
|
</target> |
794 |
|
|
795 |
|
|
796 |
|
<target name="jsr166ydocs" |
797 |
< |
description="Builds javadocs with custom tags to build folder"> |
797 |
> |
description="Builds javadocs to dist dir"> |
798 |
|
|
799 |
< |
<delete dir="${build.jsr166yjavadocs.dir}"/> |
800 |
< |
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
799 |
> |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
800 |
> |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
801 |
|
|
802 |
< |
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
803 |
< |
packagenames="jsr166y" |
802 |
> |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
803 |
> |
packagenames="jsr166y.*" |
804 |
|
link="${jdkapidocs.url}" |
805 |
< |
source="${build.sourcelevel}" |
806 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
805 |
> |
source="6" |
806 |
> |
bootclasspath="${bootclasspath6}" |
807 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
808 |
> |
executable="${javadoc7}" |
809 |
|
additionalparam="-XDignore.symbol.file=true" /> |
810 |
|
|
811 |
|
</target> |
812 |
|
|
813 |
|
|
814 |
|
<target name="jsr166ydist" |
815 |
< |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs" |
815 |
> |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs" |
816 |
|
description="Puts all distributable products in single hierarchy"/> |
817 |
|
|
818 |
|
|
819 |
|
|
820 |
|
<target name="jsr166yclean" |
821 |
< |
description="Removes all build products"> |
821 |
> |
description="Removes all jsr166y build products"> |
822 |
|
|
823 |
|
<delete dir="${build.jsr166y.dir}"/> |
873 |
– |
<delete dir="${build.jsr166ylib.dir}"/> |
824 |
|
|
825 |
|
</target> |
826 |
|
|
831 |
|
|
832 |
|
</target> |
833 |
|
|
884 |
– |
<target name="jsr166ydist-docs" |
885 |
– |
description="Builds javadocs without custom tags to dist folder"> |
886 |
– |
|
887 |
– |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
888 |
– |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
889 |
– |
|
890 |
– |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
891 |
– |
packagenames="jsr166y" |
892 |
– |
link="${jdkapidocs.url}" |
893 |
– |
source="${build.sourcelevel}" |
894 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
895 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
896 |
– |
|
897 |
– |
</target> |
898 |
– |
|
834 |
|
<target name="jsr166ydist-jar" |
835 |
|
depends="jsr166yclean, jsr166yjar"> |
836 |
|
|
837 |
< |
<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/> |
837 |
> |
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
838 |
|
|
839 |
|
</target> |
840 |
|
|
843 |
|
|
844 |
|
|
845 |
|
<target name="extra166ycompile" |
846 |
< |
depends="init, configure-compiler, jsr166ycompile" |
846 |
> |
depends="configure-compiler, jsr166yjar" |
847 |
|
description="Compiles extra166y sources"> |
848 |
|
|
849 |
< |
<mkdir dir="${build.extra166y.dir}"/> |
849 |
> |
<mkdir dir="${build.extra166y.classes.dir}"/> |
850 |
|
|
851 |
< |
<javac srcdir="${extra166ysrc.dir}" |
852 |
< |
destdir="${build.extra166y.dir}" |
853 |
< |
debug="${build.debug}" |
854 |
< |
classpath="${jsr166yproduct.jar}" |
855 |
< |
debuglevel="${build.debuglevel}" |
856 |
< |
deprecation="${build.deprecation}" |
857 |
< |
source="${build.sourcelevel}" |
858 |
< |
fork="true"> |
851 |
> |
<javac srcdir="${topsrc.dir}" |
852 |
> |
destdir="${build.extra166y.classes.dir}" |
853 |
> |
debug="${build.debug}" |
854 |
> |
debuglevel="${build.debuglevel}" |
855 |
> |
deprecation="${build.deprecation}" |
856 |
> |
classpath="" |
857 |
> |
source="6" |
858 |
> |
bootclasspath="${jsr166y.jar}:${bootclasspath6}" |
859 |
> |
includeAntRuntime="false" |
860 |
> |
includeJavaRuntime="false" |
861 |
> |
executable="${javac7}" |
862 |
> |
fork="true"> |
863 |
|
|
864 |
< |
<include name="**/*.java"/> |
864 |
> |
<include name="extra166y/**/*.java"/> |
865 |
|
<compilerarg line="${build.args}"/> |
866 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
867 |
< |
<compilerarg value="${bootclasspath.args}"/> |
929 |
< |
|
930 |
< |
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
867 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
868 |
|
|
869 |
|
</javac> |
870 |
|
|
876 |
|
depends="extra166ycompile" |
877 |
|
description="Builds library jar from compiled sources"> |
878 |
|
|
879 |
< |
<mkdir dir="${build.extra166ylib.dir}"/> |
880 |
< |
|
944 |
< |
<jar destfile="${extra166yproduct.jar}" index="true"> |
945 |
< |
<fileset dir="${build.extra166y.dir}"/> |
879 |
> |
<jar destfile="${extra166y.jar}" index="true"> |
880 |
> |
<fileset dir="${build.extra166y.classes.dir}"/> |
881 |
|
</jar> |
882 |
|
|
883 |
|
</target> |
885 |
|
|
886 |
|
|
887 |
|
<target name="extra166ydocs" |
888 |
< |
description="Builds javadocs with custom tags to build folder"> |
888 |
> |
description="Builds javadocs to build dir"> |
889 |
|
|
890 |
< |
<delete dir="${build.extra166yjavadocs.dir}"/> |
891 |
< |
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
890 |
> |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
891 |
> |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
892 |
|
|
893 |
< |
<javadoc destdir="${build.extra166yjavadocs.dir}" |
894 |
< |
packagenames="extra166y" |
893 |
> |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
894 |
> |
packagenames="extra166y.*" |
895 |
|
link="${jdkapidocs.url}" |
896 |
< |
source="${build.sourcelevel}" |
897 |
< |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
896 |
> |
source="6" |
897 |
> |
bootclasspath="${bootclasspath6}" |
898 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
899 |
> |
executable="${javadoc7}" |
900 |
|
additionalparam="-XDignore.symbol.file=true" /> |
901 |
|
|
902 |
|
</target> |
903 |
|
|
904 |
|
|
905 |
|
<target name="extra166ydist" |
906 |
< |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs" |
906 |
> |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs" |
907 |
|
description="Puts all distributable products in single hierarchy"/> |
908 |
|
|
909 |
|
|
910 |
|
|
911 |
|
<target name="extra166yclean" |
912 |
< |
description="Removes all build products"> |
912 |
> |
description="Removes all extra166y build products"> |
913 |
|
|
914 |
|
<delete dir="${build.extra166y.dir}"/> |
978 |
– |
<delete dir="${build.extra166ylib.dir}"/> |
915 |
|
|
916 |
|
</target> |
917 |
|
|
922 |
|
|
923 |
|
</target> |
924 |
|
|
989 |
– |
<target name="extra166ydist-docs" |
990 |
– |
description="Builds javadocs without custom tags to dist folder"> |
991 |
– |
|
992 |
– |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
993 |
– |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
994 |
– |
|
995 |
– |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
996 |
– |
packagenames="extra166y" |
997 |
– |
link="${jdkapidocs.url}" |
998 |
– |
source="${build.sourcelevel}" |
999 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
1000 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
1001 |
– |
|
1002 |
– |
</target> |
1003 |
– |
|
925 |
|
<target name="extra166ydist-jar" |
926 |
|
depends="extra166yclean, extra166yjar"> |
927 |
|
|
928 |
< |
<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/> |
928 |
> |
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
929 |
|
|
930 |
|
</target> |
931 |
|
|
935 |
|
depends="configure-compiler" |
936 |
|
description="Compiles jsr166e sources"> |
937 |
|
|
938 |
< |
<mkdir dir="${build.jsr166e.dir}"/> |
938 |
> |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
939 |
|
|
940 |
|
<javac srcdir="${topsrc.dir}" |
941 |
< |
destdir="${build.jsr166e.dir}" |
941 |
> |
destdir="${build.jsr166e.classes.dir}" |
942 |
|
debug="${build.debug}" |
943 |
|
debuglevel="${build.debuglevel}" |
944 |
|
deprecation="${build.deprecation}" |
945 |
< |
source="1.7" |
945 |
> |
source="7" |
946 |
|
classpath="" |
947 |
|
includeAntRuntime="false" |
948 |
|
includeJavaRuntime="false" |
964 |
|
depends="jsr166ecompile" |
965 |
|
description="Builds library jar from compiled sources"> |
966 |
|
|
967 |
< |
<mkdir dir="${build.jsr166elib.dir}"/> |
968 |
< |
|
1048 |
< |
<jar destfile="${jsr166eproduct.jar}" index="true"> |
1049 |
< |
<fileset dir="${build.jsr166e.dir}"/> |
967 |
> |
<jar destfile="${jsr166e.jar}" index="true"> |
968 |
> |
<fileset dir="${build.jsr166e.classes.dir}"/> |
969 |
|
</jar> |
970 |
|
|
971 |
|
</target> |
973 |
|
|
974 |
|
|
975 |
|
<target name="jsr166edocs" |
976 |
< |
description="Builds javadocs with custom tags to build folder"> |
976 |
> |
description="Builds javadocs to build dir"> |
977 |
|
|
978 |
< |
<delete dir="${build.jsr166ejavadocs.dir}"/> |
979 |
< |
<mkdir dir="${build.jsr166ejavadocs.dir}"/> |
978 |
> |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
979 |
> |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
980 |
|
|
981 |
< |
<javadoc destdir="${build.jsr166ejavadocs.dir}" |
982 |
< |
packagenames="jsr166e,jsr166e.extra" |
983 |
< |
link="${jdkapi7docs.url}" |
984 |
< |
source="1.7" |
981 |
> |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
982 |
> |
packagenames="jsr166e.*" |
983 |
> |
link="${jdkapidocs.url}" |
984 |
> |
source="7" |
985 |
|
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
986 |
|
executable="${javadoc7}" |
987 |
|
additionalparam="-XDignore.symbol.file=true" > |
1069 |
– |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
1070 |
– |
<include name="jsr166e/**/*.java"/> |
1071 |
– |
</fileset> |
988 |
|
</javadoc> |
989 |
|
|
990 |
|
</target> |
991 |
|
|
992 |
|
|
993 |
|
<target name="jsr166edist" |
994 |
< |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs" |
994 |
> |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs" |
995 |
|
description="Puts all distributable products in single hierarchy"/> |
996 |
|
|
997 |
|
|
998 |
|
|
999 |
|
<target name="jsr166eclean" |
1000 |
< |
description="Removes all build products"> |
1000 |
> |
description="Removes all jsr166e build products"> |
1001 |
|
|
1002 |
|
<delete dir="${build.jsr166e.dir}"/> |
1087 |
– |
<delete dir="${build.jsr166elib.dir}"/> |
1003 |
|
|
1004 |
|
</target> |
1005 |
|
|
1006 |
|
|
1092 |
– |
|
1007 |
|
<target name="jsr166edist-clean" |
1008 |
|
description="Removes all build and distribution products"> |
1009 |
|
|
1010 |
|
</target> |
1011 |
|
|
1098 |
– |
<target name="jsr166edist-docs" |
1099 |
– |
description="Builds javadocs without custom tags to dist folder"> |
1100 |
– |
|
1101 |
– |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
1102 |
– |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
1103 |
– |
|
1104 |
– |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
1105 |
– |
packagenames="jsr166e,jsr166e.extra" |
1106 |
– |
link="${jdkapidocs.url}" |
1107 |
– |
source="1.7" |
1108 |
– |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
1109 |
– |
additionalparam="-XDignore.symbol.file=true" /> |
1110 |
– |
|
1111 |
– |
</target> |
1112 |
– |
|
1012 |
|
<target name="jsr166edist-jar" |
1013 |
|
depends="jsr166eclean, jsr166ejar"> |
1014 |
|
|
1015 |
< |
<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/> |
1015 |
> |
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1016 |
|
|
1017 |
|
</target> |
1018 |
|
|