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.79 by jsr166, Sat Aug 1 17:23:51 2009 UTC vs.
Revision 1.80 by dl, Sat Aug 1 23:35:22 2009 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"/>
# Line 58 | Line 58
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 <
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"/>
64    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
# 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 148 | Line 151
151      <javadoc destdir="${build.javadocs.dir}"
152                  link="http://java.sun.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"
154 >            sourcepath="${src.dir}:${jdksrc.dir}"
155      >          
156  
157        <packageset dir="${src.dir}"/>
# 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 215 | Line 217
217              link="http://java.sun.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 511 | Line 513
513      <javadoc destdir="${build.jsr166xjavadocs.dir}"
514               link="http://java.sun.com/javase/6/docs/api/"
515  
516 <            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
516 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
517  
518      >
519        <packageset dir="${topsrc.dir}" defaultexcludes="yes">
# Line 623 | Line 625
625  
626      <javadoc destdir="${build.jsr166yjavadocs.dir}"
627                  link="http://java.sun.com/javase/6/docs/api/"
628 <            sourcepath="${src.dir}:${jsr166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
628 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
629  
630      >
631        <packageset dir="${topsrc.dir}" defaultexcludes="no">
# Line 666 | Line 668
668      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
669                  link="http://java.sun.com/javase/6/docs/api/"
670                source="${build.sourcelevel}"
671 <            sourcepath="${src.dir}:${jsr166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
671 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
672              >          
673        <fileset dir="${topsrc.dir}" defaultexcludes="yes">
674        <include name="jsr166y/*.java"/>
# Line 734 | Line 736
736  
737      <javadoc destdir="${build.extra166yjavadocs.dir}"
738                  link="http://java.sun.com/javase/6/docs/api/"
739 <            sourcepath="${src.dir}:${jsr166ysrc.dir}:${extra166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
739 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
740  
741      >
742        <packageset dir="${topsrc.dir}" defaultexcludes="no">
# Line 777 | Line 779
779      <javadoc destdir="${dist.extra166yjavadocs.dir}"
780                  link="http://java.sun.com/javase/6/docs/api/"
781                source="${build.sourcelevel}"
782 <            sourcepath="${src.dir}:${jsr166ysrc.dir}:${extra166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
782 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
783              >
784        <fileset dir="${topsrc.dir}" defaultexcludes="yes">
785        <include name="extra166y/*.java"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines