Merge changes and keep s60_sbs_config.xml to keep raptor happy.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/build/data/s60_sbs_config.xml Tue May 18 14:45:11 2010 +0100
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<build xmlns="http://symbian.com/xml/build"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://symbian.com/xml/build build/2_0.xsd">
+
+ <!-- End-user overrides for existing build configurations for SBSv2 (aka Raptor).-->
+
+ <!-- binding of FLM interfaces to certain build/makefile phase to ensure proper order of execution during build -->
+ <var name="make_changes">
+ <set name="bitmap.selector.iface" value="\.(bitmap|extension|mifconv|akniconinterfaces|removegtfiles|skingenerator|cryptoprep|builder|help_files|version_update)$"/>
+ <set name="resource.selector.iface" value="\.(resource|extension|mif2cdlindex|nativejava|genericcopy)$"/>
+ <set name="default.selector.iface" value="\.(?!export$|bitmap$|resource$|mifconv$|mif2cdlindex$|nativejava$|akniconinterfaces$|removegtfiles$|genericcopy$|skingenerator$|cryptoprep$|builder$|help_files$|version_update$).*$"/>
+ <!-- 4.5 min -->
+ <set name='TALON_TIMEOUT' value='540000'/>
+ </var>
+
+ <!-- emake -->
+ <alias name="emake" meaning="emake_engine.make_changes"/>
+
+ <!-- gnu make -->
+ <alias name="make" meaning="make_engine.make_changes"/>
+
+ <var name="permissive">
+ <append name="CC_ERRORS_CONTROL_OPTION" value="-fpermissive"/>
+ </var>
+</build>