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.131 by jsr166, Fri Feb 1 18:31:17 2013 UTC

# Line 22 | Line 22
22    $HOME/jdk/src/jdk8
23    where each of the above is a complete JDK source tree
24    (e.g. mercurial forest) or a symlink to same.
25 + As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26   ------------------------------------------------------------------------------
27    </description>
28  
29 <  <target name="usage" description="Advises user to run with -projecthelp">
30 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
29 >  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
30 >    <java classname="org.apache.tools.ant.Main">
31 >      <arg value="-projecthelp" />
32 >    </java>
33    </target>
34  
35  
# Line 39 | Line 42
42    <property name="build.debug"          value="true"/>
43    <property name="build.debuglevel"     value="source,lines,vars"/>
44    <property name="build.deprecation"    value="false"/>
45 +  <property name="build.javadoc.access" value="protected"/>
46  
47    <!-- Build locations -->
48    <property name="build.dir"                   location="build"/>
# Line 118 | Line 122
122    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
123  
124    <!-- Javadoc locations -->
125 <  <property name="javadocs.dir"          location="${build.dir}/javadocs"/>
126 <  <property name="4jdk7javadocs.dir"     location="${build.4jdk7.dir}/javadocs"/>
127 <  <property name="jsr166xjavadocs.dir"   location="${build.jsr166x.dir}/javadocs"/>
128 <  <property name="jsr166yjavadocs.dir"   location="${build.jsr166y.dir}/javadocs"/>
129 <  <property name="jsr166ejavadocs.dir"   location="${build.jsr166e.dir}/javadocs"/>
130 <  <property name="extra166yjavadocs.dir" location="${build.extra166y.dir}/javadocs"/>
131 <
132 <  <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
133 <  <property name="dist.4jdk7javadocs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
134 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
135 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
136 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
137 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
125 >  <property name="docs.dir"          location="${build.dir}/docs"/>
126 >  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
127 >  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
128 >  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
129 >  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
130 >  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
131 >
132 >  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
133 >  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
134 >  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
135 >  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
136 >  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
137 >  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
138  
139    <!-- Jar locations -->
140    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
# Line 269 | Line 273
273    <target name="docs"
274            description="Builds javadocs for src/main to dist dir">
275  
276 <    <delete dir="${javadocs.dir}"/>
277 <    <mkdir dir="${javadocs.dir}"/>
276 >    <delete dir="${docs.dir}"/>
277 >    <mkdir dir="${docs.dir}"/>
278  
279      <!-- the packagenames="none" hack below prevents scanning the -->
280      <!-- sourcepath for packages -->
281  
282 <    <javadoc destdir="${javadocs.dir}"
282 >    <javadoc destdir="${docs.dir}"
283               packagenames="none"
284               link="${jdkapi8docs.url}"
285               overview="${src.dir}/intro.html"
286 +             access="${build.javadoc.access}"
287               sourcepath="${src.dir}:${jdk8src.dir}"
288               classpath=""
289               executable="${javadoc8}">
# Line 341 | Line 346
346  
347    <target name="dist-docs"
348            depends="clean, docs">
349 <    <mirror-dir src="${javadocs.dir}" dst="${dist.javadocs.dir}"/>
349 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
350    </target>
351  
352  
# Line 408 | Line 413
413  
414    </target>
415  
416 +  <target name="test-tck"
417 +          depends="jar"
418 +          description="Runs tck tests for main directly">
419 +
420 +    <run-tck-tests
421 +      target="8"
422 +      workdir="${build.dir}"
423 +      classes="${product.jar}"/>
424 +  </target>
425  
426    <target name="run-tests"
427            depends="compile-tests">
# Line 582 | Line 596
596    </target>
597  
598  
599 <  <target name="4jdk7-jar"
599 >  <target name="4jdk7jar"
600            depends="4jdk7compile"
601            description="Builds library jar from compiled sources">
602  
# Line 594 | Line 608
608  
609  
610    <target name="4jdk7-test-tck"
611 <          depends="4jdk7-jar"
611 >          depends="4jdk7jar"
612            description="Runs tck tests for jsr166-4jdk7 directly">
613  
614      <run-tck-tests
# Line 663 | Line 677
677    <target name="4jdk7docs"
678            description="Builds javadocs for src/jdk7 to dist dir">
679  
680 <    <delete dir="${4jdk7javadocs.dir}"/>
681 <    <mkdir dir="${4jdk7javadocs.dir}"/>
680 >    <delete dir="${4jdk7docs.dir}"/>
681 >    <mkdir dir="${4jdk7docs.dir}"/>
682  
683 <    <javadoc destdir="${4jdk7javadocs.dir}"
683 >    <javadoc destdir="${4jdk7docs.dir}"
684               packagenames="none"
685               link="${jdkapi7docs.url}"
686               overview="${4jdk7src.dir}/intro.html"
687 +             access="${build.javadoc.access}"
688               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
689               classpath=""
690               executable="${javadoc7}">
# Line 700 | Line 715
715    </target>
716  
717    <target name="4jdk7dist-jar"
718 <          depends="4jdk7clean, 4jdk7-jar">
718 >          depends="4jdk7clean, 4jdk7jar">
719      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
720    </target>
721  
722  
723    <target name="4jdk7dist-docs"
724            depends="4jdk7clean, 4jdk7docs">
725 <    <mirror-dir src="${4jdk7javadocs.dir}" dst="${dist.4jdk7javadocs.dir}"/>
725 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
726    </target>
727  
728  
# Line 741 | Line 756
756    </target>
757  
758  
759 <  <target name="jsr166x-jar"
759 >  <target name="jsr166xjar"
760            depends="jsr166xcompile"
761            description="Builds library jar from compiled sources">
762  
# Line 755 | Line 770
770    <target name="jsr166xdocs"
771            description="Builds javadocs to dist dir">
772  
773 <    <delete dir="${jsr166xjavadocs.dir}"/>
774 <    <mkdir dir="${jsr166xjavadocs.dir}"/>
773 >    <delete dir="${jsr166xdocs.dir}"/>
774 >    <mkdir dir="${jsr166xdocs.dir}"/>
775  
776 <    <javadoc destdir="${jsr166xjavadocs.dir}"
776 >    <javadoc destdir="${jsr166xdocs.dir}"
777               packagenames="jsr166x.*"
778               link="${jdkapidocs.url}"
779 +             access="${build.javadoc.access}"
780               sourcepath="${topsrc.dir}:${jdk6src.dir}"
781               bootclasspath="${bootclasspath6}"
782               source="5"
# Line 791 | Line 807
807  
808  
809    <target name="jsr166xdist-jar"
810 <          depends="jsr166xclean, jsr166x-jar">
810 >          depends="jsr166xclean, jsr166xjar">
811      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
812    </target>
813  
814    <target name="jsr166xdist-docs"
815            depends="jsr166xclean, jsr166xdocs">
816 <    <mirror-dir src="${jsr166xjavadocs.dir}" dst="${dist.jsr166xjavadocs.dir}"/>
816 >    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
817    </target>
818  
819    <!-- jsr166y -->
# Line 831 | Line 847
847    </target>
848  
849  
850 <  <target name="jsr166y-jar"
850 >  <target name="jsr166yjar"
851            depends="jsr166ycompile"
852            description="Builds library jar from compiled sources">
853  
# Line 845 | Line 861
861    <target name="jsr166ydocs"
862            description="Builds javadocs to dist dir">
863  
864 <    <delete dir="${jsr166yjavadocs.dir}"/>
865 <    <mkdir dir="${jsr166yjavadocs.dir}"/>
864 >    <delete dir="${jsr166ydocs.dir}"/>
865 >    <mkdir dir="${jsr166ydocs.dir}"/>
866  
867 <    <javadoc destdir="${jsr166yjavadocs.dir}"
867 >    <javadoc destdir="${jsr166ydocs.dir}"
868               packagenames="jsr166y.*"
869               link="${jdkapidocs.url}"
870 +             access="${build.javadoc.access}"
871               sourcepath="${topsrc.dir}:${jdk6src.dir}"
872               bootclasspath="${bootclasspath6}"
873               source="6"
# Line 880 | Line 897
897    </target>
898  
899    <target name="jsr166ydist-jar"
900 <          depends="jsr166yclean, jsr166y-jar">
900 >          depends="jsr166yclean, jsr166yjar">
901      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
902    </target>
903  
904    <target name="jsr166ydist-docs"
905            depends="jsr166yclean, jsr166ydocs">
906 <    <mirror-dir src="${jsr166yjavadocs.dir}" dst="${dist.jsr166yjavadocs.dir}"/>
906 >    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
907    </target>
908  
909  
# Line 894 | Line 911
911  
912  
913    <target name="extra166ycompile"
914 <          depends="configure-compiler, jsr166y-jar"
914 >          depends="configure-compiler, jsr166yjar"
915            description="Compiles extra166y sources">
916  
917      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 921 | Line 938
938    </target>
939  
940  
941 <  <target name="extra166y-jar"
941 >  <target name="extra166yjar"
942            depends="extra166ycompile"
943            description="Builds library jar from compiled sources">
944  
# Line 935 | Line 952
952    <target name="extra166ydocs"
953            description="Builds javadocs to build dir">
954  
955 <    <delete dir="${extra166yjavadocs.dir}"/>
956 <    <mkdir dir="${extra166yjavadocs.dir}"/>
955 >    <delete dir="${extra166ydocs.dir}"/>
956 >    <mkdir dir="${extra166ydocs.dir}"/>
957  
958 <    <javadoc destdir="${extra166yjavadocs.dir}"
958 >    <javadoc destdir="${extra166ydocs.dir}"
959               packagenames="extra166y.*"
960               link="${jdkapidocs.url}"
961 +             access="${build.javadoc.access}"
962               sourcepath="${topsrc.dir}:${jdk6src.dir}"
963               bootclasspath="${bootclasspath6}"
964               source="6"
# Line 970 | Line 988
988    </target>
989  
990    <target name="extra166ydist-jar"
991 <          depends="extra166yclean, extra166y-jar">
991 >          depends="extra166yclean, extra166yjar">
992      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
993    </target>
994  
995    <target name="extra166ydist-docs"
996            depends="extra166yclean, extra166ydocs">
997 <    <mirror-dir src="${extra166yjavadocs.dir}" dst="${dist.extra166yjavadocs.dir}"/>
997 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
998    </target>
999  
1000    <!-- jsr166e -->
# Line 1008 | Line 1026
1026    </target>
1027  
1028  
1029 <  <target name="jsr166e-jar"
1029 >  <target name="jsr166ejar"
1030            depends="jsr166ecompile"
1031            description="Builds library jar from compiled sources">
1032  
# Line 1022 | Line 1040
1040    <target name="jsr166edocs"
1041            description="Builds javadocs to build dir">
1042  
1043 <    <delete dir="${jsr166ejavadocs.dir}"/>
1044 <    <mkdir dir="${jsr166ejavadocs.dir}"/>
1043 >    <delete dir="${jsr166edocs.dir}"/>
1044 >    <mkdir dir="${jsr166edocs.dir}"/>
1045  
1046 <    <javadoc destdir="${jsr166ejavadocs.dir}"
1046 >    <javadoc destdir="${jsr166edocs.dir}"
1047               packagenames="jsr166e.*"
1048               link="${jdkapidocs.url}"
1049 +             access="${build.javadoc.access}"
1050               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1051               source="7"
1052               executable="${javadoc7}">
# Line 1038 | Line 1057
1057  
1058  
1059    <target name="jsr166e-test-tck"
1060 <          depends="jsr166e-jar"
1060 >          depends="jsr166ejar"
1061            description="Runs tck tests for jsr166e">
1062  
1063      <run-tck-tests
# Line 1067 | Line 1086
1086    </target>
1087  
1088    <target name="jsr166edist-jar"
1089 <          depends="jsr166eclean, jsr166e-jar">
1089 >          depends="jsr166eclean, jsr166ejar">
1090      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1091    </target>
1092  
1093    <target name="jsr166edist-docs"
1094            depends="jsr166eclean, jsr166edocs">
1095 <    <mirror-dir src="${jsr166ejavadocs.dir}" dst="${dist.jsr166ejavadocs.dir}"/>
1095 >    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1096    </target>
1097  
1098 +
1099 + <!-- Find buglets that can be detected by static build tools -->
1100 +
1101 +  <target name="lint">
1102 +    <antcall target="dists">
1103 +      <param name="build.javadoc.access" value="private"/>
1104 +    </antcall>
1105 +  </target>
1106 +
1107 +
1108   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines