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.89 by jsr166, Fri Jun 10 18:07:30 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 +             additionalparam="-XDignore.symbol.file=true" >
160 +      <fileset dir="${src.dir}" defaultexcludes="yes">
161 +      <include name="**/*.java"/>
162 +      </fileset>
163      </javadoc>
164  
165    </target>
# Line 213 | Line 217
217      <delete dir="${dist.javadocs.dir}"/>
218      <mkdir dir="${dist.javadocs.dir}"/>
219  
220 <    <javadoc destdir="${dist.javadocs.dir}"
221 <            link="http://download.oracle.com/javase/6/docs/api/"
218 <            overview="${src.dir}/intro.html"
220 >    <!-- the packagenames="none" hack below prevents scanning the -->
221 >    <!-- sourcepath for packages -->
222  
223 <            sourcepath="${src.dir}:${jdksrc.dir}"
224 <     >
225 < <!--
226 <      <packageset dir="${src.dir}" defaultexcludes="yes">
227 <      <include name="java/util/concurrent"/>
228 <      <include name="java/util/concurrent/atomic"/>
229 <      <include name="java/util/concurrent/locks"/>
230 <      </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"/> -->
223 >    <javadoc destdir="${dist.javadocs.dir}"
224 >             packagenames="none"
225 >             link="http://download.oracle.com/javase/7/docs/api/"
226 >             overview="${src.dir}/intro.html"
227 >             sourcepath="${src.dir}:${jdksrc.dir}"
228 >             additionalparam="-XDignore.symbol.file=true" >
229 >      <fileset dir="${src.dir}" defaultexcludes="yes">
230 >      <include name="**/*.java"/>
231        </fileset>
232      </javadoc>
233  
# Line 517 | Line 507
507  
508      <javadoc destdir="${build.jsr166xjavadocs.dir}"
509               packagenames="jsr166x"
510 <             link="http://download.oracle.com/javase/6/docs/api/"
510 >             link="http://download.oracle.com/javase/7/docs/api/"
511               source="${build.sourcelevel}"
512 <             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
512 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
513 >             additionalparam="-XDignore.symbol.file=true" />
514  
515    </target>
516  
# Line 555 | Line 546
546  
547      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
548               packagenames="jsr166x"
549 <             link="http://download.oracle.com/javase/6/docs/api/"
549 >             link="http://download.oracle.com/javase/7/docs/api/"
550               source="${build.sourcelevel}"
551 <             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
551 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
552 >             additionalparam="-XDignore.symbol.file=true" />
553  
554    </target>
555  
# Line 620 | Line 612
612  
613      <javadoc destdir="${build.jsr166yjavadocs.dir}"
614               packagenames="jsr166y"
615 <             link="http://download.oracle.com/javase/6/docs/api/"
615 >             link="http://download.oracle.com/javase/7/docs/api/"
616               source="${build.sourcelevel}"
617 <             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
617 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
618 >             additionalparam="-XDignore.symbol.file=true" />
619  
620    </target>
621  
# Line 656 | Line 649
649  
650      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
651               packagenames="jsr166y"
652 <             link="http://download.oracle.com/javase/6/docs/api/"
652 >             link="http://download.oracle.com/javase/7/docs/api/"
653               source="${build.sourcelevel}"
654 <             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
654 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
655 >             additionalparam="-XDignore.symbol.file=true" />
656  
657    </target>
658  
# Line 722 | Line 716
716  
717      <javadoc destdir="${build.extra166yjavadocs.dir}"
718               packagenames="extra166y"
719 <             link="http://download.oracle.com/javase/6/docs/api/"
719 >             link="http://download.oracle.com/javase/7/docs/api/"
720               source="${build.sourcelevel}"
721 <             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
721 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
722 >             additionalparam="-XDignore.symbol.file=true" />
723  
724    </target>
725  
# Line 758 | Line 753
753  
754      <javadoc destdir="${dist.extra166yjavadocs.dir}"
755               packagenames="extra166y"
756 <             link="http://download.oracle.com/javase/6/docs/api/"
756 >             link="http://download.oracle.com/javase/7/docs/api/"
757               source="${build.sourcelevel}"
758 <             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
758 >             sourcepath="${topsrc.dir}:${jdksrc.dir}"
759 >             additionalparam="-XDignore.symbol.file=true" />
760  
761    </target>
762  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines