# HG changeset patch
# User Louis Henry Nayegon <louisn@symbian.org>
# Date 1243581047 -3600
# Node ID 9765c33f29a53d96092f9566db3e0149ab0aead3
# Parent  483f966c6335d48d5408eb525ff8e9ddec7c78af# Parent  47cccedacd2d05656a93362c9e8dea126e216b64
merge - catch up

diff -r 483f966c6335 -r 9765c33f29a5 common/build.xml
--- a/common/build.xml	Fri May 29 08:07:21 2009 +0100
+++ b/common/build.xml	Fri May 29 08:10:47 2009 +0100
@@ -170,10 +170,7 @@
     
     <target name="sf-postbuild">
         <echo>[SF-POSTBUILD]</echo>
-        
-        <!-- run build analysis tools -->
-        <runtarget target="sf-run-analysis"/>
-        
+                
         <!-- TAG SOURCE CODE -->
         <if>
             <istrue value="${sf.spec.tagafterbuild.enable}" />
@@ -197,6 +194,9 @@
             </then>
         </if>
 
+        <!-- run build analysis tools -->
+        <runtarget target="sf-run-analysis"/>
+
         <runtarget target="sf-zip-logs"/>
 
         <!-- PUBLISH LOGS/REPORTS -->
diff -r 483f966c6335 -r 9765c33f29a5 common/tools/zip_includefiles.pl
--- a/common/tools/zip_includefiles.pl	Fri May 29 08:07:21 2009 +0100
+++ b/common/tools/zip_includefiles.pl	Fri May 29 08:10:47 2009 +0100
@@ -8,6 +8,6 @@
     my $includefilename=$_;
 	if (m/(.*)(_includefile.txt)/) {
 		my $zipfilename = $1.".zip";
-		system("7z a -tzip -i@".$includefilename . " " .$zipfilename);
+		system("7za a -tzip -i@".$includefilename . " " .$zipfilename);
 	}
 }
\ No newline at end of file