Return-Path: 
 <commits-return-42536-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 9512 invoked from network); 22 Aug 2007 05:02:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 22 Aug 2007 05:02:55 -0000
Received: (qmail 78962 invoked by uid 500); 22 Aug 2007 05:02:52 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 78943 invoked by uid 500); 22 Aug 2007 05:02:52 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 78934 invoked by uid 99); 22 Aug 2007 05:02:52 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Aug 2007 22:02:52 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Aug 2007 05:03:29 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7F4521A981A; Tue, 21 Aug 2007 22:02:31 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r568418 -
 /harmony/enhanced/buildtest/branches/2.0/scripts/cc-exec-adaptor.xml
Date: Wed, 22 Aug 2007 05:02:31 -0000
To: commits@harmony.apache.org
From: varlax@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20070822050231.7F4521A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: varlax
Date: Tue Aug 21 22:02:30 2007
New Revision: 568418

URL: http://svn.apache.org/viewvc?rev=568418&view=rev
Log:
Keep copies of cc log and mail message in results directory, for providing complete set of artifacts.

Modified:
    harmony/enhanced/buildtest/branches/2.0/scripts/cc-exec-adaptor.xml

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/cc-exec-adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/cc-exec-adaptor.xml?rev=568418&r1=568417&r2=568418&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/cc-exec-adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/cc-exec-adaptor.xml Tue Aug 21 22:02:30 2007
@@ -133,8 +133,12 @@
             depends="define-ant-contrib"
             if="framework.parameters.usemail"
             unless="${suite.name}.parameters.run.skipped">
+        
+        <available file="${cc.execution.log.file}" property="cc.execution.log.file.available"/>
+        <runtarget target="-store-cc-logs"/>
         <!-- attach execution log file in case of failure -->
-        <if>
+        <condition property="mail.execution.log" 
+            value="${temp.files.dir}/execution_log.zip">
             <and>
                 <isfalse value="${thisbuildsuccessful}"/>
                 <not><isset 
@@ -145,32 +149,20 @@
                 </not>
                 <available file="${cc.execution.log.file}"/>
             </and>
-        <then>
-            <delete file="${temp.files.dir}/execution_log.zip" 
-                    failonerror="false"/>
-            <zip destfile="${temp.files.dir}/execution_log.zip">
-                <fileset file="${cc.execution.log.file}"/>
-            </zip>
-            <property name="mail.execution.log" 
-                 value="${temp.files.dir}/execution_log.zip"/>
-        </then>
-        </if>
+        </condition>
 
         <!-- compose message from CC logs (it there is no message file
              provided by test suite) -->
-        <if>
+        <condition property="mail.message" value="${cc.message.file}">
             <not>
             <or>
                 <isset property="${suite.name}.parameters.cc.message"/>
                 <isset property="${suite.name}.parameters.mail.message"/>
             </or>
             </not>
-        <then>
-            <runtarget target="-compose-message-file"/>
-        </then>
-        </if>
+        </condition>
 
-        <!-- do mail notifiaction -->
+        <!-- do mail notification -->
         <ant dir="${scripts.dir}" 
              antfile="${scripts.dir}/publisher.xml" 
              target="publish"
@@ -204,17 +196,32 @@
         
     </target>
 
+    <target name="-store-cc-logs" if="cc.execution.log.file.available">
+        <property name="suite.results.dir" location="${results.dir}/${suite.name}"/>
+        <mkdir dir="${suite.results.dir}"/>
+        <delete file="${temp.files.dir}/execution_log.zip" 
+                    failonerror="false"/>
+        <copy file="${cc.execution.log.file}" todir="${suite.results.dir}"/>
+        <zip destfile="${temp.files.dir}/execution_log.zip">
+            <fileset file="${cc.execution.log.file}"/>
+        </zip>
+
+        <!-- compose summary from CC logs -->
+        <runtarget target="-compose-message-file"/>
+        <copy file="${cc.message.file}" todir="${suite.results.dir}" failonerror="false"/>
+    </target>
+
     <!-- compose message from CC logs -->
     <target name="-compose-message-file"
             unless="mail.message">
         <property name="cc.xsl.files.dir"
                   value="${ext.cc.location}/webapps/cruisecontrol/xsl"/>
-        <property name="mail.message"
+        <property name="cc.message.file"
                   value="${temp.files.dir}/${suite.name}-email-message.txt"/>
         <xslt basedir="${scripts.dir}/xslt"
               in="${logdir}/${logfile}"
               style="${scripts.dir}/xslt/br.xsl"
-              out="${mail.message}"
+              out="${cc.message.file}"
               classpath="${ext.xalan.location}:${ext.cc.location}/lib/serializer-2.7.0.jar"/>
     </target>