21 |
|
|
22 |
|
|
23 |
|
<!-- Compilation options --> |
24 |
< |
<property name="build.sourcelevel" value="1.5"/> |
24 |
> |
<property name="build.sourcelevel" value="1.6"/> |
25 |
|
<property name="build.debug" value="true"/> |
26 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
27 |
|
<property name="build.deprecation" value="false"/> |
28 |
|
|
29 |
|
<!-- Build locations --> |
30 |
< |
<property name="build.dir" location="build"/> |
31 |
< |
<property name="build.classes.dir" location="${build.dir}/classes"/> |
32 |
< |
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
33 |
< |
<property name="build.loops.dir" location="${build.dir}/loops"/> |
34 |
< |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
35 |
< |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
36 |
< |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
37 |
< |
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
30 |
> |
<property name="build.dir" location="build"/> |
31 |
> |
<property name="build.classes.dir" location="${build.dir}/classes"/> |
32 |
> |
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
33 |
> |
<property name="build.loops.dir" location="${build.dir}/loops"/> |
34 |
> |
<property name="build.lib.dir" location="${build.dir}/lib"/> |
35 |
> |
<property name="build.javadocs.dir" location="${build.dir}/javadocs"/> |
36 |
> |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
37 |
> |
<property name="build.jsr166x.dir" location="${build.dir}/jsr166x"/> |
38 |
|
<property name="build.jsr166xlib.dir" location="${build.dir}/jsr166xlib"/> |
39 |
|
<property name="build.jsr166xjavadocs.dir" location="${build.dir}/jsr166xjavadocs"/> |
40 |
|
|
41 |
< |
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
41 |
> |
<property name="build.jsr166y.dir" location="${build.dir}/jsr166y"/> |
42 |
|
<property name="build.jsr166ylib.dir" location="${build.dir}/jsr166ylib"/> |
43 |
|
<property name="build.jsr166yjavadocs.dir" location="${build.dir}/jsr166yjavadocs"/> |
44 |
|
|
45 |
< |
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
46 |
< |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
47 |
< |
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
45 |
> |
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
46 |
> |
<property name="build.extra166ylib.dir" location="${build.dir}/extra166ylib"/> |
47 |
> |
<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/> |
48 |
|
|
49 |
|
<!-- Source locations --> |
50 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
57 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
58 |
|
<property name="jsr166xsrc.dir" location="${basedir}/src/jsr166x"/> |
59 |
|
<property name="jsr166ysrc.dir" location="${basedir}/src/jsr166y"/> |
60 |
< |
<property name="extra166ysrc.dir" location="${basedir}/src/extra166y"/> |
61 |
< |
|
60 |
> |
<property name="extra166ysrc.dir" location="${basedir}/src/extra166y"/> |
61 |
> |
<property name="jdksrc.dir" location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/> |
62 |
|
<!-- Distribution locations --> |
63 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
63 |
> |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
64 |
|
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
65 |
|
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
66 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
66 |
> |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
67 |
|
|
68 |
|
<!-- Jar locations --> |
69 |
|
<property name="product.jar" location="${build.lib.dir}/jsr166.jar"/> |
70 |
|
<property name="jsr166xproduct.jar" location="${build.jsr166xlib.dir}/jsr166x.jar"/> |
71 |
|
<property name="jsr166yproduct.jar" location="${build.jsr166ylib.dir}/jsr166y.jar"/> |
72 |
< |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
72 |
> |
<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/> |
73 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
74 |
|
|
75 |
|
<!-- Bootclasspath argument --> |
89 |
|
|
90 |
|
<!-- Main targets --> |
91 |
|
|
92 |
+ |
<target name="dists" |
93 |
+ |
depends="dist, jsr166xdist, jsr166ydist, extra166ydist" |
94 |
+ |
description="Builds all public jars and docs"/> |
95 |
|
|
96 |
|
<target name="compile" |
97 |
|
depends="init, configure-compiler" |
108 |
|
fork="true"> |
109 |
|
|
110 |
|
<include name="**/*.java"/> |
111 |
< |
<compilerarg value="-XDignore.symbol.file"/> |
111 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
112 |
|
|
113 |
|
<!-- |
114 |
|
<exclude name="java/lang/**"/> |
149 |
|
<mkdir dir="${build.javadocs.dir}"/> |
150 |
|
|
151 |
|
<javadoc destdir="${build.javadocs.dir}" |
152 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
152 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
153 |
|
overview="${src.dir}/intro.html" |
154 |
< |
sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
155 |
< |
> |
154 |
> |
sourcepath="${src.dir}:${jdksrc.dir}" |
155 |
> |
> |
156 |
|
|
157 |
|
<packageset dir="${src.dir}"/> |
158 |
|
|
167 |
|
description="Puts all distributable products in single hierarchy"/> |
168 |
|
|
169 |
|
|
167 |
– |
|
170 |
|
<target name="release" |
171 |
|
depends="dist" |
172 |
|
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
213 |
|
<delete dir="${dist.javadocs.dir}"/> |
214 |
|
<mkdir dir="${dist.javadocs.dir}"/> |
215 |
|
|
216 |
< |
<javadoc destdir="${dist.javadocs.dir}" |
217 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
216 |
< |
overview="${src.dir}/intro.html" |
216 |
> |
<!-- the packagenames="none" hack below prevents scanning the --> |
217 |
> |
<!-- sourcepath for packages --> |
218 |
|
|
219 |
< |
sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
220 |
< |
> |
221 |
< |
<!-- |
222 |
< |
<packageset dir="${src.dir}" defaultexcludes="yes"> |
223 |
< |
<include name="java/util/concurrent"/> |
224 |
< |
<include name="java/util/concurrent/atomic"/> |
225 |
< |
<include name="java/util/concurrent/locks"/> |
225 |
< |
</packageset> |
226 |
< |
--> |
227 |
< |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
228 |
< |
<include name="main/java/util/concurrent/*.java"/> |
229 |
< |
<include name="main/java/util/concurrent/atomic/*.java"/> |
230 |
< |
<include name="main/java/util/concurrent/locks/*.java"/> |
231 |
< |
<include name="main/java/util/*.java"/> |
232 |
< |
<!-- |
233 |
< |
<include name="main/java/util/concurrent/*.html"/> |
234 |
< |
<include name="main/java/util/concurrent/atomic/*.html"/> |
235 |
< |
<include name="main/java/util/concurrent/locks/*.html"/> |
236 |
< |
<include name="main/java/util/*.html"/> |
237 |
< |
--> |
238 |
< |
<!-- <include name="jsr166x/*.java"/> --> |
219 |
> |
<javadoc destdir="${dist.javadocs.dir}" |
220 |
> |
packagenames="none" |
221 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
222 |
> |
overview="${src.dir}/intro.html" |
223 |
> |
sourcepath="${src.dir}:${jdksrc.dir}" > |
224 |
> |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
225 |
> |
<include name="**/*.java"/> |
226 |
|
</fileset> |
227 |
|
</javadoc> |
228 |
|
|
266 |
|
|
267 |
|
<compilerarg value="${bootclasspath.args}"/> |
268 |
|
<compilerarg line="${build.args}"/> |
269 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
270 |
|
|
271 |
|
<classpath refid="test.classpath"/> |
272 |
|
|
284 |
|
|
285 |
|
<compilerarg value="${bootclasspath.args}"/> |
286 |
|
<compilerarg line="${build.args}"/> |
287 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
288 |
|
|
289 |
|
<classpath refid="test.classpath"/> |
290 |
|
|
301 |
|
|
302 |
|
<compilerarg value="${bootclasspath.args}"/> |
303 |
|
<compilerarg line="${build.args}"/> |
304 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
305 |
|
|
306 |
|
<classpath refid="test.classpath"/> |
307 |
|
|
442 |
|
|
443 |
|
<compilerarg line="${build.args}"/> |
444 |
|
<classpath refid="loops.classpath"/> |
445 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
446 |
|
|
447 |
|
</javac> |
448 |
|
|
472 |
|
|
473 |
|
<include name="**/*.java"/> |
474 |
|
<compilerarg line="${build.args}"/> |
475 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
476 |
|
|
477 |
|
</javac> |
478 |
|
|
501 |
|
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
502 |
|
|
503 |
|
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
504 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
505 |
< |
|
506 |
< |
sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
507 |
< |
|
516 |
< |
> |
517 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
518 |
< |
<include name="jsr166x"/> |
519 |
< |
</packageset> |
520 |
< |
|
521 |
< |
|
522 |
< |
</javadoc> |
504 |
> |
packagenames="jsr166x" |
505 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
506 |
> |
source="${build.sourcelevel}" |
507 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
508 |
|
|
509 |
|
</target> |
510 |
|
|
539 |
|
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
540 |
|
|
541 |
|
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
542 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
543 |
< |
source="${build.sourcelevel}"> |
544 |
< |
|
545 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
561 |
< |
<include name="jsr166x"/> |
562 |
< |
</packageset> |
563 |
< |
|
564 |
< |
</javadoc> |
542 |
> |
packagenames="jsr166x" |
543 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
544 |
> |
source="${build.sourcelevel}" |
545 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
546 |
|
|
547 |
|
</target> |
548 |
|
|
572 |
|
|
573 |
|
<include name="**/*.java"/> |
574 |
|
<compilerarg line="${build.args}"/> |
575 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
576 |
|
<compilerarg value="${bootclasspath.args}"/> |
577 |
|
|
578 |
|
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
604 |
|
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
605 |
|
|
606 |
|
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
607 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
608 |
< |
sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
609 |
< |
|
610 |
< |
> |
629 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="no"> |
630 |
< |
<include name="jsr166y"/> |
631 |
< |
</packageset> |
632 |
< |
|
633 |
< |
|
634 |
< |
</javadoc> |
607 |
> |
packagenames="jsr166y" |
608 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
609 |
> |
source="${build.sourcelevel}" |
610 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
611 |
|
|
612 |
|
</target> |
613 |
|
|
640 |
|
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
641 |
|
|
642 |
|
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
643 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
644 |
< |
source="${build.sourcelevel}"> |
645 |
< |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
646 |
< |
<include name="jsr166y/*.java"/> |
671 |
< |
</fileset> |
672 |
< |
</javadoc> |
643 |
> |
packagenames="jsr166y" |
644 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
645 |
> |
source="${build.sourcelevel}" |
646 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
647 |
|
|
648 |
|
</target> |
649 |
|
|
674 |
|
|
675 |
|
<include name="**/*.java"/> |
676 |
|
<compilerarg line="${build.args}"/> |
677 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
678 |
|
<compilerarg value="${bootclasspath.args}"/> |
679 |
|
|
680 |
|
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
706 |
|
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
707 |
|
|
708 |
|
<javadoc destdir="${build.extra166yjavadocs.dir}" |
709 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
710 |
< |
sourcepath="${extra166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
711 |
< |
|
712 |
< |
> |
738 |
< |
<packageset dir="${topsrc.dir}" defaultexcludes="no"> |
739 |
< |
<include name="extra166y"/> |
740 |
< |
</packageset> |
741 |
< |
|
742 |
< |
|
743 |
< |
</javadoc> |
709 |
> |
packagenames="extra166y" |
710 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
711 |
> |
source="${build.sourcelevel}" |
712 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
713 |
|
|
714 |
|
</target> |
715 |
|
|
742 |
|
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
743 |
|
|
744 |
|
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
745 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
746 |
< |
source="${build.sourcelevel}"> |
747 |
< |
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
748 |
< |
<include name="extra166y/*.java"/> |
780 |
< |
</fileset> |
781 |
< |
</javadoc> |
745 |
> |
packagenames="extra166y" |
746 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
747 |
> |
source="${build.sourcelevel}" |
748 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" /> |
749 |
|
|
750 |
|
</target> |
751 |
|
|