# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1254833983 -3600
# Node ID 793e44f064c625964fe755d89525582c088d4f3f
# Parent  ab837f463b9c31ab000f00185160d6b6580f69f1# Parent  5d2fed6f53ce95b4865e4c0ba116e7debda4483c
catchup merge

diff -r ab837f463b9c -r 793e44f064c6 symbian2/micro/sources.csv
--- a/symbian2/micro/sources.csv	Tue Oct 06 11:53:16 2009 +0100
+++ b/symbian2/micro/sources.csv	Tue Oct 06 13:59:43 2009 +0100
@@ -2,5 +2,5 @@
 //v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,RCL_1,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,,RCL_1,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,,RCL_1,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_1,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,RCL_1,layers.sysdef.xml
diff -r ab837f463b9c -r 793e44f064c6 symbian3/split/sources_fcl.csv
--- a/symbian3/split/sources_fcl.csv	Tue Oct 06 11:53:16 2009 +0100
+++ b/symbian3/split/sources_fcl.csv	Tue Oct 06 13:59:43 2009 +0100
@@ -97,7 +97,7 @@
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development_staging/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/graphics/,/sf/os/graphics,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
@@ -109,12 +109,13 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development_staging/sfl/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development_staging/sfl/FCL/sf/os/unref/,/sf/os/unref,branch,default,
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/unref/,/sf/os/unref,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/usb/,/sf/os/usb,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/interim/QEMU/,/sf/os/QEMU,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/build_s60/,/sf/tools/build_s60,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
diff -r ab837f463b9c -r 793e44f064c6 symbian3/split/sysdefs/system_model_os.xml
--- a/symbian3/split/sysdefs/system_model_os.xml	Tue Oct 06 11:53:16 2009 +0100
+++ b/symbian3/split/sysdefs/system_model_os.xml	Tue Oct 06 13:59:43 2009 +0100
@@ -94,7 +94,7 @@
   root CDATA #IMPLIED
   command CDATA #REQUIRED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
 <block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
@@ -128,6 +128,9 @@
 <component name="f32test" long-name="File Server Tests" purpose="development">
 <unit bldFile="os\kernelhwsrv\kerneltest\f32test\group" mrp="os\kernelhwsrv\kerneltest\f32test\group\base_f32test.mrp"/>
 </component>
+<component name="syborg" long-name="Syborg" purpose="development">
+<unit bldFile="os\QEMU\baseport\syborg" mrp=""/>
+</component>
 </collection>
 <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
 <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional">
@@ -293,9 +296,6 @@
 <component name="e32toolp" long-name="E32 Perl Tools" purpose="development" class="PC">
 <unit bldFile="os\buildtools\sbsv1_os\e32toolp\group" mrp="os\buildtools\sbsv1_os\e32toolp\group\tools_e32toolp.mrp"/>
 </component>
-<component name="romutils" long-name="ROM Utilities" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\sbsv1_os\romutils\group" mrp="os\buildtools\sbsv1_os\romutils\group\tools_romutils.mrp"/>
-</component>
 </collection>
 <collection name="imgtools_os" long-name="Image Tools" level="fw">
 <component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="tb91" purpose="development">
@@ -368,9 +368,6 @@
 <component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory">
 <unit bldFile="os\ossrv\lowlevellibsandfws\apputils\group" mrp="os\ossrv\lowlevellibsandfws\apputils\group\syslibs_bafl.mrp"/>
 </component>
-<component name="sysutil" long-name="System Utilities" introduced="ER5" purpose="mandatory">
-<unit bldFile="os\ossrv\lowlevellibsandfws\apputils\sysutil\group"/>
-</component>
 <component name="genericusabilitylib" long-name="Generic Usability Library" introduced="tb92" purpose="mandatory">
 <unit bldFile="os\ossrv\lowlevellibsandfws\genericusabilitylib\group" mrp="os\ossrv\lowlevellibsandfws\genericusabilitylib\group\syslibs_euserhl.mrp"/>
 </component>
@@ -1612,7 +1609,7 @@
 </component>
 </collection>
 </block>
-<block name="osrndtools" level="services" long-name="OS RD tools" levels="fw trace">
+<block name="osrndtools" level="services" long-name="OS R&amp;D tools" levels="fw trace">
 <collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
 <component name="cinidata" long-name="CINI Data" purpose="development">
 <unit bldFile="os\osrndtools\testexecfw1\cinidata" mrp="os\osrndtools\testexecfw1\cinidata\tools_cinidata.mrp"/>
@@ -1621,8 +1618,8 @@
 <unit bldFile="os\osrndtools\testexecfw1\testexecute\Group" mrp="os\osrndtools\testexecfw1\testexecute\Group\tools_testexecute.mrp"/>
 </component>
 </collection>
-<collection name="osrndtools_info" long-name="OS RD tools Info" level="trace">
-<component name="osrndtools_metadata" long-name="OS RD tools Metadata" introduced="tb91" purpose="development" class="config PC">
+<collection name="osrndtools_info" long-name="OS R&amp;D tools Info" level="trace">
+<component name="osrndtools_metadata" long-name="OS R&amp;D tools Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="os\osrndtools\osrndtools_info\osrndtools_metadata\osrndtools_metadata.mrp"/>
 </component>
 </collection>
@@ -1794,9 +1791,9 @@
 </component>
 </collection>
 </block>
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin framework conn server">
+<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
 <collection name="realtimenetprots" long-name="Real-time Internet Protocols" level="server">
-<component name="rtp" long-name="RTP" introduced="9.0" purpose="optional">
+<component name="symrtp" long-name="RTP" introduced="9.0" purpose="optional">
 <!-- Real Time Data Protocol -->
 <unit bldFile="mw\ipappprotocols\realtimenetprots\rtp\group" mrp="mw\ipappprotocols\realtimenetprots\rtp\group\mm-protocols_rtp.mrp"/>
 </component>
@@ -1809,12 +1806,13 @@
 <unit bldFile="mw\ipappprotocols\sipproviderplugins\sipprovider\group" mrp="mw\ipappprotocols\sipproviderplugins\sipprovider\group\mm-protocols_SipProvider.mrp"/>
 </component>
 </collection>
-<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="server">
+<collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
 <component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="mw\ipappprotocols\ipappprotocols_info\ipappprotocols_metadata\ipappprotocols_metadata.mrp"/>
 </component>
 </collection>
 </block>
+<block name="conntools" level="generic" long-name="Connectivity Tools"/>
 <block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
 <collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
 <component name="amrpayloadformatter" long-name="AMR Payload Formatter" introduced="tb92" purpose="optional">
@@ -2065,6 +2063,7 @@
 </component>
 </collection>
 <collection name="classicui_info" long-name="Classic UI Info" level="specific">
+<!-- the multiple units in the API components need to be resolved -->
 <component name="classicui_metadata" long-name="Classic UI Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="mw\classicui\classicui_info\classicui_metadata\classicui_metadata.mrp"/>
 </component>
@@ -2095,6 +2094,9 @@
 <component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
 <unit mrp="mw\appinstall\secureswitools\openssllib\security_openssl.mrp"/>
 </component>
+<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
+<unit bldFile="mw\appinstall\secureswitools\swisistools\group" mrp="mw\appinstall\secureswitools\swisistools\group\security_sistools.mrp"/>
+</component>
 </collection>
 <collection name="appinstall_info" long-name="Application Installation Info" level="api">
 <component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="tb91" purpose="development" class="config PC">
@@ -2104,6 +2106,17 @@
 </block>
 </layer>
 <layer name="app" long-name="Applications" levels="services apps">
+<block name="location" level="apps" long-name="Location Apps"/>
+<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs"/>
+<block name="phone" level="apps" span="2" long-name="Phone Apps"/>
+<block name="videotelephony" level="apps" long-name="Video Telephony Apps"/>
+<block name="poc" level="apps" long-name="PoC"/>
+<block name="iptelephony" level="apps" long-name="IP Telephony"/>
+<block name="settingsuis" level="services" long-name="Settings UIs"/>
+<block name="contentcontrol" level="services" long-name="Content Control Daemons"/>
+<block name="devicecontrol" level="services" long-name="Device Control Daemons"/>
+<block name="printing" level="services" long-name="Printing"/>
+<block name="files" level="apps" long-name="File Manager Apps"/>
 <block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
 <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
 <component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
@@ -2124,7 +2137,7 @@
 </component>
 </collection>
 </block>
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui">
+<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
 <collection name="pimappservices" long-name="PIM App Services" level="services">
 <component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
 <unit bldFile="app\organizer\pimappservices\calendar\group" mrp="app\organizer\pimappservices\calendar\group\app-engines_calendar.mrp" version="2"/>
@@ -2144,7 +2157,7 @@
 <unit bldFile="app\organizer\pimappsupport\chinesecalendarconverter\group" mrp="app\organizer\pimappsupport\chinesecalendarconverter\group\app-services_calcon.mrp"/>
 </component>
 </collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="ui">
+<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
 <component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="app\organizer\organizer_info\organizer_metadata\organizer_metadata.mrp"/>
 </component>
@@ -2186,12 +2199,34 @@
 </component>
 </collection>
 </block>
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools unused ui">
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="app\helps\symhelp\helpmodel\group" mrp="app\helps\symhelp\helpmodel\group\app-services_hlpmodel.mrp"/>
-</component>
-</collection>
+<block name="commonemail" level="apps" long-name="Email Apps"/>
+<block name="conversations" level="apps" long-name="Conversation Apps"/>
+<block name="im" level="apps" long-name="Instant Messaging Apps"/>
+<block name="utils" level="apps" long-name="Utility Apps"/>
+<block name="dictionary" level="services" long-name="Dictionary"/>
+<block name="camera" level="apps" long-name="Camera Apps"/>
+<block name="imgeditor" level="apps" long-name="Image Editor Apps"/>
+<block name="videoeditor" level="apps" long-name="Video Editor Apps"/>
+<block name="gallery" level="apps" long-name="Gallery Apps"/>
+<block name="videoplayer" level="apps" long-name="Video Player Apps"/>
+<block name="photos" level="apps" long-name="Photos"/>
+<block name="tv" level="apps" long-name="TV Apps"/>
+<block name="videocenter" level="apps" long-name="Video Center"/>
+<block name="musicplayer" level="apps" long-name="Music Player Apps"/>
+<block name="radio" level="apps" long-name="Radio Apps"/>
+<block name="internetradio" level="apps" long-name="Internet Radio Apps"/>
+<block name="voicerec" level="apps" long-name="Voice Recorder Apps"/>
+<block name="imgvieweruis" level="services" long-name="Image Viewer UIs"/>
+<block name="screensaver" level="apps" long-name="Screen Saver Apps"/>
+<block name="homescreen" level="apps" long-name="Home Screen Apps"/>
+<block name="graphicsuis" level="services" long-name="Graphics UIs"/>
+<block name="profile" level="apps" long-name="Profile"/>
+<block name="speechsrv" level="services" long-name="Speech Recognition UIs"/>
+<block name="homescreentools" level="services" long-name="Home Screen Tools"/>
+<block name="webuis" level="services" long-name="Web UIs"/>
+<block name="java" level="services" long-name="Java"/>
+<block name="rndtools" level="services" long-name="RD tools"/>
+<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
 <collection name="helps_info" long-name="Help Apps Info" level="ui">
 <component name="helps_metadata" long-name="Help Apps Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="app\helps\helps_info\helps_metadata\helps_metadata.mrp"/>
@@ -2207,11 +2242,6 @@
 <unit bldFile="app\techview\buildverification\smoketest\Group" mrp="app\techview\buildverification\smoketest\Group\testtools_smoketest.mrp"/>
 </component>
 </collection>
-<collection name="installationapps" long-name="Installation Apps" level="apps2">
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="mw\appinstall\secureswitools\swisistools\group" mrp="mw\appinstall\secureswitools\swisistools\group\security_sistools.mrp"/>
-</component>
-</collection>
 <collection name="networkingutils" long-name="Networking Utils" level="utils">
 <component name="ipadministrationtool" long-name="IP Administration Tool" introduced="7.0" purpose="development">
 <unit mrp="app\techview\networkingutils\ipadministrationtool\group\networking_ipadm.mrp"/>