# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1266451157 0
# Node ID e754af35c291bd6622eefaf37a2f8b25968e5e0b
# Parent  27a3dfc1b15b01f2578a501231a40625a1b9e271
Point of closest approach between joined model and PDK 3.0.g v2 single model
- added adaptation layer to the root model
- package_definition_3.0.xml files for qemu, beagleboard and stubs
- added package_definition_3.0.xml for tools\homescreentools, and used that instead of app\homescreentools
- added various extras under "sf_build", and corrected capitalisation to match single model
- changed some filters from "test" to "sf_build", because we need to build those things

Left out some dubious units - cross-checking shows 4 missing

/sf/mw/remoteconn/connectivitytransports/plpremotelink/group
/sf/mw/remoteconn/connectivitytransports/plpvariant/group
/sf/os/textandloc/charconvfw/charconv/ongoing/group
/sf/os/textandloc/charconvfw/charconvplugin/group

diff -r 27a3dfc1b15b -r e754af35c291 symbian3/adaptation/beagleboard/package_definition_3.0.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adaptation/beagleboard/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="beagleboard" name="Beagle Board" levels="hw-if">
+    <collection id="omap3530" name="OMAP 3530" level="hw-if">
+      <component id="omap3530" name="Beagle Board common" introduced="symbian^3" purpose="optional">
+        <unit bldFile="omap3530" mrp="omap3530/base_beagle.mrp"/>
+      </component>
+      <component id="kernel" name="Beagle Board kernel" introduced="symbian^3" purpose="optional">
+        <unit bldFile="omap3530/kernel"/>
+      </component>
+      <component id="beagleboard" name="Beagle Board baseport" introduced="symbian^3" purpose="optional">
+        <unit bldFile="omap3530/beagleboard"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 27a3dfc1b15b -r e754af35c291 symbian3/adaptation/qemu/package_definition_3.0.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adaptation/qemu/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="qemu" name="QEMU" levels="hw-if">
+    <collection id="baseport" name="Baseport" level="hw-if">
+      <component id="syborg" name="Syborg" introduced="symbian^2" purpose="optional">
+        <unit bldFile="baseport/syborg" mrp="baseport/syborg/syborg.mrp"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 27a3dfc1b15b -r e754af35c291 symbian3/adaptation/stubs/package_definition_3.0.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adaptation/stubs/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="stubs" levels="stub">
+    <collection id="s60_stubs" level="stub">
+     <component id="audiostubs">
+      <unit bldFile="/adaptation/stubs/audiostubs/group"/>
+     </component>
+     <component id="drm_stubs">
+      <unit bldFile="/adaptation/stubs/drm_stubs/group"/>
+     </component>
+     <component id="ocrsrv_stub">
+      <unit bldFile="/adaptation/stubs/ocrsrv_stub/group"/>
+     </component>
+     <component id="omasuplasnconverterstubimpl">
+      <unit bldFile="/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+     </component>
+     <component id="posmsgpluginreferenceimpl">
+      <unit bldFile="/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+     </component>
+     <component id="power_save_display_mode_stub">
+      <unit bldFile="/adaptation/stubs/power_save_display_mode_stub/group"/>
+     </component>
+     <component id="systemswstubs">
+      <unit bldFile="/adaptation/stubs/systemswstubs/group"/>
+     </component>
+     <component id="tactileclickplugin_stub">
+      <unit bldFile="/adaptation/stubs/tactileclickplugin_stub/group"/>
+     </component>
+     <component id="wlanhwinit_stub">
+      <unit bldFile="/adaptation/stubs/wlanhwinit_stub/group"/>
+     </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 27a3dfc1b15b -r e754af35c291 symbian3/app/camera/package_definition_3.0.xml
--- a/symbian3/app/camera/package_definition_3.0.xml	Thu Feb 18 10:49:08 2010 +0000
+++ b/symbian3/app/camera/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
@@ -7,6 +7,7 @@
       </component>
       <component id="cameraapp" filter="s60" name="Camera Application">
         <unit bldFile="camerauis/cameraapp/group"/>
+        <unit bldFile="camerauis/cameraapp/help/group"/>
       </component>
     </collection>
     <collection id="camera_info" name="Camera Apps Info">
diff -r 27a3dfc1b15b -r e754af35c291 symbian3/app/videotelephony/package_definition_3.0.xml
--- a/symbian3/app/videotelephony/package_definition_3.0.xml	Thu Feb 18 10:49:08 2010 +0000
+++ b/symbian3/app/videotelephony/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
@@ -3,7 +3,7 @@
   <package id="videotelephony" name="Video Telephony Apps" levels="engine plugin prot ui">
     <collection id="vtengines" name="Video Telephony Engines" level="engine">
       <component id="videoteleng" filter="s60" name="Video Telephony Engine">
-        <unit bldFile="vtengines/videoteleng/group"/>
+        <unit bldFile="vtengines/videoteleng/Group"/>
       </component>
       <component id="vtmediatorplugin" filter="s60" name="VT Mediator Plugin" class="plugin">
         <unit bldFile="vtengines/vtmediatorplugin/group"/>
@@ -16,10 +16,10 @@
     </collection>
     <collection id="vtprotocolplugins" name="VT Protocol Plugins" level="plugin">
       <component id="displaysink" filter="s60" name="Display Sink" introduced="^2">
-        <unit bldFile="vtprotocolplugins/displaysink/group"/>
+        <unit bldFile="vtprotocolplugins/DisplaySink/group"/>
       </component>
       <component id="videosource" filter="s60" name="Video Source" introduced="^2">
-        <unit bldFile="vtprotocolplugins/videosource/group"/>
+        <unit bldFile="vtprotocolplugins/VideoSource/group"/>
       </component>
     </collection>
     <collection id="vtprotocolsstub" name="VT Protocols Stub" level="prot">
diff -r 27a3dfc1b15b -r e754af35c291 symbian3/mw/mmmw/package_definition_3.0.xml
--- a/symbian3/mw/mmmw/package_definition_3.0.xml	Thu Feb 18 10:49:08 2010 +0000
+++ b/symbian3/mw/mmmw/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
@@ -41,6 +41,9 @@
       <component id="metadatautility" filter="s60" name="Metadata Utility">
         <unit bldFile="mmserv/metadatautility/group"/>
       </component>
+      <component id="3gpextparserstub" filter="sf_build" name="3GPExt Parser Stub">
+        <unit bldFile="mmserv/metadatautility/3GPExtParserLib_stub/group"/>
+      </component>
       <component id="radioutility" filter="s60" name="Radio Utility">
         <unit bldFile="mmserv/radioutility/group"/>
       </component>
diff -r 27a3dfc1b15b -r e754af35c291 symbian3/mw/securitysrv/package_definition_3.0.xml
--- a/symbian3/mw/securitysrv/package_definition_3.0.xml	Thu Feb 18 10:49:08 2010 +0000
+++ b/symbian3/mw/securitysrv/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
@@ -30,7 +30,7 @@
         <unit bldFile="pkiutilities/devicetoken/group"/>
       </component>
       <component id="certificates" filter="s60" name="Certificates">
-        <unit bldFile="pkiutilities/certificates/group" filter="sf_build"/>
+        <unit bldFile="pkiutilities/Certificates/group" filter="sf_build"/>
       </component>
       <component id="pkiutilities_build" filter="s60" name="PKI Utilities Build">
       	<!-- need to split this into the above components -->
diff -r 27a3dfc1b15b -r e754af35c291 symbian3/mw/uiresources/package_definition_3.0.xml
--- a/symbian3/mw/uiresources/package_definition_3.0.xml	Thu Feb 18 10:49:08 2010 +0000
+++ b/symbian3/mw/uiresources/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
@@ -43,6 +43,9 @@
       <component id="aknicon" filter="s60" name="Avkon Icon Framework">
         <unit bldFile="uigraphics/aknicon/group"/>
       </component>
+      <component id="nvgrenderstage" filter="sf_build" name="NVG Render Stage">
+        <unit bldFile="uigraphics/nvgrenderstage/group"/> 
+      </component>
     </collection>
     <collection id="layouts" name="Layouts" level="plugin">
       <component id="cdl" filter="s60" name="Customization Definition Language">
diff -r 27a3dfc1b15b -r e754af35c291 symbian3/os/buildtools/package_definition_3.0.xml
--- a/symbian3/os/buildtools/package_definition_3.0.xml	Thu Feb 18 10:49:08 2010 +0000
+++ b/symbian3/os/buildtools/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
@@ -44,7 +44,7 @@
       </component>
     </collection>
     <collection id="sbsv1_os" name="Symbian Build System v1" level="fw">
-      <component id="e32toolp" name="E32 Perl Tools" purpose="development" target="desktop" filter="test">
+      <component id="e32toolp" name="E32 Perl Tools" purpose="development" target="desktop" filter="sf_build">
         <unit mrp="sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="sbsv1_os/e32toolp/group"/>
       </component>
 	  </collection>
diff -r 27a3dfc1b15b -r e754af35c291 symbian3/os/cellularsrv/package_definition_3.0.xml
--- a/symbian3/os/cellularsrv/package_definition_3.0.xml	Thu Feb 18 10:49:08 2010 +0000
+++ b/symbian3/os/cellularsrv/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
@@ -74,7 +74,7 @@
       <component id="common_tsy" name="Common TSY" introduced="^2" purpose="optional" class="plugin">
         <unit bldFile="telephonyserverplugins/common_tsy/group" mrp="telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
       </component>
-      <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="test">
+      <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="sf_build">
         <unit mrp="telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="telephonyserverplugins/licenseetsystub/group"/>
       </component>
       <component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
diff -r 27a3dfc1b15b -r e754af35c291 symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml
--- a/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Thu Feb 18 10:49:08 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Wed Feb 17 23:59:17 2010 +0000
@@ -100,11 +100,11 @@
 ]>
 <SystemDefinition schema="3.0.0">
   <systemModel name="Symbian^3">
-    <layer id="adaptation" name="Adaptation" levels="low mw high">
-      <package id="stubs" tech-domain="hb" name="Stubs" level="high"/>
-      <package id="beagleboard" tech-domain="hb" name="Beagle Board" level="low"/>
-      <package id="qemu" tech-domain="hb" name="QEMU and Baseport" level="low"/>
-	</layer>
+    <layer id="adaptation" name="Adaptation" levels="hw-if">
+      <package id="qemu" level="hw-if" href="../../../../adaptation/qemu/package_definition_3.0.xml"/>
+      <package id="beagleboard" level="hw-if" href="../../../../adaptation/beagleboard/package_definition_3.0.xml"/>
+      <package id="stubs" level="hw-if" href="../../../../adaptation/stubs/package_definition_3.0.xml"/>
+    </layer>
     <layer id="os" name="OS" levels="hw services">
       <package id="kernelhwsrv" level="hw" tech-domain="hb" href="../../../../os/kernelhwsrv/package_definition_3.0.xml"/>
       <package id="boardsupport" level="hw" tech-domain="hb" href="../../../../os/boardsupport/package_definition_3.0.xml"/>
@@ -213,7 +213,7 @@
       <package id="graphicsuis" level="services" tech-domain="ui" href="../../../../app/graphicsuis/package_definition_3.0.xml"/>
       <package id="profile" level="apps" tech-domain="ui" href="../../../../app/profile/package_definition_3.0.xml"/>
       <package id="speechsrv" level="services" tech-domain="ui" href="../../../../app/speechsrv/package_definition_3.0.xml"/>
-      <package id="homescreentools" level="services" tech-domain="ui"  href="../../../../app/homescreentools/package_definition_3.0.xml"/>
+      <package id="homescreentools" level="services" tech-domain="ui"  href="../../../../tools/homescreentools/package_definition_3.0.xml"/>
       <package id="webuis" level="services" tech-domain="rt" href="../../../../app/webuis/package_definition_3.0.xml"/>
       <package id="jrt" level="services" tech-domain="rt" href="../../../../app/jrt/package_definition_3.0.xml"/>
       <package id="conntools" level="services" tech-domain="dc" href="../../../../app/conntools/package_definition_3.0.xml"/>
diff -r 27a3dfc1b15b -r e754af35c291 symbian3/os/deviceplatformrelease/package_definition_3.0.xml
--- a/symbian3/os/deviceplatformrelease/package_definition_3.0.xml	Thu Feb 18 10:49:08 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
@@ -4,7 +4,7 @@
     <collection id="s60extras" name="S60 Extras" level="mid">
     	<!-- collection is really a component. Need to move down a directory -->
       <component id="s60extras_build" filter="s60" name="S60 Extras Build" class="config" purpose="development">
-        <unit bldFile="s60extras/group"/>
+        <unit bldFile="S60Extras/group"/>
       </component>
     </collection>
     <collection id="locfiles" name="Locale Files" level="mid">
@@ -65,7 +65,7 @@
     <collection id="version" name="Version" level="top">
     	<!-- collection is really a component. Need to move down a directory -->    
       <component id="version_build" filter="s60" name="Version Build" class="config" purpose="development">
-        <unit bldFile="version/group"/>
+        <unit bldFile="Version/group"/>
       </component>
     </collection>
     
@@ -80,6 +80,9 @@
       <component id="config" filter="s60" name="Config" class="config" purpose="development">
         <unit base="sf_config/config"/>
       </component>
+      <component id="sf_cenrep" filter="sf_build" name="ConE cenrep config" class="config" purpose="development">
+        <unit bldFile="sf_config/cenrep/group"/>
+      </component>
     </collection>
         <!-- should be located locally in buildplatforms/group 
     <collection id="s60bld" name="S60 Build">
diff -r 27a3dfc1b15b -r e754af35c291 symbian3/os/graphics/package_definition_3.0.xml
--- a/symbian3/os/graphics/package_definition_3.0.xml	Thu Feb 18 10:49:08 2010 +0000
+++ b/symbian3/os/graphics/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="graphics" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
     <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
@@ -62,8 +62,11 @@
       <component id="graphics_plat" filter="s60" name="Graphics Platform Interfaces" class="api">
         <unit bldFile="graphics_plat/group"/>
       </component>
-      <component id="graphics_pub" filter="s60" name="Graphics Public Interfaces" class="api">
-        <unit bldFile="graphics_pub/group"/>
+      <component id="graphics_plat" filter="s60" name="Graphics Platform Interfaces" class="api">
+        <unit bldFile="graphics_plat/group"/>
+      </component>
+      <component id="m3g_core_api" filter="sf_build" name="M3G Core API" class="api">
+        <unit bldFile="graphics_plat/m3g_core_api/group"/> <!-- cope with missing graphics_plat/group -->
       </component>
       <component id="graphicsdocs" name="Graphics Documentation" purpose="development" class="doc">
         <unit mrp="graphics_info/graphicsdocs/graphics_documentation.mrp"/>
@@ -97,6 +100,9 @@
       <component id="openglesinterface" name="OpenGL ES Interface" introduced="8.0" purpose="optional">
         <unit bldFile="opengles/openglesinterface/group" mrp="opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
       </component>
+      <component id="opengles_stub" filter="sf_build" name="OpenGL ES stub" purpose="optional">
+        <unit bldFile="opengles/openglesinterface/group/opengles_stub"/>
+      </component>
     </collection>
     <collection id="openvg" name="OpenVG" level="internal-adaptations">
       <component id="openvginterface" name="OpenVG Interface" introduced="^2" purpose="optional">
@@ -106,6 +112,9 @@
      	<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
         <unit bldFile="openvg/openvginterface/group/openvg11"/>
       </component>
+      <component id="khropenvgri" filter="sf_build" name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
+        <unit bldFile="openvg/openvgrefimplementation/sfopenvg/group"/>
+      </component>
     </collection>
     <collection id="egl" name="EGL" level="internal-adaptations">
       <component id="eglinterface" name="EGL Interface" introduced="^2" purpose="optional">
diff -r 27a3dfc1b15b -r e754af35c291 symbian3/os/networkingsrv/package_definition_3.0.xml
--- a/symbian3/os/networkingsrv/package_definition_3.0.xml	Thu Feb 18 10:49:08 2010 +0000
+++ b/symbian3/os/networkingsrv/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
@@ -89,6 +89,9 @@
       <component id="iptransportlayer" name="IP Transport Layer" introduced="^3" purpose="optional" class="plugin">
         <unit bldFile="networkcontrol/iptransportlayer/group" mrp="networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
       </component>
+      <component id="ipupsplugins" name="IP UPS" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="networkcontrol/ipupsplugins/group"/>
+      </component>
       <component id="commsuserpromptmgr" name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
         <unit bldFile="networkcontrol/commsuserpromptmgr/group" mrp="networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
       </component>
diff -r 27a3dfc1b15b -r e754af35c291 symbian3/tools/homescreentools/package_definition_3.0.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/tools/homescreentools/package_definition_3.0.xml	Wed Feb 17 23:59:17 2010 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="homescreentools" name="Home Screen Tools" levels="tool install">
+    <collection id="dtdinstaller" name="DTD Installer" level="install">
+    	<!-- collection is really a component. Needs to be moved down a directory -->
+    	<!-- this needs to be built first, does build order need to be forced with filters? -->
+      <component id="dtdinstaller_build" filter="s60" name="DTD Installer Build" target="desktop" class="tool">
+        <unit bldFile="/tools/homescreentools/dtdinstaller/group"/>
+      </component>
+    </collection>
+    <collection id="themeinstaller" name="Theme Installer" level="install">
+    	<!-- collection is really a component. Needs to be moved down a directory -->
+      <component id="themeinstaller_build" filter="s60" name="Theme Installer Build" target="desktop" class="tool">
+        <unit bldFile="/tools/homescreentools/themeinstaller/group"/>
+      </component>
+    </collection>
+    <collection id="widgettools" name="Widget Tools" level="install">
+      <component id="hspluginpreinstaller" filter="s60" name="HS Plugin Preinstaller" target="desktop" class="tool" introduced="^3">
+        <unit bldFile="/tools/homescreentools/widgettools/hspluginpreinstaller/group"/>
+      </component>
+      <component id="wrtwidgetpreinstaller" filter="s60" name="WRT Widget Preinstaller" target="desktop" class="tool" introduced="^3">
+        <unit bldFile="/tools/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
+      </component>
+    </collection>
+    <collection id="themetool" name="Theme Tool" level="tool">
+      <component id="themetool_build" filter="s60" name="Theme Tool Build"  target="desktop" class="tool">
+        <unit bldFile="/tools/homescreentools/themetool/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>