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.145 by jsr166, Sun Jul 14 22:39:31 2013 UTC

# Line 337 | Line 337 | As of 2013-02, the very latest lambda 8
337        <arg value="-tag"/>
338        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
339        <arg value="-tag"/>
340 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
340 >      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
341      </javadoc>
342    </target>
343  
# Line 523 | Line 523 | As of 2013-02, the very latest lambda 8
523          <exclude name="LongAccumulatorTest.java"/>
524          <exclude name="LongAdderTest.java"/>
525          <exclude name="CompletableFutureTest.java"/>
526 +        <exclude name="SplittableRandomTest.java"/>
527          <exclude name="StampedLockTest.java"/>
528        </javac-elements>
529      </run-tck-tests>
# Line 899 | Line 900 | As of 2013-02, the very latest lambda 8
900  
901    <!-- jsr166e -->
902  
903 +  <property name="build.jsr166e.java.version" value="6"/>
904 +  <property name="build.jsr166e.javac" value="${javac6}"/>
905 +
906    <target name="jsr166ecompile"
907            depends="configure-compiler"
908            description="Compiles jsr166e sources">
# Line 910 | Line 914 | As of 2013-02, the very latest lambda 8
914             debug="${build.debug}"
915             debuglevel="${build.debuglevel}"
916             deprecation="${build.deprecation}"
917 <           source="7"
917 >           source="${build.jsr166e.java.version}"
918             classpath=""
919             includeAntRuntime="false"
920             includeJavaRuntime="false"
921 <           executable="${javac7}"
921 >           executable="${build.jsr166e.javac}"
922             fork="true">
923  
924        <include name="jsr166e/**/*.java"/>
# Line 947 | Line 951 | As of 2013-02, the very latest lambda 8
951               packagenames="jsr166e.*"
952               link="${jdkapidocs.url}"
953               access="${build.javadoc.access}"
954 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
955 <             source="7"
954 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
955 >             source="${build.jsr166e.java.version}"
956               executable="${javadoc7}">
957        <arg value="-XDignore.symbol.file=true"/>
958  
# Line 956 | Line 960 | As of 2013-02, the very latest lambda 8
960    </target>
961  
962  
963 <  <target name="jsr166e-test-tck"
963 >  <target name="jsr166e-test-tck-one-java-version"
964            depends="jsr166ejar"
965            description="Runs tck tests for jsr166e">
966  
967 +    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
968 +
969      <run-tck-tests
970        tck.src.dir="${test.src.dir}/tck-jsr166e"
971 <      target="7"
971 >      target="${build.jsr166e.java.version}"
972        workdir="${build.jsr166e.dir}"
973        classes="${jsr166e.jar}"/>
974    </target>
975  
976 +  <target name="jsr166e-test-tck"
977 +          description="Runs tck tests for jsr166e for multiple java versions">
978 +
979 + <!--     <antcall target="clean"/> -->
980 + <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
981 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
982 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
983 + <!--     </antcall> -->
984 +
985 +    <antcall target="clean"/>
986 +    <antcall target="jsr166e-test-tck-one-java-version">
987 +      <param name="build.jsr166e.java.version" value="7"/>
988 +      <param name="build.jsr166e.javac" value="${javac7}"/>
989 +    </antcall>
990 +
991 +    <antcall target="clean"/>
992 +    <antcall target="jsr166e-test-tck-one-java-version">
993 +      <param name="build.jsr166e.java.version" value="6"/>
994 +      <param name="build.jsr166e.javac" value="${javac6}"/>
995 +    </antcall>
996 +  </target>
997 +
998  
999    <target name="jsr166edist"
1000            depends="jsr166edist-jar, jsr166edist-docs"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines