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.147 by jsr166, Sat Jul 20 17:21:45 2013 UTC

# Line 293 | Line 293 | As of 2013-02, the very latest lambda 8
293        <compilerarg value="-Xprefer:source"/>
294        <compilerarg value="-XDignore.symbol.file=true"/>
295        <compilerarg value="-Xlint:all"/>
296 +      <compilerarg value="-Xdoclint:all/protected"/>
297 +      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
298        <compilerarg line="${build.args}"/>
299  
300      </javac>
# Line 329 | Line 331 | As of 2013-02, the very latest lambda 8
331        <fileset dir="${src.dir}" defaultexcludes="yes">
332          <include name="**/*.java"/>
333        </fileset>
334 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
335        <arg value="-XDignore.symbol.file=true"/>
336        <arg value="-tag"/>
337        <arg value="${javadoc.jls.option}"/>
# Line 337 | Line 340 | As of 2013-02, the very latest lambda 8
340        <arg value="-tag"/>
341        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
342        <arg value="-tag"/>
343 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
343 >      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
344      </javadoc>
345    </target>
346  
# Line 523 | Line 526 | As of 2013-02, the very latest lambda 8
526          <exclude name="LongAccumulatorTest.java"/>
527          <exclude name="LongAdderTest.java"/>
528          <exclude name="CompletableFutureTest.java"/>
529 +        <exclude name="SplittableRandomTest.java"/>
530          <exclude name="StampedLockTest.java"/>
531        </javac-elements>
532      </run-tck-tests>
# Line 899 | Line 903 | As of 2013-02, the very latest lambda 8
903  
904    <!-- jsr166e -->
905  
906 +  <property name="build.jsr166e.java.version" value="6"/>
907 +  <property name="build.jsr166e.javac" value="${javac6}"/>
908 +
909    <target name="jsr166ecompile"
910            depends="configure-compiler"
911            description="Compiles jsr166e sources">
# Line 910 | Line 917 | As of 2013-02, the very latest lambda 8
917             debug="${build.debug}"
918             debuglevel="${build.debuglevel}"
919             deprecation="${build.deprecation}"
920 <           source="7"
920 >           source="${build.jsr166e.java.version}"
921             classpath=""
922             includeAntRuntime="false"
923             includeJavaRuntime="false"
924 <           executable="${javac7}"
924 >           executable="${build.jsr166e.javac}"
925             fork="true">
926  
927        <include name="jsr166e/**/*.java"/>
# Line 947 | Line 954 | As of 2013-02, the very latest lambda 8
954               packagenames="jsr166e.*"
955               link="${jdkapidocs.url}"
956               access="${build.javadoc.access}"
957 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
958 <             source="7"
957 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
958 >             source="${build.jsr166e.java.version}"
959               executable="${javadoc7}">
960        <arg value="-XDignore.symbol.file=true"/>
961  
# Line 956 | Line 963 | As of 2013-02, the very latest lambda 8
963    </target>
964  
965  
966 <  <target name="jsr166e-test-tck"
966 >  <target name="jsr166e-test-tck-one-java-version"
967            depends="jsr166ejar"
968            description="Runs tck tests for jsr166e">
969  
970 +    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
971 +
972      <run-tck-tests
973        tck.src.dir="${test.src.dir}/tck-jsr166e"
974 <      target="7"
974 >      target="${build.jsr166e.java.version}"
975        workdir="${build.jsr166e.dir}"
976        classes="${jsr166e.jar}"/>
977    </target>
978  
979 +  <target name="jsr166e-test-tck"
980 +          description="Runs tck tests for jsr166e for multiple java versions">
981 +
982 + <!--     <antcall target="clean"/> -->
983 + <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
984 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
985 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
986 + <!--     </antcall> -->
987 +
988 +    <antcall target="clean"/>
989 +    <antcall target="jsr166e-test-tck-one-java-version">
990 +      <param name="build.jsr166e.java.version" value="7"/>
991 +      <param name="build.jsr166e.javac" value="${javac7}"/>
992 +    </antcall>
993 +
994 +    <antcall target="clean"/>
995 +    <antcall target="jsr166e-test-tck-one-java-version">
996 +      <param name="build.jsr166e.java.version" value="6"/>
997 +      <param name="build.jsr166e.javac" value="${javac6}"/>
998 +    </antcall>
999 +  </target>
1000 +
1001 +
1002 +  <target name="jsr166e-test"
1003 +          depends="jsr166e-test-tck"
1004 +          description="Runs all tests for jsr166e">
1005 +  </target>
1006  
1007    <target name="jsr166edist"
1008            depends="jsr166edist-jar, jsr166edist-docs"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines