/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.140 by jsr166, Mon May 20 19:12:23 2013 UTC revision 1.146 by jsr166, Thu Jul 18 18:27:55 2013 UTC
# Line 293  As of 2013-02, the very latest lambda 8 Line 293  As of 2013-02, the very latest lambda 8
293        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
294        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
295        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
296          <compilerarg value="-Xdoclint:all/protected"/>
297          <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
298        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
299    
300      </javac>      </javac>
# Line 309  As of 2013-02, the very latest lambda 8 Line 311  As of 2013-02, the very latest lambda 8
311    </target>    </target>
312    
313    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
314    <target name="docs"    <target name="docs"
315            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
316    
# Line 334  As of 2013-02, the very latest lambda 8 Line 331  As of 2013-02, the very latest lambda 8
331        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
332          <include name="**/*.java"/>          <include name="**/*.java"/>
333        </fileset>        </fileset>
334          <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
335        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
336        <arg value="-tag"/>        <arg value="-tag"/>
337        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
338          <arg value="-tag"/>
339          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
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;"/>
344      </javadoc>      </javadoc>
345    </target>    </target>
346    
# Line 380  As of 2013-02, the very latest lambda 8 Line 384  As of 2013-02, the very latest lambda 8
384    </target>    </target>
385    
386    
   <!-- Internal targets -->  
   
   
387    <target name="dist-jar"    <target name="dist-jar"
388            depends="clean, jar">            depends="clean, jar">
389      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 394  As of 2013-02, the very latest lambda 8 Line 395  As of 2013-02, the very latest lambda 8
395    </target>    </target>
396    
397    
   <target name="compile-tests"  
           depends="jar">  
   
     <mkdir dir="${build.testcases.dir}"/>  
   
     <javac srcdir="${tck.src.dir}"  
            destdir="${build.testcases.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath="${junit.jar}"  
            bootclasspath="@{product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac8}"  
            fork="true">  
   
       <include name="**/*.java"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
       <compilerarg line="${build.args}"/>  
   
     </javac>  
   
     <javac srcdir="${test.src.dir}"  
            destdir="${build.testcases.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath=""  
            bootclasspath="@{product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac8}"  
            fork="true">  
   
       <include name="jsr166/test/**/*.java"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
       <compilerarg line="${build.args}"/>  
   
     </javac>  
   
 <!--  
     <javac srcdir="${jtreg.src.dir}"  
           destdir="${build.testcases.dir}"  
             debug="${build.debug}"  
        debuglevel="${build.debuglevel}"  
       deprecation="${build.deprecation}"  
            source="${build.sourcelevel}"  
              fork="true">  
   
       <compilerarg value="-Xbootclasspath/p:${product.jar}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg line="${build.args}"/>  
   
     </javac>  
 -->  
   
   </target>  
   
398    <target name="test-tck"    <target name="test-tck"
399            depends="jar"            depends="jar"
400            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
# Line 476  As of 2013-02, the very latest lambda 8 Line 414  As of 2013-02, the very latest lambda 8
414         classes="${product.jar}"/>         classes="${product.jar}"/>
415    </target>    </target>
416    
417    <target name="test-ng"    <target name="test"
418            depends="test-tck, test-jtreg"            depends="test-tck, test-jtreg"
419            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
420    </target>    </target>
421    
   <target name="run-tests"  
           depends="compile-tests">  
   
     <!-- May be overridden by user.properties -->  
     <property name="testcase" value="*"/>  
   
     <mkdir dir="${build.reports.dir}"/>  
   
     <junit printsummary="true"  
              showoutput="true"  
           errorProperty="junit.failed"  
         failureProperty="junit.failed"  
                     dir="${build.reports.dir}"  
                     jvm="${java8}"  
                    fork="true">  
   
       <jvmarg value="-Xbootclasspath/p:${product.jar}"/>  
       <jvmarg value="-server"/>  
       <jvmarg value="-showversion"/>  
   
       <classpath refid="test.classpath"/>  
   
       <formatter type="xml"/>  
   
       <batchtest todir="${build.reports.dir}" unless="no.test.tck">  
         <fileset dir="${tck.src.dir}">  
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
   
       <batchtest todir="${build.reports.dir}" if="do.test.old">  
         <fileset dir="${test.src.dir}">  
           <include name="jsr166/test/**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
   
 <!--  
       <batchtest todir="${build.reports.dir}" if="do.test.jtreg">  
         <fileset dir="${jtreg.src.dir}">  
           <include name="**/${testcase}Test.java"/>  
         </fileset>  
       </batchtest>  
 -->  
   
     </junit>  
   
   </target>  
   
   
   <target name="report-tests"  
           depends="run-tests">  
   
     <!-- Sets junit.report.format to frames if redirection is present,  
          otherwise sets it to noframes. -->  
     <available property="junit.report.format"  
                   value="frames"  
               classname="org.apache.xalan.lib.Redirect"  
     />  
     <property name="junit.report.format" value="noframes"/>  
   
     <junitreport todir="${build.reports.dir}">  
       <fileset dir="${build.reports.dir}">  
         <include name="TEST-*.xml"/>  
       </fileset>  
       <report format="${junit.report.format}" todir="${build.reports.dir}"  
       />  
     </junitreport>  
   
     <fail message="Test Cases Failed" if="junit.failed"/>  
   
   </target>  
422    
423    
424    <target name="configure-compiler">    <target name="configure-compiler">
# Line 571  As of 2013-02, the very latest lambda 8 Line 438  As of 2013-02, the very latest lambda 8
438    </target>    </target>
439    
440    
   <target name="configure-tests"  
        depends="configure-compiler">  
   
     <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->  
     <available property="junit.available"  
                classname="junit.framework.Protectable"/>  
   
     <!-- Xalan -->  
     <available property="xalan.available"  
                classname="org.apache.xalan.Version"/>  
   
   
     <!-- Ant 1.6beta and later don't need or want this check -->  
     <!--  
     <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"  
           unless="junit.available"/>  
   
     <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"  
           unless="xalan.available"/>  
     -->  
   
   </target>  
   
441    
442    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
443    
# Line 682  As of 2013-02, the very latest lambda 8 Line 526  As of 2013-02, the very latest lambda 8
526          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
527          <exclude name="LongAdderTest.java"/>          <exclude name="LongAdderTest.java"/>
528          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
529            <exclude name="SplittableRandomTest.java"/>
530          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
531        </javac-elements>        </javac-elements>
532      </run-tck-tests>      </run-tck-tests>
# Line 722  As of 2013-02, the very latest lambda 8 Line 567  As of 2013-02, the very latest lambda 8
567      <run-jtreg-tests      <run-jtreg-tests
568         target="7"         target="7"
569         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
570         classes="${4jdk7product.jar}"/>         classes="${4jdk7product.jar}"
571           jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
572    </target>    </target>
573    
574    
# Line 1057  As of 2013-02, the very latest lambda 8 Line 903  As of 2013-02, the very latest lambda 8
903    
904    <!-- jsr166e -->    <!-- jsr166e -->
905    
906      <property name="build.jsr166e.java.version" value="6"/>
907      <property name="build.jsr166e.javac" value="${javac6}"/>
908    
909    <target name="jsr166ecompile"    <target name="jsr166ecompile"
910            depends="configure-compiler"            depends="configure-compiler"
911            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 1068  As of 2013-02, the very latest lambda 8 Line 917  As of 2013-02, the very latest lambda 8
917             debug="${build.debug}"             debug="${build.debug}"
918             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
919             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
920             source="7"             source="${build.jsr166e.java.version}"
921             classpath=""             classpath=""
922             includeAntRuntime="false"             includeAntRuntime="false"
923             includeJavaRuntime="false"             includeJavaRuntime="false"
924             executable="${javac7}"             executable="${build.jsr166e.javac}"
925             fork="true">             fork="true">
926    
927        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
# Line 1105  As of 2013-02, the very latest lambda 8 Line 954  As of 2013-02, the very latest lambda 8
954               packagenames="jsr166e.*"               packagenames="jsr166e.*"
955               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
956               access="${build.javadoc.access}"               access="${build.javadoc.access}"
957               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
958               source="7"               source="${build.jsr166e.java.version}"
959               executable="${javadoc7}">               executable="${javadoc7}">
960        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
961    
# Line 1114  As of 2013-02, the very latest lambda 8 Line 963  As of 2013-02, the very latest lambda 8
963    </target>    </target>
964    
965    
966    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck-one-java-version"
967            depends="jsr166ejar"            depends="jsr166ejar"
968            description="Runs tck tests for jsr166e">            description="Runs tck tests for jsr166e">
969    
970        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
971    
972      <run-tck-tests      <run-tck-tests
973        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
974        target="7"        target="${build.jsr166e.java.version}"
975        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
976        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
977    </target>    </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="jsr166edist"    <target name="jsr166edist"
1003            depends="jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"

Legend:
Removed from v.1.140  
changed lines
  Added in v.1.146

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27