Replace pretty much every instance of "adaptation" within file names with "adapt".
--- a/symbian2/single/sysdefs/system_model.xml Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian2/single/sysdefs/system_model.xml Tue Aug 24 14:27:40 2010 +0100
@@ -247,11 +247,11 @@
</collection>
</block>
</layer>
- <layer name="adaptation" long-name="Adaptation">
+ <layer name="adapt" long-name="Adaptation">
<block name="qemu" level="hw-if" long-name="Syborg Adaptation" levels="hw-if">
<collection id="baseport" name="Baseport" level="hw-if">
<component id="syborg" name="Syborg" introduced="symbian^2" purpose="optional">
- <unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
+ <unit bldFile="adapt/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
</component>
</collection>
</block>
@@ -259,125 +259,125 @@
<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" origin-model="foundation">
<!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/audiovibracontrolcistub/group"/> -->
- <!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/custominterfaceproxyfactory_stub/group"/> -->
- <!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/messagehandlerfactory_stub/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/custominterfaceproxyfactory_stub/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/messagehandlerfactory_stub/group"/> -->
<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
</component>
<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub" origin-model="foundation">
- <unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+ <unit bldFile="adapt/stubs/audiostubs/fmradiotunercontrolstub/group"/>
</component>
</collection>
<collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
<component name="drm_stubs_build" long-name="DRM Stubs Component" origin-model="foundation">
- <unit bldFile="adaptation/stubs/drm_stubs/group"/>
+ <unit bldFile="adapt/stubs/drm_stubs/group"/>
</component>
</collection>
<collection name="ptit9core_stub" long-name="PTI T9 Core Stub" level="plugin">
<component name="ptit9core_stub_build" long-name="PTI T9 Core Stub Component" origin-model="foundation"/>
</collection>
<collection name="btaudioadaptation_stub" long-name="BT Audio Adaptation Stub" level="adaptation">
- <component name="btaudioadaptation_stub_build" origin-model="foundation">
- <unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
+ <component name="btaudioadapt_stub_build" origin-model="foundation">
+ <unit bldFile="adapt/stubs/btaudioadapt_stub/group"/>
</component>
</collection>
<collection name="posmsgpluginreferenceimpl" long-name="Pos Msg Plugin Reference Implementation" level="plugin">
<component name="eposomasuplposrefapp" origin-model="foundation">
- <unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+ <unit bldFile="adapt/stubs/posmsgpluginreferenceimpl/group"/>
</component>
</collection>
<collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
<component name="asnimplementation" long-name="ASN Implementation" origin-model="foundation">
- <unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+ <unit bldFile="adapt/stubs/omasuplasnconverterstubimpl/group"/>
</component>
</collection>
<collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
<component name="power_save_display_mode_stub_build" origin-model="foundation">
- <unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
+ <unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
</component>
</collection>
<collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
<component name="adaptationhwdevice" long-name="Adaptation Hardware Device" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/srsfenginestub/adaptationhwdevice/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/srsfenginestub/adaptationhwdevice/group"/> -->
</component>
<component name="grcompilerhwdevice" long-name="GR Compiler Hardware Device" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/srsfenginestub/grcompilerhwdevice/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/srsfenginestub/grcompilerhwdevice/group"/> -->
</component>
<component name="ttphwdevice" long-name="TTP Hardware Device" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/srsfenginestub/ttphwdevice/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/srsfenginestub/ttphwdevice/group"/> -->
</component>
<component name="recognitionhwdevice" long-name="Recognition Hardware Device" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/srsfenginestub/recognitionhwdevice/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/srsfenginestub/recognitionhwdevice/group"/> -->
</component>
<component name="vocmanhwdevice" long-name="Voc Man Hardware Device" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/srsfenginestub/vocmanhwdevice/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/srsfenginestub/vocmanhwdevice/group"/> -->
</component>
<component name="ttshwdevice" long-name="TTS Hardware Device" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/srsfenginestub/ttshwdevice/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/srsfenginestub/ttshwdevice/group"/> -->
</component>
<component name="nlphwdevice" long-name="NLP Hardware Device" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/srsfenginestub/nlphwdevice/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/srsfenginestub/nlphwdevice/group"/> -->
</component>
<component unofficial="yes" name="srsfenginestub_build" long-name="SRSF Engine Stub Build" origin-model="foundation">
- <unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+ <unit bldFile="adapt/stubs/srsfenginestub/group"/>
</component>
</collection>
<collection name="systemswstubs" long-name="System SW Stubs" level="adaptation">
<component name="accessorypolicyreference" long-name="Accessory Policy Reference" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/accessorypolicyreference/group"/>
</component>
<component name="asyreference" long-name="ASY Reference" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/asyreference/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/asyreference/group"/>
</component>
<component name="examplecommonisc" long-name="Example Common ISC" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/examplecommonisc/group"/>
</component>
<component name="exampledsy" long-name="Example DSY" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/exampledsy/group"/>
</component>
<component name="featuremanagerstub" long-name="Feature Manager Stub" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/featuremanagerstub/group"/>
</component>
<component name="tvoutconfig" long-name="TVOut Config" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/tvoutconfig/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/tvoutconfig/group"/>
</component>
<component name="hwrmstubplugins" long-name="HWRM Stub Plugins" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/hwrmstubplugins/group"/>
</component>
<component name="hwrmhapticsstubplugin" long-name="HWRM Haptics Stub Plugin" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/hwrmhapticsstubplugin/group"/>
</component>
<component name="sensorchannelsreference" long-name="Sensor Channels Reference" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/sensorchannelsreference/group"/>
</component>
<component name="ssyreference" long-name="SSY Rreference" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/ssyreference/group"/>
</component>
<component name="startupadaptationstub" long-name="Startup Adaptation Stub" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/startupadaptationstub/group"/>
</component>
<component name="tiltcompensationstub" long-name="Tilt Compensation Stub" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/tiltcompensationstub/group"/>
</component>
<component name="wiredbearerreference" long-name="Wired Bearer Teference" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/wiredbearerreference/group"/>
</component>
<component unofficial="yes" name="systemswstubs_build" long-name="System SW Stubs Build" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/systemswstubs/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/systemswstubs/group"/> -->
</component>
</collection>
<collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
<component name="tactileclickplugin_build" origin-model="foundation">
- <unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+ <unit bldFile="adapt/stubs/tactileclickplugin_stub/group"/>
</component>
</collection>
<collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
<component name="wlanhwinit" origin-model="foundation">
- <unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+ <unit bldFile="adapt/stubs/wlanhwinit_stub/group"/>
</component>
</collection>
<collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
<component name="ocrsrv" origin-model="foundation">
- <unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+ <unit bldFile="adapt/stubs/ocrsrv_stub/group"/>
</component>
</collection>
</block>
@@ -8253,7 +8253,7 @@
</component>
<component name="imconversationview" long-name="IM Conversation View" origin-model="foundation">
<unit bldFile="app/conversations/imstutils/imconversationview/group"/>
- <!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/dummytestadaptation/group"/> -->
+ <!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/dummytestadapt/group"/> -->
<!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/group"/> -->
</component>
<component unofficial="yes" name="imstutils_build" long-name="IM Service Tab Utils Build" origin-model="foundation">
--- a/symbian2/single/sysdefs/system_model_trimmed.xml Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian2/single/sysdefs/system_model_trimmed.xml Tue Aug 24 14:27:40 2010 +0100
@@ -248,137 +248,137 @@
</collection>
</block>
</layer>
- <layer name="adaptation" long-name="Adaptation">
- <block name="syborg_adaptation" level="hw-if" long-name="Syborg Adaptation" levels="hw-if">
+ <layer name="adapt" long-name="Adaptation">
+ <block name="syborg_adapt" level="hw-if" long-name="Syborg Adaptation" levels="hw-if">
<collection id="baseport" name="Baseport" level="hw-if">
<component id="syborg" name="Syborg" introduced="symbian^2" purpose="optional">
- <unit bldFile="adaptation/QEMU/baseport/syborg" mrp="baseport/syborg/syborg.mrp"/>
+ <unit bldFile="adapt/QEMU/baseport/syborg" mrp="baseport/syborg/syborg.mrp"/>
</component>
</collection>
</block>
- <block name="stubs" long-name="Stubs" tech_domain="hb" levels="adaptation plugin mid engine">
- <collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
+ <block name="stubs" long-name="Stubs" tech_domain="hb" levels="adapt plugin mid engine">
+ <collection name="audiostubs" long-name="Audio Stubs" level="adapt">
<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/audiovibracontrolcistub/group"/> -->
- <!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/custominterfaceproxyfactory_stub/group"/> -->
- <!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/messagehandlerfactory_stub/group"/> -->
- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+ <!-- <unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/audiovibracontrolcistub/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/custominterfaceproxyfactory_stub/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/messagehandlerfactory_stub/group"/> -->
+ <unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
</component>
<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub" origin-model="foundation">
- <unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+ <unit bldFile="adapt/stubs/audiostubs/fmradiotunercontrolstub/group"/>
</component>
</collection>
<collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
<component name="drm_stubs_build" long-name="DRM Stubs Component" origin-model="foundation">
- <unit bldFile="adaptation/stubs/drm_stubs/group"/>
+ <unit bldFile="adapt/stubs/drm_stubs/group"/>
</component>
</collection>
<collection name="ptit9core_stub" long-name="PTI T9 Core Stub" level="plugin">
<component name="ptit9core_stub_build" long-name="PTI T9 Core Stub Component" origin-model="foundation"/>
</collection>
- <collection name="btaudioadaptation_stub" long-name="BT Audio Adaptation Stub" level="adaptation">
- <component name="btaudioadaptation_stub_build" origin-model="foundation">
- <unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
+ <collection name="btaudioadapt_stub" long-name="BT Audio Adaptation Stub" level="adapt">
+ <component name="btaudioadapt_stub_build" origin-model="foundation">
+ <unit bldFile="adapt/stubs/btaudioadapt_stub/group"/>
</component>
</collection>
<collection name="posmsgpluginreferenceimpl" long-name="Pos Msg Plugin Reference Implementation" level="plugin">
<component name="eposomasuplposrefapp" origin-model="foundation">
- <unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+ <unit bldFile="adapt/stubs/posmsgpluginreferenceimpl/group"/>
</component>
</collection>
<collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
<component name="asnimplementation" long-name="ASN Implementation" origin-model="foundation">
- <unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+ <unit bldFile="adapt/stubs/omasuplasnconverterstubimpl/group"/>
</component>
</collection>
<collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
<component name="power_save_display_mode_stub_build" origin-model="foundation">
- <unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
+ <unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
</component>
</collection>
<collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
- <component name="adaptationhwdevice" long-name="Adaptation Hardware Device" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/srsfenginestub/adaptationhwdevice/group"/> -->
+ <component name="adapthwdevice" long-name="Adaptation Hardware Device" origin-model="foundation">
+ <!-- <unit bldFile="adapt/stubs/srsfenginestub/adapthwdevice/group"/> -->
</component>
<component name="grcompilerhwdevice" long-name="GR Compiler Hardware Device" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/srsfenginestub/grcompilerhwdevice/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/srsfenginestub/grcompilerhwdevice/group"/> -->
</component>
<component name="ttphwdevice" long-name="TTP Hardware Device" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/srsfenginestub/ttphwdevice/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/srsfenginestub/ttphwdevice/group"/> -->
</component>
<component name="recognitionhwdevice" long-name="Recognition Hardware Device" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/srsfenginestub/recognitionhwdevice/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/srsfenginestub/recognitionhwdevice/group"/> -->
</component>
<component name="vocmanhwdevice" long-name="Voc Man Hardware Device" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/srsfenginestub/vocmanhwdevice/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/srsfenginestub/vocmanhwdevice/group"/> -->
</component>
<component name="ttshwdevice" long-name="TTS Hardware Device" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/srsfenginestub/ttshwdevice/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/srsfenginestub/ttshwdevice/group"/> -->
</component>
<component name="nlphwdevice" long-name="NLP Hardware Device" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/srsfenginestub/nlphwdevice/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/srsfenginestub/nlphwdevice/group"/> -->
</component>
<component unofficial="yes" name="srsfenginestub_build" long-name="SRSF Engine Stub Build" origin-model="foundation">
- <unit bldFile="adaptation/stubs/srsfenginestub/group"/>
- </component>
- </collection>
- <collection name="systemswstubs" long-name="System SW Stubs" level="adaptation">
+ <unit bldFile="adapt/stubs/srsfenginestub/group"/>
+ </component>
+ </collection>
+ <collection name="systemswstubs" long-name="System SW Stubs" level="adapt">
<component name="accessorypolicyreference" long-name="Accessory Policy Reference" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/accessorypolicyreference/group"/>
</component>
<component name="asyreference" long-name="ASY Reference" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/asyreference/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/asyreference/group"/>
</component>
<component name="examplecommonisc" long-name="Example Common ISC" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/examplecommonisc/group"/>
</component>
<component name="exampledsy" long-name="Example DSY" origin-model="foundation">
-<!--AUTO TRIMMED <unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group"/> -->
+<!--AUTO TRIMMED <unit bldFile="adapt/stubs/systemswstubs/exampledsy/group"/> -->
</component>
<component name="featuremanagerstub" long-name="Feature Manager Stub" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/featuremanagerstub/group"/>
</component>
<component name="tvoutconfig" long-name="TVOut Config" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/tvoutconfig/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/tvoutconfig/group"/>
</component>
<component name="hwrmstubplugins" long-name="HWRM Stub Plugins" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/hwrmstubplugins/group"/>
</component>
<component name="hwrmhapticsstubplugin" long-name="HWRM Haptics Stub Plugin" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/hwrmhapticsstubplugin/group"/>
</component>
<component name="sensorchannelsreference" long-name="Sensor Channels Reference" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/sensorchannelsreference/group"/>
</component>
<component name="ssyreference" long-name="SSY Rreference" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group"/>
- </component>
- <component name="startupadaptationstub" long-name="Startup Adaptation Stub" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/ssyreference/group"/>
+ </component>
+ <component name="startupadaptstub" long-name="Startup Adaptation Stub" origin-model="foundation">
+ <unit bldFile="adapt/stubs/systemswstubs/startupadaptstub/group"/>
</component>
<component name="tiltcompensationstub" long-name="Tilt Compensation Stub" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/tiltcompensationstub/group"/>
</component>
<component name="wiredbearerreference" long-name="Wired Bearer Teference" origin-model="foundation">
- <unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group"/>
+ <unit bldFile="adapt/stubs/systemswstubs/wiredbearerreference/group"/>
</component>
<component unofficial="yes" name="systemswstubs_build" long-name="System SW Stubs Build" origin-model="foundation">
- <!-- <unit bldFile="adaptation/stubs/systemswstubs/group"/> -->
+ <!-- <unit bldFile="adapt/stubs/systemswstubs/group"/> -->
</component>
</collection>
<collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
<component name="tactileclickplugin_build" origin-model="foundation">
- <unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+ <unit bldFile="adapt/stubs/tactileclickplugin_stub/group"/>
</component>
</collection>
<collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
<component name="wlanhwinit" origin-model="foundation">
- <unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+ <unit bldFile="adapt/stubs/wlanhwinit_stub/group"/>
</component>
</collection>
<collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
<component name="ocrsrv" origin-model="foundation">
- <unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+ <unit bldFile="adapt/stubs/ocrsrv_stub/group"/>
</component>
</collection>
</block>
@@ -659,7 +659,7 @@
</component>
</collection>
</block>
- <block name="persistentdata" long-name="Persistent Data Services" tech_domain="hb" level="services" levels="adaptation hw-if plugin framework server app-if">
+ <block name="persistentdata" long-name="Persistent Data Services" tech_domain="hb" level="services" levels="adapt hw-if plugin framework server app-if">
<collection name="featuremgmt" long-name="Feature Management" level="framework">
<component name="featuremanager" long-name="Feature Manager" origin-model="foundation">
<!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/clientdll/group"/> -->
@@ -719,7 +719,7 @@
</component>
</collection>
</block>
- <block name="devicesrv" long-name="Device Services" tech_domain="hb" level="services" levels="adaptation hw-if plugin framework server app-if">
+ <block name="devicesrv" long-name="Device Services" tech_domain="hb" level="services" levels="adapt hw-if plugin framework server app-if">
<collection name="accessoryservices" long-name="Accessory Services" level="framework">
<component name="accessorymonitor" long-name="Accessory Monitor" origin-model="foundation">
<unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
@@ -1022,7 +1022,7 @@
</component>
</collection>
</block>
- <block name="lbs" long-name="Locating Services" tech_domain="lo" level="services" levels="hw-if data-acquisition adaptation management application-interface">
+ <block name="lbs" long-name="Locating Services" tech_domain="lo" level="services" levels="hw-if data-acquisition adapt management application-interface">
<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
<component name="locationnpppsy" long-name="Location NPP PSY" origin-model="foundation">
<unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
@@ -1044,9 +1044,9 @@
<!-- <unit bldFile="os/lbs/datasourcemodules/agpsintegrationmodule/group" mrp="os/lbs/datasourcemodules/agpsintegrationmodule/group/lbs_datasourceplugins.mrp"/> -->
</component>
</collection>
- <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
- <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
- <unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+ <collection name="datasourceadapt" long-name="Data Source Adaptation" level="adapt">
+ <component name="gpsdatasourceadapt" long-name="GPS Data Source Adaptation" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
+ <unit bldFile="os/lbs/datasourceadapt/gpsdatasourceadapt/group" mrp="os/lbs/datasourceadapt/gpsdatasourceadapt/group/lbs_gps_data_source_adapt.mrp"/>
</component>
</collection>
<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
@@ -1079,7 +1079,7 @@
<unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
</component>
</collection>
- <collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+ <collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adapt">
<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
</component>
@@ -1207,7 +1207,7 @@
</component>
</collection>
</block>
- <block name="networkingsrv" long-name="Networking Services" tech_domain="dc" level="services" levels="adaptation hw-if plugin framework server app-if">
+ <block name="networkingsrv" long-name="Networking Services" tech_domain="dc" level="services" levels="adapt hw-if plugin framework server app-if">
<collection name="commsdb" long-name="Comms DB" level="server">
<component name="s60_commsdb" long-name="S60 Commsdb" origin-model="foundation">
<unit bldFile="os/networkingsrv/commsdb/s60_commsdb/group"/>
@@ -1415,10 +1415,10 @@
</component>
</collection>
</block>
- <block name="cellularsrv" long-name="Cellular Baseband Services" tech_domain="vc" level="services" levels="adaptation hw-if plugin framework server app-if">
- <collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+ <block name="cellularsrv" long-name="Cellular Baseband Services" tech_domain="vc" level="services" levels="adapt hw-if plugin framework server app-if">
+ <collection name="basebandadaptplugins" long-name="Baseband Adaptation Plugins" level="adapt">
<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
- <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 name="fax" long-name="Fax" level="server">
@@ -1574,7 +1574,7 @@
<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
</component>
</collection>
- <collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+ <collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adapt">
<component name="mocksy" long-name="MockSY" introduced="tb91" purpose="development" plugin="Y" origin-model="Symbian">
<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
</component>
@@ -1597,7 +1597,7 @@
</component>
</collection>
</block>
- <block name="mm" long-name="Multimedia" tech_domain="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if">
+ <block name="mm" long-name="Multimedia" tech_domain="mm" level="services" levels="adapt hw-if device-fw devices middleware app-if">
<collection name="audio" long-name="Audio Codecs" level="middleware">
<component name="arm_cmmf_codecs" long-name="ARM CMMF Codecs" origin-model="foundation">
<unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
@@ -1664,12 +1664,12 @@
<!--AUTO TRIMMED <unit bldFile="os/mm/mdfdevvideoextensions/group"/> -->
</component>
</collection>
- <collection name="videoadaptationextensions" long-name="Video Adaptation Extensions" level="adaptation">
+ <collection name="videoadaptextensions" long-name="Video Adaptation Extensions" level="adapt">
<component name="postingsurface" long-name="Posting Surface" origin-model="foundation">
- <unit bldFile="os/mm/videoadaptationextensions/postingsurface/group"/>
- </component>
- <component unofficial="yes" name="videoadaptationextensions_build" long-name="Video Adaptation Extensions Build" origin-model="foundation">
-<!--AUTO TRIMMED <unit bldFile="os/mm/videoadaptationextensions/group"/> -->
+ <unit bldFile="os/mm/videoadaptextensions/postingsurface/group"/>
+ </component>
+ <component unofficial="yes" name="videoadaptextensions_build" long-name="Video Adaptation Extensions Build" origin-model="foundation">
+<!--AUTO TRIMMED <unit bldFile="os/mm/videoadaptextensions/group"/> -->
</component>
</collection>
<collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
@@ -1819,7 +1819,7 @@
<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
</component>
</collection>
- <collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+ <collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adapt">
<component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
<unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev/multimedia_mdf_devsound_hwdev.mrp"/>
</component>
@@ -1827,10 +1827,10 @@
<unit bldFile="os/mm/mmhais/a3facl/group" mrp="os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
</component>
<component name="a3fdevsoundcustomisation" long-name="A3F DevSound Customisation" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
- <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 name="refacladapt" long-name="Reference ACL Adaptation" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
- <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 name="videohai" long-name="Video HAI" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
<unit bldFile="os/mm/mmhais/videohai/group" mrp="os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
@@ -1863,13 +1863,13 @@
</component>
</collection>
</block>
- <block name="imagingext" long-name="Imaging Extensions" tech_domain="mm" level="services" levels="adaptation hw-if plugin framework server app-if">
- <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
+ <block name="imagingext" long-name="Imaging Extensions" tech_domain="mm" level="services" levels="adapt hw-if plugin framework server app-if">
+ <collection name="imageadaptextensions" long-name="Image Adaptation Extensions" level="app-if">
<component name="iclextjpegapi" long-name="ICL Ext JPEG API" origin-model="foundation">
- <unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
- </component>
- <component unofficial="yes" name="imageadaptationextensions_build" long-name="Image Adaptation Extensions Build" origin-model="foundation">
- <unit bldFile="os/imagingext/imageadaptationextensions/group"/>
+ <unit bldFile="os/imagingext/imageadaptextensions/iclextjpegapi/group"/>
+ </component>
+ <component unofficial="yes" name="imageadaptextensions_build" long-name="Image Adaptation Extensions Build" origin-model="foundation">
+ <unit bldFile="os/imagingext/imageadaptextensions/group"/>
</component>
</collection>
<collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
@@ -1895,15 +1895,15 @@
</component>
</collection>
</block>
- <block name="graphics" long-name="Graphics" tech_domain="ui" level="services" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
- <collection name="graphicsaccelaration" long-name="Graphics Accelaration" level="adaptation">
+ <block name="graphics" long-name="Graphics" tech_domain="ui" level="services" levels="adapt engines internal-adapts device-interface internal-utils app-if">
+ <collection name="graphicsaccelaration" long-name="Graphics Accelaration" level="adapt">
<component name="vgi" long-name="VGI" origin-model="foundation">
<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
</component>
<component name="2d_openvg_1_0" long-name="2D Open VG 1.0" origin-model="foundation"/>
<component name="3d_opengl_es_1_1" long-name="3d OpenGL ES 1.1" origin-model="foundation"/>
</collection>
- <collection name="m3g" long-name="M3G" level="internal-adaptations">
+ <collection name="m3g" long-name="M3G" level="internal-adapts">
<component name="m3gcore11" long-name="M3G Core 11" origin-model="foundation">
<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
</component>
@@ -1956,7 +1956,7 @@
<unit bldFile="os/graphics/fbs/fontandbitmapserver/group" mrp="os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
</component>
</collection>
- <collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
+ <collection name="opengles" long-name="OpenGLES" level="internal-adapts">
<component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
<unit bldFile="os/graphics/opengles/openglesinterface/group" mrp="os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
</component>
@@ -1969,15 +1969,15 @@
<!-- <unit bldFile="os/graphics/opengles/openglesdisplayproperties/group" mrp="os/graphics/opengles/openglesdisplayproperties/group/graphics_openglesdisplayproperty.mrp"/> -->
</component>
</collection>
- <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
+ <collection name="openvg" long-name="OpenVG" level="internal-adapts">
<component name="openvginterface" long-name="OpenVG Interface" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
<unit bldFile="os/graphics/openvg/openvginterface/group" mrp="os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
</component>
- <component name="openvg11" long-name="OpenVG11" level="internal-adaptations">
+ <component name="openvg11" long-name="OpenVG11" level="internal-adapts">
<unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
</component>
</collection>
- <collection name="egl" long-name="EGL" level="internal-adaptations">
+ <collection name="egl" long-name="EGL" level="internal-adapts">
<component name="eglinterface" long-name="EGL Interface" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
<unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
</component>
@@ -2259,7 +2259,7 @@
</component>
</collection>
</block>
- <block name="kernelhwsrv" long-name="Kernel and Hardware Services" tech_domain="hb" level="hw" levels="hw-if adaptation framework test">
+ <block name="kernelhwsrv" long-name="Kernel and Hardware Services" tech_domain="hb" level="hw" levels="hw-if adapt framework test">
<collection name="baseintegtests" long-name="Base Integration Testing" level="test">
<component name="baseintegrationtest" long-name="Base Integration Test" introduced="9.3" purpose="development" plugin="N" origin-model="Symbian">
<unit bldFile="os/kernelhwsrv/baseintegtests/baseintegrationtest/group" mrp="os/kernelhwsrv/baseintegtests/baseintegrationtest/group/base_integration_test.mrp"/>
@@ -2292,7 +2292,7 @@
<unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
</component>
</collection>
- <collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+ <collection name="kernel" long-name="Kernel Architecture" level="adapt">
<component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory" plugin="N" origin-model="Symbian">
<unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
</component>
@@ -2312,7 +2312,7 @@
<unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
</component>
</collection>
- <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+ <collection name="ldds" long-name="Logical Device Drivers" level="adapt">
<component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional" plugin="N" origin-model="Symbian">
<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
</component>
@@ -2432,7 +2432,7 @@
</component>
</collection>
</block>
- <block name="shortlinksrv" long-name="Short Link Services" tech_domain="de" level="services" levels="adaptation hw-if plugin framework server app-if">
+ <block name="shortlinksrv" long-name="Short Link Services" tech_domain="de" level="services" levels="adapt hw-if plugin framework server app-if">
<collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if">
<component name="bluetoothsvs" long-name="Bluetooth Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
<unit mrp="os/shortlinksrv/bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp"/>
@@ -3018,9 +3018,9 @@
<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
</component>
</collection>
- <collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
+ <collection name="hwresourceadapt" long-name="Hardware Resource Adaptation" level="generic">
<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
- <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 name="commonappservices" long-name="Common Application Services" level="framework">
@@ -4489,10 +4489,10 @@
<unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
<!-- <unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/group"/> -->
</component>
- <component name="ossprotocoladaptation" long-name="OSS Protocol Adaptation" origin-model="foundation">
- <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/dataconvlib/group"/> -->
- <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
- <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/tsrc/ossadapmt/group"/> -->
+ <component name="ossprotocoladapt" long-name="OSS Protocol Adaptation" origin-model="foundation">
+ <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladapt/dataconvlib/group"/> -->
+ <unit bldFile="mw/imsrv/imservices/ossprotocoladapt/group"/>
+ <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladapt/tsrc/ossadapmt/group"/> -->
</component>
<component name="instantmessagingcache" long-name="Instant Messaging Cache" origin-model="foundation">
<unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
@@ -8775,7 +8775,7 @@
</component>
<component name="imconversationview" long-name="IM Conversation View" origin-model="foundation">
<unit bldFile="app/conversations/imstutils/imconversationview/group"/>
- <!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/dummytestadaptation/group"/> -->
+ <!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/dummytestadapt/group"/> -->
<!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/group"/> -->
</component>
<component unofficial="yes" name="imstutils_build" long-name="IM Service Tab Utils Build" origin-model="foundation">
--- a/symbian3/micro/sysdefs/system_model.xml Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian3/micro/sysdefs/system_model.xml Tue Aug 24 14:27:40 2010 +0100
@@ -53,7 +53,7 @@
</component>
</collection>
</block>
- <block name="kernelhwsrv" long-name="Kernel and Hardware Services" tech_domain="hb" level="hw" levels="hw-if adaptation framework test">
+ <block name="kernelhwsrv" long-name="Kernel and Hardware Services" tech_domain="hb" level="hw" levels="hw-if adapt framework test">
<collection name="baseintegtests" long-name="Base Integration Testing" level="test">
<component name="baseintegrationtest" long-name="Base Integration Test" introduced="9.3" purpose="development" plugin="N" origin-model="Symbian">
<unit bldFile="os/kernelhwsrv/baseintegtests/baseintegrationtest/group" mrp="os/kernelhwsrv/baseintegtests/baseintegrationtest/group/base_integration_test.mrp"/>
@@ -86,7 +86,7 @@
<unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
</component>
</collection>
- <collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+ <collection name="kernel" long-name="Kernel Architecture" level="adapt">
<component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory" plugin="N" origin-model="Symbian">
<unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
</component>
@@ -106,7 +106,7 @@
<unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
</component>
</collection>
- <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+ <collection name="ldds" long-name="Logical Device Drivers" level="adapt">
<component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional" plugin="N" origin-model="Symbian">
<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
</component>
--- a/symbian3/micro/sysdefs/system_model_os.xml Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian3/micro/sysdefs/system_model_os.xml Tue Aug 24 14:27:40 2010 +0100
@@ -53,7 +53,7 @@
</component>
</collection>
</block>
- <block name="kernelhwsrv" long-name="Kernel and Hardware Services" tech_domain="hb" level="hw" levels="hw-if adaptation framework test">
+ <block name="kernelhwsrv" long-name="Kernel and Hardware Services" tech_domain="hb" level="hw" levels="hw-if adapt framework test">
<collection name="baseintegtests" long-name="Base Integration Testing" level="test">
<component name="baseintegrationtest" long-name="Base Integration Test" introduced="9.3" purpose="development" plugin="N" origin-model="Symbian">
<unit bldFile="os/kernelhwsrv/baseintegtests/baseintegrationtest/group" mrp="os/kernelhwsrv/baseintegtests/baseintegrationtest/group/base_integration_test.mrp"/>
@@ -86,7 +86,7 @@
<unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
</component>
</collection>
- <collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+ <collection name="kernel" long-name="Kernel Architecture" level="adapt">
<component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory" plugin="N" origin-model="Symbian">
<unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
</component>
@@ -106,7 +106,7 @@
<unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
</component>
</collection>
- <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+ <collection name="ldds" long-name="Logical Device Drivers" level="adapt">
<component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional" plugin="N" origin-model="Symbian">
<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
</component>
--- a/symbian3/micro/sysdefs/system_model_s60.xml Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian3/micro/sysdefs/system_model_s60.xml Tue Aug 24 14:27:40 2010 +0100
@@ -53,7 +53,7 @@
</component>
</collection>
</block>
- <block name="kernelhwsrv" long-name="Kernel and Hardware Services" tech_domain="hb" level="hw" levels="hw-if adaptation framework test">
+ <block name="kernelhwsrv" long-name="Kernel and Hardware Services" tech_domain="hb" level="hw" levels="hw-if adapt framework test">
<collection name="baseintegtests" long-name="Base Integration Testing" level="test">
<component name="baseintegrationtest" long-name="Base Integration Test" introduced="9.3" purpose="development" plugin="N" origin-model="Symbian">
<unit bldFile="os/kernelhwsrv/baseintegtests/baseintegrationtest/group" mrp="os/kernelhwsrv/baseintegtests/baseintegrationtest/group/base_integration_test.mrp"/>
@@ -86,7 +86,7 @@
<unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
</component>
</collection>
- <collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+ <collection name="kernel" long-name="Kernel Architecture" level="adapt">
<component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory" plugin="N" origin-model="Symbian">
<unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
</component>
@@ -106,7 +106,7 @@
<unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
</component>
</collection>
- <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+ <collection name="ldds" long-name="Logical Device Drivers" level="adapt">
<component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional" plugin="N" origin-model="Symbian">
<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
</component>
--- a/symbian3/single/sources.csv Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian3/single/sources.csv Tue Aug 24 14:27:40 2010 +0100
@@ -1,8 +1,8 @@
source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/adaptation/codecs.aricent/,/sf/adaptation/codecs.aricent,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adapt/beagleboard,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/adapt/codecs.aricent/,/sf/adapt/codecs.aricent,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,branch,RCL_3,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,branch,RCL_3,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,RCL_3,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,branch,RCL_3,layers.sysdef.xml
--- a/symbian3/single/sources_3.0.0.csv Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian3/single/sources_3.0.0.csv Tue Aug 24 14:27:40 2010 +0100
@@ -1,7 +1,7 @@
source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,changeset,2905910218db,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,changeset,0f0bbe5dfe4b,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,changeset,ac0dcfe5059d,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,changeset,2905910218db,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,changeset,0f0bbe5dfe4b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,changeset,ac0dcfe5059d,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,changeset,53c8aa5d97a3,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,changeset,67369d1b217f,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,changeset,a49137138563,layers.sysdef.xml
--- a/symbian3/single/sources_3.0.1_candidate.csv Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian3/single/sources_3.0.1_candidate.csv Tue Aug 24 14:27:40 2010 +0100
@@ -1,7 +1,7 @@
source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,changeset,2905910218db,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,changeset,0f0bbe5dfe4b,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,changeset,ac0dcfe5059d,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,changeset,2905910218db,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,changeset,0f0bbe5dfe4b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,changeset,ac0dcfe5059d,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,changeset,53c8aa5d97a3,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,changeset,67369d1b217f,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,changeset,a49137138563,layers.sysdef.xml
--- a/symbian3/single/sources_3.0.h.csv Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian3/single/sources_3.0.h.csv Tue Aug 24 14:27:40 2010 +0100
@@ -4,7 +4,7 @@
//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,changeset,afb66031ac23,
//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,changeset,bc65ca6d8d9c,
//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,changeset,3308607f8c27,
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,changeset,08c4f946d508,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,changeset,08c4f946d508,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,changeset,dbec5787fa68,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,changeset,e1b6206813b4,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,changeset,cc5042a680fb,layers.sysdef.xml
@@ -110,8 +110,8 @@
http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,changeset,6524e815f76f,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,changeset,e65204f75c47,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,changeset,73ff0d268e1d,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,changeset,6f943d133287,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,changeset,34cd6bf038ac,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,changeset,6f943d133287,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,changeset,34cd6bf038ac,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,changeset,67b05696354a,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,changeset,882d065be445,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,changeset,0f973a9226e8,layers.sysdef.xml
--- a/symbian3/single/sources_3.0.i.csv Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian3/single/sources_3.0.i.csv Tue Aug 24 14:27:40 2010 +0100
@@ -4,9 +4,9 @@
//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,changeset,afb66031ac23,
//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,changeset,bc65ca6d8d9c,
//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,changeset,3308607f8c27,
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,changeset,2905910218db,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,changeset,d00bf4f57250,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,changeset,205ca2b22b4d,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,changeset,2905910218db,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,changeset,d00bf4f57250,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,changeset,205ca2b22b4d,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,changeset,38fb6f7eacd5,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,changeset,b13141f05c3d,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,changeset,a49137138563,layers.sysdef.xml
--- a/symbian3/single/sources_compiler_compatibility.csv Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian3/single/sources_compiler_compatibility.csv Tue Aug 24 14:27:40 2010 +0100
@@ -6,7 +6,7 @@
//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
@@ -112,8 +112,8 @@
http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,CompilerCompatibility,
http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
--- a/symbian3/single/sources_good.csv Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian3/single/sources_good.csv Tue Aug 24 14:27:40 2010 +0100
@@ -5,7 +5,7 @@
//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,tag,S3_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,tag,S3_LATESTGOOD,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,tag,S3_LATESTGOOD,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,tag,S3_LATESTGOOD,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,tag,S3_LATESTGOOD,layers.sysdef.xml
@@ -111,8 +111,8 @@
http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,tag,S3_LATESTGOOD,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,tag,S3_LATESTGOOD,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,tag,S3_LATESTGOOD,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,tag,S3_LATESTGOOD,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,tag,S3_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,tag,S3_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,tag,S3_LATESTGOOD,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,tag,S3_LATESTGOOD,layers.sysdef.xml
http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,tag,S3_LATESTGOOD,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,tag,S3_LATESTGOOD,layers.sysdef.xml
--- a/symbian3/single/sysdefs/full_system_model_3.0.xml Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml Tue Aug 24 14:27:40 2010 +0100
@@ -1,66 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?><SystemDefinition id-namespace="http://www.symbian.org/system-definition" schema="3.0.0">
<systemModel name="Symbian^3">
-<layer id="adaptation" name="Adaptation" levels="low mw high">
+<layer id="adapt" name="Adaptation" levels="low mw high">
<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"/>
-</component>
-<component id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="/adaptation/stubs/btaudioadaptation_stub/group"/>
+<unit bldFile="/adapt/stubs/audiostubs/group"/>
+</component>
+<component id="btaudioadapt_stub" name="Bluetooth Audio Adaptation Stub">
+<unit bldFile="/adapt/stubs/btaudioadapt_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>
</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 mrp="/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -71,7 +71,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>
@@ -87,7 +87,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>
@@ -586,7 +586,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>
@@ -664,7 +664,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"/>
@@ -715,7 +715,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"/>
@@ -1011,7 +1011,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>
@@ -1025,7 +1025,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>
@@ -1178,7 +1178,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"/>
@@ -1199,9 +1199,9 @@
<unit bldFile="/os/lbs/datasourcemodules/locationapesuplpsy/group"/>
</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">
@@ -1237,7 +1237,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>
@@ -1355,7 +1355,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"/>
@@ -1603,15 +1603,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="fax" name="Fax" level="server">
@@ -1712,7 +1712,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>
@@ -1734,10 +1734,10 @@
</component>
</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"/>
@@ -1827,7 +1827,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>
@@ -1848,7 +1848,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"/>
@@ -1912,8 +1912,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"/>
@@ -1936,8 +1936,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"/>
@@ -2020,8 +2020,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"/>
@@ -2107,7 +2107,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"/>
@@ -2213,9 +2213,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">
@@ -2284,7 +2284,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>
@@ -2292,10 +2292,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"/>
@@ -2308,7 +2308,7 @@
</component>
</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"/>
@@ -2339,13 +2339,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">
@@ -2357,13 +2357,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>
@@ -2372,8 +2372,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>
</collection>
<collection id="graphicsutils" name="Graphics Utils" level="engines">
@@ -2381,7 +2381,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"/>
@@ -2443,7 +2443,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>
@@ -2451,7 +2451,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>
@@ -2463,7 +2463,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>
@@ -2496,8 +2496,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">
@@ -2571,7 +2571,7 @@
</component>
</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"/>
@@ -2617,8 +2617,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>
@@ -3015,7 +3015,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">
@@ -3125,9 +3125,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">
-<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">
@@ -3259,8 +3259,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"/>
@@ -4120,8 +4120,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"/>
@@ -5092,7 +5092,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>
@@ -5374,9 +5374,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">
@@ -5590,15 +5590,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"/>
@@ -5711,7 +5711,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">
@@ -5730,14 +5730,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">
@@ -6308,14 +6308,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">
@@ -6349,7 +6349,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>
@@ -7462,10 +7462,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"/>
@@ -7745,7 +7745,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>
@@ -7767,7 +7767,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>
@@ -8188,7 +8188,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>
@@ -8241,7 +8241,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>
@@ -8829,7 +8829,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>
@@ -8986,7 +8986,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>
@@ -10042,7 +10042,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>
@@ -10283,8 +10283,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">
@@ -10318,8 +10318,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">
@@ -10728,7 +10728,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">
@@ -10906,8 +10906,8 @@
<component id="vas_vcommand_api" name="VAS Voice Command API" class="api" filter="s60">
<unit bldFile="/app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
</component>
-<component id="adaptation_hw_device_api" name="Adaptation Hardware Device API" class="api" filter="s60">
-<unit bldFile="/app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
+<component id="adapt_hw_device_api" name="Adaptation Hardware Device API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/adapt_hw_device_api/group"/>
</component>
<component id="nss_devtts_api" name="NSS DevTTS API" class="api" filter="s60">
<unit bldFile="/app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
@@ -11117,7 +11117,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>
--- a/symbian3/single/sysdefs/system_model.xml Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml Tue Aug 24 14:27:40 2010 +0100
@@ -75,127 +75,127 @@
]>
<SystemDefinition name="Symbian^3" schema="2.0.1">
<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
+<layer name="adapt" long-name="Adaptation" levels="low mw high">
<block name="stubs" level="high" long-name="Stubs" levels="stub">
<collection name="s60_stubs" level="stub">
<component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
-</component>
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
+<unit bldFile="adapt/stubs/audiostubs/group"/>
+</component>
+<component name="btaudioadapt_stub" long-name="Bluetooth Audio Adaptation Stub">
+<unit bldFile="adapt/stubs/btaudioadapt_stub/group"/>
</component>
<component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="adapt/stubs/drm_stubs/group"/>
</component>
<component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="adapt/stubs/ocrsrv_stub/group"/>
</component>
<component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="adapt/stubs/omasuplasnconverterstubimpl/group"/>
</component>
<component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="adapt/stubs/posmsgpluginreferenceimpl/group"/>
</component>
<component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="adapt/stubs/srsfenginestub/group"/>
</component>
<component name="power_save_display_mode_stub" long-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 name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
+<unit bldFile="adapt/stubs/systemswstubs/group"/>
</component>
<component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="adapt/stubs/tactileclickplugin_stub/group"/>
</component>
<component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="adapt/stubs/wlanhwinit_stub/group"/>
</component>
</collection>
</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_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"/>
+<unit bldFile="adapt/beagleboard/omap3530" mrp="adapt/beagleboard/omap3530/base_beagle.mrp"/>
</component>
<component name="omap3530_kernel" long-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 name="beagleboard_Baseport" long-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>
</block>
<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
<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"/>
+<unit bldFile="adapt/qemu/baseport/syborg" mrp="adapt/qemu/baseport/syborg/syborg.mrp"/>
</component>
</collection>
</block>
<block name="codecs.aricent" level="low" long-name="Aricent Codecs">
<collection name="utilities" long-name="Aricent Utilities">
<component name="ariprocessengine" long-name="Aricent Process Engine">
-<unit bldFile="adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
+<unit bldFile="adapt/codecs.aricent/utilities/ariprocessengine/group"/>
</component>
<component name="aristatemachine" long-name="Aricent State Machine">
-<unit bldFile="adaptation/codecs.aricent/utilities/aristatemachine/group"/>
+<unit bldFile="adapt/codecs.aricent/utilities/aristatemachine/group"/>
</component>
</collection>
<collection name="aaclc_enc" level="plugin">
<component name="ariaaclcencmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
</component>
</collection>
<collection name="amrnb_dec" level="plugin">
<component name="ariamrnbdecmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
</component>
</collection>
<collection name="amrnb_enc" level="plugin">
<component name="ariamrnbencmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
</component>
</collection>
<collection name="amrwb_dec" level="plugin">
<component name="ariamrwbdecmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
</component>
</collection>
<collection name="h264_dec" level="plugin">
<component name="arih264dechwdevice">
-<unit bldFile="adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
</component>
</collection>
<collection name="h264_enc" level="plugin">
<component name="arih264enchwdevice">
-<unit bldFile="adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
</component>
</collection>
<collection name="heaac_dec" level="plugin">
<component name="ariheaacdecmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
</component>
</collection>
<collection name="mp3_dec" level="plugin">
<component name="arimp3decmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
</component>
</collection>
<collection name="mp4asp_dec" level="plugin">
<component name="arimpeg4aspdechwdevice">
-<unit bldFile="adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
</component>
</collection>
<collection name="mp4sp_enc" level="plugin">
<component name="arimp4spenchwdevice">
-<unit bldFile="adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
</component>
</collection>
</block>
</layer>
<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adapt framework test">
<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
<unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -206,7 +206,7 @@
<unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
</component>
</collection>
-<collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+<collection name="kernel" long-name="Kernel Architecture" level="adapt">
<component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory">
<unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
</component>
@@ -222,7 +222,7 @@
<unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
</component>
</collection>
-<collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+<collection name="ldds" long-name="Logical Device Drivers" level="adapt">
<component name="ethernetldd" long-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>
@@ -788,7 +788,7 @@
</component>
</collection>
</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adapt hw-if plugin framework server app-if">
<collection name="featuremgmt" long-name="Feature Management" level="framework">
<component name="featuremgr" long-name="Feature Manager" introduced="^3" purpose="mandatory">
<unit bldFile="os/persistentdata/featuremgmt/featuremgr/group" mrp="os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
@@ -839,7 +839,7 @@
</component>
</collection>
</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="devicesrv" level="services" long-name="Device Services" levels="adapt hw-if plugin framework server app-if">
<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
<unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
@@ -1285,7 +1285,7 @@
</component>
</collection>
</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adapt management application-interface">
<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -1306,9 +1306,9 @@
<unit bldFile="os/lbs/datasourcemodules/locationapesuplpsy/group"/>
</component>
</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+<collection name="datasourceadapt" long-name="Data Source Adaptation" level="adapt">
+<component name="gpsdatasourceadapt" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourceadapt/gpsdatasourceadapt/group" mrp="os/lbs/datasourceadapt/gpsdatasourceadapt/group/lbs_gps_data_source_adapt.mrp"/>
</component>
</collection>
<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
@@ -1341,7 +1341,7 @@
<unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
</component>
</collection>
-<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adapt">
<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
</component>
@@ -1449,7 +1449,7 @@
</component>
</collection>
</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="networkingsrv" level="services" long-name="Networking Services" levels="adapt hw-if plugin framework server app-if">
<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
<component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
<unit bldFile="os/networkingsrv/esockapiextensions/internetsockets/group" mrp="os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -1657,15 +1657,15 @@
</component>
</collection>
</block>
-<block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adapt hw-if plugin framework server app-if">
<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+<collection name="basebandadaptplugins" long-name="Baseband Adaptation Plugins" level="adapt">
<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<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 name="fax" long-name="Fax" level="server">
@@ -1760,7 +1760,7 @@
<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
</component>
</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adapt">
<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
</component>
@@ -1772,10 +1772,10 @@
</component>
</collection>
</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+<block name="bt" level="services" long-name="Bluetooth" levels="adapt hw-if plugin framework server app-if">
<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+<component name="bluetooth_audio_adapt_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
+<unit bldFile="os/bt/bt_plat/bluetooth_audio_adapt_api/group"/>
</component>
<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
@@ -1855,7 +1855,7 @@
</component>
</collection>
</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
+<block name="usb" level="services" long-name="USB" levels="adapt hw-if plugin framework server app-if">
<collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
<!-- usbclientdrivers to be moved here from kernelhwsrv-->
</collection>
@@ -1873,7 +1873,7 @@
</component>
</collection>
</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+<block name="mm" level="services" long-name="Multimedia" levels="adapt hw-if device-fw devices middleware app-if">
<collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
<component name="audio_effects_api" long-name="Audio Effects API" filter="s60" class="api">
<unit bldFile="os/mm/mm_pub/audio_effects_api/group"/>
@@ -1937,8 +1937,8 @@
<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
+<component name="devsound_adapt_api" long-name="DevSound Adaptation API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/devsound_adapt_api/group"/>
</component>
<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/display_posting_api/group"/>
@@ -1961,8 +1961,8 @@
<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/fm_radio_adaptation_api/group"/>
+<component name="fm_radio_adapt_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/fm_radio_adapt_api/group"/>
</component>
<component name="g711_decoder_interface_api" long-name="G711 Decoder Interface API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group"/>
@@ -2045,8 +2045,8 @@
<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/rds_adaptation_api/group"/>
+<component name="rds_adapt_api" long-name="RDS Adaptation API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/rds_adapt_api/group"/>
</component>
<component name="restricted_audio_output_api" long-name="Restricted Audio Output API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group"/>
@@ -2220,9 +2220,9 @@
<unit bldFile="os/mm/mmdevicefw/speechrecogsupport/group" mrp="os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
</component>
</collection>
-<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
+<collection name="mmswadapt" long-name="Multimedia Software Adaptation" level="adapt">
<component name="videorenderer" long-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 name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
@@ -2269,7 +2269,7 @@
<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
</component>
</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adapt">
<component name="devsoundhwdeviceapi" long-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>
@@ -2277,10 +2277,10 @@
<unit bldFile="os/mm/mmhais/a3facl/group" mrp="os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
</component>
<component name="a3fdevsoundcustomisation" long-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 name="refacladapt" long-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 name="videohai" long-name="Video HAI" introduced="7.0s" purpose="mandatory">
<unit bldFile="os/mm/mmhais/videohai/group" mrp="os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
@@ -2290,7 +2290,7 @@
</component>
</collection>
</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adapt hw-if plugin framework server app-if">
<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
<component name="exif_api" long-name="Exif API" filter="s60" class="api">
<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
@@ -2319,13 +2319,13 @@
<unit bldFile="os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
</component>
</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
+<collection name="imageadaptextensions" long-name="Image Adaptation Extensions" level="app-if">
<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-name="Image Adaptation Extensions Build">
+<unit bldFile="os/imagingext/imageadaptextensions/iclextjpegapi/group"/>
+</component>
+<component name="imageadaptextensions_build" filter="s60" long-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 name="imagingmodules" long-name="Imaging Modules" level="hw-if">
@@ -2337,13 +2337,13 @@
</component>
</collection>
</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
+<block name="graphics" level="services" long-name="Graphics" levels="adapt engines internal-adapts device-interface internal-utils app-if">
+<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adapt">
<component name="vgi" filter="s60" long-name="VGI">
<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
</component>
</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
+<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adapts">
<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
</component>
@@ -2352,8 +2352,8 @@
<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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 name="graphicsresourceadapt" long-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>
</collection>
<collection name="graphicsutils" long-name="Graphics Utils" level="engines">
@@ -2361,7 +2361,7 @@
<unit bldFile="os/graphics/graphicsutils/commongraphicsheaders/group" mrp="os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
</component>
</collection>
-<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
+<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adapt">
<!-- displayldd to be moved here -->
<component name="surfacemgr" long-name="Surface Manager" introduced="^3" purpose="optional">
<unit bldFile="os/graphics/graphicshwdrivers/surfacemgr/group" mrp="os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
@@ -2420,7 +2420,7 @@
<unit bldFile="os/graphics/fbs/fontandbitmapserver/group" mrp="os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
</component>
</collection>
-<collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
+<collection name="opengles" long-name="OpenGLES" level="internal-adapts">
<component name="openglesinterface" long-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>
@@ -2428,7 +2428,7 @@
<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
</component>
</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
+<collection name="openvg" long-name="OpenVG" level="internal-adapts">
<component name="openvginterface" long-name="OpenVG Interface" introduced="^2" purpose="optional">
<unit bldFile="os/graphics/openvg/openvginterface/group" mrp="os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
</component>
@@ -2440,7 +2440,7 @@
<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
</component>
</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
+<collection name="egl" long-name="EGL" level="internal-adapts">
<component name="eglinterface" long-name="EGL Interface" introduced="^2" purpose="optional">
<unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
</component>
@@ -2473,8 +2473,8 @@
<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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 name="directgdiadapt" long-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 name="graphicstools" long-name="Graphics Tools" level="internal-utils">
@@ -3082,9 +3082,9 @@
<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
</component>
</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
+<collection name="hwresourceadapt" long-name="Hardware Resource Adaptation" level="generic">
<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
-<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 name="commonappservices" long-name="Common Application Services" level="framework">
@@ -3210,8 +3210,8 @@
<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+<component name="devencadapt_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/devencadapt_api/group"/>
</component>
<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
@@ -10406,8 +10406,8 @@
<component name="vas_vcommand_api" long-name="VAS Voice Command API" filter="s60" class="api">
<unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
</component>
-<component name="adaptation_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
-<unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
+<component name="adapt_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
+<unit bldFile="app/speechsrv/speechsrv_plat/adapt_hw_device_api/group"/>
</component>
<component name="nss_devtts_api" long-name="NSS DevTTS API" filter="s60" class="api">
<unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
--- a/symbian3/single/sysdefs/system_model_3.0.xml Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml Tue Aug 24 14:27:40 2010 +0100
@@ -1,67 +1,67 @@
<?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^3">
-<layer id="adaptation" name="Adaptation" levels="low mw high">
+<layer id="adapt" name="Adaptation" levels="low mw high">
<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"/>
-</component>
-<component id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="/adaptation/stubs/btaudioadaptation_stub/group"/>
+<unit bldFile="/adapt/stubs/audiostubs/group"/>
+</component>
+<component id="btaudioadapt_stub" name="Bluetooth Audio Adaptation Stub">
+<unit bldFile="/adapt/stubs/btaudioadapt_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>
</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 mrp="/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -72,7 +72,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>
@@ -88,7 +88,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>
@@ -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>
@@ -659,7 +659,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"/>
@@ -710,7 +710,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"/>
@@ -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>
@@ -1164,7 +1164,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"/>
@@ -1185,9 +1185,9 @@
<unit bldFile="/os/lbs/datasourcemodules/locationapesuplpsy/group"/>
</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">
@@ -1221,7 +1221,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>
@@ -1333,7 +1333,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"/>
@@ -1555,15 +1555,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="fax" name="Fax" level="server">
@@ -1660,7 +1660,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>
@@ -1676,10 +1676,10 @@
</component>
</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"/>
@@ -1763,7 +1763,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>
@@ -1782,7 +1782,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"/>
@@ -1846,8 +1846,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"/>
@@ -1870,8 +1870,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"/>
@@ -1954,8 +1954,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"/>
@@ -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"/>
@@ -2135,9 +2135,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">
@@ -2192,7 +2192,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>
@@ -2200,10 +2200,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"/>
@@ -2214,7 +2214,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"/>
@@ -2245,13 +2245,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">
@@ -2263,13 +2263,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>
@@ -2278,8 +2278,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>
</collection>
<collection id="graphicsutils" name="Graphics Utils" level="engines">
@@ -2287,7 +2287,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"/>
@@ -2347,7 +2347,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>
@@ -2355,7 +2355,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>
@@ -2367,7 +2367,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>
@@ -2400,8 +2400,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">
@@ -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">
@@ -3023,9 +3023,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">
-<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">
@@ -3153,8 +3153,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"/>
@@ -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">
@@ -10735,8 +10735,8 @@
<component id="vas_vcommand_api" name="VAS Voice Command API" class="api" filter="s60">
<unit bldFile="/app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
</component>
-<component id="adaptation_hw_device_api" name="Adaptation Hardware Device API" class="api" filter="s60">
-<unit bldFile="/app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
+<component id="adapt_hw_device_api" name="Adaptation Hardware Device API" class="api" filter="s60">
+<unit bldFile="/app/speechsrv/speechsrv_plat/adapt_hw_device_api/group"/>
</component>
<component id="nss_devtts_api" name="NSS DevTTS API" class="api" filter="s60">
<unit bldFile="/app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
@@ -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>
--- a/symbian4/single/sources.csv Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian4/single/sources.csv Tue Aug 24 14:27:40 2010 +0100
@@ -1,6 +1,6 @@
source,dst,type,pattern,sysdef
http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,branch,default,
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/browserui/,/sf/app/browserui,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
@@ -106,10 +106,10 @@
http://developer.symbian.org/oss/FCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,default,modified-FCL
http://developer.symbian.org/oss/FCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/homescreentools/,/sf/app/homescreentools,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/rndtools/,/sf/app/rndtools,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/adaptation/codecs.aricent/,/sf/adaptation/codecs.aricent,branch,default,NON-NOKIA
+http://developer.symbian.org/oss/MCL/sf/adapt/codecs.aricent/,/sf/adapt/codecs.aricent,branch,default,NON-NOKIA
--- a/symbian4/single/sources_bulk.csv Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian4/single/sources_bulk.csv Tue Aug 24 14:27:40 2010 +0100
@@ -1,9 +1,9 @@
source,dst,type,pattern,sysdef
http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,branch,default,NON-NOKIA
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,NON-NOKIA
-http://developer.symbian.org/oss/MCL/sf/adaptation/codecs.aricent/,/sf/adaptation/codecs.aricent,branch,default,NON-NOKIA
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,NON-NOKIA
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,default,NON-NOKIA
+http://developer.symbian.org/oss/MCL/sf/adapt/codecs.aricent/,/sf/adapt/codecs.aricent,branch,default,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,default,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,tag,tip_bulk,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/browserui/,/sf/app/browserui,tag,tip_bulk,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,tag,tip_bulk,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/commonemail/,/sf/app/commonemail,tag,tip_bulk,layers.sysdef.xml
--- a/symbian4/single/sources_good.csv Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian4/single/sources_good.csv Tue Aug 24 14:27:40 2010 +0100
@@ -1,9 +1,9 @@
source,dst,type,pattern,sysdef
http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,changeset,73890f073898,NON-NOKIA
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,changeset,23f868c54bc5,NON-NOKIA
-http://developer.symbian.org/oss/MCL/sf/adaptation/codecs.aricent/,/sf/adaptation/codecs.aricent,changeset,bb31fbe78861,NON-NOKIA
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,changeset,d2f9a1d49266,NON-NOKIA
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,changeset,931072794a66,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,changeset,23f868c54bc5,NON-NOKIA
+http://developer.symbian.org/oss/MCL/sf/adapt/codecs.aricent/,/sf/adapt/codecs.aricent,changeset,bb31fbe78861,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,changeset,d2f9a1d49266,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,changeset,931072794a66,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/browserui/,/sf/app/browserui,changeset,1c3b8676e58c,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,changeset,64817133cd1d,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/commonemail/,/sf/app/commonemail,changeset,997a02608b3a,layers.sysdef.xml
--- a/symbian4/single/sources_staging.csv Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian4/single/sources_staging.csv Tue Aug 24 14:27:40 2010 +0100
@@ -6,7 +6,7 @@
//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
-//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/adapt/stubs/,/sf/adapt/stubs,branch,default,layers.sysdef.xml
//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/browserui/,/sf/app/browserui,branch,default,layers.sysdef.xml
//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
@@ -113,8 +113,8 @@
//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,default,layers.sysdef.xml
//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,layers.sysdef.xml
//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,branch,default,layers.sysdef.xml
//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
--- a/symbian4/single/sources_surge.csv Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian4/single/sources_surge.csv Tue Aug 24 14:27:40 2010 +0100
@@ -1,8 +1,8 @@
source,dst,type,pattern,sysdef
http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,branch,default,
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,GCC_SURGE,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,GCC_SURGE,modified-FCL
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,GCC_SURGE,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,branch,GCC_SURGE,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/browserui/,/sf/app/browserui,branch,GCC_SURGE,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,branch,GCC_SURGE,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/app/commonemail/,/sf/app/commonemail,branch,GCC_SURGE,layers.sysdef.xml
--- a/symbian4/single/sysdefs/auto/system_model.xml Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian4/single/sysdefs/auto/system_model.xml Tue Aug 24 14:27:40 2010 +0100
@@ -1,261 +1,261 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
<SystemDefinition name="Symbian^4" schema="2.0.1">
<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
-<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
+<layer name="adapt" long-name="Adaptation" levels="low mw high">
+<block name="stubs" level="high" span="2" long-name="Stubs" levels="adapt plugin mid engine">
+<collection name="audiostubs" long-name="Audio Stubs" level="adapt">
<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+<unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
</component>
<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
-<unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+<unit bldFile="adapt/stubs/audiostubs/fmradiotunercontrolstub/group"/>
</component>
</collection>
<collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
<component name="drm_stubs_build" long-name="DRM Stubs Build">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="adapt/stubs/drm_stubs/group"/>
</component>
</collection>
<collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
<component name="ocrsrv_stub_build" long-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 name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
<component name="omasuplasnconverterstubimpl_build" long-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 name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
<component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="adapt/stubs/posmsgpluginreferenceimpl/group"/>
</component>
</collection>
<collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
<component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="adapt/stubs/srsfenginestub/group"/>
</component>
</collection>
<collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
<component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-</collection>
-<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
+<unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
+</component>
+</collection>
+<collection name="systemswstubs" long-name="System Software Stubs" level="adapt">
<component name="ddcaccessstub" long-name="DDC Access Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+<unit bldFile="adapt/stubs/systemswstubs/ddcaccessstub/group"/>
</component>
<component name="tvoutconfig" long-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 name="accessorypolicyreference" long-name="Accessory Policy Reference">
-<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
</component>
<component name="asyreference" long-name="ASY Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
</component>
<component name="examplecommonisc" long-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 name="exampledsy" long-name="Example DSY">
-<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
</component>
<component name="featuremanagerstub" long-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 name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
</component>
<component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
</component>
<component name="sensorchannelsreference" long-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 name="ssyreference" long-name="SSY Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
-</component>
-<component name="startupadaptationstub" long-name="Startup Adaptation Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+</component>
+<component name="startupadaptstub" long-name="Startup Adaptation Stub" plugin="Y">
+<unit bldFile="adapt/stubs/systemswstubs/startupadaptstub/group" filter="oem_build"/>
</component>
<component name="tiltcompensationstub" long-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 name="tvoutbehaviour" long-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 name="wiredbearerreference" long-name="Wired Bearer Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
</component>
</collection>
<collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
<component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="adapt/stubs/tactileclickplugin_stub/group"/>
</component>
</collection>
<collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
<component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="adapt/stubs/wlanhwinit_stub/group"/>
</component>
</collection>
</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_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"/>
+<unit bldFile="adapt/beagleboard/omap3530" mrp="adapt/beagleboard/omap3530/base_beagle.mrp"/>
</component>
<component name="omap3530_kernel" long-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 name="beagleboard_Baseport" long-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>
</block>
<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
<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"/>
+<unit bldFile="adapt/qemu/baseport/syborg" mrp="adapt/qemu/baseport/syborg/syborg.mrp"/>
</component>
</collection>
</block>
<block name="codecs.aricent" level="low" long-name="Aricent Codecs">
<collection name="utilities" long-name="Aricent Utilities">
<component name="ariprocessengine" long-name="Aricent Process Engine">
-<unit bldFile="adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
+<unit bldFile="adapt/codecs.aricent/utilities/ariprocessengine/group"/>
</component>
<component name="aristatemachine" long-name="Aricent State Machine">
-<unit bldFile="adaptation/codecs.aricent/utilities/aristatemachine/group"/>
+<unit bldFile="adapt/codecs.aricent/utilities/aristatemachine/group"/>
</component>
</collection>
<collection name="aaclc_enc" level="plugin">
<component name="ariaaclcencmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
</component>
</collection>
<collection name="amrnb_dec" level="plugin">
<component name="ariamrnbdecmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
</component>
</collection>
<collection name="amrnb_enc" level="plugin">
<component name="ariamrnbencmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
</component>
</collection>
<collection name="amrwb_dec" level="plugin">
<component name="ariamrwbdecmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
</component>
</collection>
<collection name="h264_dec" level="plugin">
<component name="arih264dechwdevice">
-<unit bldFile="adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
</component>
</collection>
<collection name="h264_enc" level="plugin">
<component name="arih264enchwdevice">
-<unit bldFile="adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
</component>
</collection>
<collection name="heaac_dec" level="plugin">
<component name="ariheaacdecmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
</component>
</collection>
<collection name="mp3_dec" level="plugin">
<component name="arimp3decmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
</component>
</collection>
<collection name="mp4asp_dec" level="plugin">
<component name="arimpeg4aspdechwdevice">
-<unit bldFile="adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
</component>
</collection>
<collection name="mp4sp_enc" level="plugin">
<component name="arimp4spenchwdevice">
-<unit bldFile="adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
</component>
</collection>
</block>
</layer>
<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adapt framework test">
<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
<unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -266,7 +266,7 @@
<unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
</component>
</collection>
-<collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+<collection name="kernel" long-name="Kernel Architecture" level="adapt">
<component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory">
<unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
</component>
@@ -282,7 +282,7 @@
<unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
</component>
</collection>
-<collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+<collection name="ldds" long-name="Logical Device Drivers" level="adapt">
<component name="ethernetldd" long-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>
@@ -614,7 +614,7 @@
<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
</component>
<component name="ofdbus_rom" filter="s60" long-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>
@@ -691,7 +691,7 @@
</component>
</collection>
</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adapt hw-if plugin framework server app-if">
<collection name="featuremgmt" long-name="Feature Management" level="framework">
<component name="featuremgr" long-name="Feature Manager" introduced="^3" purpose="mandatory">
<unit bldFile="os/persistentdata/featuremgmt/featuremgr/group" mrp="os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
@@ -742,7 +742,7 @@
</component>
</collection>
</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="devicesrv" level="services" long-name="Device Services" levels="adapt hw-if plugin framework server app-if">
<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
<!-- this needs to be moved to deviceplatformrelease -->
@@ -1199,7 +1199,7 @@
</component>
</collection>
</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adapt management application-interface">
<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -1220,9 +1220,9 @@
<unit bldFile="os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
</component>
</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+<collection name="datasourceadapt" long-name="Data Source Adaptation" level="adapt">
+<component name="gpsdatasourceadapt" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourceadapt/gpsdatasourceadapt/group" mrp="os/lbs/datasourceadapt/gpsdatasourceadapt/group/lbs_gps_data_source_adapt.mrp"/>
</component>
</collection>
<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
@@ -1255,7 +1255,7 @@
<unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
</component>
</collection>
-<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adapt">
<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
</component>
@@ -1365,7 +1365,7 @@
</component>
</collection>
</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="networkingsrv" level="services" long-name="Networking Services" levels="adapt hw-if plugin framework server app-if">
<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
<component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
<unit bldFile="os/networkingsrv/esockapiextensions/internetsockets/group" mrp="os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -1567,15 +1567,15 @@
</component>
</collection>
</block>
-<block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adapt hw-if plugin framework server app-if">
<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+<collection name="basebandadaptplugins" long-name="Baseband Adaptation Plugins" level="adapt">
<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<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 name="smsprotocols" long-name="SMS Protocols" level="framework">
@@ -1662,7 +1662,7 @@
<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
</component>
</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adapt">
<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
</component>
@@ -1675,10 +1675,10 @@
</component>
</collection>
</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+<block name="bt" level="services" long-name="Bluetooth" levels="adapt hw-if plugin framework server app-if">
<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+<component name="bluetooth_audio_adapt_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
+<unit bldFile="os/bt/bt_plat/bluetooth_audio_adapt_api/group"/>
</component>
<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
@@ -1758,12 +1758,12 @@
</component>
</collection>
<collection name="btsimulator" long-name="Bluetooth Simulator" level="internal-utils">
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaption Stub" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/btsimulator/btaudioadaptation_stub/group"/>
+<component name="btaudioadapt_stub" long-name="Bluetooth Audio Adaption Stub" introduced="^3" purpose="optional" filter="s60">
+<unit bldFile="os/bt/btsimulator/btaudioadapt_stub/group"/>
</component>
</collection>
</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
+<block name="usb" level="services" long-name="USB" levels="adapt hw-if plugin framework server app-if">
<collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
<!-- placeholder for platform APIs -->
</collection>
@@ -1784,7 +1784,7 @@
</component>
</collection>
</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+<block name="mm" level="services" long-name="Multimedia" levels="adapt hw-if device-fw devices middleware app-if">
<collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
<component name="audio_effects_api" long-name="Audio Effects API" filter="s60" class="api">
<unit bldFile="os/mm/mm_pub/audio_effects_api/group" filter="!test"/>
@@ -1848,8 +1848,8 @@
<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
+<component name="devsound_adapt_api" long-name="DevSound Adaptation API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/devsound_adapt_api/group"/>
</component>
<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/display_posting_api/group"/>
@@ -1872,8 +1872,8 @@
<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/fm_radio_adaptation_api/group"/>
+<component name="fm_radio_adapt_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/fm_radio_adapt_api/group"/>
</component>
<component name="g711_decoder_interface_api" long-name="G711 Decoder Interface API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group" filter="!test"/>
@@ -1956,8 +1956,8 @@
<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/rds_adaptation_api/group"/>
+<component name="rds_adapt_api" long-name="RDS Adaptation API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/rds_adapt_api/group"/>
</component>
<component name="restricted_audio_output_api" long-name="Restricted Audio Output API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group" filter="!test"/>
@@ -2043,7 +2043,7 @@
<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
</component>
<component name="effectspresets_utils" filter="s60" long-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"/>
@@ -2135,9 +2135,9 @@
<unit bldFile="os/mm/mmdevicefw/speechrecogsupport/group" mrp="os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
</component>
</collection>
-<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
+<collection name="mmswadapt" long-name="Multimedia Software Adaptation" level="adapt">
<component name="videorenderer" long-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 name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
@@ -2184,7 +2184,7 @@
<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
</component>
</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adapt">
<component name="devsoundhwdeviceapi" long-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>
@@ -2192,10 +2192,10 @@
<unit bldFile="os/mm/mmhais/a3facl/group" mrp="os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
</component>
<component name="a3fdevsoundcustomisation" long-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 name="refacladapt" long-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 name="videohai" long-name="Video HAI" introduced="7.0s" purpose="mandatory">
<unit bldFile="os/mm/mmhais/videohai/group" mrp="os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
@@ -2205,7 +2205,7 @@
</component>
</collection>
</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adapt hw-if plugin framework server app-if">
<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
<component name="exif_api" long-name="Exif API" filter="s60" class="api">
<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
@@ -2234,13 +2234,13 @@
<unit bldFile="os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
</component>
</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
+<collection name="imageadaptextensions" long-name="Image Adaptation Extensions" level="app-if">
<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-name="Image Adaptation Extensions Build">
+<unit bldFile="os/imagingext/imageadaptextensions/iclextjpegapi/group"/>
+</component>
+<component name="imageadaptextensions_build" filter="s60" long-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 name="imagingmodules" long-name="Imaging Modules" level="hw-if">
@@ -2252,13 +2252,13 @@
</component>
</collection>
</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
+<block name="graphics" level="services" long-name="Graphics" levels="adapt engines internal-adapts device-interface internal-utils app-if">
+<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adapt">
<component name="vgi" filter="s60" long-name="VGI">
<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
</component>
</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
+<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adapts">
<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
</component>
@@ -2267,8 +2267,8 @@
<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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 name="graphicsresourceadapt" long-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 name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
@@ -2282,7 +2282,7 @@
<unit bldFile="os/graphics/graphicsutils/commongraphicsheaders/group" mrp="os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
</component>
</collection>
-<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
+<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adapt">
<!-- displayldd to be moved here -->
<component name="surfacemgr" long-name="Surface Manager" introduced="^3" purpose="optional">
<unit bldFile="os/graphics/graphicshwdrivers/surfacemgr/group" mrp="os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
@@ -2341,7 +2341,7 @@
<unit bldFile="os/graphics/fbs/fontandbitmapserver/group" mrp="os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
</component>
</collection>
-<collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
+<collection name="opengles" long-name="OpenGLES" level="internal-adapts">
<component name="openglesinterface" long-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>
@@ -2349,7 +2349,7 @@
<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
</component>
</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
+<collection name="openvg" long-name="OpenVG" level="internal-adapts">
<component name="openvginterface" long-name="OpenVG Interface" introduced="^2" purpose="optional">
<unit bldFile="os/graphics/openvg/openvginterface/group" mrp="os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
</component>
@@ -2361,7 +2361,7 @@
<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
</component>
</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
+<collection name="egl" long-name="EGL" level="internal-adapts">
<component name="eglinterface" long-name="EGL Interface" introduced="^2" purpose="mandatory">
<unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
</component>
@@ -2395,8 +2395,8 @@
<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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 name="directgdiadapt" long-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 name="graphicstools" long-name="Graphics Tools" level="internal-utils">
@@ -2939,9 +2939,9 @@
<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
</component>
</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
+<collection name="hwresourceadapt" long-name="Hardware Resource Adaptation" level="generic">
<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" deprecated="^4" plugin="Y">
-<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 name="commonappservices" long-name="Common Application Services" level="framework">
@@ -3067,8 +3067,8 @@
<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+<component name="devencadapt_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/devencadapt_api/group"/>
</component>
<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
@@ -3342,9 +3342,9 @@
<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
</component>
<component name="supl_pos_message_plugin_api" long-name="SUPL POS Message Plugin API" filter="s60" class="api placeholder">
-<!-- placeholder
- <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
- <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
+<!-- placeholder
+ <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
+ <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
-->
</component>
<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
@@ -5698,7 +5698,7 @@
</collection>
<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
<component name="mmappcomponents_build" filter="s60" long-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>
@@ -6647,10 +6647,10 @@
<component name="fontprovider" filter="s60" long-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 name="fontutils" filter="sf_build" long-name="Font Utils">
<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -6744,15 +6744,15 @@
</collection>
<collection name="controlpanel" long-name="Control Panel" level="generic">
<component name="controlpanel_rom" long-name="Control Panel ROM" filter="s60" class="placeholder">
-<!-- Need to create a real .pro file for this
+<!-- Need to create a real .pro file for this
<unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/> -->
</component>
<component name="controlpanel_config" long-name="Control Panel Config" filter="s60" introduced="^4" class="config placeholder">
-<!-- Need to create a real .pro file for this
+<!-- Need to create a real .pro file for this
<unit bldFile="controlpanel/conf" qt:proFile="conf.pri" qt:qmakeArgs="-r -config rom"/> -->
</component>
<component name="controlpanel_source" long-name="Control Panel Source" filter="s60" class="placeholder">
-<!-- Uncomment when controlpanel_build is removed
+<!-- Uncomment when controlpanel_build is removed
<unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/> -->
</component>
<component name="controlpanel_build" long-name="Control Panel Build" filter="s60">
@@ -7232,7 +7232,7 @@
<unit bldFile="mw/web/codhandler/roapapp/group"/>
</component>
<component name="codhandler_build" filter="s60" long-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>
@@ -8083,14 +8083,14 @@
<collection name="calendarwidgetinstaller" long-name="Calendar Widget Installer" level="build">
<!-- collection is really a component, need to move down a directory -->
<component name="calendarwidgetinstaller_build" long-name="Calendar Widget Installer Build" filter="dfs_build" introduced="^4" class="placeholder">
-<!-- built by calendarwidget_rom
+<!-- built by calendarwidget_rom
<unit bldFile="calendarwidgetinstaller" qt:qmakeArgs="-r" qt:proFile="calendarwidgetinstaller.pro"/> -->
</component>
</collection>
<collection name="calendarwidgetplugin" long-name="Calendar Widget Plugin" level="app">
<!-- collection is really a component, need to move down a directory -->
<component name="calendarwidgetplugin_build" long-name="Calendar Widget Plugin Build" filter="dfs_build" introduced="^4" plugin="Y" class="placeholder">
-<!-- built by calendarwidget_rom
+<!-- built by calendarwidget_rom
<unit bldFile="calendarwidgetplugin" qt:qmakeArgs="-r" qt:proFile="calendarwidgetplugin.pro"/> -->
</component>
<component name="calendarwidgetplugin_test" long-name="Calendar Widget Plugin Test" filter="dfs_build" introduced="^4">
--- 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>
--- a/symbian4/single/sysdefs/system_model.surge.xml Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.surge.xml Tue Aug 24 14:27:40 2010 +0100
@@ -74,127 +74,127 @@
]>
<SystemDefinition schema="2.0.1" name="Symbian^4">
<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" span="2" levels="adaptation plugin mid engine" long-name="Stubs">
-<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
+<layer name="adapt" long-name="Adaptation" levels="low mw high">
+<block name="stubs" level="high" span="2" levels="adapt plugin mid engine" long-name="Stubs">
+<collection name="audiostubs" long-name="Audio Stubs" level="adapt">
<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" purpose="optional">
-<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+<unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
</component>
<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+<unit bldFile="adapt/stubs/audiostubs/fmradiotunercontrolstub/group"/>
</component>
</collection>
<collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
<component name="drm_stubs_build" long-name="DRM Stubs Build" purpose="optional">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="adapt/stubs/drm_stubs/group"/>
</component>
</collection>
<collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
<component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build" purpose="optional">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="adapt/stubs/ocrsrv_stub/group"/>
</component>
</collection>
<collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
<component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build" purpose="optional">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="adapt/stubs/omasuplasnconverterstubimpl/group"/>
</component>
</collection>
<collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
<component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="adapt/stubs/posmsgpluginreferenceimpl/group"/>
</component>
</collection>
<collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
<component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs" purpose="optional">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="adapt/stubs/srsfenginestub/group"/>
</component>
</collection>
<collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
<component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build" purpose="optional">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-</collection>
-<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
+<unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
+</component>
+</collection>
+<collection name="systemswstubs" long-name="System Software Stubs" level="adapt">
<component name="ddcaccessstub" long-name="DDC Access Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+<unit bldFile="adapt/stubs/systemswstubs/ddcaccessstub/group"/>
</component>
<component name="tvoutconfig" long-name="TV Out Config" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
</component>
<component name="accessorypolicyreference" long-name="Accessory Policy Reference" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
</component>
<component name="asyreference" long-name="ASY Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
</component>
<component name="examplecommonisc" long-name="Example Common ISC" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
</component>
<component name="exampledsy" long-name="Example DSY" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
</component>
<component name="featuremanagerstub" long-name="Feature Manager Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
</component>
<component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
</component>
<component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
</component>
<component name="sensorchannelsreference" long-name="Sensor Channels Reference" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
</component>
<component name="ssyreference" long-name="SSY Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
-</component>
-<component name="startupadaptationstub" long-name="Startup Adaptation Stub" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+</component>
+<component name="startupadaptstub" long-name="Startup Adaptation Stub" purpose="optional" plugin="Y">
+<unit bldFile="adapt/stubs/systemswstubs/startupadaptstub/group" filter="oem_build"/>
</component>
<component name="tiltcompensationstub" long-name="Tilt Compensation Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
</component>
<component name="tvoutbehaviour" long-name="TV Out Behaviour" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
</component>
<component name="wiredbearerreference" long-name="Wired Bearer Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
</component>
</collection>
<collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
<component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="adapt/stubs/tactileclickplugin_stub/group"/>
</component>
</collection>
<collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
<component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build" purpose="optional">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="adapt/stubs/wlanhwinit_stub/group"/>
</component>
</collection>
</block>
<block name="beagleboard" level="low" levels="hw-if" long-name="Beagle Board">
<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" filter="sf_build" purpose="optional">
-<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 name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
+<unit bldFile="adapt/beagleboard/omap3530/kernel"/>
</component>
<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
+<unit bldFile="adapt/beagleboard/omap3530/beagleboard"/>
</component>
</collection>
</block>
<block name="qemu" level="low" levels="hw-if" long-name="QEMU and Baseport">
<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
<component name="syborg" long-name="Syborg" introduced="^2" filter="sf_build" purpose="optional">
-<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>
</block>
</layer>
<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" levels="hw-if adaptation framework test" long-name="Kernel and Hardware Services">
+<block name="kernelhwsrv" level="hw" levels="hw-if adapt framework test" long-name="Kernel and Hardware Services">
<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
<unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -205,7 +205,7 @@
<unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
</component>
</collection>
-<collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+<collection name="kernel" long-name="Kernel Architecture" level="adapt">
<component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory">
<unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
</component>
@@ -221,7 +221,7 @@
<unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
</component>
</collection>
-<collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+<collection name="ldds" long-name="Logical Device Drivers" level="adapt">
<component name="ethernetldd" long-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>
@@ -633,7 +633,7 @@
</component>
</collection>
</block>
-<block name="persistentdata" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Persistent Data Services">
+<block name="persistentdata" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Persistent Data Services">
<collection name="featuremgmt" long-name="Feature Management" level="framework">
<component name="featuremgr" long-name="Feature Manager" introduced="^3" purpose="mandatory">
<unit bldFile="os/persistentdata/featuremgmt/featuremgr/group" mrp="os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
@@ -684,7 +684,7 @@
</component>
</collection>
</block>
-<block name="devicesrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Device Services">
+<block name="devicesrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Device Services">
<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" purpose="optional" class="api">
<!-- this needs to be moved to deviceplatformrelease -->
@@ -1135,7 +1135,7 @@
</component>
</collection>
</block>
-<block name="lbs" level="services" levels="hw-if data-acquisition adaptation management application-interface" long-name="Locating Services">
+<block name="lbs" level="services" levels="hw-if data-acquisition adapt management application-interface" long-name="Locating Services">
<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -1156,9 +1156,9 @@
<unit bldFile="os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
</component>
</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+<collection name="datasourceadapt" long-name="Data Source Adaptation" level="adapt">
+<component name="gpsdatasourceadapt" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourceadapt/gpsdatasourceadapt/group" mrp="os/lbs/datasourceadapt/gpsdatasourceadapt/group/lbs_gps_data_source_adapt.mrp"/>
</component>
</collection>
<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
@@ -1191,7 +1191,7 @@
<unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
</component>
</collection>
-<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adapt">
<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
</component>
@@ -1301,7 +1301,7 @@
</component>
</collection>
</block>
-<block name="networkingsrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Networking Services">
+<block name="networkingsrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Networking Services">
<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
<component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
<unit bldFile="os/networkingsrv/esockapiextensions/internetsockets/group" mrp="os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -1503,15 +1503,15 @@
</component>
</collection>
</block>
-<block name="cellularsrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Cellular Baseband Services">
+<block name="cellularsrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Cellular Baseband Services">
<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+<collection name="basebandadaptplugins" long-name="Baseband Adaptation Plugins" level="adapt">
<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<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 name="smsprotocols" long-name="SMS Protocols" level="framework">
@@ -1598,7 +1598,7 @@
<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
</component>
</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adapt">
<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
</component>
@@ -1611,10 +1611,10 @@
</component>
</collection>
</block>
-<block name="bt" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Bluetooth">
+<block name="bt" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Bluetooth">
<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" purpose="optional" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+<component name="bluetooth_audio_adapt_api" long-name="Bluetooth Audio Adaptation API" filter="s60" purpose="optional" class="api">
+<unit bldFile="os/bt/bt_plat/bluetooth_audio_adapt_api/group"/>
</component>
<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" purpose="optional" class="api">
<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
@@ -1694,12 +1694,12 @@
</component>
</collection>
<collection name="btsimulator" long-name="Bluetooth Simulator" level="internal-utils">
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaption Stub" introduced="^3" filter="s60" purpose="optional">
-<unit bldFile="os/bt/btsimulator/btaudioadaptation_stub/group"/>
+<component name="btaudioadapt_stub" long-name="Bluetooth Audio Adaption Stub" introduced="^3" filter="s60" purpose="optional">
+<unit bldFile="os/bt/btsimulator/btaudioadapt_stub/group"/>
</component>
</collection>
</block>
-<block name="usb" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="USB">
+<block name="usb" level="services" levels="adapt hw-if plugin framework server app-if" long-name="USB">
<collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
<!-- placeholder for platform APIs -->
</collection>
@@ -1720,7 +1720,7 @@
</component>
</collection>
</block>
-<block name="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if" long-name="Multimedia">
+<block name="mm" level="services" levels="adapt hw-if device-fw devices middleware app-if" long-name="Multimedia">
<collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
<component name="audio_effects_api" long-name="Audio Effects API" filter="s60" purpose="optional" class="api">
<unit bldFile="os/mm/mm_pub/audio_effects_api/group" filter="!test"/>
@@ -1784,8 +1784,8 @@
<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" purpose="optional" class="api">
<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" purpose="optional" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
+<component name="devsound_adapt_api" long-name="DevSound Adaptation API" filter="s60" purpose="optional" class="api">
+<unit bldFile="os/mm/mm_plat/devsound_adapt_api/group"/>
</component>
<component name="display_posting_api" long-name="Display Posting API" filter="s60" purpose="optional" class="api">
<unit bldFile="os/mm/mm_plat/display_posting_api/group"/>
@@ -1808,8 +1808,8 @@
<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" purpose="optional" class="api">
<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" purpose="optional" class="api">
-<unit bldFile="os/mm/mm_plat/fm_radio_adaptation_api/group"/>
+<component name="fm_radio_adapt_api" long-name="FM Radio Adaptation API" filter="s60" purpose="optional" class="api">
+<unit bldFile="os/mm/mm_plat/fm_radio_adapt_api/group"/>
</component>
<component name="g711_decoder_interface_api" long-name="G711 Decoder Interface API" filter="s60" purpose="optional" class="api">
<unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group" filter="!test"/>
@@ -1892,8 +1892,8 @@
<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" purpose="optional" class="api">
<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" purpose="optional" class="api">
-<unit bldFile="os/mm/mm_plat/rds_adaptation_api/group"/>
+<component name="rds_adapt_api" long-name="RDS Adaptation API" filter="s60" purpose="optional" class="api">
+<unit bldFile="os/mm/mm_plat/rds_adapt_api/group"/>
</component>
<component name="restricted_audio_output_api" long-name="Restricted Audio Output API" filter="s60" purpose="optional" class="api">
<unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group" filter="!test"/>
@@ -2071,9 +2071,9 @@
<unit bldFile="os/mm/mmdevicefw/speechrecogsupport/group" mrp="os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
</component>
</collection>
-<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
+<collection name="mmswadapt" long-name="Multimedia Software Adaptation" level="adapt">
<component name="videorenderer" long-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 name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
@@ -2120,7 +2120,7 @@
<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
</component>
</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adapt">
<component name="devsoundhwdeviceapi" long-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>
@@ -2128,10 +2128,10 @@
<unit bldFile="os/mm/mmhais/a3facl/group" mrp="os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
</component>
<component name="a3fdevsoundcustomisation" long-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 name="refacladapt" long-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 name="videohai" long-name="Video HAI" introduced="7.0s" purpose="mandatory">
<unit bldFile="os/mm/mmhais/videohai/group" mrp="os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
@@ -2141,7 +2141,7 @@
</component>
</collection>
</block>
-<block name="imagingext" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Imaging Extensions">
+<block name="imagingext" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Imaging Extensions">
<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
<component name="exif_api" long-name="Exif API" filter="s60" purpose="optional" class="api">
<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
@@ -2170,13 +2170,13 @@
<unit bldFile="os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
</component>
</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
+<collection name="imageadaptextensions" long-name="Image Adaptation Extensions" level="app-if">
<component name="iclextjpegapi" long-name="ICL Extension JPEG API" filter="s60" purpose="optional">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" long-name="Image Adaptation Extensions Build" filter="s60" purpose="optional">
+<unit bldFile="os/imagingext/imageadaptextensions/iclextjpegapi/group"/>
+</component>
+<component name="imageadaptextensions_build" long-name="Image Adaptation Extensions Build" filter="s60" purpose="optional">
<!-- 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 name="imagingmodules" long-name="Imaging Modules" level="hw-if">
@@ -2188,13 +2188,13 @@
</component>
</collection>
</block>
-<block name="graphics" level="services" levels="adaptation engines internal-adaptations device-interface internal-utils app-if" long-name="Graphics">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
+<block name="graphics" level="services" levels="adapt engines internal-adapts device-interface internal-utils app-if" long-name="Graphics">
+<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adapt">
<component name="vgi" long-name="VGI" filter="s60" purpose="optional">
<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
</component>
</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
+<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adapts">
<component name="m3gcore11" long-name="M3G Core 1.1" filter="s60" purpose="optional">
<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
</component>
@@ -2203,8 +2203,8 @@
<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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 name="graphicsresourceadapt" long-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 name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
@@ -2218,7 +2218,7 @@
<unit bldFile="os/graphics/graphicsutils/commongraphicsheaders/group" mrp="os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
</component>
</collection>
-<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
+<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adapt">
<!-- displayldd to be moved here -->
<component name="surfacemgr" long-name="Surface Manager" introduced="^3" purpose="optional">
<unit bldFile="os/graphics/graphicshwdrivers/surfacemgr/group" mrp="os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
@@ -2277,7 +2277,7 @@
<unit bldFile="os/graphics/fbs/fontandbitmapserver/group" mrp="os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
</component>
</collection>
-<collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
+<collection name="opengles" long-name="OpenGLES" level="internal-adapts">
<component name="openglesinterface" long-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>
@@ -2285,7 +2285,7 @@
<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
</component>
</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
+<collection name="openvg" long-name="OpenVG" level="internal-adapts">
<component name="openvginterface" long-name="OpenVG Interface" introduced="^2" purpose="optional">
<unit bldFile="os/graphics/openvg/openvginterface/group" mrp="os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
</component>
@@ -2297,7 +2297,7 @@
<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
</component>
</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
+<collection name="egl" long-name="EGL" level="internal-adapts">
<component name="eglinterface" long-name="EGL Interface" introduced="^2" purpose="mandatory">
<unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
</component>
@@ -2331,8 +2331,8 @@
<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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 name="directgdiadapt" long-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 name="graphicstools" long-name="Graphics Tools" level="internal-utils">
@@ -2875,9 +2875,9 @@
<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
</component>
</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
+<collection name="hwresourceadapt" long-name="Hardware Resource Adaptation" level="generic">
<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" deprecated="^4" purpose="optional" plugin="Y">
-<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 name="commonappservices" long-name="Common Application Services" level="framework">
@@ -3003,8 +3003,8 @@
<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" purpose="optional" class="api">
<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" purpose="optional" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+<component name="devencadapt_api" long-name="Device Encryption Adaptation API" filter="s60" purpose="optional" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/devencadapt_api/group"/>
</component>
<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" purpose="optional" class="api">
<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
--- a/symbian4/single/sysdefs/system_model.xml Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml Tue Aug 24 14:27:40 2010 +0100
@@ -1,261 +1,261 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
<SystemDefinition name="Symbian^4" schema="2.0.1">
<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
-<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
+<layer name="adapt" long-name="Adaptation" levels="low mw high">
+<block name="stubs" level="high" span="2" long-name="Stubs" levels="adapt plugin mid engine">
+<collection name="audiostubs" long-name="Audio Stubs" level="adapt">
<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+<unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
</component>
<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
-<unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+<unit bldFile="adapt/stubs/audiostubs/fmradiotunercontrolstub/group"/>
</component>
</collection>
<collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
<component name="drm_stubs_build" long-name="DRM Stubs Build">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="adapt/stubs/drm_stubs/group"/>
</component>
</collection>
<collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
<component name="ocrsrv_stub_build" long-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 name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
<component name="omasuplasnconverterstubimpl_build" long-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 name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
<component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="adapt/stubs/posmsgpluginreferenceimpl/group"/>
</component>
</collection>
<collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
<component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="adapt/stubs/srsfenginestub/group"/>
</component>
</collection>
<collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
<component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-</collection>
-<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
+<unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
+</component>
+</collection>
+<collection name="systemswstubs" long-name="System Software Stubs" level="adapt">
<component name="ddcaccessstub" long-name="DDC Access Stub">
-<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+<unit bldFile="adapt/stubs/systemswstubs/ddcaccessstub/group"/>
</component>
<component name="tvoutconfig" long-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 name="accessorypolicyreference" long-name="Accessory Policy Reference">
-<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
</component>
<component name="asyreference" long-name="ASY Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
</component>
<component name="examplecommonisc" long-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 name="exampledsy" long-name="Example DSY">
-<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
</component>
<component name="featuremanagerstub" long-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 name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
</component>
<component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
</component>
<component name="sensorchannelsreference" long-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 name="ssyreference" long-name="SSY Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
-</component>
-<component name="startupadaptationstub" long-name="Startup Adaptation Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+</component>
+<component name="startupadaptstub" long-name="Startup Adaptation Stub" plugin="Y">
+<unit bldFile="adapt/stubs/systemswstubs/startupadaptstub/group" filter="oem_build"/>
</component>
<component name="tiltcompensationstub" long-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 name="tvoutbehaviour" long-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 name="wiredbearerreference" long-name="Wired Bearer Reference" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
</component>
</collection>
<collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
<component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="adapt/stubs/tactileclickplugin_stub/group"/>
</component>
</collection>
<collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
<component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="adapt/stubs/wlanhwinit_stub/group"/>
</component>
</collection>
</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_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"/>
+<unit bldFile="adapt/beagleboard/omap3530" mrp="adapt/beagleboard/omap3530/base_beagle.mrp"/>
</component>
<component name="omap3530_kernel" long-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 name="beagleboard_Baseport" long-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>
</block>
<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
<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"/>
+<unit bldFile="adapt/qemu/baseport/syborg" mrp="adapt/qemu/baseport/syborg/syborg.mrp"/>
</component>
</collection>
</block>
<block name="codecs.aricent" level="low" long-name="Aricent Codecs">
<collection name="utilities" long-name="Aricent Utilities">
<component name="ariprocessengine" long-name="Aricent Process Engine">
-<unit bldFile="adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
+<unit bldFile="adapt/codecs.aricent/utilities/ariprocessengine/group"/>
</component>
<component name="aristatemachine" long-name="Aricent State Machine">
-<unit bldFile="adaptation/codecs.aricent/utilities/aristatemachine/group"/>
+<unit bldFile="adapt/codecs.aricent/utilities/aristatemachine/group"/>
</component>
</collection>
<collection name="aaclc_enc" level="plugin">
<component name="ariaaclcencmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
</component>
</collection>
<collection name="amrnb_dec" level="plugin">
<component name="ariamrnbdecmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
</component>
</collection>
<collection name="amrnb_enc" level="plugin">
<component name="ariamrnbencmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
</component>
</collection>
<collection name="amrwb_dec" level="plugin">
<component name="ariamrwbdecmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
</component>
</collection>
<collection name="h264_dec" level="plugin">
<component name="arih264dechwdevice">
-<unit bldFile="adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
</component>
</collection>
<collection name="h264_enc" level="plugin">
<component name="arih264enchwdevice">
-<unit bldFile="adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
</component>
</collection>
<collection name="heaac_dec" level="plugin">
<component name="ariheaacdecmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
</component>
</collection>
<collection name="mp3_dec" level="plugin">
<component name="arimp3decmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
</component>
</collection>
<collection name="mp4asp_dec" level="plugin">
<component name="arimpeg4aspdechwdevice">
-<unit bldFile="adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
</component>
</collection>
<collection name="mp4sp_enc" level="plugin">
<component name="arimp4spenchwdevice">
-<unit bldFile="adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
</component>
</collection>
</block>
</layer>
<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adapt framework test">
<collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
<component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
<unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -266,7 +266,7 @@
<unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
</component>
</collection>
-<collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+<collection name="kernel" long-name="Kernel Architecture" level="adapt">
<component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory">
<unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
</component>
@@ -282,7 +282,7 @@
<unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
</component>
</collection>
-<collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+<collection name="ldds" long-name="Logical Device Drivers" level="adapt">
<component name="ethernetldd" long-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>
@@ -614,7 +614,7 @@
<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
</component>
<component name="ofdbus_rom" filter="s60" long-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>
@@ -691,7 +691,7 @@
</component>
</collection>
</block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adapt hw-if plugin framework server app-if">
<collection name="featuremgmt" long-name="Feature Management" level="framework">
<component name="featuremgr" long-name="Feature Manager" introduced="^3" purpose="mandatory">
<unit bldFile="os/persistentdata/featuremgmt/featuremgr/group" mrp="os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
@@ -742,7 +742,7 @@
</component>
</collection>
</block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="devicesrv" level="services" long-name="Device Services" levels="adapt hw-if plugin framework server app-if">
<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
<!-- this needs to be moved to deviceplatformrelease -->
@@ -1199,7 +1199,7 @@
</component>
</collection>
</block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adapt management application-interface">
<collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
<component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
<unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -1220,9 +1220,9 @@
<unit bldFile="os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
</component>
</collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+<collection name="datasourceadapt" long-name="Data Source Adaptation" level="adapt">
+<component name="gpsdatasourceadapt" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/datasourceadapt/gpsdatasourceadapt/group" mrp="os/lbs/datasourceadapt/gpsdatasourceadapt/group/lbs_gps_data_source_adapt.mrp"/>
</component>
</collection>
<collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
@@ -1255,7 +1255,7 @@
<unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
</component>
</collection>
-<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adapt">
<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
<unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
</component>
@@ -1365,7 +1365,7 @@
</component>
</collection>
</block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="networkingsrv" level="services" long-name="Networking Services" levels="adapt hw-if plugin framework server app-if">
<collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
<component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
<unit bldFile="os/networkingsrv/esockapiextensions/internetsockets/group" mrp="os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -1567,15 +1567,15 @@
</component>
</collection>
</block>
-<block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adapt hw-if plugin framework server app-if">
<collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
<component name="basebandchanneladaptor" long-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 name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+<collection name="basebandadaptplugins" long-name="Baseband Adaptation Plugins" level="adapt">
<component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
-<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 name="smsprotocols" long-name="SMS Protocols" level="framework">
@@ -1662,7 +1662,7 @@
<unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
</component>
</collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adapt">
<component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
<unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
</component>
@@ -1675,10 +1675,10 @@
</component>
</collection>
</block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+<block name="bt" level="services" long-name="Bluetooth" levels="adapt hw-if plugin framework server app-if">
<collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+<component name="bluetooth_audio_adapt_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
+<unit bldFile="os/bt/bt_plat/bluetooth_audio_adapt_api/group"/>
</component>
<component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
<unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
@@ -1758,12 +1758,12 @@
</component>
</collection>
<collection name="btsimulator" long-name="Bluetooth Simulator" level="internal-utils">
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaption Stub" introduced="^3" purpose="optional" filter="s60">
-<unit bldFile="os/bt/btsimulator/btaudioadaptation_stub/group"/>
+<component name="btaudioadapt_stub" long-name="Bluetooth Audio Adaption Stub" introduced="^3" purpose="optional" filter="s60">
+<unit bldFile="os/bt/btsimulator/btaudioadapt_stub/group"/>
</component>
</collection>
</block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
+<block name="usb" level="services" long-name="USB" levels="adapt hw-if plugin framework server app-if">
<collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
<!-- placeholder for platform APIs -->
</collection>
@@ -1784,7 +1784,7 @@
</component>
</collection>
</block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+<block name="mm" level="services" long-name="Multimedia" levels="adapt hw-if device-fw devices middleware app-if">
<collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
<component name="audio_effects_api" long-name="Audio Effects API" filter="s60" class="api">
<unit bldFile="os/mm/mm_pub/audio_effects_api/group" filter="!test"/>
@@ -1848,8 +1848,8 @@
<component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
</component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
+<component name="devsound_adapt_api" long-name="DevSound Adaptation API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/devsound_adapt_api/group"/>
</component>
<component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/display_posting_api/group"/>
@@ -1872,8 +1872,8 @@
<component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
</component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/fm_radio_adaptation_api/group"/>
+<component name="fm_radio_adapt_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/fm_radio_adapt_api/group"/>
</component>
<component name="g711_decoder_interface_api" long-name="G711 Decoder Interface API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group" filter="!test"/>
@@ -1956,8 +1956,8 @@
<component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
</component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/rds_adaptation_api/group"/>
+<component name="rds_adapt_api" long-name="RDS Adaptation API" filter="s60" class="api">
+<unit bldFile="os/mm/mm_plat/rds_adapt_api/group"/>
</component>
<component name="restricted_audio_output_api" long-name="Restricted Audio Output API" filter="s60" class="api">
<unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group" filter="!test"/>
@@ -2043,7 +2043,7 @@
<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
</component>
<component name="effectspresets_utils" filter="s60" long-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"/>
@@ -2135,9 +2135,9 @@
<unit bldFile="os/mm/mmdevicefw/speechrecogsupport/group" mrp="os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
</component>
</collection>
-<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
+<collection name="mmswadapt" long-name="Multimedia Software Adaptation" level="adapt">
<component name="videorenderer" long-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 name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
@@ -2184,7 +2184,7 @@
<unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
</component>
</collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adapt">
<component name="devsoundhwdeviceapi" long-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>
@@ -2192,10 +2192,10 @@
<unit bldFile="os/mm/mmhais/a3facl/group" mrp="os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
</component>
<component name="a3fdevsoundcustomisation" long-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 name="refacladapt" long-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 name="videohai" long-name="Video HAI" introduced="7.0s" purpose="mandatory">
<unit bldFile="os/mm/mmhais/videohai/group" mrp="os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
@@ -2205,7 +2205,7 @@
</component>
</collection>
</block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adapt hw-if plugin framework server app-if">
<collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
<component name="exif_api" long-name="Exif API" filter="s60" class="api">
<unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
@@ -2234,13 +2234,13 @@
<unit bldFile="os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
</component>
</collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
+<collection name="imageadaptextensions" long-name="Image Adaptation Extensions" level="app-if">
<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" filter="s60" long-name="Image Adaptation Extensions Build">
+<unit bldFile="os/imagingext/imageadaptextensions/iclextjpegapi/group"/>
+</component>
+<component name="imageadaptextensions_build" filter="s60" long-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 name="imagingmodules" long-name="Imaging Modules" level="hw-if">
@@ -2252,13 +2252,13 @@
</component>
</collection>
</block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
+<block name="graphics" level="services" long-name="Graphics" levels="adapt engines internal-adapts device-interface internal-utils app-if">
+<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adapt">
<component name="vgi" filter="s60" long-name="VGI">
<unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
</component>
</collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
+<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adapts">
<component name="m3gcore11" filter="s60" long-name="M3G Core 1.1">
<unit bldFile="os/graphics/m3g/m3gcore11/group"/>
</component>
@@ -2267,8 +2267,8 @@
<component name="graphicsresource" long-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 name="graphicsresourceadaptation" long-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 name="graphicsresourceadapt" long-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 name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
@@ -2282,7 +2282,7 @@
<unit bldFile="os/graphics/graphicsutils/commongraphicsheaders/group" mrp="os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
</component>
</collection>
-<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
+<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adapt">
<!-- displayldd to be moved here -->
<component name="surfacemgr" long-name="Surface Manager" introduced="^3" purpose="optional">
<unit bldFile="os/graphics/graphicshwdrivers/surfacemgr/group" mrp="os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
@@ -2341,7 +2341,7 @@
<unit bldFile="os/graphics/fbs/fontandbitmapserver/group" mrp="os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
</component>
</collection>
-<collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
+<collection name="opengles" long-name="OpenGLES" level="internal-adapts">
<component name="openglesinterface" long-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>
@@ -2349,7 +2349,7 @@
<unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
</component>
</collection>
-<collection name="openvg" long-name="OpenVG" level="internal-adaptations">
+<collection name="openvg" long-name="OpenVG" level="internal-adapts">
<component name="openvginterface" long-name="OpenVG Interface" introduced="^2" purpose="optional">
<unit bldFile="os/graphics/openvg/openvginterface/group" mrp="os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
</component>
@@ -2361,7 +2361,7 @@
<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
</component>
</collection>
-<collection name="egl" long-name="EGL" level="internal-adaptations">
+<collection name="egl" long-name="EGL" level="internal-adapts">
<component name="eglinterface" long-name="EGL Interface" introduced="^2" purpose="mandatory">
<unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
</component>
@@ -2395,8 +2395,8 @@
<component name="directgdiinterface" long-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 name="directgdiadaptation" long-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 name="directgdiadapt" long-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 name="graphicstools" long-name="Graphics Tools" level="internal-utils">
@@ -2939,9 +2939,9 @@
<unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
</component>
</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
+<collection name="hwresourceadapt" long-name="Hardware Resource Adaptation" level="generic">
<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" deprecated="^4" plugin="Y">
-<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 name="commonappservices" long-name="Common Application Services" level="framework">
@@ -3067,8 +3067,8 @@
<component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
<unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
</component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+<component name="devencadapt_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/devencadapt_api/group"/>
</component>
<component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
<unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
@@ -3342,9 +3342,9 @@
<unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
</component>
<component name="supl_pos_message_plugin_api" long-name="SUPL POS Message Plugin API" filter="s60" class="api placeholder">
-<!-- placeholder
- <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
- <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
+<!-- placeholder
+ <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
+ <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
-->
</component>
<component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
@@ -5698,7 +5698,7 @@
</collection>
<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
<component name="mmappcomponents_build" filter="s60" long-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>
@@ -6647,10 +6647,10 @@
<component name="fontprovider" filter="s60" long-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 name="fontutils" filter="sf_build" long-name="Font Utils">
<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -6744,15 +6744,15 @@
</collection>
<collection name="controlpanel" long-name="Control Panel" level="generic">
<component name="controlpanel_rom" long-name="Control Panel ROM" filter="s60" class="placeholder">
-<!-- Need to create a real .pro file for this
+<!-- Need to create a real .pro file for this
<unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/> -->
</component>
<component name="controlpanel_config" long-name="Control Panel Config" filter="s60" introduced="^4" class="config placeholder">
-<!-- Need to create a real .pro file for this
+<!-- Need to create a real .pro file for this
<unit bldFile="controlpanel/conf" qt:proFile="conf.pri" qt:qmakeArgs="-r -config rom"/> -->
</component>
<component name="controlpanel_source" long-name="Control Panel Source" filter="s60" class="placeholder">
-<!-- Uncomment when controlpanel_build is removed
+<!-- Uncomment when controlpanel_build is removed
<unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/> -->
</component>
<component name="controlpanel_build" long-name="Control Panel Build" filter="s60">
@@ -7232,7 +7232,7 @@
<unit bldFile="mw/web/codhandler/roapapp/group"/>
</component>
<component name="codhandler_build" filter="s60" long-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>
@@ -8083,14 +8083,14 @@
<collection name="calendarwidgetinstaller" long-name="Calendar Widget Installer" level="build">
<!-- collection is really a component, need to move down a directory -->
<component name="calendarwidgetinstaller_build" long-name="Calendar Widget Installer Build" filter="dfs_build" introduced="^4" class="placeholder">
-<!-- built by calendarwidget_rom
+<!-- built by calendarwidget_rom
<unit bldFile="calendarwidgetinstaller" qt:qmakeArgs="-r" qt:proFile="calendarwidgetinstaller.pro"/> -->
</component>
</collection>
<collection name="calendarwidgetplugin" long-name="Calendar Widget Plugin" level="app">
<!-- collection is really a component, need to move down a directory -->
<component name="calendarwidgetplugin_build" long-name="Calendar Widget Plugin Build" filter="dfs_build" introduced="^4" plugin="Y" class="placeholder">
-<!-- built by calendarwidget_rom
+<!-- built by calendarwidget_rom
<unit bldFile="calendarwidgetplugin" qt:qmakeArgs="-r" qt:proFile="calendarwidgetplugin.pro"/> -->
</component>
<component name="calendarwidgetplugin_test" long-name="Calendar Widget Plugin Test" filter="dfs_build" introduced="^4">
--- a/symbian4/single/sysdefs/system_model_3.0.xml Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian4/single/sysdefs/system_model_3.0.xml Tue Aug 24 14:27:40 2010 +0100
@@ -1,139 +1,139 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- this DTD describes schema="3.0.1" --><!-- all relative paths are relative to this file
- all absolute paths are relative to the environment variable specified by the root attribute, or SRCROOT if not. --><!-- Container for metadata
- meta, if present, should always be the first element in the parent
- --><!-- systemModel element has name but no ID --><!-- All items from layer down to component should have either @href or at least one valid child item.
- Anything else will be considered a placeholder
- --><!-- Nested packages are for backwards compatibility only --><!-- contains units or is a placeholder --><!--
- "origin-model" attribute is only to be inserted by tools when merging models
- recommended class values are: doc, config, plugin, tool, api --><!-- priority is deprecated
+<?xml version="1.0" encoding="UTF-8"?><!-- this DTD describes schema="3.0.1" --><!-- all relative paths are relative to this file
+ all absolute paths are relative to the environment variable specified by the root attribute, or SRCROOT if not. --><!-- Container for metadata
+ meta, if present, should always be the first element in the parent
+ --><!-- systemModel element has name but no ID --><!-- All items from layer down to component should have either @href or at least one valid child item.
+ Anything else will be considered a placeholder
+ --><!-- Nested packages are for backwards compatibility only --><!-- contains units or is a placeholder --><!--
+ "origin-model" attribute is only to be inserted by tools when merging models
+ recommended class values are: doc, config, plugin, tool, api --><!-- priority is deprecated
"root" attribute will usually be inserted by tools when merging models, although it can be set manually--><SystemDefinition xmlns:qt="http://www.nokia.com/qt" schema="3.0.1" id-namespace="http://www.symbian.org/system-definition">
<systemModel name="Symbian^4">
- <layer id="adaptation" name="Adaptation" levels="low mw high">
- <package id="stubs" tech-domain="hb" level="high" span="2" levels="adaptation plugin mid engine" name="Stubs">
- <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" levels="adapt plugin mid engine" name="Stubs">
+ <collection id="audiostubs" name="Audio Stubs" level="adapt">
<component id="devsoundextensions_stubs" name="Devsound Extensions Stubs" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <unit bldFile="/adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+ <unit bldFile="/adapt/stubs/audiostubs/fmradiotunercontrolstub/group"/>
</component>
</collection>
<collection id="drm_stubs" name="DRM Stubs" level="plugin">
<component id="drm_stubs_build" name="DRM Stubs Build" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <unit bldFile="/adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+ <unit bldFile="/adapt/stubs/systemswstubs/ddcaccessstub/group"/>
</component>
<component id="tvoutconfig" name="TV Out Config" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <unit bldFile="/adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
- </component>
- <component id="startupadaptationstub" name="Startup Adaptation Stub" class="plugin" target="device" purpose="optional">
- <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" target="device" purpose="optional">
+ <unit bldFile="/adapt/stubs/systemswstubs/startupadaptstub/group" filter="oem_build"/>
</component>
<component id="tiltcompensationstub" name="Tilt Compensation Stub" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <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">
<component id="tactileclickplugin_stub_build" name="Tactile Click Plugin Stub Build" class="plugin" target="device" purpose="optional">
- <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" target="device" purpose="optional">
- <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" levels="hw-if" name="Beagle Board">
<collection id="omap3530" name="OMAP 3530" level="hw-if">
<component id="omap3530_build" name="Beagle Board Common" introduced="^3" filter="sf_build" purpose="optional" target="device">
- <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" filter="sf_build" purpose="optional" target="device">
- <unit bldFile="/adaptation/beagleboard/omap3530/kernel"/>
+ <unit bldFile="/adapt/beagleboard/omap3530/kernel"/>
</component>
<component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" filter="sf_build" purpose="optional" target="device">
- <unit bldFile="/adaptation/beagleboard/omap3530/beagleboard"/>
+ <unit bldFile="/adapt/beagleboard/omap3530/beagleboard"/>
</component>
</collection>
</package>
<package id="qemu" tech-domain="hb" level="low" levels="hw-if" name="QEMU and Baseport">
<collection id="qemu_baseport" name="Baseport" level="hw-if">
<component id="syborg" name="Syborg" introduced="^2" filter="sf_build" purpose="optional" target="device">
- <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" levels="hw-if adaptation framework test" name="Kernel and Hardware Services">
+ <package id="kernelhwsrv" level="hw" tech-domain="hb" levels="hw-if adapt framework test" name="Kernel and Hardware Services">
<collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
<component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional" target="device">
<unit bldFile="/os/kernelhwsrv/brdbootldr/ubootldr" mrp="/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -144,7 +144,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" target="device">
<unit bldFile="/os/kernelhwsrv/kernel/eka" mrp="/os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
</component>
@@ -160,7 +160,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" target="device">
<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="/os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
</component>
@@ -526,7 +526,7 @@
<unit bldFile="/os/ossrv/ofdbus/dbus-glib/group"/>
</component>
<component id="ofdbus_rom" name="D-Bus ROM" filter="s60" target="device" purpose="optional">
- <!-- 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>
@@ -605,7 +605,7 @@
</component>
</collection>
</package>
- <package id="persistentdata" level="services" tech-domain="hb" levels="adaptation hw-if plugin framework server app-if" name="Persistent Data Services">
+ <package id="persistentdata" level="services" tech-domain="hb" levels="adapt hw-if plugin framework server app-if" name="Persistent Data Services">
<collection id="featuremgmt" name="Feature Management" level="framework">
<component id="featuremgr" name="Feature Manager" introduced="^3" purpose="mandatory" target="device">
<unit bldFile="/os/persistentdata/featuremgmt/featuremgr/group" mrp="/os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
@@ -656,7 +656,7 @@
</component>
</collection>
</package>
- <package id="devicesrv" level="services" tech-domain="hb" levels="adaptation hw-if plugin framework server app-if" name="Device Services">
+ <package id="devicesrv" level="services" tech-domain="hb" levels="adapt hw-if plugin framework server app-if" name="Device Services">
<collection id="devicesrv_pub" name="Device Services Public Interfaces" level="app-if">
<component id="platform_path_definitions_api" name="Platform Path Definitions API" filter="s60,bldmefirst" class="api" target="device" purpose="optional">
<!-- this needs to be moved to deviceplatformrelease -->
@@ -1180,7 +1180,7 @@
</component>
</collection>
</package>
- <package id="lbs" level="services" tech-domain="lo" levels="hw-if data-acquisition adaptation management application-interface" name="Locating Services">
+ <package id="lbs" level="services" tech-domain="lo" levels="hw-if data-acquisition adapt management application-interface" name="Locating Services">
<collection id="datasourcemodules" name="Generic Positioning Plugins" level="data-acquisition">
<component id="defaultpositioningmodule" name="Default Positioning Module" introduced="^2" purpose="optional" class="plugin" target="device">
<unit bldFile="/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -1201,9 +1201,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" target="device">
- <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" target="device">
+ <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">
@@ -1237,7 +1237,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" target="device">
<unit bldFile="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
</component>
@@ -1351,7 +1351,7 @@
</component>
</collection>
</package>
- <package id="networkingsrv" level="services" tech-domain="dc" levels="adaptation hw-if plugin framework server app-if" name="Networking Services">
+ <package id="networkingsrv" level="services" tech-domain="dc" levels="adapt hw-if plugin framework server app-if" name="Networking Services">
<collection id="esockapiextensions" name="ESock API Extensions" level="app-if">
<component id="internetsockets" name="Internet Sockets" introduced="ER5" purpose="mandatory" target="device">
<unit bldFile="/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -1581,7 +1581,7 @@
</component>
</collection>
</package>
- <package id="cellularsrv" level="services" tech-domain="vc" levels="adaptation hw-if plugin framework server app-if" name="Cellular Baseband Services">
+ <package id="cellularsrv" level="services" tech-domain="vc" levels="adapt hw-if plugin framework server app-if" name="Cellular Baseband Services">
<meta rel="License" type="auto">
<license type="EPL">
<supplier>Nokia</supplier>
@@ -1592,9 +1592,9 @@
<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" target="device">
- <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">
@@ -1683,7 +1683,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" target="device">
<unit bldFile="/os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="/os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
</component>
@@ -1703,11 +1703,11 @@
</component>
</collection>
</package>
- <package id="bt" level="services" tech-domain="de" levels="adaptation hw-if plugin framework server app-if" name="Bluetooth">
+ <package id="bt" level="services" tech-domain="de" levels="adapt hw-if plugin framework server app-if" name="Bluetooth">
<collection id="bt_plat" name="Bluetooth Platform Interfaces" level="app-if">
- <component id="bluetooth_audio_adaptation_api" name="Bluetooth Audio Adaptation API" filter="s60" class="api" target="device" purpose="optional">
-
- <unit bldFile="/os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+ <component id="bluetooth_audio_adapt_api" name="Bluetooth Audio Adaptation API" filter="s60" class="api" target="device" purpose="optional">
+
+ <unit bldFile="/os/bt/bt_plat/bluetooth_audio_adapt_api/group"/>
</component>
<component id="bluetooth_power_management_api" name="Bluetooth Power Management API" filter="s60" class="api" target="device" purpose="optional">
@@ -1793,12 +1793,12 @@
</component>
</collection>
<collection id="btsimulator" name="Bluetooth Simulator" level="internal-utils">
- <component id="btaudioadaptation_stub" name="Bluetooth Audio Adaption Stub" introduced="^3" filter="s60" purpose="optional" target="device">
- <unit bldFile="/os/bt/btsimulator/btaudioadaptation_stub/group"/>
+ <component id="btaudioadapt_stub" name="Bluetooth Audio Adaption Stub" introduced="^3" filter="s60" purpose="optional" target="device">
+ <unit bldFile="/os/bt/btsimulator/btaudioadapt_stub/group"/>
</component>
</collection>
</package>
- <package id="usb" level="services" tech-domain="de" levels="adaptation hw-if plugin framework server app-if" name="USB">
+ <package id="usb" level="services" tech-domain="de" levels="adapt hw-if plugin framework server app-if" name="USB">
<collection id="usb_plat" name="USB Platform Interfaces" level="app-if">
<!-- placeholder for platform APIs -->
</collection>
@@ -1820,7 +1820,7 @@
</component>
</collection>
</package>
- <package id="mm" level="services" tech-domain="mm" levels="adaptation hw-if device-fw devices middleware app-if" name="Multimedia">
+ <package id="mm" level="services" tech-domain="mm" levels="adapt hw-if device-fw devices middleware app-if" name="Multimedia">
<collection id="mm_pub" name="Multimedia Public Interfaces" level="app-if">
<component id="audio_effects_api" name="Audio Effects API" filter="s60" class="api" target="device" purpose="optional">
@@ -1909,9 +1909,9 @@
<unit bldFile="/os/mm/mm_plat/custom_interface_utility_api/group"/>
</component>
- <component id="devsound_adaptation_api" name="DevSound Adaptation API" filter="s60" class="api" target="device" purpose="optional">
-
- <unit bldFile="/os/mm/mm_plat/devsound_adaptation_api/group"/>
+ <component id="devsound_adapt_api" name="DevSound Adaptation API" filter="s60" class="api" target="device" purpose="optional">
+
+ <unit bldFile="/os/mm/mm_plat/devsound_adapt_api/group"/>
</component>
<component id="display_posting_api" name="Display Posting API" filter="s60" class="api" target="device" purpose="optional">
@@ -1943,9 +1943,9 @@
<unit bldFile="/os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
</component>
- <component id="fm_radio_adaptation_api" name="FM Radio Adaptation API" filter="s60" class="api" target="device" purpose="optional">
-
- <unit bldFile="/os/mm/mm_plat/fm_radio_adaptation_api/group"/>
+ <component id="fm_radio_adapt_api" name="FM Radio Adaptation API" filter="s60" class="api" target="device" purpose="optional">
+
+ <unit bldFile="/os/mm/mm_plat/fm_radio_adapt_api/group"/>
</component>
<component id="g711_decoder_interface_api" name="G711 Decoder Interface API" filter="s60" class="api" target="device" purpose="optional">
@@ -2063,9 +2063,9 @@
<unit bldFile="/os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
</component>
- <component id="rds_adaptation_api" name="RDS Adaptation API" filter="s60" class="api" target="device" purpose="optional">
-
- <unit bldFile="/os/mm/mm_plat/rds_adaptation_api/group"/>
+ <component id="rds_adapt_api" name="RDS Adaptation API" filter="s60" class="api" target="device" purpose="optional">
+
+ <unit bldFile="/os/mm/mm_plat/rds_adapt_api/group"/>
</component>
<component id="restricted_audio_output_api" name="Restricted Audio Output API" filter="s60" class="api" target="device" purpose="optional">
@@ -2177,7 +2177,7 @@
<unit bldFile="/os/mm/devsoundextensions/effectspresets/group"/>
</component>
<component id="effectspresets_utils" name="Effects Presets Utils" filter="s60" target="device" purpose="optional">
- <!-- 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"/>
@@ -2274,9 +2274,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" target="device">
- <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">
@@ -2331,7 +2331,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" target="device">
<unit bldFile="/os/mm/devsound/hwdevapi/group" mrp="/os/mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
</component>
@@ -2339,10 +2339,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" target="device">
- <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" target="device">
- <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" target="device">
<unit bldFile="/os/mm/mmhais/videohai/group" mrp="/os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
@@ -2353,7 +2353,7 @@
</collection>
</package>
- <package id="imagingext" level="services" tech-domain="mm" levels="adaptation hw-if plugin framework server app-if" name="Imaging Extensions">
+ <package id="imagingext" level="services" tech-domain="mm" levels="adapt hw-if plugin framework server app-if" name="Imaging Extensions">
<collection id="imagingext_pub" name="Imaging Extensions Public Interfaces" level="app-if">
<component id="exif_api" name="Exif API" filter="s60" class="api" target="device" purpose="optional">
@@ -2392,13 +2392,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" name="ICL Extension JPEG API" filter="s60" target="device" purpose="optional">
- <unit bldFile="/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
- </component>
- <component id="imageadaptationextensions_build" name="Image Adaptation Extensions Build" filter="s60" target="device" purpose="optional">
+ <unit bldFile="/os/imagingext/imageadaptextensions/iclextjpegapi/group"/>
+ </component>
+ <component id="imageadaptextensions_build" name="Image Adaptation Extensions Build" filter="s60" target="device" purpose="optional">
<!-- 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">
@@ -2410,13 +2410,13 @@
</component>
</collection>
</package>
- <package id="graphics" level="services" tech-domain="ui" levels="adaptation engines internal-adaptations device-interface internal-utils app-if" name="Graphics">
- <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
+ <package id="graphics" level="services" tech-domain="ui" levels="adapt engines internal-adapts device-interface internal-utils app-if" name="Graphics">
+ <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adapt">
<component id="vgi" name="VGI" filter="s60" target="device" purpose="optional">
<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" name="M3G Core 1.1" filter="s60" target="device" purpose="optional">
<unit bldFile="/os/graphics/m3g/m3gcore11/group"/>
</component>
@@ -2425,8 +2425,8 @@
<component id="graphicsresource" name="Graphics Resource" introduced="^3" deprecated="^3" purpose="optional" target="device">
<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" target="device">
- <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" target="device">
+ <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" target="device">
<unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
@@ -2440,7 +2440,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" target="device">
<unit bldFile="/os/graphics/graphicshwdrivers/surfacemgr/group" mrp="/os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
@@ -2501,7 +2501,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" target="device">
<unit bldFile="/os/graphics/opengles/openglesinterface/group" mrp="/os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
</component>
@@ -2509,7 +2509,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" target="device">
<unit bldFile="/os/graphics/openvg/openvginterface/group" mrp="/os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
</component>
@@ -2521,7 +2521,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="mandatory" target="device">
<unit bldFile="/os/graphics/egl/eglinterface/group" mrp="/os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
</component>
@@ -2554,8 +2554,8 @@
<component id="directgdiinterface" name="DirectGDI Interface" introduced="^3" deprecated="^3" purpose="optional" target="device">
<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" target="device">
- <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" target="device">
+ <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">
@@ -3186,9 +3186,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" deprecated="^4" purpose="optional" class="plugin" target="device">
- <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">
@@ -3329,8 +3329,8 @@
<component id="lockapp_server_api" name="Lock Application Server API" filter="s60" class="api" target="device" purpose="optional">
<unit bldFile="/mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
</component>
- <component id="devencadaptation_api" name="Device Encryption Adaptation API" filter="s60" class="api" target="device" purpose="optional">
- <unit bldFile="/mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+ <component id="devencadapt_api" name="Device Encryption Adaptation API" filter="s60" class="api" target="device" purpose="optional">
+ <unit bldFile="/mw/securitysrv/secsrv_plat/devencadapt_api/group"/>
</component>
<component id="devenccommonutils_api" name="Device Encryption Common Utils API" filter="s60" class="api" target="device" purpose="optional">
<unit bldFile="/mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
@@ -3634,9 +3634,9 @@
<unit bldFile="/mw/locationsrv/locsrv_plat/geocoding_api/group"/>
</component>
<component id="supl_pos_message_plugin_api" name="SUPL POS Message Plugin API" filter="s60" class="api" target="device" purpose="optional">
- <!-- placeholder
- <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
- <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
+ <!-- placeholder
+ <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
+ <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
-->
</component>
<component id="landmarks_category_definition_api" name="Landmarks Category Definition API" filter="s60" class="api" target="device" purpose="optional">
@@ -6232,7 +6232,7 @@
</collection>
<collection id="mmappcomponents" name="Multimedia App Components" level="utils">
<component id="mmappcomponents_build" name="Multimedia App Components Build" introduced="^1" filter="s60" target="device" purpose="optional">
- <!-- 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>
@@ -7518,10 +7518,10 @@
<component id="fontprovider" name="Font Provider" filter="s60" target="device" purpose="optional">
<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" name="Font Utils" filter="sf_build" target="device" purpose="optional">
<unit bldFile="/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -7624,15 +7624,15 @@
<collection id="controlpanel" name="Control Panel" level="generic">
<component id="controlpanel_rom" name="Control Panel ROM" filter="s60" target="device" purpose="optional">
- <!-- Need to create a real .pro file for this
+ <!-- Need to create a real .pro file for this
<unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/> -->
</component>
<component id="controlpanel_config" name="Control Panel Config" introduced="^4" filter="s60" class="config" target="device" purpose="optional">
- <!-- Need to create a real .pro file for this
+ <!-- Need to create a real .pro file for this
<unit bldFile="controlpanel/conf" qt:proFile="conf.pri" qt:qmakeArgs="-r -config rom"/> -->
</component>
<component id="controlpanel_source" name="Control Panel Source" filter="s60" target="device" purpose="optional">
- <!-- Uncomment when controlpanel_build is removed
+ <!-- Uncomment when controlpanel_build is removed
<unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/> -->
</component>
<component id="controlpanel_build" name="Control Panel Build" filter="s60" target="device" purpose="optional">
@@ -8161,7 +8161,7 @@
<unit bldFile="/mw/web/codhandler/roapapp/group"/>
</component>
<component id="codhandler_build" name="COD Handler Build" filter="s60" target="device" purpose="optional">
- <!-- 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>
@@ -9061,14 +9061,14 @@
<collection id="calendarwidgetinstaller" name="Calendar Widget Installer" level="build">
<!-- collection is really a component, need to move down a directory -->
<component id="calendarwidgetinstaller_build" name="Calendar Widget Installer Build" introduced="^4" filter="dfs_build" target="device" purpose="optional">
- <!-- built by calendarwidget_rom
+ <!-- built by calendarwidget_rom
<unit bldFile="calendarwidgetinstaller" qt:qmakeArgs="-r" qt:proFile="calendarwidgetinstaller.pro"/> -->
</component>
</collection>
<collection id="calendarwidgetplugin" name="Calendar Widget Plugin" level="app">
<!-- collection is really a component, need to move down a directory -->
<component id="calendarwidgetplugin_build" name="Calendar Widget Plugin Build" introduced="^4" filter="dfs_build" class="plugin" target="device" purpose="optional">
- <!-- built by calendarwidget_rom
+ <!-- built by calendarwidget_rom
<unit bldFile="calendarwidgetplugin" qt:qmakeArgs="-r" qt:proFile="calendarwidgetplugin.pro"/> -->
</component>
<component id="calendarwidgetplugin_test" name="Calendar Widget Plugin Test" introduced="^4" filter="dfs_build" target="device" purpose="optional">