# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1266343579 0
# Node ID 7da3f5055ea5b51830adc599e82d07632e5fff6a
# Parent  e379d83ca22e199f9ded6d42dd91fc53fc04b410
Comment out configurable units which are #included elsewhere

diff -r e379d83ca22e -r 7da3f5055ea5 symbian3/app/commonemail/package_definition.xml
--- a/symbian3/app/commonemail/package_definition.xml	Tue Feb 16 12:48:05 2010 +0000
+++ b/symbian3/app/commonemail/package_definition.xml	Tue Feb 16 18:06:19 2010 +0000
@@ -205,9 +205,12 @@
             <unit bldFile="/sf/app/commonemail/emailuis/uicomponents/group"/>
           </component>
           <component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-            <unit bldFile="/sf/app/commonemail/emailuis/widget/group"/>
+            <!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
+            <!--<unit bldFile="emailuis/widget/group"/>-->
           </component>
-          <!-- until config is supported, may need to just use emailuis/group/bld.inf -->
+          <component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/emailuis/group"/>
+          </component>
         </collection>
         <collection name="commonemail_info" long-name="Email Apps Info" level="app">
           <component name="emailhelp" filter="s60" long-name="Email Help" class="placeholder">
diff -r e379d83ca22e -r 7da3f5055ea5 symbian3/app/commonemail/package_definition_3.0.xml
--- a/symbian3/app/commonemail/package_definition_3.0.xml	Tue Feb 16 12:48:05 2010 +0000
+++ b/symbian3/app/commonemail/package_definition_3.0.xml	Tue Feb 16 18:06:19 2010 +0000
@@ -132,9 +132,12 @@
         <meta rel="config">
         	<not-defined condition="FF_CMAIL_INTEGRATION"/>
         </meta>      
-        <unit bldFile="emailuis/widget/group"/>
+		<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
+        <!--<unit bldFile="emailuis/widget/group"/>-->
       </component>
-      	<!-- until config is supported, may need to just use emailuis/group/bld.inf -->
+      <component id="emailuis_build" filter="s60" name="Email UIs Build" introduced="^2">
+        <unit bldFile="emailuis/group"/>
+      </component>
     </collection>
     <collection id="commonemail_info" name="Email Apps Info" level="app">
       <component id="emailhelp" filter="s60" name="Email Help">
diff -r e379d83ca22e -r 7da3f5055ea5 symbian3/app/musicplayer/package_definition.xml
--- a/symbian3/app/musicplayer/package_definition.xml	Tue Feb 16 12:48:05 2010 +0000
+++ b/symbian3/app/musicplayer/package_definition.xml	Tue Feb 16 18:06:19 2010 +0000
@@ -77,7 +77,6 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-        <!-- custom filter pref_test-->
         <collection name="mpxmusicplayer" long-name="MPX Music Player" level="app">
           <component name="mpxmusicplayer_help" filter="s60" long-name="Help">
             <unit bldFile="/sf/app/musicplayer/mpxmusicplayer/help/group"/>
@@ -103,21 +102,22 @@
           </component>
         </collection>
         <collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
-          <component name="mpxcollectionpublisher" filter="s60" long-name="MPX Collection Publisher" introduced="^2">
-            <unit bldFile="/sf/app/musicplayer/musichomescreen_multiview/mpxcollectionpublisher/group"/>
+          <!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
+          <component name="mpxcollectionpublisher" filter="s60" long-name="MPX Collection Publisher" introduced="^2" class="placeholder">
+            <!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
           </component>
-          <component name="musiccontentpublisher" filter="s60" long-name="Music Content Publisher" introduced="^2">
-            <unit bldFile="/sf/app/musicplayer/musichomescreen_multiview/musiccontentpublisher/group"/>
+          <component name="musiccontentpublisher" filter="s60" long-name="Music Content Publisher" introduced="^2" class="placeholder">
+            <!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
           </component>
-          <component name="mcpmusicplayer" filter="s60" long-name="Music Player MCP Plugin" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/app/musicplayer/musichomescreen_multiview/mcpmusicplayer/group"/>
+          <component name="mcpmusicplayer" filter="s60" long-name="Music Player MCP Plugin" introduced="^2" plugin="Y" class="placeholder">
+            <!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
           </component>
-          <component name="musicplayeractionhandlerplugin" filter="s60" long-name="Music Player Action Handler Plugin" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/app/musicplayer/musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>
+          <component name="musicplayeractionhandlerplugin" filter="s60" long-name="Music Player Action Handler Plugin" introduced="^2" plugin="Y" class="placeholder">
+            <!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
           </component>
-          <component name="mpx_data" filter="s60" long-name="MPX Data" introduced="^2">
+          <component name="mpx_data" filter="s60" long-name="MPX Data" introduced="^2" class="placeholder">
             <!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
-            <unit bldFile="/sf/app/musicplayer/musichomescreen_multiview/data/themes/default/group"/>
+            <!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
           </component>
           <component name="musichomescreen_build" filter="s60" long-name="Music Homescreen Multiview Build" introduced="^2">
             <unit bldFile="/sf/app/musicplayer/musichomescreen_multiview/group"/>
diff -r e379d83ca22e -r 7da3f5055ea5 symbian3/app/musicplayer/package_definition_3.0.xml
--- a/symbian3/app/musicplayer/package_definition_3.0.xml	Tue Feb 16 12:48:05 2010 +0000
+++ b/symbian3/app/musicplayer/package_definition_3.0.xml	Tue Feb 16 18:06:19 2010 +0000
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="musicplayer" name="Music Player Apps" levels="plugins support hs app">
-  <!-- custom filter pref_test-->
     <collection id="mpxmusicplayer" name="MPX Music Player" level="app">
       <component id="mpxmusicplayer_help" filter="s60" name="Help">
         <unit bldFile="mpxmusicplayer/help/group"/>
@@ -30,21 +29,22 @@
      <meta rel="config">
    		<defined condition="IAD_INCLUDE_ENHANCED_HOMESCREEN"/>
    	  </meta>    
+	  <!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
       <component id="mpxcollectionpublisher" filter="s60" name="MPX Collection Publisher" introduced="^2">
-        <unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>
+        <!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
       </component>
       <component id="musiccontentpublisher" filter="s60" name="Music Content Publisher" introduced="^2">
-        <unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>
+        <!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
       </component>
       <component id="mcpmusicplayer" filter="s60" name="Music Player MCP Plugin" class="plugin" introduced="^2">
-        <unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>
+        <!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
       </component>
       <component id="musicplayeractionhandlerplugin" filter="s60" name="Music Player Action Handler Plugin" class="plugin" introduced="^2">
-        <unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>
+        <!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
       </component>
       <component id="mpx_data" filter="s60" name="MPX Data" introduced="^2">
       	<!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
-        <unit bldFile="musichomescreen_multiview/data/themes/default/group"/>
+        <!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
       </component>
       <component id="musichomescreen_build" filter="s60" name="Music Homescreen Multiview Build" introduced="^2">
         <unit bldFile="musichomescreen_multiview/group"/>
diff -r e379d83ca22e -r 7da3f5055ea5 symbian3/app/organizer/package_definition.xml
--- a/symbian3/app/organizer/package_definition.xml	Tue Feb 16 12:48:05 2010 +0000
+++ b/symbian3/app/organizer/package_definition.xml	Tue Feb 16 18:06:19 2010 +0000
@@ -108,11 +108,15 @@
           </component>
         </collection>
         <collection name="searchfw" long-name="Search Framework" level="services">
-          <component name="coresearchfw" filter="s60" long-name="Core Search Framework" introduced="^1">
-            <unit bldFile="/sf/app/organizer/searchfw/coresearchfw/group"/>
+          <!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
+          <component name="coresearchfw" filter="s60" long-name="Core Search Framework" introduced="^1" class="placeholder">
+            <!--<unit bldFile="searchfw/coresearchfw/group"/>-->
           </component>
-          <component name="searchfw_plugins" filter="s60" long-name="Search Plugins" introduced="^1" plugin="Y">
-            <unit bldFile="/sf/app/organizer/searchfw/plugins/group"/>
+          <component name="searchfw_plugins" filter="s60" long-name="Search Plugins" introduced="^1" plugin="Y" class="placeholder">
+            <!--<unit bldFile="searchfw/plugins/group"/>-->
+          </component>
+          <component name="searchfw_build" filter="s60" long-name="Search Framework Build" introduced="^1">
+            <unit bldFile="/sf/app/organizer/searchfw/group"/>
           </component>
         </collection>
         <collection name="alarmui" long-name="Alarm UI" level="app">
@@ -226,11 +230,15 @@
         </collection>
         <collection name="searchui" long-name="Search UI" level="app">
           <!-- consider making this a single component -->
-          <component name="searchui_help" filter="s60" long-name="Search UI Help">
-            <unit bldFile="/sf/app/organizer/searchui/help/group"/>
+          <!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
+          <component name="searchui_help" filter="s60" long-name="Search UI Help" class="placeholder">
+            <!--<unit bldFile="searchui/help/group"/>-->
           </component>
-          <component name="searchapp" filter="s60" long-name="Search Application">
-            <unit bldFile="/sf/app/organizer/searchui/searchapp/group"/>
+          <component name="searchapp" filter="s60" long-name="Search Application" class="placeholder">
+            <!--<unit bldFile="searchui/searchapp/group"/>-->
+          </component>
+          <component name="searchui_build" filter="s60" long-name="Search UI Build">
+            <unit bldFile="/sf/app/organizer/searchui/group"/>
           </component>
         </collection>
         <collection name="pimappservices" long-name="PIM Application Services" level="services">
diff -r e379d83ca22e -r 7da3f5055ea5 symbian3/app/organizer/package_definition_3.0.xml
--- a/symbian3/app/organizer/package_definition_3.0.xml	Tue Feb 16 12:48:05 2010 +0000
+++ b/symbian3/app/organizer/package_definition_3.0.xml	Tue Feb 16 18:06:19 2010 +0000
@@ -35,11 +35,15 @@
       	<meta rel="config">
       		<defined condition="RD_GENERAL_SEARCH"/>
       	</meta>
+		<!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
       <component id="coresearchfw" filter="s60" name="Core Search Framework" introduced="^1">
-        <unit bldFile="searchfw/coresearchfw/group"/>
+        <!--<unit bldFile="searchfw/coresearchfw/group"/>-->
       </component>
       <component id="searchfw_plugins" filter="s60" name="Search Plugins" class="plugin" introduced="^1">
-        <unit bldFile="searchfw/plugins/group"/>
+        <!--<unit bldFile="searchfw/plugins/group"/>-->
+      </component>
+      <component id="searchfw_build" filter="s60" name="Search Framework Build" introduced="^1">
+        <unit bldFile="searchfw/group"/>
       </component>
     </collection>
     <collection id="alarmui" name="Alarm UI" level="app">
@@ -155,11 +159,15 @@
       	<meta rel="config">
       		<defined condition="RD_GENERAL_SEARCH"/>
       	</meta>
+		<!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
       <component id="searchui_help" filter="s60" name="Search UI Help">
-        <unit bldFile="searchui/help/group"/>
+        <!--<unit bldFile="searchui/help/group"/>-->
       </component>
       <component id="searchapp" filter="s60" name="Search Application">
-        <unit bldFile="searchui/searchapp/group"/>
+        <!--<unit bldFile="searchui/searchapp/group"/>-->
+      </component>
+      <component id="searchui_build" filter="s60" name="Search UI Build">
+        <unit bldFile="searchui/group"/>
       </component>
     </collection>
     <collection id="pimappservices" name="PIM Application Services" level="services">
diff -r e379d83ca22e -r 7da3f5055ea5 symbian3/mw/appsupport/package_definition.xml
--- a/symbian3/mw/appsupport/package_definition.xml	Tue Feb 16 12:48:05 2010 +0000
+++ b/symbian3/mw/appsupport/package_definition.xml	Tue Feb 16 18:06:19 2010 +0000
@@ -78,11 +78,16 @@
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
         <collection name="contextframework" long-name="Context Framework" level="framework">
+          <!-- 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 name="cfw" filter="s60" long-name="Context Framework">
-            <unit bldFile="/sf/mw/appsupport/contextframework/cfw/group"/>
+            <!--<unit bldFile="contextframework/cfw/group"/> -->
           </component>
           <component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-            <unit bldFile="/sf/mw/appsupport/contextframework/cfwplugins/group"/>
+            <!--<unit bldFile="contextframework/cfwplugins/group"/>-->
+          </component>
+          <component name="contextframework_build" filter="s60" long-name="Context Framework Build">
+            <unit bldFile="/sf/mw/appsupport/contextframework/group"/>
           </component>
         </collection>
         <collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
diff -r e379d83ca22e -r 7da3f5055ea5 symbian3/mw/appsupport/package_definition_3.0.xml
--- a/symbian3/mw/appsupport/package_definition_3.0.xml	Tue Feb 16 12:48:05 2010 +0000
+++ b/symbian3/mw/appsupport/package_definition_3.0.xml	Tue Feb 16 18:06:19 2010 +0000
@@ -2,17 +2,22 @@
 <SystemDefinition schema="3.0.0">
   <package id="appsupport" name="Generic Application Support" levels="system plugin framework server generic specific">
     <collection id="contextframework" name="Context Framework" level="framework">
+	  <!-- 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">
-      		<defined condition="RD_CONTEXT_FRAMEWORK"/>
-      	</meta>
-        <unit bldFile="contextframework/cfw/group"/>
+         <meta rel="config">
+      	  <defined condition="RD_CONTEXT_FRAMEWORK"/>
+        </meta>
+        <!--<unit bldFile="contextframework/cfw/group"/> -->
       </component>
       <component id="cfwplugins" filter="s60" name="Context Framework Plugins" class="plugin">
-      	<meta rel="config">
-      		<defined condition="RD_CONTEXT_FRAMEWORK"/>
-      	</meta>
-        <unit bldFile="contextframework/cfwplugins/group"/>
+         <meta rel="config">
+      	  <defined condition="RD_CONTEXT_FRAMEWORK"/>
+        </meta>
+        <!--<unit bldFile="contextframework/cfwplugins/group"/>-->
+      </component>
+      <component id="contextframework_build" filter="s60" name="Context Framework Build">
+        <unit bldFile="contextframework/group"/>
       </component>
     </collection>
     <collection id="coreapplicationuis" name="Core Application UIs" level="server">
diff -r e379d83ca22e -r 7da3f5055ea5 symbian3/mw/drm/package_definition.xml
--- a/symbian3/mw/drm/package_definition.xml	Tue Feb 16 12:48:05 2010 +0000
+++ b/symbian3/mw/drm/package_definition.xml	Tue Feb 16 18:06:19 2010 +0000
@@ -89,7 +89,8 @@
             <unit bldFile="/sf/mw/drm/commondrm/drmrightsmanagerui/help/group"/>
           </component>
           <component name="drmutility" filter="s60" long-name="DRM Utility">
-            <unit bldFile="/sf/mw/drm/commondrm/drmutility/group"/>
+            <!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
+            <!--<unit bldFile="commondrm/drmutility/group"/>-->
           </component>
           <component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
             <unit bldFile="/sf/mw/drm/commondrm/drmserviceapiwrapper/group"/>
diff -r e379d83ca22e -r 7da3f5055ea5 symbian3/mw/drm/package_definition_3.0.xml
--- a/symbian3/mw/drm/package_definition_3.0.xml	Tue Feb 16 12:48:05 2010 +0000
+++ b/symbian3/mw/drm/package_definition_3.0.xml	Tue Feb 16 18:06:19 2010 +0000
@@ -16,7 +16,8 @@
       	<meta rel="config">
       		<defined condition="RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM"/>
       	</meta>      
-        <unit bldFile="commondrm/drmutility/group"/>
+		<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
+        <!--<unit bldFile="commondrm/drmutility/group"/>-->
       </component>
       <component id="drmserviceapiwrapper" filter="s60" name="DRM Service API Wrapper">
         <unit bldFile="commondrm/drmserviceapiwrapper/group"/>
diff -r e379d83ca22e -r 7da3f5055ea5 symbian3/mw/mds/package_definition.xml
--- a/symbian3/mw/mds/package_definition.xml	Tue Feb 16 12:48:05 2010 +0000
+++ b/symbian3/mw/mds/package_definition.xml	Tue Feb 16 18:06:19 2010 +0000
@@ -154,8 +154,9 @@
         </collection>
         <collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
           <!-- collection is really a component. Move down a directory -->
-          <component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2">
-            <unit bldFile="/sf/mw/mds/clfwrapper/group"/>
+          <component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
+            <!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
+            <!--<unit bldFile="clfwrapper/group"/>-->
           </component>
         </collection>
         <collection name="mds_info" long-name="Metadata Services Info" level="int">
diff -r e379d83ca22e -r 7da3f5055ea5 symbian3/mw/mds/package_definition_3.0.xml
--- a/symbian3/mw/mds/package_definition_3.0.xml	Tue Feb 16 12:48:05 2010 +0000
+++ b/symbian3/mw/mds/package_definition_3.0.xml	Tue Feb 16 18:06:19 2010 +0000
@@ -77,12 +77,13 @@
       </component>
     </collection>
     <collection id="clfwrapper" name="Content Listing Framework Wrapper" level="int">
+    	<!-- collection is really a component. Move down a directory -->
      	<meta rel="config">
      		<defined condition="RD_MDS_2_5"/>
      	</meta>
-    	<!-- collection is really a component. Move down a directory -->
       <component id="clfwrapper_build" filter="s60" name="CLF Wrapper Build" introduced="^2">
-        <unit bldFile="clfwrapper/group"/>
+		  <!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
+        <!--<unit bldFile="clfwrapper/group"/>-->
       </component>
     </collection>
     <collection id="mds_info" name="Metadata Services Info" level="int">
diff -r e379d83ca22e -r 7da3f5055ea5 symbian3/mw/web/package_definition.xml
--- a/symbian3/mw/web/package_definition.xml	Tue Feb 16 12:48:05 2010 +0000
+++ b/symbian3/mw/web/package_definition.xml	Tue Feb 16 18:06:19 2010 +0000
@@ -222,7 +222,7 @@
             <!--<unit bldFile="widgets/widgetinstaller/group"/>-->
           </component>
           <component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-            <unit bldFile="/sf/mw/web/widgets/widgetlauncher/group"/>
+            <!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
           </component>
           <component name="widgetapp" filter="s60" long-name="Widget UI">
             <!--<unit bldFile="widgets/widgetapp/group"/>-->
diff -r e379d83ca22e -r 7da3f5055ea5 symbian3/mw/web/package_definition_3.0.xml
--- a/symbian3/mw/web/package_definition_3.0.xml	Tue Feb 16 12:48:05 2010 +0000
+++ b/symbian3/mw/web/package_definition_3.0.xml	Tue Feb 16 18:06:19 2010 +0000
@@ -159,9 +159,9 @@
       </component>
       <component id="widgetlauncher" filter="s60" name="Widget Launcher">
       	<meta rel="config">
-      		<!-- <defined condition="__WEB_WIDGETS"/>-->
+      		<defined condition="__WEB_WIDGETS"/>
       	</meta>
-        <unit bldFile="widgets/widgetlauncher/group"/>
+        <!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
       </component>
       <component id="widgetapp" filter="s60" name="Widget UI">
       	<meta rel="config">