--- a/symbian3/single/sysdefs/system_model_3.0.xml Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml Fri Oct 15 14:33:14 2010 +0100
@@ -5,57 +5,57 @@
<package id="stubs" tech-domain="hb" level="high" name="Stubs" levels="stub">
<collection id="s60_stubs" level="stub">
<component id="audiostubs" name="Audio Stubs">
-<unit bldFile="/adaptation/stubs/audiostubs/group"/>
+<unit bldFile="/adapt/stubs/audiostubs/group"/>
</component>
<component id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="/adaptation/stubs/btaudioadaptation_stub/group"/>
+<unit bldFile="/adapt/stubs/btaudioadaptation_stub/group"/>
</component>
<component id="drm_stubs" name="DRM Stubs">
-<unit bldFile="/adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="/adapt/stubs/drm_stubs/group"/>
</component>
<component id="ocrsrv_stub" name="OCR Services Stub">
-<unit bldFile="/adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="/adapt/stubs/ocrsrv_stub/group"/>
</component>
<component id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="/adapt/stubs/omasuplasnconverterstubimpl/group"/>
</component>
<component id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" class="plugin">
-<unit bldFile="/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="/adapt/stubs/posmsgpluginreferenceimpl/group"/>
</component>
<component id="srsfenginestub" name="SRSF Engine Stub">
-<unit bldFile="/adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="/adapt/stubs/srsfenginestub/group"/>
</component>
<component id="power_save_display_mode_stub" name="Power Save Display Mode Stub">
-<unit bldFile="/adaptation/stubs/power_save_display_mode_stub/group"/>
+<unit bldFile="/adapt/stubs/power_save_display_mode_stub/group"/>
</component>
<component id="systemswstubs" name="System Software Stubs">
-<unit bldFile="/adaptation/stubs/systemswstubs/group"/>
+<unit bldFile="/adapt/stubs/systemswstubs/group"/>
</component>
<component id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" class="plugin">
-<unit bldFile="/adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="/adapt/stubs/tactileclickplugin_stub/group"/>
</component>
<component id="wlanhwinit_stub" name="WLAN Hardware Init Stub">
-<unit bldFile="/adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="/adapt/stubs/wlanhwinit_stub/group"/>
</component>
</collection>
</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_build" name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530" mrp="/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+<unit bldFile="/adapt/beagleboard/omap3530" mrp="/adapt/beagleboard/omap3530/base_beagle.mrp"/>
</component>
<component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530/kernel"/>
+<unit bldFile="/adapt/beagleboard/omap3530/kernel"/>
</component>
<component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530/beagleboard"/>
+<unit bldFile="/adapt/beagleboard/omap3530/beagleboard"/>
</component>
</collection>
</package>
<package id="qemu" tech-domain="hb" level="low" name="QEMU and Baseport" levels="hw-if">
<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"/>
+<unit bldFile="/adapt/qemu/baseport/syborg" mrp="/adapt/qemu/baseport/syborg/syborg.mrp"/>
</component>
</collection>
</package>
@@ -583,7 +583,7 @@
<unit bldFile="/os/ossrv/ofdbus/dbus-glib/group"/>
</component>
<component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
Consider moving IBY file to one of the above as well and removing this component entirely -->
<unit bldFile="/os/ossrv/ofdbus/group"/>
</component>
@@ -1006,7 +1006,7 @@
<meta rel="config">
<defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
</meta>
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
+<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
may need to -->
<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
</component>
@@ -1020,7 +1020,7 @@
<unit bldFile="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
</component>
<component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
-<!-- Move exports to a self-contained component.
+<!-- Move exports to a self-contained component.
This needs to be kept around until configuration is in place -->
<unit bldFile="/os/devicesrv/resourcemgmt/group"/>
</component>
@@ -2041,7 +2041,7 @@
<unit bldFile="/os/mm/devsoundextensions/effectspresets/group"/>
</component>
<component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
+<!-- need to #include the lot from a single bld.inf
Also move to a standard component location, not under effectspresets -->
<unit bldFile="/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
<unit bldFile="/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -2469,7 +2469,7 @@
</collection>
<collection id="textandlocutils" name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
+<!-- components in this collection need to be moved to the right collection.
Either move into the units' directories, or create a new textandlocutils directory -->
<component id="numbergrouping" filter="s60" name="Number Grouping">
<unit bldFile="/os/textandloc/charconvfw/numbergrouping/group"/>
@@ -2515,8 +2515,8 @@
<package id="xmlsrv" level="services" tech-domain="rt" name="XML Services" levels="plugin server framework generic specific">
<collection id="xmlsrv_plat" name="XML Services Platform Interfaces" level="specific">
<component id="xmlsrv_plat_build" name="XML Services Platform Interface Build" class="api" filter="s60">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
+<!-- need to fix the configuration used here.
+ Either destribute to other components or use the new feature flags confguration mechanisms.
Remove this component and uncomment the other units when fixed-->
<unit bldFile="/os/xmlsrv/xmlsrv_plat/group"/>
</component>
@@ -2913,7 +2913,7 @@
</component>
</collection>
<collection id="contextframework" name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
+<!-- the units that are commented out need to be put back when configuration is in place.
They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
<component id="cfw" filter="s60" name="Context Framework">
<meta rel="config">
@@ -4008,8 +4008,8 @@
</component>
</collection>
<collection id="vpnengine" name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
+<!-- too many components in this collection.
+ Probably best to group the binaries together into larger components
or maybe split the collection into more reasonable groups -->
<component id="eventmediatorapi" filter="s60" name="Event Mediator API">
<unit bldFile="/mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
@@ -4974,7 +4974,7 @@
<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
</component>
<component id="remotestoragefw_build" filter="s60" name="Remote Storage Framework Build">
-<!-- move exports to other components.
+<!-- move exports to other components.
This is needed for #includes of configured component until congigiration is in place -->
<unit bldFile="/mw/remotestorage/remotestoragefw/group"/>
</component>
@@ -5256,9 +5256,9 @@
</meta>
<component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+ <unit bldFile="upnpharvester/common/cmsettings/group"/>
+ <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
<unit bldFile="upnpharvester/common/dbmanager/group"/>-->
</component>
<component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
@@ -5466,15 +5466,15 @@
<component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
<unit bldFile="/mw/usbservices/usbclasses/usbmscpersonality/group"/>
</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
+<!-- commented out in bld.inf. Should this be deleted?
+ <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+ <unit bldFile="usbclasses/ptpstack/group"/>
+ </component>
+ <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+ <unit bldFile="usbclasses/sicdusbplugin/group"/>
+ </component>
+ <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+ <unit bldFile="usbclasses/ptpserver/group"/>
</component>-->
<component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
<unit bldFile="/mw/usbservices/usbclasses/pictbridgeengine/group"/>
@@ -5585,7 +5585,7 @@
<meta rel="config">
<not-defined condition="RD_MDS_2_5"/>
</meta>
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>-->
</component>
<component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
@@ -5604,14 +5604,14 @@
<meta rel="config">
<not-defined condition="RD_MDS_2_5"/>
</meta>
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
<unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>-->
</component>
<component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" class="api" filter="s60">
<meta rel="config">
<not-defined condition="RD_MDS_2_5"/>
</meta>
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
<unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>-->
</component>
<component id="metadatasrv_plat_build" name="Legacy Metadata Services Platform Interface Build" class="api" filter="s60">
@@ -6176,14 +6176,14 @@
<meta rel="config">
<defined condition="IAD_INCLUDE_BACKSTEPPING"/>
</meta>
-<!-- uncomment when configuration is put in place
+<!-- uncomment when configuration is put in place
<unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
</component>
<component id="asx_parser_api" name="ASX Parser API" introduced="^1" class="api" filter="s60">
<meta rel="config">
<defined condition="__WINDOWS_MEDIA"/>
</meta>
-<!-- uncomment when configuration is put in place
+<!-- uncomment when configuration is put in place
<unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
</component>
<component id="playback_helper_api" name="Playback Helper API" introduced="^1" class="api" filter="s60">
@@ -6217,7 +6217,7 @@
</collection>
<collection id="mmappcomponents" name="Multimedia App Components" level="utils">
<component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
Can remove this once configuration is in place-->
<unit bldFile="/mw/mmappfw/mmappcomponents/group"/>
</component>
@@ -7325,10 +7325,10 @@
<component id="fontprovider" filter="s60" name="Font Provider">
<unit bldFile="/mw/uiresources/fontsupport/fontprovider/group"/>
</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+ <component id="s60_fonts" filter="s60" name="S60 Fonts">
+ <unit bldFile="fontsupport/fontutils/group"/>
+ </component>
-->
<component id="fontutils" filter="sf_build" name="Font Utils">
<unit bldFile="/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -7608,7 +7608,7 @@
<unit bldFile="/mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
</component>
<component id="contentpublishingsrv_build" filter="s60" name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
If keeping, it need to move down a directory.-->
<unit bldFile="/mw/homescreensrv/contentpublishingsrv/group"/>
</component>
@@ -7630,7 +7630,7 @@
<unit bldFile="/mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
</component>
<component id="contentcontrolsrv_build" name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
If keeping, it need to move down a directory.-->
<unit bldFile="/mw/homescreensrv/contentcontrolsrv/group"/>
</component>
@@ -8047,7 +8047,7 @@
<unit bldFile="/mw/web/codhandler/roapapp/group"/>
</component>
<component id="codhandler_build" filter="s60" name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
+<!-- Exports need to go into another component or make this self-contained.
#included .hrh file needs to be #included in each of the other components -->
<unit bldFile="/mw/web/codhandler/group"/>
</component>
@@ -8100,7 +8100,7 @@
<!--<unit bldFile="widgets/widgetstartup/group"/>-->
</component>
<component id="widgets_build" filter="s60" name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
#included .hrh file needs to be #included in each of the other components -->
<unit bldFile="/mw/web/widgets/group"/>
</component>
@@ -8688,7 +8688,7 @@
<unit bldFile="/app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
</component>
<component id="convergedconnectionhandler_build" filter="s60" name="CCH Build" introduced="^2">
-<!-- consider distributing this into the above components, or collapse the collection into a single component.
+<!-- consider distributing this into the above components, or collapse the collection into a single component.
The latter is a better option since clients and sevrers are rarely separate components -->
<unit bldFile="/app/iptelephony/convergedconnectionhandler/group"/>
</component>
@@ -8845,7 +8845,7 @@
<unit bldFile="/app/devicecontrol/devicediagnostics/diagsuites/group"/>
</component>
<component id="devicediagnostics_build" filter="s60" name="Device Diagnostics Build">
-<!-- can the exports be moved to one of the other components?
+<!-- can the exports be moved to one of the other components?
or all #includes removed from here, and it renamed Device Diagnostics ROM -->
<unit bldFile="/app/devicecontrol/devicediagnostics/group"/>
</component>
@@ -9901,7 +9901,7 @@
<unit bldFile="/app/commonemail/meetingrequest/mrurlparserplugin/group"/>
</component>
<component id="meetingrequest_build" filter="s60" name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
+<!-- can the exports be broken up into the other components ?
alternatively, move the exports into a RM Config component-->
<unit bldFile="/app/commonemail/meetingrequest/group"/>
</component>
@@ -10138,8 +10138,8 @@
<unit bldFile="/app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
<unit bldFile="/app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
<unit bldFile="/app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+ <unit bldFile="imageeditor/plugins/drawplugin/group"/>
-->
</component>
<component id="editorprovider" filter="s60" name="Image Editor Provider">
@@ -10173,8 +10173,8 @@
<unit bldFile="/app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
<unit bldFile="/app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
<unit bldFile="/app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+ <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
-->
</component>
<component id="imageeditorutils" filter="s60" name="Image Editor Utilities">
@@ -10561,7 +10561,7 @@
<defined condition="__SERIES60_NATIVE_BROWSER"/>
</meta>
<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
+<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
</component>
<component id="scrsaver_slideshowplugin" filter="s60" name="Screen Saver Slideshow Plugin" class="plugin">
@@ -10944,7 +10944,7 @@
<unit bldFile="/app/webuis/pushmtm/plugins/group"/>
</component>
<component id="pushmtm_build" filter="s60" name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
+<!-- Some content is at collection level and some is at comopnent level. Either make this a single
component and move it down a diretcory, or make separate independent components in this collection -->
<unit bldFile="/app/webuis/pushmtm/group"/>
</component>