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

Diff of /jsr166/build.xml

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

revision 1.137 by jsr166, Wed Feb 6 19:55:06 2013 UTC revision 1.144 by jsr166, Sun Jul 14 19:55:04 2013 UTC
# Line 44  As of 2013-02, the very latest lambda 8 Line 44  As of 2013-02, the very latest lambda 8
44    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
45    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
46    
47      <!-- Tck options; see JSR166TestCase.java -->
48      <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49      <property name="jsr166.profileTests"     value="false"/>
50      <property name="jsr166.profileThreshold" value="100"/>
51      <property name="jsr166.runsPerTest"      value="1"/>
52      <!-- Allow running an individual tck test class -->
53      <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
54      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
55    
56    <!-- Build locations -->    <!-- Build locations -->
57    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
58    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
# Line 170  As of 2013-02, the very latest lambda 8 Line 179  As of 2013-02, the very latest lambda 8
179    
180    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
181      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
182      <attribute name="target"/>      <attribute name="target"/>
183        <attribute name="compile-target" default="@{target}"/>
184      <attribute name="workdir"/>      <attribute name="workdir"/>
185      <attribute name="classes"/>      <attribute name="classes"/>
186      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default=""/>
# Line 185  As of 2013-02, the very latest lambda 8 Line 194  As of 2013-02, the very latest lambda 8
194             debug="${build.debug}"             debug="${build.debug}"
195             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
196             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
197             source="@{source}"             source="@{compile-target}"
198               target="@{compile-target}"
199             classpath="${junit.jar}"             classpath="${junit.jar}"
200             bootclasspath="@{classes}:${bootclasspath@{source}}"             bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
201             includeAntRuntime="false"             includeAntRuntime="false"
202             includeJavaRuntime="false"             includeJavaRuntime="false"
203             executable="${javac@{target}}"             executable="${javac@{compile-target}}"
204             fork="true">             fork="true">
205    
206        <include name="*.java"/>        <include name="*.java"/>
# Line 201  As of 2013-02, the very latest lambda 8 Line 211  As of 2013-02, the very latest lambda 8
211    
212      </javac>      </javac>
213    
214      <java classname="JSR166TestCase"      <java classname="${jsr166.tckTestClass}"
215            failonerror="true"            failonerror="true"
216            jvm="${java@{target}}"            jvm="${java@{target}}"
217            fork="true">            fork="true">
218          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
219          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
220            <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
221            <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
222            <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
223          <classpath>          <classpath>
224            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
225            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 296  As of 2013-02, the very latest lambda 8 Line 309  As of 2013-02, the very latest lambda 8
309    </target>    </target>
310    
311    
   <target name="test"  
           depends="configure-tests, report-tests"  
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />  
   
   
312    <target name="docs"    <target name="docs"
313            description="Builds javadocs for src/main to dist dir">            description="Builds javadocs for src/main to dist dir">
314    
# Line 324  As of 2013-02, the very latest lambda 8 Line 332  As of 2013-02, the very latest lambda 8
332        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
333        <arg value="-tag"/>        <arg value="-tag"/>
334        <arg value="${javadoc.jls.option}"/>        <arg value="${javadoc.jls.option}"/>
335          <arg value="-tag"/>
336          <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
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;"/>
341      </javadoc>      </javadoc>
342    </target>    </target>
343    
# Line 367  As of 2013-02, the very latest lambda 8 Line 381  As of 2013-02, the very latest lambda 8
381    </target>    </target>
382    
383    
   <!-- Internal targets -->  
   
   
384    <target name="dist-jar"    <target name="dist-jar"
385            depends="clean, jar">            depends="clean, jar">
386      <copy file="${product.jar}" todir="${dist.dir}"/>      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 381  As of 2013-02, the very latest lambda 8 Line 392  As of 2013-02, the very latest lambda 8
392    </target>    </target>
393    
394    
   <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>  
   
395    <target name="test-tck"    <target name="test-tck"
396            depends="jar"            depends="jar"
397            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
# Line 463  As of 2013-02, the very latest lambda 8 Line 411  As of 2013-02, the very latest lambda 8
411         classes="${product.jar}"/>         classes="${product.jar}"/>
412    </target>    </target>
413    
414    <target name="test-ng"    <target name="test"
415            depends="test-tck, test-jtreg"            depends="test-tck, test-jtreg"
416            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
417    </target>    </target>
418    
   <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>  
419    
420    
421    <target name="configure-compiler">    <target name="configure-compiler">
# Line 558  As of 2013-02, the very latest lambda 8 Line 435  As of 2013-02, the very latest lambda 8
435    </target>    </target>
436    
437    
   <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>  
   
438    
439    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
440    
# Line 664  As of 2013-02, the very latest lambda 8 Line 518  As of 2013-02, the very latest lambda 8
518        <javac-elements>        <javac-elements>
519          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
520          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
521            <exclude name="DoubleAccumulatorTest.java"/>
522            <exclude name="DoubleAdderTest.java"/>
523            <exclude name="LongAccumulatorTest.java"/>
524            <exclude name="LongAdderTest.java"/>
525          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
526          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
527        </javac-elements>        </javac-elements>
# Line 693  As of 2013-02, the very latest lambda 8 Line 551  As of 2013-02, the very latest lambda 8
551    
552        <formatter type="brief"/>        <formatter type="brief"/>
553    
554        <test name="JSR166TestCase" haltonfailure="no">        <test name="${jsr166.tckTestClass}" haltonfailure="no">
555        </test>        </test>
556    
557      </junit>      </junit>
# Line 705  As of 2013-02, the very latest lambda 8 Line 563  As of 2013-02, the very latest lambda 8
563      <run-jtreg-tests      <run-jtreg-tests
564         target="7"         target="7"
565         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
566         classes="${4jdk7product.jar}"/>         classes="${4jdk7product.jar}"
567           jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
568    </target>    </target>
569    
570    
# Line 1040  As of 2013-02, the very latest lambda 8 Line 899  As of 2013-02, the very latest lambda 8
899    
900    <!-- jsr166e -->    <!-- jsr166e -->
901    
902      <property name="build.jsr166e.java.version" value="6"/>
903      <property name="build.jsr166e.javac" value="${javac6}"/>
904    
905    <target name="jsr166ecompile"    <target name="jsr166ecompile"
906            depends="configure-compiler"            depends="configure-compiler"
907            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
# Line 1051  As of 2013-02, the very latest lambda 8 Line 913  As of 2013-02, the very latest lambda 8
913             debug="${build.debug}"             debug="${build.debug}"
914             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
915             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
916             source="7"             source="${build.jsr166e.java.version}"
917             classpath=""             classpath=""
918             includeAntRuntime="false"             includeAntRuntime="false"
919             includeJavaRuntime="false"             includeJavaRuntime="false"
920             executable="${javac7}"             executable="${build.jsr166e.javac}"
921             fork="true">             fork="true">
922    
923        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
# Line 1088  As of 2013-02, the very latest lambda 8 Line 950  As of 2013-02, the very latest lambda 8
950               packagenames="jsr166e.*"               packagenames="jsr166e.*"
951               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
952               access="${build.javadoc.access}"               access="${build.javadoc.access}"
953               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
954               source="7"               source="${build.jsr166e.java.version}"
955               executable="${javadoc7}">               executable="${javadoc7}">
956        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
957    
# Line 1097  As of 2013-02, the very latest lambda 8 Line 959  As of 2013-02, the very latest lambda 8
959    </target>    </target>
960    
961    
962    <target name="jsr166e-test-tck"    <target name="jsr166e-test-tck-one-java-version"
963            depends="jsr166ejar"            depends="jsr166ejar"
964            description="Runs tck tests for jsr166e">            description="Runs tck tests for jsr166e">
965    
966        <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
967    
968      <run-tck-tests      <run-tck-tests
969        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
970        source="7"        target="${build.jsr166e.java.version}"
       target="8"  
971        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
972        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
973    </target>    </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"    <target name="jsr166edist"
999            depends="jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-jar, jsr166edist-docs"

Legend:
Removed from v.1.137  
changed lines
  Added in v.1.144

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