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.129 by jsr166, Wed Jan 23 07:17:13 2013 UTC

# Line 25 | Line 25
25   ------------------------------------------------------------------------------
26    </description>
27  
28 <  <target name="usage" description="Advises user to run with -projecthelp">
29 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
28 >  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
29 >    <java classname="org.apache.tools.ant.Main">
30 >      <arg value="-projecthelp" />
31 >    </java>
32    </target>
33  
34  
# Line 118 | Line 120
120    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
121  
122    <!-- Javadoc locations -->
123 <  <property name="javadocs.dir"          location="${build.dir}/javadocs"/>
124 <  <property name="4jdk7javadocs.dir"     location="${build.4jdk7.dir}/javadocs"/>
125 <  <property name="jsr166xjavadocs.dir"   location="${build.jsr166x.dir}/javadocs"/>
126 <  <property name="jsr166yjavadocs.dir"   location="${build.jsr166y.dir}/javadocs"/>
127 <  <property name="jsr166ejavadocs.dir"   location="${build.jsr166e.dir}/javadocs"/>
128 <  <property name="extra166yjavadocs.dir" location="${build.extra166y.dir}/javadocs"/>
129 <
130 <  <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
131 <  <property name="dist.4jdk7javadocs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
132 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
133 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
134 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
135 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
123 >  <property name="docs.dir"          location="${build.dir}/docs"/>
124 >  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
125 >  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
126 >  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
127 >  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
128 >  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
129 >
130 >  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
131 >  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
132 >  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
133 >  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
134 >  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
135 >  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
136  
137    <!-- Jar locations -->
138    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 269 | Line 271
271    <target name="docs"
272            description="Builds javadocs for src/main to dist dir">
273  
274 <    <delete dir="${javadocs.dir}"/>
275 <    <mkdir dir="${javadocs.dir}"/>
274 >    <delete dir="${docs.dir}"/>
275 >    <mkdir dir="${docs.dir}"/>
276  
277      <!-- the packagenames="none" hack below prevents scanning the -->
278      <!-- sourcepath for packages -->
279  
280 <    <javadoc destdir="${javadocs.dir}"
280 >    <javadoc destdir="${docs.dir}"
281               packagenames="none"
282               link="${jdkapi8docs.url}"
283               overview="${src.dir}/intro.html"
# Line 341 | Line 343
343  
344    <target name="dist-docs"
345            depends="clean, docs">
346 <    <mirror-dir src="${javadocs.dir}" dst="${dist.javadocs.dir}"/>
346 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
347    </target>
348  
349  
# Line 582 | Line 584
584    </target>
585  
586  
587 <  <target name="4jdk7-jar"
587 >  <target name="4jdk7jar"
588            depends="4jdk7compile"
589            description="Builds library jar from compiled sources">
590  
# Line 594 | Line 596
596  
597  
598    <target name="4jdk7-test-tck"
599 <          depends="4jdk7-jar"
599 >          depends="4jdk7jar"
600            description="Runs tck tests for jsr166-4jdk7 directly">
601  
602      <run-tck-tests
# Line 663 | Line 665
665    <target name="4jdk7docs"
666            description="Builds javadocs for src/jdk7 to dist dir">
667  
668 <    <delete dir="${4jdk7javadocs.dir}"/>
669 <    <mkdir dir="${4jdk7javadocs.dir}"/>
668 >    <delete dir="${4jdk7docs.dir}"/>
669 >    <mkdir dir="${4jdk7docs.dir}"/>
670  
671 <    <javadoc destdir="${4jdk7javadocs.dir}"
671 >    <javadoc destdir="${4jdk7docs.dir}"
672               packagenames="none"
673               link="${jdkapi7docs.url}"
674               overview="${4jdk7src.dir}/intro.html"
# Line 700 | Line 702
702    </target>
703  
704    <target name="4jdk7dist-jar"
705 <          depends="4jdk7clean, 4jdk7-jar">
705 >          depends="4jdk7clean, 4jdk7jar">
706      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
707    </target>
708  
709  
710    <target name="4jdk7dist-docs"
711            depends="4jdk7clean, 4jdk7docs">
712 <    <mirror-dir src="${4jdk7javadocs.dir}" dst="${dist.4jdk7javadocs.dir}"/>
712 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
713    </target>
714  
715  
# Line 741 | Line 743
743    </target>
744  
745  
746 <  <target name="jsr166x-jar"
746 >  <target name="jsr166xjar"
747            depends="jsr166xcompile"
748            description="Builds library jar from compiled sources">
749  
# Line 755 | Line 757
757    <target name="jsr166xdocs"
758            description="Builds javadocs to dist dir">
759  
760 <    <delete dir="${jsr166xjavadocs.dir}"/>
761 <    <mkdir dir="${jsr166xjavadocs.dir}"/>
760 >    <delete dir="${jsr166xdocs.dir}"/>
761 >    <mkdir dir="${jsr166xdocs.dir}"/>
762  
763 <    <javadoc destdir="${jsr166xjavadocs.dir}"
763 >    <javadoc destdir="${jsr166xdocs.dir}"
764               packagenames="jsr166x.*"
765               link="${jdkapidocs.url}"
766               sourcepath="${topsrc.dir}:${jdk6src.dir}"
# Line 791 | Line 793
793  
794  
795    <target name="jsr166xdist-jar"
796 <          depends="jsr166xclean, jsr166x-jar">
796 >          depends="jsr166xclean, jsr166xjar">
797      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
798    </target>
799  
800    <target name="jsr166xdist-docs"
801            depends="jsr166xclean, jsr166xdocs">
802 <    <mirror-dir src="${jsr166xjavadocs.dir}" dst="${dist.jsr166xjavadocs.dir}"/>
802 >    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
803    </target>
804  
805    <!-- jsr166y -->
# Line 831 | Line 833
833    </target>
834  
835  
836 <  <target name="jsr166y-jar"
836 >  <target name="jsr166yjar"
837            depends="jsr166ycompile"
838            description="Builds library jar from compiled sources">
839  
# Line 845 | Line 847
847    <target name="jsr166ydocs"
848            description="Builds javadocs to dist dir">
849  
850 <    <delete dir="${jsr166yjavadocs.dir}"/>
851 <    <mkdir dir="${jsr166yjavadocs.dir}"/>
850 >    <delete dir="${jsr166ydocs.dir}"/>
851 >    <mkdir dir="${jsr166ydocs.dir}"/>
852  
853 <    <javadoc destdir="${jsr166yjavadocs.dir}"
853 >    <javadoc destdir="${jsr166ydocs.dir}"
854               packagenames="jsr166y.*"
855               link="${jdkapidocs.url}"
856               sourcepath="${topsrc.dir}:${jdk6src.dir}"
# Line 880 | Line 882
882    </target>
883  
884    <target name="jsr166ydist-jar"
885 <          depends="jsr166yclean, jsr166y-jar">
885 >          depends="jsr166yclean, jsr166yjar">
886      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
887    </target>
888  
889    <target name="jsr166ydist-docs"
890            depends="jsr166yclean, jsr166ydocs">
891 <    <mirror-dir src="${jsr166yjavadocs.dir}" dst="${dist.jsr166yjavadocs.dir}"/>
891 >    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
892    </target>
893  
894  
# Line 894 | Line 896
896  
897  
898    <target name="extra166ycompile"
899 <          depends="configure-compiler, jsr166y-jar"
899 >          depends="configure-compiler, jsr166yjar"
900            description="Compiles extra166y sources">
901  
902      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 921 | Line 923
923    </target>
924  
925  
926 <  <target name="extra166y-jar"
926 >  <target name="extra166yjar"
927            depends="extra166ycompile"
928            description="Builds library jar from compiled sources">
929  
# Line 935 | Line 937
937    <target name="extra166ydocs"
938            description="Builds javadocs to build dir">
939  
940 <    <delete dir="${extra166yjavadocs.dir}"/>
941 <    <mkdir dir="${extra166yjavadocs.dir}"/>
940 >    <delete dir="${extra166ydocs.dir}"/>
941 >    <mkdir dir="${extra166ydocs.dir}"/>
942  
943 <    <javadoc destdir="${extra166yjavadocs.dir}"
943 >    <javadoc destdir="${extra166ydocs.dir}"
944               packagenames="extra166y.*"
945               link="${jdkapidocs.url}"
946               sourcepath="${topsrc.dir}:${jdk6src.dir}"
# Line 970 | Line 972
972    </target>
973  
974    <target name="extra166ydist-jar"
975 <          depends="extra166yclean, extra166y-jar">
975 >          depends="extra166yclean, extra166yjar">
976      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
977    </target>
978  
979    <target name="extra166ydist-docs"
980            depends="extra166yclean, extra166ydocs">
981 <    <mirror-dir src="${extra166yjavadocs.dir}" dst="${dist.extra166yjavadocs.dir}"/>
981 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
982    </target>
983  
984    <!-- jsr166e -->
# Line 1008 | Line 1010
1010    </target>
1011  
1012  
1013 <  <target name="jsr166e-jar"
1013 >  <target name="jsr166ejar"
1014            depends="jsr166ecompile"
1015            description="Builds library jar from compiled sources">
1016  
# Line 1022 | Line 1024
1024    <target name="jsr166edocs"
1025            description="Builds javadocs to build dir">
1026  
1027 <    <delete dir="${jsr166ejavadocs.dir}"/>
1028 <    <mkdir dir="${jsr166ejavadocs.dir}"/>
1027 >    <delete dir="${jsr166edocs.dir}"/>
1028 >    <mkdir dir="${jsr166edocs.dir}"/>
1029  
1030 <    <javadoc destdir="${jsr166ejavadocs.dir}"
1030 >    <javadoc destdir="${jsr166edocs.dir}"
1031               packagenames="jsr166e.*"
1032               link="${jdkapidocs.url}"
1033               sourcepath="${topsrc.dir}:${jdk7src.dir}"
# Line 1038 | Line 1040
1040  
1041  
1042    <target name="jsr166e-test-tck"
1043 <          depends="jsr166e-jar"
1043 >          depends="jsr166ejar"
1044            description="Runs tck tests for jsr166e">
1045  
1046      <run-tck-tests
# Line 1067 | Line 1069
1069    </target>
1070  
1071    <target name="jsr166edist-jar"
1072 <          depends="jsr166eclean, jsr166e-jar">
1072 >          depends="jsr166eclean, jsr166ejar">
1073      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1074    </target>
1075  
1076    <target name="jsr166edist-docs"
1077            depends="jsr166eclean, jsr166edocs">
1078 <    <mirror-dir src="${jsr166ejavadocs.dir}" dst="${dist.jsr166ejavadocs.dir}"/>
1078 >    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1079    </target>
1080  
1081   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines