# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1282754968 -3600
# Node ID 126cebfeac51753392b54333f5d803b5b66d44f9
# Parent  3ae367641fee7a128c00cd57738c67c59b78551d
First attempt to reflect the extraction of os/mmimaging and os/openmaxil from os/mm, and mw/qtmobility from mw/qtextensions

diff -r 3ae367641fee -r 126cebfeac51 symbian4/mw/qtextensions/package_definition.xml
--- a/symbian4/mw/qtextensions/package_definition.xml	Wed Aug 25 12:22:36 2010 +0100
+++ b/symbian4/mw/qtextensions/package_definition.xml	Wed Aug 25 17:49:28 2010 +0100
@@ -42,23 +42,6 @@
       <unit bldFile="qtmobileextensions/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
      </component>
     </collection>
-    <collection id="qtmobility" name="Qt Mobility" level="mw">
-	 <component id="qtmobility_build" filter="qtmobility" name="Qt Mobility" purpose="development" introduced="^4">
-      <unit bldFile="qtmobility" qt:proFile="qtmobility.pro" qt:qmakeArgs="-r"/>
-     </component>
-    <component id="qtmobility_examples" filter="qtextensionsexamples,build_as_app" name="Qt Mobility Examples" purpose="development" introduced="^4">
-      <meta rel="testbuild">
-       <group name="qtextensionsexamples"/>
-      </meta>
-      <unit bldFile="qtmobility/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
-     </component>
-     <component id="qtmobilitytests" filter="test,qtextensionstests,build_as_app" name="Qt Extensions Tests"  purpose="development" introduced="^4">
-      <meta rel="testbuild">
-       <group name="qtextensionstests"/>
-      </meta>
-      <unit bldFile="qtmobility/tests" qt:proFile="tests.pro" qt:qmakeArgs="-r"/>
-     </component>
-    </collection>
     <collection id="qhbstyle" level="mw" name="Qt Orbit Style">
      <component id="qhbstyle_build" name="Qt Orbit Style Build" introduced="^4">
       <unit bldFile="qhbstyle" qt:qmakeArgs="-r" qt:proFile="qhbstyle.pro"/>
diff -r 3ae367641fee -r 126cebfeac51 symbian4/mw/qtmobility/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/mw/qtmobility/package_definition.xml	Wed Aug 25 17:49:28 2010 +0100
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+	<!-- qt:qmakeArgs attribute is an unsupported extension used as temporary hack to get this to work with abld.
+		This will be removed when sbsv2 builds are working -->
+  <package id="qtmobility" name="Qt Mobility" levels="tool mw app">
+   <collection id="qtmobility_collection" name="Qt Mobility collection" level="app">
+     <component id="qtmobility_build" name="Qt Mobility Build" introduced="^4">
+		<!-- break this up into the above collections-->
+      <unit bldFile="." qt:proFile="qtmobility.pro" qt:qmakeArgs="-r"/>
+     </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 3ae367641fee -r 126cebfeac51 symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml
--- a/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Wed Aug 25 12:22:36 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Wed Aug 25 17:49:28 2010 +0100
@@ -125,6 +125,8 @@
       <package id="bt" level="services" tech-domain="de" href="../../../../os/bt/package_definition.xml"/> 
       <package id="usb" level="services" tech-domain="de" href="../../../../os/usb/package_definition.xml"/> 
       <package id="mm" level="services" tech-domain="mm" href="../../../../os/mm/package_definition.xml"/>
+      <package id="mmimaging" level="services" tech-domain="mm" href="../../../../os/mmimaging/package_definition.xml"/>
+      <package id="openmaxil" level="services" tech-domain="mm" href="../../../../os/openmaxil/package_definition.xml"/>
       <package id="imagingext" level="services" tech-domain="mm" href="../../../../os/imagingext/package_definition.xml"/>
       <package id="graphics" level="services" tech-domain="ui" href="../../../../os/graphics/package_definition.xml"/>
       <package id="textandloc" level="services" tech-domain="ui" href="../../../../os/textandloc/package_definition.xml"/>
@@ -167,6 +169,7 @@
       <package id="hgwidgets" level="specific" tech-domain="mm" href="../../../../mw/hgwidgets/package_definition.xml"/>
       <package id="inputmethods" level="generic" tech-domain="ui" href="../../../../mw/inputmethods/package_definition.xml"/>
       <package id="qt" level="generic" tech-domain="ui" href="../../../../mw/qt/package_definition.xml"/>
+      <package id="qtmobility" level="generic" tech-domain="ui" href="../../../../mw/qtmobility/package_definition.xml"/>
       <package id="qtextensions" level="generic" tech-domain="ui" href="../../../../mw/qtextensions/package_definition.xml"/>
       <package id="hb" level="generic" tech-domain="ui" href="../../../../mw/hb/package_definition.xml"/>
       <package id="classicui" level="generic" tech-domain="ui" href="../../../../mw/classicui/package_definition.xml"/>
diff -r 3ae367641fee -r 126cebfeac51 symbian4/os/mm/package_definition.xml
--- a/symbian4/os/mm/package_definition.xml	Wed Aug 25 12:22:36 2010 +0100
+++ b/symbian4/os/mm/package_definition.xml	Wed Aug 25 17:49:28 2010 +0100
@@ -357,7 +357,7 @@
     <unit bldFile="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="devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
     <unit bldFile="devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -398,23 +398,6 @@
     <unit bldFile="eaacplusutil_stub/group"/>
    </component>
   </collection>
-  <collection id="imagingandcamerafws" name="Imaging and Camera Frameworks" level="app-if">
-   <component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-    <unit bldFile="imagingandcamerafws/imagingfws/group" mrp="imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-   </component>
-   <component id="imagingunittest" name="Imaging Unit Tests" introduced="7.0s" purpose="development" filter="test">
-    <unit mrp="imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="imagingandcamerafws/imagingunittest/group"/>
-   </component>
-   <component id="imaginginttest" name="Imaging Integration Tests" introduced="7.0s" purpose="development" filter="test">
-    <unit mrp="imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="imagingandcamerafws/imaginginttest/group"/>
-   </component>
-   <component id="camerafw" name="Camera Framework" introduced="7.0s" purpose="optional">
-    <unit bldFile="imagingandcamerafws/camerafw/group" mrp="imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-   </component>
-   <component id="cameraunittest" name="Camera Unit Tests" introduced="9.2" purpose="development" filter="test">
-    <unit mrp="imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp" bldFile="imagingandcamerafws/cameraunittest/group"/>
-   </component>
-  </collection>
   <collection id="mmlibs" name="Multimedia Libraries" level="middleware">
    <component id="mmutilitylib" name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
     <unit bldFile="mmlibs/mmutilitylib/group" mrp="mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
@@ -483,29 +466,6 @@
     <unit mrp="mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp" bldFile="mmtestenv/mmtesttools/Group"/>
    </component>
   </collection>
-  <collection id="omxil" name="OpenMAX IL" level="hw-if">
-   <component id="omxilapi" name="OpenMAX IL API" introduced="^3" purpose="optional">
-    <unit version="1" bldFile="omxil/omxilapi/group" mrp="omxil/omxilapi/group/multimedia_omx_il_api.mrp"/>
-   </component>
-   <component id="omxilcore" name="OpenMAX IL Core" introduced="^3" purpose="optional">
-    <unit version="1" bldFile="omxil/omxilcore/group" mrp="omxil/omxilcore/group/multimedia_omx_il_core.mrp"/>
-   </component>
-   <component id="omxilcomponentcommon" name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-    <unit version="1" bldFile="omxil/omxilcomponentcommon/group" mrp="omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp"/>
-   </component>
-   <component id="omxilrefcomps" name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-    <unit version="1" bldFile="omxil/omxilrefcomps/ref_components/group" mrp="omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp"/>
-   </component>
-   <component id="omxilunittest" name="OpenMAX IL Unit Tests" introduced="^3" purpose="development" filter="test">
-    <unit mrp="omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp" bldFile="omxil/omxilunittest/group"/>
-   </component>
-   <component id="omxilcoreconftest" name="OpenMAX IL Core Conformance Suite" introduced="^3" purpose="development" filter="test">
-    <unit mrp="omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp" bldFile="omxil/omxilcoreconftest/group"/>
-   </component>
-   <component id="mmilapi" name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-    <unit bldFile="omxil/mmilapi/group" mrp="omxil/mmilapi/group/multimedia_il_api.mrp"/>
-   </component>
-  </collection>
   <collection id="devsound" name="Sound Device" level="devices">
    <component id="devsoundapi" name="DevSound API" introduced="7.0s" purpose="mandatory">
     <unit bldFile="devsound/devsoundapi/group" mrp="devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
diff -r 3ae367641fee -r 126cebfeac51 symbian4/os/mmimaging/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/os/mmimaging/package_definition.xml	Wed Aug 25 17:49:28 2010 +0100
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="mmimaging" name="Multimedia Imaging" levels="adaptation hw-if device-fw devices middleware app-if">
+    <collection id="imaging" name="Imaging Frameworks and Plugins" level="app-if">
+      <component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
+        <unit bldFile="imaging/imagingfws/group" mrp="imaging/imagingfws/group/multimedia_icl.mrp"/>
+      </component>
+      <component id="imagingplugins" name="Imaging Plugins" introduced="7.0s" purpose="optional" class="plugin">
+        <unit bldFile="imaging/imagingplugins/group" mrp="imaging/imagingplugins/group/multimedia_icl_plugin.mrp"/>
+      </component>
+      <component id="imagingunittest" name="Imaging Unit Tests" introduced="7.0s" purpose="development" filter="test">
+        <unit mrp="imaging/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="imaging/imagingunittest/group"/>
+      </component>
+      <component id="imaginginttest" name="Imaging Integration Tests" introduced="7.0s" purpose="development" filter="test">
+        <unit mrp="imaging/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="imaging/imaginginttest/group"/>
+      </component>
+      <component id="imagingdocs" name="Imaging Documentation" purpose="development" class="doc">
+      	<unit mrp="imaging/imagingdocs/imaging_documentation.mrp" />
+      </component>	  
+    </collection>
+    <collection id="imagingtestenv" name="Imaging Test Environment" level="device-fw">
+      <component id="imagingtestfw" name="Imaging Test Framework" introduced="7.0s" purpose="development" filter="test">
+        <unit mrp="imagingtestenv/imagingtestfw/group/imaging_testframework_source.mrp" bldFile="imagingtestenv/imagingtestfw/group"/>
+      </component>
+      <component id="imagingtestfwunittest" name="Imaging Test Framework Unit Tests" introduced="7.0s" purpose="development" filter="test">
+        <unit mrp="imagingtestenv/imagingtestfwunittest/group/imaging_unittest_testframework_source.mrp" bldFile="imagingtestenv/imagingtestfwunittest/group"/>
+      </component>
+      <component id="imagingtestagent" name="Imaging Test Agent" introduced="8.0" purpose="development" filter="test">
+        <unit mrp="imagingtestenv/imagingtestagent/group/imagingtestagent_source.mrp" bldFile="imagingtestenv/imagingtestagent/group"/>
+      </component>
+      <component id="imagingtesttools" name="Imaging Test Tools" purpose="development" filter="test">
+        <unit mrp="imagingtestenv/imagingtesttools/Group/imaging_testtools_source.mrp" bldFile="imagingtestenv/imagingtesttools/Group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r 3ae367641fee -r 126cebfeac51 symbian4/os/openmaxil/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/os/openmaxil/package_definition.xml	Wed Aug 25 17:49:28 2010 +0100
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.1">
+  <package id="openmaxil" name="openmaxil" levels="adaptation hw-if device-fw devices middleware app-if">
+
+
+    <collection id="openmaxil_plat" name="OpenMAX IL Platform Exports" level="hw-if">
+      <component id="khronos_api" name="OpenMAX IL API" introduced="^3" purpose="mandatory" class="api">
+        <unit version="1" bldFile="openmaxil_plat/khronos_api/group"/>
+      </component>
+      <component id="symbian_api" name="OpenMAX IL Symbian API" introduced="^3" purpose="mandatory" class="api">
+        <unit version="1" bldFile="openmaxil_plat/symbian_api/group"/>
+      </component>
+      <component id="test_api" name="OpenMAX IL test headers" introduced="^3" purpose="development" class="api">
+        <unit version="1" bldFile="openmaxil_plat/test_api/group"/>
+      </component>
+    </collection>
+
+    <collection id="omxil_generic" name="OpenMAX IL Implementation" level="device-fw">
+      <component id="omxilcomplib" name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
+        <unit version="1" bldFile="omxil_generic/omxilcomplib/group"/>
+      </component>
+      <component id="omxilcore" name="OpenMAX IL Core" introduced="^3" purpose="mandatory">
+        <unit version="1" bldFile="omxil_generic/omxilcore/group"/>
+      </component>
+      <component id="omxilloader" name="OpenMAX IL Loader" introduced="^3" purpose="mandatory">
+        <unit version="1" bldFile="omxil_generic/omxilloader/group"/>
+      </component>
+    </collection>
+
+    <collection id="tsrc" name="OpenMAX IL Test code" level="hw-if">
+      <component id="xmltestharness" name="OpenMAX IL XML Test Harness" introduced="^3" purpose="development">
+        <unit version="1" bldFile="tsrc/xmltestharness/group"/>
+      </component>
+    </collection>
+
+  </package>
+</SystemDefinition>