--- a/symbian3/single/sysdefs/system_model.xml Fri Jan 15 18:09:39 2010 +0000
+++ b/symbian3/single/sysdefs/system_model.xml Sat Jan 16 00:39:38 2010 +0000
@@ -2528,16 +2528,16 @@
<unit bldFile="/sf/os/mm/imagingandcamerafws/imagingfws/group" mrp="/sf/os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
</component>
<component name="imagingunittest" long-name="Imaging Unit Tests" introduced="7.0s" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="/sf/mm/imagingandcamerafws/imagingunittest/group" />
+<unit mrp="/sf/os/mm/imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="/sf/os/mm/imagingandcamerafws/imagingunittest/group" />
</component>
<component name="imaginginttest" long-name="Imaging Integration Tests" introduced="7.0s" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="/sf/mm/imagingandcamerafws/imaginginttest/group" />
+<unit mrp="/sf/os/mm/imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="/sf/os/mm/imagingandcamerafws/imaginginttest/group" />
</component>
<component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional" plugin="N">
<unit bldFile="/sf/os/mm/imagingandcamerafws/camerafw/group" mrp="/sf/os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
</component>
<component name="cameraunittest" long-name="Camera Unit Tests" introduced="9.2" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp" bldFile="/sf/mm/imagingandcamerafws/cameraunittest/group" />
+<unit mrp="/sf/os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp" bldFile="/sf/os/mm/imagingandcamerafws/cameraunittest/group" />
</component>
</collection>
<collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
@@ -2545,7 +2545,7 @@
<unit bldFile="/sf/os/mm/mmlibs/mmutilitylib/group" mrp="/sf/os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
</component>
<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory" plugin="N">
-<unit bldFile="/sf/mm/mmlibs/mmfw/group" mrp="mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
+<unit bldFile="/sf/os/mm/mmlibs/mmfw/group" mrp="mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
</component>
</collection>
<collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
@@ -2559,10 +2559,10 @@
<unit bldFile="/sf/os/mm/mmplugins/lib3gp/group" mrp="/sf/os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
</component>
<component name="lib3gpunittest" long-name="3GP Unit Tests" introduced="tb91" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp" bldFile="/sf/mm/mmplugins/lib3gpunittest/group" />
+<unit mrp="/sf/os/mm/mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp" bldFile="/sf/os/mm/mmplugins/lib3gpunittest/group" />
</component>
<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mm/mmplugins/mmfwplugins/group" mrp="mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
+<unit bldFile="/sf/os/mm/mmplugins/mmfwplugins/group" mrp="mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
</component>
</collection>
<collection name="mm_info" long-name="Multimedia Info" level="app-if">
@@ -2586,10 +2586,10 @@
</component>
<component name="mdfunittest" long-name="MDF Unit Tests" introduced="9.2" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp" bldFile="/sf/mm/mmdevicefw/mdfunittest/group" />
+<unit mrp="/sf/os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp" bldFile="/sf/os/mm/mmdevicefw/mdfunittest/group" />
</component>
<component name="speechrecogsupport" long-name="Speech Recognition Support" introduced="7.0s" purpose="mandatory" plugin="N">
-<unit bldFile="/sf/mm/mmdevicefw/speechrecogsupport/group" mrp="mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
+<unit bldFile="/sf/os/mm/mmdevicefw/speechrecogsupport/group" mrp="mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
</component>
<!-- <component name="asrcontroller" long-name="Speech Recognition Controller" introduced="7.0s" purpose="mandatory" plugin="N">
@@ -2603,16 +2603,16 @@
</collection>
<collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw">
<component name="mmtestfw" long-name="Multimedia Test Framework" introduced="7.0s" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp" bldFile="/sf/mm/mmtestenv/mmtestfw/group" />
+<unit mrp="/sf/os/mm/mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp" bldFile="/sf/os/mm/mmtestenv/mmtestfw/group" />
</component>
<component name="mmtestfwunittest" long-name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp" bldFile="/sf/mm/mmtestenv/mmtestfwunittest/group" />
+<unit mrp="/sf/os/mm/mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp" bldFile="/sf/os/mm/mmtestenv/mmtestfwunittest/group" />
</component>
<component name="mmtestagent" long-name="Multimedia Test Agent" introduced="8.0" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmtestenv/mmtestagent/group/multimediatestagent_source.mrp" bldFile="/sf/mm/mmtestenv/mmtestagent/group" />
+<unit mrp="/sf/os/mm/mmtestenv/mmtestagent/group/multimediatestagent_source.mrp" bldFile="/sf/os/mm/mmtestenv/mmtestagent/group" />
</component>
<component name="mmtesttools" long-name="Multimedia Test Tools" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp" bldFile="/sf/mm/mmtestenv/mmtesttools/Group" />
+<unit mrp="/sf/os/mm/mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp" bldFile="/sf/os/mm/mmtestenv/mmtesttools/Group" />
</component>
</collection>
@@ -2620,7 +2620,7 @@
<collection name="omxil" long-name="OpenMAX IL" level="hw-if">
<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional" plugin="N">
-<unit bldFile="/sf/mm/omxil/omxilcomponentcommon/group" mrp="mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
+<unit bldFile="/sf/os/mm/omxil/omxilcomponentcommon/group" mrp="mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
</component>
<component name="omxilapi" long-name="OpenMAX IL API" introduced="tb92" purpose="optional" plugin="N">
@@ -2640,10 +2640,10 @@
</component>
<component name="omxilunittest" long-name="OpenMAX IL Unit Tests" introduced="tb92" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp" bldFile="/sf/mm/omxil/omxilunittest/group" />
+<unit mrp="/sf/os/mm/omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp" bldFile="/sf/os/mm/omxil/omxilunittest/group" />
</component>
<component name="omxilcoreconftest" long-name="OpenMAX IL Core Conformance Suite" introduced="tb92" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp" bldFile="/sf/mm/omxil/omxilcoreconftest/group" />
+<unit mrp="/sf/os/mm/omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp" bldFile="/sf/os/mm/omxil/omxilcoreconftest/group" />
</component>
<component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="tb92" purpose="development" plugin="N">
<unit bldFile="/sf/os/mm/omxil/mmilapi/group" mrp="/sf/os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
@@ -2651,7 +2651,7 @@
</collection>
<collection name="devsound" long-name="Sound Device" level="devices">
<component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory" plugin="N">
-<unit bldFile="/sf/mm/devsound/devsoundapi/group" mrp="mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
+<unit bldFile="/sf/os/mm/devsound/devsoundapi/group" mrp="mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
</component>
<component name="a3fdevsound" long-name="A3F DevSound" introduced="tb91" purpose="optional" plugin="N">
@@ -2661,19 +2661,19 @@
<unit bldFile="/sf/os/mm/devsound/a3facf/group" mrp="/sf/os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
</component>
<component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional" plugin="N">
-<unit bldFile="/sf/mm/devsound/devsoundpluginsupport/group" mrp="mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
+<unit bldFile="/sf/os/mm/devsound/devsoundpluginsupport/group" mrp="mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
</component>
<component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s" purpose="optional" plugin="N">
-<unit bldFile="/sf/mm/devsound/devsoundrefplugin/group" mrp="mm/devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
+<unit bldFile="/sf/os/mm/devsound/devsoundrefplugin/group" mrp="mm/devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
</component>
<component name="btdevsound" long-name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" plugin="Y">
-<unit bldFile="/sf/mm/devsound/sounddevbt/group" mrp="mm/devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
+<unit bldFile="/sf/os/mm/devsound/sounddevbt/group" mrp="mm/devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
</component>
<component name="a3ftrace" long-name="A3F Trace Utility" introduced="tb91" purpose="development" plugin="N">
<unit bldFile="/sf/os/mm/devsound/a3ftrace/group" mrp="/sf/os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
</component>
<component name="a3fintegrationtest" long-name="A3F Integration Tests" introduced="tb91" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp" bldFile="/sf/mm/devsound/a3fintegrationtest/group" />
+<unit mrp="/sf/os/mm/devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp" bldFile="/sf/os/mm/devsound/a3fintegrationtest/group" />
</component>
<component name="a3fsrvstart" long-name="A3F Server Start" introduced="tb91" purpose="optional" plugin="Y">
<unit bldFile="/sf/os/mm/devsound/a3fsrvstart/group" mrp="/sf/os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
@@ -2681,7 +2681,7 @@
</collection>
<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
<component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional" plugin="N">
-<unit bldFile="/sf/mm/devsound/hwdevapi/group" mrp="mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
+<unit bldFile="/sf/os/mm/devsound/hwdevapi/group" mrp="mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
</component>
<component name="a3facl" long-name="A3F Audio Component Library" introduced="tb91" purpose="development" plugin="N">
<unit bldFile="/sf/os/mm/mmhais/a3facl/group" mrp="/sf/os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
@@ -2699,7 +2699,7 @@
<unit bldFile="/sf/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="/sf/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
</component>
<component name="dvbhunittest" long-name="Mobile TV DVB-H Unit Tests" introduced="tb91" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp" bldFile="/sf/mm/mmhais/dvbhunittest/hai/dvbh/group"/>
+<unit mrp="/sf/os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp" bldFile="/sf/os/mm/mmhais/dvbhunittest/hai/dvbh/group"/>
</component>
</collection>
@@ -2709,13 +2709,13 @@
<unit mrp="/sf/os/mm/mmapitest/mmsvs/group/mmsvs.mrp"/>
</component>
<component name="devvideohaitest" long-name="DevVideo HAI Tests" introduced="tb91" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmapitest/devvideohaitest/group/devvideohaitest.mrp" bldFile="/sf/mm/mmapitest/devvideohaitest/group" />
+<unit mrp="/sf/os/mm/mmapitest/devvideohaitest/group/devvideohaitest.mrp" bldFile="/sf/os/mm/mmapitest/devvideohaitest/group" />
</component>
<component name="devsoundhaitest" long-name="DevSound HAI Tests" introduced="tb91" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmapitest/devsoundhaitest/group/devsoundhaitest.mrp" bldFile="/sf/mm/mmapitest/devsoundhaitest/group"/>
+<unit mrp="/sf/os/mm/mmapitest/devsoundhaitest/group/devsoundhaitest.mrp" bldFile="/sf/os/mm/mmapitest/devsoundhaitest/group"/>
</component>
<component name="devsoundexthaitest" long-name="DevSound Extensions HAI Tests" introduced="tb91" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmapitest/devsoundexthaitest/group/devsoundexthaitest.mrp" bldFile="/sf/mm/mmapitest/devsoundexthaitest/group" />
+<unit mrp="/sf/os/mm/mmapitest/devsoundexthaitest/group/devsoundexthaitest.mrp" bldFile="/sf/os/mm/mmapitest/devsoundexthaitest/group" />
</component>
</collection>
<collection name="s60">