ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.77 by dl, Thu Jul 23 13:06:55 2009 UTC vs.
Revision 1.84 by dl, Thu Nov 25 12:48:45 2010 UTC

# Line 21 | Line 21
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"/>
# Line 57 | Line 57
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 -->
# Line 89 | Line 89
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"
# Line 105 | Line 108
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/**"/>
# Line 146 | Line 149
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  
# Line 164 | Line 167
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">
# Line 212 | Line 214
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">
# Line 279 | Line 281
281  
282        <compilerarg value="${bootclasspath.args}"/>
283        <compilerarg line="${build.args}"/>
284 +      <compilerarg value="-XDignore.symbol.file=true"/>
285  
286        <classpath refid="test.classpath"/>
287  
# Line 296 | Line 299
299  
300        <compilerarg value="${bootclasspath.args}"/>
301        <compilerarg line="${build.args}"/>
302 +      <compilerarg value="-XDignore.symbol.file=true"/>
303  
304        <classpath refid="test.classpath"/>
305  
# Line 312 | Line 316
316  
317        <compilerarg value="${bootclasspath.args}"/>
318        <compilerarg line="${build.args}"/>
319 +      <compilerarg value="-XDignore.symbol.file=true"/>
320  
321        <classpath refid="test.classpath"/>
322  
# Line 452 | Line 457
457  
458        <compilerarg line="${build.args}"/>
459        <classpath refid="loops.classpath"/>
460 +      <compilerarg value="-XDignore.symbol.file=true"/>
461  
462      </javac>
463  
# Line 481 | Line 487
487  
488        <include name="**/*.java"/>
489        <compilerarg line="${build.args}"/>
490 +      <compilerarg value="-XDignore.symbol.file=true"/>
491  
492      </javac>
493  
# Line 509 | Line 516
516      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
517  
518      <javadoc destdir="${build.jsr166xjavadocs.dir}"
519 <             link="http://java.sun.com/javase/6/docs/api/"
520 <
514 <            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
515 <
519 >             link="http://download.oracle.com/javase/6/docs/api/"
520 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
521      >
522        <packageset dir="${topsrc.dir}" defaultexcludes="yes">
523        <include name="jsr166x"/>
# Line 554 | Line 559
559      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
560  
561      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
562 <                link="http://java.sun.com/javase/6/docs/api/"
562 >                link="http://download.oracle.com/javase/6/docs/api/"
563                source="${build.sourcelevel}">
564  
565        <packageset dir="${topsrc.dir}" defaultexcludes="yes">
# Line 591 | Line 596
596  
597        <include name="**/*.java"/>
598        <compilerarg line="${build.args}"/>
599 +      <compilerarg value="-XDignore.symbol.file=true"/>
600        <compilerarg value="${bootclasspath.args}"/>
601  
602   <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
# Line 622 | Line 628
628      <mkdir dir="${build.jsr166yjavadocs.dir}"/>
629  
630      <javadoc destdir="${build.jsr166yjavadocs.dir}"
631 <                link="http://java.sun.com/javase/6/docs/api/"
632 <            sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
627 <
631 >                link="http://download.oracle.com/javase/6/docs/api/"
632 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
633      >
634        <packageset dir="${topsrc.dir}" defaultexcludes="no">
635        <include name="jsr166y"/>
# Line 664 | Line 669
669      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
670  
671      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
672 <                link="http://java.sun.com/javase/6/docs/api/"
673 <              source="${build.sourcelevel}">
672 >                link="http://download.oracle.com/javase/6/docs/api/"
673 >              source="${build.sourcelevel}"
674 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
675 >            >
676        <fileset dir="${topsrc.dir}" defaultexcludes="yes">
677        <include name="jsr166y/*.java"/>
678              </fileset>
# Line 700 | Line 707
707  
708        <include name="**/*.java"/>
709        <compilerarg line="${build.args}"/>
710 +      <compilerarg value="-XDignore.symbol.file=true"/>
711        <compilerarg value="${bootclasspath.args}"/>
712  
713   <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
# Line 731 | Line 739
739      <mkdir dir="${build.extra166yjavadocs.dir}"/>
740  
741      <javadoc destdir="${build.extra166yjavadocs.dir}"
742 <                link="http://java.sun.com/javase/6/docs/api/"
743 <            sourcepath="${extra166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
736 <
742 >                link="http://download.oracle.com/javase/6/docs/api/"
743 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
744      >
745        <packageset dir="${topsrc.dir}" defaultexcludes="no">
746        <include name="extra166y"/>
# Line 773 | Line 780
780      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
781  
782      <javadoc destdir="${dist.extra166yjavadocs.dir}"
783 <                link="http://java.sun.com/javase/6/docs/api/"
784 <              source="${build.sourcelevel}">
783 >                link="http://download.oracle.com/javase/6/docs/api/"
784 >              source="${build.sourcelevel}"
785 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
786 >            >
787        <fileset dir="${topsrc.dir}" defaultexcludes="yes">
788        <include name="extra166y/*.java"/>
789              </fileset>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines