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.85 by jsr166, Sat May 28 00:57:34 2011 UTC vs.
Revision 1.87 by jsr166, Sat May 28 02:32:19 2011 UTC

# Line 149 | Line 149
149      <mkdir dir="${build.javadocs.dir}"/>
150  
151      <javadoc destdir="${build.javadocs.dir}"
152 <                link="http://download.oracle.com/javase/6/docs/api/"
152 >                link="http://download.oracle.com/javase/7/docs/api/"
153              overview="${src.dir}/intro.html"
154              sourcepath="${src.dir}:${jdksrc.dir}"
155      >
# Line 213 | Line 213
213      <delete dir="${dist.javadocs.dir}"/>
214      <mkdir dir="${dist.javadocs.dir}"/>
215  
216 <    <javadoc destdir="${dist.javadocs.dir}"
217 <            link="http://download.oracle.com/javase/6/docs/api/"
218 <            overview="${src.dir}/intro.html"
216 >    <!-- the packagenames="none" hack below prevents scanning the -->
217 >    <!-- sourcepath for packages -->
218  
219 <            sourcepath="${src.dir}:${jdksrc.dir}"
220 <     >
221 < <!--
222 <      <packageset dir="${src.dir}" defaultexcludes="yes">
223 <      <include name="java/util/concurrent"/>
224 <      <include name="java/util/concurrent/atomic"/>
225 <      <include name="java/util/concurrent/locks"/>
227 <      </packageset>
228 < -->
229 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
230 <      <include name="main/java/util/concurrent/*.java"/>
231 <      <include name="main/java/util/concurrent/atomic/*.java"/>
232 <      <include name="main/java/util/concurrent/locks/*.java"/>
233 <      <include name="main/java/util/*.java"/>
234 < <!--
235 <      <include name="main/java/util/concurrent/*.html"/>
236 <      <include name="main/java/util/concurrent/atomic/*.html"/>
237 <      <include name="main/java/util/concurrent/locks/*.html"/>
238 <      <include name="main/java/util/*.html"/>
239 < -->
240 < <!--      <include name="jsr166x/*.java"/> -->
219 >    <javadoc destdir="${dist.javadocs.dir}"
220 >             packagenames="none"
221 >             link="http://download.oracle.com/javase/7/docs/api/"
222 >             overview="${src.dir}/intro.html"
223 >             sourcepath="${src.dir}:${jdksrc.dir}" >
224 >      <fileset dir="${src.dir}" defaultexcludes="yes">
225 >      <include name="**/*.java"/>
226        </fileset>
227      </javadoc>
228  
# Line 517 | Line 502
502  
503      <javadoc destdir="${build.jsr166xjavadocs.dir}"
504               packagenames="jsr166x"
505 <             link="http://download.oracle.com/javase/6/docs/api/"
505 >             link="http://download.oracle.com/javase/7/docs/api/"
506               source="${build.sourcelevel}"
507               sourcepath="${topsrc.dir}:${jdksrc.dir}" />
508  
# Line 555 | Line 540
540  
541      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
542               packagenames="jsr166x"
543 <             link="http://download.oracle.com/javase/6/docs/api/"
543 >             link="http://download.oracle.com/javase/7/docs/api/"
544               source="${build.sourcelevel}"
545               sourcepath="${topsrc.dir}:${jdksrc.dir}" />
546  
# Line 620 | Line 605
605  
606      <javadoc destdir="${build.jsr166yjavadocs.dir}"
607               packagenames="jsr166y"
608 <             link="http://download.oracle.com/javase/6/docs/api/"
608 >             link="http://download.oracle.com/javase/7/docs/api/"
609               source="${build.sourcelevel}"
610               sourcepath="${topsrc.dir}:${jdksrc.dir}" />
611  
# Line 656 | Line 641
641  
642      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
643               packagenames="jsr166y"
644 <             link="http://download.oracle.com/javase/6/docs/api/"
644 >             link="http://download.oracle.com/javase/7/docs/api/"
645               source="${build.sourcelevel}"
646               sourcepath="${topsrc.dir}:${jdksrc.dir}" />
647  
# Line 722 | Line 707
707  
708      <javadoc destdir="${build.extra166yjavadocs.dir}"
709               packagenames="extra166y"
710 <             link="http://download.oracle.com/javase/6/docs/api/"
710 >             link="http://download.oracle.com/javase/7/docs/api/"
711               source="${build.sourcelevel}"
712               sourcepath="${topsrc.dir}:${jdksrc.dir}" />
713  
# Line 758 | Line 743
743  
744      <javadoc destdir="${dist.extra166yjavadocs.dir}"
745               packagenames="extra166y"
746 <             link="http://download.oracle.com/javase/6/docs/api/"
746 >             link="http://download.oracle.com/javase/7/docs/api/"
747               source="${build.sourcelevel}"
748               sourcepath="${topsrc.dir}:${jdksrc.dir}" />
749  

Diff Legend

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