symbian3/mw/uiresources/package_definition.xml
branchHighFidelityModel
changeset 245 30e67220bf86
parent 141 27d9d356efbf
child 314 e2c657c13ee2
--- a/symbian3/mw/uiresources/package_definition.xml	Tue May 25 11:17:36 2010 +0100
+++ b/symbian3/mw/uiresources/package_definition.xml	Wed May 26 17:18:20 2010 +0100
@@ -1,239 +1,183 @@
 <?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
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-        <!-- are the custom filters below needed? -->
-        <collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-          <component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/pictograph_api/tsrc/group" filter="test,api_test,pictograph_api"/>
-          </component>
-          <component name="skins_api" long-name="Skins API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/skins_api/tsrc/group" filter="test,api_test,skins_api"/>
-          </component>
-          <component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/font_definition_api/tsrc/group" filter="test,api_test,font_definition_api"/>
-          </component>
-          <component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/graphics_api/tsrc/group" filter="test,api_test,graphics_api"/>
-          </component>
-          <component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-          </component>
-          <component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-          </component>
-        </collection>
-        <collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-          <component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_system_private_api/tsrc/group" filter="test,api_test,layout_system_private_api"/>
-          </component>
-          <component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_data_api/tsrc/group" filter="test,api_test,layout_data_api"/>
-          </component>
-          <component name="cdl_api" long-name="CDL API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/cdl_api/tsrc/group" filter="test,api_test,cdl_api"/>
-          </component>
-          <component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_skins_api/tsrc/group" filter="test,api_test,extended_skins_api"/>
-          </component>
-          <component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-          </component>
-          <component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_fonts_api/tsrc/group" filter="test,api_test,extended_fonts_api"/>
-          </component>
-          <component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/graphic_configuration_api/tsrc/group" filter="test,api_test,graphic_configuration_api"/>
-          </component>
-          <component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-          </component>
-          <component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-          </component>
-          <component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-          </component>
-          <component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-          </component>
-          <component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-          </component>
-          <component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-          </component>
-          <component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/skins_image_attributes_api/tsrc/group" filter="test,api_test,skins_image_attributes_api"/>
-          </component>
-          <component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-          </component>
-          <component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-          </component>
-        </collection>
-        <collection name="uiresources_info" long-name="UI Resources Info" level="data">
-          <component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development">
-            <unit bldFile="/sf/mw/uiresources/tsrc/group" filter="uiresources_api_all"/>
-          </component>
-        </collection>
-        <collection name="uigraphics" long-name="UI Graphics" level="generic">
-          <component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
-            <unit bldFile="/sf/mw/uiresources/uigraphics/bitmaps2/group"/>
-          </component>
-          <component name="icons" filter="s60" long-name="Icons" class="config">
-            <unit bldFile="/sf/mw/uiresources/uigraphics/icons/group"/>
-          </component>
-          <component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
-            <unit bldFile="/sf/mw/uiresources/uigraphics/variatedbitmaps/group"/>
-          </component>
-          <component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
-            <unit bldFile="/sf/mw/uiresources/uigraphics/aknicon/group"/>
-          </component>
-          <component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
-            <unit bldFile="/sf/mw/uiresources/uigraphics/nvgrenderstage/group"/>
-          </component>
-        </collection>
-        <collection name="layouts" long-name="Layouts" level="plugin">
-          <component name="cdl" filter="s60" long-name="Customization Definition Language">
-            <!-- can only have one unit. Need to #include them or split into multiple components -->
-            <unit bldFile="/sf/mw/uiresources/layouts/cdl/cdlengine/group"/>
-            <unit bldFile="/sf/mw/uiresources/layouts/cdl/cdlserver/group"/>
-          </component>
-          <component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
-            <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/group"/>
-          </component>
-        </collection>
-        <collection name="skins" long-name="Skins" level="data">
-          <component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
-            <unit bldFile="/sf/mw/uiresources/skins/aknskincontent/group"/>
-          </component>
-          <component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
-            <unit bldFile="/sf/mw/uiresources/skins/aknskins/group"/>
-          </component>
-        </collection>
-        <collection name="pictographs" long-name="Pictographs" level="data">
-          <component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
-            <unit bldFile="/sf/mw/uiresources/pictographs/aknpictograph/group"/>
-          </component>
-        </collection>
-        <collection name="locales" long-name="Locales" level="framework">
-          <component name="locales_build" filter="s60" long-name="Locales Build">
-            <unit bldFile="/sf/mw/uiresources/locales/loce32"/>
-          </component>
-        </collection>
-        <collection name="uiconfig" long-name="UI Config" level="server">
-          <component name="s60config" filter="s60" long-name="S60 UI Config">
-            <unit bldFile="/sf/mw/uiresources/uiconfig/s60config/group"/>
-          </component>
-        </collection>
-        <collection name="fontsupport" long-name="Font Support" level="generic">
-          <component name="fontprovider" filter="s60" long-name="Font Provider">
-            <unit bldFile="/sf/mw/uiresources/fontsupport/fontprovider/group"/>
-          </component>
-          <!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+<SystemDefinition schema="3.0.0">
+ <package id="uiresources" name="UI Resources" levels="compile plugin framework server generic data">
+   <!-- are the custom filters below needed? -->
+  <collection id="uiresources_pub" name="UI Resources Public Interfaces" level="data">
+   <component id="pictograph_api" name="Pictograph API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_pub/pictograph_api/pictograph_api.metaxml"/>
+    <unit bldFile="uiresources_pub/pictograph_api/group" filter="!test"/>
+    <unit bldFile="uiresources_pub/pictograph_api/tsrc/group" filter="test,api_test,pictograph_api"/>
+   </component>
+   <component id="skins_api" name="Skins API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_pub/skins_api/skins_api.metaxml"/>
+    <unit bldFile="uiresources_pub/skins_api/group" filter="!test"/>
+    <unit bldFile="uiresources_pub/skins_api/tsrc/group" filter="test,api_test,skins_api"/>
+   </component>
+   <component id="font_definition_api" name="Font Definition API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_pub/font_definition_api/font_definition_api.metaxml"/>
+    <unit bldFile="uiresources_pub/font_definition_api/group" filter="!test"/>
+    <unit bldFile="uiresources_pub/font_definition_api/tsrc/group" filter="test,api_test,font_definition_api"/>
+   </component>
+   <component id="graphics_api" name="Graphics API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_pub/graphics_api/graphics_api.metaxml"/>
+    <unit bldFile="uiresources_pub/graphics_api/group" filter="!test"/>
+    <unit bldFile="uiresources_pub/graphics_api/tsrc/group" filter="test,api_test,graphics_api"/>
+   </component>
+   <component id="scalable_icons_api" name="Scalable Icons API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_pub/scalable_icons_api/scalable_icons_api.metaxml"/>
+    <unit bldFile="uiresources_pub/scalable_icons_api/group"/>
+   </component>
+   <component id="layout_id_definitions_api" name="Layout ID Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_pub/layout_id_definitions_api/layout_id_definitions_api.metaxml"/>
+    <unit bldFile="uiresources_pub/layout_id_definitions_api/group"/>
+   </component>
+  </collection>
+  <collection id="uiresources_plat" name="UI Resources Platform Interfaces" level="data">
+   <component id="layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/layout_system_private_api/layout_system_private_api.metaxml"/>
+    <unit bldFile="uiresources_plat/layout_system_private_api/group" filter="!test"/>
+    <unit bldFile="uiresources_plat/layout_system_private_api/tsrc/group" filter="test,api_test,layout_system_private_api"/>
+   </component>
+   <component id="layout_data_api" name="Layout Data API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/layout_data_api/layout_data_api.metaxml"/>
+    <unit bldFile="uiresources_plat/layout_data_api/group" filter="!test"/>
+    <unit bldFile="uiresources_plat/layout_data_api/tsrc/group" filter="test,api_test,layout_data_api"/>
+   </component>
+   <component id="cdl_api" name="CDL API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/cdl_api/cdl_api.metaxml"/>
+    <unit bldFile="uiresources_plat/cdl_api/group" filter="!test"/>
+    <unit bldFile="uiresources_plat/cdl_api/tsrc/group" filter="test,api_test,cdl_api"/>
+   </component>
+   <component id="extended_skins_api" name="Extended Skins API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/extended_skins_api/extended_skins_api.metaxml"/>
+    <unit bldFile="uiresources_plat/extended_skins_api/group" filter="!test"/>
+    <unit bldFile="uiresources_plat/extended_skins_api/tsrc/group" filter="test,api_test,extended_skins_api"/>
+   </component>
+   <component id="tfx_server_controller_plugin_api" name="TFX Server Controller Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/tfx_server_controller_plugin_api/tfx_server_controller_plugin_api.metaxml"/>
+    <unit bldFile="uiresources_plat/tfx_server_controller_plugin_api/group"/>
+   </component>
+   <component id="extended_fonts_api" name="Extended Fonts API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/extended_fonts_api/extended_fonts_api.metaxml"/>
+    <unit bldFile="uiresources_plat/extended_fonts_api/group" filter="!test"/>
+    <unit bldFile="uiresources_plat/extended_fonts_api/tsrc/group" filter="test,api_test,extended_fonts_api"/>
+   </component>
+   <component id="graphic_configuration_api" name="Graphic Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/graphic_configuration_api/graphic_configuration_api.metaxml"/>
+    <unit bldFile="uiresources_plat/graphic_configuration_api/group" filter="!test"/>
+    <unit bldFile="uiresources_plat/graphic_configuration_api/tsrc/group" filter="test,api_test,graphic_configuration_api"/>
+   </component>
+   <component id="mif_header_cdl_api" name="MIF Header CDL API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/mif_header_cdl_api/mif_header_cdl_api.metaxml"/>
+    <unit bldFile="uiresources_plat/mif_header_cdl_api/group"/>
+   </component>
+   <component id="personalisation_and_skins_settings_api" name="Personalisation and Skins Settings API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/personalisation_and_skins_settings_api/personalisation_and_skins_settings_api.metaxml"/>
+    <unit bldFile="uiresources_plat/personalisation_and_skins_settings_api/group"/>
+   </component>
+   <component id="tfx_effect_setup_plugin_api" name="TFX Effect Setup Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/tfx_effect_setup_plugin_api/tfx_effect_setup_plugin_api.metaxml"/>
+    <unit bldFile="uiresources_plat/tfx_effect_setup_plugin_api/group"/>
+   </component>
+   <component id="mifconv_definitions_api" name="Mifconv Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/mifconv_definitions_api/mifconv_definitions_api.metaxml"/>
+    <unit bldFile="uiresources_plat/mifconv_definitions_api/group"/>
+   </component>
+   <component id="wallpaper_configuration_api" name="Wallpaper Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/wallpaper_configuration_api/wallpaper_configuration_api.metaxml"/>
+    <unit bldFile="uiresources_plat/wallpaper_configuration_api/group"/>
+   </component>
+   <component id="language_code_definitions_api" name="Language Code Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/language_code_definitions_api/language_code_definitions_api.metaxml"/>
+    <unit bldFile="uiresources_plat/language_code_definitions_api/group"/>
+   </component>
+   <component id="skins_image_attributes_api" name="Skins Image Attributes API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/skins_image_attributes_api/skins_image_attributes_api.metaxml"/>
+    <unit bldFile="uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
+    <unit bldFile="uiresources_plat/skins_image_attributes_api/tsrc/group" filter="test,api_test,skins_image_attributes_api"/>
+   </component>
+   <component id="private_user_area_code_definitions_api" name="Private User Area Code Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/private_user_area_code_definitions_api/private_user_area_code_definitions_api.metaxml"/>
+    <unit bldFile="uiresources_plat/private_user_area_code_definitions_api/group"/>
+   </component>
+   <component id="tfx_server_plugin_ids_api" name="TFX Server Plug-in IDs API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/tfx_server_plugin_ids_api/tfx_server_plugin_ids_api.metaxml"/>
+    <unit bldFile="uiresources_plat/tfx_server_plugin_ids_api/group"/>
+   </component>
+  </collection>
+  <collection id="uiresources_info" name="UI Resources Info" level="data">
+   <component id="uiresources_test" filter="s60,test,api_test" name="UI Resources Tests" purpose="development">
+    <unit bldFile="tsrc/group" filter="uiresources_api_all"/>
+   </component>
+  </collection>
+  <collection id="uigraphics" name="UI Graphics" level="generic">
+   <component id="bitmaps2" filter="s60" name="Bitmaps 2" class="config">
+    <unit bldFile="uigraphics/bitmaps2/group"/>
+   </component>
+   <component id="icons" filter="s60" class="config" name="Icons">
+    <unit bldFile="uigraphics/icons/group"/>
+   </component>
+   <component id="variatedbitmaps" filter="s60" name="Variated Bitmaps" class="config">
+    <unit bldFile="uigraphics/variatedbitmaps/group"/>
+   </component>
+   <component id="aknicon" filter="s60" name="Avkon Icon Framework">
+    <unit bldFile="uigraphics/aknicon/group"/>
+   </component>
+   <component id="nvgrenderstage" filter="sf_build" name="NVG Render Stage">
+    <unit bldFile="uigraphics/nvgrenderstage/group"/>
+   </component>
+  </collection>
+  <collection id="layouts" name="Layouts" level="plugin">
+   <component id="cdl" filter="s60" name="Customization Definition Language">
+    <!-- can only have one unit. Need to #include them or split into multiple components -->
+    <unit bldFile="layouts/cdl/cdlengine/group"/>
+    <unit bldFile="layouts/cdl/cdlserver/group"/>
+   </component>
+   <component id="aknlayout2" filter="s60" name="Avkon Layout 2">
+    <unit bldFile="layouts/aknlayout2/group"/>
+   </component>
+  </collection>
+  <collection id="skins" name="Skins" level="data">
+   <component id="aknskincontent" filter="s60" name="Avkon Skin Content" class="config">
+    <unit bldFile="skins/aknskincontent/group"/>
+   </component>
+   <component id="aknskins" filter="s60" name="Avkon Skin Compiler">
+    <unit bldFile="skins/aknskins/group"/>
+   </component>
+  </collection>
+  <collection id="pictographs" name="Pictographs" level="data">
+   <component id="aknpictograph" filter="s60" name="Avkon Pictograph">
+    <unit bldFile="pictographs/aknpictograph/group"/>
+   </component>
+  </collection>
+  <collection id="locales" name="Locales" level="framework">
+   <component id="locales_build" filter="s60" name="Locales Build">
+    <unit bldFile="locales/loce32"/>
+   </component>
+  </collection>
+  <collection id="uiconfig" name="UI Config" level="server">
+   <component id="s60config" filter="s60" name="S60 UI Config">
+    <unit bldFile="uiconfig/s60config/group"/>
+   </component>
+  </collection>
+  <collection id="fontsupport" name="Font Support" level="generic">
+   <component id="fontprovider" filter="s60" name="Font Provider">
+    <unit bldFile="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>
 -->
-          <component name="fontutils" filter="sf_build" long-name="Font Utils">
-            <unit bldFile="/sf/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
-          </component>
-        </collection>
-        <collection name="helpthemes" long-name="Help Themes" level="data">
-          <!-- collection is really a component. Need to move down a directory -->
-          <component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
-            <unit bldFile="/sf/mw/uiresources/helpthemes/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+   <component id="fontutils" filter="sf_build" name="Font Utils">
+    <unit bldFile="fontsupport/fontutils/FontUtils/group"/>
+   </component>
+  </collection>
+  <collection id="helpthemes" name="Help Themes" level="data">
+   <!-- collection is really a component. Need to move down a directory -->
+   <component id="helpthemes_build" filter="s60" name="Help Themes Build" class="config">
+    <unit bldFile="helpthemes/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>