[cvs] / jsr166 / build.xml Repository:
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.124, Tue Jan 22 21:22:57 2013 UTC revision 1.125, Wed Jan 23 06:45:08 2013 UTC
# Line 86  Line 86 
86      </sequential>      </sequential>
87    </macrodef>    </macrodef>
88    
89      <macrodef name="mirror-dir">
90        <attribute name="src"/>
91        <attribute name="dst"/>
92        <sequential>
93        <delete dir="@{dst}"/>
94        <mkdir dir="@{dst}"/>
95        <copy todir="@{dst}" preservelastmodified="true">
96          <fileset dir="@{src}"/>
97        </copy>
98        </sequential>
99      </macrodef>
100    
101    <defjdklocations v="6"/>    <defjdklocations v="6"/>
102    <defjdklocations v="7"/>    <defjdklocations v="7"/>
103    <defjdklocations v="8"/>    <defjdklocations v="8"/>
# Line 105  Line 117 
117    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
118    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
119    
120    <!-- Distribution locations -->    <!-- Javadoc locations -->
121    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166docs"/>    <property name="javadocs.dir"          location="${build.dir}/javadocs"/>
122    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>    <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"/>    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
131    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
132    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 250  Line 269 
269    <target name="docs"    <target name="docs"
270            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
271    
272      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${javadocs.dir}"/>
273      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${javadocs.dir}"/>
274    
275      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
276      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
277    
278      <javadoc destdir="${dist.javadocs.dir}"      <javadoc destdir="${javadocs.dir}"
279               packagenames="none"               packagenames="none"
280               link="${jdkapi8docs.url}"               link="${jdkapi8docs.url}"
281               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
# Line 274  Line 293 
293    
294    
295    <target name="dist"    <target name="dist"
296            depends="dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, dist-docs"
297            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
298    
299    
# Line 317  Line 336 
336    
337    <target name="dist-jar"    <target name="dist-jar"
338            depends="clean, jar">            depends="clean, jar">
   
339      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
340      </target>
341    
342      <target name="dist-docs"
343              depends="clean, docs">
344        <mirror-dir src="${javadocs.dir}" dst="${dist.javadocs.dir}"/>
345    </target>    </target>
346    
347    
# Line 641  Line 663 
663    <target name="4jdk7docs"    <target name="4jdk7docs"
664            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
665    
666      <delete dir="${dist.4jdk7.docs.dir}"/>      <delete dir="${4jdk7javadocs.dir}"/>
667      <mkdir dir="${dist.4jdk7.docs.dir}"/>      <mkdir dir="${4jdk7javadocs.dir}"/>
668    
669      <javadoc destdir="${dist.4jdk7.docs.dir}"      <javadoc destdir="${4jdk7javadocs.dir}"
670               packagenames="none"               packagenames="none"
671               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
672               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
# Line 660  Line 682 
682    
683    
684    <target name="4jdk7dist"    <target name="4jdk7dist"
685            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"            depends="4jdk7dist-jar, 4jdk7dist-docs"
686            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
687    
688    
# Line 679  Line 701 
701    
702    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
703            depends="4jdk7clean, 4jdk7-jar">            depends="4jdk7clean, 4jdk7-jar">
   
704      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
705      </target>
706    
707    
708      <target name="4jdk7dist-docs"
709              depends="4jdk7clean, 4jdk7docs">
710        <mirror-dir src="${4jdk7javadocs.dir}" dst="${dist.4jdk7javadocs.dir}"/>
711    </target>    </target>
712    
713    
# Line 729  Line 755 
755    <target name="jsr166xdocs"    <target name="jsr166xdocs"
756            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
757    
758      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${jsr166xjavadocs.dir}"/>
759      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${jsr166xjavadocs.dir}"/>
760    
761      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${jsr166xjavadocs.dir}"
762               packagenames="jsr166x.*"               packagenames="jsr166x.*"
763               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
764               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
# Line 746  Line 772 
772    
773    
774    <target name="jsr166xdist"    <target name="jsr166xdist"
775            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"            depends="jsr166xdist-jar, jsr166xdist-docs"
776            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
777    
778    
# Line 766  Line 792 
792    
793    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
794            depends="jsr166xclean, jsr166x-jar">            depends="jsr166xclean, jsr166x-jar">
   
795      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
796      </target>
797    
798      <target name="jsr166xdist-docs"
799              depends="jsr166xclean, jsr166xdocs">
800        <mirror-dir src="${jsr166xjavadocs.dir}" dst="${dist.jsr166xjavadocs.dir}"/>
801    </target>    </target>
802    
803    <!-- jsr166y -->    <!-- jsr166y -->
# Line 816  Line 845 
845    <target name="jsr166ydocs"    <target name="jsr166ydocs"
846            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
847    
848      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${jsr166yjavadocs.dir}"/>
849      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${jsr166yjavadocs.dir}"/>
850    
851      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${jsr166yjavadocs.dir}"
852               packagenames="jsr166y.*"               packagenames="jsr166y.*"
853               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
854               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
# Line 833  Line 862 
862    
863    
864    <target name="jsr166ydist"    <target name="jsr166ydist"
865            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"            depends="jsr166ydist-jar, jsr166ydist-docs"
866            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
867    
868    
# Line 852  Line 881 
881    
882    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
883            depends="jsr166yclean, jsr166y-jar">            depends="jsr166yclean, jsr166y-jar">
   
884      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
885      </target>
886    
887      <target name="jsr166ydist-docs"
888              depends="jsr166yclean, jsr166ydocs">
889        <mirror-dir src="${jsr166yjavadocs.dir}" dst="${dist.jsr166yjavadocs.dir}"/>
890    </target>    </target>
891    
892    
# Line 903  Line 935 
935    <target name="extra166ydocs"    <target name="extra166ydocs"
936            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
937    
938      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${extra166yjavadocs.dir}"/>
939      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${extra166yjavadocs.dir}"/>
940    
941      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${extra166yjavadocs.dir}"
942               packagenames="extra166y.*"               packagenames="extra166y.*"
943               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
944               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
# Line 920  Line 952 
952    
953    
954    <target name="extra166ydist"    <target name="extra166ydist"
955            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"            depends="extra166ydist-jar, extra166ydist-docs"
956            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
957    
958    
# Line 939  Line 971 
971    
972    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
973            depends="extra166yclean, extra166y-jar">            depends="extra166yclean, extra166y-jar">
   
974      <copy file="${extra166y.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
975      </target>
976    
977      <target name="extra166ydist-docs"
978              depends="extra166yclean, extra166ydocs">
979        <mirror-dir src="${extra166yjavadocs.dir}" dst="${dist.extra166yjavadocs.dir}"/>
980    </target>    </target>
981    
982    <!-- jsr166e -->    <!-- jsr166e -->
# Line 987  Line 1022 
1022    <target name="jsr166edocs"    <target name="jsr166edocs"
1023            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1024    
1025      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${jsr166ejavadocs.dir}"/>
1026      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${jsr166ejavadocs.dir}"/>
1027    
1028      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${jsr166ejavadocs.dir}"
1029               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1030               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1031               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
# Line 1016  Line 1051 
1051    
1052    
1053    <target name="jsr166edist"    <target name="jsr166edist"
1054            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"            depends="jsr166edist-jar, jsr166edist-docs"
1055            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1056    
1057    
1058    <target name="jsr166eclean"    <target name="jsr166eclean"
1059            description="Removes all jsr166e build products">            description="Removes all jsr166e build products">
   
1060      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
   
1061    </target>    </target>
1062    
1063    
# Line 1035  Line 1068 
1068    
1069    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1070            depends="jsr166eclean, jsr166e-jar">            depends="jsr166eclean, jsr166e-jar">
   
1071      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1072      </target>
1073    
1074      <target name="jsr166edist-docs"
1075              depends="jsr166eclean, jsr166edocs">
1076        <mirror-dir src="${jsr166ejavadocs.dir}" dst="${dist.jsr166ejavadocs.dir}"/>
1077    </target>    </target>
1078    
1079  </project>  </project>

Legend:
Removed from v.1.124  
changed lines
  Added in v.1.125

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8