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.127 by jsr166, Wed Jan 23 06:57:08 2013 UTC vs.
Revision 1.132 by jsr166, Fri Feb 1 21:58:27 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 171 | Line 175
175      <attribute name="workdir"/>
176      <attribute name="classes"/>
177      <attribute name="jvmflags" default=""/>
178 +    <element name="javac-elements" optional="true"/>
179      <sequential>
180  
181      <mkdir dir="@{workdir}/tck-classes"/>
# Line 192 | Line 197
197        <compilerarg value="-XDignore.symbol.file=true"/>
198        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
199        <compilerarg line="${build.args}"/>
200 +      <javac-elements/>
201  
202      </javac>
203  
# Line 279 | Line 285
285               packagenames="none"
286               link="${jdkapi8docs.url}"
287               overview="${src.dir}/intro.html"
288 +             access="${build.javadoc.access}"
289               sourcepath="${src.dir}:${jdk8src.dir}"
290               classpath=""
291               executable="${javadoc8}">
# Line 408 | Line 415
415  
416    </target>
417  
418 +  <target name="test-tck"
419 +          depends="jar"
420 +          description="Runs tck tests for main directly">
421 +
422 +    <run-tck-tests
423 +      target="8"
424 +      workdir="${build.dir}"
425 +      classes="${product.jar}"/>
426 +  </target>
427  
428    <target name="run-tests"
429            depends="compile-tests">
# Line 582 | Line 598
598    </target>
599  
600  
601 <  <target name="4jdk7-jar"
601 >  <target name="4jdk7jar"
602            depends="4jdk7compile"
603            description="Builds library jar from compiled sources">
604  
# Line 594 | Line 610
610  
611  
612    <target name="4jdk7-test-tck"
613 <          depends="4jdk7-jar"
613 >          depends="4jdk7jar"
614            description="Runs tck tests for jsr166-4jdk7 directly">
615  
616      <run-tck-tests
617        target="7"
618        workdir="${build.4jdk7.dir}"
619 <      classes="${4jdk7product.jar}"/>
619 >      classes="${4jdk7product.jar}">
620 >      <javac-elements>
621 >        <exclude name="StampedLockTest.java"/>
622 >      </javac-elements>
623 >    </run-tck-tests>
624    </target>
625  
626  
# Line 670 | Line 690
690               packagenames="none"
691               link="${jdkapi7docs.url}"
692               overview="${4jdk7src.dir}/intro.html"
693 +             access="${build.javadoc.access}"
694               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
695               classpath=""
696               executable="${javadoc7}">
# Line 700 | Line 721
721    </target>
722  
723    <target name="4jdk7dist-jar"
724 <          depends="4jdk7clean, 4jdk7-jar">
724 >          depends="4jdk7clean, 4jdk7jar">
725      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
726    </target>
727  
# Line 741 | Line 762
762    </target>
763  
764  
765 <  <target name="jsr166x-jar"
765 >  <target name="jsr166xjar"
766            depends="jsr166xcompile"
767            description="Builds library jar from compiled sources">
768  
# Line 761 | Line 782
782      <javadoc destdir="${jsr166xdocs.dir}"
783               packagenames="jsr166x.*"
784               link="${jdkapidocs.url}"
785 +             access="${build.javadoc.access}"
786               sourcepath="${topsrc.dir}:${jdk6src.dir}"
787               bootclasspath="${bootclasspath6}"
788               source="5"
# Line 791 | Line 813
813  
814  
815    <target name="jsr166xdist-jar"
816 <          depends="jsr166xclean, jsr166x-jar">
816 >          depends="jsr166xclean, jsr166xjar">
817      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
818    </target>
819  
# Line 831 | Line 853
853    </target>
854  
855  
856 <  <target name="jsr166y-jar"
856 >  <target name="jsr166yjar"
857            depends="jsr166ycompile"
858            description="Builds library jar from compiled sources">
859  
# Line 851 | Line 873
873      <javadoc destdir="${jsr166ydocs.dir}"
874               packagenames="jsr166y.*"
875               link="${jdkapidocs.url}"
876 +             access="${build.javadoc.access}"
877               sourcepath="${topsrc.dir}:${jdk6src.dir}"
878               bootclasspath="${bootclasspath6}"
879               source="6"
# Line 880 | Line 903
903    </target>
904  
905    <target name="jsr166ydist-jar"
906 <          depends="jsr166yclean, jsr166y-jar">
906 >          depends="jsr166yclean, jsr166yjar">
907      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
908    </target>
909  
# Line 894 | Line 917
917  
918  
919    <target name="extra166ycompile"
920 <          depends="configure-compiler, jsr166y-jar"
920 >          depends="configure-compiler, jsr166yjar"
921            description="Compiles extra166y sources">
922  
923      <mkdir dir="${build.extra166y.classes.dir}"/>
# Line 921 | Line 944
944    </target>
945  
946  
947 <  <target name="extra166y-jar"
947 >  <target name="extra166yjar"
948            depends="extra166ycompile"
949            description="Builds library jar from compiled sources">
950  
# Line 941 | Line 964
964      <javadoc destdir="${extra166ydocs.dir}"
965               packagenames="extra166y.*"
966               link="${jdkapidocs.url}"
967 +             access="${build.javadoc.access}"
968               sourcepath="${topsrc.dir}:${jdk6src.dir}"
969               bootclasspath="${bootclasspath6}"
970               source="6"
# Line 970 | Line 994
994    </target>
995  
996    <target name="extra166ydist-jar"
997 <          depends="extra166yclean, extra166y-jar">
997 >          depends="extra166yclean, extra166yjar">
998      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
999    </target>
1000  
# Line 1008 | Line 1032
1032    </target>
1033  
1034  
1035 <  <target name="jsr166e-jar"
1035 >  <target name="jsr166ejar"
1036            depends="jsr166ecompile"
1037            description="Builds library jar from compiled sources">
1038  
# Line 1028 | Line 1052
1052      <javadoc destdir="${jsr166edocs.dir}"
1053               packagenames="jsr166e.*"
1054               link="${jdkapidocs.url}"
1055 +             access="${build.javadoc.access}"
1056               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1057               source="7"
1058               executable="${javadoc7}">
# Line 1038 | Line 1063
1063  
1064  
1065    <target name="jsr166e-test-tck"
1066 <          depends="jsr166e-jar"
1066 >          depends="jsr166ejar"
1067            description="Runs tck tests for jsr166e">
1068  
1069      <run-tck-tests
# Line 1067 | Line 1092
1092    </target>
1093  
1094    <target name="jsr166edist-jar"
1095 <          depends="jsr166eclean, jsr166e-jar">
1095 >          depends="jsr166eclean, jsr166ejar">
1096      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1097    </target>
1098  
# Line 1076 | Line 1101
1101      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1102    </target>
1103  
1104 +
1105 + <!-- Find buglets that can be detected by static build tools -->
1106 +
1107 +  <target name="lint">
1108 +    <antcall target="dists">
1109 +      <param name="build.javadoc.access" value="private"/>
1110 +    </antcall>
1111 +  </target>
1112 +
1113 +
1114   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines