# HG changeset patch
# User Mattd <mattd@symbian.org>
# Date 1258737830 0
# Node ID 24d6f993e110fcfc84968be4b168dfcfb3704a6a
# Parent  cf98fb6a1da9442af2cdb302e598b89af79362ad# Parent  9791b89d932a6219758571956926cb559d40ee9c
Catchup merge

diff -r cf98fb6a1da9 -r 24d6f993e110 .hgtags
--- a/.hgtags	Fri Nov 20 17:23:06 2009 +0000
+++ b/.hgtags	Fri Nov 20 17:23:50 2009 +0000
@@ -6,3 +6,4 @@
 7a343c038e7d120d886ec1068c2c10b3c1165acd PDK_2.0.0
 cdfb88270be0d5720e775c6570f9676d002e327e PDK_3.0.b
 12815724a05335ac5bedb529d40107faf73ba950 PDK_3.0.c
+e13acd883fbe11620a838de22ed6421e8b8ada56 PDK_2.0.1
diff -r cf98fb6a1da9 -r 24d6f993e110 common/build.postbuild.xml
--- a/common/build.postbuild.xml	Fri Nov 20 17:23:06 2009 +0000
+++ b/common/build.postbuild.xml	Fri Nov 20 17:23:50 2009 +0000
@@ -508,10 +508,8 @@
       <!-- Send the data to the server -->
 	  <exec executable="python">
 		    <arg value="${sf.common.config.dir}/tools/brag/send_xml_to_diamonds.py"/>
-		    <arg value="-s"/>
-		    <arg value="${diamonds.host}"/>
 		    <arg value="-u"/>
-		    <arg value="${diamonds.build.id}"/>
+		    <arg value="http://${diamonds.host}${diamonds.build.id}"/>
 		    <arg value="-f"/>
 		    <arg value="${build.log.dir}/linksForDiamonds.xml"/>
 	  </exec>
@@ -556,10 +554,8 @@
                         <!-- Send the data to the server -->
                         <exec executable="python">
                             <arg value="${sf.common.config.dir}/tools/brag/send_xml_to_diamonds.py"/>
-                            <arg value="-s"/>
-                            <arg value="${diamonds.host}"/>
                             <arg value="-u"/>
-                            <arg value="${diamonds.build.id}"/>
+                            <arg value="http://${diamonds.host}${diamonds.build.id}"/>
                             <arg value="-f"/>
                             <arg value="${temp.build.dir}/bragForDiamonds.xml"/>
                         </exec>
@@ -627,6 +623,7 @@
                 <mkdir dir="${build.output.dir}/zips/release"/> <!-- workaround for when there's no other releaseables, just the logs -->
                 <zip destfile="${build.output.dir}/zips/release/build_logs.zip" basedir="${build.drive}"> 
                     <include name="output/logs/**"/>
+					<exclude name="output/logs/BC/**"/>
                     <exclude name="output/logs/BOM/**"/>
                     <exclude name="output/logs/deliverables/**"/>
                     <exclude name="output/logs/releaseables/**"/>
@@ -649,6 +646,18 @@
         <copy todir="${publish.dir}" preservelastmodified="true" failonerror="false">
            <fileset dir="${build.output.dir}/zips/release/"><include name="build_*.zip"/></fileset>
         </copy>
+        <mkdir dir="${publish.dir}/html"/>
+        <copy todir="${publish.dir}/html" preservelastmodified="true" failonerror="false">
+           <fileset dir="${build.log.dir}/html"><include name="*.html"/></fileset>
+        </copy>
+		<mkdir dir="${publish.dir}/BC"/>
+        <copy todir="${publish.dir}/BC" preservelastmodified="true" failonerror="false">
+           <fileset dir="${build.log.dir}/BC/">
+		       <include name="BBCResults.xsl"/>
+			   <include name="headers_report.xml"/>
+			   <include name="libraries_report.xml"/>
+		   </fileset>
+        </copy>
     </target>
 
     <!-- TODO: Make this work for package builds once we have sysmodel story worked out -->
diff -r cf98fb6a1da9 -r 24d6f993e110 common/common_props.ant.xml
--- a/common/common_props.ant.xml	Fri Nov 20 17:23:06 2009 +0000
+++ b/common/common_props.ant.xml	Fri Nov 20 17:23:50 2009 +0000
@@ -99,14 +99,14 @@
     <property name="sf.spec.test.package.droppath"  value="TestDrops"/>
 
     <!-- BC check properties -->
-    <property name="sf.spec.bccheck.enable" value="false"/> <!-- This disables it being called during a normal build, although the target can be called seperately -->
+    <property name="sf.spec.bccheck.enable" value="true"/> <!-- This disables it being called during a normal build, although the target can be called seperately -->
     <property name="sf.spec.bccheck.enable.la" value="true"/>
     <property name="sf.spec.bccheck.enable.ha" value="true"/>
     <property name="sf.spec.bccheck.enable.dynamic" value="false"/>
     <property name="sf.spec.bccheck.baseline.name" value="symbian1"/>
-    <property name="sf.spec.bccheck.baseline.skd.dir" value="\\v800008\builds01\releases\installed\s60_5th_sdk_installed"/>
+    <property name="sf.spec.bccheck.baseline.skd.dir" value="\\v800008\builds01\installed\s60_5th_sdk_installed"/>
     <property name="sf.spec.bccheck.baseline.s60.version" value="5.0"/>
-    <property name="sf.spec.bccheck.current.s60.version" value="SF2"/>
+    <property name="sf.spec.bccheck.current.s60.version" value="5.1"/>
     <property name="sf.spec.bccheck.reportid" value="report"/>
     <property name="sf.spec.bccheck.package.name" value="${env.COMPUTERNAME}-bctest-${sf.spec.job.name}_${sf.spec.job.codeline}.${sf.spec.job.number}.zip"/>
 </project>
diff -r cf98fb6a1da9 -r 24d6f993e110 common/diamonds/linksForDiamonds.xml.ftl
--- a/common/diamonds/linksForDiamonds.xml.ftl	Fri Nov 20 17:23:06 2009 +0000
+++ b/common/diamonds/linksForDiamonds.xml.ftl	Fri Nov 20 17:23:50 2009 +0000
@@ -9,6 +9,11 @@
     </file>
     <file>
       <type>log</type>
+      <name>Raptor Build Summary</name>
+      <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\html\index.html</url>
+    </file>
+    <file>
+      <type>log</type>
       <name>Build BOM</name>
       <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\build_BOM.zip</url>
     </file>
@@ -17,5 +22,19 @@
       <name>Build Logs</name>
       <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\build_logs.zip</url>
     </file>
+	<#if "${ant['sf.spec.bccheck.enable']}" = "true" && "${ant['sf.spec.bccheck.enable.ha']}" = "true">
+	  <file>
+        <type>log</type>
+        <name>Binary Compatibility Report (Headerfiles)</name>
+		<url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\BC\headers_report.xml</url>	  
+	  </file>
+	</#if>
+	<#if "${ant['sf.spec.bccheck.enable']}" = "true" && "${ant['sf.spec.bccheck.enable.la']}" = "true">
+	  <file>
+        <type>log</type>
+        <name>Binary Compatibility Report (Libraries)</name>
+		<url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\BC\libraries_report.xml</url>	  
+	  </file>
+	</#if>	
    </files>
 </diamonds-build>
\ No newline at end of file
diff -r cf98fb6a1da9 -r 24d6f993e110 common/templates/zip.cfg.xml.ftl.template
--- a/common/templates/zip.cfg.xml.ftl.template	Fri Nov 20 17:23:06 2009 +0000
+++ b/common/templates/zip.cfg.xml.ftl.template	Fri Nov 20 17:23:50 2009 +0000
@@ -44,56 +44,7 @@
 			<set name="archives.dir" value="${build.output.dir}/zips/release" />
 			<set name="grace.filters" value="src" />
 			<set name="grace.extract" value="double" />
-			<!-- Zips of zips for SFL code -->
-			<config name="sfl-adaptation">
-				<set name="name" value="src_sfl_adaptation"/>
-				<set name="include" value="src_sfl_adaptation_*.zip"/>
-			</config>
-			<config name="sfl-app">
-				<set name="name" value="src_sfl_app"/>
-				<set name="include" value="src_sfl_app_*.zip"/>
-			</config>
-			<config name="sfl-mw">
-				<set name="name" value="src_sfl_mw"/>
-				<set name="include" value="src_sfl_mw_*.zip"/>
-			</config>
-			<config name="sfl-os">
-				<set name="name" value="src_sfl_os"/>
-				<set name="include" value="src_sfl_os_*.zip"/>
-			</config>
-			<config name="sfl-ostools">
-				<set name="name" value="src_sfl_ostools"/>
-				<set name="include" value="src_sfl_ostools_*.zip"/>
-			</config>
-			<config name="sfl-tools">
-				<set name="name" value="src_sfl_tools"/>
-				<set name="include" value="src_sfl_tools_*.zip"/>
-			</config>
-			<!-- Zips of zips for OSS code -->
-			<config name="oss-adaptation">
-				<set name="name" value="src_oss_adaptation"/>
-				<set name="include" value="src_oss_adaptation_*.zip"/>
-			</config>
-			<config name="oss-app">
-				<set name="name" value="src_oss_app"/>
-				<set name="include" value="src_oss_app_*.zip"/>
-			</config>
-			<config name="oss-mw">
-				<set name="name" value="src_oss_mw"/>
-				<set name="include" value="src_oss_mw_*.zip"/>
-			</config>
-			<config name="oss-os">
-				<set name="name" value="src_oss_os"/>
-				<set name="include" value="src_oss_os_*.zip"/>
-			</config>
-			<config name="oss-ostools">
-				<set name="name" value="src_oss_ostools"/>
-				<set name="include" value="src_oss_ostools_*.zip"/>
-			</config>
-			<config name="oss-tools">
-				<set name="name" value="src_oss_tools"/>
-				<set name="include" value="src_oss_tools_*.zip"/>
-			</config>
+			<!-- Zips of zips for SFL code and for OSS code will be inserted here -->
 		</config>
 		<!-- Specify this config to package all rnd inputs to the build that should be released -->
 		<config name="rnd" abstract="true">
diff -r cf98fb6a1da9 -r 24d6f993e110 common/tools/ats/smoketest/apploader/testdata/smoketest_apploader.ini
--- a/common/tools/ats/smoketest/apploader/testdata/smoketest_apploader.ini	Fri Nov 20 17:23:06 2009 +0000
+++ b/common/tools/ats/smoketest/apploader/testdata/smoketest_apploader.ini	Fri Nov 20 17:23:50 2009 +0000
@@ -32,10 +32,12 @@
 delay2	=5000
 key3	=EKeyDevice0
 delay3	=5000
-key4	=EKeyDevice1
+key4	=EKeyDevice0
 delay4	=5000
 key5	=EKeyDevice1
 delay5	=5000
+key6	=EKeyDevice1
+delay6	=5000
 
 [SMOKE_APP_LAUNCH_0009]
 program	=eshell.exe
diff -r cf98fb6a1da9 -r 24d6f993e110 common/tools/ats/smoketest/notepad/conf/smoketest_notepad.cfg
--- a/common/tools/ats/smoketest/notepad/conf/smoketest_notepad.cfg	Fri Nov 20 17:23:06 2009 +0000
+++ b/common/tools/ats/smoketest/notepad/conf/smoketest_notepad.cfg	Fri Nov 20 17:23:50 2009 +0000
@@ -1,3 +1,8 @@
+[Test]
+title Send key events to close UI setup dialogs
+run testscripter c:\smoketest\ui_TestNpdApi.cfg 1
+[Endtest]
+
 [Test]
 title Fetch Template & Cancel (-ve)
 run testscripter c:\smoketest\ui_TestNpdApi.cfg 4
diff -r cf98fb6a1da9 -r 24d6f993e110 common/tools/ats/smoketest/notepad/conf/ui_TestNpdApi.cfg
--- a/common/tools/ats/smoketest/notepad/conf/ui_TestNpdApi.cfg	Fri Nov 20 17:23:06 2009 +0000
+++ b/common/tools/ats/smoketest/notepad/conf/ui_TestNpdApi.cfg	Fri Nov 20 17:23:50 2009 +0000
@@ -1,14 +1,20 @@
 //#1
 [Test]
-title Press LSK
+title Send key events to close UI setup dialogs
 pause 2000
 presskey global EKeyDevice0
+pause 1000
+presskey global EKeyDevice0
+pause 1000
+presskey global EKeyDevice0
+pause 1000
+presskey global EKeyDevice0
 [Endtest]
 
 //#2
 [Test]
 title Press RSK
-pause 2000
+pause 1000
 presskey global EKeyDevice1
 [Endtest]
 
diff -r cf98fb6a1da9 -r 24d6f993e110 common/tools/brag/sbsToBrag.pl
--- a/common/tools/brag/sbsToBrag.pl	Fri Nov 20 17:23:06 2009 +0000
+++ b/common/tools/brag/sbsToBrag.pl	Fri Nov 20 17:23:50 2009 +0000
@@ -87,6 +87,7 @@
 				tools2lib => {message => "Failed to build library $context->{target}", severity => "minor"},
 				ar => {message => "Failed to build library $context->{target}", severity => "minor"},
 				win32archive => {message => "Failed to build library $context->{target}", severity => "minor"},
+				win32def2lib => {message => "Failed to build DLL entry point library $context->{target}", severity => "minor"},
 				"link" => {message => "Failed to create symbols for $context->{target}", severity => "minor"},
 				postlink => {message => "Failed to link $context->{target}", severity => "minor"},
 				win32stageonelink => {message => "Failed to link $context->{target} (stage 1)", severity => "minor"},
diff -r cf98fb6a1da9 -r 24d6f993e110 common/tools/brag/send_xml_to_diamonds.py
--- a/common/tools/brag/send_xml_to_diamonds.py	Fri Nov 20 17:23:06 2009 +0000
+++ b/common/tools/brag/send_xml_to_diamonds.py	Fri Nov 20 17:23:50 2009 +0000
@@ -1,38 +1,40 @@
 command_help = """
-Send XML data from file to Diamonds. v.1.23
+Send XML data from file to Diamonds. v.2.0
 Use:
     send_xml_to_diamonds.py options
     
     Mandatory options:
-    -s    Server address
     -u    Url
     -f    path of XML file
     
     Optional options:
     -m    Send only mail, without POST connection. Recommend only,
           when direct POST connection is not available.
-    -o    mail server. Not needed inside Nokia intranet.
-    -h    help
+    -o    Mail server, not needed inside Nokia intranet.
+    -h    Help, prints this help text.
     
     Examples:
     Sending only by mail, without POST. (not recommended)
-        send_xml_to_diamonds.py -s diamonds.nmp.nokia.com -u /diamonds/builds/ -f c:\\build.xml -m buildtoolsautomation@nokia.com
+        send_xml_to_diamonds.py -u http://diamonds.nmp.nokia.com/diamonds/builds/ -f c:\\build.xml -m buildtoolsautomation@nokia.com
     
     Sending a new build to release instance of Diamonds
-        send_xml_to_diamonds.py -s diamonds.nmp.nokia.com -u /diamonds/builds/ -f c:\\build.xml
+        send_xml_to_diamonds.py -u http://diamonds.nmp.nokia.com/diamonds/builds/ -f c:\\build.xml
     
     Updating test results to existing build
-        send_xml_to_diamonds.py -s diamonds.nmp.nokia.com -u /diamonds/builds/123/ -f c:\\test.xml
+        send_xml_to_diamonds.py -u http://diamonds.nmp.nokia.com/diamonds/builds/123/ -f c:\\test.xml
     
     Sending data for Relative Change in SW Asset metrics
-        send_xml_to_diamonds.py -s diamonds.nmp.nokia.com -u /diamonds/metrics/ -f c:\\relative.xml
+        send_xml_to_diamonds.py -u http://diamonds.nmp.nokia.com/diamonds/metrics/ -f c:\\relative.xml
     
-    Sending data for Function Coverage
-        send_xml_to_diamonds.py -s diamonds.nmp.nokia.com -u /diamonds/tests/coverage/ -f c:\\coverage.xml
+    Sending data for Function Coverage of Releases
+        send_xml_to_diamonds.py -u http://diamonds.nmp.nokia.com/diamonds/tests/coverage/ -f c:\\coverage.xml
     
     Note: If you want to send XML to development version of Diamonds in testing purposes, use
     address: trdeli02.nmp.nokia.com:9001 in the server address:
-        send_xml_to_diamonds.py -s trdeli02.nmp.nokia.com:9001 -u /diamonds/builds/ -f c:\\build.xml
+        send_xml_to_diamonds.py -u http://trdeli02.nmp.nokia.com:9001/diamonds/builds/ -f c:\\build.xml
+    
+    For local Diamonds development:
+        send_xml_to_diamonds.py -u http://127.0.0.1:8000/diamonds/builds/ -f c:\\build.xml
 """
 
 from httplib import *
@@ -78,27 +80,55 @@
     else:
         return "%s minutes and %s seconds" % (int(total_time/60), round((total_time%60), 1))
 
+def safe_pop():
+    try:
+        return sys.argv.pop(0)
+    except IndexError:
+        sys.exit("Syntax Error!\n%s" % command_help)
+
+def get_server_from_url(url):
+    # Remove 'http://' if any
+    try:
+        return url.replace("http://", "").split("/")[0]
+    except IndexError:
+        sys.exit("Invalid URL: %s" % url)
+
+def get_path_from_url(url):
+    try:
+        path = url.replace("http://", "").split("/")
+        # Discard server address
+        _ = path.pop(0)
+        path = "/" + "/".join(path)
+        # Append slash if needed
+        if path[-1] != "/":
+            path = path + "/"
+        return path
+    except IndexError:
+        sys.exit("Invalid URL: %s" % url)
+
 def main():
-    start_time          = time.time()
-    server_valid        = False
-    url_valid           = False
-    sfile_valid         = False
-    mail_address        = None
+    if len(sys.argv) < 2:
+        sys.exit(command_help)
+    start_time = time.time()
+    server_valid = False
+    path_valid = False
+    sfile_valid = False
+    mail_address = None
     mail_server_address = "smtp.nokia.com"
-    _                   = sys.argv.pop(0)
+    _ = sys.argv.pop(0)
     
     while sys.argv:
         parameter = sys.argv.pop(0)
         if re.search('^-', parameter):
-            if parameter == '-s':
-                server       = sys.argv.pop(0)
+            if parameter == '-u':
+                url = safe_pop()
+                server = get_server_from_url(url)
                 server_valid = True
-            elif parameter == '-u':
-                url          = sys.argv.pop(0)
-                url_valid    = True
+                path = get_path_from_url(url)
+                path_valid = True
             elif parameter == '-f':
-                source_file  = sys.argv.pop(0)
-                sfile_valid  = True
+                source_file = safe_pop()
+                sfile_valid = True
                 try:
                     xml = open(source_file).read()
                 except:
@@ -113,8 +143,8 @@
                 sys.exit("Incorrect parameter! %s" % (parameter) + command_help )
         else:
             sys.exit("Incorrect parameter! %s" % (parameter) + command_help)
-    if not server_valid or not url_valid or not sfile_valid:
-        sys.exit("Too few parameters: Use -h for help")
+    if not server_valid or not path_valid or not sfile_valid:
+        sys.exit("Too few parameters. \n%s" % command_help)
     
     diamonds_mail_box      = "diamonds@diamonds.nmp.nokia.com"
     import_failed_message  = "XML was not sent successfully to Diamonds via REST interface!\n"
@@ -125,11 +155,11 @@
         connection = HTTPConnection(server)
         
         try:
-            connection.request("POST", url, xml)
+            connection.request("POST", path, xml)
         except:
             print "Can not connect to the server %s\n" % server
             sender = get_username()
-            send_email(get_mail_subject(sender, server, url), xml, sender, [diamonds_mail_box], "latin-1", mail_server_address)
+            send_email(get_mail_subject(sender, server, path), xml, sender, [diamonds_mail_box], "latin-1", mail_server_address)
             sys.exit(mail_sent_message)
         
         response = connection.getresponse()
@@ -143,8 +173,9 @@
         else:
             print import_failed_message
             print get_response_message(response)
+            #print "Server response:%s\n" % response.read()
             sender = get_username()
-            send_email(get_mail_subject(sender, server, url), xml, sender, [diamonds_mail_box], "latin-1", mail_server_address)
+            send_email(get_mail_subject(sender, server, path), xml, sender, [diamonds_mail_box], "latin-1", mail_server_address)
             print mail_sent_message
         
         connection.close()
@@ -152,7 +183,7 @@
     else:
         print 'Sending only mail'
         sender = get_username()
-        send_email(get_mail_subject(sender, server, url), xml, sender, [mail_address], "latin-1", mail_server_address)
+        send_email(get_mail_subject(sender, server, path), xml, sender, [mail_address], "latin-1", mail_server_address)
     
     print "------------------------"
     print "Processed in %s" % get_process_time(time.time()-start_time)
diff -r cf98fb6a1da9 -r 24d6f993e110 common/tools/populateziptemplate.pl
--- a/common/tools/populateziptemplate.pl	Fri Nov 20 17:23:06 2009 +0000
+++ b/common/tools/populateziptemplate.pl	Fri Nov 20 17:23:50 2009 +0000
@@ -118,6 +118,20 @@
   				},
   			]
   		};
+		$zipConfig->{config}->{config}->{"src-by-layer"}->{config}->{$license."-$layer"} =
+		{
+			set => 
+			[
+				{
+					name => "name",
+					value => join "_", "src", $license, $layer,
+				},
+				{
+					name => "include",
+					value => join "_", "src", $license, $layer, "*.zip",
+				},
+			]
+		};
 	}
 	elsif ($package->{source} =~ m{/rnd/([^/]+)/([^/]+)})
 	{
diff -r cf98fb6a1da9 -r 24d6f993e110 common/tools/raptor/RaptorRecipe.pm
--- a/common/tools/raptor/RaptorRecipe.pm	Fri Nov 20 17:23:06 2009 +0000
+++ b/common/tools/raptor/RaptorRecipe.pm	Fri Nov 20 17:23:50 2009 +0000
@@ -56,8 +56,10 @@
 my $CATEGORY_RECIPEFAILURE_ARMAR_FILEDOESNOTEXIST = 'armar_file_does_not_exist';
 my $CATEGORY_RECIPEFAILURE_ARMCC_CONTROLLINGEXPRESSIONISCONSTANT = 'armcc_controlling_expression_is_constant';
 my $CATEGORY_RECIPEFAILURE_ARMCC_INTERNALFAULT = 'armcc_internal_fault';
+my $CATEGORY_RECIPEFAILURE_ARMCC_MODIFIERNOTALLOWED = 'armcc_modifier_not_allowed';
 my $CATEGORY_RECIPEFAILURE_ARMCC_GENERICWARNINGSERRORS = 'armcc_generic_warnings_errors';
 my $CATEGORY_RECIPEFAILURE_ELF2E32_SYMBOLMISSINGFROMELFFILE = 'elf2e32_symbol_missing_from_elf_file';
+my $CATEGORY_RECIPEFAILURE_MWCCSYM2_FILECANNOTBEOPENED = 'mwccsym2_file_cannot_be_opened';
 
 my $mmp_with_issues = {};
 
@@ -123,12 +125,22 @@
 		my $subcategory = $CATEGORY_RECIPEFAILURE_ARMCC_INTERNALFAULT;
 		RaptorCommon::dump_fault($category, $subcategory, $severity, $config, $component, $mmp, $phase, $recipe, $file, $line);
 	}
+	elsif ($text =~ m,/armcc.exe , and $text =~ m,Error:  #655-D: the modifier ".*" is not allowed on this declaration,)
+	{
+		my $subcategory = $CATEGORY_RECIPEFAILURE_ARMCC_MODIFIERNOTALLOWED;
+		RaptorCommon::dump_fault($category, $subcategory, $severity, $config, $component, $mmp, $phase, $recipe, $file, $line);
+	}
 	# the following captures generic armcc error/warnings, not captured by regexps above
 	elsif ($text =~ m,/armcc.exe , and $text =~ m,: \d+ warnings\, \d+ errors$,)
 	{
 		my $subcategory = $CATEGORY_RECIPEFAILURE_ARMCC_GENERICWARNINGSERRORS;
 		RaptorCommon::dump_fault($category, $subcategory, $severity, $config, $component, $mmp, $phase, $recipe, $file, $line);
 	}
+	elsif ($text =~ m,mwccsym2.exe , and $text =~ m,: the file '.*' cannot be opened,)
+	{
+		my $subcategory = $CATEGORY_RECIPEFAILURE_MWCCSYM2_FILECANNOTBEOPENED;
+		RaptorCommon::dump_fault($category, $subcategory, $severity, $config, $component, $mmp, $phase, $recipe, $file, $line);
+	}
 	else # log everything by default
 	{
 		RaptorCommon::dump_fault($category, $subcategory, $severity, $config, $component, $mmp, $phase, $recipe, $file, $line);
diff -r cf98fb6a1da9 -r 24d6f993e110 sf-package/CompilerCompatibility_props.ant.xml
--- a/sf-package/CompilerCompatibility_props.ant.xml	Fri Nov 20 17:23:06 2009 +0000
+++ b/sf-package/CompilerCompatibility_props.ant.xml	Fri Nov 20 17:23:50 2009 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
 <project name="COMPILERCOMPATIBILITY-PROPS">
-  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.b"/>
+  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.c"/>
 </project>
 
diff -r cf98fb6a1da9 -r 24d6f993e110 sf-package/NewGraphicsArchitecture_props.ant.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf-package/NewGraphicsArchitecture_props.ant.xml	Fri Nov 20 17:23:50 2009 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+
+<project name="NEWGRAPHICSARCHITECTURE-PROPS">
+  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.c"/>
+</project>
+
diff -r cf98fb6a1da9 -r 24d6f993e110 sf-package/symbian2_props.ant.xml
--- a/sf-package/symbian2_props.ant.xml	Fri Nov 20 17:23:06 2009 +0000
+++ b/sf-package/symbian2_props.ant.xml	Fri Nov 20 17:23:50 2009 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
 <project name="SYMBIAN2-PROPS">
-  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_2.0.0"/>
+  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_2.0.1"/>
 </project>
 
diff -r cf98fb6a1da9 -r 24d6f993e110 sf-package/symbian3_props.ant.xml
--- a/sf-package/symbian3_props.ant.xml	Fri Nov 20 17:23:06 2009 +0000
+++ b/sf-package/symbian3_props.ant.xml	Fri Nov 20 17:23:50 2009 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
 <project name="SYMBIAN3-PROPS">
-  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.b"/>
+  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.c"/>
 </project>