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.144 by jsr166, Sun Jul 14 19:55:04 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 899 | Line 899 | As of 2013-02, the very latest lambda 8
899  
900    <!-- jsr166e -->
901  
902 +  <property name="build.jsr166e.java.version" value="6"/>
903 +  <property name="build.jsr166e.javac" value="${javac6}"/>
904 +
905    <target name="jsr166ecompile"
906            depends="configure-compiler"
907            description="Compiles jsr166e sources">
# Line 910 | Line 913 | As of 2013-02, the very latest lambda 8
913             debug="${build.debug}"
914             debuglevel="${build.debuglevel}"
915             deprecation="${build.deprecation}"
916 <           source="7"
916 >           source="${build.jsr166e.java.version}"
917             classpath=""
918             includeAntRuntime="false"
919             includeJavaRuntime="false"
920 <           executable="${javac7}"
920 >           executable="${build.jsr166e.javac}"
921             fork="true">
922  
923        <include name="jsr166e/**/*.java"/>
# Line 947 | Line 950 | As of 2013-02, the very latest lambda 8
950               packagenames="jsr166e.*"
951               link="${jdkapidocs.url}"
952               access="${build.javadoc.access}"
953 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
954 <             source="7"
953 >             sourcepath="${topsrc.dir}:${jdk6src.dir}"
954 >             source="${build.jsr166e.java.version}"
955               executable="${javadoc7}">
956        <arg value="-XDignore.symbol.file=true"/>
957  
# Line 956 | Line 959 | As of 2013-02, the very latest lambda 8
959    </target>
960  
961  
962 <  <target name="jsr166e-test-tck"
962 >  <target name="jsr166e-test-tck-one-java-version"
963            depends="jsr166ejar"
964            description="Runs tck tests for jsr166e">
965  
966 +    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
967 +
968      <run-tck-tests
969        tck.src.dir="${test.src.dir}/tck-jsr166e"
970 <      target="7"
970 >      target="${build.jsr166e.java.version}"
971        workdir="${build.jsr166e.dir}"
972        classes="${jsr166e.jar}"/>
973    </target>
974  
975 +  <target name="jsr166e-test-tck"
976 +          description="Runs tck tests for jsr166e for multiple java versions">
977 +
978 + <!--     <antcall target="clean"/> -->
979 + <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
980 + <!--       <param name="build.jsr166e.java.version" value="8"/> -->
981 + <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
982 + <!--     </antcall> -->
983 +
984 +    <antcall target="clean"/>
985 +    <antcall target="jsr166e-test-tck-one-java-version">
986 +      <param name="build.jsr166e.java.version" value="7"/>
987 +      <param name="build.jsr166e.javac" value="${javac7}"/>
988 +    </antcall>
989 +
990 +    <antcall target="clean"/>
991 +    <antcall target="jsr166e-test-tck-one-java-version">
992 +      <param name="build.jsr166e.java.version" value="6"/>
993 +      <param name="build.jsr166e.javac" value="${javac6}"/>
994 +    </antcall>
995 +  </target>
996 +
997  
998    <target name="jsr166edist"
999            depends="jsr166edist-jar, jsr166edist-docs"

Diff Legend

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