# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1272989257 -3600
# Node ID 7cce0a054fbd86c606189367d30b18ed56f58511
# Parent  730e85656f7ded95ba0dc5852ceeb9ecbfa80b71
Remove faulty duplicate mmapfw_plat_build component

diff -r 730e85656f7d -r 7cce0a054fbd symbian3/mw/mmappfw/package_definition.xml
--- a/symbian3/mw/mmappfw/package_definition.xml	Tue May 04 16:58:47 2010 +0100
+++ b/symbian3/mw/mmappfw/package_definition.xml	Tue May 04 17:07:37 2010 +0100
@@ -1,87 +1,83 @@
 <?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^3" schema="2.0.1">
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
         <collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-          <component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-            <!-- this is no longer necessary when confguration is put in place -->
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat"/>
-          </component>
           <component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
             <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
           </component>
@@ -134,11 +130,11 @@
             <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
           </component>
           <component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-            <!-- 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 name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-            <!-- uncomment when configuration is put in place
+            <!-- uncomment when configuration is put in place
     <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
           </component>
           <component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
@@ -172,7 +168,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="/sf/mw/mmappfw/mmappcomponents/group"/>
           </component>
diff -r 730e85656f7d -r 7cce0a054fbd symbian3/mw/mmappfw/package_definition_3.0.xml
--- a/symbian3/mw/mmappfw/package_definition_3.0.xml	Tue May 04 16:58:47 2010 +0100
+++ b/symbian3/mw/mmappfw/package_definition_3.0.xml	Tue May 04 17:07:37 2010 +0100
@@ -2,10 +2,6 @@
 <SystemDefinition schema="3.0.0">
  <package id="mmappfw" name="Multimedia App Framework" levels="fw utils if">
   <collection id="mmappfw_plat" name="Multimedia App Framework Platform Interfaces" level="if">
-   <component id="mmappfw_plat_build" name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-    <!-- this is no longer necessary when confguration is put in place -->
-    <unit bldFile="mmappfw_plat"/>
-   </component>
    <component id="collection_helper_api" name="Collection Helper API" introduced="^1" class="api" filter="s60">
     <meta rel="Api" href="mmappfw_plat/collection_helper_api/collection_helper_api.metaxml"/>
     <unit bldFile="mmappfw_plat/collection_helper_api/group"/>
@@ -121,7 +117,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="mmappcomponents/group"/>
    </component>