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.88 by jsr166, Sun May 29 16:00:20 2011 UTC

# Line 148 | Line 148
148      <delete dir="${build.javadocs.dir}"/>
149      <mkdir dir="${build.javadocs.dir}"/>
150  
151 <    <javadoc destdir="${build.javadocs.dir}"
152 <                link="http://download.oracle.com/javase/6/docs/api/"
153 <            overview="${src.dir}/intro.html"
154 <            sourcepath="${src.dir}:${jdksrc.dir}"
155 <    >
156 <
157 <      <packageset dir="${src.dir}"/>
151 >    <!-- the packagenames="none" hack below prevents scanning the -->
152 >    <!-- sourcepath for packages -->
153  
154 +    <javadoc destdir="${build.javadocs.dir}"
155 +             packagenames="none"
156 +             link="http://download.oracle.com/javase/7/docs/api/"
157 +             overview="${src.dir}/intro.html"
158 +             sourcepath="${src.dir}:${jdksrc.dir}" >
159 +      <fileset dir="${src.dir}" defaultexcludes="yes">
160 +      <include name="**/*.java"/>
161 +      </fileset>
162      </javadoc>
163  
164    </target>
# Line 213 | Line 216
216      <delete dir="${dist.javadocs.dir}"/>
217      <mkdir dir="${dist.javadocs.dir}"/>
218  
219 <    <javadoc destdir="${dist.javadocs.dir}"
220 <            link="http://download.oracle.com/javase/6/docs/api/"
218 <            overview="${src.dir}/intro.html"
219 >    <!-- the packagenames="none" hack below prevents scanning the -->
220 >    <!-- sourcepath for packages -->
221  
222 <            sourcepath="${src.dir}:${jdksrc.dir}"
223 <     >
224 < <!--
225 <      <packageset dir="${src.dir}" defaultexcludes="yes">
226 <      <include name="java/util/concurrent"/>
227 <      <include name="java/util/concurrent/atomic"/>
228 <      <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"/> -->
222 >    <javadoc destdir="${dist.javadocs.dir}"
223 >             packagenames="none"
224 >             link="http://download.oracle.com/javase/7/docs/api/"
225 >             overview="${src.dir}/intro.html"
226 >             sourcepath="${src.dir}:${jdksrc.dir}" >
227 >      <fileset dir="${src.dir}" defaultexcludes="yes">
228 >      <include name="**/*.java"/>
229        </fileset>
230      </javadoc>
231  
# Line 517 | Line 505
505  
506      <javadoc destdir="${build.jsr166xjavadocs.dir}"
507               packagenames="jsr166x"
508 <             link="http://download.oracle.com/javase/6/docs/api/"
508 >             link="http://download.oracle.com/javase/7/docs/api/"
509               source="${build.sourcelevel}"
510               sourcepath="${topsrc.dir}:${jdksrc.dir}" />
511  
# Line 555 | Line 543
543  
544      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
545               packagenames="jsr166x"
546 <             link="http://download.oracle.com/javase/6/docs/api/"
546 >             link="http://download.oracle.com/javase/7/docs/api/"
547               source="${build.sourcelevel}"
548               sourcepath="${topsrc.dir}:${jdksrc.dir}" />
549  
# Line 620 | Line 608
608  
609      <javadoc destdir="${build.jsr166yjavadocs.dir}"
610               packagenames="jsr166y"
611 <             link="http://download.oracle.com/javase/6/docs/api/"
611 >             link="http://download.oracle.com/javase/7/docs/api/"
612               source="${build.sourcelevel}"
613               sourcepath="${topsrc.dir}:${jdksrc.dir}" />
614  
# Line 656 | Line 644
644  
645      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
646               packagenames="jsr166y"
647 <             link="http://download.oracle.com/javase/6/docs/api/"
647 >             link="http://download.oracle.com/javase/7/docs/api/"
648               source="${build.sourcelevel}"
649               sourcepath="${topsrc.dir}:${jdksrc.dir}" />
650  
# Line 722 | Line 710
710  
711      <javadoc destdir="${build.extra166yjavadocs.dir}"
712               packagenames="extra166y"
713 <             link="http://download.oracle.com/javase/6/docs/api/"
713 >             link="http://download.oracle.com/javase/7/docs/api/"
714               source="${build.sourcelevel}"
715               sourcepath="${topsrc.dir}:${jdksrc.dir}" />
716  
# Line 758 | Line 746
746  
747      <javadoc destdir="${dist.extra166yjavadocs.dir}"
748               packagenames="extra166y"
749 <             link="http://download.oracle.com/javase/6/docs/api/"
749 >             link="http://download.oracle.com/javase/7/docs/api/"
750               source="${build.sourcelevel}"
751               sourcepath="${topsrc.dir}:${jdksrc.dir}" />
752  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines