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.83 by dl, Sat Nov 13 13:20:12 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"/>
# 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 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 509 | Line 511
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"/>
# Line 554 | Line 554
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">
# Line 591 | Line 591
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"/> -->
# Line 622 | Line 623
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="${src.dir}:${jsr166ysrc.dir}:/home/dl/1.6.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"/>
# Line 664 | Line 664
664      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
665  
666      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
667 <                link="http://java.sun.com/javase/6/docs/api/"
667 >                link="http://download.oracle.com/javase/6/docs/api/"
668                source="${build.sourcelevel}"
669 <            sourcepath="${src.dir}:${jsr166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
670 <            >          
669 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
670 >            >
671        <fileset dir="${topsrc.dir}" defaultexcludes="yes">
672        <include name="jsr166y/*.java"/>
673              </fileset>
# Line 702 | Line 702
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"/> -->
# Line 733 | Line 734
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="${src.dir}:${jsr166ysrc.dir}:${extra166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
738 <
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"/>
# Line 775 | Line 775
775      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
776  
777      <javadoc destdir="${dist.extra166yjavadocs.dir}"
778 <                link="http://java.sun.com/javase/6/docs/api/"
778 >                link="http://download.oracle.com/javase/6/docs/api/"
779                source="${build.sourcelevel}"
780 <            sourcepath="${src.dir}:${jsr166ysrc.dir}:${extra166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
780 >            sourcepath="${topsrc.dir}:${jdksrc.dir}"
781              >
782        <fileset dir="${topsrc.dir}" defaultexcludes="yes">
783        <include name="extra166y/*.java"/>

Diff Legend

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