--- a/common/tools/analysis/parsewhatlog.pl	Mon Jun 15 14:34:28 2009 +0100
+++ b/common/tools/analysis/parsewhatlog.pl	Mon Jun 15 14:44:46 2009 +0100
@@ -48,7 +48,8 @@
 sub main()
 {
   my $path = shift @ARGV;
-  my @files = glob($path."/*whatlog*WHAT_*compile.log"); 
+#  my @files = glob($path."/*whatlog*WHAT_*compile.log");
+  my @files = glob($path."/*whatlog*_*compile.log"); 
   foreach my $filename (@files)
   {
 #    print $filename."\n";
@@ -70,7 +71,7 @@
   while(my $line = <FILE>)
   {
     ++$linecount;
-    if($line =~ m/^<whatlog bldinf='(\S+)' mmp='(\S*)' config='\S*'>/) #brittle
+    if($line =~ m/^<whatlog bldinf='(\S+)' mmp='(\S*)' config='\S+'>/) #brittle
     {
       $bldinf = $1;
       $makefile = $2;

--- a/sf-platform/build.xml	Mon Jun 15 14:34:28 2009 +0100
+++ b/sf-platform/build.xml	Mon Jun 15 14:44:46 2009 +0100
@@ -199,6 +199,7 @@
 		</antcall>
 
 		<!-- OS what -->
+		<!--
         <antcall target="compile-main" inheritAll="false" inheritRefs="true">
                 <param name="build.system" value="${sf.spec.build.system}" />
                 <param name="compile.sysdef.dtd.stub" value="${sf.spec.os.sysdef.dtd}" />
@@ -208,6 +209,7 @@
                 <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
                 <reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
         </antcall>
+		-->
 		
 		<!-- OS clean main build -->
 		<if><istrue value="${sf.spec.baseline.clean}"/>
@@ -344,6 +346,7 @@
 		</antcall>
 		
 			<!-- s60 what  -->
+			<!--
     		<antcall target="compile-main" inheritAll="false" inheritRefs="true">
           			<param name="build.system" value="${sf.spec.build.system}" />
           			<param name="sysdef.configurations.list" value="${sf.spec.s60.sysdef.clean.configurations.list}" />
@@ -352,7 +355,7 @@
           			<reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
           			<reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files" />
     		</antcall>
-			
+			-->
 			<!-- s60 clean main build -->
 			<if><istrue value="${sf.spec.baseline.clean}"/>
 				<then>