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.126 by jsr166, Wed Jan 23 06:46:27 2013 UTC vs.
Revision 1.127 by jsr166, Wed Jan 23 06:57:08 2013 UTC

# Line 118 | Line 118
118    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
119  
120    <!-- Javadoc locations -->
121 <  <property name="javadocs.dir"          location="${build.dir}/javadocs"/>
122 <  <property name="4jdk7javadocs.dir"     location="${build.4jdk7.dir}/javadocs"/>
123 <  <property name="jsr166xjavadocs.dir"   location="${build.jsr166x.dir}/javadocs"/>
124 <  <property name="jsr166yjavadocs.dir"   location="${build.jsr166y.dir}/javadocs"/>
125 <  <property name="jsr166ejavadocs.dir"   location="${build.jsr166e.dir}/javadocs"/>
126 <  <property name="extra166yjavadocs.dir" location="${build.extra166y.dir}/javadocs"/>
127 <
128 <  <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
129 <  <property name="dist.4jdk7javadocs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
130 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
131 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
132 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
133 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
121 >  <property name="docs.dir"          location="${build.dir}/docs"/>
122 >  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
123 >  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
124 >  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
125 >  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
126 >  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
127 >
128 >  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
129 >  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
130 >  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
131 >  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
132 >  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
133 >  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
134  
135    <!-- Jar locations -->
136    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 269 | Line 269
269    <target name="docs"
270            description="Builds javadocs for src/main to dist dir">
271  
272 <    <delete dir="${javadocs.dir}"/>
273 <    <mkdir dir="${javadocs.dir}"/>
272 >    <delete dir="${docs.dir}"/>
273 >    <mkdir dir="${docs.dir}"/>
274  
275      <!-- the packagenames="none" hack below prevents scanning the -->
276      <!-- sourcepath for packages -->
277  
278 <    <javadoc destdir="${javadocs.dir}"
278 >    <javadoc destdir="${docs.dir}"
279               packagenames="none"
280               link="${jdkapi8docs.url}"
281               overview="${src.dir}/intro.html"
# Line 341 | Line 341
341  
342    <target name="dist-docs"
343            depends="clean, docs">
344 <    <mirror-dir src="${javadocs.dir}" dst="${dist.javadocs.dir}"/>
344 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
345    </target>
346  
347  
# Line 663 | Line 663
663    <target name="4jdk7docs"
664            description="Builds javadocs for src/jdk7 to dist dir">
665  
666 <    <delete dir="${4jdk7javadocs.dir}"/>
667 <    <mkdir dir="${4jdk7javadocs.dir}"/>
666 >    <delete dir="${4jdk7docs.dir}"/>
667 >    <mkdir dir="${4jdk7docs.dir}"/>
668  
669 <    <javadoc destdir="${4jdk7javadocs.dir}"
669 >    <javadoc destdir="${4jdk7docs.dir}"
670               packagenames="none"
671               link="${jdkapi7docs.url}"
672               overview="${4jdk7src.dir}/intro.html"
# Line 707 | Line 707
707  
708    <target name="4jdk7dist-docs"
709            depends="4jdk7clean, 4jdk7docs">
710 <    <mirror-dir src="${4jdk7javadocs.dir}" dst="${dist.4jdk7javadocs.dir}"/>
710 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
711    </target>
712  
713  
# Line 755 | Line 755
755    <target name="jsr166xdocs"
756            description="Builds javadocs to dist dir">
757  
758 <    <delete dir="${jsr166xjavadocs.dir}"/>
759 <    <mkdir dir="${jsr166xjavadocs.dir}"/>
758 >    <delete dir="${jsr166xdocs.dir}"/>
759 >    <mkdir dir="${jsr166xdocs.dir}"/>
760  
761 <    <javadoc destdir="${jsr166xjavadocs.dir}"
761 >    <javadoc destdir="${jsr166xdocs.dir}"
762               packagenames="jsr166x.*"
763               link="${jdkapidocs.url}"
764               sourcepath="${topsrc.dir}:${jdk6src.dir}"
# Line 797 | Line 797
797  
798    <target name="jsr166xdist-docs"
799            depends="jsr166xclean, jsr166xdocs">
800 <    <mirror-dir src="${jsr166xjavadocs.dir}" dst="${dist.jsr166xjavadocs.dir}"/>
800 >    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
801    </target>
802  
803    <!-- jsr166y -->
# Line 845 | Line 845
845    <target name="jsr166ydocs"
846            description="Builds javadocs to dist dir">
847  
848 <    <delete dir="${jsr166yjavadocs.dir}"/>
849 <    <mkdir dir="${jsr166yjavadocs.dir}"/>
848 >    <delete dir="${jsr166ydocs.dir}"/>
849 >    <mkdir dir="${jsr166ydocs.dir}"/>
850  
851 <    <javadoc destdir="${jsr166yjavadocs.dir}"
851 >    <javadoc destdir="${jsr166ydocs.dir}"
852               packagenames="jsr166y.*"
853               link="${jdkapidocs.url}"
854               sourcepath="${topsrc.dir}:${jdk6src.dir}"
# Line 886 | Line 886
886  
887    <target name="jsr166ydist-docs"
888            depends="jsr166yclean, jsr166ydocs">
889 <    <mirror-dir src="${jsr166yjavadocs.dir}" dst="${dist.jsr166yjavadocs.dir}"/>
889 >    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
890    </target>
891  
892  
# Line 935 | Line 935
935    <target name="extra166ydocs"
936            description="Builds javadocs to build dir">
937  
938 <    <delete dir="${extra166yjavadocs.dir}"/>
939 <    <mkdir dir="${extra166yjavadocs.dir}"/>
938 >    <delete dir="${extra166ydocs.dir}"/>
939 >    <mkdir dir="${extra166ydocs.dir}"/>
940  
941 <    <javadoc destdir="${extra166yjavadocs.dir}"
941 >    <javadoc destdir="${extra166ydocs.dir}"
942               packagenames="extra166y.*"
943               link="${jdkapidocs.url}"
944               sourcepath="${topsrc.dir}:${jdk6src.dir}"
# Line 976 | Line 976
976  
977    <target name="extra166ydist-docs"
978            depends="extra166yclean, extra166ydocs">
979 <    <mirror-dir src="${extra166yjavadocs.dir}" dst="${dist.extra166yjavadocs.dir}"/>
979 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
980    </target>
981  
982    <!-- jsr166e -->
# Line 1022 | Line 1022
1022    <target name="jsr166edocs"
1023            description="Builds javadocs to build dir">
1024  
1025 <    <delete dir="${jsr166ejavadocs.dir}"/>
1026 <    <mkdir dir="${jsr166ejavadocs.dir}"/>
1025 >    <delete dir="${jsr166edocs.dir}"/>
1026 >    <mkdir dir="${jsr166edocs.dir}"/>
1027  
1028 <    <javadoc destdir="${jsr166ejavadocs.dir}"
1028 >    <javadoc destdir="${jsr166edocs.dir}"
1029               packagenames="jsr166e.*"
1030               link="${jdkapidocs.url}"
1031               sourcepath="${topsrc.dir}:${jdk7src.dir}"
# Line 1073 | Line 1073
1073  
1074    <target name="jsr166edist-docs"
1075            depends="jsr166eclean, jsr166edocs">
1076 <    <mirror-dir src="${jsr166ejavadocs.dir}" dst="${dist.jsr166ejavadocs.dir}"/>
1076 >    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1077    </target>
1078  
1079   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines