--- a/symbian4/single/sysdefs/auto/system_model_3.0.xml Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian4/single/sysdefs/auto/system_model_3.0.xml Tue Aug 24 14:27:40 2010 +0100
@@ -1,108 +1,108 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition xmlns:qt="http://www.nokia.com/qt" id-namespace="http://www.symbian.org/system-definition" schema="3.0.0">
<systemModel name="Symbian^4">
-<layer id="adaptation" name="Adaptation" levels="low mw high">
-<package id="stubs" tech-domain="hb" level="high" span="2" name="Stubs" levels="adaptation plugin mid engine">
-<collection id="audiostubs" name="Audio Stubs" level="adaptation">
+<layer id="adapt" name="Adaptation" levels="low mw high">
+<package id="stubs" tech-domain="hb" level="high" span="2" name="Stubs" levels="adapt plugin mid engine">
+<collection id="audiostubs" name="Audio Stubs" level="adapt">
<component id="devsoundextensions_stubs" name="Devsound Extensions Stubs">
-<unit bldFile="/adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+<unit bldFile="/adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
</component>
<component id="fmradiotunercontrolstub" name="FM Radio Tuner Control Stub">
-<unit bldFile="/adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
-</component>
-</collection>
-<collection id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub" level="adaptation">
-<component id="btaudioadaptation_stub_build" name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
-<unit bldFile="/adaptation/stubs/btaudioadaptation_stub/group"/>
+<unit bldFile="/adapt/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+</component>
+</collection>
+<collection id="btaudioadapt_stub" name="Bluetooth Audio Adaptation Stub" level="adapt">
+<component id="btaudioadapt_stub_build" name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
+<unit bldFile="/adapt/stubs/btaudioadapt_stub/group"/>
</component>
</collection>
<collection id="drm_stubs" name="DRM Stubs" level="plugin">
<component id="drm_stubs_build" name="DRM Stubs Build">
-<unit bldFile="/adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="/adapt/stubs/drm_stubs/group"/>
</component>
</collection>
<collection id="ocrsrv_stub" name="OCR Services Stub" level="mid">
<component id="ocrsrv_stub_build" name="OCR Services Stub Build" filter="!dfs_build">
-<unit bldFile="/adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="/adapt/stubs/ocrsrv_stub/group"/>
</component>
</collection>
<collection id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
<component id="omasuplasnconverterstubimpl_build" name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
-<unit bldFile="/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="/adapt/stubs/omasuplasnconverterstubimpl/group"/>
</component>
</collection>
<collection id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" level="plugin">
<component id="posmsgpluginreferenceimpl_build" name="POS Message Plugin Reference Implementation Build" class="plugin">
-<unit bldFile="/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="/adapt/stubs/posmsgpluginreferenceimpl/group"/>
</component>
</collection>
<collection id="srsfenginestub" name="SRSF Engine Stub" level="engine">
<component id="srsfenginestub_build" name="SRSF Engine Stub Build" filter="stubs">
-<unit bldFile="/adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="/adapt/stubs/srsfenginestub/group"/>
</component>
</collection>
<collection id="power_save_display_mode_stub" name="Power Save Display Mode Stub" level="plugin">
<component id="power_save_display_mode_stub_build" name="Power Save Display Mode Stub Build">
-<unit bldFile="/adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-</collection>
-<collection id="systemswstubs" name="System Software Stubs" level="adaptation">
+<unit bldFile="/adapt/stubs/power_save_display_mode_stub/group"/>
+</component>
+</collection>
+<collection id="systemswstubs" name="System Software Stubs" level="adapt">
<component id="ddcaccessstub" name="DDC Access Stub">
-<unit bldFile="/adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+<unit bldFile="/adapt/stubs/systemswstubs/ddcaccessstub/group"/>
</component>
<component id="tvoutconfig" name="TV Out Config">
-<unit bldFile="/adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
</component>
<component id="accessorypolicyreference" name="Accessory Policy Reference">
<meta rel="config">
<defined condition="__ACCESSORY_FW"/>
</meta>
-<unit bldFile="/adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
</component>
<component id="asyreference" name="ASY Reference" class="plugin">
<meta rel="config">
<defined condition="__ACCESSORY_FW"/>
</meta>
-<unit bldFile="/adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
</component>
<component id="examplecommonisc" name="Example Common ISC">
-<unit bldFile="/adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
</component>
<component id="exampledsy" name="Example DSY">
<meta rel="config">
<defined condition="RD_STARTUP_CHANGE"/>
</meta>
-<unit bldFile="/adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
</component>
<component id="featuremanagerstub" name="Feature Manager Stub">
-<unit bldFile="/adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
</component>
<component id="hwrmstubplugins" name="Hardware Resource Manager Stub Plugins" class="plugin">
-<unit bldFile="/adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
</component>
<component id="hwrmhapticsstubplugin" name="Hardware Resource Manager Haptics Stub Plugin" class="plugin">
-<unit bldFile="/adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
</component>
<component id="sensorchannelsreference" name="Sensor Channels Reference">
-<unit bldFile="/adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
</component>
<component id="ssyreference" name="SSY Reference" class="plugin">
<meta rel="config">
<defined condition="RD_SENSOR_FW"/>
</meta>
-<unit bldFile="/adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
-</component>
-<component id="startupadaptationstub" name="Startup Adaptation Stub" class="plugin">
-<unit bldFile="/adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+</component>
+<component id="startupadaptstub" name="Startup Adaptation Stub" class="plugin">
+<unit bldFile="/adapt/stubs/systemswstubs/startupadaptstub/group" filter="oem_build"/>
</component>
<component id="tiltcompensationstub" name="Tilt Compensation Stub">
-<unit bldFile="/adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
</component>
<component id="tvoutbehaviour" name="TV Out Behaviour">
-<unit bldFile="/adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
</component>
<component id="wiredbearerreference" name="Wired Bearer Reference" class="plugin">
-<unit bldFile="/adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
</component>
</collection>
<collection id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" level="engine">
@@ -110,38 +110,38 @@
<defined condition="RD_TACTILE_FEEDBACK"/>
</meta>
<component id="tactileclickplugin_stub_build" name="Tactile Click Plugin Stub Build" class="plugin">
-<unit bldFile="/adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="/adapt/stubs/tactileclickplugin_stub/group"/>
</component>
</collection>
<collection id="wlanhwinit_stub" name="WLAN Hardware Init Stub" level="mid">
<component id="wlanhwinit_stub_build" name="WLAN Hardware Init Stub Build">
-<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>
</layer>
<layer id="os" name="OS" levels="hw services">
-<package id="kernelhwsrv" level="hw" tech-domain="hb" name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+<package id="kernelhwsrv" level="hw" tech-domain="hb" name="Kernel and Hardware Services" levels="hw-if adapt framework test">
<collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
<component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional">
<unit bldFile="/os/kernelhwsrv/brdbootldr/ubootldr" mrp="/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -152,7 +152,7 @@
<unit bldFile="/os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="/os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
</component>
</collection>
-<collection id="kernel" name="Kernel Architecture" level="adaptation">
+<collection id="kernel" name="Kernel Architecture" level="adapt">
<component id="eka" name="Kernel Architecture" introduced="8.0" purpose="mandatory">
<unit bldFile="/os/kernelhwsrv/kernel/eka" mrp="/os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
</component>
@@ -168,7 +168,7 @@
<unit bldFile="/os/kernelhwsrv/kerneltest/f32test/group" mrp="/os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
</component>
</collection>
-<collection id="ldds" name="Logical Device Drivers" level="adaptation">
+<collection id="ldds" name="Logical Device Drivers" level="adapt">
<component id="ethernetldd" name="Ethernet Drivers" purpose="optional">
<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="/os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
</component>
@@ -503,7 +503,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>
@@ -582,7 +582,7 @@
</component>
</collection>
</package>
-<package id="persistentdata" level="services" tech-domain="hb" name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+<package id="persistentdata" level="services" tech-domain="hb" name="Persistent Data Services" levels="adapt hw-if plugin framework server app-if">
<collection id="featuremgmt" name="Feature Management" level="framework">
<component id="featuremgr" name="Feature Manager" introduced="^3" purpose="mandatory">
<unit bldFile="/os/persistentdata/featuremgmt/featuremgr/group" mrp="/os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
@@ -633,7 +633,7 @@
</component>
</collection>
</package>
-<package id="devicesrv" level="services" tech-domain="hb" name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+<package id="devicesrv" level="services" tech-domain="hb" name="Device Services" levels="adapt hw-if plugin framework server app-if">
<collection id="devicesrv_pub" name="Device Services Public Interfaces" level="app-if">
<component id="platform_path_definitions_api" name="Platform Path Definitions API" class="api" filter="s60,bldmefirst">
<unit bldFile="/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
@@ -935,7 +935,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>
@@ -949,7 +949,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>
@@ -1108,7 +1108,7 @@
</component>
</collection>
</package>
-<package id="lbs" level="services" tech-domain="lo" name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+<package id="lbs" level="services" tech-domain="lo" name="Locating Services" levels="hw-if data-acquisition adapt management application-interface">
<collection id="datasourcemodules" name="Generic Positioning Plugins" level="data-acquisition">
<component id="defaultpositioningmodule" name="Default Positioning Module" introduced="^2" purpose="optional" class="plugin">
<unit bldFile="/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -1129,9 +1129,9 @@
<unit bldFile="/os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="/os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
</component>
</collection>
-<collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
-<component id="gpsdatasourceadaptation" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin">
-<unit bldFile="/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+<collection id="datasourceadapt" name="Data Source Adaptation" level="adapt">
+<component id="gpsdatasourceadapt" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin">
+<unit bldFile="/os/lbs/datasourceadapt/gpsdatasourceadapt/group" mrp="/os/lbs/datasourceadapt/gpsdatasourceadapt/group/lbs_gps_data_source_adapt.mrp"/>
</component>
</collection>
<collection id="locationrequestmgmt" name="Location Request Management" level="application-interface">
@@ -1165,7 +1165,7 @@
<unit bldFile="/os/lbs/locationmgmt/networkgateway/group" mrp="/os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
</component>
</collection>
-<collection id="networkprotocolmodules" name="Network Protocol Modules" level="adaptation">
+<collection id="networkprotocolmodules" name="Network Protocol Modules" level="adapt">
<component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
<unit bldFile="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
</component>
@@ -1277,7 +1277,7 @@
</component>
</collection>
</package>
-<package id="networkingsrv" level="services" tech-domain="dc" name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+<package id="networkingsrv" level="services" tech-domain="dc" name="Networking Services" levels="adapt hw-if plugin framework server app-if">
<collection id="esockapiextensions" name="ESock API Extensions" level="app-if">
<component id="internetsockets" name="Internet Sockets" introduced="ER5" purpose="mandatory">
<unit bldFile="/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -1499,15 +1499,15 @@
</component>
</collection>
</package>
-<package id="cellularsrv" level="services" tech-domain="vc" name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+<package id="cellularsrv" level="services" tech-domain="vc" name="Cellular Baseband Services" levels="adapt hw-if plugin framework server app-if">
<collection id="basebandabstraction" name="Baseband Abstraction" level="hw-if">
<component id="basebandchanneladaptor" name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
<unit bldFile="/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
</component>
</collection>
-<collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
+<collection id="basebandadaptplugins" name="Baseband Adaptation Plugins" level="adapt">
<component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
-<unit bldFile="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
+<unit bldFile="/os/cellularsrv/basebandadaptplugins/basebandchanneladaptorforc32/group" mrp="/os/cellularsrv/basebandadaptplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
</component>
</collection>
<collection id="smsprotocols" name="SMS Protocols" level="framework">
@@ -1599,7 +1599,7 @@
<unit mrp="/os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
</component>
</collection>
-<collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adaptation">
+<collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adapt">
<component id="mocksy" name="MockSY" introduced="^2" purpose="development" class="plugin">
<unit bldFile="/os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="/os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
</component>
@@ -1610,10 +1610,10 @@
</collection>
</package>
-<package id="bt" level="services" tech-domain="de" name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+<package id="bt" level="services" tech-domain="de" name="Bluetooth" levels="adapt hw-if plugin framework server app-if">
<collection id="bt_plat" name="Bluetooth Platform Interfaces" level="app-if">
-<component id="bluetooth_audio_adaptation_api" name="Bluetooth Audio Adaptation API" class="api" filter="s60">
-<unit bldFile="/os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+<component id="bluetooth_audio_adapt_api" name="Bluetooth Audio Adaptation API" class="api" filter="s60">
+<unit bldFile="/os/bt/bt_plat/bluetooth_audio_adapt_api/group"/>
</component>
<component id="bluetooth_power_management_api" name="Bluetooth Power Management API" class="api" filter="s60">
<unit bldFile="/os/bt/bt_plat/bluetooth_power_management_api/group"/>
@@ -1697,7 +1697,7 @@
</component>
</collection>
</package>
-<package id="usb" level="services" tech-domain="de" name="USB" levels="adaptation hw-if plugin framework server app-if">
+<package id="usb" level="services" tech-domain="de" name="USB" levels="adapt hw-if plugin framework server app-if">
<collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
<!-- usbclientdrivers to be moved here from kernelhwsrv-->
</collection>
@@ -1716,7 +1716,7 @@
</component>
</collection>
</package>
-<package id="mm" level="services" tech-domain="mm" name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+<package id="mm" level="services" tech-domain="mm" name="Multimedia" levels="adapt hw-if device-fw devices middleware app-if">
<collection id="mm_pub" name="Multimedia Public Interfaces" level="app-if">
<component id="audio_effects_api" name="Audio Effects API" class="api" filter="s60">
<unit bldFile="/os/mm/mm_pub/audio_effects_api/group"/>
@@ -1780,8 +1780,8 @@
<component id="custom_interface_utility_api" name="Custom Interface Utility API" class="api" filter="s60">
<unit bldFile="/os/mm/mm_plat/custom_interface_utility_api/group"/>
</component>
-<component id="devsound_adaptation_api" name="DevSound Adaptation API" class="api" filter="s60">
-<unit bldFile="/os/mm/mm_plat/devsound_adaptation_api/group"/>
+<component id="devsound_adapt_api" name="DevSound Adaptation API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/devsound_adapt_api/group"/>
</component>
<component id="display_posting_api" name="Display Posting API" class="api" filter="s60">
<unit bldFile="/os/mm/mm_plat/display_posting_api/group"/>
@@ -1804,8 +1804,8 @@
<component id="error_concealment_interface_proxy_api" name="Error Concealment Interface Proxy API" class="api" filter="s60">
<unit bldFile="/os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
</component>
-<component id="fm_radio_adaptation_api" name="FM Radio Adaptation API" class="api" filter="s60">
-<unit bldFile="/os/mm/mm_plat/fm_radio_adaptation_api/group"/>
+<component id="fm_radio_adapt_api" name="FM Radio Adaptation API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/fm_radio_adapt_api/group"/>
</component>
<component id="g711_decoder_interface_api" name="G711 Decoder Interface API" class="api" filter="s60">
<unit bldFile="/os/mm/mm_plat/g711_decoder_interface_api/group"/>
@@ -1888,8 +1888,8 @@
<component id="ra8_decoder_interface_proxy_api" name="RA8 Decoder Interface Proxy API" class="api" filter="s60">
<unit bldFile="/os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
</component>
-<component id="rds_adaptation_api" name="RDS Adaptation API" class="api" filter="s60">
-<unit bldFile="/os/mm/mm_plat/rds_adaptation_api/group"/>
+<component id="rds_adapt_api" name="RDS Adaptation API" class="api" filter="s60">
+<unit bldFile="/os/mm/mm_plat/rds_adapt_api/group"/>
</component>
<component id="restricted_audio_output_api" name="Restricted Audio Output API" class="api" filter="s60">
<unit bldFile="/os/mm/mm_plat/restricted_audio_output_api/group"/>
@@ -1975,7 +1975,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"/>
@@ -2069,9 +2069,9 @@
<unit bldFile="/os/mm/mmdevicefw/speechrecogsupport/group" mrp="/os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
</component>
</collection>
-<collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adaptation">
+<collection id="mmswadapt" name="Multimedia Software Adaptation" level="adapt">
<component id="videorenderer" name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="/os/mm/mmswadaptation/videorenderer/group" mrp="/os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
+<unit bldFile="/os/mm/mmswadapt/videorenderer/group" mrp="/os/mm/mmswadapt/videorenderer/group/multimedia_videorenderer.mrp"/>
</component>
</collection>
<collection id="mmtestenv" name="Multimedia Test Environment" level="device-fw">
@@ -2126,7 +2126,7 @@
<unit bldFile="/os/mm/devsound/a3fsrvstart/group" mrp="/os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
</component>
</collection>
-<collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adapt">
<component id="devsoundhwdeviceapi" name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
<unit bldFile="/os/mm/devsound/hwdevapi/group" mrp="/os/mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
</component>
@@ -2134,10 +2134,10 @@
<unit bldFile="/os/mm/mmhais/a3facl/group" mrp="/os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
</component>
<component id="a3fdevsoundcustomisation" name="A3F DevSound Customisation" introduced="^2" purpose="optional">
-<unit bldFile="/os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="/os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
+<unit bldFile="/os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="/os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptinfo.mrp"/>
</component>
<component id="refacladapt" name="Reference ACL Adaptation" introduced="^2" purpose="optional">
-<unit bldFile="/os/mm/mmhais/refacladapt/group" mrp="/os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
+<unit bldFile="/os/mm/mmhais/refacladapt/group" mrp="/os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladapt.mrp"/>
</component>
<component id="videohai" name="Video HAI" introduced="7.0s" purpose="mandatory">
<unit bldFile="/os/mm/mmhais/videohai/group" mrp="/os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
@@ -2148,7 +2148,7 @@
</collection>
</package>
-<package id="imagingext" level="services" tech-domain="mm" name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+<package id="imagingext" level="services" tech-domain="mm" name="Imaging Extensions" levels="adapt hw-if plugin framework server app-if">
<collection id="imagingext_pub" name="Imaging Extensions Public Interfaces" level="app-if">
<component id="exif_api" name="Exif API" class="api" filter="s60">
<unit bldFile="/os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
@@ -2179,13 +2179,13 @@
<unit bldFile="/os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
</component>
</collection>
-<collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
+<collection id="imageadaptextensions" name="Image Adaptation Extensions" level="app-if">
<component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
-<unit bldFile="/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component id="imageadaptationextensions_build" filter="s60" name="Image Adaptation Extensions Build">
+<unit bldFile="/os/imagingext/imageadaptextensions/iclextjpegapi/group"/>
+</component>
+<component id="imageadaptextensions_build" filter="s60" name="Image Adaptation Extensions Build">
<!-- Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
-<unit bldFile="/os/imagingext/imageadaptationextensions/group"/>
+<unit bldFile="/os/imagingext/imageadaptextensions/group"/>
</component>
</collection>
<collection id="imagingmodules" name="Imaging Modules" level="hw-if">
@@ -2197,13 +2197,13 @@
</component>
</collection>
</package>
-<package id="graphics" level="services" tech-domain="ui" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
+<package id="graphics" level="services" tech-domain="ui" name="Graphics" levels="adapt engines internal-adapts device-interface internal-utils app-if">
+<collection id="graphicsaccelaration" name="Graphics Acceleration" level="adapt">
<component id="vgi" filter="s60" name="VGI">
<unit bldFile="/os/graphics/graphicsaccelaration/vgi/group"/>
</component>
</collection>
-<collection id="m3g" name="Mobile 3D Graphics" level="internal-adaptations">
+<collection id="m3g" name="Mobile 3D Graphics" level="internal-adapts">
<component id="m3gcore11" filter="s60" name="M3G Core 1.1">
<unit bldFile="/os/graphics/m3g/m3gcore11/group"/>
</component>
@@ -2212,8 +2212,8 @@
<component id="graphicsresource" name="Graphics Resource" introduced="^3" deprecated="^3" purpose="optional">
<unit bldFile="/os/graphics/graphicsresourceservices/graphicsresource/group" mrp="/os/graphics/graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
</component>
-<component id="graphicsresourceadaptation" name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
+<component id="graphicsresourceadapt" name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+<unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceadapt/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceadapt/group/graphics_graphicsresourceadapter.mrp"/>
</component>
<component id="graphicsresourceimplementation" name="Graphics Resource Implementation" introduced="^4" purpose="optional">
<unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
@@ -2227,7 +2227,7 @@
<unit bldFile="/os/graphics/graphicsutils/commongraphicsheaders/group" mrp="/os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
</component>
</collection>
-<collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adaptation">
+<collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adapt">
<!-- displayldd to be moved here -->
<component id="surfacemgr" name="Surface Manager" introduced="^3" purpose="optional">
<unit bldFile="/os/graphics/graphicshwdrivers/surfacemgr/group" mrp="/os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
@@ -2287,7 +2287,7 @@
<unit bldFile="/os/graphics/fbs/fontandbitmapserver/group" mrp="/os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
</component>
</collection>
-<collection id="opengles" name="OpenGLES" level="internal-adaptations">
+<collection id="opengles" name="OpenGLES" level="internal-adapts">
<component id="openglesinterface" name="OpenGL ES Interface" introduced="8.0" purpose="optional">
<unit bldFile="/os/graphics/opengles/openglesinterface/group" mrp="/os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
</component>
@@ -2295,7 +2295,7 @@
<unit bldFile="/os/graphics/opengles/openglesinterface/group/opengles_stub"/>
</component>
</collection>
-<collection id="openvg" name="OpenVG" level="internal-adaptations">
+<collection id="openvg" name="OpenVG" level="internal-adapts">
<component id="openvginterface" name="OpenVG Interface" introduced="^2" purpose="optional">
<unit bldFile="/os/graphics/openvg/openvginterface/group" mrp="/os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
</component>
@@ -2307,7 +2307,7 @@
<unit bldFile="/os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
</component>
</collection>
-<collection id="egl" name="EGL" level="internal-adaptations">
+<collection id="egl" name="EGL" level="internal-adapts">
<component id="eglinterface" name="EGL Interface" introduced="^2" purpose="optional">
<unit bldFile="/os/graphics/egl/eglinterface/group" mrp="/os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
</component>
@@ -2340,8 +2340,8 @@
<component id="directgdiinterface" name="DirectGDI Interface" introduced="^3" deprecated="^3" purpose="optional">
<unit bldFile="/os/graphics/graphicsdeviceinterface/directgdiinterface/group" mrp="/os/graphics/graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
</component>
-<component id="directgdiadaptation" name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="/os/graphics/graphicsdeviceinterface/directgdiadaptation/group" mrp="/os/graphics/graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
+<component id="directgdiadapt" name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+<unit bldFile="/os/graphics/graphicsdeviceinterface/directgdiadapt/group" mrp="/os/graphics/graphicsdeviceinterface/directgdiadapt/group/graphics_directgdiadapter.mrp"/>
</component>
</collection>
<collection id="graphicstools" name="Graphics Tools" level="internal-utils">
@@ -2453,8 +2453,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>
@@ -2788,7 +2788,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">
@@ -2901,9 +2901,9 @@
<unit bldFile="/mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="/mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
</component>
</collection>
-<collection id="hwresourceadaptation" name="Hardware Resource Adaptation" level="generic">
+<collection id="hwresourceadapt" name="Hardware Resource Adaptation" level="generic">
<component id="hwresourcemgruiplugin" name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" class="plugin" deprecated="^4">
-<unit bldFile="/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
+<unit bldFile="/mw/appsupport/hwresourceadapt/hwresourcemgruiplugin/group" mrp="/mw/appsupport/hwresourceadapt/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
</component>
</collection>
<collection id="commonappservices" name="Common Application Services" level="framework">
@@ -3031,8 +3031,8 @@
<component id="lockapp_server_api" name="Lock Application Server API" class="api" filter="s60">
<unit bldFile="/mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
</component>
-<component id="devencadaptation_api" name="Device Encryption Adaptation API" class="api" filter="s60">
-<unit bldFile="/mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+<component id="devencadapt_api" name="Device Encryption Adaptation API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/devencadapt_api/group"/>
</component>
<component id="devenccommonutils_api" name="Device Encryption Common Utils API" class="api" filter="s60">
<unit bldFile="/mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
@@ -3762,8 +3762,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"/>
@@ -4944,9 +4944,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">
@@ -5162,15 +5162,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"/>
@@ -5785,7 +5785,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>
@@ -6913,10 +6913,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"/>
@@ -7567,7 +7567,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>
@@ -7603,7 +7603,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>