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.84 by dl, Thu Nov 25 12:48:45 2010 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 516 | Line 504
504      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
505  
506      <javadoc destdir="${build.jsr166xjavadocs.dir}"
507 <             link="http://download.oracle.com/javase/6/docs/api/"
508 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
509 <    >
510 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
523 <      <include name="jsr166x"/>
524 <      </packageset>
525 <
526 <
527 <    </javadoc>
507 >             packagenames="jsr166x"
508 >             link="http://download.oracle.com/javase/7/docs/api/"
509 >             source="${build.sourcelevel}"
510 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
511  
512    </target>
513  
# Line 559 | Line 542
542      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
543  
544      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
545 <                link="http://download.oracle.com/javase/6/docs/api/"
546 <              source="${build.sourcelevel}">
547 <
548 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
566 <      <include name="jsr166x"/>
567 <      </packageset>
568 <
569 <    </javadoc>
545 >             packagenames="jsr166x"
546 >             link="http://download.oracle.com/javase/7/docs/api/"
547 >             source="${build.sourcelevel}"
548 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
549  
550    </target>
551  
# Line 628 | Line 607
607      <mkdir dir="${build.jsr166yjavadocs.dir}"/>
608  
609      <javadoc destdir="${build.jsr166yjavadocs.dir}"
610 <                link="http://download.oracle.com/javase/6/docs/api/"
611 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
612 <    >
613 <      <packageset dir="${topsrc.dir}" defaultexcludes="no">
635 <      <include name="jsr166y"/>
636 <      </packageset>
637 <
638 <
639 <    </javadoc>
610 >             packagenames="jsr166y"
611 >             link="http://download.oracle.com/javase/7/docs/api/"
612 >             source="${build.sourcelevel}"
613 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
614  
615    </target>
616  
# Line 669 | Line 643
643      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
644  
645      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
646 <                link="http://download.oracle.com/javase/6/docs/api/"
647 <              source="${build.sourcelevel}"
648 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
649 <            >
676 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
677 <      <include name="jsr166y/*.java"/>
678 <            </fileset>
679 <    </javadoc>
646 >             packagenames="jsr166y"
647 >             link="http://download.oracle.com/javase/7/docs/api/"
648 >             source="${build.sourcelevel}"
649 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
650  
651    </target>
652  
# Line 739 | Line 709
709      <mkdir dir="${build.extra166yjavadocs.dir}"/>
710  
711      <javadoc destdir="${build.extra166yjavadocs.dir}"
712 <                link="http://download.oracle.com/javase/6/docs/api/"
713 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
714 <    >
715 <      <packageset dir="${topsrc.dir}" defaultexcludes="no">
746 <      <include name="extra166y"/>
747 <      </packageset>
748 <
749 <
750 <    </javadoc>
712 >             packagenames="extra166y"
713 >             link="http://download.oracle.com/javase/7/docs/api/"
714 >             source="${build.sourcelevel}"
715 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
716  
717    </target>
718  
# Line 780 | Line 745
745      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
746  
747      <javadoc destdir="${dist.extra166yjavadocs.dir}"
748 <                link="http://download.oracle.com/javase/6/docs/api/"
749 <              source="${build.sourcelevel}"
750 <            sourcepath="${topsrc.dir}:${jdksrc.dir}"
751 <            >
787 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
788 <      <include name="extra166y/*.java"/>
789 <            </fileset>
790 <    </javadoc>
748 >             packagenames="extra166y"
749 >             link="http://download.oracle.com/javase/7/docs/api/"
750 >             source="${build.sourcelevel}"
751 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
752  
753    </target>
754  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines