# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1266779678 0
# Node ID 904a95ca5c8659de4f7b7d810acd248cbfa5ffe3
# Parent  b07e89eb79e30a8acab915cc39e6044584c12d83
Update models with tweaks identified in build 310

diff -r b07e89eb79e3 -r 904a95ca5c86 symbian3/single/sysdefs/full_system_model_3.0.xml
--- a/symbian3/single/sysdefs/full_system_model_3.0.xml	Fri Feb 19 17:05:04 2010 +0000
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml	Sun Feb 21 19:14:38 2010 +0000
@@ -41,20 +41,20 @@
    </package>
    <package id="beagleboard" tech-domain="hb" level="low" name="Beagle Board" levels="hw-if">
     <collection id="omap3530" name="OMAP 3530" level="hw-if">
-     <component id="omap3530" name="Beagle Board common" introduced="^3" purpose="optional">
+     <component id="omap3530_build" name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
       <unit bldFile="/adaptation/beagleboard/omap3530" mrp="/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
      </component>
-     <component id="kernel" name="Beagle Board kernel" introduced="^3" purpose="optional">
+     <component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
       <unit bldFile="/adaptation/beagleboard/omap3530/kernel"/>
      </component>
-     <component id="beagleboard" name="Beagle Board baseport" introduced="^3" purpose="optional">
+     <component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
       <unit bldFile="/adaptation/beagleboard/omap3530/beagleboard"/>
      </component>
     </collection>
    </package>
    <package id="qemu" tech-domain="hb" level="low" name="QEMU and Baseport" levels="hw-if">
-    <collection id="baseport" name="Baseport" level="hw-if">
-     <component id="syborg" name="Syborg" introduced="^2" purpose="optional">
+    <collection id="qemu_baseport" name="Baseport" level="hw-if">
+     <component id="syborg" name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
       <unit bldFile="/adaptation/qemu/baseport/syborg" mrp="/adaptation/qemu/baseport/syborg/syborg.mrp"/>
      </component>
     </collection>
@@ -2355,7 +2355,7 @@
      <component id="tzlocrscfactory" name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
       <unit bldFile="/mw/appsupport/tzservices/tzlocrscfactory/group" mrp="/mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
      </component>
-     <component id="tzdatabase" name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
+     <component id="tzdatabase" name="Time Zone Database" filter="test" introduced="9.1" purpose="optional" class="config">
       <unit bldFile="/mw/appsupport/tzservices/tzdatabase/group" mrp="/mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
      </component>
     </collection>
@@ -4990,9 +4990,11 @@
      <component id="fontprovider" filter="s60" name="Font Provider">
       <unit bldFile="/mw/uiresources/fontsupport/fontprovider/group"/>
      </component>
-     <component id="fontutils" filter="s60" name="Font Utils">
-      <unit bldFile="/mw/uiresources/fontsupport/fontutils/group"/>
-     </component>
+     <!-- R&D materials, should be Nokia only
+      <component id="fontutils" filter="s60" name="Font Utils">
+        <unit bldFile="fontsupport/fontutils/group"/>
+      </component>
+-->
     </collection>
     <collection id="helpthemes" name="Help Themes" level="data">
      <!-- collection is really a component. Need to move down a directory -->
@@ -6508,7 +6510,7 @@
      <component id="calenlauncher" filter="s60" name="Calendar Launcher">
       <unit bldFile="/app/organizer/calendarengines/calenlauncher/group"/>
      </component>
-     <component id="caldav" filter="s60" name="CalDav Server" introduced="^3">
+     <component id="caldavsrv" filter="sf_build" name="CalDAV Server" introduced="^3">
       <unit bldFile="/app/organizer/calendarengines/caldav/group"/>
      </component>
     </collection>
@@ -6595,6 +6597,9 @@
      <component id="calenaiwprovider" filter="s60" name="Calendar AIW Proivder" class="plugin" introduced="^3">
       <unit bldFile="/app/organizer/calendarui/calenaiwprovider/group"/>
      </component>
+     <component id="caldav" filter="sf_build" name="CalDAV" class="plugin" introduced="^3">
+      <unit bldFile="/app/organizer/calendarui/caldav/group"/>
+     </component>
      <component id="calendarui_build" filter="s60" name="Calendar UI Build">
       <!-- split contents into separate components -->
       <unit bldFile="/app/organizer/calendarui/group"/>
@@ -7117,7 +7122,7 @@
      </component>
     </collection>
     <collection id="camera_info" name="Camera Apps Info">
-     <component id="camera_plat" filter="s60,test,api_test" name="Camera Apps Platform Interfaces" class="api">
+     <component id="camera_plat" filter="s60" name="Camera Apps Platform Interfaces" class="api">
       <unit bldFile="/app/camera/camera_plat/group"/>
      </component>
     </collection>
@@ -7407,7 +7412,7 @@
       <unit bldFile="/app/videoplayer/videoplayerapp/lwplayer/group"/>
      </component>
      <component id="mpxvideoplayer" filter="s60" name="MPX Video Player" class="plugin">
-      <unit bldFile="/app/videoplayer/videoplayerapp/lmpxvideoplayer/group"/>
+      <unit bldFile="/app/videoplayer/videoplayerapp/mpxvideoplayer/group"/>
      </component>
      <component id="videoplayerlauncher" filter="s60" name="Video Player Launcher">
       <unit bldFile="/app/videoplayer/videoplayerapp/videoplayerlauncher/group"/>
diff -r b07e89eb79e3 -r 904a95ca5c86 symbian3/single/sysdefs/system_model.xml
--- a/symbian3/single/sysdefs/system_model.xml	Fri Feb 19 17:05:04 2010 +0000
+++ b/symbian3/single/sysdefs/system_model.xml	Sun Feb 21 19:14:38 2010 +0000
@@ -115,20 +115,20 @@
    </block>
    <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
     <collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-     <component name="omap3530" long-name="Beagle Board common" introduced="^3" purpose="optional">
+     <component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
       <unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
      </component>
-     <component name="kernel" long-name="Beagle Board kernel" introduced="^3" purpose="optional">
+     <component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
       <unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
      </component>
-     <component name="beagleboard" long-name="Beagle Board baseport" introduced="^3" purpose="optional">
+     <component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
       <unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
      </component>
     </collection>
    </block>
    <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-    <collection name="baseport" long-name="Baseport" level="hw-if">
-     <component name="syborg" long-name="Syborg" introduced="^2" purpose="optional">
+    <collection name="qemu_baseport" long-name="Baseport" level="hw-if">
+     <component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
       <unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
      </component>
     </collection>
@@ -2236,9 +2236,6 @@
      <component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
       <unit bldFile="mw/appsupport/tzservices/tzlocrscfactory/group" mrp="mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
      </component>
-     <component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-      <unit bldFile="mw/appsupport/tzservices/tzdatabase/group" mrp="mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-     </component>
     </collection>
     <collection name="contenthandling" long-name="Content Handling" level="plugin">
      <component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
@@ -4579,9 +4576,11 @@
      <component name="fontprovider" filter="s60" long-name="Font Provider">
       <unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
      </component>
-     <component name="fontutils" filter="s60" long-name="Font Utils">
-      <unit bldFile="mw/uiresources/fontsupport/fontutils/group"/>
-     </component>
+     <!-- R&D materials, should be Nokia only
+      <component id="fontutils" filter="s60" name="Font Utils">
+        <unit bldFile="fontsupport/fontutils/group"/>
+      </component>
+-->
     </collection>
     <collection name="helpthemes" long-name="Help Themes" level="data">
      <!-- collection is really a component. Need to move down a directory -->
@@ -6018,7 +6017,7 @@
      <component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
       <unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
      </component>
-     <component name="caldav" filter="s60" long-name="CalDav Server" introduced="^3">
+     <component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
       <unit bldFile="app/organizer/calendarengines/caldav/group"/>
      </component>
     </collection>
@@ -6102,6 +6101,9 @@
      <component name="calenaiwprovider" filter="s60" long-name="Calendar AIW Proivder" introduced="^3" plugin="Y">
       <unit bldFile="app/organizer/calendarui/calenaiwprovider/group"/>
      </component>
+     <component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
+      <unit bldFile="app/organizer/calendarui/caldav/group"/>
+     </component>
      <component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
       <!-- split contents into separate components -->
       <unit bldFile="app/organizer/calendarui/group"/>
@@ -6617,7 +6619,11 @@
       <unit bldFile="app/camera/camerauis/cameraapp/help/group"/>
      </component>
     </collection>
-    <collection name="camera_info" long-name="Camera Apps Info"/>
+    <collection name="camera_info" long-name="Camera Apps Info">
+     <component name="camera_plat" filter="s60" long-name="Camera Apps Platform Interfaces" class="api">
+      <unit bldFile="app/camera/camera_plat/group"/>
+     </component>
+    </collection>
    </block>
    <block name="imgeditor" level="apps" long-name="Image Editor Apps" levels="engine ui">
     <collection name="imageeditor" long-name="Image Editor UI" level="ui">
@@ -6882,7 +6888,7 @@
       <unit bldFile="app/videoplayer/videoplayerapp/lwplayer/group"/>
      </component>
      <component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
-      <unit bldFile="app/videoplayer/videoplayerapp/lmpxvideoplayer/group"/>
+      <unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group"/>
      </component>
      <component name="videoplayerlauncher" filter="s60" long-name="Video Player Launcher">
       <unit bldFile="app/videoplayer/videoplayerapp/videoplayerlauncher/group"/>
diff -r b07e89eb79e3 -r 904a95ca5c86 symbian3/single/sysdefs/system_model_3.0.xml
--- a/symbian3/single/sysdefs/system_model_3.0.xml	Fri Feb 19 17:05:04 2010 +0000
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Sun Feb 21 19:14:38 2010 +0000
@@ -41,20 +41,20 @@
    </package>
    <package id="beagleboard" tech-domain="hb" level="low" name="Beagle Board" levels="hw-if">
     <collection id="omap3530" name="OMAP 3530" level="hw-if">
-     <component id="omap3530" name="Beagle Board common" introduced="^3" purpose="optional">
+     <component id="omap3530_build" name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
       <unit bldFile="/adaptation/beagleboard/omap3530" mrp="/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
      </component>
-     <component id="kernel" name="Beagle Board kernel" introduced="^3" purpose="optional">
+     <component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
       <unit bldFile="/adaptation/beagleboard/omap3530/kernel"/>
      </component>
-     <component id="beagleboard" name="Beagle Board baseport" introduced="^3" purpose="optional">
+     <component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
       <unit bldFile="/adaptation/beagleboard/omap3530/beagleboard"/>
      </component>
     </collection>
    </package>
    <package id="qemu" tech-domain="hb" level="low" name="QEMU and Baseport" levels="hw-if">
-    <collection id="baseport" name="Baseport" level="hw-if">
-     <component id="syborg" name="Syborg" introduced="^2" purpose="optional">
+    <collection id="qemu_baseport" name="Baseport" level="hw-if">
+     <component id="syborg" name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
       <unit bldFile="/adaptation/qemu/baseport/syborg" mrp="/adaptation/qemu/baseport/syborg/syborg.mrp"/>
      </component>
     </collection>
@@ -2243,9 +2243,7 @@
      <component id="tzlocrscfactory" name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
       <unit bldFile="/mw/appsupport/tzservices/tzlocrscfactory/group" mrp="/mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
      </component>
-     <component id="tzdatabase" name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-      <unit bldFile="/mw/appsupport/tzservices/tzdatabase/group" mrp="/mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-     </component>
+     
     </collection>
     <collection id="contenthandling" name="Content Handling" level="plugin">
      <component id="webrecognisers" name="Web Recognisers" purpose="optional" class="plugin">
@@ -4683,9 +4681,11 @@
      <component id="fontprovider" filter="s60" name="Font Provider">
       <unit bldFile="/mw/uiresources/fontsupport/fontprovider/group"/>
      </component>
-     <component id="fontutils" filter="s60" name="Font Utils">
-      <unit bldFile="/mw/uiresources/fontsupport/fontutils/group"/>
-     </component>
+     <!-- R&D materials, should be Nokia only
+      <component id="fontutils" filter="s60" name="Font Utils">
+        <unit bldFile="fontsupport/fontutils/group"/>
+      </component>
+-->
     </collection>
     <collection id="helpthemes" name="Help Themes" level="data">
      <!-- collection is really a component. Need to move down a directory -->
@@ -6166,7 +6166,7 @@
      <component id="calenlauncher" filter="s60" name="Calendar Launcher">
       <unit bldFile="/app/organizer/calendarengines/calenlauncher/group"/>
      </component>
-     <component id="caldav" filter="s60" name="CalDav Server" introduced="^3">
+     <component id="caldavsrv" filter="sf_build" name="CalDAV Server" introduced="^3">
       <unit bldFile="/app/organizer/calendarengines/caldav/group"/>
      </component>
     </collection>
@@ -6253,6 +6253,9 @@
      <component id="calenaiwprovider" filter="s60" name="Calendar AIW Proivder" class="plugin" introduced="^3">
       <unit bldFile="/app/organizer/calendarui/calenaiwprovider/group"/>
      </component>
+     <component id="caldav" filter="sf_build" name="CalDAV" class="plugin" introduced="^3">
+      <unit bldFile="/app/organizer/calendarui/caldav/group"/>
+     </component>
      <component id="calendarui_build" filter="s60" name="Calendar UI Build">
       <!-- split contents into separate components -->
       <unit bldFile="/app/organizer/calendarui/group"/>
@@ -6775,7 +6778,9 @@
      </component>
     </collection>
     <collection id="camera_info" name="Camera Apps Info">
-     
+     <component id="camera_plat" filter="s60" name="Camera Apps Platform Interfaces" class="api">
+      <unit bldFile="/app/camera/camera_plat/group"/>
+     </component>
     </collection>
    </package>
    <package id="imgeditor" level="apps" tech-domain="ma" name="Image Editor Apps" levels="engine ui">
@@ -7045,7 +7050,7 @@
       <unit bldFile="/app/videoplayer/videoplayerapp/lwplayer/group"/>
      </component>
      <component id="mpxvideoplayer" filter="s60" name="MPX Video Player" class="plugin">
-      <unit bldFile="/app/videoplayer/videoplayerapp/lmpxvideoplayer/group"/>
+      <unit bldFile="/app/videoplayer/videoplayerapp/mpxvideoplayer/group"/>
      </component>
      <component id="videoplayerlauncher" filter="s60" name="Video Player Launcher">
       <unit bldFile="/app/videoplayer/videoplayerapp/videoplayerlauncher/group"/>