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"> |
214 |
|
<mkdir dir="${dist.javadocs.dir}"/> |
215 |
|
|
216 |
|
<javadoc destdir="${dist.javadocs.dir}" |
217 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
217 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
218 |
|
overview="${src.dir}/intro.html" |
219 |
|
|
220 |
< |
sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes" |
220 |
> |
sourcepath="${src.dir}:${jdksrc.dir}" |
221 |
|
> |
222 |
|
<!-- |
223 |
|
<packageset dir="${src.dir}" defaultexcludes="yes"> |
511 |
|
<mkdir dir="${build.jsr166xjavadocs.dir}"/> |
512 |
|
|
513 |
|
<javadoc destdir="${build.jsr166xjavadocs.dir}" |
514 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
515 |
< |
|
514 |
< |
sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
515 |
< |
|
514 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
515 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
516 |
|
> |
517 |
|
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
518 |
|
<include name="jsr166x"/> |
554 |
|
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
555 |
|
|
556 |
|
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
557 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
557 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
558 |
|
source="${build.sourcelevel}"> |
559 |
|
|
560 |
|
<packageset dir="${topsrc.dir}" defaultexcludes="yes"> |
591 |
|
|
592 |
|
<include name="**/*.java"/> |
593 |
|
<compilerarg line="${build.args}"/> |
594 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
595 |
|
<compilerarg value="${bootclasspath.args}"/> |
596 |
|
|
597 |
|
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
623 |
|
<mkdir dir="${build.jsr166yjavadocs.dir}"/> |
624 |
|
|
625 |
|
<javadoc destdir="${build.jsr166yjavadocs.dir}" |
626 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
627 |
< |
sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
627 |
< |
|
626 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
627 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
628 |
|
> |
629 |
|
<packageset dir="${topsrc.dir}" defaultexcludes="no"> |
630 |
|
<include name="jsr166y"/> |
664 |
|
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
665 |
|
|
666 |
|
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
667 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
668 |
< |
source="${build.sourcelevel}"> |
667 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
668 |
> |
source="${build.sourcelevel}" |
669 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
670 |
> |
> |
671 |
|
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
672 |
|
<include name="jsr166y/*.java"/> |
673 |
|
</fileset> |
702 |
|
|
703 |
|
<include name="**/*.java"/> |
704 |
|
<compilerarg line="${build.args}"/> |
705 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
706 |
|
<compilerarg value="${bootclasspath.args}"/> |
707 |
|
|
708 |
|
<!-- <compilerarg line="-Xlint -Xmaxwarns 1000"/> --> |
734 |
|
<mkdir dir="${build.extra166yjavadocs.dir}"/> |
735 |
|
|
736 |
|
<javadoc destdir="${build.extra166yjavadocs.dir}" |
737 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
738 |
< |
sourcepath="${extra166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" |
736 |
< |
|
737 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
738 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
739 |
|
> |
740 |
|
<packageset dir="${topsrc.dir}" defaultexcludes="no"> |
741 |
|
<include name="extra166y"/> |
775 |
|
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
776 |
|
|
777 |
|
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
778 |
< |
link="http://java.sun.com/javase/6/docs/api/" |
779 |
< |
source="${build.sourcelevel}"> |
778 |
> |
link="http://download.oracle.com/javase/6/docs/api/" |
779 |
> |
source="${build.sourcelevel}" |
780 |
> |
sourcepath="${topsrc.dir}:${jdksrc.dir}" |
781 |
> |
> |
782 |
|
<fileset dir="${topsrc.dir}" defaultexcludes="yes"> |
783 |
|
<include name="extra166y/*.java"/> |
784 |
|
</fileset> |