# HG changeset patch
# User Matt Davies <mattd@symbian.org>
# Date 1248878474 -3600
# Node ID b2c612c53eebc9578ea9ed6db22dea9a2b2812ca
# Parent  2796eb7c8c4175597ab29fa37e755e6fb450fa29# Parent  1c53d9d8d78d599c3c92da64d2028713f887829c
catchup merge

diff -r 1c53d9d8d78d -r b2c612c53eeb common/build.xml
--- a/common/build.xml	Wed Jul 29 15:35:45 2009 +0100
+++ b/common/build.xml	Wed Jul 29 15:41:14 2009 +0100
@@ -875,7 +875,7 @@
           <propertyregex override="yes" property="yarpfile"  input="@{logfile}" regexp=".*[\\|\/](.*)_compile\.log" replace="\1_yarp.csv"/>
           <propertyregex override="yes" property="yarpfile_short"  input="${yarpfile}" regexp="[^_]*_[^_]*_[^_]*_(.+)_[^_]*_yarp\.csv" replace="YARP_\1"/>
           <echo message="Yarping @{logfile}..."/>
-          <exec executable="perl" dir="${build.drive}" failonerror="false" output="${build.log.dir}/analysis/${build.id}_yarp.log" append="true">
+          <exec executable="perl" dir="${build.drive}" failonerror="false" output="${build.log.dir}/analysis/${yarpfile}.log" append="true">
             <arg value="${sf.common.config.dir}/tools/analysis/yarp.pl"/>
             <arg value="@{logfile}"/>
             <arg value="${build.log.dir}/analysis/${yarpfile}"/>
diff -r 1c53d9d8d78d -r b2c612c53eeb common/tools/analysis/yarp.pl
--- a/common/tools/analysis/yarp.pl	Wed Jul 29 15:35:45 2009 +0100
+++ b/common/tools/analysis/yarp.pl	Wed Jul 29 15:41:14 2009 +0100
@@ -71,11 +71,23 @@
     my $failures = 0;
     while( my $line = <FILE>)
     {
+      if(defined $recipe)
+      {
+        if(defined $recipe->{'content'})
+        {
+          my $ref = $recipe->{'content'}; 
+          push(@$ref, $line);
+        }
+      }
       ++$counter;
       if($line =~ m/^<recipe\s+(\S.+)>/)
       {
         $recipe = XMLin($line."</recipe>");
         $recipe->{'line'} = $counter;
+        my @content;
+        push(@content, $line);
+        $recipe->{'content'} = \@content;
+        
 #        print Dumper($recipe);
       }
       elsif($line =~ m/<\/recipe>/)
@@ -160,7 +172,12 @@
     }
     print OUT ",";
   }
-  print OUT "\n";            
+  print OUT "\n";
+  my $content = $recipe->{'content'};
+  for my $line (@$content)
+  {
+    print $line;
+  }              
   #print Dumper($recipe);
 
 }