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.76 by dl, Tue Jan 6 16:31:52 2009 UTC vs.
Revision 1.79 by jsr166, Sat Aug 1 17:23:51 2009 UTC

# Line 27 | Line 27
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"/>
60 >  <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
61  
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 623 | Line 623
623  
624      <javadoc destdir="${build.jsr166yjavadocs.dir}"
625                  link="http://java.sun.com/javase/6/docs/api/"
626 <            sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
626 >            sourcepath="${src.dir}:${jsr166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
627  
628      >
629        <packageset dir="${topsrc.dir}" defaultexcludes="no">
# Line 665 | Line 665
665  
666      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
667                  link="http://java.sun.com/javase/6/docs/api/"
668 <              source="${build.sourcelevel}">
668 >              source="${build.sourcelevel}"
669 >            sourcepath="${src.dir}:${jsr166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
670 >            >          
671        <fileset dir="${topsrc.dir}" defaultexcludes="yes">
672        <include name="jsr166y/*.java"/>
673              </fileset>
# Line 684 | Line 686
686  
687  
688    <target name="extra166ycompile"
689 <          depends="init, configure-compiler"
689 >          depends="init, configure-compiler, jsr166ycompile"
690            description="Compiles extra166y sources">
691  
692      <mkdir dir="${build.extra166y.dir}"/>
# Line 692 | Line 694
694      <javac srcdir="${extra166ysrc.dir}"
695            destdir="${build.extra166y.dir}"
696              debug="${build.debug}"
697 +            classpath="${jsr166yproduct.jar}"
698         debuglevel="${build.debuglevel}"
699        deprecation="${build.deprecation}"
700             source="${build.sourcelevel}"
# Line 731 | Line 734
734  
735      <javadoc destdir="${build.extra166yjavadocs.dir}"
736                  link="http://java.sun.com/javase/6/docs/api/"
737 <            sourcepath="${extra166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
737 >            sourcepath="${src.dir}:${jsr166ysrc.dir}:${extra166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
738  
739      >
740        <packageset dir="${topsrc.dir}" defaultexcludes="no">
# Line 773 | Line 776
776  
777      <javadoc destdir="${dist.extra166yjavadocs.dir}"
778                  link="http://java.sun.com/javase/6/docs/api/"
779 <              source="${build.sourcelevel}">
779 >              source="${build.sourcelevel}"
780 >            sourcepath="${src.dir}:${jsr166ysrc.dir}:${extra166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
781 >            >
782        <fileset dir="${topsrc.dir}" defaultexcludes="yes">
783        <include name="extra166y/*.java"/>
784              </fileset>

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines