vmassol     2004/07/16 04:12:46

  Modified:    clover   plugin.jelly
               clover/xdocs changes.xml
  Log:
  The <code>clover:report</code> goal does not call the tests anymore. It only 
generates Clover reports.
  
  Revision  Changes    Path
  1.29      +16 -27    maven-plugins/clover/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/clover/plugin.jelly,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- plugin.jelly      16 Jul 2004 10:59:37 -0000      1.28
  +++ plugin.jelly      16 Jul 2004 11:12:46 -0000      1.29
  @@ -90,7 +90,7 @@
     -->
     <goal name="clover"
           description="Generate test coverage reports with Clover"
  -        prereqs="clover:report"/>
  +        prereqs="clover:test,clover:report"/>
    
     <!--
        ========================================================================
  @@ -207,37 +207,26 @@
          be generated.
        ========================================================================
     -->
  -  <goal name="clover:report">
  +  <goal name="clover:report" prereqs="clover:on">
   
  +    <!-- Skip reports if no coverage database has been created. -->
  +    <u:file var="cloverDatabaseAsFile" name="${cloverDatabase}"/>
       <j:choose>
  -      <j:when test="${unitTestSourcesPresent == 'true'}">
  +      <j:when test="${cloverDatabaseAsFile.exists()}">       
   
  -        <attainGoal name="clover:test"/>
  -        
  -        <!-- Skip reports if no coverage database has been created. -->
  -        <u:file var="cloverDatabaseAsFile" name="${cloverDatabase}"/>
  -        <j:choose>
  -          <j:when test="${cloverDatabaseAsFile.exists()}">       
  -
  -            <j:if test="${context.getVariable('maven.clover.report.xml') == 
'true'}">
  -              <attainGoal name="clover:xml-report-internal"/>
  -            </j:if>
  -            <j:if test="${context.getVariable('maven.clover.report.html') == 
'true'}">
  -              <attainGoal name="clover:html-report-internal"/>
  -            </j:if>
  -            <j:if test="${context.getVariable('maven.clover.report.swing') == 
'true'}">
  -              <attainGoal name="clover:swing-report-internal"/>
  -            </j:if>
  +        <j:if test="${context.getVariable('maven.clover.report.xml') == 'true'}">
  +          <attainGoal name="clover:xml-report-internal"/>
  +        </j:if>
  +        <j:if test="${context.getVariable('maven.clover.report.html') == 'true'}">
  +          <attainGoal name="clover:html-report-internal"/>
  +        </j:if>
  +        <j:if test="${context.getVariable('maven.clover.report.swing') == 'true'}">
  +          <attainGoal name="clover:swing-report-internal"/>
  +        </j:if>
           
  -          </j:when>
  -          <j:otherwise>
  -            <ant:echo>No Clover database found, skipping report 
generation</ant:echo>
  -          </j:otherwise>
  -        </j:choose>
  -
         </j:when>
         <j:otherwise>
  -        <ant:echo>No tests to run Clover on</ant:echo>
  +        <ant:echo>No Clover database found, skipping report generation</ant:echo>
         </j:otherwise>
       </j:choose>
   
  @@ -333,7 +322,7 @@
        ========================================================================
     -->
     <goal name="maven-clover-plugin:report">
  -    <attainGoal name="clover:report"/>
  +    <attainGoal name="clover"/>
     </goal>
   
   </project>
  
  
  
  1.34      +4 -0      maven-plugins/clover/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/clover/xdocs/changes.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- changes.xml       16 Jul 2004 10:59:37 -0000      1.33
  +++ changes.xml       16 Jul 2004 11:12:46 -0000      1.34
  @@ -26,6 +26,10 @@
     </properties>
     <body>
       <release version="1.6-SNAPSHOT" date="in CVS">
  +      <action dev="vmassol" type="update">
  +        The <code>clover:report</code> goal does not call the tests anymore. 
  +        It only generates Clover reports.
  +      </action>
         <action dev="vmassol" type="fix">
           When executing <code>clover:on</code> and <code>clover:off</code>, modify 
           the <code>maven.build.dest</code> property value in the Root context of
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to