cvs commit: avalon/buildsystem/gump-integration/project avalon-fortress-container.xml avalon-framework.xml

[leosimons]

leosimons    2003/06/16 08:15:09

  Modified:    buildsystem maven-common-gump-build.xml maven-common.xml
               buildsystem/gump-integration/project
                        avalon-fortress-container.xml avalon-framework.xml
  Log:
  have gump generate junitreports for us (hopefully).
  
  Revision  Changes    Path
  1.4       +21 -0     avalon/buildsystem/maven-common-gump-build.xml
  
  Index: maven-common-gump-build.xml
  ===================================================================
  RCS file: /home/cvs/avalon/buildsystem/maven-common-gump-build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- maven-common-gump-build.xml       11 Jun 2003 15:29:11 -0000      1.3
  +++ maven-common-gump-build.xml       16 Jun 2003 15:15:09 -0000      1.4
  @@ -37,6 +37,7 @@
     java classes = ${maven.build.dir}/classes
     jarfile      = ${maven.build.dir}/${project.name}-${project.version}.jar
     javadocs     = ${maven.build.dir}/docs/apidocs
  +  junitreports = ${maven.build.dir}/docs/junitreports
   =======================================================================
           </echo>
       </target>
  @@ -328,6 +329,26 @@
               </fileset>
             </batchtest>
           </junit>
  +
  +        <echo>
  +=======================================================================
  + Generating test reports
  +=======================================================================
  +        </echo>
  +
  +        <!-- note: this completely deviates from the approach maven
  +             takes to generating the junit reports and stores them
  +             in a different location. -->
  +
  +        <mkdir dir="${maven.build.dir}/docs/junitreports"/>
  +
  +        <junitreport todir="${maven.build.dir}/docs/junitreports">
  +            <fileset dir="${maven.build.dir}/test-reports">
  +                <include name="TEST-*.xml"/>
  +            </fileset>
  +            <report format="frames" todir="${maven.build.dir}/docs/junitreports"/>
  +        </junitreport>
  +
       </target>
   
       <target name="avalon:regular-jar"
  
  
  
  1.7       +3 -1      avalon/buildsystem/maven-common.xml
  
  Index: maven-common.xml
  ===================================================================
  RCS file: /home/cvs/avalon/buildsystem/maven-common.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- maven-common.xml  11 Jun 2003 20:07:22 -0000      1.6
  +++ maven-common.xml  16 Jun 2003 15:15:09 -0000      1.7
  @@ -728,7 +728,8 @@
   
       <!-- common dependencies -->
       <depend project="ant" inherit="runtime"/>
  -    <depend project="xml-xalan2"/>
  +
  +    <depend project="xml-xalan2"/><!-- support for <junitreport/> -->
       <depend project="xml-xerces"/>
   
       <!-- dump out the set of dependencies -->
  @@ -746,6 +747,7 @@
       <j:if test="${api.src.present}"><jar 
name="target/${pom.artifactId}-@@DATE@@-api.jar"/></j:if>
       <j:if test="${impl.src.present}"><jar 
name="target/${pom.artifactId}-@@DATE@@-impl.jar"/></j:if>
       <javadoc nested="${component.dir}/target/docs/apidocs"/>
  +    <junitreport nested="${component.dir}/target/docs/junitreports"/>
   
       <nag from="Gump Integration Build &lt;[EMAIL PROTECTED]&gt;"
               to="[EMAIL PROTECTED]"/>
  
  
  
  1.8       +1 -0      
avalon/buildsystem/gump-integration/project/avalon-fortress-container.xml
  
  Index: avalon-fortress-container.xml
  ===================================================================
  RCS file: 
/home/cvs/avalon/buildsystem/gump-integration/project/avalon-fortress-container.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- avalon-fortress-container.xml     15 Jun 2003 10:10:01 -0000      1.7
  +++ avalon-fortress-container.xml     16 Jun 2003 15:15:09 -0000      1.8
  @@ -50,6 +50,7 @@
       <jar name="target/avalon-fortress-container-@@DATE@@-api.jar" id="api"></jar>
       <jar name="target/avalon-fortress-container-@@DATE@@-impl.jar" id="impl"></jar>
       <javadoc nested="fortress/container/target/docs/apidocs"></javadoc>
  +    <junitreport nested="fortress/container/target/docs/junitreports"></junitreport>
   
       <nag to="[EMAIL PROTECTED]" from="Gump Integration Build &lt;[EMAIL 
PROTECTED]&gt;"></nag>
   </project>
  
  
  
  1.6       +1 -0      avalon/buildsystem/gump-integration/project/avalon-framework.xml
  
  Index: avalon-framework.xml
  ===================================================================
  RCS file: 
/home/cvs/avalon/buildsystem/gump-integration/project/avalon-framework.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- avalon-framework.xml      15 Jun 2003 10:10:01 -0000      1.5
  +++ avalon-framework.xml      16 Jun 2003 15:15:09 -0000      1.6
  @@ -24,6 +24,7 @@
       <jar name="target/avalon-framework-@@DATE@@-api.jar" id="api"/>
       <jar name="target/avalon-framework-@@DATE@@-impl.jar" id="impl"/>
       <javadoc nested="framework/target/docs/apidocs"/>
  +    <junitreport nested="framework/target/docs/junitreports"/>
   
       <nag to="[EMAIL PROTECTED]" from="Gump Integration Build &lt;[EMAIL 
PROTECTED]&gt;"/>
   </project>
  
  
  

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