--- a/symbian4/app/commonemail/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/commonemail/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -147,8 +147,10 @@
<component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
</component>
- <component name="nmhswidget" filter="test,s60,widget_tools" long-name="Nmail Homescreen Widget">
- <unit bldFile="/sf/app/commonemail/emailuis/nmhswidget/tsrc/nmhswidgettestapp"/>
+ <component name="nmhswidget" filter="test,s60,widget_tools" long-name="Nmail Homescreen Widget" class="placeholder">
+ <!-- temporary built from nmail.pro as a workaround to ServiceFW bug on service regisrtations, fix expected on wk18 MCL
+ <unit bldFile="emailuis/nmhswidget/tsrc/nmhswidgettestapp" qt:proFile="nmhswidgettestapp.pro" qt:qmakeArgs="-r"/>
+ -->
</component>
</collection>
<collection name="commonemail_info" long-name="Email Apps Info" level="app">
--- a/symbian4/app/commonemail/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/commonemail/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -72,7 +72,9 @@
<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
</component>
<component id="nmhswidget" filter="test,s60,widget_tools" name="Nmail Homescreen Widget">
+ <!-- temporary built from nmail.pro as a workaround to ServiceFW bug on service regisrtations, fix expected on wk18 MCL
<unit bldFile="emailuis/nmhswidget/tsrc/nmhswidgettestapp" qt:proFile="nmhswidgettestapp.pro" qt:qmakeArgs="-r"/>
+ -->
</component>
</collection>
<collection id="commonemail_info" name="Email Apps Info" level="app">
--- a/symbian4/app/contacts/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/contacts/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -78,18 +78,8 @@
<layer name="app" long-name="Applications" levels="services apps">
<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
<collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
- <component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
- <component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
- <component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
- <component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
</collection>
- <collection name="logsui" long-name="Logs UI" level="ui">
- <component name="logsui_build" filter="s60" long-name="Logs UI Build">
- <!-- component at too high a rank, should move down one directory -->
- <unit bldFile="/sf/app/contacts/logsui"/>
- </component>
- </collection>
<collection name="phonebookui" long-name="Phonebook UI" level="ui">
<component name="mobhistorymodel" filter="s60" long-name="Mobile History Model" introduced="^4" class="placeholder">
<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
@@ -136,6 +126,9 @@
<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
<unit bldFile="/sf/app/contacts/phonebookengines/simutility"/>
</component>
+ <component name="cntimageutility" long-name="Contacts Image Utility" filter="s60" introduced="^4">
+ <unit bldFile="/sf/app/contacts/phonebookengines/cntimageutility"/>
+ </component>
</collection>
<collection name="pimprotocols" long-name="PIM Protocols" level="services">
<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
--- a/symbian4/app/contacts/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/contacts/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -2,29 +2,11 @@
<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
<package id="contacts" name="Contacts Apps" levels="engine support services ui">
<collection id="contacts_plat" name="Contacts Apps Platform Interfaces" level="ui">
- <component id="logs_engine_api" name="Logs Engine API" class="api" filter="s60" introduced="^4">
- <unit base="contacts_plat/logs_engine_api"/>
- </component>
- <component id="logs_engine_api_extensions" name="Logs Engine API Extensions" class="api" filter="s60">
- <unit base="contacts_plat/logs_engine_api_extensions"/>
- </component>
- <component id="logs_services_api" name="Logs Services API" class="api" filter="s60" introduced="^4">
- <unit base="contacts_plat/logs_services_api"/>
- </component>
- <component id="logs_timers_api" name="Logs Timers API" class="api" filter="s60">
- <unit base="contacts_plat/logs_timers_api"/>
- </component>
<component id="qt_mobility_contacts_api" name="Qt Mobility Contacts API" class="api" filter="s60" introduced="^4">
<meta rel="Api" href="contacts_plat/qt_mobility_contacts_api/qt_mobility_contacts_api.metaxml"/>
<unit base="contacts_plat/qt_mobility_contacts_api"/>
</component>
</collection>
- <collection id="logsui" name="Logs UI" level="ui">
- <component id="logsui_build" filter="s60" name="Logs UI Build">
- <!-- component at too high a rank, should move down one directory -->
- <unit bldFile="logsui" qt:proFile="logsui.pro"/>
- </component>
- </collection>
<collection id="phonebookui" name="Phonebook UI" level="ui">
<component id="mobhistorymodel" filter="s60" name="Mobile History Model" introduced="^4">
<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
@@ -71,6 +53,9 @@
<component id="simutility" filter="s60" name="SIM Utility" introduced="^4">
<unit bldFile="phonebookengines/simutility" qt:proFile="simutility.pro"/>
</component>
+ <component id="cntimageutility" name="Contacts Image Utility" filter="s60" introduced="^4">
+ <unit bldFile="phonebookengines/cntimageutility" qt:proFile="cntimageutility.pro"/>
+ </component>
</collection>
<collection id="pimprotocols" name="PIM Protocols" level="services">
<component id="phonebooksync" name="Phonebook Sync" purpose="optional" class="plugin">
--- a/symbian4/app/contentcontrol/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/contentcontrol/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -78,10 +78,10 @@
<layer name="app" long-name="Applications" levels="services apps">
<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
- <component name="ds_contactsdatastoreextension_api" long-name="Adapter Customization API" filter="s60" introduced="^4" class="api">
+ <component name="ds_contactsdatastoreextension_api" long-name="DS Contacts Data Store Extension API" filter="s60" introduced="^4" class="api">
<unit bldFile="/sf/app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
</component>
- <component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
+ <component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" introduced="^3" class="api">
<unit bldFile="/sf/app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
</component>
</collection>
@@ -104,7 +104,7 @@
<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
<unit bldFile="/sf/app/contentcontrol/omads/omadsextensions/group"/>
</component>
- <component name="omadsextensions" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
+ <component name="omadsextensions_qt" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
<unit bldFile="/sf/app/contentcontrol/omads/omadsextensions"/>
</component>
</collection>
--- a/symbian4/app/contentcontrol/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/contentcontrol/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -2,11 +2,11 @@
<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
<package id="contentcontrol" name="Content Control Daemons" levels="plugin framework app">
<collection id="contentctrl_plat" name="Content Control Daemons Platforn Interfaces" level="app">
- <component id="ds_contactsdatastoreextension_api" name="Adapter Customization API" class="api" filter="s60" introduced="^4">
+ <component id="ds_contactsdatastoreextension_api" name="DS Contacts Data Store Extension API" class="api" filter="s60" introduced="^4">
<meta rel="Api" href="contentctrl_plat/ds_contactsdatastoreextension_api/ds_contactsdatastoreextension_api.metaxml"/>
<unit bldFile="contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
</component>
- <component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60">
+ <component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60" introduced="^3">
<meta rel="Api" href="contentctrl_plat/ds_data_modification_api/ds_data_modification_api.metaxml"/>
<unit bldFile="contentctrl_plat/ds_data_modification_api/group"/>
</component>
@@ -29,7 +29,7 @@
<component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
<unit bldFile="omads/omadsextensions/group"/>
</component>
- <component id="omadsextensions" filter="s60" name="OMA DS Qt Extensions" class="plugin">
+ <component id="omadsextensions_qt" filter="s60" name="OMA DS Qt Extensions" class="plugin">
<unit bldFile="omads/omadsextensions" qt:proFile="omadsextensions.pro"/>
</component>
</collection>
--- a/symbian4/app/imgeditor/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/imgeditor/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -78,39 +78,39 @@
<layer name="app" long-name="Applications" levels="services apps">
<block name="imgeditor" level="apps" long-name="Image Editor Apps" levels="engine ui">
<collection name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" level="ui">
- <component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
+ <component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="sf_build" class="api">
<unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
</component>
- <component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
+ <component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="sf_build" class="api">
<unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
</component>
- <component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
+ <component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="sf_build" class="api">
<unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
</component>
- <component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
+ <component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="sf_build" class="api">
<unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
</component>
- <component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
+ <component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="sf_build" class="api">
<unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
</component>
</collection>
<collection name="imageeditor" long-name="Image Editor UI" level="ui">
- <component name="pb" filter="s60" long-name="Plugin Base">
+ <component name="pb" filter="sf_build" long-name="Plugin Base">
<unit bldFile="/sf/app/imgeditor/imageeditor/pb/group"/>
</component>
- <component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
+ <component name="iepb" filter="sf_build" long-name="Image Editor Plugin Base">
<unit bldFile="/sf/app/imgeditor/imageeditor/iepb/group"/>
</component>
- <component name="imageeditorui" filter="s60" long-name="Image Editor UI">
+ <component name="imageeditorui" filter="sf_build" long-name="Image Editor UI">
<unit bldFile="/sf/app/imgeditor/imageeditor/imageeditorui/group"/>
</component>
- <component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
+ <component name="imageeditormanager" filter="sf_build" long-name="Image Editor Manager">
<unit bldFile="/sf/app/imgeditor/imageeditor/imageeditormanager/group"/>
</component>
- <component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
+ <component name="imageeditorapp" filter="sf_build" long-name="Image Editor Application">
<unit bldFile="/sf/app/imgeditor/imageeditor/imageeditorapp/group"/>
</component>
- <component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
+ <component name="imageeditor_plugins" filter="sf_build" long-name="Image Editor Plugins" plugin="Y">
<!-- can only have one unit. Need to include all from a single bld.inf -->
<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
@@ -133,16 +133,16 @@
<unit bldFile="imageeditor/plugins/drawplugin/group"/>
-->
</component>
- <component name="editorprovider" filter="s60" long-name="Image Editor Provider">
+ <component name="editorprovider" filter="sf_build" long-name="Image Editor Provider">
<unit bldFile="/sf/app/imgeditor/imageeditor/editorprovider/group"/>
</component>
- <component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
+ <component name="imageeditor_build" filter="sf_build" long-name="Image Editor Build">
<!-- should distribute this to the other components -->
<unit bldFile="/sf/app/imgeditor/imageeditor/group"/>
</component>
</collection>
<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
- <component name="filters" filter="s60" long-name="Image Editor Filters">
+ <component name="filters" filter="sf_build" long-name="Image Editor Filters">
<!-- can only have one unit. Need to include all from a single bld.inf -->
<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
@@ -168,16 +168,16 @@
<unit bldFile="imageeditorengine/filters/filterdraw/group"/>
-->
</component>
- <component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
+ <component name="imageeditorutils" filter="sf_build" long-name="Image Editor Utilities">
<unit bldFile="/sf/app/imgeditor/imageeditorengine/imageeditorutils/group"/>
</component>
- <component name="systemparameters" filter="s60" long-name="System Parameters">
+ <component name="systemparameters" filter="sf_build" long-name="System Parameters">
<unit bldFile="/sf/app/imgeditor/imageeditorengine/systemparameters/group"/>
</component>
- <component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
+ <component name="enginewrapper" filter="sf_build" long-name="Image Editor Engine Wrapper">
<unit bldFile="/sf/app/imgeditor/imageeditorengine/enginewrapper/group"/>
</component>
- <component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
+ <component name="imageeditorengine_build" filter="sf_build" long-name="Image Editor Engine Build">
<!-- should distribute this to the other components -->
<unit bldFile="/sf/app/imgeditor/imageeditorengine/group"/>
</component>
--- a/symbian4/app/imgeditor/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/imgeditor/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -2,44 +2,44 @@
<SystemDefinition schema="3.0.0">
<package id="imgeditor" name="Image Editor Apps" levels="engine ui">
<collection id="imgeditor_plat" name="Image Editor Apps Platform Interfaces" level="ui">
- <component id="image_editor_debug_utilities_api" name="Image Editor Debug Utilities API" class="api" filter="s60">
+ <component id="image_editor_debug_utilities_api" name="Image Editor Debug Utilities API" class="api" filter="sf_build">
<meta rel="Api" href="imgeditor_plat/image_editor_debug_utilities_api/image_editor_debug_utilities_api.metaxml"/>
<unit bldFile="imgeditor_plat/image_editor_debug_utilities_api/group"/>
</component>
- <component id="image_editor_utilities_api" name="Image Editor Utilities API" class="api" filter="s60">
+ <component id="image_editor_utilities_api" name="Image Editor Utilities API" class="api" filter="sf_build">
<meta rel="Api" href="imgeditor_plat/image_editor_utilities_api/image_editor_utilities_api.metaxml"/>
<unit bldFile="imgeditor_plat/image_editor_utilities_api/group"/>
</component>
- <component id="image_editor_definitions_api" name="Image Editor Definitions API" class="api" filter="s60">
+ <component id="image_editor_definitions_api" name="Image Editor Definitions API" class="api" filter="sf_build">
<meta rel="Api" href="imgeditor_plat/image_editor_definitions_api/image_editor_definitions_api.metaxml"/>
<unit bldFile="imgeditor_plat/image_editor_definitions_api/group"/>
</component>
- <component id="image_editor_system_parameters_api" name="Image Editor System Parameters API" class="api" filter="s60">
+ <component id="image_editor_system_parameters_api" name="Image Editor System Parameters API" class="api" filter="sf_build">
<meta rel="Api" href="imgeditor_plat/image_editor_system_parameters_api/image_editor_system_parameters_api.metaxml"/>
<unit bldFile="imgeditor_plat/image_editor_system_parameters_api/group"/>
</component>
- <component id="image_processing_engine_api" name="Image Processing Engine API" class="api" filter="s60">
+ <component id="image_processing_engine_api" name="Image Processing Engine API" class="api" filter="sf_build">
<meta rel="Api" href="imgeditor_plat/image_processing_engine_api/image_processing_engine_api.metaxml"/>
<unit bldFile="imgeditor_plat/image_processing_engine_api/group"/>
</component>
</collection>
<collection id="imageeditor" name="Image Editor UI" level="ui">
- <component id="pb" filter="s60" name="Plugin Base">
+ <component id="pb" filter="sf_build" name="Plugin Base">
<unit bldFile="imageeditor/pb/group"/>
</component>
- <component id="iepb" filter="s60" name="Image Editor Plugin Base">
+ <component id="iepb" filter="sf_build" name="Image Editor Plugin Base">
<unit bldFile="imageeditor/iepb/group"/>
</component>
- <component id="imageeditorui" filter="s60" name="Image Editor UI">
+ <component id="imageeditorui" filter="sf_build" name="Image Editor UI">
<unit bldFile="imageeditor/imageeditorui/group"/>
</component>
- <component id="imageeditormanager" filter="s60" name="Image Editor Manager">
+ <component id="imageeditormanager" filter="sf_build" name="Image Editor Manager">
<unit bldFile="imageeditor/imageeditormanager/group"/>
</component>
- <component id="imageeditorapp" filter="s60" name="Image Editor Application">
+ <component id="imageeditorapp" filter="sf_build" name="Image Editor Application">
<unit bldFile="imageeditor/imageeditorapp/group"/>
</component>
- <component id="imageeditor_plugins" filter="s60" name="Image Editor Plugins" class="plugin">
+ <component id="imageeditor_plugins" filter="sf_build" name="Image Editor Plugins" class="plugin">
<!-- can only have one unit. Need to include all from a single bld.inf -->
<unit bldFile="imageeditor/plugins/blackwhiteplugin/group"/>
<unit bldFile="imageeditor/plugins/brightnessplugin/group"/>
@@ -62,16 +62,16 @@
<unit bldFile="imageeditor/plugins/drawplugin/group"/>
-->
</component>
- <component id="editorprovider" filter="s60" name="Image Editor Provider">
+ <component id="editorprovider" filter="sf_build" name="Image Editor Provider">
<unit bldFile="imageeditor/editorprovider/group"/>
</component>
- <component id="imageeditor_build" filter="s60" name="Image Editor Build">
+ <component id="imageeditor_build" filter="sf_build" name="Image Editor Build">
<!-- should distribute this to the other components -->
<unit bldFile="imageeditor/group"/>
</component>
</collection>
<collection id="imageeditorengine" name="Image Editor Engine" level="engine">
- <component id="filters" filter="s60" name="Image Editor Filters">
+ <component id="filters" filter="sf_build" name="Image Editor Filters">
<!-- can only have one unit. Need to include all from a single bld.inf -->
<unit bldFile="imageeditorengine/filters/filterbrightness/group"/>
<unit bldFile="imageeditorengine/filters/filterbubble/group"/>
@@ -97,16 +97,16 @@
<unit bldFile="imageeditorengine/filters/filterdraw/group"/>
-->
</component>
- <component id="imageeditorutils" filter="s60" name="Image Editor Utilities">
+ <component id="imageeditorutils" filter="sf_build" name="Image Editor Utilities">
<unit bldFile="imageeditorengine/imageeditorutils/group"/>
</component>
- <component id="systemparameters" filter="s60" name="System Parameters">
+ <component id="systemparameters" filter="sf_build" name="System Parameters">
<unit bldFile="imageeditorengine/systemparameters/group"/>
</component>
- <component id="enginewrapper" filter="s60" name="Image Editor Engine Wrapper">
+ <component id="enginewrapper" filter="sf_build" name="Image Editor Engine Wrapper">
<unit bldFile="imageeditorengine/enginewrapper/group"/>
</component>
- <component id="imageeditorengine_build" filter="s60" name="Image Editor Engine Build">
+ <component id="imageeditorengine_build" filter="sf_build" name="Image Editor Engine Build">
<!-- should distribute this to the other components -->
<unit bldFile="imageeditorengine/group"/>
</component>
--- a/symbian4/app/jrt/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/jrt/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -88,26 +88,46 @@
<unit bldFile="/sf/app/jrt/jrt_plat/java_debug_api/build"/>
</component>
</collection>
- <collection name="java_stubs" long-name="Java Stubs" level="util">
- <!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
- <component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
- <!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
+ <collection name="build_nativejava" long-name="Build Native Java">
+ <component name="nativejava" long-name="Build Native Java" filter="s60" introduced="^4">
+ <unit bldFile="/sf/app/jrt/build/nativejava" filter="!sf_build"/>
+ <unit bldFile="/sf/app/jrt/build/nativejava" filter="sf_build"/>
</component>
- <component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
- <!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
+ </collection>
+ <collection name="javacommons" long-name="Java Commons" level="generic">
+ <component name="javacommons_build" filter="s60" long-name="JRT Build">
+ <unit bldFile="/sf/app/jrt/javacommons" filter="!sf_build"/>
+ <unit bldFile="/sf/app/jrt/javacommons" filter="sf_build"/>
</component>
- <component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
- <!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
- </component>
- <component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
- <!-- Remove the #includes and rename JRT ROM-->
- <!--<unit bldFile="java_stubs/group"/>-->
+ </collection>
+ <collection name="javaruntimes" long-name="Java Runtimes" level="rt">
+ <component name="javaruntimes_build" filter="s60" long-name="JRT Build">
+ <unit bldFile="/sf/app/jrt/javaruntimes" filter="!sf_build"/>
+ <unit bldFile="/sf/app/jrt/javaruntimes" filter="sf_build"/>
</component>
</collection>
- <collection name="jrt_info" long-name="JRT Info" level="rt">
- <component name="jrt_build" filter="s60" long-name="JRT Build">
- <!-- needed for __JAVA_STUBS condition -->
- <unit bldFile="/sf/app/jrt/group"/>
+ <collection name="javauis" long-name="Java UIs" level="ui">
+ <component name="javauis_build" filter="s60" long-name="JRT Build">
+ <unit bldFile="/sf/app/jrt/javauis" filter="!sf_build"/>
+ <unit bldFile="/sf/app/jrt/javauis" filter="sf_build"/>
+ </component>
+ </collection>
+ <collection name="javamanager" level="generic">
+ <component name="javamanager_build" filter="s60" long-name="JRT Build">
+ <unit bldFile="/sf/app/jrt/javamanager" filter="!sf_build"/>
+ <unit bldFile="/sf/app/jrt/javamanager" filter="sf_build"/>
+ </component>
+ </collection>
+ <collection name="javatools" long-name="Java Tools" level="util">
+ <component name="javatools_build" filter="s60" long-name="JRT Build">
+ <unit bldFile="/sf/app/jrt/javatools" filter="!sf_build"/>
+ <unit bldFile="/sf/app/jrt/javatools" filter="sf_build"/>
+ </component>
+ </collection>
+ <collection name="javaextensions" long-name="Java Extensions" level="generic">
+ <component name="javaextensions_build" filter="s60" long-name="JRT Build">
+ <unit bldFile="/sf/app/jrt/javaextensions" filter="!sf_build"/>
+ <unit bldFile="/sf/app/jrt/javaextensions" filter="sf_build"/>
</component>
</collection>
</block>
--- a/symbian4/app/jrt/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/jrt/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -1,41 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
<package id="jrt" name="Java Runtime" levels="util generic rt ui">
<collection id="jrt_plat" name="JRT Platform Interfaces" level="ui">
<component id="java_registry_api" name="Java Registry API" class="api" filter="s60">
+ <meta rel="Api" href="jrt_plat/java_registry_api/java_registry_api.metaxml"/>
<unit bldFile="jrt_plat/java_registry_api/build"/>
</component>
<component id="java_env_info_api" name="Java Environment Info API" class="api" filter="s60">
+ <meta rel="Api" href="jrt_plat/java_env_info_api/java_env_info_api.metaxml"/>
<unit bldFile="jrt_plat/java_env_info_api/build"/>
</component>
<component id="java_debug_api" name="Java Debug API" class="api" filter="s60">
+ <meta rel="Api" href="jrt_plat/java_debug_api/java_debug_api.metaxml"/>
<unit bldFile="jrt_plat/java_debug_api/build"/>
</component>
</collection>
- <collection id="java_stubs" name="Java Stubs" level="util">
- <meta rel="config">
- <defined condition="__JAVA_STUBS"/>
- </meta>
- <!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
- <component id="javadrmutils" name="Java DRM Utils" filter="s60,sf_build">
- <!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
- </component>
- <component id="javaenvinfo" name="Java Environment Info" filter="s60,sf_build">
- <!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
- </component>
- <component id="javaregistry" filter="s60,sf_build" name="Java Registry">
- <!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
- </component>
- <component id="java_stubs_build" filter="s60,sf_build" name="Java Stubs ROM">
- <!-- Remove the #includes and rename JRT ROM-->
- <!--<unit bldFile="java_stubs/group"/>-->
+
+ <collection id="build_nativejava" name="Build Native Java">
+ <component id="nativejava" name="Build Native Java" filter="s60" introduced="^4">
+ <unit bldFile="build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+ <unit bldFile="build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
</component>
</collection>
- <collection id="jrt_info" name="JRT Info" level="rt">
- <component id="jrt_build" filter="s60" name="JRT Build">
- <!-- needed for __JAVA_STUBS condition -->
- <unit bldFile="group"/>
- </component>
+ <collection id="javacommons" name="Java Commons" level="generic">
+ <component id="javacommons_build" filter="s60" name="JRT Build">
+ <unit bldFile="javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+ <unit bldFile="javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+ </component>
+ </collection>
+ <collection id="javaruntimes" name="Java Runtimes" level="rt">
+ <component id="javaruntimes_build" filter="s60" name="JRT Build">
+ <unit bldFile="javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+ <unit bldFile="javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+ </component>
+ </collection>
+ <collection id="javauis" name="Java UIs" level="ui">
+ <component id="javauis_build" filter="s60" name="JRT Build">
+ <unit bldFile="javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+ <unit bldFile="javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+ </component>
+
+ </collection>
+ <collection id="javamanager" level="generic">
+ <component id="javamanager_build" filter="s60" name="JRT Build">
+ <unit bldFile="javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+ <unit bldFile="javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+ </component>
+ </collection>
+ <collection id="javatools" name="Java Tools" level="util">
+ <component id="javatools_build" filter="s60" name="JRT Build">
+ <unit bldFile="javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+ <unit bldFile="javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+ </component>
+ </collection>
+ <collection id="javaextensions" name="Java Extensions" level="generic">
+ <component id="javaextensions_build" filter="s60" name="JRT Build">
+ <unit bldFile="javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+ <unit bldFile="javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+ </component>
</collection>
</package>
</SystemDefinition>
--- a/symbian4/app/location/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/location/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -77,9 +77,9 @@
<systemModel>
<layer name="app" long-name="Applications" levels="services apps">
<block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
- <collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="api">
+ <collection name="location_plat" long-name="Location Apps Platform Interfaces" level="api">
<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
- <unit bldFile="/sf/app/location/loc_plat"/>
+ <unit bldFile="/sf/app/location/location_plat"/>
</component>
</collection>
<collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
@@ -88,6 +88,12 @@
<unit bldFile="/sf/app/location/locationpickerservice"/>
</component>
</collection>
+ <collection name="locationdataharvester" long-name="Location Data Harvester" level="events">
+ <!--collection is really a component. Should move down a directory -->
+ <component name="locationdataharvester_build" long-name="Location Data Harvester Build" filter="s60" introduced="^4">
+ <unit bldFile="/sf/app/location/locationdataharvester"/>
+ </component>
+ </collection>
</block>
</layer>
</systemModel>
--- a/symbian4/app/location/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/location/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
<package id="location" name="Location Apps" levels="ui events loc api">
- <collection id="loc_plat" name="Location Apps Platform Interfaces" level="api">
+ <collection id="location_plat" name="Location Apps Platform Interfaces" level="api">
<component id="location_picker_service_api" name="Location Picker Service API" introduced="^4" class="api" filter="s60">
- <unit bldFile="loc_plat" qt:proFile="location_plat.pro"/>
+ <unit bldFile="location_plat" qt:proFile="location_plat.pro"/>
</component>
</collection>
<collection id="locationpickerservice" name="Location Picker Service" level="loc">
@@ -12,5 +12,11 @@
<unit bldFile="locationpickerservice" qt:proFile="locationpickerservice.pro"/>
</component>
</collection>
+ <collection id="locationdataharvester" name="Location Data Harvester" level="events">
+ <!--collection is really a component. Should move down a directory -->
+ <component id="locationdataharvester_build" name="Location Data Harvester Build" filter="s60" introduced="^4">
+ <unit bldFile="locationdataharvester" qt:proFile="locationdataharvester.pro"/>
+ </component>
+ </collection>
</package>
</SystemDefinition>
--- a/symbian4/app/messaging/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/messaging/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -111,9 +111,6 @@
<unit bldFile="/sf/app/messaging/messagingappbase"/>
</component>
<component name="msgmedia" filter="s60" long-name="Message Media"/>
- <component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
- <unit mrp="/sf/app/messaging/messagingappbase/smsmtm/group/messaging_sms.mrp"/>
- </component>
<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
<unit bldFile="/sf/app/messaging/messagingappbase/smilparser/GROUP" mrp="/sf/app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
</component>
@@ -170,7 +167,7 @@
</component>
</collection>
<collection name="messagingapp" long-name="Messaging Application" level="app">
- <component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
+ <component name="messagingapp_build" filter="s60" long-name="MMS Engine Build">
<!-- this should be broken up into the individual other components -->
<unit bldFile="/sf/app/messaging/messagingapp"/>
</component>
--- a/symbian4/app/messaging/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/messaging/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -72,9 +72,6 @@
<component id="msgmedia" filter="s60" name="Message Media">
<unit base="messagingappbase/msgmedia"/>
</component>
- <component id="smsmtm" name="SMS MTM" purpose="optional" class="plugin">
- <unit mrp="messagingappbase/smsmtm/group/messaging_sms.mrp"/>
- </component>
<component id="smilparser" name="SMIL Parser" introduced="7.0s" purpose="optional">
<unit bldFile="messagingappbase/smilparser/GROUP" mrp="messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
</component>
@@ -131,7 +128,7 @@
</component>
</collection>
<collection id="messagingapp" name="Messaging Application" level="app">
- <component id="mmsengine_build" filter="s60" name="MMS Engine Build">
+ <component id="messagingapp_build" filter="s60" name="MMS Engine Build">
<!-- this should be broken up into the individual other components -->
<unit bldFile="messagingapp" qt:proFile="messagingapp.pro" qt:qmakeArgs="-r"/>
</component>
@@ -170,10 +167,6 @@
<component id="messaging_metadata" name="Messaging Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="messaging_info/messaging_metadata/messaging_metadata.mrp"/>
</component>
- <component name="messaging_build" long-name="Messaging App Build" introduced="^4">
- <!-- break this up into the above collections and eventually remove -->
- <unit bldFile="." qt:proFile="messaging.pro" qt:qmakeArgs="-r"/>
- </component>
</collection>
</package>
</SystemDefinition>
--- a/symbian4/app/organizer/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/organizer/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -97,13 +97,12 @@
<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
</component>
- <component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api">
+ <component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api placeholder">
<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
</component>
<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
- <component name="agenda_eventviewer_api" long-name="Agenda Event Viewer API" filter="s60" introduced="^4" class="api"/>
</collection>
<collection name="agendainterface" long-name="Agenda Interface" level="services">
<!-- collection is really a component, should move down a directory -->
@@ -116,7 +115,7 @@
<unit bldFile="/sf/app/organizer/calendarui/commonutils"/>
</component>
<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
- <unit bldFile="/sf/app/organizer/calendarui/calenlauncher/group"/>
+ <unit bldFile="/sf/app/organizer/calendarui/calenlauncher"/>
</component>
<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
<unit bldFile="/sf/app/organizer/calendarui/caleneditor"/>
@@ -139,15 +138,15 @@
<component name="views" filter="s60" long-name="Calendar Views">
<unit bldFile="/sf/app/organizer/calendarui/views"/>
</component>
- <component name="calengriditemstyleplugin" filter="s60" introduced="^4" plugin="Y">
- <unit bldFile="/sf/app/organizer/calendarui/styleplugins/calengriditemstyleplugin"/>
- </component>
<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
<unit bldFile="/sf/app/organizer/calendarui/controller"/>
</component>
<component name="calendarui_application" filter="s60" long-name="Calendar Application">
<unit bldFile="/sf/app/organizer/calendarui/application"/>
</component>
+ <component name="regionalplugins" long-name="Regional Plugins" filter="s60" introduced="^4" plugin="Y">
+ <unit bldFile="/sf/app/organizer/calendarui/regionalplugins"/>
+ </component>
<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
<unit bldFile="/sf/app/organizer/calendarui/caldav/group"/>
</component>
--- a/symbian4/app/organizer/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/organizer/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -26,7 +26,6 @@
<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
</component>
<component id="calendar_launcher_api" name="Calendar Launcher API" class="api" filter="s60">
- <meta rel="Api" href="organizer_plat/calendar_launcher_api/calendar_launcher_api.metaxml"/>
<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
</component>
<component id="agenda_interface_api" name="Agenda Interface API" class="api" filter="s60" introduced="^4">
@@ -38,9 +37,6 @@
<component id="notes_editor_api" name="Notes Editor API" class="api" filter="s60" introduced="^4">
<unit base="organizer_plat/notes_editor_api"/>
</component>
- <component id="agenda_eventviewer_api" name="Agenda Event Viewer API" class="api" filter="s60" introduced="^4">
- <unit base="organizer_plat/agenda_eventviewer_api"/>
- </component>
</collection>
<collection id="agendainterface" name="Agenda Interface" level="services">
<!-- collection is really a component, should move down a directory -->
@@ -53,7 +49,7 @@
<unit bldFile="calendarui/commonutils" qt:proFile="commonutils.pro"/>
</component>
<component id="calenlauncher" filter="s60" name="Calendar Launcher">
- <unit bldFile="calendarui/calenlauncher/group" qt:proFile="calenlauncher.pro"/>
+ <unit bldFile="calendarui/calenlauncher" qt:proFile="calenlauncher.pro"/>
</component>
<component id="caleneditor" filter="s60" name="Calendar Editor" introduced="^4">
<unit bldFile="calendarui/caleneditor" qt:proFile="caleneditor.pro"/>
@@ -76,15 +72,15 @@
<component id="views" filter="s60" name="Calendar Views">
<unit bldFile="calendarui/views" qt:proFile="views.pro"/>
</component>
- <component id="calengriditemstyleplugin" filter="s60" name="calengriditemstyleplugin" introduced="^4" class="plugin">
- <unit bldFile="calendarui/styleplugins/calengriditemstyleplugin" qt:proFile="calengriditemstyleplugin.pro"/>
- </component>
<component id="calendarui_controller" filter="s60" name="Calendar Controller">
<unit bldFile="calendarui/controller" qt:proFile="controller.pro"/>
</component>
<component id="calendarui_application" filter="s60" name="Calendar Application">
<unit bldFile="calendarui/application" qt:proFile="application.pro"/>
</component>
+ <component id="regionalplugins" name="Regional Plugins" filter="s60" introduced="^4" class="plugin">
+ <unit bldFile="calendarui/regionalplugins" qt:proFile="regionalplugins.pro"/>
+ </component>
<component id="caldav" filter="sf_build" name="CalDAV" class="plugin" introduced="^3">
<unit bldFile="calendarui/caldav/group"/>
</component>
--- a/symbian4/app/phone/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/phone/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -184,7 +184,7 @@
<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
<unit bldFile="/sf/app/phone/phone_plat/phone_application_voip_commands_api/group"/>
</component>
- <component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+ <component name="phone_telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
<unit bldFile="/sf/app/phone/phone_plat/telephony_mediator_api/group"/>
</component>
<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
--- a/symbian4/app/phone/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/phone/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -114,7 +114,7 @@
<component id="phone_application_voip_commands_api" name="Phone Application VOIP Commands API" class="api" filter="s60">
<unit bldFile="phone_plat/phone_application_voip_commands_api/group"/>
</component>
- <component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
+ <component id="phone_telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
<unit bldFile="phone_plat/telephony_mediator_api/group"/>
</component>
<component id="video_telephony_mediator_api" name="Video Telephony Mediator API" class="api" filter="s60">
@@ -132,7 +132,7 @@
<unit bldFile="phoneplugins/hsdialerwidgetplugin" qt:proFile="hsdialerwidgetplugin.pro"/>
</component>
<component id="infowidgetplugin" filter="s60" name="Info Widget Plugin" class="plugin" introduced="^4">
- <unit bldFile="phoneplugins/infowidgetplugin" qt:proFile=""/>
+ <unit bldFile="phoneplugins/infowidgetplugin" qt:proFile="infowidgetplugin.pro"/>
</component>
</collection>
<collection id="phonesettings" name="Phone Settings" level="plugin">
--- a/symbian4/app/podcatcher/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/podcatcher/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -3,8 +3,15 @@
<package id="podcatcher" name="Podcatcher" levels="app">
<collection id="podcatcher_info" name="Podcatcher" level="app">
<component id="podcatcher_build" filter="sf_build" name="Podcatcher Build" introduced="^3">
+ <!-- has exports from top level bld.inf -->
<unit bldFile="group"/>
</component>
+ <component id="podcatcher_app" filter="sf_build" name="Podcatcher Application" introduced="^3">
+ <unit bldFile="application/group"/>
+ </component>
+ <component id="podcatcher_engine" filter="sf_build" name="Podcatcher Engine" introduced="^3">
+ <unit bldFile="engine/group"/>
+ </component>
</collection>
</package>
</SystemDefinition>
--- a/symbian4/app/rndtools/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/rndtools/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -113,13 +113,13 @@
<collection name="perfmon" long-name="Performance Monitor" level="test">
<!-- collection is really a component. Should move down a directory -->
<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
- <unit bldFile="/sf/app/rndtools/perfmon/group"/>
+ <unit bldFile="/sf/app/rndtools/perfmon"/>
</component>
</collection>
<collection name="screengrabber" long-name="Screen Grabber" level="util">
<!-- collection is really a component. Should move down a directory -->
<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
- <unit bldFile="/sf/app/rndtools/screengrabber/group"/>
+ <unit bldFile="/sf/app/rndtools/screengrabber"/>
</component>
</collection>
<collection name="stifui" long-name="STIF UI" level="generic">
--- a/symbian4/app/rndtools/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/rndtools/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
<package id="rndtools" name="R&D tools" levels="support generic test util">
<collection id="creator" name="Creator" level="support">
<!-- collection is really a component. Should move down a directory -->
@@ -43,13 +42,13 @@
<collection id="perfmon" name="Performance Monitor" level="test">
<!-- collection is really a component. Should move down a directory -->
<component id="perfmon_build" filter="s60" name="Performance Monitor Tool" purpose="development" target="device" class="tool">
- <unit bldFile="perfmon/group"/>
+ <unit bldFile="perfmon" qt:proFile="perfmon.pro"/>
</component>
</collection>
<collection id="screengrabber" name="Screen Grabber" level="util">
<!-- collection is really a component. Should move down a directory -->
<component id="screengrabber_build" filter="s60" name="ScreenGrabber" purpose="development" target="device" class="tool">
- <unit bldFile="screengrabber/group"/>
+ <unit bldFile="screengrabber" qt:proFile="screengrabber.pro"/>
</component>
</collection>
<collection id="stifui" name="STIF UI" level="generic">
--- a/symbian4/app/techview/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/techview/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -110,7 +110,7 @@
<unit bldFile="/sf/app/techview/techviewui/startup/group" mrp="/sf/app/techview/techviewui/startup/group/techview_startup.mrp"/>
</component>
</collection>
- <collection name="controlpanel" long-name="Control Panel" level="ui">
+ <collection name="tv_controlpanel" long-name="Control Panel" level="ui">
<component name="fepsetup" long-name="FEP Setup" filter="techview" purpose="development">
<unit bldFile="/sf/app/techview/controlpanel/fepsetup/group" mrp="/sf/app/techview/controlpanel/fepsetup/group/techview_fepsetup.mrp"/>
</component>
--- a/symbian4/app/techview/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/techview/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -34,7 +34,7 @@
<unit bldFile="techviewui/startup/group" mrp="techviewui/startup/group/techview_startup.mrp"/>
</component>
</collection>
- <collection id="controlpanel" name="Control Panel" level="ui">
+ <collection id="tv_controlpanel" name="Control Panel" level="ui">
<component id="fepsetup" name="FEP Setup" filter="techview" purpose="development">
<unit bldFile="controlpanel/fepsetup/group" mrp="controlpanel/fepsetup/group/techview_fepsetup.mrp"/>
</component>
--- a/symbian4/app/videoeditor/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/videoeditor/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -78,58 +78,58 @@
<layer name="app" long-name="Applications" levels="services apps">
<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
- <component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
+ <component name="video_editor_engine_api" filter="sf_build" long-name="Video Editor Engine API" introduced="^2" class="api">
<unit bldFile="/sf/app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
</component>
</collection>
<collection name="videditor" long-name="Video Editor" level="ui">
- <component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
+ <component name="videoeditorcommon" filter="sf_build" long-name="Video Editor Common" introduced="^2">
<unit bldFile="/sf/app/videoeditor/videditor/videoeditorcommon/group"/>
</component>
- <component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
+ <component name="videoeditoruicomponents" filter="sf_build" long-name="Video Editor UI Components" introduced="^2">
<unit bldFile="/sf/app/videoeditor/videditor/videoeditoruicomponents/group"/>
</component>
- <component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
+ <component name="simplevideoeditor" filter="sf_build" long-name="Simple Video Editor" introduced="^2">
<unit bldFile="/sf/app/videoeditor/videditor/simplevideoeditor/group"/>
</component>
- <component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
+ <component name="simplecutvideo" filter="sf_build" long-name="Simple Cut Video" introduced="^2">
<unit bldFile="/sf/app/videoeditor/videditor/simplecutvideo/group"/>
</component>
- <component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
+ <component name="videoprovider" filter="sf_build" long-name="Video Provider" introduced="^2">
<unit bldFile="/sf/app/videoeditor/videditor/videoprovider/group"/>
</component>
- <component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
+ <component name="manualvideoeditor" filter="sf_build" long-name="Manual Video Editor" introduced="^2" class="placeholder">
<!-- uncomment when supported
<meta rel="config">
<defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
</meta>
<unit bldFile="videditor/manualvideoeditor/group"/> -->
</component>
- <component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
+ <component name="videditor_build" filter="sf_build" long-name="Video Editor Build" introduced="^2">
<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
<unit bldFile="/sf/app/videoeditor/videditor/group"/>
</component>
</collection>
<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
- <component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
+ <component name="audioeditorengine" filter="sf_build" long-name="Audio Editor Engine" introduced="^2">
<unit bldFile="/sf/app/videoeditor/videoeditorengine/audioeditorengine/group"/>
</component>
- <component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
+ <component name="avcedit" filter="sf_build" long-name="AVC Editing" introduced="^2">
<unit bldFile="/sf/app/videoeditor/videoeditorengine/avcedit/group"/>
</component>
- <component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
+ <component name="h263decoder" filter="sf_build" long-name="H.263 Decoder" introduced="^2">
<unit bldFile="/sf/app/videoeditor/videoeditorengine/h263decoder/group"/>
</component>
- <component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
+ <component name="mp3aacmaniplib" filter="sf_build" long-name="MP3 and AAC Manipulation Library" introduced="^2">
<unit bldFile="/sf/app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
</component>
- <component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
+ <component name="vedtranscoder" filter="sf_build" long-name="Video Editor Transcoder" introduced="^2">
<unit bldFile="/sf/app/videoeditor/videoeditorengine/vedtranscoder/group"/>
</component>
- <component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
+ <component name="vedengine" filter="sf_build" long-name="Video Editor Engine" introduced="^2">
<unit bldFile="/sf/app/videoeditor/videoeditorengine/vedengine/group"/>
</component>
- <component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
+ <component name="videoeditorengine_build" filter="sf_build" long-name="Video Editor Engine Build" introduced="^2">
<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
<unit bldFile="/sf/app/videoeditor/videoeditorengine/group"/>
</component>
--- a/symbian4/app/videoeditor/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/videoeditor/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -1,60 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="videoeditor" name="Video Editor Apps" levels="engine ui">
- <collection id="videoeditor_plat" filter="s60" name="Video Editor Apps Platform Interfaces" level="ui">
- <component id="video_editor_engine_api" name="Video Editor Engine API" class="api" introduced="^2">
+ <collection id="videoeditor_plat" filter="sf_build" name="Video Editor Apps Platform Interfaces" level="ui">
+ <component id="video_editor_engine_api" filter="sf_build" name="Video Editor Engine API" class="api" introduced="^2">
<meta rel="Api" href="videoeditor_plat/video_editor_engine_api/video_editor_engine_api.metaxml"/>
<unit bldFile="videoeditor_plat/video_editor_engine_api/group"/>
</component>
</collection>
<collection id="videditor" name="Video Editor" level="ui">
- <component id="videoeditorcommon" filter="s60" name="Video Editor Common" introduced="^2">
+ <component id="videoeditorcommon" filter="sf_build" name="Video Editor Common" introduced="^2">
<unit bldFile="videditor/videoeditorcommon/group"/>
</component>
- <component id="videoeditoruicomponents" filter="s60" name="Video Editor UI Components" introduced="^2">
+ <component id="videoeditoruicomponents" filter="sf_build" name="Video Editor UI Components" introduced="^2">
<unit bldFile="videditor/videoeditoruicomponents/group"/>
</component>
- <component id="simplevideoeditor" filter="s60" name="Simple Video Editor" introduced="^2">
+ <component id="simplevideoeditor" filter="sf_build" name="Simple Video Editor" introduced="^2">
<unit bldFile="videditor/simplevideoeditor/group"/>
</component>
- <component id="simplecutvideo" filter="s60" name="Simple Cut Video" introduced="^2">
+ <component id="simplecutvideo" filter="sf_build" name="Simple Cut Video" introduced="^2">
<unit bldFile="videditor/simplecutvideo/group"/>
</component>
- <component id="videoprovider" filter="s60" name="Video Provider" introduced="^2">
+ <component id="videoprovider" filter="sf_build" name="Video Provider" introduced="^2">
<unit bldFile="videditor/videoprovider/group"/>
</component>
- <component id="manualvideoeditor" filter="s60" name="Manual Video Editor" introduced="^2">
+ <component id="manualvideoeditor" filter="sf_build" name="Manual Video Editor" introduced="^2">
<!-- uncomment when supported
<meta rel="config">
<defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
</meta>
<unit bldFile="videditor/manualvideoeditor/group"/> -->
</component>
- <component id="videditor_build" filter="s60" name="Video Editor Build" introduced="^2">
+ <component id="videditor_build" filter="sf_build" name="Video Editor Build" introduced="^2">
<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
<unit bldFile="videditor/group"/>
</component>
</collection>
<collection id="videoeditorengine" name="Video Editor Engine" level="engine">
- <component id="audioeditorengine" filter="s60" name="Audio Editor Engine" introduced="^2">
+ <component id="audioeditorengine" filter="sf_build" name="Audio Editor Engine" introduced="^2">
<unit bldFile="videoeditorengine/audioeditorengine/group"/>
</component>
- <component id="avcedit" filter="s60" name="AVC Editing" introduced="^2">
+ <component id="avcedit" filter="sf_build" name="AVC Editing" introduced="^2">
<unit bldFile="videoeditorengine/avcedit/group"/>
</component>
- <component id="h263decoder" filter="s60" name="H.263 Decoder" introduced="^2">
+ <component id="h263decoder" filter="sf_build" name="H.263 Decoder" introduced="^2">
<unit bldFile="videoeditorengine/h263decoder/group"/>
</component>
- <component id="mp3aacmaniplib" filter="s60" name="MP3 and AAC Manipulation Library" introduced="^2">
+ <component id="mp3aacmaniplib" filter="sf_build" name="MP3 and AAC Manipulation Library" introduced="^2">
<unit bldFile="videoeditorengine/mp3aacmaniplib/group"/>
</component>
- <component id="vedtranscoder" filter="s60" name="Video Editor Transcoder" introduced="^2">
+ <component id="vedtranscoder" filter="sf_build" name="Video Editor Transcoder" introduced="^2">
<unit bldFile="videoeditorengine/vedtranscoder/group"/>
</component>
- <component id="vedengine" filter="s60" name="Video Editor Engine" introduced="^2">
+ <component id="vedengine" filter="sf_build" name="Video Editor Engine" introduced="^2">
<unit bldFile="videoeditorengine/vedengine/group"/>
</component>
- <component id="videoeditorengine_build" filter="s60" name="Video Editor Engine Build" introduced="^2">
+ <component id="videoeditorengine_build" filter="sf_build" name="Video Editor Engine Build" introduced="^2">
<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
<unit bldFile="videoeditorengine/group"/>
</component>
--- a/symbian4/app/videoplayer/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/videoplayer/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -79,8 +79,7 @@
<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
<collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
- <unit bldFile="/sf/app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
- <unit bldFile="/sf/app/videoplayer/videoplayer_plat/videoplayer_startup_api/tsrc/group" filter="test,api_test"/>
+ <unit bldFile="/sf/app/videoplayer/videoplayer_plat/videoplayer_startup_api/group"/>
</component>
<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
<unit bldFile="/sf/app/videoplayer/videoplayer_plat/videocollection_api/group"/>
@@ -93,7 +92,7 @@
<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
<unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper"/>
</component>
- <component name="videocollectionwrapper" filter="test,qt_unit_test" long-name="Video Collection Wrapper Tests">
+ <component name="videocollectionwrapper_test" filter="test,qt_unit_test" long-name="Video Collection Wrapper Tests" introduced="^4">
<!--Can only have one unit. Need to split into separate component or #include from a common file-->
<unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideocollectionclient"/>
<unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideocollectionlistener"/>
@@ -105,6 +104,7 @@
<unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideosortfilterproxymodel"/>
<unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata"/>
<unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata_p"/>
+ <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideothumbnailfetcher"/>
</component>
<component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
<unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview"/>
@@ -115,6 +115,7 @@
<unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testhintwidget"/>
<unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testlistview"/>
<unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testlistwidget"/>
+ <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testvideocollectionuiloader"/>
<unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testvideocollectionviewutils"/>
<unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testvideolistselectiondialog"/>
</component>
--- a/symbian4/app/videoplayer/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/videoplayer/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -3,8 +3,7 @@
<package id="videoplayer" name="Video Player Apps" levels="support plugin util apps" xmlns:qt="http://www.nokia.com/qt">
<collection id="videoplayer_plat" name="Video Player Apps Platform Interfaces" level="apps">
<component id="videoplayer_startup_api" name="Video Player Startup API" class="api" filter="s60">
- <unit bldFile="videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
- <unit bldFile="videoplayer_plat/videoplayer_startup_api/tsrc/group" filter="test,api_test"/>
+ <unit bldFile="videoplayer_plat/videoplayer_startup_api/group"/>
</component>
<component id="videocollection_api" name="Video Collection API" class="api" filter="s60">
<unit bldFile="videoplayer_plat/videocollection_api/group"/>
@@ -17,7 +16,7 @@
<component id="videocollectionwrapper" filter="s60" name="Video Collection Wrapper" introduced="^4">
<unit bldFile="videocollection/videocollectionwrapper" qt:proFile="videocollectionwrapper.pro" qt:qmakeArgs="-r"/>
</component>
- <component id="videocollectionwrapper" filter="test,qt_unit_test" name="Video Collection Wrapper Tests">
+ <component id="videocollectionwrapper_test" filter="test,qt_unit_test" name="Video Collection Wrapper Tests" introduced="^4">
<!--Can only have one unit. Need to split into separate component or #include from a common file-->
<meta rel="testbuild">
<group name="vado.videocollection.tsrc"/>
@@ -32,6 +31,7 @@
<unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideosortfilterproxymodel" qt:proFile="testvideosortfilterproxymodel.pro"/>
<unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata" qt:proFile="testvideothumbnaildata.pro"/>
<unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata_p" qt:proFile="testvideothumbnaildata_p.pro"/>
+ <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideothumbnailfetcher" qt:proFile="testvideothumbnailfetcher.pro"/>
</component>
<component id="videocollectionview" filter="s60" name="Video Collection View" introduced="^4">
<unit bldFile="videocollection/videocollectionview" qt:proFile="videocollectionview.pro" qt:qmakeArgs="-r"/>
@@ -45,6 +45,7 @@
<unit bldFile="videocollection/videocollectionview/tsrc/testhintwidget" qt:proFile="testhintwidget.pro"/>
<unit bldFile="videocollection/videocollectionview/tsrc/testlistview" qt:proFile="testlistview.pro"/>
<unit bldFile="videocollection/videocollectionview/tsrc/testlistwidget" qt:proFile="testlistwidget.pro"/>
+ <unit bldFile="videocollection/videocollectionview/tsrc/testvideocollectionuiloader" qt:proFile="testvideocollectionuiloader.pro"/>
<unit bldFile="videocollection/videocollectionview/tsrc/testvideocollectionviewutils" qt:proFile="testvideocollectionviewutils.pro"/>
<unit bldFile="videocollection/videocollectionview/tsrc/testvideolistselectiondialog" qt:proFile="testvideolistselectiondialog.pro"/>
</component>
--- a/symbian4/mw/appsupport/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/appsupport/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -228,10 +228,10 @@
<component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
<unit bldFile="/sf/mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
</component>
- <component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
+ <component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub" deprecated="^4">
<unit bldFile="/sf/mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
</component>
- <component name="gsserverengine" filter="s60" long-name="GS Server Engine">
+ <component name="gsserverengine" filter="s60" long-name="GS Server Engine" deprecated="^4">
<unit bldFile="/sf/mw/appsupport/coreapplicationuis/gsserverengine/group"/>
</component>
<component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
@@ -290,7 +290,7 @@
</component>
</collection>
<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
- <component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
+ <component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" deprecated="^4" plugin="Y">
<unit bldFile="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
</component>
</collection>
--- a/symbian4/mw/appsupport/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/appsupport/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -190,10 +190,10 @@
<component id="powersaveutilities" filter="s60" name="Power Save Utilities">
<unit bldFile="coreapplicationuis/powersaveutilities/group"/>
</component>
- <component id="gsserverenginestub" filter="s60" name="GS Server Engine Stub">
+ <component id="gsserverenginestub" filter="s60" name="GS Server Engine Stub" deprecated="^4">
<unit bldFile="coreapplicationuis/gsserverenginestub/group"/>
</component>
- <component id="gsserverengine" filter="s60" name="GS Server Engine">
+ <component id="gsserverengine" filter="s60" name="GS Server Engine" deprecated="^4">
<unit bldFile="coreapplicationuis/gsserverengine/group"/>
</component>
<component id="sensordatacompensatorplugin" filter="s60" name="Sensor Data Compensator Plugin" class="plugin">
@@ -254,7 +254,7 @@
</component>
</collection>
<collection id="hwresourceadaptation" name="Hardware Resource Adaptation" level="generic">
- <component id="hwresourcemgruiplugin" name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" class="plugin">
+ <component id="hwresourcemgruiplugin" name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" class="plugin" deprecated="^4">
<unit bldFile="hwresourceadaptation/hwresourcemgruiplugin/group" mrp="hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
</component>
</collection>
--- a/symbian4/mw/btservices/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/btservices/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -174,6 +174,11 @@
<unit bldFile="/sf/mw/btservices/atcommands/lccustomplugin/group"/>
</component>
</collection>
+ <collection name="cbsatplugin" long-name="CBS AT Plugin">
+ <component name="atmisccmdplugin" long-name="AT Misc Commands Plugin" filter="s60" introduced="^4" plugin="Y">
+ <unit bldFile="/sf/mw/btservices/cbsatplugin/atmisccmdplugin/group"/>
+ </component>
+ </collection>
<collection name="btservices_info" long-name="BT Services Info" level="plugin">
<component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
<unit mrp="/sf/mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
--- a/symbian4/mw/btservices/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/btservices/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -113,6 +113,11 @@
<unit bldFile="atcommands/lccustomplugin/group"/>
</component>
</collection>
+ <collection id="cbsatplugin" name="CBS AT Plugin">
+ <component id="atmisccmdplugin" name="AT Misc Commands Plugin" filter="s60" class="plugin" introduced="^4">
+ <unit bldFile="cbsatplugin/atmisccmdplugin/group"/>
+ </component>
+ </collection>
<collection id="btservices_info" name="BT Services Info" level="plugin">
<component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
<unit mrp="btservices_info/btservices_metadata/btservices_metadata.mrp"/>
--- a/symbian4/mw/classicui/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/classicui/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -79,8 +79,7 @@
<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
<collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
- <unit bldFile="/sf/mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
- <unit bldFile="/sf/mw/classicui/classicui_plat/personalisation_framework_api/tsrc/group" filter="test,api_test"/>
+ <unit bldFile="/sf/mw/classicui/classicui_plat/personalisation_framework_api/group"/>
</component>
<component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
<unit bldFile="/sf/mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
@@ -464,9 +463,6 @@
<unit bldFile="/sf/mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
<unit bldFile="/sf/mw/classicui/classicui_pub/notes_api/tsrc/group" filter="test,api_test"/>
</component>
- <component name="screen_saver_api" long-name="Screen Saver API" filter="s60,test,api_test" class="api">
- <unit bldFile="/sf/mw/classicui/classicui_pub/screen_saver_api/tsrc/group"/>
- </component>
<component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
<unit bldFile="/sf/mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
<unit bldFile="/sf/mw/classicui/classicui_pub/status_pane_api/tsrc/group" filter="test,api_test"/>
--- a/symbian4/mw/classicui/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/classicui/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -4,8 +4,7 @@
<collection id="classicui_plat" name="Classic UI Platform Interfaces" level="specific">
<component id="personalisation_framework_api" name="Personalisation Framework API" class="api" filter="s60">
<meta rel="Api" href="classicui_plat/personalisation_framework_api/personalisation_framework_api.metaxml"/>
- <unit bldFile="classicui_plat/personalisation_framework_api/group" filter="!test"/>
- <unit bldFile="classicui_plat/personalisation_framework_api/tsrc/group" filter="test,api_test"/>
+ <unit bldFile="classicui_plat/personalisation_framework_api/group"/>
</component>
<component id="signal_pane_api" name="Signal Pane API" class="api" filter="s60">
<meta rel="Api" href="classicui_plat/signal_pane_api/signal_pane_api.metaxml"/>
@@ -487,13 +486,6 @@
<unit bldFile="classicui_pub/notes_api/group" filter="!test"/>
<unit bldFile="classicui_pub/notes_api/tsrc/group" filter="test,api_test"/>
</component>
- <component id="screen_saver_api" name="Screen Saver API" class="api" filter="s60,test,api_test">
- <meta rel="Api" href="classicui_pub/screen_saver_api/screen_saver_api.metaxml"/>
- <meta rel="testbuild">
- <group name="classicui_pub_api_tests"/>
- </meta>
- <unit bldFile="classicui_pub/screen_saver_api/tsrc/group"/>
- </component>
<component id="status_pane_api" name="Status Pane API" class="api" filter="s60">
<meta rel="Api" href="classicui_pub/status_pane_api/status_pane_api.metaxml"/>
<unit bldFile="classicui_pub/status_pane_api/group" filter="!test"/>
--- a/symbian4/mw/dlnasrv/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/dlnasrv/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -192,9 +192,9 @@
</meta>
<component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
<!-- need to merge or #include these to a single bld.inf -->
- <!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+ <!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+ <unit bldFile="upnpharvester/common/cmsettings/group"/>
+ <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
<unit bldFile="upnpharvester/common/dbmanager/group"/>-->
</component>
<component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
--- a/symbian4/mw/drm/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/drm/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -111,9 +111,12 @@
<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
<unit bldFile="/sf/mw/drm/drm_plat/wmdrm_core_api/group"/>
</component>
- <component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
+ <component name="wmdrm_access_api" long-name="WM DRM Access API" filter="s60" class="api">
<unit bldFile="/sf/mw/drm/drm_plat/wmdrm_access_api/group"/>
</component>
+ <component name="wmdrm_ota_access_api" long-name="WM DRM OTA Access API" filter="s60" class="api">
+ <unit bldFile="/sf/mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
+ </component>
<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
<unit bldFile="/sf/mw/drm/drm_plat/camese_utility_api/group"/>
</component>
@@ -144,8 +147,7 @@
<unit bldFile="/sf/mw/drm/commondrm/drmrightsmanagerui/help/group"/>
</component>
<component name="drmutility" filter="s60" long-name="DRM Utility">
- <!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
- <!--<unit bldFile="commondrm/drmutility/group"/>-->
+ <unit bldFile="/sf/mw/drm/commondrm/drmutility/group"/>
</component>
<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
<unit bldFile="/sf/mw/drm/commondrm/drmserviceapiwrapper/group"/>
@@ -163,9 +165,6 @@
<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
<unit bldFile="/sf/mw/drm/omadrm/group"/>
</component>
- <component name="rndcerts" filter="s60,test" long-name="R&D Certificates">
- <unit bldFile="/sf/mw/drm/omadrm/rndcerts/group"/>
- </component>
<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
<unit bldFile="/sf/mw/drm/omadrm/foundationcerts/group"/>
</component>
--- a/symbian4/mw/drm/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/drm/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -46,10 +46,14 @@
<meta rel="Api" href="drm_plat/wmdrm_core_api/wmdrm_core_api.metaxml"/>
<unit bldFile="drm_plat/wmdrm_core_api/group"/>
</component>
- <component id="wmdrm_access_api" name="WMDRM Access API" class="api" filter="s60">
+ <component id="wmdrm_access_api" name="WM DRM Access API" class="api" filter="s60">
<meta rel="Api" href="drm_plat/wmdrm_access_api/wmdrm_access_api.metaxml"/>
<unit bldFile="drm_plat/wmdrm_access_api/group"/>
</component>
+ <component id="wmdrm_ota_access_api" name="WM DRM OTA Access API" class="api" filter="s60">
+ <meta rel="Api" href="drm_plat/wmdrm_ota_access_api/wmdrm_ota_access_api.metaxml"/>
+ <unit bldFile="drm_plat/wmdrm_ota_access_api/group"/>
+ </component>
<component id="camese_utility_api" name="Camese Utility API" class="api" filter="s60">
<meta rel="Api" href="drm_plat/camese_utility_api/camese_utility_api.metaxml"/>
<meta rel="config">
@@ -91,11 +95,7 @@
<unit bldFile="commondrm/drmrightsmanagerui/help/group"/>
</component>
<component id="drmutility" filter="s60" name="DRM Utility">
- <meta rel="config">
- <defined condition="RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM"/>
- </meta>
- <!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
- <!--<unit bldFile="commondrm/drmutility/group"/>-->
+ <unit bldFile="commondrm/drmutility/group"/>
</component>
<component id="drmserviceapiwrapper" filter="s60" name="DRM Service API Wrapper">
<unit bldFile="commondrm/drmserviceapiwrapper/group"/>
@@ -113,9 +113,6 @@
<component id="omadrm_build" filter="s60" name="OMA DRM Build">
<unit bldFile="omadrm/group"/>
</component>
- <component id="rndcerts" filter="s60,test" name="R&D Certificates">
- <unit bldFile="omadrm/rndcerts/group"/>
- </component>
<component id="foundationcerts" filter="sf_build" name="Foundation Certificates">
<unit bldFile="omadrm/foundationcerts/group"/>
</component>
--- a/symbian4/mw/gsprofilesrv/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/gsprofilesrv/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -122,11 +122,14 @@
</component>
</collection>
<collection name="controlpanel" long-name="Control Panel" level="generic">
- <component name="controlpanel_test" long-name="Control Panel Test" filter="test,api_test">
+ <component name="controlpanel_test" long-name="Control Panel Test" filter="s60,test,qt_unit_test">
<unit bldFile="/sf/mw/gsprofilesrv/controlpanel/tsrc"/>
</component>
- <component name="controlpanel_build" long-name="Control Panel Build">
- <unit bldFile="/sf/mw/gsprofilesrv/controlpanel"/>
+ <component name="controlpanel_rom" long-name="Control Panel ROM" filter="s60">
+ <unit bldFile="/sf/mw/gsprofilesrv/controlpanel/rom"/>
+ </component>
+ <component name="controlpanel_source" long-name="Control Panel Source" filter="s60">
+ <unit bldFile="/sf/mw/gsprofilesrv/controlpanel/src"/>
</component>
</collection>
<collection name="profilesservices" long-name="Profiles Services" level="server">
--- a/symbian4/mw/gsprofilesrv/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/gsprofilesrv/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -55,14 +55,17 @@
</component>
</collection>
<collection id="controlpanel" name="Control Panel" level="generic">
- <component id="controlpanel_test" name="Control Panel Test" filter="test,api_test">
+ <component id="controlpanel_test" name="Control Panel Test" filter="s60,test,qt_unit_test">
<meta rel="testbuild">
- <group name="controlpanel_api_tests"/>
+ <group name="controlpanel_tests"/>
</meta>
- <unit bldFile="controlpanel/tsrc"/>
+ <unit bldFile="controlpanel/tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r"/>
+ </component>
+ <component id="controlpanel_rom" name="Control Panel ROM" filter="s60">
+ <unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/>
</component>
- <component id="controlpanel_build" name="Control Panel Build">
- <unit bldFile="controlpanel" qt:proFile="controlpanel.pro" qt:qmakeArgs="-r -config rom"/>
+ <component id="controlpanel_source" name="Control Panel Source" filter="s60">
+ <unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/>
</component>
</collection>
<collection id="profilesservices" name="Profiles Services" level="server">
--- a/symbian4/mw/hgwidgets/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/hgwidgets/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -77,7 +77,7 @@
<systemModel>
<layer name="mw" long-name="Middleware" levels="generic specific">
<block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
- <collection name="hgwidgets_pub" long-name="HG Widgets Platform Interfaces" level="api">
+ <collection name="hgwidgets_plat" long-name="HG Widgets Platform Interfaces" level="api">
<component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
<!-- should separate out unit -->
</component>
--- a/symbian4/mw/hgwidgets/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/hgwidgets/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
<package id="hgwidgets" name="HG Widgets" levels="framework service api">
- <collection id="hgwidgets_pub" name="HG Widgets Platform Interfaces" level="api">
+ <collection id="hgwidgets_plat" name="HG Widgets Platform Interfaces" level="api">
<component id="ganeswidgets_api" name="Ganes Widgets API" class="api" introduced="^4">
<!-- should separate out unit -->
</component>
--- a/symbian4/mw/homescreensrv/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -77,24 +77,31 @@
<systemModel>
<layer name="mw" long-name="Middleware" levels="generic specific">
<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
- <collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
- <component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/tsrc/group" filter="test,api_test"/>
+ <collection name="appfoundation" long-name="App Foundation" level="generic">
+ <component name="appfoundation_build" long-name="App Foundation Build" introduced="^4">
+ <unit bldFile="/sf/mw/homescreensrv/appfoundation"/>
</component>
- <component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group" filter="test,api_test"/>
+ </collection>
+ <collection name="hswidgetmodel" long-name="Home Screen Widget Model" level="framework">
+ <component name="hswidgetmodel_build" long-name="Home Screen Widget Model Build" introduced="^4">
+ <unit bldFile="/sf/mw/homescreensrv/hswidgetmodel"/>
</component>
- <component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group" filter="test,api_test"/>
+ </collection>
+ <collection name="contentstorage" long-name="Content Storage" level="framework">
+ <component name="cautils" long-name="Content Arsenal Utils" introduced="^4">
+ <unit bldFile="/sf/mw/homescreensrv/contentstorage/cautils"/>
+ </component>
+ <component name="contentstorage_build" long-name="Content Storage Build" introduced="^4">
+ <unit bldFile="/sf/mw/homescreensrv/contentstorage/group"/>
</component>
- <component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
+ <component name="casrv/calocalizerscanner" long-name="Content Arsenal Server Localizer Scanner" introduced="^4">
+ <unit bldFile="/sf/mw/homescreensrv/contentstorage/casrv/calocalizerscanner"/>
</component>
- <component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
+ <component name="cahandler" long-name="Content Arsenal Handler" introduced="^4">
+ <unit bldFile="/sf/mw/homescreensrv/contentstorage/cahandler"/>
+ </component>
+ <component name="caclient" long-name="Content Arsenal Client" introduced="^4">
+ <unit bldFile="/sf/mw/homescreensrv/contentstorage/caclient"/>
</component>
</collection>
<collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
@@ -117,6 +124,39 @@
<unit bldFile="/sf/mw/homescreensrv/contentpublishingsrv/group"/>
</component>
</collection>
+ <collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
+ <component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api"/>
+ <component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api"/>
+ <component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api"/>
+ <component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api"/>
+ <component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api"/>
+ </collection>
+ <collection name="screensavermodel" long-name="Screensaver Model" level="specific">
+ <component name="screensavermodel_build" long-name="Screensaver Model Build" introduced="^4">
+ <unit bldFile="/sf/mw/homescreensrv/screensavermodel"/>
+ </component>
+ </collection>
+ <collection name="hsactivityfw" long-name="Activity Framework" level="activityfw">
+ <component name="hsactivityfw_build" long-name="Activity Framework Build" introduced="^4">
+ <unit bldFile="/sf/mw/homescreensrv/activityfw"/>
+ </component>
+ </collection>
+ <collection name="hsappkeyhandler" long-name="HS Appplication Key Handler" level="server">
+ <component name="hsappkeyhandler_build" long-name="Appplication Key Handler Build" introduced="^4">
+ <unit bldFile="/sf/mw/homescreensrv/hsappkeyhandler"/>
+ </component>
+ </collection>
+ <collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
+ <component name="homescreensrvconf" long-name="Home Screen Services Config" introduced="^4" class="config">
+ <unit bldFile="/sf/mw/homescreensrv/."/>
+ </component>
+ <component name="homescreensrvrom" long-name="Home Screen Services ROM" introduced="^4">
+ <unit bldFile="/sf/mw/homescreensrv/group"/>
+ </component>
+ <component name="homescreensrv_test" long-name="Home Screen Services Test" filter="test,unit_test" introduced="^4">
+ <unit bldFile="/sf/mw/homescreensrv/tsrc"/>
+ </component>
+ </collection>
</block>
</layer>
</systemModel>
--- a/symbian4/mw/homescreensrv/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -1,31 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
<package id="homescreensrv" name="Home Screen Services" levels="plugin framework server generic specific">
- <collection id="homescreensrv_plat" name="Home Screen Services Platform Interfaces" level="specific">
- <component id="action_handler_plugin_api" name="Action Handler Plugin API" class="api" filter="s60">
- <meta rel="Api" href="homescreensrv_plat/action_handler_plugin_api/action_handler_plugin_api.metaxml"/>
- <unit bldFile="homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
- <unit bldFile="homescreensrv_plat/action_handler_plugin_api/tsrc/group" filter="test,api_test"/>
- </component>
- <component id="content_harvester_plugin_api" name="Content Harvester Plugin API" class="api" filter="s60">
- <meta rel="Api" href="homescreensrv_plat/content_harvester_plugin_api/content_harvester_plugin_api.metaxml"/>
- <unit bldFile="homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
- <unit bldFile="homescreensrv_plat/content_harvester_plugin_api/tsrc/group" filter="test,api_test"/>
- </component>
- <component id="menu_sat_interface_api" name="Menu SAT Interface API" class="api" filter="s60">
- <meta rel="Api" href="homescreensrv_plat/menu_sat_interface_api/menu_sat_interface_api.metaxml"/>
- <unit bldFile="homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
- <unit bldFile="homescreensrv_plat/menu_sat_interface_api/tsrc/group" filter="test,api_test"/>
- </component>
- <component id="sapi_contentpublishing" name="SAPI Content Publishing" class="api" filter="s60">
- <meta rel="Api" href="homescreensrv_plat/sapi_contentpublishing/sapi_contentpublishing.metaxml"/>
- <unit bldFile="homescreensrv_plat/sapi_contentpublishing/group"/>
- </component>
- <component id="sapi_actionhandler" name="SAPI Action Handler" class="api" filter="s60">
- <meta rel="Api" href="homescreensrv_plat/sapi_actionhandler/sapi_actionhandler.metaxml"/>
- <unit bldFile="homescreensrv_plat/sapi_actionhandler/group"/>
- </component>
+
+ <collection id="appfoundation" name="App Foundation" level="generic">
+ <component id="appfoundation_build" name="App Foundation Build" introduced="^4">
+ <unit bldFile="appfoundation" qt:qmakeArgs="-r" qt:proFile="appfoundation.pro"/>
+ </component>
+ </collection>
+ <collection id="hswidgetmodel" name="Home Screen Widget Model" level="framework">
+ <component id="hswidgetmodel_build" name="Home Screen Widget Model Build" introduced="^4">
+ <unit bldFile="hswidgetmodel" qt:qmakeArgs="-r" qt:proFile="hswidgetmodel.pro"/>
+ </component>
</collection>
+ <collection id="contentstorage" name="Content Storage" level="framework">
+ <component id="cautils" name="Content Arsenal Utils" introduced="^4">
+ <unit bldFile="contentstorage/cautils" qt:qmakeArgs="-r" qt:proFile="cautils.pro"/>
+ </component>
+ <component id="contentstorage_build" name="Content Storage Build" introduced="^4">
+ <unit bldFile="contentstorage/group" qt:qmakeArgs="-r" qt:proFile="group.pro"/>
+ </component>
+ <component id="casrv/calocalizerscanner" name="Content Arsenal Server Localizer Scanner" introduced="^4">
+ <unit bldFile="contentstorage/casrv/calocalizerscanner" qt:qmakeArgs="-r" qt:proFile="calocalizerscanner.pro"/>
+ </component>
+ <component id="cahandler" name="Content Arsenal Handler" introduced="^4">
+ <unit bldFile="contentstorage/cahandler" qt:qmakeArgs="-r" qt:proFile="cahandler.pro"/>
+ </component>
+ <component id="caclient" name="Content Arsenal Client" introduced="^4">
+ <unit bldFile="contentstorage/caclient" qt:qmakeArgs="-r" qt:proFile="caclient.pro"/>
+ </component>
+ </collection>
+
<collection id="contentpublishingsrv" name="Content Publishing Service" level="server">
<component id="contentpublishingdebug" filter="s60" name="Content Publishing Debug">
<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
@@ -49,5 +52,55 @@
<unit bldFile="contentpublishingsrv/group"/>
</component>
</collection>
+
+ <collection id="homescreensrv_plat" name="Home Screen Services Platform Interfaces" level="specific">
+ <component id="action_handler_plugin_api" name="Action Handler Plugin API" class="api" filter="s60">
+ <meta rel="Api" href="homescreensrv_plat/action_handler_plugin_api/action_handler_plugin_api.metaxml"/>
+ <unit base="homescreensrv_plat/action_handler_plugin_api"/>
+ </component>
+ <component id="content_harvester_plugin_api" name="Content Harvester Plugin API" class="api" filter="s60">
+ <meta rel="Api" href="homescreensrv_plat/content_harvester_plugin_api/content_harvester_plugin_api.metaxml"/>
+ <unit base="homescreensrv_plat/content_harvester_plugin_api"/>
+ </component>
+ <component id="menu_sat_interface_api" name="Menu SAT Interface API" class="api" filter="s60">
+ <meta rel="Api" href="homescreensrv_plat/menu_sat_interface_api/menu_sat_interface_api.metaxml"/>
+ <unit base="homescreensrv_plat/menu_sat_interface_api"/>
+ </component>
+ <component id="sapi_contentpublishing" name="SAPI Content Publishing" class="api" filter="s60">
+ <meta rel="Api" href="homescreensrv_plat/sapi_contentpublishing/sapi_contentpublishing.metaxml"/>
+ <unit base="homescreensrv_plat/sapi_contentpublishing"/>
+ </component>
+ <component id="sapi_actionhandler" name="SAPI Action Handler" class="api" filter="s60">
+ <meta rel="Api" href="homescreensrv_plat/sapi_actionhandler/sapi_actionhandler.metaxml"/>
+ <unit base="homescreensrv_plat/sapi_actionhandler"/>
+ </component>
+ </collection>
+ <collection id="screensavermodel" name="Screensaver Model" level="specific">
+ <component id="screensavermodel_build" name="Screensaver Model Build" introduced="^4">
+ <unit bldFile="screensavermodel" qt:qmakeArgs="-r" qt:proFile="screensavermodel.pro"/>
+ </component>
+ </collection>
+ <collection id="hsactivityfw" name="Activity Framework" level="activityfw">
+ <component id="hsactivityfw_build" name="Activity Framework Build" introduced="^4">
+ <unit bldFile="activityfw" qt:qmakeArgs="-r" qt:proFile="activityfw.pro"/>
+ </component>
+ </collection>
+ <collection id="hsappkeyhandler" name="HS Appplication Key Handler" level="server">
+ <component id="hsappkeyhandler_build" name="Appplication Key Handler Build" introduced="^4">
+ <unit bldFile="hsappkeyhandler" qt:qmakeArgs="-r" qt:proFile="hsappkeyhandler.pro"/>
+ </component>
+ </collection>
+ <collection id="homescreensrv_info" name="Home Screen Services Info" level="specific">
+ <component id="homescreensrvconf" name="Home Screen Services Config" class="config" introduced="^4">
+ <unit bldFile="." qt:qmakeArgs="-r" qt:proFile="homescreensrv_exports_to_rom.pri"/>
+ </component>
+ <component id="homescreensrvrom" name="Home Screen Services ROM" introduced="^4">
+ <unit bldFile="group"/>
+ </component>
+ <component id="homescreensrv_test" name="Home Screen Services Test" filter="test,unit_test" introduced="^4">
+ <unit bldFile="tsrc" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN" qt:proFile="tsrc.pro"/>
+ </component>
+ </collection>
</package>
</SystemDefinition>
+
--- a/symbian4/mw/imghandling/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/imghandling/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -102,7 +102,7 @@
<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
<unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
</component>
- <component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
+ <component name="thumbnailmanagerqt" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
<unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test"/>
<unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt/tsrc" filter="test,unit_test"/>
</component>
--- a/symbian4/mw/imghandling/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/imghandling/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -29,7 +29,7 @@
<component id="thumbnailmanager" filter="s60" name="Thumbnail Manager">
<unit bldFile="imagehandlingutilities/thumbnailmanager/group"/>
</component>
- <component id="thumbnailmanager" filter="s60" name="Thumbnail Manager Qt" introduced="^4">
+ <component id="thumbnailmanagerqt" filter="s60" name="Thumbnail Manager Qt" introduced="^4">
<unit bldFile="imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" qt:proFile="thumbnailmanagerqt.pro" qt:qmakeArgs="-r" filter="!test"/>
<unit bldFile="imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt/tsrc" qt:proFile="test_qtnmwrapper.pro" filter="test,unit_test"/>
</component>
--- a/symbian4/mw/inputmethods/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/inputmethods/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -90,12 +90,10 @@
</collection>
<collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
<component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
- <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
- <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group" filter="test,api_test"/>
+ <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/group"/>
</component>
<component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
- <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
- <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group" filter="test,api_test"/>
+ <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group"/>
</component>
<component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
<unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
@@ -116,8 +114,7 @@
<unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
</component>
<component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
- <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
- <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group" filter="test,api_test"/>
+ <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group"/>
</component>
</collection>
<collection name="textinput" long-name="Text Input" level="framework">
--- a/symbian4/mw/inputmethods/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/inputmethods/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -21,13 +21,11 @@
<collection id="inputmethods_plat" name="Input Methods Platform Interfaces" level="api">
<component id="pen_input_server_api" name="Pen Input Server API" class="api" filter="s60">
<meta rel="Api" href="inputmethods_plat/pen_input_server_api/pen_input_server_api.metaxml"/>
- <unit bldFile="inputmethods_plat/pen_input_server_api/group" filter="!test"/>
- <unit bldFile="inputmethods_plat/pen_input_server_api/tsrc/group" filter="test,api_test"/>
+ <unit bldFile="inputmethods_plat/pen_input_server_api/group"/>
</component>
<component id="ptiengine_hwr_api" name="PTI Engine Handwriting Recognition API" class="api" filter="s60">
<meta rel="Api" href="inputmethods_plat/ptiengine_hwr_api/ptiengine_hwr_api.metaxml"/>
- <unit bldFile="inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
- <unit bldFile="inputmethods_plat/ptiengine_hwr_api/tsrc/group" filter="test,api_test"/>
+ <unit bldFile="inputmethods_plat/ptiengine_hwr_api/group"/>
</component>
<component id="aknfep_settings_api" name="Avkon FEP Settings API" class="api" filter="s60">
<meta rel="Api" href="inputmethods_plat/aknfep_settings_api/aknfep_settings_api.metaxml"/>
@@ -61,8 +59,7 @@
</component>
<component id="aknfep_uiinterface_api" name="Avkon FEP UI Interface API" class="api" filter="s60">
<meta rel="Api" href="inputmethods_plat/aknfep_uiinterface_api/aknfep_uiinterface_api.metaxml"/>
- <unit bldFile="inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
- <unit bldFile="inputmethods_plat/aknfep_uiinterface_api/tsrc/group" filter="test,api_test"/>
+ <unit bldFile="inputmethods_plat/aknfep_uiinterface_api/group"/>
</component>
</collection>
<collection id="textinput" name="Text Input" level="framework">
--- a/symbian4/mw/metadatasrv/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/metadatasrv/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -78,34 +78,14 @@
<layer name="mw" long-name="Middleware" levels="generic specific">
<block name="metadatasrv" level="specific" long-name="Legacy Metadata Services" levels="plugin framework server generic specific">
<collection name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" level="specific">
- <component name="content_listing_framework_api" long-name="Content Listing Framework API" filter="s60" class="api">
- <!-- Leave commented out until confguration is in use
- unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>-->
- </component>
<component name="media_fetch_api" long-name="Media Fetch API" filter="s60" class="api">
<unit bldFile="/sf/mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
</component>
- <component name="metadatasrv_pub_build" long-name="Legacy Metadata Services Public Interface Build" filter="s60" class="api">
- <!-- only needed for #ifdefs, remove when confguration is in use -->
- <unit bldFile="/sf/mw/metadatasrv/metadatasrv_pub/group"/>
- </component>
</collection>
<collection name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" level="specific">
<component name="media_fetch_implementation_api" long-name="Media Fetch Implementation API" filter="s60" class="api">
<unit bldFile="/sf/mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
</component>
- <component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" filter="s60" class="api">
- <!-- Leave commented out until confguration is in use
- <unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>-->
- </component>
- <component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" filter="s60" class="api">
- <!-- Leave commented out until confguration is in use
- <unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>-->
- </component>
- <component name="metadatasrv_plat_build" long-name="Legacy Metadata Services Platform Interface Build" filter="s60" class="api">
- <!-- only needed for #ifdefs, remove when confguration is in use -->
- <unit bldFile="/sf/mw/metadatasrv/metadatasrv_plat/group"/>
- </component>
</collection>
<collection name="mediamanagementutilities" long-name="Media Management Utilities" level="generic">
<component name="mediafetch" filter="s60" long-name="Media Fetch">
--- a/symbian4/mw/metadatasrv/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/metadatasrv/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -2,45 +2,16 @@
<SystemDefinition schema="3.0.0">
<package id="metadatasrv" name="Legacy Metadata Services" levels="plugin framework server generic specific">
<collection id="metadatasrv_pub" name="Legacy Metadata Services Public Interfaces" level="specific">
- <component id="content_listing_framework_api" name="Content Listing Framework API" class="api" filter="s60">
- <meta rel="config">
- <not-defined condition="RD_MDS_2_5"/>
- </meta>
- <!-- Leave commented out until confguration is in use
- unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>-->
- </component>
<component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
<meta rel="Api" href="metadatasrv_pub/media_fetch_api/media_fetch_api.metaxml"/>
<unit bldFile="metadatasrv_pub/media_fetch_api/group"/>
</component>
- <component id="metadatasrv_pub_build" name="Legacy Metadata Services Public Interface Build" class="api" filter="s60">
- <!-- only needed for #ifdefs, remove when confguration is in use -->
- <unit bldFile="metadatasrv_pub/group"/>
- </component>
</collection>
<collection id="metadatasrv_plat" name="Legacy Metadata Services Platform Interfaces" level="specific">
<component id="media_fetch_implementation_api" name="Media Fetch Implementation API" class="api" filter="s60">
<meta rel="Api" href="metadatasrv_plat/media_fetch_implementation_api/media_fetch_implementation_api.metaxml"/>
<unit bldFile="metadatasrv_plat/media_fetch_implementation_api/group"/>
</component>
- <component id="content_listing_framework_collection_manager_api" name="Content Listing Framework Collection Manager API" class="api" filter="s60">
- <meta rel="config">
- <not-defined condition="RD_MDS_2_5"/>
- </meta>
- <!-- Leave commented out until confguration is in use
- <unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>-->
- </component>
- <component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" class="api" filter="s60">
- <meta rel="config">
- <not-defined condition="RD_MDS_2_5"/>
- </meta>
- <!-- Leave commented out until confguration is in use
- <unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>-->
- </component>
- <component id="metadatasrv_plat_build" name="Legacy Metadata Services Platform Interface Build" class="api" filter="s60">
- <!-- only needed for #ifdefs, remove when confguration is in use -->
- <unit bldFile="metadatasrv_plat/group"/>
- </component>
</collection>
<collection id="mediamanagementutilities" name="Media Management Utilities" level="generic">
<component id="mediafetch" filter="s60" name="Media Fetch">
--- a/symbian4/mw/mmappfw/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/mmappfw/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -78,10 +78,6 @@
<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>
--- a/symbian4/mw/mmappfw/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/mmappfw/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -2,10 +2,6 @@
<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
<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"/>
--- a/symbian4/mw/mmmw/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/mmmw/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -154,6 +154,9 @@
<component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
<unit bldFile="/sf/mw/mmmw/mmmw_plat/openmax_al_api/group"/>
</component>
+ <component name="system_tone_service_api" long-name="System Tone Service API" filter="s60" introduced="^4" class="api">
+ <unit bldFile="/sf/mw/mmmw/mmmw_plat/system_tone_service_api/group"/>
+ </component>
</collection>
<collection name="mmfenh" long-name="MMF Enhancements" level="generic">
<component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
@@ -208,7 +211,10 @@
<unit bldFile="/sf/mw/mmmw/mmserv/voipaudioservices/group"/>
</component>
<component name="lib3gpextparser" filter="s60" long-name="3GP Extension Metadata Parser Library">
- <unit bldFile="/sf/mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
+ <unit bldFile="/sf/mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group"/>
+ </component>
+ <component name="sts" long-name="System Tone Service" filter="s60" introduced="^4">
+ <unit bldFile="/sf/mw/mmmw/mmserv/sts/group"/>
</component>
</collection>
<collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
--- a/symbian4/mw/mmmw/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/mmmw/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -101,6 +101,9 @@
<meta rel="Api" href="mmmw_plat/openmax_al_api/openmax_al_api.metaxml"/>
<unit bldFile="mmmw_plat/openmax_al_api/group"/>
</component>
+ <component id="system_tone_service_api" name="System Tone Service API" class="api" filter="s60" introduced="^4">
+ <unit bldFile="mmmw_plat/system_tone_service_api/group"/>
+ </component>
</collection>
<collection id="mmfenh" name="MMF Enhancements" level="generic">
<component id="advancedaudiocontroller" filter="s60" name="Advanced Audio Controllers" class="plugin">
@@ -155,7 +158,10 @@
<unit bldFile="mmserv/voipaudioservices/group"/>
</component>
<component id="lib3gpextparser" filter="s60" name="3GP Extension Metadata Parser Library">
- <unit bldFile="mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
+ <unit bldFile="mmserv/metadatautility/3GPExtParserLib_stub/group"/>
+ </component>
+ <component id="sts" name="System Tone Service" filter="s60" introduced="^4">
+ <unit bldFile="mmserv/sts/group"/>
</component>
</collection>
<collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
--- a/symbian4/mw/qt/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/qt/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -78,7 +78,7 @@
<layer name="mw" long-name="Middleware" levels="generic specific">
<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
<collection name="qtconf" long-name="Qt Config" level="tool">
- <component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" class="config tool">
+ <component name="qt_deviceconfiguration" long-name="Qt Device Configuration" filter="qt_tools" introduced="^2" class="config tool">
<unit bldFile="/sf/mw/qt/src/s60installs/deviceconfiguration"/>
</component>
</collection>
--- a/symbian4/mw/qt/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/qt/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -4,7 +4,7 @@
This will be removed when sbsv2 builds are working -->
<package id="qt" name="Qt" levels="tool mw app">
<collection id="qtconf" name="Qt Config" level="tool">
- <component id="qt_deviceconfiguration" name="Qt Device Configuration" class="config tool" introduced="^2">
+ <component id="qt_deviceconfiguration" name="Qt Device Configuration" class="config tool" filter="qt_tools" introduced="^2">
<unit bldFile="src/s60installs/deviceconfiguration"/>
</component>
</collection>
--- a/symbian4/mw/qtextensions/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/qtextensions/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -78,11 +78,17 @@
<layer name="mw" long-name="Middleware" levels="generic specific">
<block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
<collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
+ <component name="qtecomplugins_build" filter="qtecomplugins" long-name="Qt ECom Plugin" purpose="development" introduced="^4" plugin="Y">
+ <unit bldFile="/sf/mw/qtextensions/qtecomplugins"/>
+ </component>
<component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
<unit bldFile="/sf/mw/qtextensions/qtecomplugins/examples"/>
</component>
</collection>
<collection name="qthighway" long-name="Qt Highway" level="app">
+ <component name="qthighway_build" filter="qthighway" long-name="Qt Highway" purpose="development" introduced="^4">
+ <unit bldFile="/sf/mw/qtextensions/qthighway"/>
+ </component>
<component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
<unit bldFile="/sf/mw/qtextensions/qthighway/examples"/>
</component>
@@ -91,11 +97,17 @@
</component>
</collection>
<collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
+ <component name="qtmobileextensions_build" filter="qtextension" long-name="Qt Mobile Extensions" purpose="development" introduced="^4">
+ <unit bldFile="/sf/mw/qtextensions/qtmobileextensions"/>
+ </component>
<component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
<unit bldFile="/sf/mw/qtextensions/qtmobileextensions/examples"/>
</component>
</collection>
- <collection name="qtmobility" long-name="Qt Mobility">
+ <collection name="qtmobility" long-name="Qt Mobility" level="mw">
+ <component name="qtmobility_build" filter="qtmobility" long-name="Qt Mobility" purpose="development" introduced="^4">
+ <unit bldFile="/sf/mw/qtextensions/qtmobility"/>
+ </component>
<component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
<unit bldFile="/sf/mw/qtextensions/qtmobility/examples"/>
</component>
@@ -103,8 +115,13 @@
<unit bldFile="/sf/mw/qtextensions/qtmobility/tests"/>
</component>
</collection>
- <collection name="qtextensions_info">
- <component name="qtextensions_build" long-name="Qt Extensions Confgure" introduced="^4" class="conf">
+ <collection name="qhbstyle" level="mw" long-name="Qt Orbit Style">
+ <component name="qhbstyle_build" long-name="Qt Orbit Style Build" introduced="^4">
+ <unit bldFile="/sf/mw/qtextensions/qhbstyle"/>
+ </component>
+ </collection>
+ <collection name="qtextensions_info" long-name="Qt Extensions Info" level="app">
+ <component name="qtextensions_conf" long-name="Qt Extensions Confgure" introduced="^4" class="conf">
<unit bldFile="/sf/mw/qtextensions/group"/>
</component>
<component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
--- a/symbian4/mw/qtextensions/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/qtextensions/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -4,45 +4,50 @@
This will be removed when sbsv2 builds are working -->
<package id="qtextensions" name="Qt Extensions" levels="tool mw app">
<collection id="qtecomplugins" name="Qt ECom Plugins" level="app">
- <component id="qtecomplugins" filter="qtecomplugins" name="Qt ECom Plugin" purpose="development" introduced="^4">
+ <component id="qtecomplugins_build" filter="qtecomplugins" name="Qt ECom Plugin" purpose="development" introduced="^4" class="plugin">
<unit bldFile="qtecomplugins" qt:proFile="qtecomplugins.pro" qt:qmakeArgs="-r"/>
</component>
- <component id="qtextensions_examples" filter="qtextensionsexamples" name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
+ <component id="qtextensions_examples" filter="qtextensionsexamples" name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
<unit bldFile="qtecomplugins/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
</component>
</collection>
<collection id="qthighway" name="Qt Highway" level="app">
- <component id="qthighway" filter="qthighway" name="Qt Highway" purpose="development" introduced="^4">
+ <component id="qthighway_build" filter="qthighway" name="Qt Highway" purpose="development" introduced="^4">
<unit bldFile="qthighway" qt:proFile="qthighway.pro" qt:qmakeArgs="-r"/>
</component>
<component id="qthighway_examples" filter="qtextensionsexamples" name="Qt Highway Examples" purpose="development" introduced="^4">
- <unit bldFile="qthighway/examples" qtproFile="examples.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="qthighway/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
</component>
<component id="qthighwaytests" filter="qtextensionstests" name="Qt Highway Tests" purpose="development" introduced="^4">
<unit bldFile="qthighway/tests" qt:proFile="tests.pro" qt:qmakeArgs="-r"/>
</component>
</collection>
<collection id="qtmobileextensions" name="Qt Mobile Extensions" level="app">
- <component id="qtmobileextensions" filter="qtextension" name="Qt Mobile Extensions" purpose="development" introduced="^4">
+ <component id="qtmobileextensions_build" filter="qtextension" name="Qt Mobile Extensions" purpose="development" introduced="^4">
<unit bldFile="qtmobileextensions" qt:proFile="qtmobileextensions.pro" qt:qmakeArgs="-r"/>
</component>
- <component id="qtmobileextensions_examples" filter="qtextensionsexamples" name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
+ <component id="qtmobileextensions_examples" filter="qtextensionsexamples" name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
<unit bldFile="qtmobileextensions/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
</component>
</collection>
- <collection id="qtmobility" name="Qt Mobility">
- <component id="qtmobility" filter="qtmobility" name="Qt Mobility" purpose="development" introduced="^4">
+ <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" name="Qt Mobility Examples" purpose="development" introduced="^4">
+ <component id="qtmobility_examples" filter="qtextensionsexamples" name="Qt Mobility Examples" purpose="development" introduced="^4">
<unit bldFile="qtmobility/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
</component>
<component id="qtmobilitytests" filter="qtextensionstests" name="Qt Extensions Tests" purpose="development" introduced="^4">
<unit bldFile="qtmobility/tests" qt:proFile="tests.pro" qt:qmakeArgs="-r"/>
</component>
</collection>
- <collection id="qtextensions_info">
- <component id="qtextensions_build" name="Qt Extensions Confgure" class="conf" introduced="^4">
+ <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"/>
+ </component>
+ </collection>
+ <collection id="qtextensions_info" name="Qt Extensions Info" level="app">
+ <component id="qtextensions_conf" name="Qt Extensions Confgure" class="conf" introduced="^4">
<unit bldFile="group"/>
</component>
<component id="qtextensions_build" name="Qt Extensions Build" introduced="^4">
--- a/symbian4/mw/searchsrv/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/searchsrv/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -135,7 +135,7 @@
<!-- move exports to own component and remove this -->
<unit bldFile="/sf/mw/searchsrv/group"/>
</component>
- <component name="searchsrv_build" long-name="Search Services Test" purpose="development" filter="test" introduced="^4">
+ <component name="searchsrv_test" long-name="Search Services Test" purpose="development" filter="test" introduced="^4">
<unit bldFile="/sf/mw/searchsrv/tsrc/CPixMWTester/group"/>
</component>
</collection>
--- a/symbian4/mw/searchsrv/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/searchsrv/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -62,7 +62,7 @@
<!-- move exports to own component and remove this -->
<unit bldFile="group"/>
</component>
- <component id="searchsrv_build" name="Search Services Test" purpose="development" filter="test" introduced="^4">
+ <component id="searchsrv_test" name="Search Services Test" purpose="development" filter="test" introduced="^4">
<unit bldFile="tsrc/CPixMWTester/group"/>
</component>
</collection>
--- a/symbian4/mw/securitysrv/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/securitysrv/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -172,7 +172,7 @@
<unit bldFile="/sf/mw/securitysrv/pkiutilities/ocsp/group" mrp="/sf/mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
</component>
</collection>
- <collection name="wim" long-name="Wireless Identity Module " level="framework">
+ <collection name="wim" long-name="Wireless Identity Module" level="framework">
<!-- collection is really a component. Need to move down a directory-->
<component name="wim_build" filter="s60" long-name="WIM Build">
<unit bldFile="/sf/mw/securitysrv/wim/group"/>
@@ -244,7 +244,7 @@
<component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
<unit bldFile="/sf/mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
</component>
- <component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
+ <component name="devencdiskutils_build" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
<unit bldFile="/sf/mw/securitysrv/devencdiskutils/group"/>
</component>
--- a/symbian4/mw/securitysrv/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/securitysrv/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -109,7 +109,7 @@
<unit bldFile="pkiutilities/ocsp/group" mrp="pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
</component>
</collection>
- <collection id="wim" name="Wireless Identity Module " level="framework">
+ <collection id="wim" name="Wireless Identity Module" level="framework">
<!-- collection is really a component. Need to move down a directory-->
<component id="wim_build" filter="s60" name="WIM Build">
<unit bldFile="wim/group"/>
@@ -181,7 +181,7 @@
<component id="devencstarter" filter="s60" name="Device Encryption Starter" introduced="^3" class="plugin">
<unit bldFile="devencdiskutils/DevEncStarter/group"/>
</component>
- <component id="devencdiskutils" filter="s60" name="Device Encryption Disk Utils Build" introduced="^3">
+ <component id="devencdiskutils_build" filter="s60" name="Device Encryption Disk Utils Build" introduced="^3">
<!-- need to split this into the above components, or remove #includes and make this a ROM component-->
<unit bldFile="devencdiskutils/group"/>
</component>
--- a/symbian4/mw/srvdiscovery/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/srvdiscovery/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -78,22 +78,22 @@
<layer name="mw" long-name="Middleware" levels="generic specific">
<block name="srvdiscovery" level="generic" long-name="Service Discovery and Usage" levels="plugin framework server generic specific">
<collection name="upnpstack_plat" long-name="UPnP Stack Platform Interfaces" level="specific">
- <component name="upnpstack_plat" long-name="UPnP Device API" purpose="optional" introduced="^3" class="api">
+ <component name="upnp_device_api" long-name="UPnP Device API" purpose="optional" introduced="^3" class="api">
<unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_device_api/group"/>
</component>
- <component name="upnpstack_plat" long-name="UPnP Common API" purpose="optional" introduced="^3" class="api">
+ <component name="upnp_common_api" long-name="UPnP Common API" purpose="optional" introduced="^3" class="api">
<unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_common_api/group"/>
</component>
- <component name="upnpstack_plat" long-name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
+ <component name="upnp_utils_api" long-name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
<unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_utils_api/group"/>
</component>
- <component name="upnpstack_plat" long-name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
+ <component name="upnp_control_point_api" long-name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
<unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_control_point_api/group"/>
</component>
- <component name="upnpstack_plat" long-name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
+ <component name="upnp_httpserver_api" long-name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
<unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_httpserver_api/group"/>
</component>
- <component name="upnpstack_plat" long-name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
+ <component name="upnp_http_transfer_api" long-name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
<unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_http_transfer_api/group"/>
</component>
</collection>
--- a/symbian4/mw/srvdiscovery/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/srvdiscovery/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -2,27 +2,27 @@
<SystemDefinition schema="3.0.0">
<package id="srvdiscovery" name="Service Discovery and Usage" levels="plugin framework server generic specific">
<collection id="upnpstack_plat" name="UPnP Stack Platform Interfaces" level="specific">
- <component id="upnpstack_plat" name="UPnP Device API" purpose="optional" introduced="^3" class="api">
+ <component id="upnp_device_api" name="UPnP Device API" purpose="optional" introduced="^3" class="api">
<meta rel="Api" href="upnp/upnpstack_plat/upnp_device_api/upnp_device_api.metaxml"/>
<unit bldFile="upnp/upnpstack_plat/upnp_device_api/group"/>
</component>
- <component id="upnpstack_plat" name="UPnP Common API" purpose="optional" introduced="^3" class="api">
+ <component id="upnp_common_api" name="UPnP Common API" purpose="optional" introduced="^3" class="api">
<meta rel="Api" href="upnp/upnpstack_plat/upnp_common_api/upnp_common_api.metaxml"/>
<unit bldFile="upnp/upnpstack_plat/upnp_common_api/group"/>
</component>
- <component id="upnpstack_plat" name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
+ <component id="upnp_utils_api" name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
<meta rel="Api" href="upnp/upnpstack_plat/upnp_utils_api/upnp_utils_api.metaxml"/>
<unit bldFile="upnp/upnpstack_plat/upnp_utils_api/group"/>
</component>
- <component id="upnpstack_plat" name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
+ <component id="upnp_control_point_api" name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
<meta rel="Api" href="upnp/upnpstack_plat/upnp_control_point_api/upnp_control_point_api.metaxml"/>
<unit bldFile="upnp/upnpstack_plat/upnp_control_point_api/group"/>
</component>
- <component id="upnpstack_plat" name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
+ <component id="upnp_httpserver_api" name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
<meta rel="Api" href="upnp/upnpstack_plat/upnp_httpserver_api/upnp_httpserver_api.metaxml"/>
<unit bldFile="upnp/upnpstack_plat/upnp_httpserver_api/group"/>
</component>
- <component id="upnpstack_plat" name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
+ <component id="upnp_http_transfer_api" name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
<meta rel="Api" href="upnp/upnpstack_plat/upnp_http_transfer_api/upnp_http_transfer_api.metaxml"/>
<unit bldFile="upnp/upnpstack_plat/upnp_http_transfer_api/group"/>
</component>
--- a/symbian4/mw/uitools/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/uitools/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -83,10 +83,10 @@
</component>
</collection>
<collection name="uitools_plat" long-name="UI Tools Platform Interfaces" level="if">
- <component name="cdl_api" long-name="CDL API" filter="s60" class="api">
+ <component name="uitools_cdl_api" long-name="CDL API" filter="s60" class="api">
<unit bldFile="/sf/mw/uitools/uitools_plat/cdl_api/group"/>
</component>
- <component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
+ <component name="uitools_layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
<unit bldFile="/sf/mw/uitools/uitools_plat/layout_system_private_api/group"/>
</component>
</collection>
@@ -103,9 +103,6 @@
</component>
</collection>
<collection name="gfxtools" long-name="Graphics Tools" level="tool">
- <component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
- <unit bldFile="/sf/mw/uitools/gfxtools/gditools/group"/>
- </component>
<component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
<unit bldFile="/sf/mw/uitools/gfxtools/color/group"/>
</component>
--- a/symbian4/mw/uitools/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/uitools/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -8,11 +8,11 @@
</component>
</collection>
<collection id="uitools_plat" name="UI Tools Platform Interfaces" level="if">
- <component id="cdl_api" name="CDL API" class="api" filter="s60">
+ <component id="uitools_cdl_api" name="CDL API" class="api" filter="s60">
<meta rel="Api" href="uitools_plat/cdl_api/cdl_api.metaxml"/>
<unit bldFile="uitools_plat/cdl_api/group"/>
</component>
- <component id="layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
+ <component id="uitools_layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
<meta rel="Api" href="uitools_plat/layout_system_private_api/layout_system_private_api.metaxml"/>
<unit bldFile="uitools_plat/layout_system_private_api/group"/>
</component>
@@ -30,9 +30,6 @@
</component>
</collection>
<collection id="gfxtools" name="Graphics Tools" level="tool">
- <component id="gditools" filter="s60" name="GDI Tools" target="desktop">
- <unit bldFile="gfxtools/gditools/group"/>
- </component>
<component id="color" filter="s60" name="Bitmap Colour Palette" target="desktop">
<unit bldFile="gfxtools/color/group"/>
</component>
--- a/symbian4/mw/videoutils/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/videoutils/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -81,32 +81,17 @@
<component name="videoscheduler_api" long-name="Video Scheduler API" filter="s60" class="api">
<unit bldFile="/sf/mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
</component>
- <component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
- <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
- </component>
<component name="videoplayer_constants_api" long-name="Videoplayer Constants API" filter="s60" class="api">
<unit bldFile="/sf/mw/videoutils/videoutils_plat/videoplayer_constants_api/group"/>
</component>
</collection>
<collection name="videoscheduler" long-name="Video Scheduler" level="util">
+ <!-- don't build these -->
<component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
- <unit bldFile="/sf/mw/videoutils/videoscheduler/schedulerclient/group"/>
+ <unit bldFile="/sf/mw/videoutils/videoscheduler/schedulerclient/group" filter="test"/>
</component>
<component name="schedulerserver" filter="s60" long-name="Video Scheduler Server">
- <unit bldFile="/sf/mw/videoutils/videoscheduler/schedulerserver/group"/>
- </component>
- </collection>
- <collection name="videoconnutility" long-name="Video Connection Utility" level="util">
- <component name="connutilpsworker" filter="s60" long-name="Connection Utility Publish and Subscribe Worker">
- <unit bldFile="/sf/mw/videoutils/videoconnutility/connutilpsworker/group"/>
- </component>
- <component name="video_connutility" filter="s60" long-name="Video Connection Utility">
- <unit bldFile="/sf/mw/videoutils/videoconnutility/connutility/group"/>
- </component>
- </collection>
- <collection name="videoutils_info" long-name="Video Utils Info" level="if">
- <component name="videoutils_test" filter="s60,test,api_test" long-name="Video Utils Tests">
- <unit bldFile="/sf/mw/videoutils/tsrc/group"/>
+ <unit bldFile="/sf/mw/videoutils/videoscheduler/schedulerserver/group" filter="test"/>
</component>
</collection>
</block>
--- a/symbian4/mw/videoutils/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/videoutils/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -6,34 +6,18 @@
<meta rel="Api" href="videoutils_plat/videoscheduler_api/videoscheduler_api.metaxml"/>
<unit bldFile="videoutils_plat/videoscheduler_api/group"/>
</component>
- <component id="videoconnutility_api" name="Video Connection Utility API" class="api" filter="s60">
- <meta rel="Api" href="videoutils_plat/videoconnutility_api/videoconnutility_api.metaxml"/>
- <unit bldFile="videoutils_plat/videoconnutility_api/group"/>
- </component>
<component id="videoplayer_constants_api" name="Videoplayer Constants API" class="api" filter="s60">
<meta rel="Api" href="videoutils_plat/videoplayer_constants_api/videoplayer_constants_api.metaxml"/>
<unit bldFile="videoutils_plat/videoplayer_constants_api/group"/>
</component>
</collection>
<collection id="videoscheduler" name="Video Scheduler" level="util">
+ <!-- don't build these -->
<component id="schedulerclient" filter="s60" name="Video Scheduler Client">
- <unit bldFile="videoscheduler/schedulerclient/group"/>
+ <unit bldFile="videoscheduler/schedulerclient/group" filter="test"/>
</component>
<component id="schedulerserver" filter="s60" name="Video Scheduler Server">
- <unit bldFile="videoscheduler/schedulerserver/group"/>
- </component>
- </collection>
- <collection id="videoconnutility" name="Video Connection Utility" level="util">
- <component id="connutilpsworker" filter="s60" name="Connection Utility Publish and Subscribe Worker">
- <unit bldFile="videoconnutility/connutilpsworker/group"/>
- </component>
- <component id="video_connutility" filter="s60" name="Video Connection Utility">
- <unit bldFile="videoconnutility/connutility/group"/>
- </component>
- </collection>
- <collection id="videoutils_info" name="Video Utils Info" level="if">
- <component id="videoutils_test" filter="s60,test,api_test" name="Video Utils Tests">
- <unit bldFile="tsrc/group"/>
+ <unit bldFile="videoscheduler/schedulerserver/group" filter="test"/>
</component>
</collection>
</package>
--- a/symbian4/mw/vpnclient/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/vpnclient/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -84,7 +84,7 @@
</component>
</collection>
<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
- <component name="vpnapi" filter="s60" long-name="VPN API">
+ <component name="vpnapi_impl" filter="s60" long-name="VPN API">
<unit bldFile="/sf/mw/vpnclient/vpnapiimpl/group"/>
</component>
</collection>
--- a/symbian4/mw/vpnclient/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/vpnclient/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -9,7 +9,7 @@
</component>
</collection>
<collection id="vpnapiimpl" name="VPN API Implementation" level="api">
- <component id="vpnapi" filter="s60" name="VPN API">
+ <component id="vpnapi_impl" filter="s60" name="VPN API">
<unit bldFile="vpnapiimpl/group"/>
</component>
</collection>
--- a/symbian4/mw/web/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/web/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -119,9 +119,6 @@
<component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
<unit bldFile="/sf/mw/web/web_plat/download_mgr_client_api_extn/group"/>
</component>
- <component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
- <unit bldFile="/sf/mw/web/web_plat/download_path_plugin_api/group"/>
- </component>
<component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
<unit bldFile="/sf/mw/web/web_plat/feeds_engine_api/group"/>
</component>
@@ -134,6 +131,9 @@
<component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
<unit bldFile="/sf/mw/web/web_plat/recent_url_store_api/group"/>
</component>
+ <component name="rt_gesturehelper_api" long-name="Runtime Gesture Helper API" filter="s60" introduced="^4" class="api">
+ <unit bldFile="/sf/mw/web/web_plat/rt_gesturehelper_api/group"/>
+ </component>
<component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
<unit bldFile="/sf/mw/web/web_plat/scheme_handler_plugin_api/group"/>
</component>
@@ -282,21 +282,18 @@
</collection>
<collection name="widgets" long-name="Web Widget Framework" level="generic">
<!-- the following units can be uncommented when configuration is put in place -->
- <component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
+ <component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y" class="placeholder">
<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
</component>
- <component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
+ <component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y" class="placeholder">
<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
</component>
- <component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
+ <component name="widgetlauncher" filter="s60" long-name="Widget Launcher" class="placeholder">
<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
</component>
- <component name="widgetapp" filter="s60" long-name="Widget UI">
+ <component name="widgetapp" filter="s60" long-name="Widget UI" class="placeholder">
<!--<unit bldFile="widgets/widgetapp/group"/>-->
</component>
- <component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
- <!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
- </component>
<component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
</component>
--- a/symbian4/mw/web/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/web/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -56,9 +56,6 @@
<meta rel="Api" href="web_plat/download_mgr_client_api_extn/download_mgr_client_api_extn.metaxml"/>
<unit bldFile="web_plat/download_mgr_client_api_extn/group"/>
</component>
- <component id="download_path_plugin_api" name="Download Path Plugin API" class="api" filter="s60" introduced="^3">
- <unit bldFile="web_plat/download_path_plugin_api/group"/>
- </component>
<component id="feeds_engine_api" name="Feeds Engine API" class="api" filter="s60">
<meta rel="Api" href="web_plat/feeds_engine_api/feeds_engine_api.metaxml"/>
<unit bldFile="web_plat/feeds_engine_api/group"/>
@@ -78,6 +75,10 @@
<meta rel="Api" href="web_plat/recent_url_store_api/recent_url_store_api.metaxml"/>
<unit bldFile="web_plat/recent_url_store_api/group"/>
</component>
+ <component id="rt_gesturehelper_api" name="Runtime Gesture Helper API" class="api" filter="s60" introduced="^4">
+ <meta rel="Api" href="web_plat/rt_gesturehelper_api/rt_gesturehelper_api.metaxml"/>
+ <unit bldFile="web_plat/rt_gesturehelper_api/group"/>
+ </component>
<component id="scheme_handler_plugin_api" name="Scheme Handler Plugin API" class="api" filter="s60">
<meta rel="Api" href="web_plat/scheme_handler_plugin_api/scheme_handler_plugin_api.metaxml"/>
<unit bldFile="web_plat/scheme_handler_plugin_api/group"/>
@@ -235,38 +236,21 @@
<collection id="widgets" name="Web Widget Framework" level="generic">
<meta rel="config">
<defined condition="RD_BROWSER_WIDGETS"/>
+ <defined condition="__WEB_WIDGETS"/>
</meta>
<!-- the following units can be uncommented when configuration is put in place -->
<component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
- <meta rel="config">
- <defined condition="__WEB_WIDGETS"/>
- </meta>
<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
</component>
<component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
- <meta rel="config">
- <defined condition="__WEB_WIDGETS"/>
- </meta>
<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
</component>
<component id="widgetlauncher" filter="s60" name="Widget Launcher">
- <meta rel="config">
- <defined condition="__WEB_WIDGETS"/>
- </meta>
<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
</component>
<component id="widgetapp" filter="s60" name="Widget UI">
- <meta rel="config">
- <defined condition="__WEB_WIDGETS"/>
- </meta>
<!--<unit bldFile="widgets/widgetapp/group"/>-->
</component>
- <component id="widgetsidchecker" filter="s60" name="Widget SID Checker" introduced="^3">
- <meta rel="config">
- <defined condition="APP_SID_CHECK_SUPPORT_FF"/>
- </meta>
- <!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
- </component>
<component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
<meta rel="config">
<defined condition="RD_WIDGET_PREINSTALLER"/>
--- a/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -178,6 +178,7 @@
<package id="appinstall" level="generic" tech-domain="rt" href="../../../../mw/appinstall/package_definition_3.0.xml"/>
<package id="serviceapifw" level="specific" tech-domain="rt" href="../../../../mw/serviceapifw/package_definition_3.0.xml"/>
<package id="serviceapi" level="specific" tech-domain="rt" href="../../../../mw/serviceapi/package_definition_3.0.xml"/>
+ <package id="browser" level="specific" tech-domain="rt" href="../../../../mw/browser/package_definition_3.0.xml"/>
<package id="web" level="specific" tech-domain="rt" href="../../../../mw/web/package_definition_3.0.xml"/>
<package id="websrv" level="generic" tech-domain="rt" href="../../../../mw/websrv/package_definition_3.0.xml"/>
<package id="webruntime" level="specific" tech-domain="rt" href="../../../../mw/webruntime/package_definition_3.0.xml"/>
@@ -187,6 +188,7 @@
<layer id="app" name="Applications" levels="services apps">
<package id="location" level="apps" tech-domain="lo" href="../../../../app/location/package_definition_3.0.xml"/> <!-- pending removal -->
<package id="phone" level="apps" span="2" tech-domain="vc" href="../../../../app/phone/package_definition_3.0.xml"/>
+ <package id="recents" level="apps" tech-domain="vc" href="../../../../app/recents/package_definition_3.0.xml"/>
<package id="settingsuis" level="services" tech-domain="dm" href="../../../../app/settingsuis/package_definition_3.0.xml"/>
<package id="contentcontrol" level="services" tech-domain="dm" href="../../../../app/contentcontrol/package_definition_3.0.xml"/>
<package id="firsttimeuse" level="apps" tech-domain="dm" href="../../../../app/firsttimeuse/package_definition_3.0.xml"/>
@@ -208,8 +210,8 @@
<package id="internetradio" level="apps" tech-domain="ma" href="../../../../app/internetradio/package_definition_3.0.xml"/>
<package id="podcatcher" level="apps" tech-domain="ma" href="../../../../app/podcatcher/package_definition_3.0.xml"/>
<package id="homescreen" level="apps" tech-domain="ui" href="../../../../app/homescreen/package_definition_3.0.xml"/>
- <package id="homescreentools" level="services" tech-domain="ui" href="../../../../app/homescreentools/package_definition_3.0.xml"/>
<package id="jrt" level="services" tech-domain="rt" href="../../../../app/jrt/package_definition_3.0.xml"/>
+ <package id="browserui" level="services" tech-domain="rt" href="../../../../app/browserui/package_definition_3.0.xml"/>
<package id="conntools" level="services" tech-domain="dc" href="../../../../app/conntools/package_definition_3.0.xml"/>
<package id="rndtools" level="services" tech-domain="to" href="../../../../app/rndtools/package_definition_3.0.xml"/>
<package id="helps" level="apps" span="2" tech-domain="ui" href="../../../../app/helps/package_definition_3.0.xml"/>
--- a/symbian4/os/deviceplatformrelease/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -95,7 +95,21 @@
<unit bldFile="/sf/os/deviceplatformrelease/helps_loc2/group"/>
</component>
</collection>
- <collection name="sf_config" long-name="SF Config" level="mid">
+ <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
+ <component name="cedarutils" long-name="Cedar Utils" purpose="development">
+ <unit mrp="/sf/os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+ </component>
+ <component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
+ <unit mrp="/sf/os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+ </component>
+ </collection>
+ <collection name="foundation_system" long-name="Foundation System" level="top">
+ <component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
+ </component>
+ <component name="sf_config" long-name="Foundation Config" introduced="^4">
+ <unit bldFile="/sf/os/deviceplatformrelease/foundation_system/sf_config/CI_external/group"/>
+ </component>
<component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
<component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
<!-- will should give the id/path something more unique than cenrep -->
@@ -108,28 +122,6 @@
<unit bldFile="/sf/os/deviceplatformrelease/foundation_system/sf_config/rombuild/zoom2/group"/>
</component>
</collection>
- <!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
- <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
- <component name="cedarutils" long-name="Cedar Utils" purpose="development">
- <unit mrp="/sf/os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
- </component>
- <component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config">
- <unit mrp="/sf/os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
- </component>
- <component name="foundation_s60_packages" long-name="Foundation S60 Packages" introduced="^3" deprecated="^3" purpose="development" class="config PC">
- <unit mrp="/sf/os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
- </component>
- </collection>
- <collection name="foundation_system" long-name="Foundation System" level="top">
- <component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
- <unit mrp="/sf/os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
- </component>
- </collection>
<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
<component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="^2" purpose="development" class="config PC">
<unit mrp="/sf/os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
--- a/symbian4/os/deviceplatformrelease/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -21,7 +21,21 @@
</component>
</collection>
- <collection id="sf_config" name="SF Config" level="mid">
+ <collection id="symbianosbld" name="Symbian OS Build" level="bld">
+ <component id="cedarutils" name="Cedar Utils" purpose="development">
+ <unit mrp="symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+ </component>
+ <component id="productionbldcbrconfig" name="Production Build CBR Config" filter="gt" purpose="development" class="config">
+ <unit mrp="symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+ </component>
+ </collection>
+ <collection id="foundation_system" name="Foundation System" level="top">
+ <component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="foundation_system/system_model/system_model.mrp"/>
+ </component>
+ <component id="sf_config" name="Foundation Config" introduced="^4">
+ <unit bldFile="foundation_system/sf_config/CI_external/group"/>
+ </component>
<component id="config" filter="s60" name="Config" class="config" purpose="development">
<unit base="foundation_system/sf_config/config"/>
</component>
@@ -36,28 +50,6 @@
<unit bldFile="foundation_system/sf_config/rombuild/zoom2/group"/>
</component>
</collection>
- <!-- should be located locally in buildplatforms/group
- <collection id="s60bld" name="S60 Build">
- <component id="buildplatforms" filter="s60" name="Build Platforms">
- <unit bldFile="/tools/buildplatforms/group"/>
- </component>
- </collection>-->
- <collection id="symbianosbld" name="Symbian OS Build" level="bld">
- <component id="cedarutils" name="Cedar Utils" purpose="development">
- <unit mrp="symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
- </component>
- <component id="productionbldcbrconfig" name="Production Build CBR Config" filter="gt" purpose="development" class="config">
- <unit mrp="symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
- </component>
- <component id="foundation_s60_packages" name="Foundation S60 Packages" class="config" introduced="^3" deprecated="^3" purpose="development" target="desktop">
- <unit mrp="symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
- </component>
- </collection>
- <collection id="foundation_system" name="Foundation System" level="top">
- <component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
- <unit mrp="foundation_system/system_model/system_model.mrp"/>
- </component>
- </collection>
<collection id="deviceplatformrelease_info" name="Device Platform Release Info" level="top">
<component id="deviceplatformrelease_metadata" name="Device Platform Release Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
--- a/symbian4/os/devicesrv/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/devicesrv/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -286,13 +286,13 @@
<unit bldFile="commonservices/platformenv/group"/>
</component>
<component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5">
- <meta rel="config"> <!-- how can this be mandatory if it can be configured out? -->
+ <meta rel="config">
<defined condition="SYMBIAN_BAFL_SYSUTIL"/>
</meta>
<unit bldFile="commonservices/sysutil/group" mrp="commonservices/sysutil/group/sysutil.mrp"/>
</component>
<component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5">
- <meta rel="config"> <!-- how can this be mandatory if it can be configured out? -->
+ <meta rel="config">
<defined condition="SYMBIAN_BAFL_SYSUTIL"/>
</meta>
<unit bldFile="commonservices/activitymanager/group" mrp="commonservices/activitymanager/group/activitymanager.mrp"/>
@@ -363,7 +363,7 @@
<meta rel="config">
<defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
</meta>
- <!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
+ <!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
may need to -->
<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
</component>
@@ -377,7 +377,7 @@
<unit bldFile="resourcemgmt/hwresourcesmgrconfig" mrp="resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
</component>
<component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
- <!-- Move exports to a self-contained component.
+ <!-- Move exports to a self-contained component.
This needs to be kept around until configuration is in place -->
<unit bldFile="resourcemgmt/group"/>
</component>
@@ -414,7 +414,7 @@
<unit bldFile="sysstatemgmt/systemstarter/group" mrp="sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
</component>
<component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory">
- <meta rel="config"> <!-- how can this be mandatory if it can be configured out? -->
+ <meta rel="config">
<defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
</meta>
<unit bldFile="sysstatemgmt/systemstatemgr/group" mrp="sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
--- a/symbian4/os/imagingext/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/imagingext/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -103,6 +103,9 @@
<component name="ecam_face_tracking_custom_api" long-name="ECam Face Tracking Custom API" filter="s60" class="api">
<unit bldFile="/sf/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
</component>
+ <component name="ecam_use_case_hint_custom_api" long-name="ECam Use Case Hint Custom API" filter="s60" introduced="^4" class="api">
+ <unit bldFile="/sf/os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
+ </component>
</collection>
<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
<component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
--- a/symbian4/os/imagingext/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/imagingext/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -34,6 +34,10 @@
<meta rel="Api" href="imagingext_plat/ecam_face_tracking_custom_api/ecam_face_tracking_custom_api.metaxml"/>
<unit bldFile="imagingext_plat/ecam_face_tracking_custom_api/group"/>
</component>
+ <component id="ecam_use_case_hint_custom_api" class="api" name="ECam Use Case Hint Custom API" filter="s60" introduced="^4">
+ <meta rel="Api" href="imagingext_plat/ecam_use_case_hint_custom_api/ecam_use_case_hint_custom_api.metaxml"/>
+ <unit bldFile="imagingext_plat/ecam_use_case_hint_custom_api/group"/>
+ </component>
</collection>
<collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
<component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
--- a/symbian4/os/lbs/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/lbs/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -93,8 +93,8 @@
<component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="^3" purpose="optional" plugin="Y">
<unit bldFile="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
</component>
- <component name="locationapesuplpsy" long-name="APE SUPL PSY" introduced="^3" purpose="optional" filter="s60" plugin="Y">
- <unit bldFile="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group"/>
+ <component name="locationapesuplpsy" long-name="APE SUPL Positioning Module" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
</component>
</collection>
<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
@@ -139,10 +139,22 @@
<component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
<unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
</component>
+ <component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
+ <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+ <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+ </component>
+ <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
+ <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+ <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+ </component>
<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
<unit bldFile="/sf/os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
</component>
+ <component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
+ <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+ <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+ </component>
</collection>
<collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
<component name="lbshaitest" long-name="Location HAI Tests" introduced="^2" purpose="development" filter="test">
--- a/symbian4/os/lbs/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/lbs/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -17,8 +17,8 @@
<component id="networkpositioningmodule" name="Network Positioning Module" introduced="^3" purpose="optional" class="plugin">
<unit bldFile="datasourcemodules/networkpositioningmodule/group" mrp="datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
</component>
- <component id="locationapesuplpsy" name="APE SUPL PSY" introduced="^3" purpose="optional" class="plugin" filter="s60">
- <unit bldFile="datasourcemodules/locationapesuplpsy/group"/>
+ <component id="locationapesuplpsy" name="APE SUPL Positioning Module" introduced="^3" purpose="optional" class="plugin">
+ <unit bldFile="datasourcemodules/locationapesuplpsy/group" mrp="datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
</component>
</collection>
<collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
@@ -63,10 +63,22 @@
<component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
<unit bldFile="networkprotocolmodules/privacyprotocolmodule/group" mrp="networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
</component>
+ <component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" class="plugin">
+ <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+ <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+ </component>
+ <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+ <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+ <unit bldFile="networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+ </component>
<component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
<unit bldFile="networkprotocolmodules/common/suplrrlpasn1/group"/>
</component>
+ <component id="suplrrlpprotocol" name="SUPL RRLP Protocol Module">
+ <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+ <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+ </component>
</collection>
<collection id="lbsapitest" name="Location API Tests" level="application-interface">
<component id="lbshaitest" name="Location HAI Tests" introduced="^2" purpose="development" filter="test">
--- a/symbian4/os/mm/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/mm/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -499,7 +499,7 @@
<component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
<unit bldFile="/sf/os/mm/devsound/devsoundrefplugin/group" mrp="/sf/os/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">
+ <component name="btdevsound" long-name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" deprecated="^4" plugin="Y">
<unit bldFile="/sf/os/mm/devsound/sounddevbt/group" mrp="/sf/os/mm/devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
</component>
<component name="a3ftrace" long-name="A3F Trace Utility" introduced="^2" purpose="development">
--- a/symbian4/os/mm/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/mm/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -502,7 +502,7 @@
<component id="refdevsound" name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
<unit bldFile="devsound/devsoundrefplugin/group" mrp="devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
</component>
- <component id="btdevsound" name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" class="plugin">
+ <component id="btdevsound" name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" class="plugin" deprecated="^4">
<unit bldFile="devsound/sounddevbt/group" mrp="devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
</component>
<component id="a3ftrace" name="A3F Trace Utility" introduced="^2" purpose="development">
--- a/symbian4/os/networkingsrv/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/networkingsrv/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -139,7 +139,7 @@
</component>
</collection>
<collection name="networkcontrol" long-name="Network Control" level="plugin">
- <component name="qosfwconfig" long-name="QoS Framework Config" introduced="7.0s" purpose="optional" filter="test" class="config">
+ <component name="qosfwconfig" long-name="QoS Framework Config" introduced="7.0s" purpose="optional" filter="test" deprecated="^4" class="config">
<unit mrp="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp" bldFile="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/data"/>
</component>
<component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional">
--- a/symbian4/os/networkingsrv/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/networkingsrv/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -63,7 +63,7 @@
</component>
</collection>
<collection id="networkcontrol" name="Network Control" level="plugin">
- <component id="qosfwconfig" name="QoS Framework Config" introduced="7.0s" purpose="optional" class="config" filter="test">
+ <component id="qosfwconfig" name="QoS Framework Config" introduced="7.0s" purpose="optional" class="config" filter="test" deprecated="^4">
<unit mrp="networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp" bldFile="networkcontrol/qosfwconfig/qos/data"/>
</component>
<component id="qoslib" name="QoS Library" introduced="7.0s" purpose="optional">
--- a/symbian4/os/ossrv/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/ossrv/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -342,7 +342,7 @@
<component name="dbus_api" long-name="Dbus API" filter="s60" class="api">
<unit bldFile="/sf/os/ossrv/ossrv_pub/dbus/group"/>
</component>
- <component name="dbus-glib" long-name="Dbus-glib API" filter="s60" class="api">
+ <component name="dbus-glib_api" long-name="D-Bus GLib API" filter="s60" class="api">
<unit bldFile="/sf/os/ossrv/ossrv_pub/dbus-glib/group"/>
</component>
</collection>
--- a/symbian4/os/ossrv/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/ossrv/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
- <package id="ossrv" name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+ <package id="ossrv" name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
<collection id="ossrv_pub" name="Generic OS Services Public Interfaces" level="utilities">
<component id="boost_apis" name="Boost APIs" class="api" filter="s60">
<meta rel="Api" href="ossrv_pub/boost_apis/boost_apis.metaxml"/>
@@ -353,7 +353,7 @@
<component id="dbus_api" name="Dbus API" class="api" filter="s60">
<unit bldFile="ossrv_pub/dbus/group"/>
</component>
- <component id="dbus-glib" name="Dbus-glib API" class="api" filter="s60">
+ <component id="dbus-glib_api" name="D-Bus GLib API" class="api" filter="s60">
<unit bldFile="ossrv_pub/dbus-glib/group"/>
</component>
</collection>
@@ -362,137 +362,140 @@
<unit bldFile="ossrv_plat/libutils/group"/>
</component>
</collection>
- <collection id="stdlibs" name="Standard Libraries" level="translation">
- <component id="libz" filter="s60" name="Z Compression Library">
- <unit bldFile="stdlibs/libz/group"/>
- </component>
- <component id="libcrypt" filter="s60" name="Crypt Library">
- <unit bldFile="stdlibs/libcrypt/group"/>
- </component>
- </collection>
- <collection id="ssl" name="SSL" level="data-services">
- <component id="libcrypto" filter="s60" name="Crypto Library">
- <unit bldFile="ssl/libcrypto/group"/>
- </component>
- <component id="libssl" filter="s60" purpose="development" name="SSL Library">
- <unit bldFile="ssl/libssl/group"/>
- </component>
- </collection>
- <collection id="glib" name="GLib" level="utilities">
- <component id="glibbackend" filter="s60" name="GLib Backend">
- <unit bldFile="glib/build/symbian/glibbackend/group"/>
- <!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
- </component>
- <component id="libglib" filter="s60" name="GLib Library">
- <unit bldFile="glib/build/symbian/glib/group"/>
- <!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
- </component>
- <component id="libgthread" filter="s60" name="Libg Thread">
- <unit bldFile="glib/build/symbian/gthread/group"/>
- <!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
- </component>
- <component id="libgmodule" filter="s60" name="Libg Module">
- <unit bldFile="glib/build/symbian/gmodule/group"/>
- <!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
- </component>
- <component id="libgobject" filter="s60" name="Libg Object">
- <unit bldFile="glib/build/symbian/gobject/group"/>
- <!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
- </component>
- </collection>
- <collection id="stdcpp" name="C++ Standard Library" level="translation">
- <!-- collection is really a component. Needs to be moved down a directory -->
- <component id="stdcpp_build" filter="s60" name="Stdcpp">
- <unit bldFile="stdcpp/group"/>
- </component>
- </collection>
- <collection id="ofdbus" name="Open Foundation D-Bus" level="utilities">
- <component id="dbus" filter="s60" name="D-Bus">
- <unit bldFile="ofdbus/dbus/group"/>
- </component>
- <component id="dbus-glib" filter="s60" name="D-Bus GLib">
- <unit bldFile="ofdbus/dbus-glib/group"/>
- </component>
- <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
- <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
+ <collection id="stdlibs" name="Standard Libraries" level="translation">
+ <component id="libz" filter="s60" name="Z Compression Library">
+ <unit bldFile="stdlibs/libz/group"/>
+ </component>
+ <component id="libcrypt" filter="s60" name="Crypt Library">
+ <unit bldFile="stdlibs/libcrypt/group"/>
+ </component>
+ </collection>
+ <collection id="ssl" name="SSL" level="data-services">
+ <component id="libcrypto" filter="s60" name="Crypto Library">
+ <unit bldFile="ssl/libcrypto/group"/>
+ </component>
+ <component id="libssl" filter="s60" purpose="development" name="SSL Library">
+ <unit bldFile="ssl/libssl/group"/>
+ </component>
+ </collection>
+ <collection id="glib" name="GLib" level="utilities">
+ <component id="glibbackend" filter="s60" name="GLib Backend">
+ <unit bldFile="glib/build/symbian/glibbackend/group"/>
+ <!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
+ </component>
+ <component id="libglib" filter="s60" name="GLib Library">
+ <unit bldFile="glib/build/symbian/glib/group"/>
+ <!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
+ </component>
+ <component id="libgthread" filter="s60" name="Libg Thread">
+ <unit bldFile="glib/build/symbian/gthread/group"/>
+ <!-- Move to here: <unit bldFile="glib/libgthread/group"/> -->
+ </component>
+ <component id="libgmodule" filter="s60" name="Libg Module">
+ <unit bldFile="glib/build/symbian/gmodule/group"/>
+ <!-- Move to here: <unit bldFile="glib/libgmodule/group"/> -->
+ </component>
+ <component id="libgobject" filter="s60" name="Libg Object">
+ <unit bldFile="glib/build/symbian/gobject/group"/>
+ <!-- Move to here: <unit bldFile="glib/libgobject/group"/> -->
+ </component>
+ </collection>
+ <collection id="stdcpp" name="C++ Standard Library" level="translation">
+ <!-- collection is really a component. Needs to be moved down a directory -->
+ <component id="stdcpp_build" filter="s60" name="Stdcpp">
+ <unit bldFile="stdcpp/group"/>
+ </component>
+ </collection>
+ <collection id="ofdbus" name="Open Foundation D-Bus" level="utilities">
+ <component id="dbus" filter="s60" name="D-Bus">
+ <unit bldFile="ofdbus/dbus/group"/>
+ </component>
+ <component id="dbus-glib" filter="s60" name="D-Bus GLib">
+ <unit bldFile="ofdbus/dbus-glib/group"/>
+ </component>
+ <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
+ <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
Consider moving IBY file to one of the above as well and removing this component entirely -->
- <unit bldFile="ofdbus/group"/>
- </component>
- </collection>
- <collection id="utilitylibraries" name="Utility Libraries" level="encoding">
- <component id="libutils" filter="s60" name="Utility Library">
- <unit bldFile="utilitylibraries/libutils/group"/>
- </component>
- </collection>
- <collection id="genericservices" name="Generic Services" level="utilities">
- <component id="s60compatibilityheaders" name="S60 Compatibility Headers" filter="gt" purpose="optional">
- <unit version="tb101sf" bldFile="genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp"/>
- </component>
- <component id="mimerecognitionfw" name="MIME Recognition Framework" purpose="mandatory">
- <unit bldFile="genericservices/mimerecognitionfw/group" mrp="genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
- </component>
- <component id="systemagent" name="System Agent" introduced="9.0" purpose="mandatory">
- <unit bldFile="genericservices/systemagent/group" mrp="genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
- </component>
- <component id="taskscheduler" name="Task Scheduler" introduced="6.0" purpose="optional">
- <unit bldFile="genericservices/taskscheduler/group" mrp="genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
- </component>
- <component id="activebackupclient" name="Active Backup Client" purpose="optional">
- <unit bldFile="genericservices/activebackupclient/group" mrp="genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
- </component>
- <component id="syslibsdocs" name="Syslibs Documentation" purpose="development" class="doc">
- <unit mrp="genericservices/syslibsdocs/syslibs_documentation.mrp"/>
- </component>
- <component id="httputils" name="HTTP Utilities Library" introduced="6.2" purpose="optional">
- <unit bldFile="genericservices/httputils/group" mrp="genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
- </component>
- </collection>
- <collection id="syslibsapitest" name="SysLibs API Tests" level="utilities">
- <component id="syslibssvs" name="Syslibs Verfication Suite" introduced="^2" purpose="development" filter="test">
- <unit mrp="syslibsapitest/syslibssvs/group/syslibssvs.mrp" bldFile="syslibsapitest/syslibssvs/group"/>
- </component>
- </collection>
- <collection id="compressionlibs" name="Compression Libraries" level="data-services">
- <component id="ziplib" name="Zip Compression Library" introduced="6.0" purpose="mandatory">
- <unit bldFile="compressionlibs/ziplib/group" mrp="compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
- </component>
- </collection>
- <collection id="genericopenlibs" name="Generic Open Libraries" level="translation">
- <component id="cstdlib" name="C Standard Library" introduced="ER5" purpose="optional">
- <unit bldFile="genericopenlibs/cstdlib/group" mrp="genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
- </component>
- <component id="cppstdlib" name="C++ Standard Library" introduced="^3" purpose="mandatory">
- <unit bldFile="genericopenlibs/cppstdlib/group" mrp="genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
- </component>
- <component id="openenvcore" name="Open Environment Core" introduced="^2" purpose="mandatory">
- <unit bldFile="genericopenlibs/openenvcore/group" mrp="genericopenlibs/openenvcore/group/openenv.mrp"/>
- </component>
- <component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
- <unit bldFile="genericopenlibs/posixrealtimeextensions/group" mrp="genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
- </component>
- <component id="liboil" name="Liboil" introduced="^4" purpose="optional">
- <unit bldFile="genericopenlibs/liboil/group" mrp="genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
- </component>
- </collection>
- <collection id="lowlevellibsandfws" name="Low Level Libraries and Frameworks" level="app-libs">
- <component id="pluginfw" name="Plugin Framework" introduced="6.2" purpose="mandatory">
- <unit version="3" bldFile="lowlevellibsandfws/pluginfw/Group" mrp="lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp"/>
- </component>
- <component id="apputils" name="Application Utilities" introduced="ER5" purpose="mandatory">
- <unit bldFile="lowlevellibsandfws/apputils/group" mrp="lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
- </component>
- <component id="genericusabilitylib" name="Generic Usability Library" introduced="^3" purpose="mandatory">
- <unit bldFile="lowlevellibsandfws/genericusabilitylib/group" mrp="lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
- </component>
- </collection>
- <collection id="ossrv_info" name="Generic OS Services Info" level="utilities">
- <component id="ossrv_build" filter="s60" name="Generic OS Services Build">
- <!-- exports should be moved to individual components -->
- <unit bldFile="group"/>
- </component>
- <component id="ossrv_metadata" name="Generic OS Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
- <unit mrp="ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
- </component>
- </collection>
- </package>
+ <unit bldFile="ofdbus/group"/>
+ </component>
+ </collection>
+ <collection id="utilitylibraries" name="Utility Libraries" level="encoding">
+ <component id="libutils" filter="s60" name="Utility Library">
+ <unit bldFile="utilitylibraries/libutils/group"/>
+ </component>
+ </collection>
+ <collection id="genericservices" name="Generic Services" level="utilities">
+ <component id="s60compatibilityheaders" name="S60 Compatibility Headers" filter="gt" purpose="optional">
+ <unit version="tb101sf" bldFile="genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp"/>
+ </component>
+ <component id="mimerecognitionfw" name="MIME Recognition Framework" purpose="mandatory">
+ <unit bldFile="genericservices/mimerecognitionfw/group" mrp="genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+ </component>
+ <component id="systemagent" name="System Agent" introduced="9.0" purpose="mandatory">
+ <unit bldFile="genericservices/systemagent/group" mrp="genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+ </component>
+ <component id="taskscheduler" name="Task Scheduler" introduced="6.0" purpose="optional">
+ <unit bldFile="genericservices/taskscheduler/group" mrp="genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+ </component>
+ <component id="activebackupclient" name="Active Backup Client" purpose="optional">
+ <unit bldFile="genericservices/activebackupclient/group" mrp="genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+ </component>
+ <component id="syslibsdocs" name="Syslibs Documentation" purpose="development" class="doc">
+ <unit mrp="genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+ </component>
+ <component id="httputils" name="HTTP Utilities Library" introduced="6.2" purpose="optional">
+ <unit bldFile="genericservices/httputils/group" mrp="genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+ </component>
+ </collection>
+ <collection id="syslibsapitest" name="SysLibs API Tests" level="utilities">
+ <component id="syslibssvs" name="Syslibs Verfication Suite" introduced="^2" purpose="development" filter="test">
+ <unit mrp="syslibsapitest/syslibssvs/group/syslibssvs.mrp" bldFile="syslibsapitest/syslibssvs/group"/>
+ </component>
+ </collection>
+ <collection id="compressionlibs" name="Compression Libraries" level="data-services">
+ <component id="ziplib" name="Zip Compression Library" introduced="6.0" purpose="mandatory">
+ <unit bldFile="compressionlibs/ziplib/group" mrp="compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
+ </component>
+ </collection>
+ <collection id="genericopenlibs" name="Generic Open Libraries" level="translation">
+ <component id="cstdlib" name="C Standard Library" introduced="ER5" purpose="optional">
+ <unit bldFile="genericopenlibs/cstdlib/group" mrp="genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+ </component>
+ <component id="cppstdlib" name="C++ Standard Library" introduced="^3" purpose="mandatory">
+ <unit bldFile="genericopenlibs/cppstdlib/group" mrp="genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
+ </component>
+ <component id="openenvcore" name="Open Environment Core" introduced="^2" purpose="mandatory">
+ <unit bldFile="genericopenlibs/openenvcore/group" mrp="genericopenlibs/openenvcore/group/openenv.mrp"/>
+ </component>
+ <component id="pluggableauthenticationmodulefw" name="Pluggable Authentication Module Framework" introduced="^4" purpose="optional">
+ <unit bldFile="genericopenlibs/pluggableauthenticationmodulefw/group" mrp="genericopenlibs/pluggableauthenticationmodulefw/group/oeaddons_libpam.mrp"/>
+ </component>
+ <component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
+ <unit bldFile="genericopenlibs/posixrealtimeextensions/group" mrp="genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
+ </component>
+ <component id="liboil" name="Liboil" introduced="^4" purpose="optional">
+ <unit bldFile="genericopenlibs/liboil/group" mrp="genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
+ </component>
+ </collection>
+ <collection id="lowlevellibsandfws" name="Low Level Libraries and Frameworks" level="app-libs">
+ <component id="pluginfw" name="Plugin Framework" introduced="6.2" purpose="mandatory">
+ <unit version="3" bldFile="lowlevellibsandfws/pluginfw/Group" mrp="lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp"/>
+ </component>
+ <component id="apputils" name="Application Utilities" introduced="ER5" purpose="mandatory">
+ <unit bldFile="lowlevellibsandfws/apputils/group" mrp="lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+ </component>
+ <component id="genericusabilitylib" name="Generic Usability Library" introduced="^3" purpose="mandatory">
+ <unit bldFile="lowlevellibsandfws/genericusabilitylib/group" mrp="lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
+ </component>
+ </collection>
+ <collection id="ossrv_info" name="Generic OS Services Info" level="utilities">
+ <component id="ossrv_build" filter="s60" name="Generic OS Services Build">
+ <!-- exports should be moved to individual components -->
+ <unit bldFile="group"/>
+ </component>
+ <component id="ossrv_metadata" name="Generic OS Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
</SystemDefinition>
--- a/symbian4/os/persistentdata/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/persistentdata/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -89,7 +89,7 @@
<component name="eventlogger" long-name="Event Logger" introduced="6.0" purpose="optional">
<unit bldFile="/sf/os/persistentdata/loggingservices/eventlogger/group" mrp="/sf/os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
</component>
- <component name="filelogger" long-name="File Logger" introduced="ER5" purpose="optional">
+ <component name="filelogger" long-name="File Logger" introduced="ER5" deprecated="^4" purpose="optional">
<unit bldFile="/sf/os/persistentdata/loggingservices/filelogger/group" mrp="/sf/os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
</component>
<component name="rfilelogger" long-name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">
--- a/symbian4/os/persistentdata/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/persistentdata/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -13,7 +13,7 @@
<component id="eventlogger" name="Event Logger" introduced="6.0" purpose="optional">
<unit bldFile="loggingservices/eventlogger/group" mrp="loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
</component>
- <component id="filelogger" name="File Logger" introduced="ER5" purpose="optional">
+ <component id="filelogger" name="File Logger" introduced="ER5" deprecated="^4" purpose="optional">
<unit bldFile="loggingservices/filelogger/group" mrp="loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
</component>
<component id="rfilelogger" name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">
--- a/symbian4/os/security/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/security/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -77,6 +77,11 @@
<systemModel>
<layer name="os" long-name="OS" levels="hw services">
<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+ <collection name="authenticationservices" long-name="Authentication Services" level="utilities">
+ <component name="authenticationserver" long-name="Authentication Server" introduced="^4" purpose="optional">
+ <unit bldFile="/sf/os/security/authenticationservices/authenticationserver/group" mrp="/sf/os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
+ </component>
+ </collection>
<collection name="authorisation" long-name="Authorisation" level="utilities">
<component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
<unit bldFile="/sf/os/security/authorisation/userpromptservice/group" mrp="/sf/os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
--- a/symbian4/os/security/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/security/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="security" name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+ <collection id="authenticationservices" name="Authentication Services" level="utilities">
+ <component id="authenticationserver" name="Authentication Server" introduced="^4" purpose="optional">
+ <unit bldFile="authenticationservices/authenticationserver/group" mrp="authenticationservices/authenticationserver/group/security_authserver.mrp"/>
+ </component>
+ </collection>
<collection id="authorisation" name="Authorisation" level="utilities">
<component id="userpromptservice" name="User Prompt Service" introduced="^3" purpose="mandatory">
<unit bldFile="authorisation/userpromptservice/group" mrp="authorisation/userpromptservice/group/security_ups.mrp"/>
--- a/symbian4/os/textandloc/package_definition.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/textandloc/package_definition.xml Wed May 19 10:37:39 2010 +0100
@@ -78,13 +78,13 @@
<layer name="os" long-name="OS" levels="hw services">
<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
- <component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
+ <component name="findutil_api" long-name="Find Util API" filter="s60" class="api">
<unit bldFile="/sf/os/textandloc/textandloc_plat/findutil_api/group"/>
</component>
<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
<unit bldFile="/sf/os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
</component>
- <component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
+ <component name="sortutil_api" long-name="Sort Util API" filter="s60" class="api">
<unit bldFile="/sf/os/textandloc/textandloc_plat/sortutil_api/group"/>
</component>
</collection>
@@ -105,13 +105,13 @@
</component>
</collection>
<collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
- <component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
+ <component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" deprecated="^4" plugin="Y">
<unit bldFile="/sf/os/textandloc/fontservices/textshaperplugin/group" mrp="/sf/os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
</component>
<component name="fontstore" long-name="Font Store" purpose="mandatory">
<unit bldFile="/sf/os/textandloc/fontservices/fontstore/group" mrp="/sf/os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
</component>
- <component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder">
+ <component name="textbase" long-name="Text Base" purpose="mandatory" class="placeholder">
<!-- placeholder for text code from GDI -->
</component>
<component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
@@ -133,18 +133,16 @@
</component>
</collection>
<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
- <!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
- <component name="numbergrouping" filter="s60" long-name="Number Grouping">
+ <component name="numbergrouping" long-name="Number Grouping">
<unit bldFile="/sf/os/textandloc/charconvfw/numbergrouping/group"/>
</component>
- <component name="jplangutil" filter="s60" long-name="Japanese Language Utilities">
+ <component name="jplangutil" long-name="Japanese Language Utilities">
<unit bldFile="/sf/os/textandloc/charconvfw/jplangutil/group"/>
</component>
- <component name="sortutil" filter="s60" long-name="Sorting Utility">
+ <component name="sortutil" long-name="Sorting Utility">
<unit bldFile="/sf/os/textandloc/charconvfw/sortutil/group"/>
</component>
- <component name="inlinetext" filter="s60" long-name="Inline Text">
+ <component name="inlinetext" long-name="Inline Text">
<unit bldFile="/sf/os/textandloc/charconvfw/inlinetext/group"/>
</component>
<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
--- a/symbian4/os/textandloc/package_definition_3.0.xml Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/textandloc/package_definition_3.0.xml Wed May 19 10:37:39 2010 +0100
@@ -1,107 +1,105 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
- <package id="textandloc" name="Text and Localisation Services" levels="encoding util fonts tools text">
- <collection id="textandloc_plat" name="Text and Localisation Platform Interfaces" level="text">
- <component id="findutil_api" name="Find Utility API" class="api" filter="s60">
- <meta rel="Api" href="textandloc_plat/findutil_api/findutil_api.metaxml"/>
- <unit bldFile="textandloc_plat/findutil_api/group"/>
- </component>
- <component id="japanese_language_utilities_api" name="Japanese Language Utilities API" class="api" filter="s60">
- <meta rel="Api" href="textandloc_plat/japanese_language_utilities_api/japanese_language_utilities_api.metaxml"/>
- <unit bldFile="textandloc_plat/japanese_language_utilities_api/group"/>
- </component>
- <component id="sortutil_api" name="Sorting Utility API" class="api" filter="s60">
- <meta rel="Api" href="textandloc_plat/sortutil_api/sortutil_api.metaxml"/>
- <unit bldFile="textandloc_plat/sortutil_api/group"/>
- </component>
- </collection>
- <collection id="textandloc_pub" name="Text and Localisation Public Interfaces" level="text">
- <component id="directory_localizer_api" name="Directory Localizer API" class="api" filter="s60">
- <meta rel="Api" href="textandloc_pub/directory_localizer_api/directory_localizer_api.metaxml"/>
- <unit bldFile="textandloc_pub/directory_localizer_api/group"/>
- </component>
- </collection>
- <collection id="charconvfw" name="Character Conversion" level="encoding">
- <component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional">
- <unit bldFile="charconvfw/charconv_fw/group" mrp="charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
- </component>
- <component id="charconvplugins" name="Character Encoding and Conversion Plugins" purpose="optional" class="plugin">
- <unit bldFile="charconvfw/charconvplugins/group" mrp="charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
- </component>
- <component id="fatfilenameconversionplugins" name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" class="plugin">
- <unit bldFile="charconvfw/fatfilenameconversionplugins/group" mrp="charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
- </component>
- </collection>
- <collection id="fontandtxtsrv" name="Font and Text Services" level="fonts">
- <component id="iculayoutengine" name="ICU Layout Engine" introduced="9.2" purpose="optional" class="plugin">
- <unit bldFile="fontservices/textshaperplugin/group" mrp="fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
- </component>
- <component id="fontstore" name="Font Store" purpose="mandatory">
- <unit bldFile="fontservices/fontstore/group" mrp="fontservices/fontstore/group/graphics_fntstore.mrp"/>
- </component>
- <component id="textrendering" name="Text Rendering" purpose="mandatory">
- <!-- placeholder for text code from GDI -->
- </component>
- <component id="freetypefontrasteriser" name="FreeType Font Rasteriser" purpose="optional" class="plugin">
- <unit bldFile="fontservices/freetypefontrasteriser/group" mrp="fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
- </component>
- <component id="referencefonts" name="Reference Fonts" introduced="6.0" purpose="optional">
- <unit bldFile="fontservices/referencefonts/group" mrp="fontservices/referencefonts/group/graphics_fonts.mrp"/>
- </component>
- </collection>
- <collection id="textlayout" name="Text Layout" level="text">
- <component id="texthandling" name="Text Handling" purpose="optional">
- <unit bldFile="textrendering/texthandling/group" mrp="textrendering/texthandling/group/app-framework_etext.mrp"/>
- </component>
- <component id="textformatting" name="Text Formatting" purpose="optional">
- <unit bldFile="textrendering/textformatting/group" mrp="textrendering/textformatting/group/app-framework_form.mrp"/>
- </component>
- <component id="word" name="Word" purpose="development" filter="test">
- <unit mrp="textrendering/word/group/app-framework_word.mrp" bldFile="textrendering/word/group"/>
- </component>
- </collection>
- <collection id="textandlocutils" name="Text and Localisation Utils" level="util">
- <!-- components in this collection need to be moved to the right collection.
- Either move into the units' directories, or create a new textandlocutils directory -->
- <component id="numbergrouping" filter="s60" name="Number Grouping">
- <unit bldFile="charconvfw/numbergrouping/group"/>
- </component>
- <component id="jplangutil" filter="s60" name="Japanese Language Utilities">
- <unit bldFile="charconvfw/jplangutil/group"/>
- </component>
- <component id="sortutil" filter="s60" name="Sorting Utility">
- <unit bldFile="charconvfw/sortutil/group"/>
- </component>
- <component id="inlinetext" filter="s60" name="Inline Text">
- <unit bldFile="charconvfw/inlinetext/group"/>
- </component>
- <component id="nearestlangutil" name="Nearest Language Util" introduced="^2" purpose="mandatory">
- <!-- placeholder for split from bafl -->
- </component>
- <component id="numberformatting" name="Number Formatting" introduced="7.0s" purpose="optional">
- <unit bldFile="textrendering/numberformatting/group" mrp="textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
- </component>
- </collection>
- <collection id="localesupport" name="Locale Support" level="util">
- <component id="reflocales" name="Reference Locales" purpose="optional" class="plugin">
- <unit bldFile="localisation/localesupport" mrp="localisation/localesupport/mmpfiles/base_loce32.mrp"/>
- </component>
- <component id="initlocale" name="Initialise Locale" introduced="^2" purpose="mandatory">
- <!-- placeholder for split from bafl -->
- </component>
- </collection>
- <collection id="textandloctools" name="Text and Localisation Tools" level="tools">
- <component id="fontcompiler" name="Font Compiler" purpose="development" target="desktop">
- <!-- placeholder for split from GDI Tools -->
- </component>
- <component id="bitmapfonttools" name="Bitmap Font Tools" purpose="development" target="desktop">
- <unit bldFile="../graphics/graphicstools/bitmapfonttools/group" mrp="../graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
- </component>
- </collection>
- <collection id="textandloc_info" name="Text and Localisation Info" level="text">
- <component id="textandloc_metadata" name="Text and Localisation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
- <unit mrp="textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
- </component>
- </collection>
- </package>
+ <package id="textandloc" name="Text and Localisation Services" levels="encoding util fonts tools text">
+ <collection id="textandloc_plat" name="Text and Localisation Platform Interfaces" level="text">
+ <component id="findutil_api" class="api" name="Find Util API" filter="s60">
+ <meta rel="Api" href="textandloc_plat/findutil_api/findutil_api.metaxml"/>
+ <unit bldFile="textandloc_plat/findutil_api/group"/>
+ </component>
+ <component id="japanese_language_utilities_api" class="api" name="Japanese Language Utilities API" filter="s60">
+ <meta rel="Api" href="textandloc_plat/japanese_language_utilities_api/japanese_language_utilities_api.metaxml"/>
+ <unit bldFile="textandloc_plat/japanese_language_utilities_api/group"/>
+ </component>
+ <component id="sortutil_api" class="api" name="Sort Util API" filter="s60">
+ <meta rel="Api" href="textandloc_plat/sortutil_api/sortutil_api.metaxml"/>
+ <unit bldFile="textandloc_plat/sortutil_api/group"/>
+ </component>
+ </collection>
+ <collection id="textandloc_pub" name="Text and Localisation Public Interfaces" level="text">
+ <component id="directory_localizer_api" class="api" name="Directory Localizer API" filter="s60">
+ <meta rel="Api" href="textandloc_pub/directory_localizer_api/directory_localizer_api.metaxml"/>
+ <unit bldFile="textandloc_pub/directory_localizer_api/group"/>
+ </component>
+ </collection>
+ <collection id="charconvfw" name="Character Conversion" level="encoding">
+ <component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional">
+ <unit bldFile="charconvfw/charconv_fw/group" mrp="charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+ </component>
+ <component id="charconvplugins" name="Character Encoding and Conversion Plugins" purpose="optional" class="plugin">
+ <unit bldFile="charconvfw/charconvplugins/group" mrp="charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+ </component>
+ <component id="fatfilenameconversionplugins" name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" class="plugin">
+ <unit bldFile="charconvfw/fatfilenameconversionplugins/group" mrp="charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+ </component>
+ </collection>
+ <collection id="fontandtxtsrv" name="Font and Text Services" level="fonts">
+ <component id="iculayoutengine" name="ICU Layout Engine" introduced="9.2" purpose="optional" class="plugin" deprecated="^4">
+ <unit bldFile="fontservices/textshaperplugin/group" mrp="fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+ </component>
+ <component id="fontstore" name="Font Store" purpose="mandatory">
+ <unit bldFile="fontservices/fontstore/group" mrp="fontservices/fontstore/group/graphics_fntstore.mrp"/>
+ </component>
+ <component id="textbase" name="Text Base" purpose="mandatory">
+ <!-- placeholder for text code from GDI -->
+ </component>
+ <component id="freetypefontrasteriser" name="FreeType Font Rasteriser" purpose="optional" class="plugin">
+ <unit bldFile="fontservices/freetypefontrasteriser/group" mrp="fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+ </component>
+ <component id="referencefonts" name="Reference Fonts" introduced="6.0" purpose="optional">
+ <unit bldFile="fontservices/referencefonts/group" mrp="fontservices/referencefonts/group/graphics_fonts.mrp"/>
+ </component>
+ </collection>
+ <collection id="textlayout" name="Text Layout" level="text">
+ <component id="texthandling" name="Text Handling" purpose="optional">
+ <unit bldFile="textrendering/texthandling/group" mrp="textrendering/texthandling/group/app-framework_etext.mrp"/>
+ </component>
+ <component id="textformatting" name="Text Formatting" purpose="optional">
+ <unit bldFile="textrendering/textformatting/group" mrp="textrendering/textformatting/group/app-framework_form.mrp"/>
+ </component>
+ <component id="word" name="Word" purpose="development" filter="test">
+ <unit mrp="textrendering/word/group/app-framework_word.mrp" bldFile="textrendering/word/group"/>
+ </component>
+ </collection>
+ <collection id="textandlocutils" name="Text and Localisation Utils" level="util">
+ <component id="numbergrouping" name="Number Grouping">
+ <unit bldFile="charconvfw/numbergrouping/group"/>
+ </component>
+ <component id="jplangutil" name="Japanese Language Utilities">
+ <unit bldFile="charconvfw/jplangutil/group"/>
+ </component>
+ <component id="sortutil" name="Sorting Utility">
+ <unit bldFile="charconvfw/sortutil/group"/>
+ </component>
+ <component id="inlinetext" name="Inline Text">
+ <unit bldFile="charconvfw/inlinetext/group"/>
+ </component>
+ <component id="nearestlangutil" name="Nearest Language Util" introduced="^2" purpose="mandatory">
+ <!-- placeholder for split from bafl -->
+ </component>
+ <component id="numberformatting" name="Number Formatting" introduced="7.0s" purpose="optional">
+ <unit bldFile="textrendering/numberformatting/group" mrp="textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+ </component>
+ </collection>
+ <collection id="localesupport" name="Locale Support" level="util">
+ <component id="reflocales" name="Reference Locales" purpose="optional" class="plugin">
+ <unit bldFile="localisation/localesupport" mrp="localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+ </component>
+ <component id="initlocale" name="Initialise Locale" introduced="^2" purpose="mandatory">
+ <!-- placeholder for split from bafl -->
+ </component>
+ </collection>
+ <collection id="textandloctools" name="Text and Localisation Tools" level="tools">
+ <component id="fontcompiler" name="Font Compiler" purpose="development" target="desktop">
+ <!-- placeholder for split from GDI Tools -->
+ </component>
+ <component id="bitmapfonttools" name="Bitmap Font Tools" purpose="development" target="desktop">
+ <unit bldFile="../graphics/graphicstools/bitmapfonttools/group" mrp="../graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+ </component>
+ </collection>
+ <collection id="textandloc_info" name="Text and Localisation Info" level="text">
+ <component id="textandloc_metadata" name="Text and Localisation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
</SystemDefinition>