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.143 by dl, Wed Jul 10 17:09:45 2013 UTC vs.
Revision 1.150 by jsr166, Mon Jul 22 17:50:12 2013 UTC

# Line 26 | Line 26 | As of 2013-02, the very latest lambda 8
26   ------------------------------------------------------------------------------
27    </description>
28  
29 <  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
29 >  <!-- Display main targets by running 'ant -projecthelp' -->
30 >  <target name="usage">
31      <java classname="org.apache.tools.ant.Main">
32        <arg value="-projecthelp" />
33      </java>
# Line 293 | Line 294 | As of 2013-02, the very latest lambda 8
294        <compilerarg value="-Xprefer:source"/>
295        <compilerarg value="-XDignore.symbol.file=true"/>
296        <compilerarg value="-Xlint:all"/>
297 +      <compilerarg value="-Xdoclint:all/protected"/>
298 +      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
299        <compilerarg line="${build.args}"/>
300  
301      </javac>
# Line 329 | Line 332 | As of 2013-02, the very latest lambda 8
332        <fileset dir="${src.dir}" defaultexcludes="yes">
333          <include name="**/*.java"/>
334        </fileset>
335 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
336        <arg value="-XDignore.symbol.file=true"/>
337        <arg value="-tag"/>
338        <arg value="${javadoc.jls.option}"/>
# Line 337 | Line 341 | As of 2013-02, the very latest lambda 8
341        <arg value="-tag"/>
342        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
343        <arg value="-tag"/>
344 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
344 >      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
345      </javadoc>
346    </target>
347  
# Line 376 | Line 380 | As of 2013-02, the very latest lambda 8
380    <target name="dist-clean"
381            description="Removes all build and distribution products">
382  
383 +    <delete dir="${build.dir}"/>
384      <delete dir="${dist.dir}"/>
385  
386    </target>
# Line 495 | Line 500 | As of 2013-02, the very latest lambda 8
500      </javac>
501    </target>
502  
503 +  <target name="4jdk7doclint"
504 +          depends="configure-compiler"
505 +          description="Finds doclint warnings">
506 +
507 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
508 +
509 +    <javac srcdir="${4jdk7src.dir}"
510 +           destdir="${build.4jdk7.classes.dir}"
511 +           debug="${build.debug}"
512 +           debuglevel="${build.debuglevel}"
513 +           deprecation="${build.deprecation}"
514 +           source="6"
515 +           classpath=""
516 +           bootclasspath="${bootclasspath7}"
517 +           includeAntRuntime="false"
518 +           includeJavaRuntime="false"
519 +           executable="${javac8}"
520 +           fork="true">
521 +
522 +      <include name="**/*.java"/>
523 +      <compilerarg value="-Xprefer:source"/>
524 +      <compilerarg value="-XDignore.symbol.file=true"/>
525 +      <compilerarg value="-Xlint:all"/>
526 +      <compilerarg value="-Xdoclint:all/protected"/>
527 +      <compilerarg line="${build.args}"/>
528 +
529 +    </javac>
530 +  </target>
531 +
532  
533    <target name="4jdk7jar"
534            depends="4jdk7compile"
# Line 523 | Line 557 | As of 2013-02, the very latest lambda 8
557          <exclude name="LongAccumulatorTest.java"/>
558          <exclude name="LongAdderTest.java"/>
559          <exclude name="CompletableFutureTest.java"/>
560 +        <exclude name="SplittableRandomTest.java"/>
561          <exclude name="StampedLockTest.java"/>
562        </javac-elements>
563      </run-tck-tests>
# Line 609 | Line 644 | As of 2013-02, the very latest lambda 8
644    </target>
645  
646  
612 –  <target name="4jdk7dist-clean"
613 –          description="Removes all build and distribution products">
614 –
615 –  </target>
616 –
647    <target name="4jdk7dist-jar"
648            depends="4jdk7clean, 4jdk7jar">
649      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
# Line 700 | Line 730 | As of 2013-02, the very latest lambda 8
730    </target>
731  
732  
703 –  <target name="jsr166xdist-clean"
704 –          description="Removes all build and distribution products">
705 –
706 –  </target>
707 –
708 –
733    <target name="jsr166xdist-jar"
734            depends="jsr166xclean, jsr166xjar">
735      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
# Line 791 | Line 815 | As of 2013-02, the very latest lambda 8
815    </target>
816  
817  
794 –  <target name="jsr166ydist-clean"
795 –          description="Removes all build and distribution products">
796 –
797 –  </target>
798 –
818    <target name="jsr166ydist-jar"
819            depends="jsr166yclean, jsr166yjar">
820      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
# Line 882 | Line 901 | As of 2013-02, the very latest lambda 8
901    </target>
902  
903  
885 –  <target name="extra166ydist-clean"
886 –          description="Removes all build and distribution products">
887 –
888 –  </target>
889 –
904    <target name="extra166ydist-jar"
905            depends="extra166yclean, extra166yjar">
906      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
# Line 899 | Line 913 | As of 2013-02, the very latest lambda 8
913  
914    <!-- jsr166e -->
915  
916 +  <property name="build.jsr166e.java.version" value="6"/>
917 +  <property name="build.jsr166e.javac" value="${javac6}"/>
918 +
919    <target name="jsr166ecompile"
920            depends="configure-compiler"
921            description="Compiles jsr166e sources">
# Line 910 | Line 927 | As of 2013-02, the very latest lambda 8
927             debug="${build.debug}"
928             debuglevel="${build.debuglevel}"
929             deprecation="${build.deprecation}"
930 <           source="7"
930 >           source="${build.jsr166e.java.version}"
931             classpath=""
932             includeAntRuntime="false"
933             includeJavaRuntime="false"
934 <           executable="${javac7}"
934 >           executable="${build.jsr166e.javac}"
935             fork="true">
936  
937        <include name="jsr166e/**/*.java"/>
# Line 925 | Line 942 | As of 2013-02, the very latest lambda 8
942      </javac>
943    </target>
944  
945 +  <!-- jsr166e: find doclint errors -->
946 +  <target name="jsr166edoclint">
947 +
948 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
949 +
950 +    <javac srcdir="${topsrc.dir}"
951 +           destdir="${build.jsr166e.classes.dir}"
952 +           debug="${build.debug}"
953 +           debuglevel="${build.debuglevel}"
954 +           deprecation="${build.deprecation}"
955 +           source="${build.jsr166e.java.version}"
956 +           classpath=""
957 +           bootclasspath="${bootclasspath7}"
958 +           includeAntRuntime="false"
959 +           includeJavaRuntime="false"
960 +           executable="${javac8}"
961 +           fork="true">
962 +
963 +      <include name="jsr166e/**/*.java"/>
964 +      <compilerarg value="-XDignore.symbol.file=true"/>
965 +      <compilerarg value="-Xlint:all"/>
966 +      <compilerarg value="-Xdoclint:all/protected"/>
967 +
968 +    </javac>
969 +  </target>
970 +
971  
972    <target name="jsr166ejar"
973            depends="jsr166ecompile"
# Line 947 | Line 990 | As of 2013-02, the very latest lambda 8
990               packagenames="jsr166e.*"
991               link="${jdkapidocs.url}"
992               access="${build.javadoc.access}"
993 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
994 <             source="7"
993 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
994 >             source="${build.jsr166e.java.version}"
995               executable="${javadoc7}">
996        <arg value="-XDignore.symbol.file=true"/>
997  
# Line 956 | Line 999 | As of 2013-02, the very latest lambda 8
999    </target>
1000  
1001  
1002 <  <target name="jsr166e-test-tck"
1003 <          depends="jsr166ejar"
1004 <          description="Runs tck tests for jsr166e">
1002 >  <target name="jsr166e-test-tck-one-java-version"
1003 >          depends="jsr166ejar">
1004 >
1005 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1006  
1007      <run-tck-tests
1008        tck.src.dir="${test.src.dir}/tck-jsr166e"
1009 <      target="7"
1009 >      target="${build.jsr166e.java.version}"
1010        workdir="${build.jsr166e.dir}"
1011        classes="${jsr166e.jar}"/>
1012    </target>
1013  
1014 +  <target name="jsr166e-test-tck"
1015 +          description="Runs tck tests for jsr166e for multiple java versions">
1016 +
1017 + <!--     <antcall target="clean"/> -->
1018 + <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1019 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1020 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1021 + <!--     </antcall> -->
1022 +
1023 +    <antcall target="clean"/>
1024 +    <antcall target="jsr166e-test-tck-one-java-version">
1025 +      <param name="build.jsr166e.java.version" value="7"/>
1026 +      <param name="build.jsr166e.javac" value="${javac7}"/>
1027 +    </antcall>
1028 +
1029 +    <antcall target="clean"/>
1030 +    <antcall target="jsr166e-test-tck-one-java-version">
1031 +      <param name="build.jsr166e.java.version" value="6"/>
1032 +      <param name="build.jsr166e.javac" value="${javac6}"/>
1033 +    </antcall>
1034 +  </target>
1035 +
1036 +
1037 +  <target name="jsr166e-test"
1038 +          depends="jsr166e-test-tck"
1039 +          description="Runs all tests for jsr166e">
1040 +  </target>
1041  
1042    <target name="jsr166edist"
1043            depends="jsr166edist-jar, jsr166edist-docs"
# Line 979 | Line 1050 | As of 2013-02, the very latest lambda 8
1050    </target>
1051  
1052  
982 –  <target name="jsr166edist-clean"
983 –          description="Removes all build and distribution products">
984 –
985 –  </target>
986 –
1053    <target name="jsr166edist-jar"
1054            depends="jsr166eclean, jsr166ejar">
1055      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines